diff --git a/.github/workflows/check-devnet.yml b/.github/workflows/check-devnet.yml
index 3d7f17723..2cb586348 100644
--- a/.github/workflows/check-devnet.yml
+++ b/.github/workflows/check-devnet.yml
@@ -3,6 +3,7 @@ name: Devnet Deploy Check
 on:
   pull_request:
     branches: [devnet, devnet-ready]
+    types: [labeled, unlabeled, synchronize]
 
 env:
   CARGO_TERM_COLOR: always
diff --git a/.github/workflows/check-finney.yml b/.github/workflows/check-finney.yml
index 3e9fb5994..665c9c8a9 100644
--- a/.github/workflows/check-finney.yml
+++ b/.github/workflows/check-finney.yml
@@ -3,6 +3,7 @@ name: Finney Deploy Check
 on:
   pull_request:
     branches: [finney, main]
+    types: [labeled, unlabeled, synchronize]
 
 env:
   CARGO_TERM_COLOR: always
@@ -51,4 +52,4 @@ jobs:
           runtime-package: "node-subtensor-runtime"
           node-uri: "wss://entrypoint-finney.opentensor.ai:443"
           checks: "pre-and-post"
-          extra-args: "--disable-spec-version-check --no-weight-warnings"
\ No newline at end of file
+          extra-args: "--disable-spec-version-check --no-weight-warnings"
diff --git a/.github/workflows/check-rust.yml b/.github/workflows/check-rust.yml
index ac7b8e3ec..e42e369cf 100644
--- a/.github/workflows/check-rust.yml
+++ b/.github/workflows/check-rust.yml
@@ -157,9 +157,9 @@ jobs:
 
       - name: check lints
         run: |
-          set -o pipefail  # Ensure the pipeline fails if any command in the pipeline fails
-          cargo check 2>&1 | sed -r "s/\x1B\[[0-9;]*[mK]//g" | tee /dev/tty | grep -q "^warning:" && \
-          (echo "Build emitted the following warnings:" >&2 && exit 1) || echo "No warnings found."
+          set -o pipefail
+          cargo check 2>&1 | sed -r "s/\x1B\[[0-9;]*[mK]//g" | grep "warning:" && exit 1
+          echo "No warnings found."
 
   cargo-clippy-all-features:
     name: cargo clippy --all-features
diff --git a/.github/workflows/check-testnet.yml b/.github/workflows/check-testnet.yml
index c18b45ac2..95277c94a 100644
--- a/.github/workflows/check-testnet.yml
+++ b/.github/workflows/check-testnet.yml
@@ -3,6 +3,7 @@ name: Testnet Deploy Check
 on:
   pull_request:
     branches: [testnet, testnet-ready]
+    types: [labeled, unlabeled, synchronize]
 
 env:
   CARGO_TERM_COLOR: always
diff --git a/Cargo.lock b/Cargo.lock
index bfb7366be..0902ad6de 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -23,18 +23,18 @@ dependencies = [
 
 [[package]]
 name = "addr2line"
-version = "0.22.0"
+version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678"
+checksum = "f5fb1d8e4442bd405fdfd1dacb42792696b0cf9cb15882e5d097b742a676d375"
 dependencies = [
- "gimli 0.29.0",
+ "gimli 0.31.0",
 ]
 
 [[package]]
-name = "adler"
-version = "1.0.2"
+name = "adler2"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f26201604c87b1e01bd3d98f8d5d9a8fcbb815e8cedb41ffccbeb4bf593a35fe"
+checksum = "512761e0bb2578dd7380c6baaa0f4ce03e84f95e960231d1dec8bf4d7d6e2627"
 
 [[package]]
 name = "aead"
@@ -68,7 +68,7 @@ dependencies = [
  "cipher 0.4.4",
  "ctr",
  "ghash",
- "subtle 2.6.0",
+ "subtle 2.6.1",
 ]
 
 [[package]]
@@ -125,20 +125,11 @@ dependencies = [
  "libc",
 ]
 
-[[package]]
-name = "ansi_term"
-version = "0.12.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d52a9bb7ec0cf484c551830a7ce27bd20d67eac647e1befb56b0be4ee39a55d2"
-dependencies = [
- "winapi",
-]
-
 [[package]]
 name = "anstream"
-version = "0.6.14"
+version = "0.6.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b"
+checksum = "64e15c1ab1f89faffbf04a634d5e1962e9074f2741eef6d97f3c4e322426d526"
 dependencies = [
  "anstyle",
  "anstyle-parse",
@@ -151,33 +142,33 @@ dependencies = [
 
 [[package]]
 name = "anstyle"
-version = "1.0.7"
+version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b"
+checksum = "1bec1de6f59aedf83baf9ff929c98f2ad654b97c9510f4e70cf6f661d49fd5b1"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.4"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4"
+checksum = "eb47de1e80c2b463c735db5b217a0ddc39d612e7ac9e2e96a5aed1f57616c1cb"
 dependencies = [
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle-query"
-version = "1.1.0"
+version = "1.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391"
+checksum = "6d36fc52c7f6c869915e99412912f22093507da8d9e942ceaf66fe4b7c14422a"
 dependencies = [
  "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.3"
+version = "3.0.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19"
+checksum = "5bf74e1b6e971609db8ca7a9ce79fd5768ab6ae46441c572e46cf596f59e57f8"
 dependencies = [
  "anstyle",
  "windows-sys 0.52.0",
@@ -185,9 +176,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.86"
+version = "1.0.89"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
+checksum = "86fdf8605db99b54d3cd748a44c6d04df638eb5dafb219b135d0149bd0db01f6"
 
 [[package]]
 name = "approx"
@@ -209,7 +200,7 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -223,6 +214,18 @@ dependencies = [
  "ark-std",
 ]
 
+[[package]]
+name = "ark-bls12-377-ext"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "20c7021f180a0cbea0380eba97c2af3c57074cdaffe0eef7e840e1c9f2841e55"
+dependencies = [
+ "ark-bls12-377",
+ "ark-ec",
+ "ark-models-ext",
+ "ark-std",
+]
+
 [[package]]
 name = "ark-bls12-381"
 version = "0.4.0"
@@ -235,6 +238,45 @@ dependencies = [
  "ark-std",
 ]
 
+[[package]]
+name = "ark-bls12-381-ext"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1dc4b3d08f19e8ec06e949712f95b8361e43f1391d94f65e4234df03480631c"
+dependencies = [
+ "ark-bls12-381",
+ "ark-ec",
+ "ark-ff",
+ "ark-models-ext",
+ "ark-serialize",
+ "ark-std",
+]
+
+[[package]]
+name = "ark-bw6-761"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e0605daf0cc5aa2034b78d008aaf159f56901d92a52ee4f6ecdfdac4f426700"
+dependencies = [
+ "ark-bls12-377",
+ "ark-ec",
+ "ark-ff",
+ "ark-std",
+]
+
+[[package]]
+name = "ark-bw6-761-ext"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ccee5fba47266f460067588ee1bf070a9c760bf2050c1c509982c5719aadb4f2"
+dependencies = [
+ "ark-bw6-761",
+ "ark-ec",
+ "ark-ff",
+ "ark-models-ext",
+ "ark-std",
+]
+
 [[package]]
 name = "ark-ec"
 version = "0.4.2"
@@ -249,9 +291,60 @@ dependencies = [
  "hashbrown 0.13.2",
  "itertools 0.10.5",
  "num-traits",
+ "rayon",
  "zeroize",
 ]
 
+[[package]]
+name = "ark-ed-on-bls12-377"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b10d901b9ac4b38f9c32beacedfadcdd64e46f8d7f8e88c1ae1060022cf6f6c6"
+dependencies = [
+ "ark-bls12-377",
+ "ark-ec",
+ "ark-ff",
+ "ark-std",
+]
+
+[[package]]
+name = "ark-ed-on-bls12-377-ext"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "524a4fb7540df2e1a8c2e67a83ba1d1e6c3947f4f9342cc2359fc2e789ad731d"
+dependencies = [
+ "ark-ec",
+ "ark-ed-on-bls12-377",
+ "ark-ff",
+ "ark-models-ext",
+ "ark-std",
+]
+
+[[package]]
+name = "ark-ed-on-bls12-381-bandersnatch"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f9cde0f2aa063a2a5c28d39b47761aa102bda7c13c84fc118a61b87c7b2f785c"
+dependencies = [
+ "ark-bls12-381",
+ "ark-ec",
+ "ark-ff",
+ "ark-std",
+]
+
+[[package]]
+name = "ark-ed-on-bls12-381-bandersnatch-ext"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d15185f1acb49a07ff8cbe5f11a1adc5a93b19e211e325d826ae98e98e124346"
+dependencies = [
+ "ark-ec",
+ "ark-ed-on-bls12-381-bandersnatch",
+ "ark-ff",
+ "ark-models-ext",
+ "ark-std",
+]
+
 [[package]]
 name = "ark-ff"
 version = "0.4.2"
@@ -268,7 +361,7 @@ dependencies = [
  "num-bigint",
  "num-traits",
  "paste",
- "rustc_version 0.4.0",
+ "rustc_version 0.4.1",
  "zeroize",
 ]
 
@@ -295,6 +388,19 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "ark-models-ext"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3e9eab5d4b5ff2f228b763d38442adc9b084b0a465409b059fac5c2308835ec2"
+dependencies = [
+ "ark-ec",
+ "ark-ff",
+ "ark-serialize",
+ "ark-std",
+ "derivative",
+]
+
 [[package]]
 name = "ark-poly"
 version = "0.4.2"
@@ -308,6 +414,35 @@ dependencies = [
  "hashbrown 0.13.2",
 ]
 
+[[package]]
+name = "ark-scale"
+version = "0.0.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5f69c00b3b529be29528a6f2fd5fa7b1790f8bed81b9cdca17e326538545a179"
+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=0fef826#0fef8266d851932ad25d6b41bc4b34d834d1e11d"
+dependencies = [
+ "ark-ec",
+ "ark-ff",
+ "ark-serialize",
+ "ark-std",
+ "ark-transcript",
+ "digest 0.10.7",
+ "getrandom_or_panic",
+ "zeroize",
+]
+
 [[package]]
 name = "ark-serialize"
 version = "0.4.2"
@@ -339,6 +474,20 @@ checksum = "94893f1e0c6eeab764ade8dc4c0db24caf4fe7cbbaafc0eba0a9030f447b5185"
 dependencies = [
  "num-traits",
  "rand",
+ "rayon",
+]
+
+[[package]]
+name = "ark-transcript"
+version = "0.0.2"
+source = "git+https://github.com/w3f/ring-vrf?rev=0fef826#0fef8266d851932ad25d6b41bc4b34d834d1e11d"
+dependencies = [
+ "ark-ff",
+ "ark-serialize",
+ "ark-std",
+ "digest 0.10.7",
+ "rand_core",
+ "sha3",
 ]
 
 [[package]]
@@ -349,15 +498,15 @@ checksum = "5d5dde061bd34119e902bbb2d9b90c5692635cf59fb91d582c2b68043f1b8293"
 
 [[package]]
 name = "arrayref"
-version = "0.3.7"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b4930d2cb77ce62f89ee5d5289b4ac049559b1c45539271f5ed4fdc7db34545"
+checksum = "76a2e8124351fda1ef8aaaa3bbd7ebbcb486bbcd4225aca0aa0d84bb2db8fecb"
 
 [[package]]
 name = "arrayvec"
-version = "0.7.4"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96d30a06541fbafbc7f82ed10c06164cfbd2c401138f6addd8404629c4b16711"
+checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "asn1-rs"
@@ -411,7 +560,7 @@ checksum = "965c2d33e53cb6b267e148a4cb0760bc01f4904c1cd4bb4002a085bb016d1490"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.79",
  "synstructure 0.13.1",
 ]
 
@@ -434,7 +583,7 @@ checksum = "7b18050c2cd6fe86c3a76584ef5e0baf286d038cda203eb6223df2cc413565f7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -450,9 +599,9 @@ dependencies = [
 
 [[package]]
 name = "async-io"
-version = "2.3.3"
+version = "2.3.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964"
+checksum = "444b0228950ee6501b3568d3c93bf1176a1fdbc3b758dcd9475046d30f4dc7e8"
 dependencies = [
  "async-lock",
  "cfg-if",
@@ -461,10 +610,10 @@ dependencies = [
  "futures-lite",
  "parking",
  "polling",
- "rustix 0.38.34",
+ "rustix 0.38.37",
  "slab",
  "tracing",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -480,13 +629,13 @@ dependencies = [
 
 [[package]]
 name = "async-trait"
-version = "0.1.80"
+version = "0.1.83"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca"
+checksum = "721cae7de5c34fbb2acd27e21e6d2cf7b886dce0c27388d46c4e6c47ea4318dd"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -521,23 +670,44 @@ dependencies = [
 
 [[package]]
 name = "autocfg"
-version = "1.3.0"
+version = "1.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
+checksum = "ace50bade8e6234aa140d9a2f552bbee1db4d353f69b8217bc503490fc1a9f26"
 
 [[package]]
 name = "backtrace"
-version = "0.3.73"
+version = "0.3.74"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a"
+checksum = "8d82cb332cdfaed17ae235a638438ac4d4839913cc2af585c3c6746e8f8bee1a"
 dependencies = [
- "addr2line 0.22.0",
- "cc",
+ "addr2line 0.24.1",
  "cfg-if",
  "libc",
  "miniz_oxide",
- "object 0.36.0",
+ "object 0.36.4",
  "rustc-demangle",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "bandersnatch_vrfs"
+version = "0.0.4"
+source = "git+https://github.com/w3f/ring-vrf?rev=0fef826#0fef8266d851932ad25d6b41bc4b34d834d1e11d"
+dependencies = [
+ "ark-bls12-381",
+ "ark-ec",
+ "ark-ed-on-bls12-381-bandersnatch",
+ "ark-ff",
+ "ark-serialize",
+ "ark-std",
+ "dleq_vrf",
+ "rand_chacha",
+ "rand_core",
+ "ring 0.1.0",
+ "sha2 0.10.8",
+ "sp-ark-bls12-381",
+ "sp-ark-ed-on-bls12-381-bandersnatch",
+ "zeroize",
 ]
 
 [[package]]
@@ -576,15 +746,6 @@ version = "1.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8c3c1a368f70d6cf7302d78f8f7093da241fb8e8807c05cc9e51a125895a6d5b"
 
-[[package]]
-name = "beef"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a8241f3ebb85c056b509d4327ad0358fbbba6ffb340bf388f26350aeda225b1"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "bincode"
 version = "1.3.3"
@@ -606,13 +767,13 @@ dependencies = [
  "lazy_static",
  "lazycell",
  "peeking_take_while",
- "prettyplease 0.2.20",
+ "prettyplease 0.2.22",
  "proc-macro2",
  "quote",
  "regex",
- "rustc-hash",
+ "rustc-hash 1.1.0",
  "shlex",
- "syn 2.0.71",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -639,9 +800,9 @@ checksum = "bef38d45163c2f1dde094a7dfd33ccf595c92905c8f8f4fdc18d06fb1037718a"
 
 [[package]]
 name = "bitflags"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4b9d6a944f767f8e5e0db018570623c85f3d925ac718db4e06d0187adb21c1"
+checksum = "b048fb63fd8b5923fc5aa7b340d8e156aec7ec02f0c78fa8a6ddc2613f6f71de"
 
 [[package]]
 name = "bitvec"
@@ -700,9 +861,9 @@ dependencies = [
 
 [[package]]
 name = "blake3"
-version = "1.5.1"
+version = "1.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30cca6d3674597c30ddf2c587bf8d9d65c9a84d2326d941cc79c9842dfe0ef52"
+checksum = "d82033247fd8e890df8f740e407ad4d038debb9eb1f40533fffb32e7d17dc6f7"
 dependencies = [
  "arrayref",
  "arrayvec",
@@ -785,9 +946,9 @@ checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"
 
 [[package]]
 name = "bytemuck"
-version = "1.16.1"
+version = "1.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e"
+checksum = "94bbb0ad554ad961ddc5da507a12a29b14e4ae5bda06b19f575a3e6079d2e2ae"
 
 [[package]]
 name = "byteorder"
@@ -797,9 +958,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.6.0"
+version = "1.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "514de17de45fdb8dc022b1a7975556c53c86f9f0aa5f534b98977b171857c2c9"
+checksum = "428d9aa8fbc0670b7b8d6030a7fadd0f86151cae55e4dbbece15f3780a3dfaf3"
 
 [[package]]
 name = "bzip2-sys"
@@ -824,9 +985,9 @@ dependencies = [
 
 [[package]]
 name = "camino"
-version = "1.1.7"
+version = "1.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0ec6b951b160caa93cc0c7b209e5a3bff7aae9062213451ac99493cd844c239"
+checksum = "8b96ec4966b5813e2c0507c1f86115c8c5abaadc3980879c3424042a02fd1ad3"
 dependencies = [
  "serde",
 ]
@@ -856,13 +1017,13 @@ dependencies = [
 
 [[package]]
 name = "cc"
-version = "1.0.99"
+version = "1.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695"
+checksum = "812acba72f0a070b003d3697490d2b55b837230ae7c6c6497f05cc2ddbb8d938"
 dependencies = [
  "jobserver",
  "libc",
- "once_cell",
+ "shlex",
 ]
 
 [[package]]
@@ -941,7 +1102,7 @@ dependencies = [
  "num-traits",
  "serde",
  "wasm-bindgen",
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -1003,9 +1164,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.7"
+version = "4.5.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5db83dced34638ad474f39f250d7fea9598bdd239eaced1bdf45d597da0f433f"
+checksum = "7be5744db7978a28d9df86a214130d106a89ce49644cbc4e3f0c22c3fba30615"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -1013,9 +1174,9 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.7"
+version = "4.5.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7e204572485eb3fbf28f871612191521df159bc3e15a9f5064c66dba3a8c05f"
+checksum = "a5fbc17d3ef8278f55b282b2a2e75ae6f6c7d4bb70ed3d0382375104bfafdb4b"
 dependencies = [
  "anstream",
  "anstyle",
@@ -1026,21 +1187,21 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.5.5"
+version = "4.5.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c780290ccf4fb26629baa7a1081e68ced113f1d3ec302fa5948f1c381ebf06c6"
+checksum = "4ac6a0c7b1a9e9a5186361f67dfa1b88213572f427fb9ab038efb2bd8c582dab"
 dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.79",
 ]
 
 [[package]]
 name = "clap_lex"
-version = "0.7.1"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70"
+checksum = "1462739cb27611015575c0c11df5df7601141071f07518d56fcc1be504cbec97"
 
 [[package]]
 name = "codespan-reporting"
@@ -1054,9 +1215,9 @@ dependencies = [
 
 [[package]]
 name = "colorchoice"
-version = "1.0.1"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422"
+checksum = "d3fd119d74b830634cea2a0f58bbd0d54540518a14397557951e79340abc28c0"
 
 [[package]]
 name = "combine"
@@ -1074,11 +1235,27 @@ version = "7.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b34115915337defe99b2aff5c2ce6771e5fbc4079f4b506301f5cf394c8452f7"
 dependencies = [
- "strum 0.26.2",
+ "strum 0.26.3",
  "strum_macros 0.26.4",
  "unicode-width",
 ]
 
+[[package]]
+name = "common"
+version = "0.1.0"
+source = "git+https://github.com/w3f/ring-proof?rev=665f5f5#665f5f51af5734c7b6d90b985dd6861d4c5b4752"
+dependencies = [
+ "ark-ec",
+ "ark-ff",
+ "ark-poly",
+ "ark-serialize",
+ "ark-std",
+ "fflonk",
+ "getrandom_or_panic",
+ "merlin",
+ "rand_chacha",
+]
+
 [[package]]
 name = "common-path"
 version = "1.0.0"
@@ -1135,9 +1312,9 @@ dependencies = [
 
 [[package]]
 name = "constant_time_eq"
-version = "0.3.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2"
+checksum = "7c74b8349d32d297c9134b8c88677813a227df8f779daa29bfc29c183fe3dca6"
 
 [[package]]
 name = "constcat"
@@ -1163,9 +1340,9 @@ dependencies = [
 
 [[package]]
 name = "core-foundation-sys"
-version = "0.8.6"
+version = "0.8.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06ea2b9bc92be3c2baa9334a323ebca2d6f074ff852cd1d7b11064035cd3868f"
+checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
 
 [[package]]
 name = "core2"
@@ -1187,9 +1364,9 @@ dependencies = [
 
 [[package]]
 name = "cpufeatures"
-version = "0.2.12"
+version = "0.2.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53fe5e26ff1b7aef8bca9c6080520cfb8d9333c7568e1829cef191a9723e5504"
+checksum = "608697df725056feaccfa42cffdaeeec3fccc4ffc38358ecd19b243e716a78e0"
 dependencies = [
  "libc",
 ]
@@ -1355,7 +1532,7 @@ checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76"
 dependencies = [
  "generic-array 0.14.7",
  "rand_core",
- "subtle 2.6.0",
+ "subtle 2.6.1",
  "zeroize",
 ]
 
@@ -1387,7 +1564,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab"
 dependencies = [
  "generic-array 0.14.7",
- "subtle 2.6.0",
+ "subtle 2.6.1",
 ]
 
 [[package]]
@@ -1410,8 +1587,8 @@ dependencies = [
  "curve25519-dalek-derive",
  "digest 0.10.7",
  "fiat-crypto",
- "rustc_version 0.4.0",
- "subtle 2.6.0",
+ "rustc_version 0.4.1",
+ "subtle 2.6.1",
  "zeroize",
 ]
 
@@ -1423,14 +1600,14 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.79",
 ]
 
 [[package]]
 name = "cxx"
-version = "1.0.124"
+version = "1.0.128"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "273dcfd3acd4e1e276af13ed2a43eea7001318823e7a726a6b3ed39b4acc0b82"
+checksum = "54ccead7d199d584d139148b04b4a368d1ec7556a1d9ea2548febb1b9d49f9a4"
 dependencies = [
  "cc",
  "cxxbridge-flags",
@@ -1440,9 +1617,9 @@ dependencies = [
 
 [[package]]
 name = "cxx-build"
-version = "1.0.124"
+version = "1.0.128"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8b2766fbd92be34e9ed143898fce6c572dc009de39506ed6903e5a05b68914e"
+checksum = "c77953e99f01508f89f55c494bfa867171ef3a6c8cea03d26975368f2121a5c1"
 dependencies = [
  "cc",
  "codespan-reporting",
@@ -1450,31 +1627,31 @@ dependencies = [
  "proc-macro2",
  "quote",
  "scratch",
- "syn 2.0.71",
+ "syn 2.0.79",
 ]
 
 [[package]]
 name = "cxxbridge-flags"
-version = "1.0.124"
+version = "1.0.128"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "839fcd5e43464614ffaa989eaf1c139ef1f0c51672a1ed08023307fa1b909ccd"
+checksum = "65777e06cc48f0cb0152024c77d6cf9e4bdb4408e7b48bea993d42fa0f5b02b6"
 
 [[package]]
 name = "cxxbridge-macro"
-version = "1.0.124"
+version = "1.0.128"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b2c1c1776b986979be68bb2285da855f8d8a35851a769fca8740df7c3d07877"
+checksum = "98532a60dedaebc4848cb2cba5023337cc9ea3af16a5b062633fabfd9f18fb60"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.79",
 ]
 
 [[package]]
 name = "darling"
-version = "0.20.9"
+version = "0.20.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83b2eb4d90d12bdda5ed17de686c2acb4c57914f8f921b8da7e112b5a36f3fe1"
+checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989"
 dependencies = [
  "darling_core",
  "darling_macro",
@@ -1482,27 +1659,27 @@ dependencies = [
 
 [[package]]
 name = "darling_core"
-version = "0.20.9"
+version = "0.20.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "622687fe0bac72a04e5599029151f5796111b90f1baaa9b544d807a5e31cd120"
+checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5"
 dependencies = [
  "fnv",
  "ident_case",
  "proc-macro2",
  "quote",
  "strsim",
- "syn 2.0.71",
+ "syn 2.0.79",
 ]
 
 [[package]]
 name = "darling_macro"
-version = "0.20.9"
+version = "0.20.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "733cabb43482b1a1b53eee8583c2b9e8684d592215ea83efd305dd31bc2f0178"
+checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
 dependencies = [
  "darling_core",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -1611,7 +1788,7 @@ checksum = "d65d7ce8132b7c0e54497a4d9a55a1c2a0912a0d786cf894472ba818fba45762"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -1623,8 +1800,8 @@ dependencies = [
  "convert_case",
  "proc-macro2",
  "quote",
- "rustc_version 0.4.0",
- "syn 2.0.71",
+ "rustc_version 0.4.1",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -1660,7 +1837,7 @@ dependencies = [
  "block-buffer 0.10.4",
  "const-oid",
  "crypto-common",
- "subtle 2.6.0",
+ "subtle 2.6.1",
 ]
 
 [[package]]
@@ -1713,7 +1890,23 @@ checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.79",
+]
+
+[[package]]
+name = "dleq_vrf"
+version = "0.0.2"
+source = "git+https://github.com/w3f/ring-vrf?rev=0fef826#0fef8266d851932ad25d6b41bc4b34d834d1e11d"
+dependencies = [
+ "ark-ec",
+ "ark-ff",
+ "ark-scale",
+ "ark-secret-scalar",
+ "ark-serialize",
+ "ark-std",
+ "ark-transcript",
+ "arrayvec",
+ "zeroize",
 ]
 
 [[package]]
@@ -1737,9 +1930,9 @@ dependencies = [
  "proc-macro2",
  "quote",
  "regex",
- "syn 2.0.71",
+ "syn 2.0.79",
  "termcolor",
- "toml 0.8.14",
+ "toml 0.8.19",
  "walkdir",
 ]
 
@@ -1818,7 +2011,7 @@ dependencies = [
  "rand_core",
  "serde",
  "sha2 0.10.8",
- "subtle 2.6.0",
+ "subtle 2.6.1",
  "zeroize",
 ]
 
@@ -1839,9 +2032,9 @@ dependencies = [
 
 [[package]]
 name = "either"
-version = "1.12.0"
+version = "1.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b"
+checksum = "60b1af1c220855b6ceac025d3f6ecdd2b7c4894bfe9cd9bda4fbb4bc7c0d4cf0"
 
 [[package]]
 name = "elliptic-curve"
@@ -1859,7 +2052,7 @@ dependencies = [
  "rand_core",
  "sec1",
  "serdect",
- "subtle 2.6.0",
+ "subtle 2.6.1",
  "zeroize",
 ]
 
@@ -1883,14 +2076,14 @@ dependencies = [
 
 [[package]]
 name = "enum-as-inner"
-version = "0.6.0"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a"
+checksum = "a1e6a265c649f3f5979b601d26f1d05ada116434c87741c9493cb56218f76cbc"
 dependencies = [
- "heck 0.4.1",
+ "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -1910,7 +2103,7 @@ checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -2020,10 +2213,10 @@ dependencies = [
  "blake2 0.10.6",
  "file-guard",
  "fs-err",
- "prettyplease 0.2.20",
+ "prettyplease 0.2.22",
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -2040,9 +2233,9 @@ checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649"
 
 [[package]]
 name = "fastrand"
-version = "2.1.0"
+version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
+checksum = "e8c02a5121d4ea3eb16a80748c74f5549a5665e4c21333c6098f283870fbdea6"
 
 [[package]]
 name = "fdlimit"
@@ -2061,7 +2254,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449"
 dependencies = [
  "rand_core",
- "subtle 2.6.0",
+ "subtle 2.6.1",
+]
+
+[[package]]
+name = "fflonk"
+version = "0.1.0"
+source = "git+https://github.com/w3f/fflonk#1e854f35e9a65d08b11a86291405cdc95baa0a35"
+dependencies = [
+ "ark-ec",
+ "ark-ff",
+ "ark-poly",
+ "ark-serialize",
+ "ark-std",
+ "merlin",
 ]
 
 [[package]]
@@ -2092,14 +2298,14 @@ dependencies = [
 
 [[package]]
 name = "filetime"
-version = "0.2.23"
+version = "0.2.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ee447700ac8aa0b2f2bd7bc4462ad686ba06baa6727ac149a2d6277f0d240fd"
+checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall 0.4.1",
- "windows-sys 0.52.0",
+ "libredox",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -2168,8 +2374,8 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
 
 [[package]]
 name = "fork-tree"
-version = "13.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "12.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "parity-scale-codec",
 ]
@@ -2201,8 +2407,8 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa"
 
 [[package]]
 name = "frame-benchmarking"
-version = "37.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "frame-support",
  "frame-support-procedural",
@@ -2218,15 +2424,15 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-runtime-interface",
- "sp-storage",
+ "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1)",
+ "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1)",
  "static_assertions",
 ]
 
 [[package]]
 name = "frame-benchmarking-cli"
-version = "42.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "32.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "Inflector",
  "array-bytes",
@@ -2259,24 +2465,24 @@ dependencies = [
  "sp-blockchain",
  "sp-core",
  "sp-database",
- "sp-externalities",
+ "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1)",
  "sp-genesis-builder",
  "sp-inherents",
  "sp-io",
  "sp-keystore",
  "sp-runtime",
  "sp-state-machine",
- "sp-storage",
+ "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1)",
  "sp-trie",
- "sp-wasm-interface",
+ "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1)",
  "thiserror",
  "thousands",
 ]
 
 [[package]]
 name = "frame-executive"
-version = "37.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "aquamarine",
  "frame-support",
@@ -2288,7 +2494,7 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-tracing",
+ "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1)",
 ]
 
 [[package]]
@@ -2305,8 +2511,8 @@ dependencies = [
 
 [[package]]
 name = "frame-metadata-hash-extension"
-version = "0.5.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "0.1.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "array-bytes",
  "docify",
@@ -2320,8 +2526,8 @@ dependencies = [
 
 [[package]]
 name = "frame-support"
-version = "37.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "aquamarine",
  "array-bytes",
@@ -2344,7 +2550,7 @@ dependencies = [
  "sp-arithmetic",
  "sp-core",
  "sp-crypto-hashing-proc-macro",
- "sp-debug-derive",
+ "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1)",
  "sp-genesis-builder",
  "sp-inherents",
  "sp-io",
@@ -2352,8 +2558,8 @@ dependencies = [
  "sp-runtime",
  "sp-staking",
  "sp-state-machine",
- "sp-std",
- "sp-tracing",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1)",
+ "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1)",
  "sp-weights",
  "static_assertions",
  "tt-call",
@@ -2361,49 +2567,74 @@ dependencies = [
 
 [[package]]
 name = "frame-support-procedural"
-version = "30.0.2"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "23.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "Inflector",
  "cfg-expr",
  "derive-syn-parse",
+ "docify",
  "expander",
- "frame-support-procedural-tools",
+ "frame-support-procedural-tools 10.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1)",
  "itertools 0.11.0",
  "macro_magic",
  "proc-macro-warning 1.0.2",
  "proc-macro2",
  "quote",
- "sp-crypto-hashing",
- "syn 2.0.71",
+ "sp-crypto-hashing 0.1.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1)",
+ "syn 2.0.79",
 ]
 
 [[package]]
 name = "frame-support-procedural-tools"
-version = "13.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "10.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3363df38464c47a73eb521a4f648bfcc7537a82d70347ef8af3f73b6d019e910"
 dependencies = [
- "frame-support-procedural-tools-derive",
- "proc-macro-crate 3.1.0",
+ "frame-support-procedural-tools-derive 11.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "proc-macro-crate 3.2.0",
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.79",
+]
+
+[[package]]
+name = "frame-support-procedural-tools"
+version = "10.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
+dependencies = [
+ "frame-support-procedural-tools-derive 11.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1)",
+ "proc-macro-crate 3.2.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.79",
 ]
 
 [[package]]
 name = "frame-support-procedural-tools-derive"
-version = "12.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "11.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68672b9ec6fe72d259d3879dc212c5e42e977588cdac830c76f54d9f492aeb58"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.79",
+]
+
+[[package]]
+name = "frame-support-procedural-tools-derive"
+version = "11.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.79",
 ]
 
 [[package]]
 name = "frame-system"
-version = "37.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "cfg-if",
  "docify",
@@ -2415,15 +2646,15 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1)",
  "sp-version",
  "sp-weights",
 ]
 
 [[package]]
 name = "frame-system-benchmarking"
-version = "37.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -2436,8 +2667,8 @@ dependencies = [
 
 [[package]]
 name = "frame-system-rpc-runtime-api"
-version = "34.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "26.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "docify",
  "parity-scale-codec",
@@ -2446,8 +2677,8 @@ dependencies = [
 
 [[package]]
 name = "frame-try-runtime"
-version = "0.43.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "0.34.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
@@ -2557,7 +2788,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -2699,9 +2930,9 @@ dependencies = [
 
 [[package]]
 name = "gimli"
-version = "0.29.0"
+version = "0.31.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"
+checksum = "32085ea23f3234fc7846555e85283ba4de91e21016dc0455a16286d87a292d64"
 
 [[package]]
 name = "glob"
@@ -2737,7 +2968,7 @@ checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63"
 dependencies = [
  "ff",
  "rand_core",
- "subtle 2.6.0",
+ "subtle 2.6.1",
 ]
 
 [[package]]
@@ -2752,7 +2983,7 @@ dependencies = [
  "futures-sink",
  "futures-util",
  "http 0.2.12",
- "indexmap 2.2.6",
+ "indexmap 2.6.0",
  "slab",
  "tokio",
  "tokio-util",
@@ -2771,7 +3002,7 @@ dependencies = [
  "futures-core",
  "futures-sink",
  "http 1.1.0",
- "indexmap 2.2.6",
+ "indexmap 2.6.0",
  "slab",
  "tokio",
  "tokio-util",
@@ -2835,6 +3066,12 @@ dependencies = [
  "allocator-api2",
 ]
 
+[[package]]
+name = "hashbrown"
+version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e087f84d4f86bf4b218b927129862374b72199ae7d8657835f1e89000eea4fb"
+
 [[package]]
 name = "hashlink"
 version = "0.8.4"
@@ -3003,9 +3240,9 @@ dependencies = [
 
 [[package]]
 name = "httparse"
-version = "1.9.4"
+version = "1.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9"
+checksum = "7d71d3574edd2771538b901e6549113b4006ece66150fb69c0fb6d9a2adae946"
 
 [[package]]
 name = "httpdate"
@@ -3021,9 +3258,9 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
 [[package]]
 name = "hyper"
-version = "0.14.29"
+version = "0.14.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f361cde2f109281a220d4307746cdfd5ee3f410da58a70377762396775634b33"
+checksum = "a152ddd61dfaec7273fe8419ab357f33aee0d914c5f4efbf0d96fa749eea5ec9"
 dependencies = [
  "bytes",
  "futures-channel",
@@ -3071,7 +3308,7 @@ checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590"
 dependencies = [
  "futures-util",
  "http 0.2.12",
- "hyper 0.14.29",
+ "hyper 0.14.30",
  "log",
  "rustls 0.21.12",
  "rustls-native-certs",
@@ -3081,9 +3318,9 @@ dependencies = [
 
 [[package]]
 name = "hyper-util"
-version = "0.1.7"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cde7055719c54e36e95e8719f95883f22072a48ede39db7fc17a4e1d5281e9b9"
+checksum = "41296eb09f183ac68eec06e03cdbea2e759633d4067b2f6552fc2e009bcad08b"
 dependencies = [
  "bytes",
  "futures-util",
@@ -3092,15 +3329,14 @@ dependencies = [
  "hyper 1.4.1",
  "pin-project-lite",
  "tokio",
- "tower",
  "tower-service",
 ]
 
 [[package]]
 name = "iana-time-zone"
-version = "0.1.60"
+version = "0.1.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7ffbb5a1b541ea2561f8c41c087286cc091e21e556a4f09a8f6cbf17b69b141"
+checksum = "235e081f3925a06703c2d0117ea8b91f042756fd6e7a6e5d901e8ca1a996b220"
 dependencies = [
  "android_system_properties",
  "core-foundation-sys",
@@ -3196,7 +3432,7 @@ dependencies = [
  "bytes",
  "futures",
  "http 0.2.12",
- "hyper 0.14.29",
+ "hyper 0.14.30",
  "log",
  "rand",
  "tokio",
@@ -3274,12 +3510,12 @@ dependencies = [
 
 [[package]]
 name = "indexmap"
-version = "2.2.6"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
+checksum = "707907fe3c25f5424cce2cb7e1cbcafee6bdbe735ca90ef77c29e84591e5b9da"
 dependencies = [
  "equivalent",
- "hashbrown 0.14.5",
+ "hashbrown 0.15.0",
 ]
 
 [[package]]
@@ -3340,26 +3576,26 @@ dependencies = [
 
 [[package]]
 name = "ipnet"
-version = "2.9.0"
+version = "2.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8f518f335dce6725a761382244631d86cf0ccb2863413590b31338feb467f9c3"
+checksum = "187674a687eed5fe42285b40c6291f9a01517d415fad1c3cbc6a9f778af7fcd4"
 
 [[package]]
 name = "is-terminal"
-version = "0.4.12"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b"
+checksum = "261f68e344040fbd0edea105bef17c66edf46f984ddb1115b775ce31be948f4b"
 dependencies = [
- "hermit-abi 0.3.9",
+ "hermit-abi 0.4.0",
  "libc",
  "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "is_terminal_polyfill"
-version = "1.70.0"
+version = "1.70.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800"
+checksum = "7943c866cc5cd64cbc25b2e01621d07fa8eb2a1a23160ee81ce38704e97b8ecf"
 
 [[package]]
 name = "itertools"
@@ -3396,90 +3632,52 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
 
 [[package]]
 name = "jobserver"
-version = "0.1.31"
+version = "0.1.32"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e"
+checksum = "48d1dbcbbeb6a7fec7e059840aa538bd62aaccf972c7346c4d9d2059312853d0"
 dependencies = [
  "libc",
 ]
 
 [[package]]
 name = "js-sys"
-version = "0.3.69"
+version = "0.3.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29c15563dc2726973df627357ce0c9ddddbea194836909d655df6a75d2cf296d"
+checksum = "1868808506b929d7b0cfa8f75951347aa71bb21144b7791bae35d9bccfcfe37a"
 dependencies = [
  "wasm-bindgen",
 ]
 
 [[package]]
 name = "jsonrpsee"
-version = "0.22.5"
+version = "0.24.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfdb12a2381ea5b2e68c3469ec604a007b367778cdb14d09612c8069ebd616ad"
+checksum = "126b48a5acc3c52fbd5381a77898cb60e145123179588a29e7ac48f9c06e401b"
 dependencies = [
- "jsonrpsee-core 0.22.5",
- "jsonrpsee-proc-macros 0.22.5",
- "jsonrpsee-server 0.22.5",
- "jsonrpsee-types 0.22.5",
- "tokio",
- "tracing",
-]
-
-[[package]]
-name = "jsonrpsee"
-version = "0.23.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62b089779ad7f80768693755a031cc14a7766aba707cbe886674e3f79e9b7e47"
-dependencies = [
- "jsonrpsee-core 0.23.2",
- "jsonrpsee-proc-macros 0.23.2",
- "jsonrpsee-server 0.23.2",
- "jsonrpsee-types 0.23.2",
+ "jsonrpsee-core",
+ "jsonrpsee-proc-macros",
+ "jsonrpsee-server",
+ "jsonrpsee-types",
  "tokio",
  "tracing",
 ]
 
 [[package]]
 name = "jsonrpsee-core"
-version = "0.22.5"
+version = "0.24.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4b257e1ec385e07b0255dde0b933f948b5c8b8c28d42afda9587c3a967b896d"
+checksum = "b0e503369a76e195b65af35058add0e6900b794a4e9a9316900ddd3a87a80477"
 dependencies = [
- "anyhow",
  "async-trait",
- "beef",
- "futures-util",
- "hyper 0.14.29",
- "jsonrpsee-types 0.22.5",
- "parking_lot 0.12.3",
- "rand",
- "rustc-hash",
- "serde",
- "serde_json",
- "thiserror",
- "tokio",
- "tracing",
-]
-
-[[package]]
-name = "jsonrpsee-core"
-version = "0.23.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79712302e737d23ca0daa178e752c9334846b08321d439fd89af9a384f8c830b"
-dependencies = [
- "anyhow",
- "async-trait",
- "beef",
  "bytes",
  "futures-util",
  "http 1.1.0",
  "http-body 1.0.1",
  "http-body-util",
- "jsonrpsee-types 0.23.2",
+ "jsonrpsee-types",
  "parking_lot 0.12.3",
  "rand",
- "rustc-hash",
+ "rustc-hash 2.0.0",
  "serde",
  "serde_json",
  "thiserror",
@@ -3489,74 +3687,36 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-proc-macros"
-version = "0.22.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d0bb047e79a143b32ea03974a6bf59b62c2a4c5f5d42a381c907a8bbb3f75c0"
-dependencies = [
- "heck 0.4.1",
- "proc-macro-crate 3.1.0",
- "proc-macro2",
- "quote",
- "syn 2.0.71",
-]
-
-[[package]]
-name = "jsonrpsee-proc-macros"
-version = "0.23.2"
+version = "0.24.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7895f186d5921065d96e16bd795e5ca89ac8356ec423fafc6e3d7cf8ec11aee4"
+checksum = "fc660a9389e2748e794a40673a4155d501f32db667757cdb80edeff0306b489b"
 dependencies = [
  "heck 0.5.0",
- "proc-macro-crate 3.1.0",
+ "proc-macro-crate 3.2.0",
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.79",
 ]
 
 [[package]]
 name = "jsonrpsee-server"
-version = "0.22.5"
+version = "0.24.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "12d8b6a9674422a8572e0b0abb12feeb3f2aeda86528c80d0350c2bd0923ab41"
+checksum = "af6e6c9b6d975edcb443565d648b605f3e85a04ec63aa6941811a8894cc9cded"
 dependencies = [
- "futures-util",
- "http 0.2.12",
- "hyper 0.14.29",
- "jsonrpsee-core 0.22.5",
- "jsonrpsee-types 0.22.5",
- "pin-project",
- "route-recognizer",
- "serde",
- "serde_json",
- "soketto 0.7.1",
- "thiserror",
- "tokio",
- "tokio-stream",
- "tokio-util",
- "tower",
- "tracing",
-]
-
-[[package]]
-name = "jsonrpsee-server"
-version = "0.23.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "654afab2e92e5d88ebd8a39d6074483f3f2bfdf91c5ac57fe285e7127cdd4f51"
-dependencies = [
- "anyhow",
  "futures-util",
  "http 1.1.0",
  "http-body 1.0.1",
  "http-body-util",
  "hyper 1.4.1",
  "hyper-util",
- "jsonrpsee-core 0.23.2",
- "jsonrpsee-types 0.23.2",
+ "jsonrpsee-core",
+ "jsonrpsee-types",
  "pin-project",
  "route-recognizer",
  "serde",
  "serde_json",
- "soketto 0.8.0",
+ "soketto",
  "thiserror",
  "tokio",
  "tokio-stream",
@@ -3567,24 +3727,10 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-types"
-version = "0.22.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "150d6168405890a7a3231a3c74843f58b8959471f6df76078db2619ddee1d07d"
-dependencies = [
- "anyhow",
- "beef",
- "serde",
- "serde_json",
- "thiserror",
-]
-
-[[package]]
-name = "jsonrpsee-types"
-version = "0.23.2"
+version = "0.24.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9c465fbe385238e861fdc4d1c85e04ada6c1fd246161d26385c1b311724d2af"
+checksum = "d8fb16314327cbc94fdf7965ef7e4422509cd5597f76d137bd104eb34aeede67"
 dependencies = [
- "beef",
  "http 1.1.0",
  "serde",
  "serde_json",
@@ -3593,9 +3739,9 @@ dependencies = [
 
 [[package]]
 name = "k256"
-version = "0.13.3"
+version = "0.13.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "956ff9b67e26e1a6a866cb758f12c6f8746208489e3e4a4b5580802f2f0a587b"
+checksum = "f6e3919bbaa2945715f0bb6d3934a173d1e9a59ac23767fbaaef277265a7411b"
 dependencies = [
  "cfg-if",
  "ecdsa",
@@ -3655,9 +3801,9 @@ dependencies = [
 
 [[package]]
 name = "lazy_static"
-version = "1.4.0"
+version = "1.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
+checksum = "bbd2bcb4c963f2ddae06a2efc7e9f3591312473c50c6685e1f298068316e66fe"
 
 [[package]]
 name = "lazycell"
@@ -3667,18 +3813,18 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
 
 [[package]]
 name = "libc"
-version = "0.2.155"
+version = "0.2.159"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
+checksum = "561d97a539a36e26a9a5fad1ea11a3039a67714694aaa379433e580854bc3dc5"
 
 [[package]]
 name = "libloading"
-version = "0.8.3"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19"
+checksum = "4979f22fdb869068da03c9f7528f8297c6fd2606bc3a4affe42e6a823fdb8da4"
 dependencies = [
  "cfg-if",
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -3718,7 +3864,7 @@ dependencies = [
  "libp2p-wasm-ext",
  "libp2p-websocket",
  "libp2p-yamux",
- "multiaddr 0.18.1",
+ "multiaddr 0.18.2",
  "pin-project",
  "rw-stream-sink",
  "thiserror",
@@ -3761,7 +3907,7 @@ dependencies = [
  "instant",
  "libp2p-identity",
  "log",
- "multiaddr 0.18.1",
+ "multiaddr 0.18.2",
  "multihash 0.19.1",
  "multistream-select",
  "once_cell",
@@ -3912,7 +4058,7 @@ dependencies = [
  "libp2p-core",
  "libp2p-identity",
  "log",
- "multiaddr 0.18.1",
+ "multiaddr 0.18.2",
  "multihash 0.19.1",
  "once_cell",
  "quick-protobuf",
@@ -4018,7 +4164,7 @@ dependencies = [
  "proc-macro-warning 0.4.2",
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -4102,7 +4248,7 @@ dependencies = [
  "parking_lot 0.12.3",
  "pin-project-lite",
  "rw-stream-sink",
- "soketto 0.8.0",
+ "soketto",
  "thiserror",
  "url",
  "webpki-roots",
@@ -4127,8 +4273,9 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c0ff37bd590ca25063e35af745c343cb7a0271906fb7b37e4813e8f79f00268d"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "libc",
+ "redox_syscall 0.5.7",
 ]
 
 [[package]]
@@ -4173,7 +4320,7 @@ checksum = "5be9b9bb642d8522a44d533eab56c16c738301965504753b03ad1de3425d5451"
 dependencies = [
  "crunchy",
  "digest 0.9.0",
- "subtle 2.6.0",
+ "subtle 2.6.1",
 ]
 
 [[package]]
@@ -4196,9 +4343,9 @@ dependencies = [
 
 [[package]]
 name = "libz-sys"
-version = "1.1.18"
+version = "1.1.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c15da26e5af7e25c90b37a2d75cdbf940cf4a55316de9d84c679c9b8bfabf82e"
+checksum = "d2d16453e800a8cf6dd2fc3eb4bc99b786a9b90c663b8559a5b1a041bf89e472"
 dependencies = [
  "cc",
  "pkg-config",
@@ -4276,7 +4423,7 @@ dependencies = [
  "futures",
  "futures-timer",
  "hex-literal",
- "indexmap 2.2.6",
+ "indexmap 2.6.0",
  "libc",
  "mockall 0.12.1",
  "multiaddr 0.17.1",
@@ -4362,19 +4509,18 @@ dependencies = [
 
 [[package]]
 name = "lz4"
-version = "1.25.0"
+version = "1.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6eab492fe7f8651add23237ea56dbf11b3c4ff762ab83d40a47f11433421f91"
+checksum = "4d1febb2b4a79ddd1980eede06a8f7902197960aa0383ffcfdd62fe723036725"
 dependencies = [
- "libc",
  "lz4-sys",
 ]
 
 [[package]]
 name = "lz4-sys"
-version = "1.9.5"
+version = "1.11.1+lz4-1.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e9764018d143cc854c9f17f0b907de70f14393b1f502da6375dce70f00514eb3"
+checksum = "6bd8c0d6c6ed0cd30b3652886bb8711dc4bb01d637a68105a3d5158039b418e6"
 dependencies = [
  "cc",
  "libc",
@@ -4398,7 +4544,7 @@ dependencies = [
  "macro_magic_core",
  "macro_magic_macros",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -4412,7 +4558,7 @@ dependencies = [
  "macro_magic_core_macros",
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -4423,7 +4569,7 @@ checksum = "b02abfe41815b5bd98dbd4260173db2c116dda171dc0fe7838cb206333b83308"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -4434,7 +4580,7 @@ checksum = "73ea28ee64b88876bf45277ed9a5817c1817df061a74f2b988971a12570e5869"
 dependencies = [
  "macro_magic_core",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -4460,9 +4606,9 @@ checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5"
 
 [[package]]
 name = "matrixmultiply"
-version = "0.3.8"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7574c1cf36da4798ab73da5b215bbf444f50718207754cb522201d78d1cd0ff2"
+checksum = "9380b911e3e96d10c1f415da0876389aaf1b56759054eeb0de7df940c456ba1a"
 dependencies = [
  "autocfg",
  "rawpointer",
@@ -4480,7 +4626,7 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b2cffa4ad52c6f791f4f8b15f0c05f9824b2ced1160e88cc393d64fff9a8ac64"
 dependencies = [
- "rustix 0.38.34",
+ "rustix 0.38.37",
 ]
 
 [[package]]
@@ -4494,9 +4640,9 @@ dependencies = [
 
 [[package]]
 name = "memmap2"
-version = "0.9.4"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322"
+checksum = "fd3f7eed9d3848f8b98834af67102b720745c4ec028fcd0aa0239277e7de374f"
 dependencies = [
  "libc",
 ]
@@ -4553,22 +4699,23 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.7.4"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
+checksum = "e2d80299ef12ff69b16a84bb182e3b9df68b5a91574d3d4fa6e41b65deec4df1"
 dependencies = [
- "adler",
+ "adler2",
 ]
 
 [[package]]
 name = "mio"
-version = "0.8.11"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
+checksum = "80e04d1dcff3aae0704555fe5fee3bcfaf3d1fdf8a7e521d5b9d2b42acb52cec"
 dependencies = [
+ "hermit-abi 0.3.9",
  "libc",
  "wasi",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -4591,7 +4738,7 @@ dependencies = [
  "rand",
  "rand_chacha",
  "rand_distr",
- "subtle 2.6.0",
+ "subtle 2.6.1",
  "thiserror",
  "zeroize",
 ]
@@ -4647,7 +4794,7 @@ dependencies = [
  "cfg-if",
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -4671,9 +4818,9 @@ dependencies = [
 
 [[package]]
 name = "multiaddr"
-version = "0.18.1"
+version = "0.18.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b852bc02a2da5feed68cd14fa50d0774b92790a5bdbfa932a813926c8472070"
+checksum = "fe6351f60b488e04c1d21bc69e56b89cb3f5e8f5d22557d6e8031bdfd79b6961"
 dependencies = [
  "arrayref",
  "byteorder",
@@ -4684,7 +4831,7 @@ dependencies = [
  "percent-encoding",
  "serde",
  "static_assertions",
- "unsigned-varint 0.7.2",
+ "unsigned-varint 0.8.0",
  "url",
 ]
 
@@ -4763,6 +4910,12 @@ version = "0.8.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a"
 
+[[package]]
+name = "multimap"
+version = "0.10.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "defc4c55412d89136f966bbb339008b474350e5e6e78d2714439c386b3137a03"
+
 [[package]]
 name = "multistream-select"
 version = "0.13.0"
@@ -4795,13 +4948,13 @@ dependencies = [
 
 [[package]]
 name = "nalgebra-macros"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91761aed67d03ad966ef783ae962ef9bbaca728d2dd7ceb7939ec110fffad998"
+checksum = "254a5372af8fc138e36684761d3c0cdb758a4410e938babcff1c860ce14ddbfc"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -4931,8 +5084,8 @@ dependencies = [
  "frame-metadata-hash-extension",
  "frame-system",
  "futures",
- "jsonrpsee 0.22.5",
- "memmap2 0.9.4",
+ "jsonrpsee",
+ "memmap2 0.9.5",
  "node-subtensor-runtime",
  "pallet-commitments",
  "pallet-transaction-payment",
@@ -5025,9 +5178,9 @@ dependencies = [
  "sp-offchain",
  "sp-runtime",
  "sp-session",
- "sp-std",
- "sp-storage",
- "sp-tracing",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1)",
+ "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1)",
+ "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1)",
  "sp-transaction-pool",
  "sp-version",
  "substrate-wasm-builder",
@@ -5081,9 +5234,9 @@ dependencies = [
 
 [[package]]
 name = "num-bigint"
-version = "0.4.5"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7"
+checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
 dependencies = [
  "num-integer",
  "num-traits",
@@ -5176,9 +5329,9 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.36.0"
+version = "0.36.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "576dfe1fc8f9df304abb159d767a29d0476f7750fbf8aa7ad07816004a207434"
+checksum = "084f1a5821ac4c651660a94a7153d27ac9d8a53736203f58b31945ded098070a"
 dependencies = [
  "memchr",
 ]
@@ -5203,9 +5356,12 @@ dependencies = [
 
 [[package]]
 name = "once_cell"
-version = "1.19.0"
+version = "1.20.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3fdb12b2476b595f9358c5161aa467c2438859caa136dec86c26fdd2efe17b92"
+checksum = "82881c4be219ab5faaf2ad5e5e5ecdff8c66bd7402ca3160975c93b24961afd1"
+dependencies = [
+ "portable-atomic",
+]
 
 [[package]]
 name = "opaque-debug"
@@ -5225,7 +5381,7 @@ version = "0.10.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "cfg-if",
  "foreign-types",
  "libc",
@@ -5242,7 +5398,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -5302,8 +5458,8 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
- "sp-tracing",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1)",
+ "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1)",
  "sp-weights",
  "substrate-fixed",
  "subtensor-macros",
@@ -5311,8 +5467,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-aura"
-version = "36.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "27.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5327,8 +5483,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-authorship"
-version = "37.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5340,8 +5496,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-balances"
-version = "38.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "docify",
  "frame-benchmarking",
@@ -5366,7 +5522,7 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1)",
  "subtensor-macros",
 ]
 
@@ -5384,14 +5540,14 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1)",
  "subtensor-macros",
 ]
 
 [[package]]
 name = "pallet-grandpa"
-version = "37.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5412,8 +5568,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-insecure-randomness-collective-flip"
-version = "25.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "16.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5425,8 +5581,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-membership"
-version = "37.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5441,8 +5597,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-multisig"
-version = "37.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5456,8 +5612,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-preimage"
-version = "37.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5472,8 +5628,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-proxy"
-version = "37.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5497,14 +5653,14 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1)",
  "subtensor-macros",
 ]
 
 [[package]]
 name = "pallet-safe-mode"
-version = "18.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "9.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "docify",
  "frame-benchmarking",
@@ -5521,8 +5677,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-scheduler"
-version = "38.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "29.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "docify",
  "frame-benchmarking",
@@ -5538,8 +5694,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-session"
-version = "37.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5588,8 +5744,8 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
- "sp-tracing",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1)",
+ "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1)",
  "sp-version",
  "substrate-fixed",
  "subtensor-macros",
@@ -5597,8 +5753,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-sudo"
-version = "37.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "docify",
  "frame-benchmarking",
@@ -5612,8 +5768,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-timestamp"
-version = "36.0.1"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "27.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "docify",
  "frame-benchmarking",
@@ -5625,14 +5781,14 @@ dependencies = [
  "sp-inherents",
  "sp-io",
  "sp-runtime",
- "sp-storage",
+ "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1)",
  "sp-timestamp",
 ]
 
 [[package]]
 name = "pallet-transaction-payment"
-version = "37.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5646,10 +5802,10 @@ dependencies = [
 
 [[package]]
 name = "pallet-transaction-payment-rpc"
-version = "40.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "30.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
- "jsonrpsee 0.23.2",
+ "jsonrpsee",
  "pallet-transaction-payment-rpc-runtime-api",
  "parity-scale-codec",
  "sp-api",
@@ -5662,8 +5818,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-transaction-payment-rpc-runtime-api"
-version = "37.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "pallet-transaction-payment",
  "parity-scale-codec",
@@ -5674,8 +5830,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-utility"
-version = "37.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5742,7 +5898,7 @@ version = "3.6.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d830939c76d294956402033aee57a6da7b438f2294eb94864c37b0569053a42c"
 dependencies = [
- "proc-macro-crate 3.1.0",
+ "proc-macro-crate 3.2.0",
  "proc-macro2",
  "quote",
  "syn 1.0.109",
@@ -5785,9 +5941,9 @@ checksum = "e1ad0aff30c1da14b1254fcb2af73e1fa9a28670e584a626f53a369d0e157304"
 
 [[package]]
 name = "parking"
-version = "2.2.0"
+version = "2.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb813b8af86854136c6922af0598d719255ecb2179515e6e7730d468f05c9cae"
+checksum = "f38d5652c16fde515bb1ecef450ab0f6a219d619a7274976324d5e377f7dceba"
 
 [[package]]
 name = "parking_lot"
@@ -5832,9 +5988,9 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall 0.5.2",
+ "redox_syscall 0.5.7",
  "smallvec",
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -5851,7 +6007,7 @@ checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166"
 dependencies = [
  "base64ct",
  "rand_core",
- "subtle 2.6.0",
+ "subtle 2.6.1",
 ]
 
 [[package]]
@@ -5893,9 +6049,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
 [[package]]
 name = "pest"
-version = "2.7.10"
+version = "2.7.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "560131c633294438da9f7c4b08189194b20946c8274c6b9e38881a7874dc8ee8"
+checksum = "fdbef9d1d47087a895abd220ed25eb4ad973a5e26f6a4367b038c25e28dfc2d9"
 dependencies = [
  "memchr",
  "thiserror",
@@ -5904,9 +6060,9 @@ dependencies = [
 
 [[package]]
 name = "pest_derive"
-version = "2.7.10"
+version = "2.7.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26293c9193fbca7b1a3bf9b79dc1e388e927e6cacaa78b4a3ab705a1d3d41459"
+checksum = "4d3a6e3394ec80feb3b6393c725571754c6188490265c61aaf260810d6b95aa0"
 dependencies = [
  "pest",
  "pest_generator",
@@ -5914,22 +6070,22 @@ dependencies = [
 
 [[package]]
 name = "pest_generator"
-version = "2.7.10"
+version = "2.7.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ec22af7d3fb470a85dd2ca96b7c577a1eb4ef6f1683a9fe9a8c16e136c04687"
+checksum = "94429506bde1ca69d1b5601962c73f4172ab4726571a59ea95931218cb0e930e"
 dependencies = [
  "pest",
  "pest_meta",
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.79",
 ]
 
 [[package]]
 name = "pest_meta"
-version = "2.7.10"
+version = "2.7.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d7a240022f37c361ec1878d646fc5b7d7c4d28d5946e1a80ad5a7a4f4ca0bdcd"
+checksum = "ac8a071862e93690b6e34e9a5fb8e33ff3734473ac0245b27232222c4906a33f"
 dependencies = [
  "once_cell",
  "pest",
@@ -5943,7 +6099,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
 dependencies = [
  "fixedbitset",
- "indexmap 2.2.6",
+ "indexmap 2.6.0",
 ]
 
 [[package]]
@@ -5963,7 +6119,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -5990,9 +6146,9 @@ dependencies = [
 
 [[package]]
 name = "pkg-config"
-version = "0.3.30"
+version = "0.3.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
+checksum = "953ec861398dccce10c670dfeaf3ec4911ca479e9c02154b3a215178c5f566f2"
 
 [[package]]
 name = "polkavm"
@@ -6043,7 +6199,7 @@ dependencies = [
  "polkavm-common",
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -6053,7 +6209,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8ba81f7b5faac81e528eb6158a6f3c9e0bb1008e0ffa19653bc8dea925ecb429"
 dependencies = [
  "polkavm-derive-impl",
- "syn 2.0.71",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -6079,17 +6235,17 @@ checksum = "26e85d3456948e650dff0cfc85603915847faf893ed1e66b020bb82ef4557120"
 
 [[package]]
 name = "polling"
-version = "3.7.2"
+version = "3.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b"
+checksum = "cc2790cd301dec6cd3b7a025e4815cf825724a51c98dccfe6a3e55f05ffb6511"
 dependencies = [
  "cfg-if",
  "concurrent-queue",
  "hermit-abi 0.4.0",
  "pin-project-lite",
- "rustix 0.38.34",
+ "rustix 0.38.37",
  "tracing",
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -6117,9 +6273,9 @@ dependencies = [
 
 [[package]]
 name = "portable-atomic"
-version = "1.6.0"
+version = "1.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7170ef9988bc169ba16dd36a7fa041e5c4cbeb6a35b76d4c03daded371eae7c0"
+checksum = "cc9c68a3f6da06753e9335d63e27f6b9754dd1920d941135b7ea8224f141adb2"
 
 [[package]]
 name = "powerfmt"
@@ -6129,9 +6285,12 @@ checksum = "439ee305def115ba05938db6eb1644ff94165c5ab5e9420d1c1bcedbba909391"
 
 [[package]]
 name = "ppv-lite86"
-version = "0.2.17"
+version = "0.2.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
+checksum = "77957b295656769bb8ad2b6a6b09d897d94f05c41b069aede1fcdaa675eaea04"
+dependencies = [
+ "zerocopy",
+]
 
 [[package]]
 name = "predicates"
@@ -6159,15 +6318,15 @@ dependencies = [
 
 [[package]]
 name = "predicates-core"
-version = "1.0.6"
+version = "1.0.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b794032607612e7abeb4db69adb4e33590fa6cf1149e95fd7cb00e634b92f174"
+checksum = "ae8177bee8e75d6846599c6b9ff679ed51e882816914eec639944d7c9aa11931"
 
 [[package]]
 name = "predicates-tree"
-version = "1.0.9"
+version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "368ba315fb8c5052ab692e68a0eefec6ec57b23a36959c14496f0b0df2c0cecf"
+checksum = "41b740d195ed3166cd147c8047ec98db0e22ec019eb8eeb76d343b795304fb13"
 dependencies = [
  "predicates-core",
  "termtree",
@@ -6185,12 +6344,12 @@ dependencies = [
 
 [[package]]
 name = "prettyplease"
-version = "0.2.20"
+version = "0.2.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e"
+checksum = "479cf940fbbb3426c32c5d5176f62ad57549a0bb84773423ba8be9d089f5faba"
 dependencies = [
  "proc-macro2",
- "syn 2.0.71",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -6219,11 +6378,11 @@ dependencies = [
 
 [[package]]
 name = "proc-macro-crate"
-version = "3.1.0"
+version = "3.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284"
+checksum = "8ecf48c7ca261d60b74ab1a7b20da18bede46776b2e55535cb958eb595c5fa7b"
 dependencies = [
- "toml_edit 0.21.1",
+ "toml_edit",
 ]
 
 [[package]]
@@ -6258,7 +6417,7 @@ checksum = "3d1eaa7fa0aa1929ffdf7eeb6eac234dde6268914a14ad44d23521ab6a9b258e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -6269,7 +6428,7 @@ checksum = "834da187cfe638ae8abb0203f0b33e5ccdb02a28e7199f2f47b3e2754f50edca"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -6281,6 +6440,25 @@ dependencies = [
  "unicode-ident",
 ]
 
+[[package]]
+name = "procedural-fork"
+version = "1.10.0-rc3"
+dependencies = [
+ "Inflector",
+ "cfg-expr",
+ "derive-syn-parse",
+ "expander",
+ "frame-support-procedural-tools 10.0.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "itertools 0.10.5",
+ "macro_magic",
+ "proc-macro-warning 1.0.2",
+ "proc-macro2",
+ "quote",
+ "regex",
+ "sp-crypto-hashing 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+ "syn 2.0.79",
+]
+
 [[package]]
 name = "prometheus"
 version = "0.13.4"
@@ -6315,7 +6493,7 @@ checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -6349,7 +6527,7 @@ dependencies = [
  "itertools 0.10.5",
  "lazy_static",
  "log",
- "multimap",
+ "multimap 0.8.3",
  "petgraph",
  "prettyplease 0.1.25",
  "prost 0.11.9",
@@ -6370,14 +6548,14 @@ dependencies = [
  "heck 0.5.0",
  "itertools 0.12.1",
  "log",
- "multimap",
+ "multimap 0.10.0",
  "once_cell",
  "petgraph",
- "prettyplease 0.2.20",
+ "prettyplease 0.2.22",
  "prost 0.12.6",
  "prost-types 0.12.6",
  "regex",
- "syn 2.0.71",
+ "syn 2.0.79",
  "tempfile",
 ]
 
@@ -6404,7 +6582,7 @@ dependencies = [
  "itertools 0.12.1",
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -6427,9 +6605,9 @@ dependencies = [
 
 [[package]]
 name = "psm"
-version = "0.1.21"
+version = "0.1.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874"
+checksum = "aa37f80ca58604976033fae9515a8a2989fc13797d953f7c04fb8fa36a11f205"
 dependencies = [
  "cc",
 ]
@@ -6487,7 +6665,7 @@ dependencies = [
  "pin-project-lite",
  "quinn-proto 0.9.6",
  "quinn-udp 0.3.2",
- "rustc-hash",
+ "rustc-hash 1.1.0",
  "rustls 0.20.9",
  "thiserror",
  "tokio",
@@ -6506,7 +6684,7 @@ dependencies = [
  "pin-project-lite",
  "quinn-proto 0.10.6",
  "quinn-udp 0.4.1",
- "rustc-hash",
+ "rustc-hash 1.1.0",
  "rustls 0.21.12",
  "thiserror",
  "tokio",
@@ -6522,7 +6700,7 @@ dependencies = [
  "bytes",
  "rand",
  "ring 0.16.20",
- "rustc-hash",
+ "rustc-hash 1.1.0",
  "rustls 0.20.9",
  "slab",
  "thiserror",
@@ -6540,7 +6718,7 @@ dependencies = [
  "bytes",
  "rand",
  "ring 0.16.20",
- "rustc-hash",
+ "rustc-hash 1.1.0",
  "rustls 0.21.12",
  "slab",
  "thiserror",
@@ -6576,9 +6754,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.36"
+version = "1.0.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
+checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
 dependencies = [
  "proc-macro2",
 ]
@@ -6640,11 +6818,11 @@ dependencies = [
 
 [[package]]
 name = "raw-cpuid"
-version = "11.0.2"
+version = "11.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e29830cbb1290e404f24c73af91c5d8d631ce7e128691e9477556b540cd01ecd"
+checksum = "1ab240315c661615f2ee9f0f2cd32d5a7343a84d5ebcccb99d46e6637565e7b0"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
 ]
 
 [[package]]
@@ -6696,27 +6874,18 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4722d768eff46b75989dd134e5c353f0d6296e5aaa3132e776cbdb56be7731aa"
-dependencies = [
- "bitflags 1.3.2",
-]
-
-[[package]]
-name = "redox_syscall"
-version = "0.5.2"
+version = "0.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd"
+checksum = "9b6dfecf2c74bce2466cabf93f6664d6998a69eb21e39f4207930065b27b771f"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
 ]
 
 [[package]]
 name = "redox_users"
-version = "0.4.5"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891"
+checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43"
 dependencies = [
  "getrandom",
  "libredox",
@@ -6740,7 +6909,7 @@ checksum = "bcc303e793d3734489387d205e9b186fac9c6cfacedd98cbb2e8a5943595f3e6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -6763,21 +6932,21 @@ checksum = "ad156d539c879b7a24a363a2016d77961786e71f48f2e2fc8302a92abd2429a6"
 dependencies = [
  "hashbrown 0.13.2",
  "log",
- "rustc-hash",
+ "rustc-hash 1.1.0",
  "slice-group-by",
  "smallvec",
 ]
 
 [[package]]
 name = "regex"
-version = "1.10.5"
+version = "1.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f"
+checksum = "38200e5ee88914975b69f657f0801b6f6dccafd44fd9326302a4aaeecfacb1d8"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-automata 0.4.7",
- "regex-syntax 0.8.4",
+ "regex-automata 0.4.8",
+ "regex-syntax 0.8.5",
 ]
 
 [[package]]
@@ -6791,13 +6960,13 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.7"
+version = "0.4.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
+checksum = "368758f23274712b504848e9d5a6f010445cc8b87a7cdb4d7cbee666c1288da3"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-syntax 0.8.4",
+ "regex-syntax 0.8.5",
 ]
 
 [[package]]
@@ -6808,9 +6977,9 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.4"
+version = "0.8.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
+checksum = "2b15c43186be67a4fd63bee50d0303afffcef381492ebe2c5d87f324e1b8815c"
 
 [[package]]
 name = "resolv-conf"
@@ -6829,7 +6998,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2"
 dependencies = [
  "hmac 0.12.1",
- "subtle 2.6.0",
+ "subtle 2.6.1",
+]
+
+[[package]]
+name = "ring"
+version = "0.1.0"
+source = "git+https://github.com/w3f/ring-proof?rev=665f5f5#665f5f51af5734c7b6d90b985dd6861d4c5b4752"
+dependencies = [
+ "ark-ec",
+ "ark-ff",
+ "ark-poly",
+ "ark-serialize",
+ "ark-std",
+ "arrayvec",
+ "blake2 0.10.6",
+ "common",
+ "fflonk",
+ "merlin",
 ]
 
 [[package]]
@@ -6936,6 +7122,12 @@ version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "08d43f7aa6b08d49f382cde6a7982047c3426db949b1424bc4b7ec9ae12c6ce2"
 
+[[package]]
+name = "rustc-hash"
+version = "2.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "583034fd73374156e66797ed8e5b0d5690409c9226b22d87cb7f19821c05d152"
+
 [[package]]
 name = "rustc-hex"
 version = "2.1.0"
@@ -6953,9 +7145,9 @@ dependencies = [
 
 [[package]]
 name = "rustc_version"
-version = "0.4.0"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
+checksum = "cfcb3a22ef46e85b45de6ee7e79d063319ebb6594faafcf1c225ea92ab6e9b92"
 dependencies = [
  "semver 1.0.23",
 ]
@@ -6985,11 +7177,11 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.38.34"
+version = "0.38.37"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
+checksum = "8acb788b847c24f28525660c4d7758620a7210875711f79e7f663cc152726811"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "errno",
  "libc",
  "linux-raw-sys 0.4.14",
@@ -7102,19 +7294,19 @@ dependencies = [
 
 [[package]]
 name = "sc-allocator"
-version = "29.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "23.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "log",
  "sp-core",
- "sp-wasm-interface",
+ "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1)",
  "thiserror",
 ]
 
 [[package]]
 name = "sc-basic-authorship"
-version = "0.44.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "0.34.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "futures",
  "futures-timer",
@@ -7135,8 +7327,8 @@ dependencies = [
 
 [[package]]
 name = "sc-block-builder"
-version = "0.42.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "0.33.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -7150,13 +7342,13 @@ dependencies = [
 
 [[package]]
 name = "sc-chain-spec"
-version = "37.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "array-bytes",
  "docify",
  "log",
- "memmap2 0.9.4",
+ "memmap2 0.9.5",
  "parity-scale-codec",
  "sc-chain-spec-derive",
  "sc-client-api",
@@ -7167,29 +7359,29 @@ dependencies = [
  "serde_json",
  "sp-blockchain",
  "sp-core",
- "sp-crypto-hashing",
+ "sp-crypto-hashing 0.1.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1)",
  "sp-genesis-builder",
  "sp-io",
  "sp-runtime",
  "sp-state-machine",
- "sp-tracing",
+ "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1)",
 ]
 
 [[package]]
 name = "sc-chain-spec-derive"
-version = "12.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "11.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
- "proc-macro-crate 3.1.0",
+ "proc-macro-crate 3.2.0",
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.79",
 ]
 
 [[package]]
 name = "sc-cli"
-version = "0.46.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "0.36.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "array-bytes",
  "chrono",
@@ -7229,8 +7421,8 @@ dependencies = [
 
 [[package]]
 name = "sc-client-api"
-version = "37.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "fnv",
  "futures",
@@ -7245,19 +7437,19 @@ dependencies = [
  "sp-consensus",
  "sp-core",
  "sp-database",
- "sp-externalities",
+ "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1)",
  "sp-runtime",
  "sp-state-machine",
  "sp-statement-store",
- "sp-storage",
+ "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1)",
  "sp-trie",
  "substrate-prometheus-endpoint",
 ]
 
 [[package]]
 name = "sc-client-db"
-version = "0.44.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "0.35.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "hash-db",
  "kvdb",
@@ -7282,8 +7474,8 @@ dependencies = [
 
 [[package]]
 name = "sc-consensus"
-version = "0.43.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "0.33.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "async-trait",
  "futures",
@@ -7306,8 +7498,8 @@ dependencies = [
 
 [[package]]
 name = "sc-consensus-aura"
-version = "0.44.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "0.34.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "async-trait",
  "futures",
@@ -7335,8 +7527,8 @@ dependencies = [
 
 [[package]]
 name = "sc-consensus-grandpa"
-version = "0.29.1"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "0.19.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "ahash 0.8.11",
  "array-bytes",
@@ -7370,7 +7562,7 @@ dependencies = [
  "sp-consensus",
  "sp-consensus-grandpa",
  "sp-core",
- "sp-crypto-hashing",
+ "sp-crypto-hashing 0.1.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1)",
  "sp-keystore",
  "sp-runtime",
  "substrate-prometheus-endpoint",
@@ -7379,12 +7571,12 @@ dependencies = [
 
 [[package]]
 name = "sc-consensus-grandpa-rpc"
-version = "0.29.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "0.19.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "finality-grandpa",
  "futures",
- "jsonrpsee 0.23.2",
+ "jsonrpsee",
  "log",
  "parity-scale-codec",
  "sc-client-api",
@@ -7399,8 +7591,8 @@ dependencies = [
 
 [[package]]
 name = "sc-consensus-slots"
-version = "0.43.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "0.33.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "async-trait",
  "futures",
@@ -7422,8 +7614,8 @@ dependencies = [
 
 [[package]]
 name = "sc-executor"
-version = "0.40.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "0.32.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "parity-scale-codec",
  "parking_lot 0.12.3",
@@ -7433,44 +7625,44 @@ dependencies = [
  "schnellru",
  "sp-api",
  "sp-core",
- "sp-externalities",
+ "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1)",
  "sp-io",
  "sp-panic-handler",
- "sp-runtime-interface",
+ "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1)",
  "sp-trie",
  "sp-version",
- "sp-wasm-interface",
+ "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1)",
  "tracing",
 ]
 
 [[package]]
 name = "sc-executor-common"
-version = "0.35.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "0.29.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "polkavm",
  "sc-allocator",
  "sp-maybe-compressed-blob",
- "sp-wasm-interface",
+ "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1)",
  "thiserror",
  "wasm-instrument",
 ]
 
 [[package]]
 name = "sc-executor-polkavm"
-version = "0.32.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "0.29.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "log",
  "polkavm",
  "sc-executor-common",
- "sp-wasm-interface",
+ "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1)",
 ]
 
 [[package]]
 name = "sc-executor-wasmtime"
-version = "0.35.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "0.29.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "anyhow",
  "cfg-if",
@@ -7480,17 +7672,17 @@ dependencies = [
  "rustix 0.36.17",
  "sc-allocator",
  "sc-executor-common",
- "sp-runtime-interface",
- "sp-wasm-interface",
+ "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1)",
+ "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1)",
  "wasmtime",
 ]
 
 [[package]]
 name = "sc-informant"
-version = "0.43.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "0.33.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
- "ansi_term",
+ "console",
  "futures",
  "futures-timer",
  "log",
@@ -7504,8 +7696,8 @@ dependencies = [
 
 [[package]]
 name = "sc-keystore"
-version = "33.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "25.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "array-bytes",
  "parking_lot 0.12.3",
@@ -7518,8 +7710,8 @@ dependencies = [
 
 [[package]]
 name = "sc-mixnet"
-version = "0.14.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "0.4.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "array-bytes",
  "arrayvec",
@@ -7529,7 +7721,7 @@ dependencies = [
  "futures-timer",
  "log",
  "mixnet",
- "multiaddr 0.18.1",
+ "multiaddr 0.18.2",
  "parity-scale-codec",
  "parking_lot 0.12.3",
  "sc-client-api",
@@ -7547,8 +7739,8 @@ dependencies = [
 
 [[package]]
 name = "sc-network"
-version = "0.44.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "0.34.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "array-bytes",
  "async-channel",
@@ -7598,8 +7790,8 @@ dependencies = [
 
 [[package]]
 name = "sc-network-common"
-version = "0.43.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "0.33.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "async-trait",
  "bitflags 1.3.2",
@@ -7616,8 +7808,8 @@ dependencies = [
 
 [[package]]
 name = "sc-network-gossip"
-version = "0.44.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "0.34.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "ahash 0.8.11",
  "futures",
@@ -7635,8 +7827,8 @@ dependencies = [
 
 [[package]]
 name = "sc-network-light"
-version = "0.43.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "0.33.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "array-bytes",
  "async-channel",
@@ -7656,8 +7848,8 @@ dependencies = [
 
 [[package]]
 name = "sc-network-sync"
-version = "0.43.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "0.33.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "array-bytes",
  "async-channel",
@@ -7693,8 +7885,8 @@ dependencies = [
 
 [[package]]
 name = "sc-network-transactions"
-version = "0.43.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "0.33.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "array-bytes",
  "futures",
@@ -7712,15 +7904,15 @@ dependencies = [
 
 [[package]]
 name = "sc-network-types"
-version = "0.12.1"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "0.10.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "bs58 0.5.1",
  "ed25519-dalek",
  "libp2p-identity",
  "litep2p",
  "log",
- "multiaddr 0.18.1",
+ "multiaddr 0.18.2",
  "multihash 0.19.1",
  "rand",
  "thiserror",
@@ -7729,15 +7921,15 @@ dependencies = [
 
 [[package]]
 name = "sc-offchain"
-version = "39.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "29.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "array-bytes",
  "bytes",
  "fnv",
  "futures",
  "futures-timer",
- "hyper 0.14.29",
+ "hyper 0.14.30",
  "hyper-rustls",
  "log",
  "num_cpus",
@@ -7753,7 +7945,7 @@ dependencies = [
  "sc-utils",
  "sp-api",
  "sp-core",
- "sp-externalities",
+ "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1)",
  "sp-keystore",
  "sp-offchain",
  "sp-runtime",
@@ -7763,8 +7955,8 @@ dependencies = [
 
 [[package]]
 name = "sc-proposer-metrics"
-version = "0.18.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "0.17.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "log",
  "substrate-prometheus-endpoint",
@@ -7772,11 +7964,11 @@ dependencies = [
 
 [[package]]
 name = "sc-rpc"
-version = "39.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "29.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "futures",
- "jsonrpsee 0.23.2",
+ "jsonrpsee",
  "log",
  "parity-scale-codec",
  "parking_lot 0.12.3",
@@ -7804,10 +7996,10 @@ dependencies = [
 
 [[package]]
 name = "sc-rpc-api"
-version = "0.43.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "0.33.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
- "jsonrpsee 0.23.2",
+ "jsonrpsee",
  "parity-scale-codec",
  "sc-chain-spec",
  "sc-mixnet",
@@ -7824,9 +8016,10 @@ dependencies = [
 
 [[package]]
 name = "sc-rpc-server"
-version = "16.0.2"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "11.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
+ "dyn-clone",
  "forwarded-header-value",
  "futures",
  "governor",
@@ -7834,8 +8027,9 @@ dependencies = [
  "http-body-util",
  "hyper 1.4.1",
  "ip_network",
- "jsonrpsee 0.23.2",
+ "jsonrpsee",
  "log",
+ "sc-rpc-api",
  "serde",
  "serde_json",
  "substrate-prometheus-endpoint",
@@ -7846,14 +8040,14 @@ dependencies = [
 
 [[package]]
 name = "sc-rpc-spec-v2"
-version = "0.44.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "0.34.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "array-bytes",
  "futures",
  "futures-util",
  "hex",
- "jsonrpsee 0.23.2",
+ "jsonrpsee",
  "log",
  "parity-scale-codec",
  "parking_lot 0.12.3",
@@ -7878,15 +8072,15 @@ dependencies = [
 
 [[package]]
 name = "sc-service"
-version = "0.45.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "0.35.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "async-trait",
  "directories",
  "exit-future",
  "futures",
  "futures-timer",
- "jsonrpsee 0.23.2",
+ "jsonrpsee",
  "log",
  "parity-scale-codec",
  "parking_lot 0.12.3",
@@ -7921,12 +8115,12 @@ dependencies = [
  "sp-blockchain",
  "sp-consensus",
  "sp-core",
- "sp-externalities",
+ "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1)",
  "sp-keystore",
  "sp-runtime",
  "sp-session",
  "sp-state-machine",
- "sp-storage",
+ "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1)",
  "sp-transaction-pool",
  "sp-transaction-storage-proof",
  "sp-trie",
@@ -7942,8 +8136,8 @@ dependencies = [
 
 [[package]]
 name = "sc-state-db"
-version = "0.36.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "0.30.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -7953,8 +8147,8 @@ dependencies = [
 
 [[package]]
 name = "sc-sysinfo"
-version = "37.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "27.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "derive_more",
  "futures",
@@ -7967,15 +8161,15 @@ dependencies = [
  "serde",
  "serde_json",
  "sp-core",
- "sp-crypto-hashing",
+ "sp-crypto-hashing 0.1.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1)",
  "sp-io",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1)",
 ]
 
 [[package]]
 name = "sc-telemetry"
-version = "24.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "15.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "chrono",
  "futures",
@@ -7994,19 +8188,18 @@ dependencies = [
 
 [[package]]
 name = "sc-tracing"
-version = "37.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
- "ansi_term",
  "chrono",
+ "console",
  "is-terminal",
  "lazy_static",
  "libc",
  "log",
  "parity-scale-codec",
  "parking_lot 0.12.3",
- "regex",
- "rustc-hash",
+ "rustc-hash 1.1.0",
  "sc-client-api",
  "sc-tracing-proc-macro",
  "serde",
@@ -8015,7 +8208,7 @@ dependencies = [
  "sp-core",
  "sp-rpc",
  "sp-runtime",
- "sp-tracing",
+ "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1)",
  "thiserror",
  "tracing",
  "tracing-log",
@@ -8025,18 +8218,18 @@ dependencies = [
 [[package]]
 name = "sc-tracing-proc-macro"
 version = "11.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
- "proc-macro-crate 3.1.0",
+ "proc-macro-crate 3.2.0",
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.79",
 ]
 
 [[package]]
 name = "sc-transaction-pool"
-version = "37.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "async-trait",
  "futures",
@@ -8052,9 +8245,9 @@ dependencies = [
  "sp-api",
  "sp-blockchain",
  "sp-core",
- "sp-crypto-hashing",
+ "sp-crypto-hashing 0.1.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1)",
  "sp-runtime",
- "sp-tracing",
+ "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1)",
  "sp-transaction-pool",
  "substrate-prometheus-endpoint",
  "thiserror",
@@ -8062,8 +8255,8 @@ dependencies = [
 
 [[package]]
 name = "sc-transaction-pool-api"
-version = "37.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "async-trait",
  "futures",
@@ -8078,8 +8271,8 @@ dependencies = [
 
 [[package]]
 name = "sc-utils"
-version = "17.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "14.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "async-channel",
  "futures",
@@ -8134,7 +8327,7 @@ version = "2.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2d35494501194174bda522a32605929eefc9ecf7e0a326c26db1fdd85881eb62"
 dependencies = [
- "proc-macro-crate 3.1.0",
+ "proc-macro-crate 3.2.0",
  "proc-macro2",
  "quote",
  "syn 1.0.109",
@@ -8148,11 +8341,11 @@ checksum = "f0cded6518aa0bd6c1be2b88ac81bf7044992f0f154bfbabd5ad34f43512abcb"
 
 [[package]]
 name = "schannel"
-version = "0.1.23"
+version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbc91545643bcf3a0bbb6569265615222618bdf33ce4ffbbd13c4bbd4c093534"
+checksum = "e9aaafd5a2b6e3d657ff009d82fbd630b6bd54dd4eb06f21693925cdf80f9b8b"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -8181,7 +8374,7 @@ dependencies = [
  "rand_core",
  "serde_bytes",
  "sha2 0.10.8",
- "subtle 2.6.0",
+ "subtle 2.6.1",
  "zeroize",
 ]
 
@@ -8233,7 +8426,7 @@ dependencies = [
  "generic-array 0.14.7",
  "pkcs8",
  "serdect",
- "subtle 2.6.0",
+ "subtle 2.6.1",
  "zeroize",
 ]
 
@@ -8266,11 +8459,11 @@ dependencies = [
 
 [[package]]
 name = "security-framework"
-version = "2.11.0"
+version = "2.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0"
+checksum = "897b2245f0b511c87893af39b033e5ca9cce68824c4d7e7630b5a1d339658d02"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "core-foundation",
  "core-foundation-sys",
  "libc",
@@ -8279,9 +8472,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.11.0"
+version = "2.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7"
+checksum = "ea4a292869320c0272d7bc55a5a6aafaff59b4f63404a003887b679a2e05b4b6"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -8328,9 +8521,9 @@ checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73"
 
 [[package]]
 name = "serde"
-version = "1.0.204"
+version = "1.0.210"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc76f558e0cbb2a839d37354c575f1dc3fdc6546b5be373ba43d95f231bf7c12"
+checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
 dependencies = [
  "serde_derive",
 ]
@@ -8346,29 +8539,29 @@ dependencies = [
 
 [[package]]
 name = "serde_bytes"
-version = "0.11.14"
+version = "0.11.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b8497c313fd43ab992087548117643f6fcd935cbf36f176ffda0aacf9591734"
+checksum = "387cc504cb06bb40a96c8e04e951fe01854cf6bc921053c954e4a606d9675c6a"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.204"
+version = "1.0.210"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0cd7e117be63d3c3678776753929474f3b04a43a080c744d6b0ae2a8c28e222"
+checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.79",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.127"
+version = "1.0.128"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8043c06d9f82bd7271361ed64f415fe5e12a77fdb52e573e7f06a516dea329ad"
+checksum = "6ff5456707a1de34e7e37f2a6fd3d3f808c318259cbd01ab6377795054b483d8"
 dependencies = [
  "itoa",
  "memchr",
@@ -8378,9 +8571,9 @@ dependencies = [
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.6"
+version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0"
+checksum = "87607cb1398ed59d48732e575a4c28a7a8ebf2454b964fe3f224f2afc07909e1"
 dependencies = [
  "serde",
 ]
@@ -8410,7 +8603,7 @@ dependencies = [
  "darling",
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -8423,19 +8616,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "sha-1"
-version = "0.9.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99cd6713db3cf16b6c84e06321e049a9b9f699826e16096d23bbcc44d15d51a6"
-dependencies = [
- "block-buffer 0.9.0",
- "cfg-if",
- "cpufeatures",
- "digest 0.9.0",
- "opaque-debug 0.3.1",
-]
-
 [[package]]
 name = "sha-1"
 version = "0.10.1"
@@ -8555,7 +8735,7 @@ version = "0.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cae9a3fcdadafb6d97f4c0e007e4247b114ee0f119f650c3cbf3a8b3a1479694"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
 ]
 
 [[package]]
@@ -8609,9 +8789,9 @@ dependencies = [
  "curve25519-dalek",
  "rand_core",
  "ring 0.17.8",
- "rustc_version 0.4.0",
+ "rustc_version 0.4.1",
  "sha2 0.10.8",
- "subtle 2.6.0",
+ "subtle 2.6.1",
 ]
 
 [[package]]
@@ -8634,22 +8814,6 @@ dependencies = [
  "windows-sys 0.52.0",
 ]
 
-[[package]]
-name = "soketto"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41d1c5305e39e09653383c2c7244f2f78b3bcae37cf50c64cb4789c9f5096ec2"
-dependencies = [
- "base64 0.13.1",
- "bytes",
- "futures",
- "http 0.2.12",
- "httparse",
- "log",
- "rand",
- "sha-1 0.9.8",
-]
-
 [[package]]
 name = "soketto"
 version = "0.8.0"
@@ -8668,8 +8832,8 @@ dependencies = [
 
 [[package]]
 name = "sp-api"
-version = "34.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "26.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "docify",
  "hash-db",
@@ -8678,10 +8842,10 @@ dependencies = [
  "scale-info",
  "sp-api-proc-macro",
  "sp-core",
- "sp-externalities",
+ "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1)",
  "sp-metadata-ir",
  "sp-runtime",
- "sp-runtime-interface",
+ "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1)",
  "sp-state-machine",
  "sp-trie",
  "sp-version",
@@ -8690,22 +8854,22 @@ dependencies = [
 
 [[package]]
 name = "sp-api-proc-macro"
-version = "20.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "15.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "Inflector",
  "blake2 0.10.6",
  "expander",
- "proc-macro-crate 3.1.0",
+ "proc-macro-crate 3.2.0",
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.79",
 ]
 
 [[package]]
 name = "sp-application-crypto"
-version = "38.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "30.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -8716,8 +8880,8 @@ dependencies = [
 
 [[package]]
 name = "sp-arithmetic"
-version = "26.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "23.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "docify",
  "integer-sqrt",
@@ -8728,10 +8892,28 @@ dependencies = [
  "static_assertions",
 ]
 
+[[package]]
+name = "sp-ark-bls12-381"
+version = "0.4.2"
+source = "git+https://github.com/paritytech/arkworks-substrate#caa2eed74beb885dd07c7db5f916f2281dad818f"
+dependencies = [
+ "ark-bls12-381-ext",
+ "sp-crypto-ec-utils",
+]
+
+[[package]]
+name = "sp-ark-ed-on-bls12-381-bandersnatch"
+version = "0.4.2"
+source = "git+https://github.com/paritytech/arkworks-substrate#caa2eed74beb885dd07c7db5f916f2281dad818f"
+dependencies = [
+ "ark-ed-on-bls12-381-bandersnatch-ext",
+ "sp-crypto-ec-utils",
+]
+
 [[package]]
 name = "sp-block-builder"
-version = "34.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "26.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "sp-api",
  "sp-inherents",
@@ -8740,8 +8922,8 @@ dependencies = [
 
 [[package]]
 name = "sp-blockchain"
-version = "37.0.1"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "futures",
  "parity-scale-codec",
@@ -8759,8 +8941,8 @@ dependencies = [
 
 [[package]]
 name = "sp-consensus"
-version = "0.40.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "0.32.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "async-trait",
  "futures",
@@ -8774,8 +8956,8 @@ dependencies = [
 
 [[package]]
 name = "sp-consensus-aura"
-version = "0.40.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "0.32.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -8790,8 +8972,8 @@ dependencies = [
 
 [[package]]
 name = "sp-consensus-grandpa"
-version = "21.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "13.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "finality-grandpa",
  "log",
@@ -8807,8 +8989,8 @@ dependencies = [
 
 [[package]]
 name = "sp-consensus-slots"
-version = "0.40.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "0.32.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -8818,10 +9000,11 @@ dependencies = [
 
 [[package]]
 name = "sp-core"
-version = "34.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "array-bytes",
+ "bandersnatch_vrfs",
  "bitflags 1.3.2",
  "blake2 0.10.6",
  "bounded-collections",
@@ -8848,12 +9031,12 @@ dependencies = [
  "secp256k1",
  "secrecy",
  "serde",
- "sp-crypto-hashing",
- "sp-debug-derive",
- "sp-externalities",
- "sp-runtime-interface",
- "sp-std",
- "sp-storage",
+ "sp-crypto-hashing 0.1.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1)",
+ "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1)",
+ "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1)",
+ "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1)",
+ "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1)",
  "ss58-registry",
  "substrate-bip39",
  "thiserror",
@@ -8862,10 +9045,44 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "sp-crypto-ec-utils"
+version = "0.10.0"
+source = "git+https://github.com/paritytech/polkadot-sdk#8614dc0e055d06de4a3774ac1da0a422b33f34e2"
+dependencies = [
+ "ark-bls12-377",
+ "ark-bls12-377-ext",
+ "ark-bls12-381",
+ "ark-bls12-381-ext",
+ "ark-bw6-761",
+ "ark-bw6-761-ext",
+ "ark-ec",
+ "ark-ed-on-bls12-377",
+ "ark-ed-on-bls12-377-ext",
+ "ark-ed-on-bls12-381-bandersnatch",
+ "ark-ed-on-bls12-381-bandersnatch-ext",
+ "ark-scale",
+ "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk)",
+]
+
+[[package]]
+name = "sp-crypto-hashing"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bc9927a7f81334ed5b8a98a4a978c81324d12bd9713ec76b5c68fd410174c5eb"
+dependencies = [
+ "blake2b_simd",
+ "byteorder",
+ "digest 0.10.7",
+ "sha2 0.10.8",
+ "sha3",
+ "twox-hash",
+]
+
 [[package]]
 name = "sp-crypto-hashing"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "blake2b_simd",
  "byteorder",
@@ -8878,17 +9095,17 @@ dependencies = [
 [[package]]
 name = "sp-crypto-hashing-proc-macro"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "quote",
- "sp-crypto-hashing",
- "syn 2.0.71",
+ "sp-crypto-hashing 0.1.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1)",
+ "syn 2.0.79",
 ]
 
 [[package]]
 name = "sp-database"
 version = "10.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "kvdb",
  "parking_lot 0.12.3",
@@ -8897,27 +9114,47 @@ dependencies = [
 [[package]]
 name = "sp-debug-derive"
 version = "14.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.79",
+]
+
+[[package]]
+name = "sp-debug-derive"
+version = "14.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk#8614dc0e055d06de4a3774ac1da0a422b33f34e2"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.79",
 ]
 
 [[package]]
 name = "sp-externalities"
-version = "0.29.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "0.25.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
+dependencies = [
+ "environmental",
+ "parity-scale-codec",
+ "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1)",
+]
+
+[[package]]
+name = "sp-externalities"
+version = "0.25.0"
+source = "git+https://github.com/paritytech/polkadot-sdk#8614dc0e055d06de4a3774ac1da0a422b33f34e2"
 dependencies = [
  "environmental",
  "parity-scale-codec",
- "sp-storage",
+ "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk)",
 ]
 
 [[package]]
 name = "sp-genesis-builder"
-version = "0.15.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "0.8.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -8928,8 +9165,8 @@ dependencies = [
 
 [[package]]
 name = "sp-inherents"
-version = "34.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "26.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "async-trait",
  "impl-trait-for-tuples",
@@ -8941,8 +9178,8 @@ dependencies = [
 
 [[package]]
 name = "sp-io"
-version = "38.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "30.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "bytes",
  "docify",
@@ -8954,12 +9191,12 @@ dependencies = [
  "rustversion",
  "secp256k1",
  "sp-core",
- "sp-crypto-hashing",
- "sp-externalities",
+ "sp-crypto-hashing 0.1.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1)",
+ "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1)",
  "sp-keystore",
- "sp-runtime-interface",
+ "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1)",
  "sp-state-machine",
- "sp-tracing",
+ "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1)",
  "sp-trie",
  "tracing",
  "tracing-core",
@@ -8967,29 +9204,29 @@ dependencies = [
 
 [[package]]
 name = "sp-keyring"
-version = "39.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "31.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "sp-core",
  "sp-runtime",
- "strum 0.26.2",
+ "strum 0.26.3",
 ]
 
 [[package]]
 name = "sp-keystore"
-version = "0.40.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "0.34.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "parity-scale-codec",
  "parking_lot 0.12.3",
  "sp-core",
- "sp-externalities",
+ "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1)",
 ]
 
 [[package]]
 name = "sp-maybe-compressed-blob"
 version = "11.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "thiserror",
  "zstd 0.12.4",
@@ -8997,8 +9234,8 @@ dependencies = [
 
 [[package]]
 name = "sp-metadata-ir"
-version = "0.7.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "0.6.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "frame-metadata",
  "parity-scale-codec",
@@ -9007,8 +9244,8 @@ dependencies = [
 
 [[package]]
 name = "sp-mixnet"
-version = "0.12.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "0.4.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -9018,8 +9255,8 @@ dependencies = [
 
 [[package]]
 name = "sp-offchain"
-version = "34.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "26.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "sp-api",
  "sp-core",
@@ -9029,7 +9266,7 @@ dependencies = [
 [[package]]
 name = "sp-panic-handler"
 version = "13.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "backtrace",
  "lazy_static",
@@ -9038,18 +9275,18 @@ dependencies = [
 
 [[package]]
 name = "sp-rpc"
-version = "32.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "26.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
- "rustc-hash",
+ "rustc-hash 1.1.0",
  "serde",
  "sp-core",
 ]
 
 [[package]]
 name = "sp-runtime"
-version = "39.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "31.0.1"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "docify",
  "either",
@@ -9067,47 +9304,79 @@ dependencies = [
  "sp-arithmetic",
  "sp-core",
  "sp-io",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1)",
  "sp-weights",
  "tracing",
 ]
 
 [[package]]
 name = "sp-runtime-interface"
-version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "24.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
+dependencies = [
+ "bytes",
+ "impl-trait-for-tuples",
+ "parity-scale-codec",
+ "polkavm-derive",
+ "primitive-types",
+ "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1)",
+ "sp-runtime-interface-proc-macro 17.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1)",
+ "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1)",
+ "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1)",
+ "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1)",
+ "static_assertions",
+]
+
+[[package]]
+name = "sp-runtime-interface"
+version = "24.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk#8614dc0e055d06de4a3774ac1da0a422b33f34e2"
 dependencies = [
  "bytes",
  "impl-trait-for-tuples",
  "parity-scale-codec",
  "polkavm-derive",
  "primitive-types",
- "sp-externalities",
- "sp-runtime-interface-proc-macro",
- "sp-std",
- "sp-storage",
- "sp-tracing",
- "sp-wasm-interface",
+ "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk)",
+ "sp-runtime-interface-proc-macro 17.0.0 (git+https://github.com/paritytech/polkadot-sdk)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk)",
+ "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk)",
+ "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk)",
+ "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk)",
  "static_assertions",
 ]
 
 [[package]]
 name = "sp-runtime-interface-proc-macro"
-version = "18.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "17.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
+dependencies = [
+ "Inflector",
+ "expander",
+ "proc-macro-crate 3.2.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.79",
+]
+
+[[package]]
+name = "sp-runtime-interface-proc-macro"
+version = "17.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk#8614dc0e055d06de4a3774ac1da0a422b33f34e2"
 dependencies = [
  "Inflector",
  "expander",
- "proc-macro-crate 3.1.0",
+ "proc-macro-crate 3.2.0",
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.79",
 ]
 
 [[package]]
 name = "sp-session"
-version = "35.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "27.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -9120,8 +9389,8 @@ dependencies = [
 
 [[package]]
 name = "sp-staking"
-version = "34.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "26.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -9133,8 +9402,8 @@ dependencies = [
 
 [[package]]
 name = "sp-state-machine"
-version = "0.43.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "0.35.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "hash-db",
  "log",
@@ -9143,7 +9412,7 @@ dependencies = [
  "rand",
  "smallvec",
  "sp-core",
- "sp-externalities",
+ "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1)",
  "sp-panic-handler",
  "sp-trie",
  "thiserror",
@@ -9153,8 +9422,8 @@ dependencies = [
 
 [[package]]
 name = "sp-statement-store"
-version = "18.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "10.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "aes-gcm",
  "curve25519-dalek",
@@ -9167,10 +9436,10 @@ dependencies = [
  "sp-api",
  "sp-application-crypto",
  "sp-core",
- "sp-crypto-hashing",
- "sp-externalities",
+ "sp-crypto-hashing 0.1.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1)",
+ "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1)",
  "sp-runtime",
- "sp-runtime-interface",
+ "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1)",
  "thiserror",
  "x25519-dalek",
 ]
@@ -9178,24 +9447,41 @@ dependencies = [
 [[package]]
 name = "sp-std"
 version = "14.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
+
+[[package]]
+name = "sp-std"
+version = "14.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk#8614dc0e055d06de4a3774ac1da0a422b33f34e2"
+
+[[package]]
+name = "sp-storage"
+version = "19.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
+dependencies = [
+ "impl-serde",
+ "parity-scale-codec",
+ "ref-cast",
+ "serde",
+ "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1)",
+]
 
 [[package]]
 name = "sp-storage"
-version = "21.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "19.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk#8614dc0e055d06de4a3774ac1da0a422b33f34e2"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
  "ref-cast",
  "serde",
- "sp-debug-derive",
+ "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk)",
 ]
 
 [[package]]
 name = "sp-timestamp"
-version = "34.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "26.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -9206,8 +9492,19 @@ dependencies = [
 
 [[package]]
 name = "sp-tracing"
-version = "17.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "16.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
+dependencies = [
+ "parity-scale-codec",
+ "tracing",
+ "tracing-core",
+ "tracing-subscriber",
+]
+
+[[package]]
+name = "sp-tracing"
+version = "16.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk#8614dc0e055d06de4a3774ac1da0a422b33f34e2"
 dependencies = [
  "parity-scale-codec",
  "tracing",
@@ -9217,8 +9514,8 @@ dependencies = [
 
 [[package]]
 name = "sp-transaction-pool"
-version = "34.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "26.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "sp-api",
  "sp-runtime",
@@ -9226,8 +9523,8 @@ dependencies = [
 
 [[package]]
 name = "sp-transaction-storage-proof"
-version = "34.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "26.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -9240,8 +9537,8 @@ dependencies = [
 
 [[package]]
 name = "sp-trie"
-version = "37.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "29.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "ahash 0.8.11",
  "hash-db",
@@ -9254,7 +9551,7 @@ dependencies = [
  "scale-info",
  "schnellru",
  "sp-core",
- "sp-externalities",
+ "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1)",
  "thiserror",
  "tracing",
  "trie-db",
@@ -9263,8 +9560,8 @@ dependencies = [
 
 [[package]]
 name = "sp-version"
-version = "37.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "29.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -9273,26 +9570,26 @@ dependencies = [
  "serde",
  "sp-crypto-hashing-proc-macro",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1)",
  "sp-version-proc-macro",
  "thiserror",
 ]
 
 [[package]]
 name = "sp-version-proc-macro"
-version = "14.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "13.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "parity-scale-codec",
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.79",
 ]
 
 [[package]]
 name = "sp-wasm-interface"
-version = "21.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "20.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "anyhow",
  "impl-trait-for-tuples",
@@ -9301,10 +9598,21 @@ dependencies = [
  "wasmtime",
 ]
 
+[[package]]
+name = "sp-wasm-interface"
+version = "20.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk#8614dc0e055d06de4a3774ac1da0a422b33f34e2"
+dependencies = [
+ "anyhow",
+ "impl-trait-for-tuples",
+ "log",
+ "parity-scale-codec",
+]
+
 [[package]]
 name = "sp-weights"
-version = "31.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "27.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "bounded-collections",
  "parity-scale-codec",
@@ -9312,7 +9620,7 @@ dependencies = [
  "serde",
  "smallvec",
  "sp-arithmetic",
- "sp-debug-derive",
+ "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1)",
 ]
 
 [[package]]
@@ -9348,9 +9656,9 @@ dependencies = [
 
 [[package]]
 name = "ss58-registry"
-version = "1.47.0"
+version = "1.50.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4743ce898933fbff7bbf414f497c459a782d496269644b3d650a398ae6a487ba"
+checksum = "43fce22ed1df64d04b262351c8f9d5c6da4f76f79f25ad15529792f893fad25d"
 dependencies = [
  "Inflector",
  "num-format",
@@ -9416,7 +9724,7 @@ dependencies = [
  "openssl-sys",
  "sctp-proto",
  "serde",
- "sha-1 0.10.1",
+ "sha-1",
  "thiserror",
  "tracing",
 ]
@@ -9435,9 +9743,9 @@ checksum = "063e6045c0e62079840579a7e47a355ae92f60eb74daaf156fb1e84ba164e63f"
 
 [[package]]
 name = "strum"
-version = "0.26.2"
+version = "0.26.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29"
+checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06"
 dependencies = [
  "strum_macros 0.26.4",
 ]
@@ -9465,13 +9773,13 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 2.0.71",
+ "syn 2.0.79",
 ]
 
 [[package]]
 name = "substrate-bip39"
-version = "0.6.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "0.4.7"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "hmac 0.12.1",
  "pbkdf2",
@@ -9483,7 +9791,7 @@ dependencies = [
 [[package]]
 name = "substrate-build-script-utils"
 version = "11.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 
 [[package]]
 name = "substrate-fixed"
@@ -9498,13 +9806,13 @@ dependencies = [
 
 [[package]]
 name = "substrate-frame-rpc-system"
-version = "38.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "docify",
  "frame-system-rpc-runtime-api",
  "futures",
- "jsonrpsee 0.23.2",
+ "jsonrpsee",
  "log",
  "parity-scale-codec",
  "sc-rpc-api",
@@ -9519,7 +9827,7 @@ dependencies = [
 [[package]]
 name = "substrate-prometheus-endpoint"
 version = "0.17.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "http-body-util",
  "hyper 1.4.1",
@@ -9532,8 +9840,8 @@ dependencies = [
 
 [[package]]
 name = "substrate-wasm-builder"
-version = "24.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.15.2-rc1#d6f482d5593c3e791d7b3e92e95aa3c734e23794"
+version = "17.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1#a427d8fb677b62635dfb78a6e530facdd2c362ec"
 dependencies = [
  "array-bytes",
  "build-helper",
@@ -9541,6 +9849,7 @@ dependencies = [
  "console",
  "filetime",
  "frame-metadata",
+ "jobserver",
  "merkleized-metadata",
  "parity-scale-codec",
  "parity-wasm",
@@ -9549,11 +9858,11 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-maybe-compressed-blob",
- "sp-tracing",
+ "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.16.0-rc1)",
  "sp-version",
- "strum 0.26.2",
+ "strum 0.26.3",
  "tempfile",
- "toml 0.8.14",
+ "toml 0.8.19",
  "walkdir",
  "wasm-opt",
 ]
@@ -9568,7 +9877,7 @@ dependencies = [
  "quote",
  "rayon",
  "subtensor-linting",
- "syn 2.0.71",
+ "syn 2.0.79",
  "walkdir",
 ]
 
@@ -9576,7 +9885,7 @@ dependencies = [
 name = "subtensor-custom-rpc"
 version = "0.0.2"
 dependencies = [
- "jsonrpsee 0.22.5",
+ "jsonrpsee",
  "pallet-subtensor",
  "parity-scale-codec",
  "serde",
@@ -9602,8 +9911,9 @@ name = "subtensor-linting"
 version = "0.1.0"
 dependencies = [
  "proc-macro2",
+ "procedural-fork",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -9613,7 +9923,7 @@ dependencies = [
  "ahash 0.8.11",
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -9623,7 +9933,7 @@ dependencies = [
  "anyhow",
  "clap",
  "semver 1.0.23",
- "toml_edit 0.22.14",
+ "toml_edit",
 ]
 
 [[package]]
@@ -9634,9 +9944,9 @@ checksum = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee"
 
 [[package]]
 name = "subtle"
-version = "2.6.0"
+version = "2.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0d0208408ba0c3df17ed26eb06992cb1a1268d41b2c0e12e65203fbe3972cee5"
+checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
 
 [[package]]
 name = "syn"
@@ -9651,9 +9961,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.71"
+version = "2.0.79"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b146dcf730474b4bcd16c311627b31ede9ab149045db4d6088b3becaea046462"
+checksum = "89132cd0bf050864e1d38dc3bbc07a0eb8e7530af26344d3d2bbbef83499f590"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -9680,7 +9990,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -9712,20 +10022,21 @@ checksum = "55937e1799185b12863d447f42597ed69d9928686b8d88a1df17376a097d8369"
 
 [[package]]
 name = "target-lexicon"
-version = "0.12.14"
+version = "0.12.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1fc403891a21bcfb7c37834ba66a547a8f402146eba7265b5a6d88059c9ff2f"
+checksum = "61c41af27dd6d1e27b1b16b489db798443478cef1f06a660c96db617ba5de3b1"
 
 [[package]]
 name = "tempfile"
-version = "3.10.1"
+version = "3.13.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
+checksum = "f0f2c9fc62d0beef6951ccffd757e241266a2c833136efbe35af6cd2567dca5b"
 dependencies = [
  "cfg-if",
  "fastrand",
- "rustix 0.38.34",
- "windows-sys 0.52.0",
+ "once_cell",
+ "rustix 0.38.37",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -9739,12 +10050,12 @@ dependencies = [
 
 [[package]]
 name = "terminal_size"
-version = "0.3.0"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7"
+checksum = "4f599bd7ca042cfdf8f4512b277c02ba102247820f9d9d4a9f521f496751a6ef"
 dependencies = [
- "rustix 0.38.34",
- "windows-sys 0.48.0",
+ "rustix 0.38.37",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -9755,22 +10066,22 @@ checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76"
 
 [[package]]
 name = "thiserror"
-version = "1.0.61"
+version = "1.0.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709"
+checksum = "d50af8abc119fb8bb6dbabcfa89656f46f84aa0ac7688088608076ad2b459a84"
 dependencies = [
  "thiserror-impl",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.61"
+version = "1.0.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
+checksum = "08904e7672f5eb876eaaf87e0ce17857500934f4981c4a0ab2b4aa98baac7fc3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -9850,9 +10161,9 @@ dependencies = [
 
 [[package]]
 name = "tinyvec"
-version = "1.6.0"
+version = "1.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
+checksum = "445e881f4f6d382d5f27c034e25eb92edd7c784ceab92a0937db7f2e9471b938"
 dependencies = [
  "tinyvec_macros",
 ]
@@ -9865,32 +10176,31 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.38.0"
+version = "1.40.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a"
+checksum = "e2b070231665d27ad9ec9b8df639893f46727666c6767db40317fbe920a5d998"
 dependencies = [
  "backtrace",
  "bytes",
  "libc",
  "mio",
- "num_cpus",
  "parking_lot 0.12.3",
  "pin-project-lite",
  "signal-hook-registry",
  "socket2 0.5.7",
  "tokio-macros",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "tokio-macros"
-version = "2.3.0"
+version = "2.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a"
+checksum = "693d596312e88961bc67d7f1f97af8a70227d9f90c31bba5806eec004978d752"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -9905,9 +10215,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-stream"
-version = "0.1.15"
+version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "267ac89e0bec6e691e5813911606935d77c476ff49024f98abcea3e7b15e37af"
+checksum = "4f4e6ce100d0eb49a2734f8c0812bcd324cf357d21810932c5df6b96ef2b86f1"
 dependencies = [
  "futures-core",
  "pin-project-lite",
@@ -9932,9 +10242,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.7.11"
+version = "0.7.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1"
+checksum = "61e7c3654c13bcd040d4a03abee2c75b1d14a37b423cf5a813ceae1cc903ec6a"
 dependencies = [
  "bytes",
  "futures-core",
@@ -9955,47 +10265,36 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.8.14"
+version = "0.8.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335"
+checksum = "a1ed1f98e3fdc28d6d910e6737ae6ab1a93bf1985935a1193e68f93eeb68d24e"
 dependencies = [
  "serde",
  "serde_spanned",
  "toml_datetime",
- "toml_edit 0.22.14",
+ "toml_edit",
 ]
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.6"
+version = "0.6.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf"
+checksum = "0dd7358ecb8fc2f8d014bf86f6f638ce72ba252a2c3a2572f2a795f1d23efb41"
 dependencies = [
  "serde",
 ]
 
 [[package]]
 name = "toml_edit"
-version = "0.21.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
-dependencies = [
- "indexmap 2.2.6",
- "toml_datetime",
- "winnow 0.5.40",
-]
-
-[[package]]
-name = "toml_edit"
-version = "0.22.14"
+version = "0.22.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38"
+checksum = "4ae48d6208a266e853d946088ed816055e556cc6028c5e8e2b84d9fa5dd7c7f5"
 dependencies = [
- "indexmap 2.2.6",
+ "indexmap 2.6.0",
  "serde",
  "serde_spanned",
  "toml_datetime",
- "winnow 0.6.13",
+ "winnow",
 ]
 
 [[package]]
@@ -10008,7 +10307,6 @@ dependencies = [
  "futures-util",
  "pin-project",
  "pin-project-lite",
- "tokio",
  "tower-layer",
  "tower-service",
  "tracing",
@@ -10020,7 +10318,7 @@ version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e9cd434a998747dd2c4276bc96ee2e0c7a2eadf3cae88e52be55a05fa9053f5"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "bytes",
  "http 1.1.0",
  "http-body 1.0.1",
@@ -10032,15 +10330,15 @@ dependencies = [
 
 [[package]]
 name = "tower-layer"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c20c8dbed6283a09604c3e69b4b7eeb54e298b8a600d4d5ecb5ad39de609f1d0"
+checksum = "121c2a6cda46980bb0fcd1647ffaf6cd3fc79a013de288782836f6df9c48780e"
 
 [[package]]
 name = "tower-service"
-version = "0.3.2"
+version = "0.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6bc1c9ce2b5135ac7f93c72918fc37feb872bdc6a5533a8b85eb4b86bfdae52"
+checksum = "8df9b6e13f2d32c91b9bd719c00d1958837bc7dec474d94952798cc8e69eeec3"
 
 [[package]]
 name = "tracing"
@@ -10062,7 +10360,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -10110,6 +10408,7 @@ dependencies = [
  "sharded-slab",
  "smallvec",
  "thread_local",
+ "time",
  "tracing",
  "tracing-core",
  "tracing-log",
@@ -10171,7 +10470,7 @@ dependencies = [
  "async-trait",
  "cfg-if",
  "data-encoding",
- "enum-as-inner 0.6.0",
+ "enum-as-inner 0.6.1",
  "futures-channel",
  "futures-io",
  "futures-util",
@@ -10269,9 +10568,9 @@ checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825"
 
 [[package]]
 name = "ucd-trie"
-version = "0.1.6"
+version = "0.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ed646292ffc8188ef8ea4d1e0e0150fb15a5c2e12ad9b8fc191ae7a8a7f3c4b9"
+checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971"
 
 [[package]]
 name = "uint"
@@ -10287,15 +10586,15 @@ dependencies = [
 
 [[package]]
 name = "unicode-bidi"
-version = "0.3.15"
+version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08f95100a766bf4f8f28f90d77e0a5461bbdb219042e7679bebe79004fed8d75"
+checksum = "5ab17db44d7388991a428b2ee655ce0c212e862eff1768a455c58f9aad6e7893"
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.12"
+version = "1.0.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
+checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
 
 [[package]]
 name = "unicode-normalization"
@@ -10308,15 +10607,15 @@ dependencies = [
 
 [[package]]
 name = "unicode-width"
-version = "0.1.13"
+version = "0.1.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d"
+checksum = "7dd6e30e90baa6f72411720665d41d89b9a3d039dc45b8faea1ddd07f617f6af"
 
 [[package]]
 name = "unicode-xid"
-version = "0.2.4"
+version = "0.2.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f962df74c8c05a667b5ee8bcf162993134c104e96440b663c8daa176dc772d8c"
+checksum = "ebc1c04c71510c7f702b52b7c350734c9ff1295c464a03335b00bb84fc54f853"
 
 [[package]]
 name = "universal-hash"
@@ -10325,7 +10624,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea"
 dependencies = [
  "crypto-common",
- "subtle 2.6.0",
+ "subtle 2.6.1",
 ]
 
 [[package]]
@@ -10399,9 +10698,9 @@ checksum = "accd4ea62f7bb7a82fe23066fb0957d48ef677f6eeb8215f372f52e48bb32426"
 
 [[package]]
 name = "version_check"
-version = "0.9.4"
+version = "0.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49874b5167b65d7193b8aba1567f5c7d93d001cafc34600cee003eda787e483f"
+checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a"
 
 [[package]]
 name = "void"
@@ -10460,34 +10759,35 @@ checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
 
 [[package]]
 name = "wasm-bindgen"
-version = "0.2.92"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4be2531df63900aeb2bca0daaaddec08491ee64ceecbee5076636a3b026795a8"
+checksum = "a82edfc16a6c469f5f44dc7b571814045d60404b55a0ee849f9bcfa2e63dd9b5"
 dependencies = [
  "cfg-if",
+ "once_cell",
  "wasm-bindgen-macro",
 ]
 
 [[package]]
 name = "wasm-bindgen-backend"
-version = "0.2.92"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "614d787b966d3989fa7bb98a654e369c762374fd3213d212cfc0251257e747da"
+checksum = "9de396da306523044d3302746f1208fa71d7532227f15e347e2d93e4145dd77b"
 dependencies = [
  "bumpalo",
  "log",
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.79",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-futures"
-version = "0.4.42"
+version = "0.4.43"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "76bc14366121efc8dbb487ab05bcc9d346b3b5ec0eaa76e46594cabbe51762c0"
+checksum = "61e9300f63a621e96ed275155c108eb6f843b6a26d053f122ab69724559dc8ed"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -10497,9 +10797,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro"
-version = "0.2.92"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a1f8823de937b71b9460c0c34e25f3da88250760bec0ebac694b49997550d726"
+checksum = "585c4c91a46b072c92e908d99cb1dcdf95c5218eeb6f3bf1efa991ee7a68cccf"
 dependencies = [
  "quote",
  "wasm-bindgen-macro-support",
@@ -10507,22 +10807,22 @@ dependencies = [
 
 [[package]]
 name = "wasm-bindgen-macro-support"
-version = "0.2.92"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
+checksum = "afc340c74d9005395cf9dd098506f7f44e38f2b4a21c6aaacf9a105ea5e1e836"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.79",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
 
 [[package]]
 name = "wasm-bindgen-shared"
-version = "0.2.92"
+version = "0.2.93"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
+checksum = "c62a0a307cb4a311d3a07867860911ca130c3494e8c2719593806c08bc5d0484"
 
 [[package]]
 name = "wasm-instrument"
@@ -10795,9 +11095,9 @@ dependencies = [
 
 [[package]]
 name = "web-sys"
-version = "0.3.69"
+version = "0.3.70"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77afa9a11836342370f4817622a2f0f418b134426d91a82dfb48f532d2ec13ef"
+checksum = "26fdeaafd9bd129f65e7c031593c24d62186301e0c72c8978fa1678be7d532c0"
 dependencies = [
  "js-sys",
  "wasm-bindgen",
@@ -10828,14 +11128,14 @@ dependencies = [
  "either",
  "home",
  "once_cell",
- "rustix 0.38.34",
+ "rustix 0.38.37",
 ]
 
 [[package]]
 name = "wide"
-version = "0.7.24"
+version = "0.7.28"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a040b111774ab63a19ef46bbc149398ab372b4ccdcfd719e9814dbd7dfd76c8"
+checksum = "b828f995bf1e9622031f8009f8481a85406ce1f4d4588ff746d872043e855690"
 dependencies = [
  "bytemuck",
  "safe_arch",
@@ -10865,11 +11165,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 
 [[package]]
 name = "winapi-util"
-version = "0.1.8"
+version = "0.1.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b"
+checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
 dependencies = [
- "windows-sys 0.52.0",
+ "windows-sys 0.59.0",
 ]
 
 [[package]]
@@ -10903,7 +11203,7 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "33ab640c8d7e35bf8ba19b884ba838ceb4fba93a4e8c65a9059d08afcfc683d9"
 dependencies = [
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -10945,7 +11245,16 @@ version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
 dependencies = [
- "windows-targets 0.52.5",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.59.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
+dependencies = [
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -10980,18 +11289,18 @@ dependencies = [
 
 [[package]]
 name = "windows-targets"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f0713a46559409d202e70e28227288446bf7841d3211583a4b53e3f6d96e7eb"
+checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
 dependencies = [
- "windows_aarch64_gnullvm 0.52.5",
- "windows_aarch64_msvc 0.52.5",
- "windows_i686_gnu 0.52.5",
+ "windows_aarch64_gnullvm 0.52.6",
+ "windows_aarch64_msvc 0.52.6",
+ "windows_i686_gnu 0.52.6",
  "windows_i686_gnullvm",
- "windows_i686_msvc 0.52.5",
- "windows_x86_64_gnu 0.52.5",
- "windows_x86_64_gnullvm 0.52.5",
- "windows_x86_64_msvc 0.52.5",
+ "windows_i686_msvc 0.52.6",
+ "windows_x86_64_gnu 0.52.6",
+ "windows_x86_64_gnullvm 0.52.6",
+ "windows_x86_64_msvc 0.52.6",
 ]
 
 [[package]]
@@ -11008,9 +11317,9 @@ checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
 
 [[package]]
 name = "windows_aarch64_gnullvm"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7088eed71e8b8dda258ecc8bac5fb1153c5cffaf2578fc8ff5d61e23578d3263"
+checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 
 [[package]]
 name = "windows_aarch64_msvc"
@@ -11026,9 +11335,9 @@ checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
 
 [[package]]
 name = "windows_aarch64_msvc"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9985fd1504e250c615ca5f281c3f7a6da76213ebd5ccc9561496568a2752afb6"
+checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
 [[package]]
 name = "windows_i686_gnu"
@@ -11044,15 +11353,15 @@ checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
 
 [[package]]
 name = "windows_i686_gnu"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "88ba073cf16d5372720ec942a8ccbf61626074c6d4dd2e745299726ce8b89670"
+checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
 
 [[package]]
 name = "windows_i686_gnullvm"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87f4261229030a858f36b459e748ae97545d6f1ec60e5e0d6a3d32e0dc232ee9"
+checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 
 [[package]]
 name = "windows_i686_msvc"
@@ -11068,9 +11377,9 @@ checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
 
 [[package]]
 name = "windows_i686_msvc"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db3c2bf3d13d5b658be73463284eaf12830ac9a26a90c717b7f771dfe97487bf"
+checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
 [[package]]
 name = "windows_x86_64_gnu"
@@ -11086,9 +11395,9 @@ checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
 
 [[package]]
 name = "windows_x86_64_gnu"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e4246f76bdeff09eb48875a0fd3e2af6aada79d409d33011886d3e1581517d9"
+checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
@@ -11104,9 +11413,9 @@ checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
 
 [[package]]
 name = "windows_x86_64_gnullvm"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "852298e482cd67c356ddd9570386e2862b5673c85bd5f88df9ab6802b334c596"
+checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 
 [[package]]
 name = "windows_x86_64_msvc"
@@ -11122,24 +11431,15 @@ checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
 
 [[package]]
 name = "windows_x86_64_msvc"
-version = "0.52.5"
+version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bec47e5bfd1bff0eeaf6d8b485cc1074891a197ab4225d504cb7a1ab88b02bf0"
+checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
 
 [[package]]
 name = "winnow"
-version = "0.5.40"
+version = "0.6.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f593a95398737aeed53e489c785df13f3618e41dbcd6718c6addbf1395aa6876"
-dependencies = [
- "memchr",
-]
-
-[[package]]
-name = "winnow"
-version = "0.6.13"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1"
+checksum = "36c1fec1a2bb5866f07c25f68c26e565c4c200aebb96d7e55710c19d3e8ac49b"
 dependencies = [
  "memchr",
 ]
@@ -11211,9 +11511,9 @@ dependencies = [
 
 [[package]]
 name = "xml-rs"
-version = "0.8.21"
+version = "0.8.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "539a77ee7c0de333dcc6da69b177380a0b81e0dacfa4f7344c465a36871ee601"
+checksum = "af4e2e2f7cba5a093896c1e150fbfe177d1883e7448200efb81d40b9d339ef26"
 
 [[package]]
 name = "xmltree"
@@ -11250,22 +11550,23 @@ dependencies = [
 
 [[package]]
 name = "zerocopy"
-version = "0.7.34"
+version = "0.7.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087"
+checksum = "1b9b4fd18abc82b8136838da5d50bae7bdea537c574d8dc1a34ed098d6c166f0"
 dependencies = [
+ "byteorder",
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.34"
+version = "0.7.35"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b"
+checksum = "fa4f8080344d4671fb4e831a13ad1e68092748387dfc4f55e356242fae12ce3e"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -11285,7 +11586,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.71",
+ "syn 2.0.79",
 ]
 
 [[package]]
@@ -11328,9 +11629,9 @@ dependencies = [
 
 [[package]]
 name = "zstd-sys"
-version = "2.0.11+zstd.1.5.6"
+version = "2.0.13+zstd.1.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75652c55c0b6f3e6f12eb786fe1bc960396bf05a1eb3bf1f3691c3610ac2e6d4"
+checksum = "38ff0f21cfee8f97d94cef41359e0c89aa6113028ab0291aa8ca0038995a95aa"
 dependencies = [
  "cc",
  "pkg-config",
diff --git a/Cargo.toml b/Cargo.toml
index a185567c5..54de1b0a0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -33,7 +33,9 @@ members = [
     "support/tools",
     "support/macros",
     "support/linting",
+    "support/procedural-fork",
 ]
+exclude = ["support/procedural-fork"]
 resolver = "2"
 
 [workspace.lints.clippy]
@@ -41,6 +43,7 @@ indexing-slicing = "deny"
 arithmetic-side-effects = "deny"
 type_complexity = "allow"
 unwrap-used = "deny"
+manual_inspect = "allow"
 
 [workspace.dependencies]
 cargo-husky = { version = "1", default-features = false }
@@ -50,7 +53,7 @@ enumflags2 = "0.7.9"
 futures = "0.3.30"
 hex = { version = "0.4", default-features = false }
 hex-literal = "0.4.1"
-jsonrpsee = { version = "0.22.5", default-features = false }
+jsonrpsee = { version = "0.24.4", default-features = false }
 log = { version = "0.4.21", default-features = false }
 memmap2 = "0.9.4"
 ndarray = { version = "0.15.6", default-features = false }
@@ -77,81 +80,81 @@ walkdir = "2"
 
 subtensor-macros = { path = "support/macros" }
 
-frame-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.15.2-rc1", default-features = false }
-frame-benchmarking-cli = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.15.2-rc1" }
-frame-executive = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.15.2-rc1", default-features = false }
-frame-metadata-hash-extension = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.15.2-rc1", default-features = false }
-frame-support = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.15.2-rc1", default-features = false }
-frame-system = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.15.2-rc1", default-features = false }
-frame-system-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.15.2-rc1", default-features = false }
-frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.15.2-rc1", default-features = false }
-frame-try-runtime = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.15.2-rc1", default-features = false }
+frame-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.16.0-rc1", default-features = false }
+frame-benchmarking-cli = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.16.0-rc1" }
+frame-executive = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.16.0-rc1", default-features = false }
+frame-metadata-hash-extension = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.16.0-rc1", default-features = false }
+frame-support = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.16.0-rc1", default-features = false }
+frame-system = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.16.0-rc1", default-features = false }
+frame-system-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.16.0-rc1", default-features = false }
+frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.16.0-rc1", default-features = false }
+frame-try-runtime = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.16.0-rc1", default-features = false }
 
-pallet-aura = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.15.2-rc1", default-features = false }
-pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.15.2-rc1", default-features = false }
-pallet-grandpa = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.15.2-rc1", default-features = false }
-pallet-insecure-randomness-collective-flip = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.15.2-rc1", default-features = false }
-pallet-membership = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.15.2-rc1", default-features = false }
-pallet-multisig = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.15.2-rc1", default-features = false }
-pallet-preimage = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.15.2-rc1", default-features = false }
-pallet-proxy = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.15.2-rc1", default-features = false }
-pallet-safe-mode = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.15.2-rc1", default-features = false }
-pallet-scheduler = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.15.2-rc1", default-features = false }
-pallet-sudo = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.15.2-rc1", default-features = false }
-pallet-timestamp = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.15.2-rc1", default-features = false }
-pallet-transaction-payment = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.15.2-rc1", default-features = false }
-pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.15.2-rc1" }
-pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.15.2-rc1", default-features = false }
-pallet-utility = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.15.2-rc1", default-features = false }
+pallet-aura = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.16.0-rc1", default-features = false }
+pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.16.0-rc1", default-features = false }
+pallet-grandpa = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.16.0-rc1", default-features = false }
+pallet-insecure-randomness-collective-flip = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.16.0-rc1", default-features = false }
+pallet-membership = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.16.0-rc1", default-features = false }
+pallet-multisig = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.16.0-rc1", default-features = false }
+pallet-preimage = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.16.0-rc1", default-features = false }
+pallet-proxy = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.16.0-rc1", default-features = false }
+pallet-safe-mode = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.16.0-rc1", default-features = false }
+pallet-scheduler = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.16.0-rc1", default-features = false }
+pallet-sudo = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.16.0-rc1", default-features = false }
+pallet-timestamp = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.16.0-rc1", default-features = false }
+pallet-transaction-payment = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.16.0-rc1", default-features = false }
+pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.16.0-rc1" }
+pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.16.0-rc1", default-features = false }
+pallet-utility = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.16.0-rc1", default-features = false }
 
-sc-basic-authorship = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.15.2-rc1" }
-sc-cli = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.15.2-rc1" }
-sc-client-api = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.15.2-rc1" }
-sc-consensus = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.15.2-rc1" }
-sc-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.15.2-rc1" }
-sc-consensus-grandpa = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.15.2-rc1" }
-sc-consensus-grandpa-rpc = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.15.2-rc1" }
-sc-chain-spec-derive = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.15.2-rc1" }
-sc-chain-spec = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.15.2-rc1" }
-sc-consensus-slots = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.15.2-rc1" }
-sc-executor = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.15.2-rc1" }
-sc-keystore = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.15.2-rc1" }
-sc-network = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.15.2-rc1" }
-sc-offchain = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.15.2-rc1" }
-sc-rpc = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.15.2-rc1" }
-sc-rpc-api = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.15.2-rc1" }
-sc-service = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.15.2-rc1" }
-sc-telemetry = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.15.2-rc1" }
-sc-transaction-pool = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.15.2-rc1" }
-sc-transaction-pool-api = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.15.2-rc1" }
+sc-basic-authorship = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.16.0-rc1" }
+sc-cli = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.16.0-rc1" }
+sc-client-api = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.16.0-rc1" }
+sc-consensus = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.16.0-rc1" }
+sc-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.16.0-rc1" }
+sc-consensus-grandpa = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.16.0-rc1" }
+sc-consensus-grandpa-rpc = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.16.0-rc1" }
+sc-chain-spec-derive = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.16.0-rc1" }
+sc-chain-spec = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.16.0-rc1" }
+sc-consensus-slots = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.16.0-rc1" }
+sc-executor = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.16.0-rc1" }
+sc-keystore = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.16.0-rc1" }
+sc-network = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.16.0-rc1" }
+sc-offchain = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.16.0-rc1" }
+sc-rpc = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.16.0-rc1" }
+sc-rpc-api = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.16.0-rc1" }
+sc-service = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.16.0-rc1" }
+sc-telemetry = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.16.0-rc1" }
+sc-transaction-pool = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.16.0-rc1" }
+sc-transaction-pool-api = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.16.0-rc1" }
 
-sp-api = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.15.2-rc1", default-features = false }
-sp-block-builder = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.15.2-rc1", default-features = false }
-sp-blockchain = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.15.2-rc1", default-features = false }
-sp-consensus = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.15.2-rc1" }
-sp-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.15.2-rc1", default-features = false }
-sp-consensus-grandpa = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.15.2-rc1" }
-sp-genesis-builder = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.15.2-rc1", default-features = false }
-sp-core = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.15.2-rc1", default-features = false }
-sp-inherents = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.15.2-rc1", default-features = false }
-sp-io = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.15.2-rc1", default-features = false }
-sp-keyring = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.15.2-rc1" }
-sp-offchain = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.15.2-rc1", default-features = false }
-sp-rpc = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.15.2-rc1", default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.15.2-rc1", default-features = false }
-sp-session = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.15.2-rc1", default-features = false }
-sp-std = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.15.2-rc1", default-features = false }
-sp-storage = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.15.2-rc1", default-features = false }
-sp-timestamp = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.15.2-rc1" }
-sp-tracing = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.15.2-rc1", default-features = false }
-sp-transaction-pool = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.15.2-rc1", default-features = false }
-sp-version = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.15.2-rc1", default-features = false }
-sp-weights = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.15.2-rc1", default-features = false }
+sp-api = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.16.0-rc1", default-features = false }
+sp-block-builder = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.16.0-rc1", default-features = false }
+sp-blockchain = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.16.0-rc1", default-features = false }
+sp-consensus = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.16.0-rc1" }
+sp-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.16.0-rc1", default-features = false }
+sp-consensus-grandpa = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.16.0-rc1" }
+sp-genesis-builder = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.16.0-rc1", default-features = false }
+sp-core = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.16.0-rc1", default-features = false }
+sp-inherents = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.16.0-rc1", default-features = false }
+sp-io = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.16.0-rc1", default-features = false }
+sp-keyring = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.16.0-rc1" }
+sp-offchain = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.16.0-rc1", default-features = false }
+sp-rpc = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.16.0-rc1", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.16.0-rc1", default-features = false }
+sp-session = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.16.0-rc1", default-features = false }
+sp-std = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.16.0-rc1", default-features = false }
+sp-storage = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.16.0-rc1", default-features = false }
+sp-timestamp = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.16.0-rc1" }
+sp-tracing = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.16.0-rc1", default-features = false }
+sp-transaction-pool = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.16.0-rc1", default-features = false }
+sp-version = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.16.0-rc1", default-features = false }
+sp-weights = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.16.0-rc1", default-features = false }
 
-substrate-build-script-utils = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.15.2-rc1" }
+substrate-build-script-utils = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.16.0-rc1" }
 substrate-fixed = { git = "https://github.com/opentensor/substrate-fixed.git", tag = "v0.5.9" }
-substrate-frame-rpc-system = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.15.2-rc1" }
-substrate-wasm-builder = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.15.2-rc1" }
+substrate-frame-rpc-system = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.16.0-rc1" }
+substrate-wasm-builder = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.16.0-rc1" }
 frame-metadata = "16"
 
 [profile.release]
diff --git a/Dockerfile b/Dockerfile
index 2dd2e2370..9edb2749b 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -28,7 +28,7 @@ COPY . /build
 WORKDIR /build
 
 # Build the project
-RUN cargo build -p node-subtensor --profile production  --features="runtime-benchmarks metadata-hash" --locked
+RUN cargo build -p node-subtensor --profile production  --features="metadata-hash" --locked
 
 # Verify the binary was produced
 RUN test -e /build/target/production/node-subtensor
diff --git a/build.rs b/build.rs
index 10cac0ea7..85388fd6c 100644
--- a/build.rs
+++ b/build.rs
@@ -60,6 +60,7 @@ fn main() {
         };
 
         track_lint(RequireFreezeStruct::lint(&parsed_file));
+        track_lint(RequireExplicitPalletIndex::lint(&parsed_file));
     });
 
     // Collect and print all errors after the parallel processing is done
@@ -75,7 +76,9 @@ fn collect_rust_files(dir: &Path) -> Vec<PathBuf> {
     let mut rust_files = Vec::new();
 
     for entry in WalkDir::new(dir) {
-        let entry = entry.unwrap();
+        let Ok(entry) = entry else {
+            continue;
+        };
         let path = entry.path();
 
         // Skip any path that contains "target" directory
diff --git a/justfile b/justfile
index f99f3913a..a753f7bb2 100644
--- a/justfile
+++ b/justfile
@@ -51,4 +51,4 @@ lint:
 
 production:
   @echo "Running cargo build with metadata-hash generation..."
-  cargo +{{RUSTV}} build --profile production --features="runtime-benchmarks metadata-hash"
+  cargo +{{RUSTV}} build --profile production --features="metadata-hash"
diff --git a/node/src/chain_spec/mod.rs b/node/src/chain_spec/mod.rs
index bf34901ae..cf9ce274e 100644
--- a/node/src/chain_spec/mod.rs
+++ b/node/src/chain_spec/mod.rs
@@ -5,7 +5,7 @@ pub mod finney;
 pub mod localnet;
 pub mod testnet;
 
-use node_subtensor_runtime::{AccountId, Block, RuntimeGenesisConfig, Signature, WASM_BINARY};
+use node_subtensor_runtime::{AccountId, Block, Signature, WASM_BINARY};
 use sc_chain_spec_derive::ChainSpecExtension;
 use sc_service::ChainType;
 use sp_consensus_aura::sr25519::AuthorityId as AuraId;
@@ -32,7 +32,7 @@ pub struct Extensions {
 }
 
 /// Specialized `ChainSpec`. This is a specialization of the general Substrate ChainSpec type.
-pub type ChainSpec = sc_service::GenericChainSpec<RuntimeGenesisConfig, Extensions>;
+pub type ChainSpec = sc_service::GenericChainSpec<Extensions>;
 
 /// Generate a crypto pair from seed.
 pub fn get_from_seed<TPublic: Public>(seed: &str) -> <TPublic::Pair as Pair>::Public {
diff --git a/node/src/command.rs b/node/src/command.rs
index 2423d1456..0f3914239 100644
--- a/node/src/command.rs
+++ b/node/src/command.rs
@@ -12,12 +12,13 @@ pub use frame_benchmarking_cli::{BenchmarkCmd, ExtrinsicFactory, SUBSTRATE_REFER
 pub use node_subtensor_runtime::EXISTENTIAL_DEPOSIT;
 #[cfg(feature = "runtime-benchmarks")]
 pub use sp_keyring::Sr25519Keyring;
-#[cfg(feature = "runtime-benchmarks")]
-use sp_runtime::traits::HashingFor;
 
 use node_subtensor_runtime::Block;
 use sc_cli::SubstrateCli;
-use sc_service::{Configuration, PartialComponents};
+use sc_service::{
+    config::{ExecutorConfiguration, RpcConfiguration},
+    Configuration, PartialComponents,
+};
 
 impl SubstrateCli for Cli {
     fn impl_name() -> String {
@@ -149,7 +150,9 @@ pub fn run() -> sc_cli::Result<()> {
                             );
                         }
 
-                        cmd.run::<HashingFor<Block>, service::ExecutorDispatch>(config)
+                        cmd.run_with_spec::<sp_runtime::traits::HashingFor<Block>, ()>(Some(
+                            config.chain_spec,
+                        ))
                     }
                     BenchmarkCmd::Block(cmd) => {
                         let PartialComponents { client, .. } = service::new_partial(&config)?;
@@ -210,7 +213,18 @@ pub fn run() -> sc_cli::Result<()> {
             let runner = cli.create_runner(&cli.run)?;
             runner.run_node_until_exit(|config| async move {
                 let config = override_default_heap_pages(config, 60_000);
-                service::new_full(config).map_err(sc_cli::Error::Service)
+                match config.network.network_backend {
+					sc_network::config::NetworkBackendType::Libp2p => service::new_full::<
+						sc_network::NetworkWorker<
+							node_subtensor_runtime::opaque::Block,
+							<node_subtensor_runtime::opaque::Block as sp_runtime::traits::Block>::Hash,
+						>,
+					>(config)
+					.map_err(sc_cli::Error::Service),
+					sc_network::config::NetworkBackendType::Litep2p =>
+						service::new_full::<sc_network::Litep2pNetworkBackend>(config)
+							.map_err(sc_cli::Error::Service),
+				}
             })
         }
     }
@@ -219,7 +233,6 @@ pub fn run() -> sc_cli::Result<()> {
 /// Override default heap pages
 fn override_default_heap_pages(config: Configuration, pages: u64) -> Configuration {
     Configuration {
-        default_heap_pages: Some(pages),
         impl_name: config.impl_name,
         impl_version: config.impl_version,
         role: config.role,
@@ -232,20 +245,7 @@ fn override_default_heap_pages(config: Configuration, pages: u64) -> Configurati
         state_pruning: config.state_pruning,
         blocks_pruning: config.blocks_pruning,
         chain_spec: config.chain_spec,
-        wasm_method: config.wasm_method,
         wasm_runtime_overrides: config.wasm_runtime_overrides,
-        rpc_addr: config.rpc_addr,
-        rpc_max_connections: config.rpc_max_connections,
-        rpc_cors: config.rpc_cors,
-        rpc_methods: config.rpc_methods,
-        rpc_max_request_size: config.rpc_max_request_size,
-        rpc_max_response_size: config.rpc_max_response_size,
-        rpc_id_provider: config.rpc_id_provider,
-        rpc_max_subs_per_conn: config.rpc_max_subs_per_conn,
-        rpc_port: config.rpc_port,
-        rpc_message_buffer_capacity: config.rpc_message_buffer_capacity,
-        rpc_batch_config: config.rpc_batch_config,
-        rpc_rate_limit: config.rpc_rate_limit,
         prometheus_config: config.prometheus_config,
         telemetry_endpoints: config.telemetry_endpoints,
         offchain_worker: config.offchain_worker,
@@ -254,11 +254,30 @@ fn override_default_heap_pages(config: Configuration, pages: u64) -> Configurati
         dev_key_seed: config.dev_key_seed,
         tracing_targets: config.tracing_targets,
         tracing_receiver: config.tracing_receiver,
-        max_runtime_instances: config.max_runtime_instances,
         announce_block: config.announce_block,
         data_path: config.data_path,
         base_path: config.base_path,
-        informant_output_format: config.informant_output_format,
-        runtime_cache_size: config.runtime_cache_size,
+        executor: ExecutorConfiguration {
+            default_heap_pages: Some(pages),
+            wasm_method: config.executor.wasm_method,
+            max_runtime_instances: config.executor.max_runtime_instances,
+            runtime_cache_size: config.executor.runtime_cache_size,
+        },
+        rpc: RpcConfiguration {
+            addr: config.rpc.addr,
+            max_connections: config.rpc.max_connections,
+            cors: config.rpc.cors,
+            methods: config.rpc.methods,
+            max_request_size: config.rpc.max_request_size,
+            max_response_size: config.rpc.max_response_size,
+            id_provider: config.rpc.id_provider,
+            max_subs_per_conn: config.rpc.max_subs_per_conn,
+            port: config.rpc.port,
+            message_buffer_capacity: config.rpc.message_buffer_capacity,
+            batch_config: config.rpc.batch_config,
+            rate_limit: config.rpc.rate_limit,
+            rate_limit_whitelisted_ips: config.rpc.rate_limit_whitelisted_ips,
+            rate_limit_trust_proxy_headers: config.rpc.rate_limit_trust_proxy_headers,
+        },
     }
 }
diff --git a/node/src/rpc.rs b/node/src/rpc.rs
index 54f82447f..7563bf834 100644
--- a/node/src/rpc.rs
+++ b/node/src/rpc.rs
@@ -15,8 +15,6 @@ use sp_api::ProvideRuntimeApi;
 use sp_block_builder::BlockBuilder;
 use sp_blockchain::{Error as BlockChainError, HeaderBackend, HeaderMetadata};
 
-pub use sc_rpc_api::DenyUnsafe;
-
 /// Dependencies for GRANDPA
 pub struct GrandpaDeps<B> {
     /// Voting round info.
@@ -37,8 +35,6 @@ pub struct FullDeps<C, P, B> {
     pub client: Arc<C>,
     /// Transaction pool instance.
     pub pool: Arc<P>,
-    /// Whether to deny unsafe calls
-    pub deny_unsafe: DenyUnsafe,
     /// Grandpa block import setup.
     pub grandpa: GrandpaDeps<B>,
     /// Backend used by the node.
@@ -72,7 +68,6 @@ where
     let FullDeps {
         client,
         pool,
-        deny_unsafe,
         grandpa,
         _backend: _,
     } = deps;
@@ -80,7 +75,7 @@ where
     // Custom RPC methods for Paratensor
     module.merge(SubtensorCustom::new(client.clone()).into_rpc())?;
 
-    module.merge(System::new(client.clone(), pool.clone(), deny_unsafe).into_rpc())?;
+    module.merge(System::new(client.clone(), pool.clone()).into_rpc())?;
     module.merge(TransactionPayment::new(client).into_rpc())?;
 
     let GrandpaDeps {
diff --git a/node/src/service.rs b/node/src/service.rs
index 9a19ae354..cc0bf2862 100644
--- a/node/src/service.rs
+++ b/node/src/service.rs
@@ -6,9 +6,8 @@ use sc_client_api::{Backend, BlockBackend};
 use sc_consensus_aura::{ImportQueueParams, SlotProportion, StartAuraParams};
 use sc_consensus_grandpa::SharedVoterState;
 use sc_consensus_slots::BackoffAuthoringOnFinalizedHeadLagging;
-use sc_executor::sp_wasm_interface::{Function, HostFunctionRegistry, HostFunctions};
-pub use sc_executor::NativeElseWasmExecutor;
-use sc_service::{error::Error as ServiceError, Configuration, TaskManager, WarpSyncParams};
+pub use sc_executor::WasmExecutor;
+use sc_service::{error::Error as ServiceError, Configuration, TaskManager, WarpSyncConfig};
 use sc_telemetry::{Telemetry, TelemetryWorker};
 use sc_transaction_pool_api::OffchainTransactionPoolFactory;
 use sp_consensus_aura::sr25519::AuthorityPair as AuraPair;
@@ -18,42 +17,8 @@ use std::{sync::Arc, time::Duration};
 /// imported and generated.
 const GRANDPA_JUSTIFICATION_PERIOD: u32 = 512;
 
-// Our native executor instance.
-pub struct ExecutorDispatch;
-
-// appeasing the compiler, this is a no-op
-impl HostFunctions for ExecutorDispatch {
-    fn host_functions() -> Vec<&'static dyn Function> {
-        vec![]
-    }
-
-    fn register_static<T>(_registry: &mut T) -> core::result::Result<(), T::Error>
-    where
-        T: HostFunctionRegistry,
-    {
-        Ok(())
-    }
-}
-
-impl sc_executor::NativeExecutionDispatch for ExecutorDispatch {
-    // Only enable the benchmarking host functions when we actually want to benchmark.
-    #[cfg(feature = "runtime-benchmarks")]
-    type ExtendHostFunctions = frame_benchmarking::benchmarking::HostFunctions;
-    // Otherwise we only use the default Substrate host functions.
-    #[cfg(not(feature = "runtime-benchmarks"))]
-    type ExtendHostFunctions = ();
-
-    fn dispatch(method: &str, data: &[u8]) -> Option<Vec<u8>> {
-        node_subtensor_runtime::api::dispatch(method, data)
-    }
-
-    fn native_version() -> sc_executor::NativeVersion {
-        node_subtensor_runtime::native_version()
-    }
-}
-
 pub(crate) type FullClient =
-    sc_service::TFullClient<Block, RuntimeApi, NativeElseWasmExecutor<ExecutorDispatch>>;
+    sc_service::TFullClient<Block, RuntimeApi, WasmExecutor<sp_io::SubstrateHostFunctions>>;
 type FullBackend = sc_service::TFullBackend<Block>;
 type FullSelectChain = sc_consensus::LongestChain<FullBackend, Block>;
 
@@ -90,7 +55,7 @@ pub fn new_partial(
         })
         .transpose()?;
 
-    let executor = sc_service::new_native_or_wasm_executor(config);
+    let executor = sc_service::new_wasm_executor::<sp_io::SubstrateHostFunctions>(&config.executor);
 
     let (client, backend, keystore_container, task_manager) =
         sc_service::new_full_parts::<Block, RuntimeApi, _>(
@@ -163,7 +128,11 @@ pub fn new_partial(
 }
 
 // Builds a new service for a full client.
-pub fn new_full(config: Configuration) -> Result<TaskManager, ServiceError> {
+pub fn new_full<
+    N: sc_network::NetworkBackend<Block, <Block as sp_runtime::traits::Block>::Hash>,
+>(
+    config: Configuration,
+) -> Result<TaskManager, ServiceError> {
     let sc_service::PartialComponents {
         client,
         backend,
@@ -175,7 +144,12 @@ pub fn new_full(config: Configuration) -> Result<TaskManager, ServiceError> {
         other: (block_import, grandpa_link, mut telemetry),
     } = new_partial(&config)?;
 
-    let mut net_config = sc_network::config::FullNetworkConfiguration::new(&config.network);
+    let mut net_config = sc_network::config::FullNetworkConfiguration::<
+        Block,
+        <Block as sp_runtime::traits::Block>::Hash,
+        N,
+    >::new(&config.network, config.prometheus_registry().cloned());
+    let metrics = N::register_notification_metrics(config.prometheus_registry());
 
     let grandpa_protocol_name = sc_consensus_grandpa::protocol_standard_name(
         &client
@@ -186,8 +160,13 @@ pub fn new_full(config: Configuration) -> Result<TaskManager, ServiceError> {
         &config.chain_spec,
     );
 
+    let peer_store_handle = net_config.peer_store_handle();
     let (grandpa_protocol_config, grandpa_notification_service) =
-        sc_consensus_grandpa::grandpa_peers_set_config(grandpa_protocol_name.clone());
+        sc_consensus_grandpa::grandpa_peers_set_config::<_, N>(
+            grandpa_protocol_name.clone(),
+            metrics.clone(),
+            peer_store_handle,
+        );
     net_config.add_notification_protocol(grandpa_protocol_config);
 
     let warp_sync = Arc::new(sc_consensus_grandpa::warp_proof::NetworkProvider::new(
@@ -205,8 +184,9 @@ pub fn new_full(config: Configuration) -> Result<TaskManager, ServiceError> {
             spawn_handle: task_manager.spawn_handle(),
             import_queue,
             block_announce_validator_builder: None,
-            warp_sync_params: Some(WarpSyncParams::WithProvider(warp_sync)),
+            warp_sync_config: Some(WarpSyncConfig::WithProvider(warp_sync)),
             block_relay: None,
+            metrics,
         })?;
 
     if config.offchain_worker.enabled {
@@ -221,7 +201,7 @@ pub fn new_full(config: Configuration) -> Result<TaskManager, ServiceError> {
                 transaction_pool: Some(OffchainTransactionPoolFactory::new(
                     transaction_pool.clone(),
                 )),
-                network_provider: network.clone(),
+                network_provider: Arc::new(network.clone()),
                 enable_http_requests: true,
                 custom_extensions: |_| vec![],
             })
@@ -239,7 +219,7 @@ pub fn new_full(config: Configuration) -> Result<TaskManager, ServiceError> {
     let shared_authority_set = grandpa_link.shared_authority_set().clone();
     let shared_voter_state = SharedVoterState::empty();
 
-    let role = config.role.clone();
+    let role = config.role;
     let force_authoring = config.force_authoring;
     let backoff_authoring_blocks = Some(BackoffAuthoringOnFinalizedHeadLagging {
         unfinalized_slack: 6,
@@ -254,11 +234,10 @@ pub fn new_full(config: Configuration) -> Result<TaskManager, ServiceError> {
         let pool = transaction_pool.clone();
 
         Box::new(
-            move |deny_unsafe, subscription_executor: sc_rpc::SubscriptionTaskExecutor| {
+            move |subscription_executor: sc_rpc::SubscriptionTaskExecutor| {
                 let deps = crate::rpc::FullDeps {
                     client: client.clone(),
                     pool: pool.clone(),
-                    deny_unsafe,
                     grandpa: crate::rpc::GrandpaDeps {
                         shared_voter_state: shared_voter_state.clone(),
                         shared_authority_set: shared_authority_set.clone(),
diff --git a/pallets/admin-utils/tests/mock.rs b/pallets/admin-utils/tests/mock.rs
index 342ed01cd..dca08ab72 100644
--- a/pallets/admin-utils/tests/mock.rs
+++ b/pallets/admin-utils/tests/mock.rs
@@ -23,11 +23,11 @@ type Block = frame_system::mocking::MockBlock<Test>;
 frame_support::construct_runtime!(
     pub enum Test
     {
-        System: frame_system,
-        Balances: pallet_balances,
-        AdminUtils: pallet_admin_utils,
-        SubtensorModule: pallet_subtensor::{Pallet, Call, Storage, Event<T>, Error<T>},
-        Scheduler: pallet_scheduler::{Pallet, Call, Storage, Event<T>},
+        System: frame_system = 1,
+        Balances: pallet_balances = 2,
+        AdminUtils: pallet_admin_utils = 3,
+        SubtensorModule: pallet_subtensor::{Pallet, Call, Storage, Event<T>, Error<T>} = 4,
+        Scheduler: pallet_scheduler::{Pallet, Call, Storage, Event<T>} = 5,
     }
 );
 
diff --git a/pallets/collective/src/tests.rs b/pallets/collective/src/tests.rs
index 91fca58d4..4cc5f1bad 100644
--- a/pallets/collective/src/tests.rs
+++ b/pallets/collective/src/tests.rs
@@ -36,11 +36,11 @@ pub type UncheckedExtrinsic = sp_runtime::generic::UncheckedExtrinsic<u32, u64,
 frame_support::construct_runtime!(
     pub enum Test
     {
-        System: frame_system::{Pallet, Call, Event<T>},
-        Collective: pallet_collective::<Instance1>::{Pallet, Call, Event<T>, Origin<T>, Config<T>},
-        CollectiveMajority: pallet_collective::<Instance2>::{Pallet, Call, Event<T>, Origin<T>, Config<T>},
-        DefaultCollective: pallet_collective::{Pallet, Call, Event<T>, Origin<T>, Config<T>},
-        Democracy: mock_democracy::{Pallet, Call, Event<T>},
+        System: frame_system::{Pallet, Call, Event<T>} = 1,
+        Collective: pallet_collective::<Instance1>::{Pallet, Call, Event<T>, Origin<T>, Config<T>} = 2,
+        CollectiveMajority: pallet_collective::<Instance2>::{Pallet, Call, Event<T>, Origin<T>, Config<T>} = 3,
+        DefaultCollective: pallet_collective::{Pallet, Call, Event<T>, Origin<T>, Config<T>} = 4,
+        Democracy: mock_democracy::{Pallet, Call, Event<T>} = 5,
     }
 );
 mod mock_democracy {
diff --git a/pallets/commitments/src/mock.rs b/pallets/commitments/src/mock.rs
index 47df72d5d..8866e1c0d 100644
--- a/pallets/commitments/src/mock.rs
+++ b/pallets/commitments/src/mock.rs
@@ -12,8 +12,8 @@ type Block = frame_system::mocking::MockBlock<Test>;
 frame_support::construct_runtime!(
     pub enum Test
     {
-        System: frame_system,
-        Commitments: pallet_commitments,
+        System: frame_system = 1,
+        Commitments: pallet_commitments = 2,
     }
 );
 
diff --git a/pallets/commitments/src/tests.rs b/pallets/commitments/src/tests.rs
index 058b5faf0..036cb5d83 100644
--- a/pallets/commitments/src/tests.rs
+++ b/pallets/commitments/src/tests.rs
@@ -15,9 +15,9 @@ pub type UncheckedExtrinsic = sp_runtime::generic::UncheckedExtrinsic<u32, u64,
 frame_support::construct_runtime!(
     pub enum Test
     {
-        System: frame_system,
-        Balances: pallet_balances,
-        Commitments: pallet_commitments
+        System: frame_system = 1,
+        Balances: pallet_balances = 2,
+        Commitments: pallet_commitments = 3,
     }
 );
 
diff --git a/pallets/registry/src/mock.rs b/pallets/registry/src/mock.rs
index 1185becbf..ae7f8594a 100644
--- a/pallets/registry/src/mock.rs
+++ b/pallets/registry/src/mock.rs
@@ -12,8 +12,8 @@ type Block = frame_system::mocking::MockBlock<Test>;
 frame_support::construct_runtime!(
     pub enum Test
     {
-        System: frame_system,
-        TemplateModule: pallet_template,
+        System: frame_system = 1,
+        TemplateModule: pallet_template = 2,
     }
 );
 
diff --git a/pallets/subtensor/rpc/src/lib.rs b/pallets/subtensor/rpc/src/lib.rs
index 2445a5eda..d99388193 100644
--- a/pallets/subtensor/rpc/src/lib.rs
+++ b/pallets/subtensor/rpc/src/lib.rs
@@ -41,7 +41,6 @@ pub trait SubtensorCustomApi<BlockHash> {
     fn get_neurons(&self, netuid: u16, at: Option<BlockHash>) -> RpcResult<Vec<u8>>;
     #[method(name = "neuronInfo_getNeuron")]
     fn get_neuron(&self, netuid: u16, uid: u16, at: Option<BlockHash>) -> RpcResult<Vec<u8>>;
-
     #[method(name = "subnetInfo_getSubnetInfo")]
     fn get_subnet_info(&self, netuid: u16, at: Option<BlockHash>) -> RpcResult<Vec<u8>>;
     #[method(name = "subnetInfo_getSubnetsInfo")]
diff --git a/pallets/subtensor/src/lib.rs b/pallets/subtensor/src/lib.rs
index 2985736c8..cc3d7d025 100644
--- a/pallets/subtensor/src/lib.rs
+++ b/pallets/subtensor/src/lib.rs
@@ -67,12 +67,14 @@ pub mod pallet {
         traits::{
             tokens::fungible, OriginTrait, QueryPreimage, StorePreimage, UnfilteredDispatchable,
         },
+        BoundedVec,
     };
     use frame_system::pallet_prelude::*;
     use sp_core::H256;
     use sp_runtime::traits::{Dispatchable, TrailingZeroInput};
     use sp_std::vec;
     use sp_std::vec::Vec;
+    use subtensor_macros::freeze_struct;
 
     #[cfg(not(feature = "std"))]
     use alloc::boxed::Box;
@@ -129,6 +131,36 @@ pub mod pallet {
         pub placeholder2: u8,
     }
 
+    /// Struct for NeuronCertificate.
+    pub type NeuronCertificateOf = NeuronCertificate;
+    /// Data structure for NeuronCertificate information.
+    #[freeze_struct("1c232be200d9ec6c")]
+    #[derive(Decode, Encode, Default, TypeInfo, PartialEq, Eq, Clone, Debug)]
+    pub struct NeuronCertificate {
+        ///  The neuron TLS public key
+        pub public_key: BoundedVec<u8, ConstU32<64>>,
+        ///  The algorithm used to generate the public key
+        pub algorithm: u8,
+    }
+
+    impl TryFrom<Vec<u8>> for NeuronCertificate {
+        type Error = ();
+
+        fn try_from(value: Vec<u8>) -> Result<Self, Self::Error> {
+            if value.len() > 65 {
+                return Err(());
+            }
+            // take the first byte as the algorithm
+            let algorithm = value.first().ok_or(())?;
+            // and the rest as the public_key
+            let certificate = value.get(1..).ok_or(())?.to_vec();
+            Ok(Self {
+                public_key: BoundedVec::try_from(certificate).map_err(|_| ())?,
+                algorithm: *algorithm,
+            })
+        }
+    }
+
     ///  Struct for Prometheus.
     pub type PrometheusInfoOf = PrometheusInfo;
 
@@ -1162,6 +1194,17 @@ pub mod pallet {
     /// --- MAP ( netuid, hotkey ) --> axon_info
     pub type Axons<T: Config> =
         StorageDoubleMap<_, Identity, u16, Blake2_128Concat, T::AccountId, AxonInfoOf, OptionQuery>;
+    /// --- MAP ( netuid, hotkey ) --> certificate
+    #[pallet::storage]
+    pub type NeuronCertificates<T: Config> = StorageDoubleMap<
+        _,
+        Identity,
+        u16,
+        Blake2_128Concat,
+        T::AccountId,
+        NeuronCertificateOf,
+        OptionQuery,
+    >;
     #[pallet::storage]
     /// --- MAP ( netuid, hotkey ) --> prometheus_info
     pub type Prometheus<T: Config> = StorageDoubleMap<
@@ -1538,6 +1581,10 @@ where
                 let transaction_fee = 0;
                 Ok((CallType::Serve, transaction_fee, who.clone()))
             }
+            Some(Call::serve_axon_tls { .. }) => {
+                let transaction_fee = 0;
+                Ok((CallType::Serve, transaction_fee, who.clone()))
+            }
             Some(Call::register_network { .. }) => {
                 let transaction_fee = 0;
                 Ok((CallType::RegisterNetwork, transaction_fee, who.clone()))
diff --git a/pallets/subtensor/src/macros/dispatches.rs b/pallets/subtensor/src/macros/dispatches.rs
index a97e4494d..c4b985a49 100644
--- a/pallets/subtensor/src/macros/dispatches.rs
+++ b/pallets/subtensor/src/macros/dispatches.rs
@@ -435,7 +435,7 @@ mod dispatches {
             Self::do_remove_stake(origin, hotkey, amount_unstaked)
         }
 
-        /// Serves or updates axon /promethteus information for the neuron associated with the caller. If the caller is
+        /// Serves or updates axon /prometheus information for the neuron associated with the caller. If the caller is
         /// already registered the metadata is updated. If the caller is not registered this call throws NotRegistered.
         ///
         /// # Args:
@@ -511,6 +511,92 @@ mod dispatches {
                 protocol,
                 placeholder1,
                 placeholder2,
+                None,
+            )
+        }
+
+        /// Same as `serve_axon` but takes a certificate as an extra optional argument.
+        /// Serves or updates axon /prometheus information for the neuron associated with the caller. If the caller is
+        /// already registered the metadata is updated. If the caller is not registered this call throws NotRegistered.
+        ///
+        /// # Args:
+        /// * 'origin': (<T as frame_system::Config>Origin):
+        /// 	- The signature of the caller.
+        ///
+        /// * 'netuid' (u16):
+        /// 	- The u16 network identifier.
+        ///
+        /// * 'version' (u64):
+        /// 	- The bittensor version identifier.
+        ///
+        /// * 'ip' (u64):
+        /// 	- The endpoint ip information as a u128 encoded integer.
+        ///
+        /// * 'port' (u16):
+        /// 	- The endpoint port information as a u16 encoded integer.
+        ///
+        /// * 'ip_type' (u8):
+        /// 	- The endpoint ip version as a u8, 4 or 6.
+        ///
+        /// * 'protocol' (u8):
+        /// 	- UDP:1 or TCP:0
+        ///
+        /// * 'placeholder1' (u8):
+        /// 	- Placeholder for further extra params.
+        ///
+        /// * 'placeholder2' (u8):
+        /// 	- Placeholder for further extra params.
+        ///
+        /// * 'certificate' (Vec<u8>):
+        ///     - TLS certificate for inter neuron communitation.
+        ///
+        /// # Event:
+        /// * AxonServed;
+        /// 	- On successfully serving the axon info.
+        ///
+        /// # Raises:
+        /// * 'SubNetworkDoesNotExist':
+        /// 	- Attempting to set weights on a non-existent network.
+        ///
+        /// * 'NotRegistered':
+        /// 	- Attempting to set weights from a non registered account.
+        ///
+        /// * 'InvalidIpType':
+        /// 	- The ip type is not 4 or 6.
+        ///
+        /// * 'InvalidIpAddress':
+        /// 	- The numerically encoded ip address does not resolve to a proper ip.
+        ///
+        /// * 'ServingRateLimitExceeded':
+        /// 	- Attempting to set prometheus information withing the rate limit min.
+        ///
+        #[pallet::call_index(40)]
+        #[pallet::weight((Weight::from_parts(46_000_000, 0)
+		.saturating_add(T::DbWeight::get().reads(4))
+		.saturating_add(T::DbWeight::get().writes(1)), DispatchClass::Normal, Pays::No))]
+        pub fn serve_axon_tls(
+            origin: OriginFor<T>,
+            netuid: u16,
+            version: u32,
+            ip: u128,
+            port: u16,
+            ip_type: u8,
+            protocol: u8,
+            placeholder1: u8,
+            placeholder2: u8,
+            certificate: Vec<u8>,
+        ) -> DispatchResult {
+            Self::do_serve_axon(
+                origin,
+                netuid,
+                version,
+                ip,
+                port,
+                ip_type,
+                protocol,
+                placeholder1,
+                placeholder2,
+                Some(certificate),
             )
         }
 
diff --git a/pallets/subtensor/src/subnets/serving.rs b/pallets/subtensor/src/subnets/serving.rs
index 1a9240c36..7e2b9a0f0 100644
--- a/pallets/subtensor/src/subnets/serving.rs
+++ b/pallets/subtensor/src/subnets/serving.rs
@@ -31,6 +31,9 @@ impl<T: Config> Pallet<T> {
     /// * 'placeholder2' (u8):
     ///     - Placeholder for further extra params.
     ///
+    /// * 'certificate' (Option<Vec<u8>>):
+    ///     - Certificate for mutual Tls connection between neurons
+    ///
     /// # Event:
     /// * AxonServed;
     ///     - On successfully serving the axon info.
@@ -61,6 +64,7 @@ impl<T: Config> Pallet<T> {
         protocol: u8,
         placeholder1: u8,
         placeholder2: u8,
+        certificate: Option<Vec<u8>>,
     ) -> dispatch::DispatchResult {
         // We check the callers (hotkey) signature.
         let hotkey_id = ensure_signed(origin)?;
@@ -86,6 +90,13 @@ impl<T: Config> Pallet<T> {
             Error::<T>::ServingRateLimitExceeded
         );
 
+        // Check certificate
+        if let Some(certificate) = certificate {
+            if let Ok(certificate) = NeuronCertificateOf::try_from(certificate) {
+                NeuronCertificates::<T>::insert(netuid, hotkey_id.clone(), certificate)
+            }
+        }
+
         // We insert the axon meta.
         prev_axon.block = Self::get_current_block_as_u64();
         prev_axon.version = version;
diff --git a/pallets/subtensor/src/subnets/uids.rs b/pallets/subtensor/src/subnets/uids.rs
index fff358f1c..2a5ceedb4 100644
--- a/pallets/subtensor/src/subnets/uids.rs
+++ b/pallets/subtensor/src/subnets/uids.rs
@@ -45,6 +45,9 @@ impl<T: Config> Pallet<T> {
         Uids::<T>::insert(netuid, new_hotkey.clone(), uid_to_replace); // Make uid - hotkey association.
         BlockAtRegistration::<T>::insert(netuid, uid_to_replace, block_number); // Fill block at registration.
         IsNetworkMember::<T>::insert(new_hotkey.clone(), netuid, true); // Fill network is member.
+
+        // 4. Clear neuron certificates
+        NeuronCertificates::<T>::remove(netuid, old_hotkey.clone());
     }
 
     /// Appends the uid to the network.
diff --git a/pallets/subtensor/src/swap/swap_hotkey.rs b/pallets/subtensor/src/swap/swap_hotkey.rs
index 793e34bff..ca3d0b5a7 100644
--- a/pallets/subtensor/src/swap/swap_hotkey.rs
+++ b/pallets/subtensor/src/swap/swap_hotkey.rs
@@ -276,6 +276,18 @@ impl<T: Config> Pallet<T> {
                     weight.saturating_accrue(T::DbWeight::get().reads_writes(1, 2));
                 }
             }
+
+            // 9.7. Swap neuron TLS certificates.
+            // NeuronCertificates( netuid, hotkey ) -> Vec<u8> -- the neuron certificate for the hotkey.
+            if is_network_member {
+                if let Ok(old_neuron_certificates) =
+                    NeuronCertificates::<T>::try_get(netuid, old_hotkey)
+                {
+                    NeuronCertificates::<T>::remove(netuid, old_hotkey);
+                    NeuronCertificates::<T>::insert(netuid, new_hotkey, old_neuron_certificates);
+                    weight.saturating_accrue(T::DbWeight::get().reads_writes(1, 2));
+                }
+            }
         }
 
         // 10. Swap Stake.
diff --git a/pallets/subtensor/src/utils/try_state.rs b/pallets/subtensor/src/utils/try_state.rs
index 4763c0484..3c01a9b64 100644
--- a/pallets/subtensor/src/utils/try_state.rs
+++ b/pallets/subtensor/src/utils/try_state.rs
@@ -38,10 +38,20 @@ impl<T: Config> Pallet<T> {
             .saturating_add(total_staked)
             .saturating_add(total_subnet_locked);
 
-        // Verify that the calculated total issuance matches the stored TotalIssuance
+        // Verify the diff between calculated TI and actual TI is less than delta
+        //
+        // These values can be off slightly due to float rounding errors.
+        // They are corrected every runtime upgrade.
+        const DELTA: u64 = 1000;
+        let diff = if TotalIssuance::<T>::get() > expected_total_issuance {
+            TotalIssuance::<T>::get().checked_sub(expected_total_issuance)
+        } else {
+            expected_total_issuance.checked_sub(TotalIssuance::<T>::get())
+        }
+        .expect("LHS > RHS");
         ensure!(
-            TotalIssuance::<T>::get() == expected_total_issuance,
-            "TotalIssuance accounting discrepancy",
+            diff <= DELTA,
+            "TotalIssuance diff greater than allowable delta",
         );
 
         Ok(())
diff --git a/pallets/subtensor/tests/mock.rs b/pallets/subtensor/tests/mock.rs
index aa93c3531..6f3b44383 100644
--- a/pallets/subtensor/tests/mock.rs
+++ b/pallets/subtensor/tests/mock.rs
@@ -24,16 +24,16 @@ type Block = frame_system::mocking::MockBlock<Test>;
 frame_support::construct_runtime!(
     pub enum Test
     {
-        System: frame_system::{Pallet, Call, Config<T>, Storage, Event<T>},
-        Balances: pallet_balances::{Pallet, Call, Config<T>, Storage, Event<T>},
-        Triumvirate: pallet_collective::<Instance1>::{Pallet, Call, Storage, Origin<T>, Event<T>, Config<T>},
-        TriumvirateMembers: pallet_membership::<Instance1>::{Pallet, Call, Storage, Event<T>, Config<T>},
-        Senate: pallet_collective::<Instance2>::{Pallet, Call, Storage, Origin<T>, Event<T>, Config<T>},
-        SenateMembers: pallet_membership::<Instance2>::{Pallet, Call, Storage, Event<T>, Config<T>},
-        SubtensorModule: pallet_subtensor::{Pallet, Call, Storage, Event<T>},
-        Utility: pallet_utility::{Pallet, Call, Storage, Event},
-        Scheduler: pallet_scheduler::{Pallet, Call, Storage, Event<T>},
-        Preimage: pallet_preimage::{Pallet, Call, Storage, Event<T>},
+        System: frame_system::{Pallet, Call, Config<T>, Storage, Event<T>} = 1,
+        Balances: pallet_balances::{Pallet, Call, Config<T>, Storage, Event<T>} = 2,
+        Triumvirate: pallet_collective::<Instance1>::{Pallet, Call, Storage, Origin<T>, Event<T>, Config<T>} = 3,
+        TriumvirateMembers: pallet_membership::<Instance1>::{Pallet, Call, Storage, Event<T>, Config<T>} = 4,
+        Senate: pallet_collective::<Instance2>::{Pallet, Call, Storage, Origin<T>, Event<T>, Config<T>} = 5,
+        SenateMembers: pallet_membership::<Instance2>::{Pallet, Call, Storage, Event<T>, Config<T>} = 6,
+        SubtensorModule: pallet_subtensor::{Pallet, Call, Storage, Event<T>} = 7,
+        Utility: pallet_utility::{Pallet, Call, Storage, Event} = 8,
+        Scheduler: pallet_scheduler::{Pallet, Call, Storage, Event<T>} = 9,
+        Preimage: pallet_preimage::{Pallet, Call, Storage, Event<T>} = 10,
     }
 );
 
diff --git a/pallets/subtensor/tests/serving.rs b/pallets/subtensor/tests/serving.rs
index 49a963951..6bc30c76f 100644
--- a/pallets/subtensor/tests/serving.rs
+++ b/pallets/subtensor/tests/serving.rs
@@ -99,6 +99,64 @@ fn test_serving_ok() {
     });
 }
 
+#[test]
+fn test_serving_tls_ok() {
+    new_test_ext(1).execute_with(|| {
+        let hotkey_account_id = U256::from(1);
+        let netuid: u16 = 1;
+        let tempo: u16 = 13;
+        let version: u32 = 2;
+        let ip: u128 = 1676056785;
+        let port: u16 = 128;
+        let ip_type: u8 = 4;
+        let modality: u16 = 0;
+        let protocol: u8 = 0;
+        let placeholder1: u8 = 0;
+        let placeholder2: u8 = 0;
+        let certificate: Vec<u8> = "CERT".as_bytes().to_vec();
+        add_network(netuid, tempo, modality);
+        register_ok_neuron(netuid, hotkey_account_id, U256::from(66), 0);
+        assert_ok!(SubtensorModule::serve_axon_tls(
+            <<Test as Config>::RuntimeOrigin>::signed(hotkey_account_id),
+            netuid,
+            version,
+            ip,
+            port,
+            ip_type,
+            protocol,
+            placeholder1,
+            placeholder2,
+            certificate.clone()
+        ));
+
+        let stored_certificate = NeuronCertificates::<Test>::get(netuid, hotkey_account_id)
+            .expect("Certificate should exist");
+        assert_eq!(
+            stored_certificate.public_key.clone().into_inner(),
+            certificate.get(1..).expect("Certificate should exist")
+        );
+        let new_certificate = "UPDATED_CERT".as_bytes().to_vec();
+        assert_ok!(SubtensorModule::serve_axon_tls(
+            <<Test as Config>::RuntimeOrigin>::signed(hotkey_account_id),
+            netuid,
+            version,
+            ip,
+            port,
+            ip_type,
+            protocol,
+            placeholder1,
+            placeholder2,
+            new_certificate.clone()
+        ));
+        let stored_certificate = NeuronCertificates::<Test>::get(netuid, hotkey_account_id)
+            .expect("Certificate should exist");
+        assert_eq!(
+            stored_certificate.public_key.clone().into_inner(),
+            new_certificate.get(1..).expect("Certificate should exist")
+        );
+    });
+}
+
 #[test]
 fn test_serving_set_metadata_update() {
     new_test_ext(1).execute_with(|| {
diff --git a/pallets/subtensor/tests/swap_hotkey.rs b/pallets/subtensor/tests/swap_hotkey.rs
index bff738b86..89938e3eb 100644
--- a/pallets/subtensor/tests/swap_hotkey.rs
+++ b/pallets/subtensor/tests/swap_hotkey.rs
@@ -311,6 +311,38 @@ fn test_swap_axons() {
     });
 }
 
+// SKIP_WASM_BUILD=1 RUST_LOG=debug cargo test --test swap_hotkey -- test_swap_certificates --exact --nocapture
+#[test]
+fn test_swap_certificates() {
+    new_test_ext(1).execute_with(|| {
+        let old_hotkey = U256::from(1);
+        let new_hotkey = U256::from(2);
+        let coldkey = U256::from(3);
+        let netuid = 0u16;
+        let certificate = NeuronCertificate::try_from(vec![1, 2, 3]).unwrap();
+        let mut weight = Weight::zero();
+
+        add_network(netuid, 0, 1);
+        IsNetworkMember::<Test>::insert(old_hotkey, netuid, true);
+        NeuronCertificates::<Test>::insert(netuid, old_hotkey, certificate.clone());
+
+        assert_ok!(SubtensorModule::perform_hotkey_swap(
+            &old_hotkey,
+            &new_hotkey,
+            &coldkey,
+            &mut weight
+        ));
+
+        assert!(!NeuronCertificates::<Test>::contains_key(
+            netuid, old_hotkey
+        ));
+        assert_eq!(
+            NeuronCertificates::<Test>::get(netuid, new_hotkey),
+            Some(certificate)
+        );
+    });
+}
+
 // SKIP_WASM_BUILD=1 RUST_LOG=debug cargo test --test swap_hotkey -- test_swap_weight_commits --exact --nocapture
 #[test]
 fn test_swap_weight_commits() {
diff --git a/pallets/subtensor/tests/uids.rs b/pallets/subtensor/tests/uids.rs
index 82adc6b8a..6b4c00328 100644
--- a/pallets/subtensor/tests/uids.rs
+++ b/pallets/subtensor/tests/uids.rs
@@ -1,8 +1,9 @@
 #![allow(clippy::unwrap_used)]
 
 use crate::mock::*;
-use frame_support::assert_ok;
+use frame_support::{assert_err, assert_ok};
 use frame_system::Config;
+use pallet_subtensor::*;
 use sp_core::U256;
 
 mod mock;
@@ -32,6 +33,7 @@ fn test_replace_neuron() {
 
         let new_hotkey_account_id = U256::from(2);
         let _new_colkey_account_id = U256::from(12345);
+        let certificate = NeuronCertificate::try_from(vec![1, 2, 3]).unwrap();
 
         //add network
         add_network(netuid, tempo, 0);
@@ -51,6 +53,9 @@ fn test_replace_neuron() {
         let neuron_uid = SubtensorModule::get_uid_for_net_and_hotkey(netuid, &hotkey_account_id);
         assert_ok!(neuron_uid);
 
+        // Set a neuron certificate for it
+        NeuronCertificates::<Test>::insert(netuid, hotkey_account_id, certificate);
+
         // Replace the neuron.
         SubtensorModule::replace_neuron(
             netuid,
@@ -77,6 +82,10 @@ fn test_replace_neuron() {
             &new_hotkey_account_id
         ));
         assert_eq!(curr_hotkey.unwrap(), new_hotkey_account_id);
+
+        // Check neuron certificate was reset
+        let certificate = NeuronCertificates::<Test>::get(netuid, hotkey_account_id);
+        assert_eq!(certificate, None);
     });
 }
 
@@ -371,3 +380,24 @@ fn test_replace_neuron_multiple_subnets_unstake_all() {
         );
     });
 }
+
+#[test]
+fn test_neuron_certificate() {
+    new_test_ext(1).execute_with(|| {
+        // 512 bits key
+        let mut data = [0; 65].to_vec();
+        assert_ok!(NeuronCertificate::try_from(data));
+
+        // 256 bits key
+        data = [1; 33].to_vec();
+        assert_ok!(NeuronCertificate::try_from(data));
+
+        // too much data
+        data = [8; 88].to_vec();
+        assert_err!(NeuronCertificate::try_from(data), ());
+
+        // no data
+        data = vec![];
+        assert_err!(NeuronCertificate::try_from(data), ());
+    });
+}
diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs
index 9622c6e2a..6990cb907 100644
--- a/runtime/src/lib.rs
+++ b/runtime/src/lib.rs
@@ -15,12 +15,16 @@ use codec::{Decode, Encode, MaxEncodedLen};
 use frame_support::traits::Imbalance;
 use frame_support::{
     dispatch::DispatchResultWithPostInfo,
-    genesis_builder_helper::{build_config, create_default_config},
+    genesis_builder_helper::{build_state, get_preset},
     pallet_prelude::Get,
-    traits::{fungible::HoldConsideration, Contains, LinearStoragePrice, OnUnbalanced},
+    traits::{
+        fungible::{
+            DecreaseIssuance, HoldConsideration, Imbalance as FungibleImbalance, IncreaseIssuance,
+        },
+        Contains, LinearStoragePrice, OnUnbalanced,
+    },
 };
 use frame_system::{EnsureNever, EnsureRoot, EnsureRootWithSuccess, RawOrigin};
-use pallet_balances::NegativeImbalance;
 use pallet_commitments::CanCommit;
 use pallet_grandpa::{
     fg_primitives, AuthorityId as GrandpaId, AuthorityList as GrandpaAuthorityList,
@@ -37,7 +41,7 @@ use sp_runtime::{
         AccountIdLookup, BlakeTwo256, Block as BlockT, IdentifyAccount, NumberFor, One, Verify,
     },
     transaction_validity::{TransactionSource, TransactionValidity},
-    ApplyExtrinsicResult, MultiSignature,
+    AccountId32, ApplyExtrinsicResult, MultiSignature,
 };
 use sp_std::cmp::Ordering;
 use sp_std::prelude::*;
@@ -64,7 +68,7 @@ pub use frame_support::{
 pub use frame_system::Call as SystemCall;
 pub use pallet_balances::Call as BalancesCall;
 pub use pallet_timestamp::Call as TimestampCall;
-use pallet_transaction_payment::{CurrencyAdapter, Multiplier};
+use pallet_transaction_payment::{FungibleAdapter, Multiplier};
 #[cfg(any(feature = "std", test))]
 pub use sp_runtime::BuildStorage;
 pub use sp_runtime::{Perbill, Permill};
@@ -142,7 +146,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
     //   `spec_version`, and `authoring_version` are the same between Wasm and native.
     // This value is set to 100 to notify Polkadot-JS App (https://polkadot.js.org/apps) to use
     //   the compatible custom types.
-    spec_version: 196,
+    spec_version: 197,
     impl_version: 1,
     apis: RUNTIME_API_VERSIONS,
     transaction_version: 1,
@@ -394,8 +398,22 @@ parameter_types! {
 /// Deduct the transaction fee from the Subtensor Pallet TotalIssuance when dropping the transaction
 /// fee.
 pub struct TransactionFeeHandler;
-impl OnUnbalanced<NegativeImbalance<Runtime>> for TransactionFeeHandler {
-    fn on_nonzero_unbalanced(credit: NegativeImbalance<Runtime>) {
+impl
+    OnUnbalanced<
+        FungibleImbalance<
+            u64,
+            DecreaseIssuance<AccountId32, pallet_balances::Pallet<Runtime>>,
+            IncreaseIssuance<AccountId32, pallet_balances::Pallet<Runtime>>,
+        >,
+    > for TransactionFeeHandler
+{
+    fn on_nonzero_unbalanced(
+        credit: FungibleImbalance<
+            u64,
+            DecreaseIssuance<AccountId32, pallet_balances::Pallet<Runtime>>,
+            IncreaseIssuance<AccountId32, pallet_balances::Pallet<Runtime>>,
+        >,
+    ) {
         let ti_before = pallet_subtensor::TotalIssuance::<Runtime>::get();
         pallet_subtensor::TotalIssuance::<Runtime>::put(ti_before.saturating_sub(credit.peek()));
         drop(credit);
@@ -406,7 +424,7 @@ impl pallet_transaction_payment::Config for Runtime {
     type RuntimeEvent = RuntimeEvent;
 
     //type TransactionByteFee = TransactionByteFee;
-    type OnChargeTransaction = CurrencyAdapter<Balances, TransactionFeeHandler>;
+    type OnChargeTransaction = FungibleAdapter<Balances, TransactionFeeHandler>;
 
     // Convert dispatch weight to a chargeable fee.
     type WeightToFee = LinearWeightToFee<FeeWeightRatio>;
@@ -1081,10 +1099,13 @@ pub type SignedExtra = (
     frame_metadata_hash_extension::CheckMetadataHash<Runtime>,
 );
 
-type Migrations =
+type Migrations = (
+    // Leave this migration in the runtime, so every runtime upgrade tiny rounding errors (fractions of fractions
+    // of a cent) are cleaned up. These tiny rounding errors occur due to floating point coversion.
     pallet_subtensor::migrations::migrate_init_total_issuance::initialise_total_issuance::Migration<
         Runtime,
-    >;
+    >,
+);
 
 // Unchecked extrinsic type as expected by this runtime.
 pub type UncheckedExtrinsic =
@@ -1111,11 +1132,12 @@ mod benches {
         [frame_benchmarking, BaselineBench::<Runtime>]
         [frame_system, SystemBench::<Runtime>]
         [pallet_balances, Balances]
-        [pallet_subtensor, SubtensorModule]
         [pallet_timestamp, Timestamp]
+        [pallet_sudo, Sudo]
         [pallet_registry, Registry]
         [pallet_commitments, Commitments]
         [pallet_admin_utils, AdminUtils]
+        [pallet_subtensor, SubtensorModule]
     );
 }
 
@@ -1170,12 +1192,16 @@ impl_runtime_apis! {
     }
 
     impl sp_genesis_builder::GenesisBuilder<Block> for Runtime {
-        fn create_default_config() -> Vec<u8> {
-            create_default_config::<RuntimeGenesisConfig>()
+        fn build_state(config: Vec<u8>) -> sp_genesis_builder::Result {
+            build_state::<RuntimeGenesisConfig>(config)
+        }
+
+        fn get_preset(id: &Option<sp_genesis_builder::PresetId>) -> Option<Vec<u8>> {
+            get_preset::<RuntimeGenesisConfig>(id, |_| None)
         }
 
-        fn build_config(config: Vec<u8>) -> sp_genesis_builder::Result {
-            build_config::<RuntimeGenesisConfig>(config)
+        fn preset_names() -> Vec<sp_genesis_builder::PresetId> {
+            vec![]
         }
     }
 
diff --git a/scripts/build.sh b/scripts/build.sh
index 3f588a1cc..b64c177d6 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -1,2 +1 @@
-cargo build --profile production --features "runtime-benchmarks metadata-hash"
-
+cargo build --profile production --features "metadata-hash"
diff --git a/scripts/localnet.sh b/scripts/localnet.sh
index 850a314d8..51e3d05a8 100755
--- a/scripts/localnet.sh
+++ b/scripts/localnet.sh
@@ -3,10 +3,10 @@
 # Check if `--no-purge` passed as a parameter
 NO_PURGE=0
 for arg in "$@"; do
-    if [ "$arg" = "--no-purge" ]; then
-        NO_PURGE=1
-        break
-    fi
+  if [ "$arg" = "--no-purge" ]; then
+    NO_PURGE=1
+    break
+  fi
 done
 
 # Determine the directory this script resides in. This allows invoking it from any location.
@@ -25,13 +25,13 @@ if [ "$fast_blocks" == "False" ]; then
   echo "fast_blocks is Off"
   : "${CHAIN:=local}"
   : "${BUILD_BINARY:=1}"
-  : "${FEATURES:="pow-faucet runtime-benchmarks"}"
+  : "${FEATURES:="pow-faucet"}"
 else
   # Block of code to execute if fast_blocks is not False
   echo "fast_blocks is On"
   : "${CHAIN:=local}"
   : "${BUILD_BINARY:=1}"
-  : "${FEATURES:="pow-faucet runtime-benchmarks fast-blocks"}"
+  : "${FEATURES:="pow-faucet fast-blocks"}"
 fi
 
 SPEC_PATH="${SCRIPT_DIR}/specs/"
@@ -77,6 +77,7 @@ alice_start=(
   --rpc-cors=all
   --allow-private-ipv4
   --discover-local
+  --unsafe-force-node-key-generation
 )
 
 bob_start=(
@@ -87,8 +88,10 @@ bob_start=(
   --port 30335
   --rpc-port 9945
   --validator
+  --rpc-cors=all
   --allow-private-ipv4
   --discover-local
+  --unsafe-force-node-key-generation
 )
 
 trap 'pkill -P $$' EXIT SIGINT SIGTERM
diff --git a/scripts/release_notes.rs b/scripts/release_notes.rs
new file mode 100755
index 000000000..73cbde4d9
--- /dev/null
+++ b/scripts/release_notes.rs
@@ -0,0 +1,173 @@
+#!/usr/bin/env rust-script
+// ^ `cargo install rust-script` to be able to run this script
+
+use core::{fmt::Display, str::FromStr};
+use std::{env, process::Command};
+
+fn eval(cmd: impl Display, print: bool) -> Result<String, String> {
+    if print {
+        println!("$ {}", cmd);
+    }
+    let output = Command::new("sh")
+        .arg("-c")
+        .arg(cmd.to_string())
+        .output()
+        .expect("failed to execute process");
+    if print {
+        println!("{}", String::from_utf8(output.stdout.clone()).unwrap());
+        eprintln!("{}", String::from_utf8(output.stderr.clone()).unwrap());
+    }
+    if !output.status.success() {
+        return Err(String::from_utf8(output.stderr).unwrap());
+    }
+    Ok(String::from_utf8(output.stdout).unwrap().trim().to_string())
+}
+
+#[derive(Copy, Clone, PartialEq, Eq, Debug)]
+enum Network {
+    Mainnet,
+    Testnet,
+}
+
+impl FromStr for Network {
+    type Err = ();
+
+    fn from_str(s: &str) -> Result<Self, Self::Err> {
+        match s {
+            "mainnet" => Ok(Network::Mainnet),
+            "testnet" => Ok(Network::Testnet),
+            _ => Err(()),
+        }
+    }
+}
+
+fn main() {
+    let network = env::var("NETWORK")
+        .unwrap_or_else(|_| "mainnet".to_string())
+        .parse::<Network>()
+        .unwrap_or_else(|_| panic!("Invalid NETWORK value"));
+    println!("Network: {:?}", network);
+
+    let all_tags = env::var("PREVIOUS_TAG")
+        .unwrap_or_else(|_| eval("git tag --sort=-creatordate", false).unwrap())
+        .split("\n")
+        .map(|s| s.trim().to_string())
+        .collect::<Vec<String>>();
+
+    let previous_tag = match network {
+        Network::Mainnet => all_tags
+            .iter()
+            .find(|tag| tag.starts_with("v") && !tag.ends_with("-pre-release"))
+            .expect("could not find a valid mainnet tag!"),
+        Network::Testnet => all_tags
+            .iter()
+            .find(|tag| tag.starts_with("v") && tag.ends_with("-pre-release"))
+            .expect("could not find a valid testnet tag!"),
+    };
+    println!("Previous release tag: {}", previous_tag);
+
+    let branch = env::var("BRANCH").unwrap_or(
+        match network {
+            Network::Mainnet => "testnet",
+            Network::Testnet => "devnet",
+        }
+        .to_string(),
+    );
+    println!("Branch: {}", branch);
+
+    println!(
+        "Generating release notes for all merges since {}...",
+        previous_tag,
+    );
+    let merges = eval(
+        format!(
+            "git log --merges --pretty=format:'%s' {}..{}",
+            branch, previous_tag,
+        ),
+        false,
+    )
+    .unwrap()
+    .split("\n")
+    .map(|s| s.trim().to_string())
+    .filter(|s| {
+        !s.is_empty()
+            && s.starts_with("Merge pull request #")
+            && !s.ends_with("from opentensor/devnet-ready")
+            && !s.ends_with("from opentensor/testnet-ready")
+            && !s.ends_with("from opentensor/devnet")
+            && !s.ends_with("from opentensor/testnet")
+    })
+    .collect::<Vec<String>>();
+
+    println!("");
+    println!("Filtered merges:\n{}", merges.join("\n"));
+
+    println!("");
+    let pr_numbers = merges
+        .iter()
+        .map(|s| s.split(" ").collect::<Vec<&str>>()[3].trim_start_matches("#"))
+        .collect::<Vec<&str>>();
+    println!("PR numbers:\n{:?}", pr_numbers);
+
+    println!("");
+    println!("Fetching PR titles...");
+    let pr_titles = pr_numbers
+        .iter()
+        .map(|pr_number| {
+            print!("#{}: ", pr_number);
+            let title = eval(format!("gh pr view {} --json title", pr_number), false)
+                .unwrap()
+                .trim()
+                .to_string();
+            if !title.starts_with("{\"title\":\"") {
+                panic!("Malformed PR title: {}", title);
+            }
+            let title = title
+                .trim_start_matches("{\"title\":\"")
+                .trim_end_matches("\"}")
+                .trim()
+                .to_string();
+            println!("{}", title);
+            title
+        })
+        .collect::<Vec<String>>();
+
+    println!("");
+    println!("Fetching PR authors...");
+    let pr_authors = pr_numbers
+        .iter()
+        .map(|pr_number| {
+            print!("#{}: ", pr_number);
+            let author = eval(
+                format!("gh pr view {} --json author | jq .author.login", pr_number),
+                false,
+            )
+            .unwrap()
+            .trim()
+            .trim_start_matches("\"")
+            .trim_end_matches("\"")
+            .to_string();
+            println!("{}", author);
+            author
+        })
+        .collect::<Vec<String>>();
+
+    println!("");
+    println!("generated release notes:");
+    let release_notes = "## What's Changed\n".to_string();
+    let release_notes = release_notes
+        + &pr_numbers
+            .iter()
+            .zip(pr_titles.iter())
+            .zip(pr_authors.iter())
+            .map(|((pr_number, pr_title), pr_author)| {
+                format!("- {} in #{} by @{}\n", pr_title, pr_number, pr_author)
+            })
+            .collect::<String>();
+    println!("{}", release_notes);
+
+    println!("");
+    println!("writing release notes to /tmp/release_notes.md");
+    std::fs::write("/tmp/release_notes.md", release_notes).unwrap();
+    println!("done!");
+}
diff --git a/support/linting/Cargo.toml b/support/linting/Cargo.toml
index 1e37d8163..4378ca9dd 100644
--- a/support/linting/Cargo.toml
+++ b/support/linting/Cargo.toml
@@ -7,6 +7,7 @@ edition = "2021"
 syn.workspace = true
 quote.workspace = true
 proc-macro2.workspace = true
+procedural-fork = { version = "1.10.0-rc3", path = "../procedural-fork" }
 
 [lints]
 workspace = true
diff --git a/support/linting/src/lib.rs b/support/linting/src/lib.rs
index d02a70a2b..e5416c1d5 100644
--- a/support/linting/src/lib.rs
+++ b/support/linting/src/lib.rs
@@ -1,6 +1,8 @@
 pub mod lint;
 pub use lint::*;
 
+mod pallet_index;
 mod require_freeze_struct;
 
+pub use pallet_index::RequireExplicitPalletIndex;
 pub use require_freeze_struct::RequireFreezeStruct;
diff --git a/support/linting/src/pallet_index.rs b/support/linting/src/pallet_index.rs
new file mode 100644
index 000000000..8ed3627d5
--- /dev/null
+++ b/support/linting/src/pallet_index.rs
@@ -0,0 +1,301 @@
+use super::*;
+use proc_macro2::TokenStream as TokenStream2;
+use procedural_fork::exports::construct_runtime::parse::RuntimeDeclaration;
+use quote::ToTokens;
+use syn::{visit::Visit, File};
+
+pub struct RequireExplicitPalletIndex;
+
+impl Lint for RequireExplicitPalletIndex {
+    fn lint(source: &File) -> Result {
+        let mut visitor = ConstructRuntimeVisitor::new(source.to_token_stream());
+        visitor.visit_file(source);
+
+        if !visitor.errors.is_empty() {
+            return Err(visitor.errors);
+        }
+
+        Ok(())
+    }
+}
+
+struct ConstructRuntimeVisitor {
+    original_tokens: String,
+    errors: Vec<syn::Error>,
+}
+
+impl<'ast> syn::visit::Visit<'ast> for ConstructRuntimeVisitor {
+    fn visit_item_macro(&mut self, node: &'ast syn::ItemMacro) {
+        let is_construct_runtime = node
+            .mac
+            .path
+            .segments
+            .last()
+            .map_or(false, |segment| segment.ident == "construct_runtime");
+
+        if is_construct_runtime {
+            let tokens = node.mac.tokens.clone();
+
+            match syn::parse2::<RuntimeDeclaration>(tokens) {
+                Ok(runtime_decl) => match runtime_decl {
+                    RuntimeDeclaration::Explicit(runtime) => {
+                        self.check_pallets_for_index(&runtime.pallets);
+                    }
+                    RuntimeDeclaration::ExplicitExpanded(runtime) => {
+                        self.check_pallets_for_index(&runtime.pallets);
+                    }
+                    RuntimeDeclaration::Implicit(runtime) => {
+                        // Only implicit runtime allows `None` for index
+                        for pallet in runtime.pallets {
+                            if pallet.index.is_none() {
+                                self.errors.push(syn::Error::new(
+                                    pallet.name.span(),
+                                    format!(
+                                        "Pallet `{}` does not have an explicit index in the implicit construct_runtime!",
+                                        pallet.name.to_token_stream()
+                                    ),
+                                ));
+                            }
+                        }
+                    }
+                },
+                Err(e) => self.errors.push(e),
+            }
+        }
+
+        syn::visit::visit_item_macro(self, node);
+    }
+}
+
+impl ConstructRuntimeVisitor {
+    fn new(original_tokens: impl Into<TokenStream2>) -> Self {
+        ConstructRuntimeVisitor {
+            original_tokens: {
+                let mut st = original_tokens.into().to_string();
+                st.retain(|c| !c.is_whitespace());
+                st
+            },
+            errors: Vec::new(),
+        }
+    }
+
+    fn check_pallets_for_index(
+        &mut self,
+        pallets: &[procedural_fork::exports::construct_runtime::parse::Pallet],
+    ) {
+        for pallet in pallets {
+            // Check for explicit index and detect missing indices
+            if !self
+                .original_tokens
+                .contains(format!("={},", pallet.index).as_str())
+            {
+                // ^ HACK: FRAME's parsing code does not allow us to differentiate between an
+                // automatically generated index and an explicitly provided index so we fall
+                // back to the original source code here. e.g. if index is 1, we will search
+                // for " = 1" in the original source code to determine if it was explicitly provided.
+                self.errors.push(syn::Error::new(
+                    pallet.name.span(),
+                    format!(
+                        "Pallet `{}` does not have an explicit index in construct_runtime!",
+                        pallet.name.to_token_stream()
+                    ),
+                ));
+            }
+        }
+    }
+}
+
+#[cfg(test)]
+#[allow(clippy::unwrap_used)]
+mod tests {
+    use super::*;
+    use quote::quote;
+
+    fn lint_macro(input: proc_macro2::TokenStream) -> Result {
+        let item_macro: syn::ItemMacro = syn::parse2(input).unwrap();
+        let mut visitor = ConstructRuntimeVisitor::new(item_macro.to_token_stream());
+        visitor.visit_item_macro(&item_macro);
+        if !visitor.errors.is_empty() {
+            return Err(visitor.errors);
+        }
+        Ok(())
+    }
+
+    #[test]
+    fn test_no_pallet_index() {
+        let input = quote! {
+            construct_runtime! {
+                pub enum Test where
+                    Block = Block,
+                    NodeBlock = Block,
+                    UncheckedExtrinsic = UncheckedExtrinsic
+                {
+                    PalletA,
+                    PalletB
+                }
+            }
+        };
+        lint_macro(input).unwrap_err();
+    }
+
+    #[test]
+    fn test_mixed_pallet_index() {
+        let input = quote! {
+            construct_runtime! {
+                pub enum Test where
+                    Block = Block,
+                    NodeBlock = Block,
+                    UncheckedExtrinsic = UncheckedExtrinsic
+                {
+                    PalletA,
+                    PalletB: 1
+                }
+            }
+        };
+        lint_macro(input).unwrap_err();
+    }
+
+    #[test]
+    fn test_complex_construct_runtime_struct() {
+        let input = quote! {
+        construct_runtime! {
+            pub struct Runtime {
+                System : frame_system = 0,
+                RandomnessCollectiveFlip : pallet_insecure_randomness_collective_flip = 1,
+                Timestamp : pallet_timestamp = 2,
+                Aura : pallet_aura = 3,
+                Grandpa : pallet_grandpa = 4,
+                Balances : pallet_balances = 5,
+                TransactionPayment : pallet_transaction_payment = 6,
+                SubtensorModule : pallet_subtensor = 7,
+                Triumvirate : pallet_collective::<Instance1>::{ Pallet, Call, Storage, Origin<T>, Event<T>, Config<T> } = 8,
+                TriumvirateMembers : pallet_membership::<Instance1>::{ Pallet, Call, Storage, Event<T>, Config<T> } = 9,
+                SenateMembers : pallet_membership::<Instance2>::{ Pallet, Call, Storage, Event<T>, Config<T> } = 10,
+                Utility : pallet_utility = 11,
+                Sudo : pallet_sudo = 12,
+                Multisig : pallet_multisig = 13,
+                Preimage : pallet_preimage = 14,
+                Scheduler : pallet_scheduler = 15,
+                Proxy : pallet_proxy = 16,
+                Registry : pallet_registry = 17,
+                Commitments : pallet_commitments = 18,
+                AdminUtils : pallet_admin_utils = 19,
+                SafeMode : pallet_safe_mode = 20
+            }
+        }
+        };
+
+        lint_macro(input).unwrap();
+    }
+
+    #[test]
+    fn test_complex_construct_runtime_enum_should_fail() {
+        let input = quote! {
+        construct_runtime! {
+            pub enum Test {
+                System: frame_system::{Pallet, Call, Config<T>, Storage, Event<T>},
+                Balances: pallet_balances::{Pallet, Call, Config<T>, Storage, Event<T>},
+                Triumvirate: pallet_collective::<Instance1>::{Pallet, Call, Storage, Origin<T>, Event<T>, Config<T>},
+                TriumvirateMembers: pallet_membership::<Instance1>::{Pallet, Call, Storage, Event<T>, Config<T>},
+                Senate: pallet_collective::<Instance2>::{Pallet, Call, Storage, Origin<T>, Event<T>, Config<T>},
+                SenateMembers: pallet_membership::<Instance2>::{Pallet, Call, Storage, Event<T>, Config<T>},
+                SubtensorModule: pallet_subtensor::{Pallet, Call, Storage, Event<T>},
+                Utility: pallet_utility::{Pallet, Call, Storage, Event},
+                Scheduler: pallet_scheduler::{Pallet, Call, Storage, Event<T>},
+                Preimage: pallet_preimage::{Pallet, Call, Storage, Event<T>},
+            }
+        }
+        };
+
+        lint_macro(input).unwrap_err();
+    }
+
+    #[test]
+    fn test_implicit_construct_runtime_should_fail() {
+        let input = quote! {
+        construct_runtime! {
+            pub struct Runtime {
+                System: frame_system = 0,
+                RandomnessCollectiveFlip: pallet_insecure_randomness_collective_flip = 1,
+                Timestamp: pallet_timestamp,
+                Aura: pallet_aura,
+                Grandpa: pallet_grandpa,
+                Balances: pallet_balances,
+                TransactionPayment: pallet_transaction_payment
+            }
+        }
+        };
+
+        lint_macro(input).unwrap_err();
+    }
+
+    #[test]
+    fn test_explicit_expanded_runtime_with_correct_index_should_pass() {
+        let input = quote! {
+        construct_runtime! {
+            pub struct Runtime {
+                System : frame_system = 0,
+                Balances : pallet_balances = 1,
+                ExpandedPallet: pallet_collective::{ Pallet, Call, Config<T>, Storage, Event<T> } = 2
+            }
+        }
+        };
+
+        lint_macro(input).unwrap();
+    }
+
+    #[test]
+    fn test_explicit_expanded_runtime_with_missing_index_should_fail() {
+        let input = quote! {
+        construct_runtime! {
+            pub struct Runtime {
+                System : frame_system = 0,
+                Balances : pallet_balances = 1,
+                ExpandedPallet: pallet_collective::{ Pallet, Call, Config<T>, Storage, Event<T> },
+                FaultyPallet: pallet_sudo
+            }
+        }
+        };
+
+        lint_macro(input).unwrap_err();
+    }
+
+    #[test]
+    fn test_fully_qualified_construct_runtime_should_pass() {
+        let input = quote! {
+        frame_support::construct_runtime! {
+            pub enum Test {
+                System: frame_system = 1,
+                Balances: pallet_balances = 2,
+                AdminUtils: pallet_admin_utils = 3,
+                SubtensorModule: pallet_subtensor::{Pallet, Call, Storage, Event<T>, Error<T>} = 4,
+                Scheduler: pallet_scheduler::{Pallet, Call, Storage, Event<T>} = 5,
+            }
+        }
+        };
+
+        lint_macro(input).unwrap();
+    }
+
+    #[test]
+    fn test_mixed_pallets_should_fail() {
+        let input = quote! {
+        frame_support::construct_runtime! {
+            pub enum Test {
+                System: frame_system::{Pallet, Call, Config<T>, Storage, Event<T>} = 1,
+                Balances: pallet_balances::{Pallet, Call, Config<T>, Storage, Event<T>},
+                Triumvirate: pallet_collective::<Instance1>::{Pallet, Call, Storage, Origin<T>, Event<T>, Config<T>} = 3,
+                TriumvirateMembers: pallet_membership::<Instance1>::{Pallet, Call, Storage, Event<T>, Config<T>} = 4,
+                Senate: pallet_collective::<Instance2>::{Pallet, Call, Storage, Origin<T>, Event<T>, Config<T>} = 5,
+                SenateMembers: pallet_membership::<Instance2>::{Pallet, Call, Storage, Event<T>, Config<T>} = 6,
+                SubtensorModule: pallet_subtensor::{Pallet, Call, Storage, Event<T>} = 7,
+                Utility: pallet_utility::{Pallet, Call, Storage, Event} = 8,
+                Scheduler: pallet_scheduler::{Pallet, Call, Storage, Event<T>} = 9,
+                Preimage: pallet_preimage::{Pallet, Call, Storage, Event<T>} = 10,
+            }
+        }
+        };
+
+        lint_macro(input).unwrap_err();
+    }
+}
diff --git a/support/procedural-fork/Cargo.toml b/support/procedural-fork/Cargo.toml
new file mode 100644
index 000000000..503c81f1f
--- /dev/null
+++ b/support/procedural-fork/Cargo.toml
@@ -0,0 +1,34 @@
+[package]
+name = "procedural-fork"
+version = "1.10.0-rc3"
+edition = "2021"
+
+[lints.clippy]
+all = "allow"
+
+[dependencies]
+derive-syn-parse = "0.2"
+Inflector = "0.11"
+cfg-expr = "0.15"
+itertools = "0.10"
+proc-macro2.workspace = true
+quote.workspace = true
+syn.workspace = true
+macro_magic = { version = "0.5", features = ["proc_support"] }
+frame-support-procedural-tools = { version = "10.0.0" }
+proc-macro-warning = { version = "1", default-features = false }
+expander = "2"
+sp-crypto-hashing = { default-features = false, version = "0.1.0" }
+
+[dev-dependencies]
+regex = "1"
+
+[features]
+default = ["std"]
+std = ["sp-crypto-hashing/std"]
+no-metadata-docs = []
+experimental = []
+# Generate impl-trait for tuples with the given number of tuples. Will be needed as the number of
+# pallets in a runtime grows. Does increase the compile time!
+tuples-96 = []
+tuples-128 = []
diff --git a/support/procedural-fork/src/benchmark.rs b/support/procedural-fork/src/benchmark.rs
new file mode 100644
index 000000000..376200d6e
--- /dev/null
+++ b/support/procedural-fork/src/benchmark.rs
@@ -0,0 +1,1279 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Home of the parsing and expansion code for the new pallet benchmarking syntax
+
+use derive_syn_parse::Parse;
+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};
+use syn::{
+    parse::{Nothing, ParseStream},
+    parse_quote,
+    punctuated::Punctuated,
+    spanned::Spanned,
+    token::{Comma, Gt, Lt, PathSep},
+    Attribute, Error, Expr, ExprBlock, ExprCall, ExprPath, FnArg, Item, ItemFn, ItemMod, Pat, Path,
+    PathArguments, PathSegment, Result, ReturnType, Signature, Stmt, Token, Type, TypePath,
+    Visibility, WhereClause,
+};
+
+mod keywords {
+    use syn::custom_keyword;
+
+    custom_keyword!(benchmark);
+    custom_keyword!(benchmarks);
+    custom_keyword!(block);
+    custom_keyword!(extra);
+    custom_keyword!(pov_mode);
+    custom_keyword!(extrinsic_call);
+    custom_keyword!(skip_meta);
+    custom_keyword!(BenchmarkError);
+    custom_keyword!(Result);
+    custom_keyword!(MaxEncodedLen);
+    custom_keyword!(Measured);
+    custom_keyword!(Ignored);
+
+    pub const BENCHMARK_TOKEN: &str = stringify!(benchmark);
+    pub const BENCHMARKS_TOKEN: &str = stringify!(benchmarks);
+}
+
+/// This represents the raw parsed data for a param definition such as `x: Linear<10, 20>`.
+#[derive(Clone)]
+struct ParamDef {
+    name: String,
+    _typ: Type,
+    start: syn::GenericArgument,
+    end: syn::GenericArgument,
+}
+
+/// Allows easy parsing of the `<10, 20>` component of `x: Linear<10, 20>`.
+#[derive(Parse)]
+struct RangeArgs {
+    _lt_token: Lt,
+    start: syn::GenericArgument,
+    _comma: Comma,
+    end: syn::GenericArgument,
+    _trailing_comma: Option<Comma>,
+    _gt_token: Gt,
+}
+
+#[derive(Clone, Debug)]
+struct BenchmarkAttrs {
+    skip_meta: bool,
+    extra: bool,
+    pov_mode: Option<PovModeAttr>,
+}
+
+/// Represents a single benchmark option
+enum BenchmarkAttr {
+    Extra,
+    SkipMeta,
+    /// How the PoV should be measured.
+    PoV(PovModeAttr),
+}
+
+impl syn::parse::Parse for PovModeAttr {
+    fn parse(input: ParseStream) -> Result<Self> {
+        let _pov: keywords::pov_mode = input.parse()?;
+        let _eq: Token![=] = input.parse()?;
+        let root = PovEstimationMode::parse(input)?;
+
+        let mut maybe_content = None;
+        let _ = || -> Result<()> {
+            let content;
+            syn::braced!(content in input);
+            maybe_content = Some(content);
+            Ok(())
+        }();
+
+        let per_key = match maybe_content {
+            Some(content) => {
+                let per_key = Punctuated::<PovModeKeyAttr, Token![,]>::parse_terminated(&content)?;
+                per_key.into_iter().collect()
+            }
+            None => Vec::new(),
+        };
+
+        Ok(Self { root, per_key })
+    }
+}
+
+impl syn::parse::Parse for BenchmarkAttr {
+    fn parse(input: ParseStream) -> Result<Self> {
+        let lookahead = input.lookahead1();
+        if lookahead.peek(keywords::extra) {
+            let _extra: keywords::extra = input.parse()?;
+            Ok(BenchmarkAttr::Extra)
+        } else if lookahead.peek(keywords::skip_meta) {
+            let _skip_meta: keywords::skip_meta = input.parse()?;
+            Ok(BenchmarkAttr::SkipMeta)
+        } else if lookahead.peek(keywords::pov_mode) {
+            PovModeAttr::parse(input).map(BenchmarkAttr::PoV)
+        } else {
+            Err(lookahead.error())
+        }
+    }
+}
+
+/// A `#[pov_mode = .. { .. }]` attribute.
+#[derive(Debug, Clone)]
+struct PovModeAttr {
+    /// The root mode for this benchmarks.
+    root: PovEstimationMode,
+    /// The pov-mode for a specific key. This overwrites `root` for this key.
+    per_key: Vec<PovModeKeyAttr>,
+}
+
+/// A single key-value pair inside the `{}` of a `#[pov_mode = .. { .. }]` attribute.
+#[derive(Debug, Clone, derive_syn_parse::Parse)]
+struct PovModeKeyAttr {
+    /// A specific storage key for which to set the PoV mode.
+    key: Path,
+    _underscore: Token![:],
+    /// The PoV mode for this key.
+    mode: PovEstimationMode,
+}
+
+/// How the PoV should be estimated.
+#[derive(Debug, Eq, PartialEq, Clone, Copy)]
+pub enum PovEstimationMode {
+    /// Use the maximal encoded length as provided by [`codec::MaxEncodedLen`].
+    MaxEncodedLen,
+    /// Measure the accessed value size in the pallet benchmarking and add some trie overhead.
+    Measured,
+    /// Do not estimate the PoV size for this storage item or benchmark.
+    Ignored,
+}
+
+impl syn::parse::Parse for PovEstimationMode {
+    fn parse(input: ParseStream) -> Result<Self> {
+        let lookahead = input.lookahead1();
+        if lookahead.peek(keywords::MaxEncodedLen) {
+            let _max_encoded_len: keywords::MaxEncodedLen = input.parse()?;
+            return Ok(PovEstimationMode::MaxEncodedLen);
+        } else if lookahead.peek(keywords::Measured) {
+            let _measured: keywords::Measured = input.parse()?;
+            return Ok(PovEstimationMode::Measured);
+        } else if lookahead.peek(keywords::Ignored) {
+            let _ignored: keywords::Ignored = input.parse()?;
+            return Ok(PovEstimationMode::Ignored);
+        } else {
+            return Err(lookahead.error());
+        }
+    }
+}
+
+impl ToString for PovEstimationMode {
+    fn to_string(&self) -> String {
+        match self {
+            PovEstimationMode::MaxEncodedLen => "MaxEncodedLen".into(),
+            PovEstimationMode::Measured => "Measured".into(),
+            PovEstimationMode::Ignored => "Ignored".into(),
+        }
+    }
+}
+
+impl quote::ToTokens for PovEstimationMode {
+    fn to_tokens(&self, tokens: &mut TokenStream2) {
+        match self {
+            PovEstimationMode::MaxEncodedLen => tokens.extend(quote!(MaxEncodedLen)),
+            PovEstimationMode::Measured => tokens.extend(quote!(Measured)),
+            PovEstimationMode::Ignored => tokens.extend(quote!(Ignored)),
+        }
+    }
+}
+
+impl syn::parse::Parse for BenchmarkAttrs {
+    fn parse(input: ParseStream) -> syn::Result<Self> {
+        let mut extra = false;
+        let mut skip_meta = false;
+        let mut pov_mode = None;
+        let args = Punctuated::<BenchmarkAttr, Token![,]>::parse_terminated(&input)?;
+
+        for arg in args.into_iter() {
+            match arg {
+                BenchmarkAttr::Extra => {
+                    if extra {
+                        return Err(input.error("`extra` can only be specified once"));
+                    }
+                    extra = true;
+                }
+                BenchmarkAttr::SkipMeta => {
+                    if skip_meta {
+                        return Err(input.error("`skip_meta` can only be specified once"));
+                    }
+                    skip_meta = true;
+                }
+                BenchmarkAttr::PoV(mode) => {
+                    if pov_mode.is_some() {
+                        return Err(input.error("`pov_mode` can only be specified once"));
+                    }
+                    pov_mode = Some(mode);
+                }
+            }
+        }
+        Ok(BenchmarkAttrs {
+            extra,
+            skip_meta,
+            pov_mode,
+        })
+    }
+}
+
+/// Represents the parsed extrinsic call for a benchmark
+#[derive(Clone)]
+enum BenchmarkCallDef {
+    ExtrinsicCall {
+        origin: Expr,
+        expr_call: ExprCall,
+        attr_span: Span,
+    }, // #[extrinsic_call]
+    Block {
+        block: ExprBlock,
+        attr_span: Span,
+    }, // #[block]
+}
+
+impl BenchmarkCallDef {
+    /// Returns the `span()` for attribute
+    fn attr_span(&self) -> Span {
+        match self {
+            BenchmarkCallDef::ExtrinsicCall {
+                origin: _,
+                expr_call: _,
+                attr_span,
+            } => *attr_span,
+            BenchmarkCallDef::Block {
+                block: _,
+                attr_span,
+            } => *attr_span,
+        }
+    }
+}
+
+/// Represents a parsed `#[benchmark]` or `#[instance_benchmark]` item.
+#[derive(Clone)]
+struct BenchmarkDef {
+    params: Vec<ParamDef>,
+    setup_stmts: Vec<Stmt>,
+    call_def: BenchmarkCallDef,
+    verify_stmts: Vec<Stmt>,
+    last_stmt: Option<Stmt>,
+    fn_sig: Signature,
+    fn_vis: Visibility,
+    fn_attrs: Vec<Attribute>,
+}
+
+/// used to parse something compatible with `Result<T, E>`
+#[derive(Parse)]
+struct ResultDef {
+    _result_kw: keywords::Result,
+    _lt: Token![<],
+    unit: Type,
+    _comma: Comma,
+    e_type: TypePath,
+    _gt: Token![>],
+}
+
+/// Ensures that `ReturnType` is a `Result<(), BenchmarkError>`, if specified
+fn ensure_valid_return_type(item_fn: &ItemFn) -> Result<()> {
+    if let ReturnType::Type(_, typ) = &item_fn.sig.output {
+        let non_unit = |span| return Err(Error::new(span, "expected `()`"));
+        let Type::Path(TypePath { path, qself: _ }) = &**typ else {
+            return Err(Error::new(
+					typ.span(),
+					"Only `Result<(), BenchmarkError>` or a blank return type is allowed on benchmark function definitions",
+				));
+        };
+        let seg = path
+            .segments
+            .last()
+            .expect("to be parsed as a TypePath, it must have at least one segment; qed");
+        let res: ResultDef = syn::parse2(seg.to_token_stream())?;
+        // ensure T in Result<T, E> is ()
+        let Type::Tuple(tup) = res.unit else {
+            return non_unit(res.unit.span());
+        };
+        if !tup.elems.is_empty() {
+            return non_unit(tup.span());
+        }
+        let TypePath { path, qself: _ } = res.e_type;
+        let seg = path
+            .segments
+            .last()
+            .expect("to be parsed as a TypePath, it must have at least one segment; qed");
+        syn::parse2::<keywords::BenchmarkError>(seg.to_token_stream())?;
+    }
+    Ok(())
+}
+
+/// Parses params such as `x: Linear<0, 1>`
+fn parse_params(item_fn: &ItemFn) -> Result<Vec<ParamDef>> {
+    let mut params: Vec<ParamDef> = Vec::new();
+    for arg in &item_fn.sig.inputs {
+        let invalid_param = |span| {
+            return Err(Error::new(
+                span,
+                "Invalid benchmark function param. A valid example would be `x: Linear<5, 10>`.",
+            ));
+        };
+
+        let FnArg::Typed(arg) = arg else {
+            return invalid_param(arg.span());
+        };
+        let Pat::Ident(ident) = &*arg.pat else {
+            return invalid_param(arg.span());
+        };
+
+        // check param name
+        let var_span = ident.span();
+        let invalid_param_name = || {
+            return Err(Error::new(
+					var_span,
+					"Benchmark parameter names must consist of a single lowercase letter (a-z) and no other characters.",
+				));
+        };
+        let name = ident.ident.to_token_stream().to_string();
+        if name.len() > 1 {
+            return invalid_param_name();
+        };
+        let Some(name_char) = name.chars().next() else {
+            return invalid_param_name();
+        };
+        if !name_char.is_alphabetic() || !name_char.is_lowercase() {
+            return invalid_param_name();
+        }
+
+        // parse type
+        let typ = &*arg.ty;
+        let Type::Path(tpath) = typ else {
+            return invalid_param(typ.span());
+        };
+        let Some(segment) = tpath.path.segments.last() else {
+            return invalid_param(typ.span());
+        };
+        let args = segment.arguments.to_token_stream().into();
+        let Ok(args) = syn::parse::<RangeArgs>(args) else {
+            return invalid_param(typ.span());
+        };
+
+        params.push(ParamDef {
+            name,
+            _typ: typ.clone(),
+            start: args.start,
+            end: args.end,
+        });
+    }
+    Ok(params)
+}
+
+/// Used in several places where the `#[extrinsic_call]` or `#[body]` annotation is missing
+fn missing_call<T>(item_fn: &ItemFn) -> Result<T> {
+    return Err(Error::new(
+		item_fn.block.brace_token.span.join(),
+		"No valid #[extrinsic_call] or #[block] annotation could be found in benchmark function body."
+	));
+}
+
+/// Finds the `BenchmarkCallDef` and its index (within the list of stmts for the fn) and
+/// returns them. Also handles parsing errors for invalid / extra call defs. AKA this is
+/// general handling for `#[extrinsic_call]` and `#[block]`
+fn parse_call_def(item_fn: &ItemFn) -> Result<(usize, BenchmarkCallDef)> {
+    // #[extrinsic_call] / #[block] handling
+    let call_defs = item_fn.block.stmts.iter().enumerate().filter_map(|(i, child)| {
+			if let Stmt::Expr(Expr::Call(expr_call), _semi) = child {
+				// #[extrinsic_call] case
+				expr_call.attrs.iter().enumerate().find_map(|(k, attr)| {
+					let segment = attr.path().segments.last()?;
+					let _: keywords::extrinsic_call = syn::parse(segment.ident.to_token_stream().into()).ok()?;
+					let mut expr_call = expr_call.clone();
+
+					// consume #[extrinsic_call] tokens
+					expr_call.attrs.remove(k);
+
+					// extract origin from expr_call
+					let Some(origin) = expr_call.args.first().cloned() else {
+						return Some(Err(Error::new(expr_call.span(), "Single-item extrinsic calls must specify their origin as the first argument.")))
+					};
+
+					Some(Ok((i, BenchmarkCallDef::ExtrinsicCall { origin, expr_call, attr_span: attr.span() })))
+				})
+			} else if let Stmt::Expr(Expr::Block(block), _) = child {
+				// #[block] case
+				block.attrs.iter().enumerate().find_map(|(k, attr)| {
+					let segment = attr.path().segments.last()?;
+					let _: keywords::block = syn::parse(segment.ident.to_token_stream().into()).ok()?;
+					let mut block = block.clone();
+
+					// consume #[block] tokens
+					block.attrs.remove(k);
+
+					Some(Ok((i, BenchmarkCallDef::Block { block, attr_span: attr.span() })))
+				})
+			} else {
+				None
+			}
+		}).collect::<Result<Vec<_>>>()?;
+    Ok(match &call_defs[..] {
+        [(i, call_def)] => (*i, call_def.clone()), // = 1
+        [] => return missing_call(item_fn),
+        _ => {
+            return Err(Error::new(
+                call_defs[1].1.attr_span(),
+                "Only one #[extrinsic_call] or #[block] attribute is allowed per benchmark.",
+            ))
+        }
+    })
+}
+
+impl BenchmarkDef {
+    /// Constructs a [`BenchmarkDef`] by traversing an existing [`ItemFn`] node.
+    pub fn from(item_fn: &ItemFn) -> Result<BenchmarkDef> {
+        let params = parse_params(item_fn)?;
+        ensure_valid_return_type(item_fn)?;
+        let (i, call_def) = parse_call_def(&item_fn)?;
+
+        let (verify_stmts, last_stmt) = match item_fn.sig.output {
+            ReturnType::Default =>
+            // no return type, last_stmt should be None
+            {
+                (
+                    Vec::from(&item_fn.block.stmts[(i + 1)..item_fn.block.stmts.len()]),
+                    None,
+                )
+            }
+            ReturnType::Type(_, _) => {
+                // defined return type, last_stmt should be Result<(), BenchmarkError>
+                // compatible and should not be included in verify_stmts
+                if i + 1 >= item_fn.block.stmts.len() {
+                    return Err(Error::new(
+                        item_fn.block.span(),
+                        "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.",
+                    ));
+                }
+                let Some(stmt) = item_fn.block.stmts.last() else {
+                    return missing_call(item_fn);
+                };
+                (
+                    Vec::from(&item_fn.block.stmts[(i + 1)..item_fn.block.stmts.len() - 1]),
+                    Some(stmt.clone()),
+                )
+            }
+        };
+
+        Ok(BenchmarkDef {
+            params,
+            setup_stmts: Vec::from(&item_fn.block.stmts[0..i]),
+            call_def,
+            verify_stmts,
+            last_stmt,
+            fn_sig: item_fn.sig.clone(),
+            fn_vis: item_fn.vis.clone(),
+            fn_attrs: item_fn.attrs.clone(),
+        })
+    }
+}
+
+/// Parses and expands a `#[benchmarks]` or `#[instance_benchmarks]` invocation
+pub fn benchmarks(
+    attrs: TokenStream,
+    tokens: TokenStream,
+    instance: bool,
+) -> syn::Result<TokenStream> {
+    let krate = generate_access_from_frame_or_crate("frame-benchmarking")?;
+    // gather module info
+    let module: ItemMod = syn::parse(tokens)?;
+    let mod_span = module.span();
+    let where_clause = match syn::parse::<Nothing>(attrs.clone()) {
+        Ok(_) => quote!(),
+        Err(_) => syn::parse::<WhereClause>(attrs)?
+            .predicates
+            .to_token_stream(),
+    };
+    let mod_vis = module.vis;
+    let mod_name = module.ident;
+
+    // consume #[benchmarks] attribute by excluding it from mod_attrs
+    let mod_attrs: Vec<&Attribute> = module
+        .attrs
+        .iter()
+        .filter(|attr| !attr.path().is_ident(keywords::BENCHMARKS_TOKEN))
+        .collect();
+
+    let mut benchmark_names: Vec<Ident> = Vec::new();
+    let mut extra_benchmark_names: Vec<Ident> = Vec::new();
+    let mut skip_meta_benchmark_names: Vec<Ident> = Vec::new();
+    // Map benchmarks to PoV modes.
+    let mut pov_modes = Vec::new();
+
+    let (_brace, mut content) = module
+        .content
+        .ok_or(syn::Error::new(mod_span, "Module cannot be empty!"))?;
+
+    // find all function defs marked with #[benchmark]
+    let benchmark_fn_metas = content.iter_mut().filter_map(|stmt| {
+        // parse as a function def first
+        let Item::Fn(func) = stmt else { return None };
+
+        // find #[benchmark] attribute on function def
+        let benchmark_attr = func
+            .attrs
+            .iter()
+            .find(|attr| attr.path().is_ident(keywords::BENCHMARK_TOKEN))?;
+
+        Some((benchmark_attr.clone(), func.clone(), stmt))
+    });
+
+    // parse individual benchmark defs and args
+    for (benchmark_attr, func, stmt) in benchmark_fn_metas {
+        // parse benchmark def
+        let benchmark_def = BenchmarkDef::from(&func)?;
+
+        // record benchmark name
+        let name = &func.sig.ident;
+        benchmark_names.push(name.clone());
+
+        // Check if we need to parse any args
+        if benchmark_attr.meta.require_path_only().is_err() {
+            // parse any args provided to #[benchmark]
+            let benchmark_attrs: BenchmarkAttrs = benchmark_attr.parse_args()?;
+
+            // record name sets
+            if benchmark_attrs.extra {
+                extra_benchmark_names.push(name.clone());
+            } else if benchmark_attrs.skip_meta {
+                skip_meta_benchmark_names.push(name.clone());
+            }
+
+            if let Some(mode) = benchmark_attrs.pov_mode {
+                let mut modes = Vec::new();
+                // We cannot expand strings here since it is no-std, but syn does not expand bytes.
+                let name = name.to_string();
+                let m = mode.root.to_string();
+                modes.push(quote!(("ALL".as_bytes().to_vec(), #m.as_bytes().to_vec())));
+
+                for attr in mode.per_key.iter() {
+                    // syn always puts spaces in quoted paths:
+                    let key = attr
+                        .key
+                        .clone()
+                        .into_token_stream()
+                        .to_string()
+                        .replace(" ", "");
+                    let mode = attr.mode.to_string();
+                    modes.push(quote!((#key.as_bytes().to_vec(), #mode.as_bytes().to_vec())));
+                }
+
+                pov_modes.push(
+                    quote!((#name.as_bytes().to_vec(), #krate::__private::vec![#(#modes),*])),
+                );
+            }
+        }
+
+        // expand benchmark
+        let expanded = expand_benchmark(benchmark_def, name, instance, where_clause.clone());
+
+        // replace original function def with expanded code
+        *stmt = Item::Verbatim(expanded);
+    }
+
+    // generics
+    let type_use_generics = match instance {
+        false => quote!(T),
+        true => quote!(T, I),
+    };
+    let type_impl_generics = match instance {
+        false => quote!(T: Config),
+        true => quote!(T: Config<I>, I: 'static),
+    };
+
+    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();
+    let extra_benchmark_names_str: Vec<String> = extra_benchmark_names
+        .iter()
+        .map(|n| n.to_string())
+        .collect();
+    let skip_meta_benchmark_names_str: Vec<String> = skip_meta_benchmark_names
+        .iter()
+        .map(|n| n.to_string())
+        .collect();
+    let mut selected_benchmark_mappings: Vec<TokenStream2> = Vec::new();
+    let mut benchmarks_by_name_mappings: Vec<TokenStream2> = Vec::new();
+    let test_idents: Vec<Ident> = benchmark_names_str
+        .iter()
+        .map(|n| Ident::new(format!("test_benchmark_{}", n).as_str(), Span::call_site()))
+        .collect();
+    for i in 0..benchmark_names.len() {
+        let name_ident = &benchmark_names[i];
+        let name_str = &benchmark_names_str[i];
+        let test_ident = &test_idents[i];
+        selected_benchmark_mappings.push(quote!(#name_str => SelectedBenchmark::#name_ident));
+        benchmarks_by_name_mappings.push(quote!(#name_str => Self::#test_ident()))
+    }
+
+    let impl_test_function = content
+        .iter_mut()
+        .find_map(|item| {
+            let Item::Macro(item_macro) = item else {
+                return None;
+            };
+
+            if !item_macro
+                .mac
+                .path
+                .segments
+                .iter()
+                .any(|s| s.ident == "impl_benchmark_test_suite")
+            {
+                return None;
+            }
+
+            let tokens = item_macro.mac.tokens.clone();
+            *item = Item::Verbatim(quote! {});
+
+            Some(quote! {
+                impl_test_function!(
+                    (#( {} #benchmark_names )*)
+                    (#( #extra_benchmark_names )*)
+                    (#( #skip_meta_benchmark_names )*)
+                    #tokens
+                );
+            })
+        })
+        .unwrap_or(quote! {});
+
+    // emit final quoted tokens
+    let res = quote! {
+        #(#mod_attrs)
+        *
+        #mod_vis mod #mod_name {
+            #(#content)
+            *
+
+            #[allow(non_camel_case_types)]
+            enum SelectedBenchmark {
+                #(#benchmark_names),
+                *
+            }
+
+            impl<#type_impl_generics> #krate::BenchmarkingSetup<#type_use_generics> for SelectedBenchmark where #where_clause {
+                fn components(&self) -> #krate::__private::Vec<(#krate::BenchmarkParameter, u32, u32)> {
+                    match self {
+                        #(
+                            Self::#benchmark_names => {
+                                <#benchmark_names as #krate::BenchmarkingSetup<#type_use_generics>>::components(&#benchmark_names)
+                            }
+                        )
+                        *
+                    }
+                }
+
+                fn instance(
+                    &self,
+                    components: &[(#krate::BenchmarkParameter, u32)],
+                    verify: bool,
+                ) -> Result<
+                    #krate::__private::Box<dyn FnOnce() -> Result<(), #krate::BenchmarkError>>,
+                    #krate::BenchmarkError,
+                > {
+                    match self {
+                        #(
+                            Self::#benchmark_names => {
+                                <#benchmark_names as #krate::BenchmarkingSetup<
+                                    #type_use_generics
+                                >>::instance(&#benchmark_names, components, verify)
+                            }
+                        )
+                        *
+                    }
+                }
+            }
+            #[cfg(any(feature = "runtime-benchmarks", test))]
+            impl<#type_impl_generics> #krate::Benchmarking for Pallet<#type_use_generics>
+            where T: #frame_system::Config, #where_clause
+            {
+                fn benchmarks(
+                    extra: bool,
+                ) -> #krate::__private::Vec<#krate::BenchmarkMetadata> {
+                    let mut all_names = #krate::__private::vec![
+                        #(#benchmark_names_str),
+                        *
+                    ];
+                    if !extra {
+                        let extra = [
+                            #(#extra_benchmark_names_str),
+                            *
+                        ];
+                        all_names.retain(|x| !extra.contains(x));
+                    }
+                    let pov_modes:
+                        #krate::__private::Vec<(
+                            #krate::__private::Vec<u8>,
+                            #krate::__private::Vec<(
+                                #krate::__private::Vec<u8>,
+                                #krate::__private::Vec<u8>
+                            )>,
+                        )> = #krate::__private::vec![
+                        #( #pov_modes ),*
+                    ];
+                    all_names.into_iter().map(|benchmark| {
+                        let selected_benchmark = match benchmark {
+                            #(#selected_benchmark_mappings),
+                            *,
+                            _ => panic!("all benchmarks should be selectable")
+                        };
+                        let components = <SelectedBenchmark as #krate::BenchmarkingSetup<#type_use_generics>>::components(&selected_benchmark);
+                        let name = benchmark.as_bytes().to_vec();
+                        let modes = pov_modes.iter().find(|p| p.0 == name).map(|p| p.1.clone());
+
+                        #krate::BenchmarkMetadata {
+                            name: benchmark.as_bytes().to_vec(),
+                            components,
+                            pov_modes: modes.unwrap_or_default(),
+                        }
+                    }).collect::<#krate::__private::Vec<_>>()
+                }
+
+                fn run_benchmark(
+                    extrinsic: &[u8],
+                    c: &[(#krate::BenchmarkParameter, u32)],
+                    whitelist: &[#krate::__private::TrackedStorageKey],
+                    verify: bool,
+                    internal_repeats: u32,
+                ) -> Result<#krate::__private::Vec<#krate::BenchmarkResult>, #krate::BenchmarkError> {
+                    let extrinsic = #krate::__private::str::from_utf8(extrinsic).map_err(|_| "`extrinsic` is not a valid utf-8 string!")?;
+                    let selected_benchmark = match extrinsic {
+                        #(#selected_benchmark_mappings),
+                        *,
+                        _ => return Err("Could not find extrinsic.".into()),
+                    };
+                    let mut whitelist = whitelist.to_vec();
+                    let whitelisted_caller_key = <#frame_system::Account<
+                        T,
+                    > as #krate::__private::storage::StorageMap<_, _,>>::hashed_key_for(
+                        #krate::whitelisted_caller::<T::AccountId>()
+                    );
+                    whitelist.push(whitelisted_caller_key.into());
+                    let transactional_layer_key = #krate::__private::TrackedStorageKey::new(
+                        #krate::__private::storage::transactional::TRANSACTION_LEVEL_KEY.into(),
+                    );
+                    whitelist.push(transactional_layer_key);
+                    // Whitelist the `:extrinsic_index`.
+                    let extrinsic_index = #krate::__private::TrackedStorageKey::new(
+                        #krate::__private::well_known_keys::EXTRINSIC_INDEX.into()
+                    );
+                    whitelist.push(extrinsic_index);
+                    // Whitelist the `:intrablock_entropy`.
+                    let intrablock_entropy = #krate::__private::TrackedStorageKey::new(
+                        #krate::__private::well_known_keys::INTRABLOCK_ENTROPY.into()
+                    );
+                    whitelist.push(intrablock_entropy);
+
+                    #krate::benchmarking::set_whitelist(whitelist.clone());
+                    let mut results: #krate::__private::Vec<#krate::BenchmarkResult> = #krate::__private::Vec::new();
+
+                    // Always do at least one internal repeat...
+                    for _ in 0 .. internal_repeats.max(1) {
+                        // Always reset the state after the benchmark.
+                        #krate::__private::defer!(#krate::benchmarking::wipe_db());
+
+                        // Set up the externalities environment for the setup we want to
+                        // benchmark.
+                        let closure_to_benchmark = <
+                            SelectedBenchmark as #krate::BenchmarkingSetup<#type_use_generics>
+                        >::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());
+                        }
+
+                        // Commit the externalities to the database, flushing the DB cache.
+                        // This will enable worst case scenario for reading from the database.
+                        #krate::benchmarking::commit_db();
+
+                        // Access all whitelisted keys to get them into the proof recorder since the
+                        // recorder does now have a whitelist.
+                        for key in &whitelist {
+                            #krate::__private::storage::unhashed::get_raw(&key.key);
+                        }
+
+                        // Reset the read/write counter so we don't count operations in the setup process.
+                        #krate::benchmarking::reset_read_write_count();
+
+                        // Time the extrinsic logic.
+                        #krate::__private::log::trace!(
+                            target: "benchmark",
+                            "Start Benchmark: {} ({:?})",
+                            extrinsic,
+                            c
+                        );
+
+                        let start_pov = #krate::benchmarking::proof_size();
+                        let start_extrinsic = #krate::benchmarking::current_time();
+
+                        closure_to_benchmark()?;
+
+                        let finish_extrinsic = #krate::benchmarking::current_time();
+                        let end_pov = #krate::benchmarking::proof_size();
+
+                        // Calculate the diff caused by the benchmark.
+                        let elapsed_extrinsic = finish_extrinsic.saturating_sub(start_extrinsic);
+                        let diff_pov = match (start_pov, end_pov) {
+                            (Some(start), Some(end)) => end.saturating_sub(start),
+                            _ => Default::default(),
+                        };
+
+                        // Commit the changes to get proper write count
+                        #krate::benchmarking::commit_db();
+                        #krate::__private::log::trace!(
+                            target: "benchmark",
+                            "End Benchmark: {} ns", elapsed_extrinsic
+                        );
+                        let read_write_count = #krate::benchmarking::read_write_count();
+                        #krate::__private::log::trace!(
+                            target: "benchmark",
+                            "Read/Write Count {:?}", read_write_count
+                        );
+
+                        // Time the storage root recalculation.
+                        let start_storage_root = #krate::benchmarking::current_time();
+                        #krate::__private::storage_root(#krate::__private::StateVersion::V1);
+                        let finish_storage_root = #krate::benchmarking::current_time();
+                        let elapsed_storage_root = finish_storage_root - start_storage_root;
+
+                        let skip_meta = [ #(#skip_meta_benchmark_names_str),* ];
+                        let read_and_written_keys = if skip_meta.contains(&extrinsic) {
+                            #krate::__private::vec![(b"Skipped Metadata".to_vec(), 0, 0, false)]
+                        } else {
+                            #krate::benchmarking::get_read_and_written_keys()
+                        };
+
+                        results.push(#krate::BenchmarkResult {
+                            components: c.to_vec(),
+                            extrinsic_time: elapsed_extrinsic,
+                            storage_root_time: elapsed_storage_root,
+                            reads: read_write_count.0,
+                            repeat_reads: read_write_count.1,
+                            writes: read_write_count.2,
+                            repeat_writes: read_write_count.3,
+                            proof_size: diff_pov,
+                            keys: read_and_written_keys,
+                        });
+                    }
+
+                    return Ok(results);
+                }
+            }
+
+            #[cfg(test)]
+            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
+                /// writes a benchmark, itself called `by_name`; the function would be shadowed in
+                /// that case.
+                ///
+                /// This is generally intended to be used by child test modules such as those created
+                /// by the `impl_benchmark_test_suite` macro. However, it is not an error if a pallet
+                /// author chooses not to implement benchmarks.
+                #[allow(unused)]
+                fn test_bench_by_name(name: &[u8]) -> Result<(), #krate::BenchmarkError> {
+                    let name = #krate::__private::str::from_utf8(name)
+                        .map_err(|_| -> #krate::BenchmarkError { "`name` is not a valid utf8 string!".into() })?;
+                    match name {
+                        #(#benchmarks_by_name_mappings),
+                        *,
+                        _ => Err("Could not find test for requested benchmark.".into()),
+                    }
+                }
+            }
+
+            #impl_test_function
+        }
+        #mod_vis use #mod_name::*;
+    };
+    Ok(res.into())
+}
+
+/// Prepares a [`Vec<ParamDef>`] to be interpolated by [`quote!`] by creating easily-iterable
+/// arrays formatted in such a way that they can be interpolated directly.
+struct UnrolledParams {
+    param_ranges: Vec<TokenStream2>,
+    param_names: Vec<TokenStream2>,
+}
+
+impl UnrolledParams {
+    /// Constructs an [`UnrolledParams`] from a [`Vec<ParamDef>`]
+    fn from(params: &Vec<ParamDef>) -> UnrolledParams {
+        let param_ranges: Vec<TokenStream2> = params
+            .iter()
+            .map(|p| {
+                let name = Ident::new(&p.name, Span::call_site());
+                let start = &p.start;
+                let end = &p.end;
+                quote!(#name, #start, #end)
+            })
+            .collect();
+        let param_names: Vec<TokenStream2> = params
+            .iter()
+            .map(|p| {
+                let name = Ident::new(&p.name, Span::call_site());
+                quote!(#name)
+            })
+            .collect();
+        UnrolledParams {
+            param_ranges,
+            param_names,
+        }
+    }
+}
+
+/// Performs expansion of an already-parsed [`BenchmarkDef`].
+fn expand_benchmark(
+    benchmark_def: BenchmarkDef,
+    name: &Ident,
+    is_instance: bool,
+    where_clause: TokenStream2,
+) -> TokenStream2 {
+    // set up variables needed during quoting
+    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;
+    let verify_stmts = benchmark_def.verify_stmts;
+    let last_stmt = benchmark_def.last_stmt;
+    let test_ident = Ident::new(
+        format!("test_benchmark_{}", name.to_string()).as_str(),
+        Span::call_site(),
+    );
+
+    // unroll params (prepare for quoting)
+    let unrolled = UnrolledParams::from(&benchmark_def.params);
+    let param_names = unrolled.param_names;
+    let param_ranges = unrolled.param_ranges;
+
+    let type_use_generics = match is_instance {
+        false => quote!(T),
+        true => quote!(T, I),
+    };
+
+    let type_impl_generics = match is_instance {
+        false => quote!(T: Config),
+        true => quote!(T: Config<I>, I: 'static),
+    };
+
+    // used in the benchmarking impls
+    let (pre_call, post_call, fn_call_body) = match &benchmark_def.call_def {
+        BenchmarkCallDef::ExtrinsicCall {
+            origin,
+            expr_call,
+            attr_span: _,
+        } => {
+            let mut expr_call = expr_call.clone();
+
+            // remove first arg from expr_call
+            let mut final_args = Punctuated::<Expr, Comma>::new();
+            let args: Vec<&Expr> = expr_call.args.iter().collect();
+            for arg in &args[1..] {
+                final_args.push((*(*arg)).clone());
+            }
+            expr_call.args = final_args;
+
+            let origin = match origin {
+                Expr::Cast(t) => {
+                    let ty = t.ty.clone();
+                    quote! {
+                        <<T as #frame_system::Config>::RuntimeOrigin as From<#ty>>::from(#origin);
+                    }
+                }
+                _ => quote! {
+                    #origin.into();
+                },
+            };
+
+            // determine call name (handles `_` and normal call syntax)
+            let expr_span = expr_call.span();
+            let call_err = || {
+                syn::Error::new(expr_span, "Extrinsic call must be a function call or `_`")
+                    .to_compile_error()
+            };
+            let call_name = match *expr_call.func {
+                Expr::Path(expr_path) => {
+                    // normal function call
+                    let Some(segment) = expr_path.path.segments.last() else {
+                        return call_err();
+                    };
+                    segment.ident.to_string()
+                }
+                Expr::Infer(_) => {
+                    // `_` style
+                    // replace `_` with fn name
+                    name.to_string()
+                }
+                _ => return call_err(),
+            };
+
+            // modify extrinsic call to be prefixed with "new_call_variant"
+            let call_name = format!("new_call_variant_{}", call_name);
+            let mut punct: Punctuated<PathSegment, PathSep> = Punctuated::new();
+            punct.push(PathSegment {
+                arguments: PathArguments::None,
+                ident: Ident::new(call_name.as_str(), Span::call_site()),
+            });
+            *expr_call.func = Expr::Path(ExprPath {
+                attrs: vec![],
+                qself: None,
+                path: Path {
+                    leading_colon: None,
+                    segments: punct,
+                },
+            });
+            let pre_call = quote! {
+                let __call = Call::<#type_use_generics>::#expr_call;
+                let __benchmarked_call_encoded = #codec::Encode::encode(&__call);
+            };
+            let post_call = quote! {
+                let __call_decoded = <Call<#type_use_generics> as #codec::Decode>
+                    ::decode(&mut &__benchmarked_call_encoded[..])
+                    .expect("call is encoded above, encoding must be correct");
+                let __origin = #origin;
+                <Call<#type_use_generics> as #traits::UnfilteredDispatchable>::dispatch_bypass_filter(
+                    __call_decoded,
+                    __origin,
+                )
+            };
+            (
+                // (pre_call, post_call, fn_call_body):
+                pre_call.clone(),
+                quote!(#post_call?;),
+                quote! {
+                    #pre_call
+                    #post_call.unwrap();
+                },
+            )
+        }
+        BenchmarkCallDef::Block {
+            block,
+            attr_span: _,
+        } => (quote!(), quote!(#block), quote!(#block)),
+    };
+
+    let vis = benchmark_def.fn_vis;
+
+    // remove #[benchmark] attribute
+    let fn_attrs = benchmark_def
+        .fn_attrs
+        .iter()
+        .filter(|attr| !attr.path().is_ident(keywords::BENCHMARK_TOKEN));
+
+    // modify signature generics, ident, and inputs, e.g:
+    // before: `fn bench(u: Linear<1, 100>) -> Result<(), BenchmarkError>`
+    // after: `fn _bench <T: Config<I>, I: 'static>(u: u32, verify: bool) -> Result<(),
+    // BenchmarkError>`
+    let mut sig = benchmark_def.fn_sig;
+    sig.generics = parse_quote!(<#type_impl_generics>);
+    if !where_clause.is_empty() {
+        sig.generics.where_clause = parse_quote!(where #where_clause);
+    }
+    sig.ident = Ident::new(
+        format!("_{}", name.to_token_stream().to_string()).as_str(),
+        Span::call_site(),
+    );
+    let mut fn_param_inputs: Vec<TokenStream2> =
+        param_names.iter().map(|name| quote!(#name: u32)).collect();
+    fn_param_inputs.push(quote!(verify: bool));
+    sig.inputs = parse_quote!(#(#fn_param_inputs),*);
+
+    // used in instance() impl
+    let impl_last_stmt = match &last_stmt {
+        Some(stmt) => quote!(#stmt),
+        None => quote!(Ok(())),
+    };
+    let fn_attrs_clone = fn_attrs.clone();
+
+    let fn_def = quote! {
+        #(
+            #fn_attrs_clone
+        )*
+        #vis #sig {
+            #(
+                #setup_stmts
+            )*
+            #fn_call_body
+            if verify {
+                #(
+                    #verify_stmts
+                )*
+            }
+            #last_stmt
+        }
+    };
+
+    // generate final quoted tokens
+    let res = quote! {
+        // benchmark function definition
+        #fn_def
+
+        #[allow(non_camel_case_types)]
+        #(
+            #fn_attrs
+        )*
+        struct #name;
+
+        #[allow(unused_variables)]
+        impl<#type_impl_generics> #krate::BenchmarkingSetup<#type_use_generics>
+        for #name where #where_clause {
+            fn components(&self) -> #krate::__private::Vec<(#krate::BenchmarkParameter, u32, u32)> {
+                #krate::__private::vec! [
+                    #(
+                        (#krate::BenchmarkParameter::#param_ranges)
+                    ),*
+                ]
+            }
+
+            fn instance(
+                &self,
+                components: &[(#krate::BenchmarkParameter, u32)],
+                verify: bool
+            ) -> Result<#krate::__private::Box<dyn FnOnce() -> Result<(), #krate::BenchmarkError>>, #krate::BenchmarkError> {
+                #(
+                    // prepare instance #param_names
+                    let #param_names = components.iter()
+                        .find(|&c| c.0 == #krate::BenchmarkParameter::#param_names)
+                        .ok_or("Could not find component during benchmark preparation.")?
+                        .1;
+                )*
+
+                // benchmark setup code
+                #(
+                    #setup_stmts
+                )*
+                #pre_call
+                Ok(#krate::__private::Box::new(move || -> Result<(), #krate::BenchmarkError> {
+                    #post_call
+                    if verify {
+                        #(
+                            #verify_stmts
+                        )*
+                    }
+                    #impl_last_stmt
+                }))
+            }
+        }
+
+        #[cfg(test)]
+        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;
+                let components = <
+                    SelectedBenchmark as #krate::BenchmarkingSetup<T, _>
+                >::components(&selected_benchmark);
+                let execute_benchmark = |
+                    c: #krate::__private::Vec<(#krate::BenchmarkParameter, u32)>
+                | -> Result<(), #krate::BenchmarkError> {
+                    // Always reset the state after the benchmark.
+                    #krate::__private::defer!(#krate::benchmarking::wipe_db());
+
+                    // Set up the benchmark, return execution + verification function.
+                    let closure_to_verify = <
+                        SelectedBenchmark as #krate::BenchmarkingSetup<T, _>
+                    >::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());
+                    }
+
+                    // Run execution + verification
+                    closure_to_verify()
+                };
+
+                if components.is_empty() {
+                    execute_benchmark(Default::default())?;
+                } else {
+                    let num_values: u32 = if let Ok(ev) = std::env::var("VALUES_PER_COMPONENT") {
+                        ev.parse().map_err(|_| {
+                            #krate::BenchmarkError::Stop(
+                                "Could not parse env var `VALUES_PER_COMPONENT` as u32."
+                            )
+                        })?
+                    } else {
+                        6
+                    };
+
+                    if num_values < 2 {
+                        return Err("`VALUES_PER_COMPONENT` must be at least 2".into());
+                    }
+
+                    for (name, low, high) in components.clone().into_iter() {
+                        // Test the lowest, highest (if its different from the lowest)
+                        // and up to num_values-2 more equidistant values in between.
+                        // For 0..10 and num_values=6 this would mean: [0, 2, 4, 6, 8, 10]
+                        if high < low {
+                            return Err("The start of a `ParamRange` must be less than or equal to the end".into());
+                        }
+
+                        let mut values = #krate::__private::vec![low];
+                        let diff = (high - low).min(num_values - 1);
+                        let slope = (high - low) as f32 / diff as f32;
+
+                        for i in 1..=diff {
+                            let value = ((low as f32 + slope * i as f32) as u32)
+                                            .clamp(low, high);
+                            values.push(value);
+                        }
+
+                        for component_value in values {
+                            // Select the max value for all the other components.
+                            let c: #krate::__private::Vec<(#krate::BenchmarkParameter, u32)> = components
+                                .iter()
+                                .map(|(n, _, h)|
+                                    if *n == name {
+                                        (*n, component_value)
+                                    } else {
+                                        (*n, *h)
+                                    }
+                                )
+                                .collect();
+
+                            execute_benchmark(c)?;
+                        }
+                    }
+                }
+                return Ok(());
+            }
+        }
+    };
+    res
+}
diff --git a/support/procedural-fork/src/construct_runtime/expand/call.rs b/support/procedural-fork/src/construct_runtime/expand/call.rs
new file mode 100644
index 000000000..7e8c2e856
--- /dev/null
+++ b/support/procedural-fork/src/construct_runtime/expand/call.rs
@@ -0,0 +1,226 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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::Pallet;
+use proc_macro2::TokenStream;
+use quote::quote;
+use std::str::FromStr;
+use syn::Ident;
+
+pub fn expand_outer_dispatch(
+    runtime: &Ident,
+    system_pallet: &Pallet,
+    pallet_decls: &[Pallet],
+    scrate: &TokenStream,
+) -> TokenStream {
+    let mut variant_defs = TokenStream::new();
+    let mut variant_patterns = Vec::new();
+    let mut query_call_part_macros = Vec::new();
+    let mut pallet_names = Vec::new();
+    let mut pallet_attrs = Vec::new();
+    let system_path = &system_pallet.path;
+
+    let pallets_with_call = pallet_decls.iter().filter(|decl| decl.exists_part("Call"));
+
+    for pallet_declaration in pallets_with_call {
+        let name = &pallet_declaration.name;
+        let path = &pallet_declaration.path;
+        let index = pallet_declaration.index;
+        let attr =
+            pallet_declaration
+                .cfg_pattern
+                .iter()
+                .fold(TokenStream::new(), |acc, pattern| {
+                    let attr = TokenStream::from_str(&format!("#[cfg({})]", pattern.original()))
+                        .expect("was successfully parsed before; qed");
+                    quote! {
+                        #acc
+                        #attr
+                    }
+                });
+
+        variant_defs.extend(quote! {
+            #attr
+            #[codec(index = #index)]
+            #name( #scrate::dispatch::CallableCallFor<#name, #runtime> ),
+        });
+        variant_patterns.push(quote!(RuntimeCall::#name(call)));
+        pallet_names.push(name);
+        pallet_attrs.push(attr);
+        query_call_part_macros.push(quote! {
+            #path::__substrate_call_check::is_call_part_defined!(#name);
+        });
+    }
+
+    quote! {
+        #( #query_call_part_macros )*
+
+        #[derive(
+            Clone, PartialEq, Eq,
+            #scrate::__private::codec::Encode,
+            #scrate::__private::codec::Decode,
+            #scrate::__private::scale_info::TypeInfo,
+            #scrate::__private::RuntimeDebug,
+        )]
+        pub enum RuntimeCall {
+            #variant_defs
+        }
+        #[cfg(test)]
+        impl RuntimeCall {
+            /// Return a list of the module names together with their size in memory.
+            pub const fn sizes() -> &'static [( &'static str, usize )] {
+                use #scrate::dispatch::Callable;
+                use core::mem::size_of;
+                &[#(
+                    #pallet_attrs
+                    (
+                        stringify!(#pallet_names),
+                        size_of::< <#pallet_names as Callable<#runtime>>::RuntimeCall >(),
+                    ),
+                )*]
+            }
+
+            /// Panics with diagnostic information if the size is greater than the given `limit`.
+            pub fn assert_size_under(limit: usize) {
+                let size = core::mem::size_of::<Self>();
+                let call_oversize = size > limit;
+                if call_oversize {
+                    println!("Size of `Call` is {} bytes (provided limit is {} bytes)", size, limit);
+                    let mut sizes = Self::sizes().to_vec();
+                    sizes.sort_by_key(|x| -(x.1 as isize));
+                    for (i, &(name, size)) in sizes.iter().enumerate().take(5) {
+                        println!("Offender #{}: {} at {} bytes", i + 1, name, size);
+                    }
+                    if let Some((_, next_size)) = sizes.get(5) {
+                        println!("{} others of size {} bytes or less", sizes.len() - 5, next_size);
+                    }
+                    panic!(
+                        "Size of `Call` is more than limit; use `Box` on complex parameter types to reduce the
+						size of `Call`.
+						If the limit is too strong, maybe consider providing a higher limit."
+                    );
+                }
+            }
+        }
+        impl #scrate::dispatch::GetDispatchInfo for RuntimeCall {
+            fn get_dispatch_info(&self) -> #scrate::dispatch::DispatchInfo {
+                match self {
+                    #(
+                        #pallet_attrs
+                        #variant_patterns => call.get_dispatch_info(),
+                    )*
+                }
+            }
+        }
+
+        impl #scrate::dispatch::CheckIfFeeless for RuntimeCall {
+            type Origin = #system_path::pallet_prelude::OriginFor<#runtime>;
+            fn is_feeless(&self, origin: &Self::Origin) -> bool {
+                match self {
+                    #(
+                        #pallet_attrs
+                        #variant_patterns => call.is_feeless(origin),
+                    )*
+                }
+            }
+        }
+
+        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::traits::CallMetadata { function_name, pallet_name }
+                        }
+                    )*
+                }
+            }
+
+            fn get_module_names() -> &'static [&'static str] {
+                &[#(
+                    #pallet_attrs
+                    stringify!(#pallet_names),
+                )*]
+            }
+
+            fn get_call_names(module: &str) -> &'static [&'static str] {
+                use #scrate::{dispatch::Callable, traits::GetCallName};
+                match module {
+                    #(
+                        #pallet_attrs
+                        stringify!(#pallet_names) =>
+                            <<#pallet_names as Callable<#runtime>>::RuntimeCall
+                                as GetCallName>::get_call_names(),
+                    )*
+                    _ => unreachable!(),
+                }
+            }
+        }
+        impl #scrate::__private::Dispatchable for RuntimeCall {
+            type RuntimeOrigin = RuntimeOrigin;
+            type Config = RuntimeCall;
+            type Info = #scrate::dispatch::DispatchInfo;
+            type PostInfo = #scrate::dispatch::PostDispatchInfo;
+            fn dispatch(self, origin: RuntimeOrigin) -> #scrate::dispatch::DispatchResultWithPostInfo {
+                if !<Self::RuntimeOrigin as #scrate::traits::OriginTrait>::filter_call(&origin, &self) {
+                    return ::core::result::Result::Err(
+                        #system_path::Error::<#runtime>::CallFiltered.into()
+                    );
+                }
+
+                #scrate::traits::UnfilteredDispatchable::dispatch_bypass_filter(self, origin)
+            }
+        }
+        impl #scrate::traits::UnfilteredDispatchable for RuntimeCall {
+            type RuntimeOrigin = RuntimeOrigin;
+            fn dispatch_bypass_filter(self, origin: RuntimeOrigin) -> #scrate::dispatch::DispatchResultWithPostInfo {
+                match self {
+                    #(
+                        #pallet_attrs
+                        #variant_patterns =>
+                            #scrate::traits::UnfilteredDispatchable::dispatch_bypass_filter(call, origin),
+                    )*
+                }
+            }
+        }
+
+        #(
+            #pallet_attrs
+            impl #scrate::traits::IsSubType<#scrate::dispatch::CallableCallFor<#pallet_names, #runtime>> for RuntimeCall {
+                #[allow(unreachable_patterns)]
+                fn is_sub_type(&self) -> Option<&#scrate::dispatch::CallableCallFor<#pallet_names, #runtime>> {
+                    match self {
+                        #variant_patterns => Some(call),
+                        // May be unreachable
+                        _ => None,
+                    }
+                }
+            }
+
+            #pallet_attrs
+            impl From<#scrate::dispatch::CallableCallFor<#pallet_names, #runtime>> for RuntimeCall {
+                fn from(call: #scrate::dispatch::CallableCallFor<#pallet_names, #runtime>) -> Self {
+                    #variant_patterns
+                }
+            }
+        )*
+    }
+}
diff --git a/support/procedural-fork/src/construct_runtime/expand/composite_helper.rs b/support/procedural-fork/src/construct_runtime/expand/composite_helper.rs
new file mode 100644
index 000000000..be6b2f085
--- /dev/null
+++ b/support/procedural-fork/src/construct_runtime/expand/composite_helper.rs
@@ -0,0 +1,101 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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),
+        }
+    }
+}
+
+pub(crate) fn expand_variant_count(
+    composite_name: &str,
+    path: &PalletPath,
+    instance: Option<&Ident>,
+) -> TokenStream {
+    let composite_name = quote::format_ident!("{}", composite_name);
+
+    if let Some(inst) = instance {
+        quote! {
+            #path::#composite_name::<#path::#inst>::VARIANT_COUNT
+        }
+    } else {
+        // Wrapped `<`..`>` means: use default type parameter for enum.
+        //
+        // This is used for pallets without instance support or pallets with instance support when
+        // we don't specify instance:
+        //
+        // ```
+        // pub struct Pallet<T, I = ()>{..}
+        //
+        // #[pallet::composite_enum]
+        // pub enum HoldReason<I: 'static = ()> {..}
+        //
+        // Pallet1: pallet_x,  // <- default type parameter
+        // ```
+        quote! {
+            <#path::#composite_name>::VARIANT_COUNT
+        }
+    }
+}
diff --git a/support/procedural-fork/src/construct_runtime/expand/config.rs b/support/procedural-fork/src/construct_runtime/expand/config.rs
new file mode 100644
index 000000000..ff715e584
--- /dev/null
+++ b/support/procedural-fork/src/construct_runtime/expand/config.rs
@@ -0,0 +1,157 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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::Pallet;
+use inflector::Inflector;
+use proc_macro2::TokenStream;
+use quote::{format_ident, quote, ToTokens};
+use std::str::FromStr;
+use syn::Ident;
+
+pub fn expand_outer_config(
+    runtime: &Ident,
+    pallet_decls: &[Pallet],
+    scrate: &TokenStream,
+) -> TokenStream {
+    let mut types = TokenStream::new();
+    let mut fields = TokenStream::new();
+    let mut genesis_build_calls = TokenStream::new();
+    let mut query_genesis_config_part_macros = Vec::new();
+
+    for decl in pallet_decls {
+        if let Some(pallet_entry) = decl.find_part("Config") {
+            let path = &decl.path;
+            let pallet_name = &decl.name;
+            let path_str = path.into_token_stream().to_string();
+            let config = format_ident!("{}Config", pallet_name);
+            let field_name =
+                &Ident::new(&pallet_name.to_string().to_snake_case(), decl.name.span());
+            let part_is_generic = !pallet_entry.generics.params.is_empty();
+            let attr = &decl
+                .cfg_pattern
+                .iter()
+                .fold(TokenStream::new(), |acc, pattern| {
+                    let attr = TokenStream::from_str(&format!("#[cfg({})]", pattern.original()))
+                        .expect("was successfully parsed before; qed");
+                    quote! {
+                        #acc
+                        #attr
+                    }
+                });
+
+            types.extend(expand_config_types(
+                attr,
+                runtime,
+                decl,
+                &config,
+                part_is_generic,
+            ));
+            fields.extend(quote!(#attr pub #field_name: #config,));
+            genesis_build_calls.extend(expand_config_build_storage_call(
+                scrate, &config, attr, field_name,
+            ));
+            query_genesis_config_part_macros.push(quote! {
+				#path::__substrate_genesis_config_check::is_genesis_config_defined!(#pallet_name);
+				#[cfg(feature = "std")]
+				#path::__substrate_genesis_config_check::is_std_enabled_for_genesis!(#pallet_name, #path_str);
+			});
+        }
+    }
+
+    quote! {
+        #( #query_genesis_config_part_macros )*
+
+        #types
+
+        use #scrate::__private::serde as __genesis_config_serde_import__;
+        #[derive(#scrate::__private::serde::Serialize, #scrate::__private::serde::Deserialize, Default)]
+        #[serde(rename_all = "camelCase")]
+        #[serde(deny_unknown_fields)]
+        #[serde(crate = "__genesis_config_serde_import__")]
+        pub struct RuntimeGenesisConfig {
+            #fields
+        }
+
+        #[cfg(any(feature = "std", test))]
+        impl #scrate::sp_runtime::BuildStorage for RuntimeGenesisConfig {
+            fn assimilate_storage(
+                &self,
+                storage: &mut #scrate::sp_runtime::Storage,
+            ) -> std::result::Result<(), String> {
+                #scrate::__private::BasicExternalities::execute_with_storage(storage, || {
+                    <Self as #scrate::traits::BuildGenesisConfig>::build(&self);
+                    Ok(())
+                })
+            }
+        }
+
+        impl #scrate::traits::BuildGenesisConfig for RuntimeGenesisConfig {
+            fn build(&self) {
+                #genesis_build_calls
+                <AllPalletsWithSystem as #scrate::traits::OnGenesis>::on_genesis();
+            }
+        }
+
+        /// Test the `Default` derive impl of the `RuntimeGenesisConfig`.
+        #[cfg(test)]
+        #[test]
+        fn test_genesis_config_builds() {
+            #scrate::__private::sp_io::TestExternalities::default().execute_with(|| {
+                <RuntimeGenesisConfig as #scrate::traits::BuildGenesisConfig>::build(
+                    &RuntimeGenesisConfig::default()
+                );
+            });
+        }
+    }
+}
+
+fn expand_config_types(
+    attr: &TokenStream,
+    runtime: &Ident,
+    decl: &Pallet,
+    config: &Ident,
+    part_is_generic: bool,
+) -> TokenStream {
+    let path = &decl.path;
+
+    match (decl.instance.as_ref(), part_is_generic) {
+        (Some(inst), true) => quote! {
+            #attr
+            pub type #config = #path::GenesisConfig<#runtime, #path::#inst>;
+        },
+        (None, true) => quote! {
+            #attr
+            pub type #config = #path::GenesisConfig<#runtime>;
+        },
+        (_, false) => quote! {
+            #attr
+            pub type #config = #path::GenesisConfig;
+        },
+    }
+}
+
+fn expand_config_build_storage_call(
+    scrate: &TokenStream,
+    pallet_genesis_config: &Ident,
+    attr: &TokenStream,
+    field_name: &Ident,
+) -> TokenStream {
+    quote! {
+        #attr
+        <#pallet_genesis_config as #scrate::traits::BuildGenesisConfig>::build(&self.#field_name);
+    }
+}
diff --git a/support/procedural-fork/src/construct_runtime/expand/freeze_reason.rs b/support/procedural-fork/src/construct_runtime/expand/freeze_reason.rs
new file mode 100644
index 000000000..131c919ef
--- /dev/null
+++ b/support/procedural-fork/src/construct_runtime/expand/freeze_reason.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
+
+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 {
+    let mut conversion_fns = Vec::new();
+    let mut freeze_reason_variants = Vec::new();
+    let mut freeze_reason_variants_count = Vec::new();
+    for decl in pallet_decls {
+        if let Some(_) = decl.find_part("FreezeReason") {
+            let variant_name = &decl.name;
+            let path = &decl.path;
+            let index = decl.index;
+            let instance = decl.instance.as_ref();
+
+            conversion_fns.push(composite_helper::expand_conversion_fn(
+                "FreezeReason",
+                path,
+                instance,
+                variant_name,
+            ));
+
+            freeze_reason_variants.push(composite_helper::expand_variant(
+                "FreezeReason",
+                index,
+                path,
+                instance,
+                variant_name,
+            ));
+
+            freeze_reason_variants_count.push(composite_helper::expand_variant_count(
+                "FreezeReason",
+                path,
+                instance,
+            ));
+        }
+    }
+
+    quote! {
+        /// A reason for placing a freeze on funds.
+        #[derive(
+            Copy, Clone, Eq, PartialEq,
+            #scrate::__private::codec::Encode, #scrate::__private::codec::Decode, #scrate::__private::codec::MaxEncodedLen,
+            #scrate::__private::scale_info::TypeInfo,
+            #scrate::__private::RuntimeDebug,
+        )]
+        pub enum RuntimeFreezeReason {
+            #( #freeze_reason_variants )*
+        }
+
+        impl #scrate::traits::VariantCount for RuntimeFreezeReason {
+            const VARIANT_COUNT: u32 = 0 #( + #freeze_reason_variants_count )*;
+        }
+
+        #( #conversion_fns )*
+    }
+}
diff --git a/support/procedural-fork/src/construct_runtime/expand/hold_reason.rs b/support/procedural-fork/src/construct_runtime/expand/hold_reason.rs
new file mode 100644
index 000000000..58870a321
--- /dev/null
+++ b/support/procedural-fork/src/construct_runtime/expand/hold_reason.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
+
+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 {
+    let mut conversion_fns = Vec::new();
+    let mut hold_reason_variants = Vec::new();
+    let mut hold_reason_variants_count = Vec::new();
+    for decl in pallet_decls {
+        if let Some(_) = decl.find_part("HoldReason") {
+            let variant_name = &decl.name;
+            let path = &decl.path;
+            let index = decl.index;
+            let instance = decl.instance.as_ref();
+
+            conversion_fns.push(composite_helper::expand_conversion_fn(
+                "HoldReason",
+                path,
+                instance,
+                variant_name,
+            ));
+
+            hold_reason_variants.push(composite_helper::expand_variant(
+                "HoldReason",
+                index,
+                path,
+                instance,
+                variant_name,
+            ));
+
+            hold_reason_variants_count.push(composite_helper::expand_variant_count(
+                "HoldReason",
+                path,
+                instance,
+            ));
+        }
+    }
+
+    quote! {
+        /// A reason for placing a hold on funds.
+        #[derive(
+            Copy, Clone, Eq, PartialEq,
+            #scrate::__private::codec::Encode, #scrate::__private::codec::Decode, #scrate::__private::codec::MaxEncodedLen,
+            #scrate::__private::scale_info::TypeInfo,
+            #scrate::__private::RuntimeDebug,
+        )]
+        pub enum RuntimeHoldReason {
+            #( #hold_reason_variants )*
+        }
+
+        impl #scrate::traits::VariantCount for RuntimeHoldReason {
+            const VARIANT_COUNT: u32 = 0 #( + #hold_reason_variants_count )*;
+        }
+
+        #( #conversion_fns )*
+    }
+}
diff --git a/support/procedural-fork/src/construct_runtime/expand/inherent.rs b/support/procedural-fork/src/construct_runtime/expand/inherent.rs
new file mode 100644
index 000000000..b58d540fe
--- /dev/null
+++ b/support/procedural-fork/src/construct_runtime/expand/inherent.rs
@@ -0,0 +1,257 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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::Pallet;
+use proc_macro2::TokenStream;
+use quote::quote;
+use std::str::FromStr;
+use syn::Ident;
+
+pub fn expand_outer_inherent(
+    runtime: &Ident,
+    block: &TokenStream,
+    unchecked_extrinsic: &TokenStream,
+    pallet_decls: &[Pallet],
+    scrate: &TokenStream,
+) -> TokenStream {
+    let mut pallet_names = Vec::new();
+    let mut pallet_attrs = Vec::new();
+    let mut query_inherent_part_macros = Vec::new();
+
+    for pallet_decl in pallet_decls {
+        if pallet_decl.exists_part("Inherent") {
+            let name = &pallet_decl.name;
+            let path = &pallet_decl.path;
+            let attr = pallet_decl
+                .cfg_pattern
+                .iter()
+                .fold(TokenStream::new(), |acc, pattern| {
+                    let attr = TokenStream::from_str(&format!("#[cfg({})]", pattern.original()))
+                        .expect("was successfully parsed before; qed");
+                    quote! {
+                        #acc
+                        #attr
+                    }
+                });
+
+            pallet_names.push(name);
+            pallet_attrs.push(attr);
+            query_inherent_part_macros.push(quote! {
+                #path::__substrate_inherent_check::is_inherent_part_defined!(#name);
+            });
+        }
+    }
+
+    quote! {
+        #( #query_inherent_part_macros )*
+
+        trait InherentDataExt {
+            fn create_extrinsics(&self) ->
+                #scrate::__private::sp_std::vec::Vec<<#block as #scrate::sp_runtime::traits::Block>::Extrinsic>;
+            fn check_extrinsics(&self, block: &#block) -> #scrate::inherent::CheckInherentsResult;
+        }
+
+        impl InherentDataExt for #scrate::inherent::InherentData {
+            fn create_extrinsics(&self) ->
+                #scrate::__private::sp_std::vec::Vec<<#block as #scrate::sp_runtime::traits::Block>::Extrinsic>
+            {
+                use #scrate::inherent::ProvideInherent;
+
+                let mut inherents = #scrate::__private::sp_std::vec::Vec::new();
+
+                #(
+                    #pallet_attrs
+                    if let Some(inherent) = #pallet_names::create_inherent(self) {
+                        let inherent = <#unchecked_extrinsic as #scrate::sp_runtime::traits::Extrinsic>::new(
+                            inherent.into(),
+                            None,
+                        ).expect("Runtime UncheckedExtrinsic is not Opaque, so it has to return \
+                            `Some`; qed");
+
+                        inherents.push(inherent);
+                    }
+                )*
+
+                inherents
+            }
+
+            fn check_extrinsics(&self, block: &#block) -> #scrate::inherent::CheckInherentsResult {
+                use #scrate::inherent::{ProvideInherent, IsFatalError};
+                use #scrate::traits::{IsSubType, ExtrinsicCall};
+                use #scrate::sp_runtime::traits::Block as _;
+                use #scrate::__private::{sp_inherents::Error, log};
+
+                let mut result = #scrate::inherent::CheckInherentsResult::new();
+
+                // This handle assume we abort on the first fatal error.
+                fn handle_put_error_result(res: Result<(), Error>) {
+                    const LOG_TARGET: &str = "runtime::inherent";
+                    match res {
+                        Ok(()) => (),
+                        Err(Error::InherentDataExists(id)) =>
+                            log::debug!(
+                                target: LOG_TARGET,
+                                "Some error already reported for inherent {:?}, new non fatal \
+                                error is ignored",
+                                id
+                            ),
+                        Err(Error::FatalErrorReported) =>
+                            log::error!(
+                                target: LOG_TARGET,
+                                "Fatal error already reported, unexpected considering there is \
+                                only one fatal error",
+                            ),
+                        Err(_) =>
+                            log::error!(
+                                target: LOG_TARGET,
+                                "Unexpected error from `put_error` operation",
+                            ),
+                    }
+                }
+
+                for xt in block.extrinsics() {
+                    // Inherents are before any other extrinsics.
+                    // And signed extrinsics are not inherents.
+                    if #scrate::sp_runtime::traits::Extrinsic::is_signed(xt).unwrap_or(false) {
+                        break
+                    }
+
+                    let mut is_inherent = false;
+
+                    #(
+                        #pallet_attrs
+                        {
+                            let call = <#unchecked_extrinsic as ExtrinsicCall>::call(xt);
+                            if let Some(call) = IsSubType::<_>::is_sub_type(call) {
+                                if #pallet_names::is_inherent(call) {
+                                    is_inherent = true;
+                                    if let Err(e) = #pallet_names::check_inherent(call, self) {
+                                        handle_put_error_result(result.put_error(
+                                            #pallet_names::INHERENT_IDENTIFIER, &e
+                                        ));
+                                        if e.is_fatal_error() {
+                                            return result;
+                                        }
+                                    }
+                                }
+                            }
+                        }
+                    )*
+
+                    // Inherents are before any other extrinsics.
+                    // No module marked it as inherent thus it is not.
+                    if !is_inherent {
+                        break
+                    }
+                }
+
+                #(
+                    #pallet_attrs
+                    match #pallet_names::is_inherent_required(self) {
+                        Ok(Some(e)) => {
+                            let found = block.extrinsics().iter().any(|xt| {
+                                let is_signed = #scrate::sp_runtime::traits::Extrinsic::is_signed(xt)
+                                    .unwrap_or(false);
+
+                                if !is_signed {
+                                    let call = <
+                                        #unchecked_extrinsic as ExtrinsicCall
+                                    >::call(xt);
+                                    if let Some(call) = IsSubType::<_>::is_sub_type(call) {
+                                        #pallet_names::is_inherent(&call)
+                                    } else {
+                                        false
+                                    }
+                                } else {
+                                    // Signed extrinsics are not inherents.
+                                    false
+                                }
+                            });
+
+                            if !found {
+                                handle_put_error_result(result.put_error(
+                                    #pallet_names::INHERENT_IDENTIFIER, &e
+                                ));
+                                if e.is_fatal_error() {
+                                    return result;
+                                }
+                            }
+                        },
+                        Ok(None) => (),
+                        Err(e) => {
+                            handle_put_error_result(result.put_error(
+                                #pallet_names::INHERENT_IDENTIFIER, &e
+                            ));
+                            if e.is_fatal_error() {
+                                return result;
+                            }
+                        },
+                    }
+                )*
+
+                result
+            }
+        }
+
+        impl #scrate::traits::IsInherent<<#block as #scrate::sp_runtime::traits::Block>::Extrinsic> for #runtime {
+            fn is_inherent(ext: &<#block as #scrate::sp_runtime::traits::Block>::Extrinsic) -> bool {
+                use #scrate::inherent::ProvideInherent;
+                use #scrate::traits::{IsSubType, ExtrinsicCall};
+
+                if #scrate::sp_runtime::traits::Extrinsic::is_signed(ext).unwrap_or(false) {
+                    // Signed extrinsics are never inherents.
+                    return false
+                }
+
+                #(
+                    #pallet_attrs
+                    {
+                        let call = <#unchecked_extrinsic as ExtrinsicCall>::call(ext);
+                        if let Some(call) = IsSubType::<_>::is_sub_type(call) {
+                            if <#pallet_names as ProvideInherent>::is_inherent(&call) {
+                                return true;
+                            }
+                        }
+                    }
+                )*
+                false
+            }
+        }
+
+        impl #scrate::traits::EnsureInherentsAreFirst<#block> for #runtime {
+            fn ensure_inherents_are_first(block: &#block) -> Result<u32, u32> {
+                use #scrate::inherent::ProvideInherent;
+                use #scrate::traits::{IsSubType, ExtrinsicCall};
+                use #scrate::sp_runtime::traits::Block as _;
+
+                let mut num_inherents = 0u32;
+
+                for (i, xt) in block.extrinsics().iter().enumerate() {
+                    if <Self as #scrate::traits::IsInherent<_>>::is_inherent(xt) {
+                        if num_inherents != i as u32 {
+                            return Err(i as u32);
+                        }
+
+                        num_inherents += 1; // Safe since we are in an `enumerate` loop.
+                    }
+                }
+
+                Ok(num_inherents)
+            }
+        }
+    }
+}
diff --git a/support/procedural-fork/src/construct_runtime/expand/lock_id.rs b/support/procedural-fork/src/construct_runtime/expand/lock_id.rs
new file mode 100644
index 000000000..67c2fb933
--- /dev/null
+++ b/support/procedural-fork/src/construct_runtime/expand/lock_id.rs
@@ -0,0 +1,64 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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::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 {
+    let mut conversion_fns = Vec::new();
+    let mut lock_id_variants = Vec::new();
+    for decl in pallet_decls {
+        if let Some(_) = decl.find_part("LockId") {
+            let variant_name = &decl.name;
+            let path = &decl.path;
+            let index = decl.index;
+            let instance = decl.instance.as_ref();
+
+            conversion_fns.push(composite_helper::expand_conversion_fn(
+                "LockId",
+                path,
+                instance,
+                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,
+            #scrate::__private::codec::Encode, #scrate::__private::codec::Decode, #scrate::__private::codec::MaxEncodedLen,
+            #scrate::__private::scale_info::TypeInfo,
+            #scrate::__private::RuntimeDebug,
+        )]
+        pub enum RuntimeLockId {
+            #( #lock_id_variants )*
+        }
+
+        #( #conversion_fns )*
+    }
+}
diff --git a/support/procedural-fork/src/construct_runtime/expand/metadata.rs b/support/procedural-fork/src/construct_runtime/expand/metadata.rs
new file mode 100644
index 000000000..f98c719ca
--- /dev/null
+++ b/support/procedural-fork/src/construct_runtime/expand/metadata.rs
@@ -0,0 +1,261 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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, Pallet};
+use proc_macro2::TokenStream;
+use quote::quote;
+use std::str::FromStr;
+use syn::Ident;
+
+pub fn expand_runtime_metadata(
+    runtime: &Ident,
+    pallet_declarations: &[Pallet],
+    scrate: &TokenStream,
+    extrinsic: &TokenStream,
+    system_path: &PalletPath,
+) -> TokenStream {
+    let pallets = pallet_declarations
+        .iter()
+        .filter_map(|pallet_declaration| {
+            pallet_declaration.find_part("Pallet").map(|_| {
+                let filtered_names: Vec<_> = pallet_declaration
+                    .pallet_parts()
+                    .iter()
+                    .filter(|part| part.name() != "Pallet")
+                    .map(|part| part.name())
+                    .collect();
+                (pallet_declaration, filtered_names)
+            })
+        })
+        .map(|(decl, filtered_names)| {
+            let name = &decl.name;
+            let index = &decl.index;
+            let storage = expand_pallet_metadata_storage(&filtered_names, runtime, decl);
+            let calls = expand_pallet_metadata_calls(&filtered_names, runtime, decl);
+            let event = expand_pallet_metadata_events(&filtered_names, runtime, scrate, decl);
+            let constants = expand_pallet_metadata_constants(runtime, decl);
+            let errors = expand_pallet_metadata_errors(runtime, decl);
+            let docs = expand_pallet_metadata_docs(runtime, decl);
+            let attr = decl
+                .cfg_pattern
+                .iter()
+                .fold(TokenStream::new(), |acc, pattern| {
+                    let attr = TokenStream::from_str(&format!("#[cfg({})]", pattern.original()))
+                        .expect("was successfully parsed before; qed");
+                    quote! {
+                        #acc
+                        #attr
+                    }
+                });
+
+            quote! {
+                #attr
+                #scrate::__private::metadata_ir::PalletMetadataIR {
+                    name: stringify!(#name),
+                    index: #index,
+                    storage: #storage,
+                    calls: #calls,
+                    event: #event,
+                    constants: #constants,
+                    error: #errors,
+                    docs: #docs,
+                }
+            }
+        })
+        .collect::<Vec<_>>();
+
+    quote! {
+        impl #runtime {
+            fn metadata_ir() -> #scrate::__private::metadata_ir::MetadataIR {
+                // Each runtime must expose the `runtime_metadata()` to fetch the runtime API metadata.
+                // The function is implemented by calling `impl_runtime_apis!`.
+                //
+                // However, the `construct_runtime!` may be called without calling `impl_runtime_apis!`.
+                // Rely on the `Deref` trait to differentiate between a runtime that implements
+                // APIs (by macro impl_runtime_apis!) and a runtime that is simply created (by macro construct_runtime!).
+                //
+                // Both `InternalConstructRuntime` and `InternalImplRuntimeApis` expose a `runtime_metadata()` function.
+                // `InternalConstructRuntime` is implemented by the `construct_runtime!` for Runtime references (`& Runtime`),
+                // while `InternalImplRuntimeApis` is implemented by the `impl_runtime_apis!` for Runtime (`Runtime`).
+                //
+                // Therefore, the `Deref` trait will resolve the `runtime_metadata` from `impl_runtime_apis!`
+                // when both macros are called; and will resolve an empty `runtime_metadata` when only the `construct_runtime!`
+                // is called.
+                //
+                // `Deref` needs a reference for resolving the function call.
+                let rt = #runtime;
+
+                let ty = #scrate::__private::scale_info::meta_type::<#extrinsic>();
+                let address_ty = #scrate::__private::scale_info::meta_type::<
+                        <<#extrinsic as #scrate::sp_runtime::traits::Extrinsic>::SignaturePayload as #scrate::sp_runtime::traits::SignaturePayload>::SignatureAddress
+                    >();
+                let call_ty = #scrate::__private::scale_info::meta_type::<
+                    <#extrinsic as #scrate::sp_runtime::traits::Extrinsic>::Call
+                    >();
+                let signature_ty = #scrate::__private::scale_info::meta_type::<
+                        <<#extrinsic as #scrate::sp_runtime::traits::Extrinsic>::SignaturePayload as #scrate::sp_runtime::traits::SignaturePayload>::Signature
+                    >();
+                let extra_ty = #scrate::__private::scale_info::meta_type::<
+                        <<#extrinsic as #scrate::sp_runtime::traits::Extrinsic>::SignaturePayload as #scrate::sp_runtime::traits::SignaturePayload>::SignatureExtra
+                    >();
+
+                #scrate::__private::metadata_ir::MetadataIR {
+                    pallets: #scrate::__private::sp_std::vec![ #(#pallets),* ],
+                    extrinsic: #scrate::__private::metadata_ir::ExtrinsicMetadataIR {
+                        ty,
+                        version: <#extrinsic as #scrate::sp_runtime::traits::ExtrinsicMetadata>::VERSION,
+                        address_ty,
+                        call_ty,
+                        signature_ty,
+                        extra_ty,
+                        signed_extensions: <
+                                <
+                                    #extrinsic as #scrate::sp_runtime::traits::ExtrinsicMetadata
+                                >::SignedExtensions as #scrate::sp_runtime::traits::SignedExtension
+                            >::metadata()
+                                .into_iter()
+                                .map(|meta| #scrate::__private::metadata_ir::SignedExtensionMetadataIR {
+                                    identifier: meta.identifier,
+                                    ty: meta.ty,
+                                    additional_signed: meta.additional_signed,
+                                })
+                                .collect(),
+                    },
+                    ty: #scrate::__private::scale_info::meta_type::<#runtime>(),
+                    apis: (&rt).runtime_metadata(),
+                    outer_enums: #scrate::__private::metadata_ir::OuterEnumsIR {
+                        call_enum_ty: #scrate::__private::scale_info::meta_type::<
+                                <#runtime as #system_path::Config>::RuntimeCall
+                            >(),
+                        event_enum_ty: #scrate::__private::scale_info::meta_type::<RuntimeEvent>(),
+                        error_enum_ty: #scrate::__private::scale_info::meta_type::<RuntimeError>(),
+                    }
+                }
+            }
+
+            pub fn metadata() -> #scrate::__private::metadata::RuntimeMetadataPrefixed {
+                // Note: this always returns the V14 version. The runtime API function
+                // must be deprecated.
+                #scrate::__private::metadata_ir::into_v14(#runtime::metadata_ir())
+            }
+
+            pub fn metadata_at_version(version: u32) -> Option<#scrate::__private::OpaqueMetadata> {
+                #scrate::__private::metadata_ir::into_version(#runtime::metadata_ir(), version).map(|prefixed| {
+                    #scrate::__private::OpaqueMetadata::new(prefixed.into())
+                })
+            }
+
+            pub fn metadata_versions() -> #scrate::__private::sp_std::vec::Vec<u32> {
+                #scrate::__private::metadata_ir::supported_versions()
+            }
+        }
+    }
+}
+
+fn expand_pallet_metadata_storage(
+    filtered_names: &[&'static str],
+    runtime: &Ident,
+    decl: &Pallet,
+) -> TokenStream {
+    if filtered_names.contains(&"Storage") {
+        let instance = decl.instance.as_ref().into_iter();
+        let path = &decl.path;
+
+        quote! {
+            Some(#path::Pallet::<#runtime #(, #path::#instance)*>::storage_metadata())
+        }
+    } else {
+        quote!(None)
+    }
+}
+
+fn expand_pallet_metadata_calls(
+    filtered_names: &[&'static str],
+    runtime: &Ident,
+    decl: &Pallet,
+) -> TokenStream {
+    if filtered_names.contains(&"Call") {
+        let instance = decl.instance.as_ref().into_iter();
+        let path = &decl.path;
+
+        quote! {
+            Some(#path::Pallet::<#runtime #(, #path::#instance)*>::call_functions())
+        }
+    } else {
+        quote!(None)
+    }
+}
+
+fn expand_pallet_metadata_events(
+    filtered_names: &[&'static str],
+    runtime: &Ident,
+    scrate: &TokenStream,
+    decl: &Pallet,
+) -> TokenStream {
+    if filtered_names.contains(&"Event") {
+        let path = &decl.path;
+        let part_is_generic = !decl
+            .find_part("Event")
+            .expect("Event part exists; qed")
+            .generics
+            .params
+            .is_empty();
+        let pallet_event = match (decl.instance.as_ref(), part_is_generic) {
+            (Some(inst), true) => quote!(#path::Event::<#runtime, #path::#inst>),
+            (Some(inst), false) => quote!(#path::Event::<#path::#inst>),
+            (None, true) => quote!(#path::Event::<#runtime>),
+            (None, false) => quote!(#path::Event),
+        };
+
+        quote! {
+            Some(
+                #scrate::__private::metadata_ir::PalletEventMetadataIR {
+                    ty: #scrate::__private::scale_info::meta_type::<#pallet_event>()
+                }
+            )
+        }
+    } else {
+        quote!(None)
+    }
+}
+
+fn expand_pallet_metadata_constants(runtime: &Ident, decl: &Pallet) -> TokenStream {
+    let path = &decl.path;
+    let instance = decl.instance.as_ref().into_iter();
+
+    quote! {
+        #path::Pallet::<#runtime #(, #path::#instance)*>::pallet_constants_metadata()
+    }
+}
+
+fn expand_pallet_metadata_errors(runtime: &Ident, decl: &Pallet) -> TokenStream {
+    let path = &decl.path;
+    let instance = decl.instance.as_ref().into_iter();
+
+    quote! {
+        #path::Pallet::<#runtime #(, #path::#instance)*>::error_metadata()
+    }
+}
+
+fn expand_pallet_metadata_docs(runtime: &Ident, decl: &Pallet) -> TokenStream {
+    let path = &decl.path;
+    let instance = decl.instance.as_ref().into_iter();
+
+    quote! {
+        #path::Pallet::<#runtime #(, #path::#instance)*>::pallet_documentation_metadata()
+    }
+}
diff --git a/support/procedural-fork/src/construct_runtime/expand/mod.rs b/support/procedural-fork/src/construct_runtime/expand/mod.rs
new file mode 100644
index 000000000..88f9a3c6e
--- /dev/null
+++ b/support/procedural-fork/src/construct_runtime/expand/mod.rs
@@ -0,0 +1,43 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 call;
+pub mod composite_helper;
+mod config;
+mod freeze_reason;
+mod hold_reason;
+mod inherent;
+mod lock_id;
+mod metadata;
+mod origin;
+mod outer_enums;
+mod slash_reason;
+mod task;
+mod unsigned;
+
+pub use call::expand_outer_dispatch;
+pub use config::expand_outer_config;
+pub use freeze_reason::expand_outer_freeze_reason;
+pub use hold_reason::expand_outer_hold_reason;
+pub use inherent::expand_outer_inherent;
+pub use lock_id::expand_outer_lock_id;
+pub use metadata::expand_runtime_metadata;
+pub use origin::expand_outer_origin;
+pub use outer_enums::{expand_outer_enum, OuterEnumType};
+pub use slash_reason::expand_outer_slash_reason;
+pub use task::expand_outer_task;
+pub use unsigned::expand_outer_validate_unsigned;
diff --git a/support/procedural-fork/src/construct_runtime/expand/origin.rs b/support/procedural-fork/src/construct_runtime/expand/origin.rs
new file mode 100644
index 000000000..2d50777bf
--- /dev/null
+++ b/support/procedural-fork/src/construct_runtime/expand/origin.rs
@@ -0,0 +1,469 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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::{Pallet, SYSTEM_PALLET_NAME};
+use proc_macro2::TokenStream;
+use quote::quote;
+use std::str::FromStr;
+use syn::{Generics, Ident};
+
+pub fn expand_outer_origin(
+    runtime: &Ident,
+    system_pallet: &Pallet,
+    pallets: &[Pallet],
+    scrate: &TokenStream,
+) -> syn::Result<TokenStream> {
+    let mut caller_variants = TokenStream::new();
+    let mut pallet_conversions = TokenStream::new();
+    let mut query_origin_part_macros = Vec::new();
+
+    for pallet_decl in pallets
+        .iter()
+        .filter(|pallet| pallet.name != SYSTEM_PALLET_NAME)
+    {
+        if let Some(pallet_entry) = pallet_decl.find_part("Origin") {
+            let instance = pallet_decl.instance.as_ref();
+            let index = pallet_decl.index;
+            let generics = &pallet_entry.generics;
+            let name = &pallet_decl.name;
+            let path = &pallet_decl.path;
+
+            if instance.is_some() && generics.params.is_empty() {
+                let msg = format!(
+                    "Instantiable pallet with no generic `Origin` cannot \
+					 be constructed: pallet `{}` must have generic `Origin`",
+                    name
+                );
+                return Err(syn::Error::new(name.span(), msg));
+            }
+
+            caller_variants.extend(expand_origin_caller_variant(
+                runtime,
+                pallet_decl,
+                index,
+                instance,
+                generics,
+            ));
+            pallet_conversions.extend(expand_origin_pallet_conversions(
+                scrate,
+                runtime,
+                pallet_decl,
+                instance,
+                generics,
+            ));
+            query_origin_part_macros.push(quote! {
+                #path::__substrate_origin_check::is_origin_part_defined!(#name);
+            });
+        }
+    }
+
+    let system_path = &system_pallet.path;
+
+    let system_index = system_pallet.index;
+
+    let system_path_name = system_path.module_name();
+
+    let doc_string = get_intra_doc_string(
+        "Origin is always created with the base filter configured in",
+        &system_path_name,
+    );
+
+    let doc_string_none_origin =
+        get_intra_doc_string("Create with system none origin and", &system_path_name);
+
+    let doc_string_root_origin =
+        get_intra_doc_string("Create with system root origin and", &system_path_name);
+
+    let doc_string_signed_origin =
+        get_intra_doc_string("Create with system signed origin and", &system_path_name);
+
+    let doc_string_runtime_origin = get_intra_doc_string(
+        "Convert to runtime origin, using as filter:",
+        &system_path_name,
+    );
+
+    let doc_string_runtime_origin_with_caller = get_intra_doc_string(
+        "Convert to runtime origin with caller being system signed or none and use filter",
+        &system_path_name,
+    );
+
+    Ok(quote! {
+        #( #query_origin_part_macros )*
+
+        /// The runtime origin type representing the origin of a call.
+        ///
+        #[doc = #doc_string]
+        #[derive(Clone)]
+        pub struct RuntimeOrigin {
+            pub caller: OriginCaller,
+            filter: #scrate::__private::sp_std::rc::Rc<Box<dyn Fn(&<#runtime as #system_path::Config>::RuntimeCall) -> bool>>,
+        }
+
+        #[cfg(not(feature = "std"))]
+        impl #scrate::__private::sp_std::fmt::Debug for RuntimeOrigin {
+            fn fmt(
+                &self,
+                fmt: &mut #scrate::__private::sp_std::fmt::Formatter,
+            ) -> #scrate::__private::sp_std::result::Result<(), #scrate::__private::sp_std::fmt::Error> {
+                fmt.write_str("<wasm:stripped>")
+            }
+        }
+
+        #[cfg(feature = "std")]
+        impl #scrate::__private::sp_std::fmt::Debug for RuntimeOrigin {
+            fn fmt(
+                &self,
+                fmt: &mut #scrate::__private::sp_std::fmt::Formatter,
+            ) -> #scrate::__private::sp_std::result::Result<(), #scrate::__private::sp_std::fmt::Error> {
+                fmt.debug_struct("Origin")
+                    .field("caller", &self.caller)
+                    .field("filter", &"[function ptr]")
+                    .finish()
+            }
+        }
+
+        impl #scrate::traits::OriginTrait for RuntimeOrigin {
+            type Call = <#runtime as #system_path::Config>::RuntimeCall;
+            type PalletsOrigin = OriginCaller;
+            type AccountId = <#runtime as #system_path::Config>::AccountId;
+
+            fn add_filter(&mut self, filter: impl Fn(&Self::Call) -> bool + 'static) {
+                let f = self.filter.clone();
+
+                self.filter = #scrate::__private::sp_std::rc::Rc::new(Box::new(move |call| {
+                    f(call) && filter(call)
+                }));
+            }
+
+            fn reset_filter(&mut self) {
+                let filter = <
+                    <#runtime as #system_path::Config>::BaseCallFilter
+                    as #scrate::traits::Contains<<#runtime as #system_path::Config>::RuntimeCall>
+                >::contains;
+
+                self.filter = #scrate::__private::sp_std::rc::Rc::new(Box::new(filter));
+            }
+
+            fn set_caller_from(&mut self, other: impl Into<Self>) {
+                self.caller = other.into().caller;
+            }
+
+            fn filter_call(&self, call: &Self::Call) -> bool {
+                match self.caller {
+                    // Root bypasses all filters
+                    OriginCaller::system(#system_path::Origin::<#runtime>::Root) => true,
+                    _ => (self.filter)(call),
+                }
+            }
+
+            fn caller(&self) -> &Self::PalletsOrigin {
+                &self.caller
+            }
+
+            fn into_caller(self) -> Self::PalletsOrigin {
+                self.caller
+            }
+
+            fn try_with_caller<R>(
+                mut self,
+                f: impl FnOnce(Self::PalletsOrigin) -> Result<R, Self::PalletsOrigin>,
+            ) -> Result<R, Self> {
+                match f(self.caller) {
+                    Ok(r) => Ok(r),
+                    Err(caller) => { self.caller = caller; Err(self) }
+                }
+            }
+
+            fn none() -> Self {
+                #system_path::RawOrigin::None.into()
+            }
+
+            fn root() -> Self {
+                #system_path::RawOrigin::Root.into()
+            }
+
+            fn signed(by: Self::AccountId) -> Self {
+                #system_path::RawOrigin::Signed(by).into()
+            }
+        }
+
+        #[derive(
+            Clone, PartialEq, Eq, #scrate::__private::RuntimeDebug, #scrate::__private::codec::Encode,
+            #scrate::__private::codec::Decode, #scrate::__private::scale_info::TypeInfo, #scrate::__private::codec::MaxEncodedLen,
+        )]
+        #[allow(non_camel_case_types)]
+        pub enum OriginCaller {
+            #[codec(index = #system_index)]
+            system(#system_path::Origin<#runtime>),
+            #caller_variants
+            #[allow(dead_code)]
+            Void(#scrate::__private::Void)
+        }
+
+        // For backwards compatibility and ease of accessing these functions.
+        #[allow(dead_code)]
+        impl RuntimeOrigin {
+            #[doc = #doc_string_none_origin]
+            pub fn none() -> Self {
+                <RuntimeOrigin as #scrate::traits::OriginTrait>::none()
+            }
+
+            #[doc = #doc_string_root_origin]
+            pub fn root() -> Self {
+                <RuntimeOrigin as #scrate::traits::OriginTrait>::root()
+            }
+
+            #[doc = #doc_string_signed_origin]
+            pub fn signed(by: <#runtime as #system_path::Config>::AccountId) -> Self {
+                <RuntimeOrigin as #scrate::traits::OriginTrait>::signed(by)
+            }
+        }
+
+        impl From<#system_path::Origin<#runtime>> for OriginCaller {
+            fn from(x: #system_path::Origin<#runtime>) -> Self {
+                OriginCaller::system(x)
+            }
+        }
+
+        impl #scrate::traits::CallerTrait<<#runtime as #system_path::Config>::AccountId> for OriginCaller {
+            fn into_system(self) -> Option<#system_path::RawOrigin<<#runtime as #system_path::Config>::AccountId>> {
+                match self {
+                    OriginCaller::system(x) => Some(x),
+                    _ => None,
+                }
+            }
+            fn as_system_ref(&self) -> Option<&#system_path::RawOrigin<<#runtime as #system_path::Config>::AccountId>> {
+                match &self {
+                    OriginCaller::system(o) => Some(o),
+                    _ => None,
+                }
+            }
+        }
+
+        impl TryFrom<OriginCaller> for #system_path::Origin<#runtime> {
+            type Error = OriginCaller;
+            fn try_from(x: OriginCaller)
+                -> #scrate::__private::sp_std::result::Result<#system_path::Origin<#runtime>, OriginCaller>
+            {
+                if let OriginCaller::system(l) = x {
+                    Ok(l)
+                } else {
+                    Err(x)
+                }
+            }
+        }
+
+        impl From<#system_path::Origin<#runtime>> for RuntimeOrigin {
+
+            #[doc = #doc_string_runtime_origin]
+            fn from(x: #system_path::Origin<#runtime>) -> Self {
+                let o: OriginCaller = x.into();
+                o.into()
+            }
+        }
+
+        impl From<OriginCaller> for RuntimeOrigin {
+            fn from(x: OriginCaller) -> Self {
+                let mut o = RuntimeOrigin {
+                    caller: x,
+                    filter: #scrate::__private::sp_std::rc::Rc::new(Box::new(|_| true)),
+                };
+
+                #scrate::traits::OriginTrait::reset_filter(&mut o);
+
+                o
+            }
+        }
+
+        impl From<RuntimeOrigin> for #scrate::__private::sp_std::result::Result<#system_path::Origin<#runtime>, RuntimeOrigin> {
+            /// NOTE: converting to pallet origin loses the origin filter information.
+            fn from(val: RuntimeOrigin) -> Self {
+                if let OriginCaller::system(l) = val.caller {
+                    Ok(l)
+                } else {
+                    Err(val)
+                }
+            }
+        }
+        impl From<Option<<#runtime as #system_path::Config>::AccountId>> for RuntimeOrigin {
+            #[doc = #doc_string_runtime_origin_with_caller]
+            fn from(x: Option<<#runtime as #system_path::Config>::AccountId>) -> Self {
+                <#system_path::Origin<#runtime>>::from(x).into()
+            }
+        }
+
+        #pallet_conversions
+    })
+}
+
+fn expand_origin_caller_variant(
+    runtime: &Ident,
+    pallet: &Pallet,
+    index: u8,
+    instance: Option<&Ident>,
+    generics: &Generics,
+) -> TokenStream {
+    let part_is_generic = !generics.params.is_empty();
+    let variant_name = &pallet.name;
+    let path = &pallet.path;
+    let attr = pallet
+        .cfg_pattern
+        .iter()
+        .fold(TokenStream::new(), |acc, pattern| {
+            let attr = TokenStream::from_str(&format!("#[cfg({})]", pattern.original()))
+                .expect("was successfully parsed before; qed");
+            quote! {
+                #acc
+                #attr
+            }
+        });
+
+    match instance {
+        Some(inst) if part_is_generic => quote! {
+            #attr
+            #[codec(index = #index)]
+            #variant_name(#path::Origin<#runtime, #path::#inst>),
+        },
+        Some(inst) => quote! {
+            #attr
+            #[codec(index = #index)]
+            #variant_name(#path::Origin<#path::#inst>),
+        },
+        None if part_is_generic => quote! {
+            #attr
+            #[codec(index = #index)]
+            #variant_name(#path::Origin<#runtime>),
+        },
+        None => quote! {
+            #attr
+            #[codec(index = #index)]
+            #variant_name(#path::Origin),
+        },
+    }
+}
+
+fn expand_origin_pallet_conversions(
+    scrate: &TokenStream,
+    runtime: &Ident,
+    pallet: &Pallet,
+    instance: Option<&Ident>,
+    generics: &Generics,
+) -> TokenStream {
+    let path = &pallet.path;
+    let variant_name = &pallet.name;
+
+    let part_is_generic = !generics.params.is_empty();
+    let pallet_origin = match instance {
+        Some(inst) if part_is_generic => quote!(#path::Origin<#runtime, #path::#inst>),
+        Some(inst) => quote!(#path::Origin<#path::#inst>),
+        None if part_is_generic => quote!(#path::Origin<#runtime>),
+        None => quote!(#path::Origin),
+    };
+
+    let doc_string = get_intra_doc_string(" Convert to runtime origin using", &path.module_name());
+    let attr = pallet
+        .cfg_pattern
+        .iter()
+        .fold(TokenStream::new(), |acc, pattern| {
+            let attr = TokenStream::from_str(&format!("#[cfg({})]", pattern.original()))
+                .expect("was successfully parsed before; qed");
+            quote! {
+                #acc
+                #attr
+            }
+        });
+
+    quote! {
+        #attr
+        impl From<#pallet_origin> for OriginCaller {
+            fn from(x: #pallet_origin) -> Self {
+                OriginCaller::#variant_name(x)
+            }
+        }
+
+        #attr
+        impl From<#pallet_origin> for RuntimeOrigin {
+            #[doc = #doc_string]
+            fn from(x: #pallet_origin) -> Self {
+                let x: OriginCaller = x.into();
+                x.into()
+            }
+        }
+
+        #attr
+        impl From<RuntimeOrigin> for #scrate::__private::sp_std::result::Result<#pallet_origin, RuntimeOrigin> {
+            /// NOTE: converting to pallet origin loses the origin filter information.
+            fn from(val: RuntimeOrigin) -> Self {
+                if let OriginCaller::#variant_name(l) = val.caller {
+                    Ok(l)
+                } else {
+                    Err(val)
+                }
+            }
+        }
+
+        #attr
+        impl TryFrom<OriginCaller> for #pallet_origin {
+            type Error = OriginCaller;
+            fn try_from(
+                x: OriginCaller,
+            ) -> #scrate::__private::sp_std::result::Result<#pallet_origin, OriginCaller> {
+                if let OriginCaller::#variant_name(l) = x {
+                    Ok(l)
+                } else {
+                    Err(x)
+                }
+            }
+        }
+
+        #attr
+        impl<'a> TryFrom<&'a OriginCaller> for &'a #pallet_origin {
+            type Error = ();
+            fn try_from(
+                x: &'a OriginCaller,
+            ) -> #scrate::__private::sp_std::result::Result<&'a #pallet_origin, ()> {
+                if let OriginCaller::#variant_name(l) = x {
+                    Ok(&l)
+                } else {
+                    Err(())
+                }
+            }
+        }
+
+        #attr
+        impl<'a> TryFrom<&'a RuntimeOrigin> for &'a #pallet_origin {
+            type Error = ();
+            fn try_from(
+                x: &'a RuntimeOrigin,
+            ) -> #scrate::__private::sp_std::result::Result<&'a #pallet_origin, ()> {
+                if let OriginCaller::#variant_name(l) = &x.caller {
+                    Ok(&l)
+                } else {
+                    Err(())
+                }
+            }
+        }
+    }
+}
+
+// Get the actual documentation using the doc information and system path name
+fn get_intra_doc_string(doc_info: &str, system_path_name: &String) -> String {
+    format!(
+        " {} [`{}::Config::BaseCallFilter`].",
+        doc_info, system_path_name
+    )
+}
diff --git a/support/procedural-fork/src/construct_runtime/expand/outer_enums.rs b/support/procedural-fork/src/construct_runtime/expand/outer_enums.rs
new file mode 100644
index 000000000..28e39c7a2
--- /dev/null
+++ b/support/procedural-fork/src/construct_runtime/expand/outer_enums.rs
@@ -0,0 +1,290 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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::Pallet;
+use proc_macro2::{Span, TokenStream};
+use quote::{quote, ToTokens};
+use std::str::FromStr;
+use syn::{Generics, Ident};
+
+/// Represents the types supported for creating an outer enum.
+#[derive(Clone, Copy, PartialEq)]
+pub enum OuterEnumType {
+    /// Collects the Event enums from all pallets.
+    Event,
+    /// Collects the Error enums from all pallets.
+    Error,
+}
+
+impl OuterEnumType {
+    /// The name of the structure this enum represents.
+    fn struct_name(&self) -> &str {
+        match self {
+            OuterEnumType::Event => "RuntimeEvent",
+            OuterEnumType::Error => "RuntimeError",
+        }
+    }
+
+    /// The name of the variant (ie `Event` or `Error`).
+    fn variant_name(&self) -> &str {
+        match self {
+            OuterEnumType::Event => "Event",
+            OuterEnumType::Error => "Error",
+        }
+    }
+}
+
+impl ToTokens for OuterEnumType {
+    fn to_tokens(&self, tokens: &mut TokenStream) {
+        match self {
+            OuterEnumType::Event => quote!(Event).to_tokens(tokens),
+            OuterEnumType::Error => quote!(Error).to_tokens(tokens),
+        }
+    }
+}
+
+/// Create an outer enum that encapsulates all pallets as variants.
+///
+/// Each variant represents a pallet and contains the corresponding type declared with either:
+/// - #[pallet::event] for the [`OuterEnumType::Event`] variant
+/// - #[pallet::error] for the [`OuterEnumType::Error`] variant
+///
+/// The name of the outer enum is prefixed with Runtime, resulting in names like RuntimeEvent
+/// or RuntimeError.
+///
+/// This structure facilitates the decoding process by leveraging the metadata.
+///
+/// # Example
+///
+/// The code generate looks like the following for [`OuterEnumType::Event`].
+///
+/// ```ignore
+/// enum RuntimeEvent {
+///     #[codec(index = 0)]
+///     System(pallet_system::Event),
+///
+///     #[codec(index = 5)]
+///     Balances(pallet_system::Event),
+/// }
+/// ```
+///
+/// Notice that the pallet index is preserved using the `#[codec(index = ..)]` attribute.
+pub fn expand_outer_enum(
+    runtime: &Ident,
+    pallet_decls: &[Pallet],
+    scrate: &TokenStream,
+    enum_ty: OuterEnumType,
+) -> syn::Result<TokenStream> {
+    // Stores all pallet variants.
+    let mut enum_variants = TokenStream::new();
+    // Generates the enum conversion between the `Runtime` outer enum and the pallet's enum.
+    let mut enum_conversions = TokenStream::new();
+    // Specific for events to query via `is_event_part_defined!`.
+    let mut query_enum_part_macros = Vec::new();
+
+    let enum_name_str = enum_ty.variant_name();
+    let enum_name_ident = Ident::new(enum_ty.struct_name(), Span::call_site());
+
+    for pallet_decl in pallet_decls {
+        let Some(pallet_entry) = pallet_decl.find_part(enum_name_str) else {
+            continue;
+        };
+
+        let path = &pallet_decl.path;
+        let pallet_name = &pallet_decl.name;
+        let index = pallet_decl.index;
+        let instance = pallet_decl.instance.as_ref();
+        let generics = &pallet_entry.generics;
+
+        if instance.is_some() && generics.params.is_empty() {
+            let msg = format!(
+                "Instantiable pallet with no generic `{}` cannot \
+					be constructed: pallet `{}` must have generic `{}`",
+                enum_name_str, pallet_name, enum_name_str,
+            );
+            return Err(syn::Error::new(pallet_name.span(), msg));
+        }
+
+        let part_is_generic = !generics.params.is_empty();
+        let pallet_enum = match (instance, part_is_generic) {
+            (Some(inst), true) => quote!(#path::#enum_ty::<#runtime, #path::#inst>),
+            (Some(inst), false) => quote!(#path::#enum_ty::<#path::#inst>),
+            (None, true) => quote!(#path::#enum_ty::<#runtime>),
+            (None, false) => quote!(#path::#enum_ty),
+        };
+
+        enum_variants.extend(expand_enum_variant(
+            runtime,
+            pallet_decl,
+            index,
+            instance,
+            generics,
+            enum_ty,
+        ));
+        enum_conversions.extend(expand_enum_conversion(
+            pallet_decl,
+            &pallet_enum,
+            &enum_name_ident,
+        ));
+
+        if enum_ty == OuterEnumType::Event {
+            query_enum_part_macros.push(quote! {
+                #path::__substrate_event_check::is_event_part_defined!(#pallet_name);
+            });
+        }
+    }
+
+    // Derives specific for the event.
+    let event_custom_derives = if enum_ty == OuterEnumType::Event {
+        quote!(Clone, PartialEq, Eq,)
+    } else {
+        quote!()
+    };
+
+    // Implementation specific for errors.
+    let error_custom_impl = generate_error_impl(scrate, enum_ty);
+
+    Ok(quote! {
+        #( #query_enum_part_macros )*
+
+        #[derive(
+            #event_custom_derives
+            #scrate::__private::codec::Encode,
+            #scrate::__private::codec::Decode,
+            #scrate::__private::scale_info::TypeInfo,
+            #scrate::__private::RuntimeDebug,
+        )]
+        #[allow(non_camel_case_types)]
+        pub enum #enum_name_ident {
+            #enum_variants
+        }
+
+        #enum_conversions
+
+        #error_custom_impl
+    })
+}
+
+fn expand_enum_variant(
+    runtime: &Ident,
+    pallet: &Pallet,
+    index: u8,
+    instance: Option<&Ident>,
+    generics: &Generics,
+    enum_ty: OuterEnumType,
+) -> TokenStream {
+    let path = &pallet.path;
+    let variant_name = &pallet.name;
+    let part_is_generic = !generics.params.is_empty();
+    let attr = pallet
+        .cfg_pattern
+        .iter()
+        .fold(TokenStream::new(), |acc, pattern| {
+            let attr = TokenStream::from_str(&format!("#[cfg({})]", pattern.original()))
+                .expect("was successfully parsed before; qed");
+            quote! {
+                #acc
+                #attr
+            }
+        });
+
+    match instance {
+        Some(inst) if part_is_generic => quote! {
+            #attr
+            #[codec(index = #index)]
+            #variant_name(#path::#enum_ty<#runtime, #path::#inst>),
+        },
+        Some(inst) => quote! {
+            #attr
+            #[codec(index = #index)]
+            #variant_name(#path::#enum_ty<#path::#inst>),
+        },
+        None if part_is_generic => quote! {
+            #attr
+            #[codec(index = #index)]
+            #variant_name(#path::#enum_ty<#runtime>),
+        },
+        None => quote! {
+            #attr
+            #[codec(index = #index)]
+            #variant_name(#path::#enum_ty),
+        },
+    }
+}
+
+fn expand_enum_conversion(
+    pallet: &Pallet,
+    pallet_enum: &TokenStream,
+    enum_name_ident: &Ident,
+) -> TokenStream {
+    let variant_name = &pallet.name;
+    let attr = pallet
+        .cfg_pattern
+        .iter()
+        .fold(TokenStream::new(), |acc, pattern| {
+            let attr = TokenStream::from_str(&format!("#[cfg({})]", pattern.original()))
+                .expect("was successfully parsed before; qed");
+            quote! {
+                #acc
+                #attr
+            }
+        });
+
+    quote! {
+        #attr
+        impl From<#pallet_enum> for #enum_name_ident {
+            fn from(x: #pallet_enum) -> Self {
+                #enum_name_ident
+                ::#variant_name(x)
+            }
+        }
+        #attr
+        impl TryInto<#pallet_enum> for #enum_name_ident {
+            type Error = ();
+
+            fn try_into(self) -> ::core::result::Result<#pallet_enum, Self::Error> {
+                match self {
+                    Self::#variant_name(evt) => Ok(evt),
+                    _ => Err(()),
+                }
+            }
+        }
+    }
+}
+
+fn generate_error_impl(scrate: &TokenStream, enum_ty: OuterEnumType) -> TokenStream {
+    // Implementation is specific to `Error`s.
+    if enum_ty == OuterEnumType::Event {
+        return quote! {};
+    }
+
+    let enum_name_ident = Ident::new(enum_ty.struct_name(), Span::call_site());
+
+    quote! {
+        impl #enum_name_ident {
+            /// Optionally convert the `DispatchError` into the `RuntimeError`.
+            ///
+            /// Returns `Some` if the error matches the `DispatchError::Module` variant, otherwise `None`.
+            pub fn from_dispatch_error(err: #scrate::sp_runtime::DispatchError) -> Option<Self> {
+                let #scrate::sp_runtime::DispatchError::Module(module_error) = err else { return None };
+
+                let bytes = #scrate::__private::codec::Encode::encode(&module_error);
+                #scrate::__private::codec::Decode::decode(&mut &bytes[..]).ok()
+            }
+        }
+    }
+}
diff --git a/support/procedural-fork/src/construct_runtime/expand/slash_reason.rs b/support/procedural-fork/src/construct_runtime/expand/slash_reason.rs
new file mode 100644
index 000000000..0695d8102
--- /dev/null
+++ b/support/procedural-fork/src/construct_runtime/expand/slash_reason.rs
@@ -0,0 +1,64 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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::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 {
+    let mut conversion_fns = Vec::new();
+    let mut slash_reason_variants = Vec::new();
+    for decl in pallet_decls {
+        if let Some(_) = decl.find_part("SlashReason") {
+            let variant_name = &decl.name;
+            let path = &decl.path;
+            let index = decl.index;
+            let instance = decl.instance.as_ref();
+
+            conversion_fns.push(composite_helper::expand_conversion_fn(
+                "SlashReason",
+                path,
+                instance,
+                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,
+            #scrate::__private::codec::Encode, #scrate::__private::codec::Decode, #scrate::__private::codec::MaxEncodedLen,
+            #scrate::__private::scale_info::TypeInfo,
+            #scrate::__private::RuntimeDebug,
+        )]
+        pub enum RuntimeSlashReason {
+            #( #slash_reason_variants )*
+        }
+
+        #( #conversion_fns )*
+    }
+}
diff --git a/support/procedural-fork/src/construct_runtime/expand/task.rs b/support/procedural-fork/src/construct_runtime/expand/task.rs
new file mode 100644
index 000000000..94a5f52bb
--- /dev/null
+++ b/support/procedural-fork/src/construct_runtime/expand/task.rs
@@ -0,0 +1,131 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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::Pallet;
+use proc_macro2::{Ident, TokenStream as TokenStream2};
+use quote::quote;
+
+/// Expands aggregate `RuntimeTask` enum.
+pub fn expand_outer_task(
+    runtime_name: &Ident,
+    pallet_decls: &[Pallet],
+    scrate: &TokenStream2,
+) -> TokenStream2 {
+    let mut from_impls = Vec::new();
+    let mut task_variants = Vec::new();
+    let mut variant_names = Vec::new();
+    let mut task_paths = Vec::new();
+    for decl in pallet_decls {
+        if decl.find_part("Task").is_none() {
+            continue;
+        }
+
+        let variant_name = &decl.name;
+        let path = &decl.path;
+        let index = decl.index;
+
+        from_impls.push(quote! {
+            impl From<#path::Task<#runtime_name>> for RuntimeTask {
+                fn from(hr: #path::Task<#runtime_name>) -> Self {
+                    RuntimeTask::#variant_name(hr)
+                }
+            }
+
+            impl TryInto<#path::Task<#runtime_name>> for RuntimeTask {
+                type Error = ();
+
+                fn try_into(self) -> Result<#path::Task<#runtime_name>, Self::Error> {
+                    match self {
+                        RuntimeTask::#variant_name(hr) => Ok(hr),
+                        _ => Err(()),
+                    }
+                }
+            }
+        });
+
+        task_variants.push(quote! {
+            #[codec(index = #index)]
+            #variant_name(#path::Task<#runtime_name>),
+        });
+
+        variant_names.push(quote!(#variant_name));
+
+        task_paths.push(quote!(#path::Task));
+    }
+
+    let prelude = quote!(#scrate::traits::tasks::__private);
+
+    const INCOMPLETE_MATCH_QED: &'static str =
+        "cannot have an instantiated RuntimeTask without some Task variant in the runtime. QED";
+
+    let output = quote! {
+        /// An aggregation of all `Task` enums across all pallets included in the current runtime.
+        #[derive(
+            Clone, Eq, PartialEq,
+            #scrate::__private::codec::Encode,
+            #scrate::__private::codec::Decode,
+            #scrate::__private::scale_info::TypeInfo,
+            #scrate::__private::RuntimeDebug,
+        )]
+        pub enum RuntimeTask {
+            #( #task_variants )*
+        }
+
+        #[automatically_derived]
+        impl #scrate::traits::Task for RuntimeTask {
+            type Enumeration = #prelude::IntoIter<RuntimeTask>;
+
+            fn is_valid(&self) -> bool {
+                match self {
+                    #(RuntimeTask::#variant_names(val) => val.is_valid(),)*
+                    _ => unreachable!(#INCOMPLETE_MATCH_QED),
+                }
+            }
+
+            fn run(&self) -> Result<(), #scrate::traits::tasks::__private::DispatchError> {
+                match self {
+                    #(RuntimeTask::#variant_names(val) => val.run(),)*
+                    _ => unreachable!(#INCOMPLETE_MATCH_QED),
+                }
+            }
+
+            fn weight(&self) -> #scrate::pallet_prelude::Weight {
+                match self {
+                    #(RuntimeTask::#variant_names(val) => val.weight(),)*
+                    _ => unreachable!(#INCOMPLETE_MATCH_QED),
+                }
+            }
+
+            fn task_index(&self) -> u32 {
+                match self {
+                    #(RuntimeTask::#variant_names(val) => val.task_index(),)*
+                    _ => unreachable!(#INCOMPLETE_MATCH_QED),
+                }
+            }
+
+            fn iter() -> Self::Enumeration {
+                let mut all_tasks = Vec::new();
+                #(all_tasks.extend(#task_paths::iter().map(RuntimeTask::from).collect::<Vec<_>>());)*
+                all_tasks.into_iter()
+            }
+        }
+
+        #( #from_impls )*
+    };
+
+    output
+}
diff --git a/support/procedural-fork/src/construct_runtime/expand/unsigned.rs b/support/procedural-fork/src/construct_runtime/expand/unsigned.rs
new file mode 100644
index 000000000..109f7081c
--- /dev/null
+++ b/support/procedural-fork/src/construct_runtime/expand/unsigned.rs
@@ -0,0 +1,92 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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::Pallet;
+use proc_macro2::TokenStream;
+use quote::quote;
+use std::str::FromStr;
+use syn::Ident;
+
+pub fn expand_outer_validate_unsigned(
+    runtime: &Ident,
+    pallet_decls: &[Pallet],
+    scrate: &TokenStream,
+) -> TokenStream {
+    let mut pallet_names = Vec::new();
+    let mut pallet_attrs = Vec::new();
+    let mut query_validate_unsigned_part_macros = Vec::new();
+
+    for pallet_decl in pallet_decls {
+        if pallet_decl.exists_part("ValidateUnsigned") {
+            let name = &pallet_decl.name;
+            let path = &pallet_decl.path;
+            let attr = pallet_decl
+                .cfg_pattern
+                .iter()
+                .fold(TokenStream::new(), |acc, pattern| {
+                    let attr = TokenStream::from_str(&format!("#[cfg({})]", pattern.original()))
+                        .expect("was successfully parsed before; qed");
+                    quote! {
+                        #acc
+                        #attr
+                    }
+                });
+
+            pallet_names.push(name);
+            pallet_attrs.push(attr);
+            query_validate_unsigned_part_macros.push(quote! {
+				#path::__substrate_validate_unsigned_check::is_validate_unsigned_part_defined!(#name);
+			});
+        }
+    }
+
+    quote! {
+        #( #query_validate_unsigned_part_macros )*
+
+        impl #scrate::unsigned::ValidateUnsigned for #runtime {
+            type Call = RuntimeCall;
+
+            fn pre_dispatch(call: &Self::Call) -> Result<(), #scrate::unsigned::TransactionValidityError> {
+                #[allow(unreachable_patterns)]
+                match call {
+                    #(
+                        #pallet_attrs
+                        RuntimeCall::#pallet_names(inner_call) => #pallet_names::pre_dispatch(inner_call),
+                    )*
+                    // pre-dispatch should not stop inherent extrinsics, validation should prevent
+                    // including arbitrary (non-inherent) extrinsics to blocks.
+                    _ => Ok(()),
+                }
+            }
+
+            fn validate_unsigned(
+                #[allow(unused_variables)]
+                source: #scrate::unsigned::TransactionSource,
+                call: &Self::Call,
+            ) -> #scrate::unsigned::TransactionValidity {
+                #[allow(unreachable_patterns)]
+                match call {
+                    #(
+                        #pallet_attrs
+                        RuntimeCall::#pallet_names(inner_call) => #pallet_names::validate_unsigned(source, inner_call),
+                    )*
+                    _ => #scrate::unsigned::UnknownTransaction::NoUnsignedValidator.into(),
+                }
+            }
+        }
+    }
+}
diff --git a/support/procedural-fork/src/construct_runtime/mod.rs b/support/procedural-fork/src/construct_runtime/mod.rs
new file mode 100644
index 000000000..de688b3d6
--- /dev/null
+++ b/support/procedural-fork/src/construct_runtime/mod.rs
@@ -0,0 +1,845 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Implementation of `construct_runtime`.
+//!
+//! `construct_runtime` implementation is recursive and can generate code which will call itself in
+//! order to get all the pallet parts for each pallet.
+//!
+//! Pallets can define their parts:
+//!  - Implicitly: `System: frame_system`
+//!  - Explicitly: `System: frame_system::{Pallet, Call}`
+//!
+//! The `construct_runtime` transitions from the implicit definition to the explicit one.
+//! From the explicit state, Substrate expands the pallets with additional information
+//! that is to be included in the runtime metadata. This expansion makes visible some extra
+//! parts of the pallets, mainly the `Error` if defined. The expanded state looks like
+//! `System: frame_system expanded::{Error} ::{Pallet, Call}` and concatenates the extra expanded
+//! parts with the user-provided parts. For example, the `Pallet`, `Call` and `Error` parts are
+//! collected.
+//!
+//! Pallets must provide the `tt_extra_parts` and `tt_default_parts` macros for these transitions.
+//! These are automatically implemented by the `#[pallet::pallet]` macro.
+//!
+//! This macro also generates the following enums for ease of decoding:
+//!  - `enum RuntimeCall`: This type contains the information needed to decode extrinsics.
+//!  - `enum RuntimeEvent`: This type contains the information needed to decode events.
+//!  - `enum RuntimeError`: While this cannot be used directly to decode `sp_runtime::DispatchError`
+//!    from the chain, it contains the information needed to decode the
+//!    `sp_runtime::DispatchError::Module`.
+//!
+//! # State Transitions
+//!
+//! ```ignore
+//!  +----------+
+//!  | Implicit | -----------+
+//!  +----------+            |
+//!      |                   |
+//!      v                   v
+//!  +----------+     +------------------+
+//!  | Explicit | --> | ExplicitExpanded |
+//!  +----------+     +------------------+
+//! ```
+//!
+//! When all pallet parts are implicit, then the `construct_runtime!` macro expands to its final
+//! state, the `ExplicitExpanded`. Otherwise, all implicit parts are converted to an explicit
+//! expanded part allow the `construct_runtime!` to expand any remaining explicit parts to an
+//! explicit expanded part.
+//!
+//! # Implicit to Explicit
+//!
+//! The `construct_runtime` macro transforms the implicit declaration of each pallet
+//! `System: frame_system` to an explicit one `System: frame_system::{Pallet, Call}` using the
+//! `tt_default_parts` macro.
+//!
+//! The `tt_default_parts` macro exposes a comma separated list of pallet parts. For example, the
+//! `Event` part is exposed only if the pallet implements an event via `#[pallet::event]` macro.
+//! The tokens generated by this macro are ` expanded :: { Pallet, Call }` for our example.
+//!
+//! The `match_and_insert` macro takes in 3 arguments:
+//!  - target: This is the `TokenStream` that contains the `construct_runtime!` macro.
+//!  - pattern: The pattern to match against in the target stream.
+//!  - tokens: The tokens to added after the pattern match.
+//!
+//! The `construct_runtime` macro uses the `tt_call` to get the default pallet parts via
+//! the `tt_default_parts` macro defined by each pallet. The pallet parts are then returned as
+//! input to the `match_and_replace` macro.
+//! The `match_and_replace` then will modify the the `construct_runtime!` to expand the implicit
+//! definition to the explicit one.
+//!
+//! For example,
+//!
+//! ```ignore
+//! construct_runtime!(
+//! 	//...
+//! 	{
+//! 		System: frame_system = 0, // Implicit definition of parts
+//! 		Balances: pallet_balances = 1, // Implicit definition of parts
+//! 	}
+//! );
+//! ```
+//! This call has some implicit pallet parts, thus it will expand to:
+//! ```ignore
+//! frame_support::__private::tt_call! {
+//! 	macro = [{ pallet_balances::tt_default_parts }]
+//! 	~~> frame_support::match_and_insert! {
+//! 		target = [{
+//! 			frame_support::__private::tt_call! {
+//! 				macro = [{ frame_system::tt_default_parts }]
+//! 				~~> frame_support::match_and_insert! {
+//! 					target = [{
+//! 						construct_runtime!(
+//! 							//...
+//! 							{
+//! 								System: frame_system = 0,
+//! 								Balances: pallet_balances = 1,
+//! 							}
+//! 						);
+//! 					}]
+//! 					pattern = [{ System: frame_system }]
+//! 				}
+//! 			}
+//! 		}]
+//! 		pattern = [{ Balances: pallet_balances }]
+//! 	}
+//! }
+//! ```
+//! `tt_default_parts` must be defined. It returns the pallet parts inside some tokens, and
+//! then `tt_call` will pipe the returned pallet parts into the input of `match_and_insert`.
+//! Thus `match_and_insert` will initially receive the following inputs:
+//! ```ignore
+//! frame_support::match_and_insert! {
+//! 	target = [{
+//! 		frame_support::match_and_insert! {
+//! 			target = [{
+//! 				construct_runtime!(
+//! 					//...
+//! 					{
+//! 						System: frame_system = 0,
+//! 						Balances: pallet_balances = 1,
+//! 					}
+//! 				)
+//! 			}]
+//! 			pattern = [{ System: frame_system }]
+//! 			tokens = [{ ::{Pallet, Call} }]
+//! 		}
+//! 	}]
+//! 	pattern = [{ Balances: pallet_balances }]
+//! 	tokens = [{ ::{Pallet, Call} }]
+//! }
+//! ```
+//! After dealing with `pallet_balances`, the inner `match_and_insert` will expand to:
+//! ```ignore
+//! frame_support::match_and_insert! {
+//! 	target = [{
+//! 		construct_runtime!(
+//! 			//...
+//! 			{
+//! 				System: frame_system = 0, // Implicit definition of parts
+//! 				Balances: pallet_balances::{Pallet, Call} = 1, // Explicit definition of parts
+//! 			}
+//! 		)
+//! 	}]
+//! 	pattern = [{ System: frame_system }]
+//! 	tokens = [{ ::{Pallet, Call} }]
+//! }
+//! ```
+//!
+//! Which will then finally expand to the following:
+//! ```ignore
+//! construct_runtime!(
+//! 	//...
+//! 	{
+//! 		System: frame_system::{Pallet, Call},
+//! 		Balances: pallet_balances::{Pallet, Call},
+//! 	}
+//! )
+//! ```
+//!
+//! This call has no implicit pallet parts, thus it will expand to the runtime construction:
+//! ```ignore
+//! pub enum Runtime { ... }
+//! pub struct Call { ... }
+//! impl Call ...
+//! pub enum Origin { ... }
+//! ...
+//! ```
+//!
+//! Visualizing the entire flow of `construct_runtime!`, it would look like the following:
+//!
+//! ```ignore
+//! +--------------------+     +---------------------+     +-------------------+
+//! |                    |     | (defined in pallet) |     |                   |
+//! | construct_runtime! | --> |  tt_default_parts!  | --> | match_and_insert! |
+//! | w/ no pallet parts |     |                     |     |                   |
+//! +--------------------+     +---------------------+     +-------------------+
+//!
+//!     +--------------------+
+//!     |                    |
+//! --> | construct_runtime! |
+//!     |  w/ pallet parts   |
+//!     +--------------------+
+//! ```
+//!
+//! # Explicit to Explicit Expanded
+//!
+//! Users normally do not care about this transition.
+//!
+//! Similarly to the previous transition, the macro expansion transforms `System:
+//! frame_system::{Pallet, Call}` into  `System: frame_system expanded::{Error} ::{Pallet, Call}`.
+//! The `expanded` section adds extra parts that the Substrate would like to expose for each pallet
+//! by default. This is done to expose the appropriate types for metadata construction.
+//!
+//! This time, instead of calling `tt_default_parts` we are using the `tt_extra_parts` macro.
+//! This macro returns the ` :: expanded { Error }` list of additional parts we would like to
+//! expose.
+
+pub(crate) mod expand;
+pub(crate) mod parse;
+
+use crate::pallet::parse::helper::two128_str;
+use cfg_expr::Predicate;
+use frame_support_procedural_tools::{
+    generate_access_from_frame_or_crate, generate_crate_access, generate_hidden_includes,
+};
+use itertools::Itertools;
+use parse::{ExplicitRuntimeDeclaration, ImplicitRuntimeDeclaration, Pallet, RuntimeDeclaration};
+use proc_macro::TokenStream;
+use proc_macro2::TokenStream as TokenStream2;
+use quote::quote;
+use std::{collections::HashSet, str::FromStr};
+use syn::{spanned::Spanned, Ident, Result};
+
+/// The fixed name of the system pallet.
+const SYSTEM_PALLET_NAME: &str = "System";
+
+/// Implementation of `construct_runtime` macro. Either expand to some code which will call
+/// `construct_runtime` again, or expand to the final runtime definition.
+pub fn construct_runtime(input: TokenStream) -> TokenStream {
+    let input_copy = input.clone();
+    let definition = syn::parse_macro_input!(input as RuntimeDeclaration);
+
+    let (check_pallet_number_res, res) = match definition {
+        RuntimeDeclaration::Implicit(implicit_def) => (
+            check_pallet_number(input_copy.clone().into(), implicit_def.pallets.len()),
+            construct_runtime_implicit_to_explicit(input_copy.into(), implicit_def),
+        ),
+        RuntimeDeclaration::Explicit(explicit_decl) => (
+            check_pallet_number(input_copy.clone().into(), explicit_decl.pallets.len()),
+            construct_runtime_explicit_to_explicit_expanded(input_copy.into(), explicit_decl),
+        ),
+        RuntimeDeclaration::ExplicitExpanded(explicit_decl) => (
+            check_pallet_number(input_copy.into(), explicit_decl.pallets.len()),
+            construct_runtime_final_expansion(explicit_decl),
+        ),
+    };
+
+    let res = res.unwrap_or_else(|e| e.to_compile_error());
+
+    // We want to provide better error messages to the user and thus, handle the error here
+    // separately. If there is an error, we print the error and still generate all of the code to
+    // get in overall less errors for the user.
+    let res = if let Err(error) = check_pallet_number_res {
+        let error = error.to_compile_error();
+
+        quote! {
+            #error
+
+            #res
+        }
+    } else {
+        res
+    };
+
+    let res = expander::Expander::new("construct_runtime")
+        .dry(std::env::var("EXPAND_MACROS").is_err())
+        .verbose(true)
+        .write_to_out_dir(res)
+        .expect("Does not fail because of IO in OUT_DIR; qed");
+
+    res.into()
+}
+
+/// All pallets that have implicit pallet parts (ie `System: frame_system`) are
+/// expanded with the default parts defined by the pallet's `tt_default_parts` macro.
+///
+/// This function transforms the [`RuntimeDeclaration::Implicit`] into
+/// [`RuntimeDeclaration::Explicit`] that is not yet fully expanded.
+///
+/// For more details, please refer to the root documentation.
+fn construct_runtime_implicit_to_explicit(
+    input: TokenStream2,
+    definition: ImplicitRuntimeDeclaration,
+) -> Result<TokenStream2> {
+    let frame_support = generate_access_from_frame_or_crate("frame-support")?;
+    let mut expansion = quote::quote!(
+        #frame_support::construct_runtime! { #input }
+    );
+    for pallet in definition
+        .pallets
+        .iter()
+        .filter(|pallet| pallet.pallet_parts.is_none())
+    {
+        let pallet_path = &pallet.path;
+        let pallet_name = &pallet.name;
+        let pallet_instance = pallet
+            .instance
+            .as_ref()
+            .map(|instance| quote::quote!(::<#instance>));
+        expansion = quote::quote!(
+            #frame_support::__private::tt_call! {
+                macro = [{ #pallet_path::tt_default_parts }]
+                your_tt_return = [{ #frame_support::__private::tt_return }]
+                ~~> #frame_support::match_and_insert! {
+                    target = [{ #expansion }]
+                    pattern = [{ #pallet_name: #pallet_path #pallet_instance }]
+                }
+            }
+        );
+    }
+
+    Ok(expansion)
+}
+
+/// All pallets that have
+///   (I): explicit pallet parts (ie `System: frame_system::{Pallet, Call}`) and
+///   (II): are not fully expanded (ie do not include the `Error` expansion part)
+/// are fully expanded by including the parts from the pallet's `tt_extra_parts` macro.
+///
+/// This function transforms the [`RuntimeDeclaration::Explicit`] that is not yet fully expanded
+/// into [`RuntimeDeclaration::ExplicitExpanded`] fully expanded.
+///
+/// For more details, please refer to the root documentation.
+fn construct_runtime_explicit_to_explicit_expanded(
+    input: TokenStream2,
+    definition: ExplicitRuntimeDeclaration,
+) -> Result<TokenStream2> {
+    let frame_support = generate_access_from_frame_or_crate("frame-support")?;
+    let mut expansion = quote::quote!(
+        #frame_support::construct_runtime! { #input }
+    );
+    for pallet in definition
+        .pallets
+        .iter()
+        .filter(|pallet| !pallet.is_expanded)
+    {
+        let pallet_path = &pallet.path;
+        let pallet_name = &pallet.name;
+        let pallet_instance = pallet
+            .instance
+            .as_ref()
+            .map(|instance| quote::quote!(::<#instance>));
+        expansion = quote::quote!(
+            #frame_support::__private::tt_call! {
+                macro = [{ #pallet_path::tt_extra_parts }]
+                your_tt_return = [{ #frame_support::__private::tt_return }]
+                ~~> #frame_support::match_and_insert! {
+                    target = [{ #expansion }]
+                    pattern = [{ #pallet_name: #pallet_path #pallet_instance }]
+                }
+            }
+        );
+    }
+
+    Ok(expansion)
+}
+
+/// All pallets have explicit definition of parts, this will expand to the runtime declaration.
+fn construct_runtime_final_expansion(
+    definition: ExplicitRuntimeDeclaration,
+) -> Result<TokenStream2> {
+    let ExplicitRuntimeDeclaration {
+        name,
+        pallets,
+        pallets_token,
+        where_section,
+    } = definition;
+
+    let system_pallet = pallets
+        .iter()
+        .find(|decl| decl.name == SYSTEM_PALLET_NAME)
+        .ok_or_else(|| {
+            syn::Error::new(
+                pallets_token.span.join(),
+                "`System` pallet declaration is missing. \
+			 Please add this line: `System: frame_system,`",
+            )
+        })?;
+    if !system_pallet.cfg_pattern.is_empty() {
+        return Err(syn::Error::new(
+            system_pallet.name.span(),
+            "`System` pallet declaration is feature gated, please remove any `#[cfg]` attributes",
+        ));
+    }
+
+    let features = pallets
+        .iter()
+        .filter_map(|decl| {
+            (!decl.cfg_pattern.is_empty()).then(|| {
+                decl.cfg_pattern.iter().flat_map(|attr| {
+                    attr.predicates().filter_map(|pred| match pred {
+                        Predicate::Feature(feat) => Some(feat),
+                        Predicate::Test => Some("test"),
+                        _ => None,
+                    })
+                })
+            })
+        })
+        .flatten()
+        .collect::<HashSet<_>>();
+
+    let hidden_crate_name = "construct_runtime";
+    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_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);
+
+    let outer_event =
+        expand::expand_outer_enum(&name, &pallets, &scrate, expand::OuterEnumType::Event)?;
+    let outer_error =
+        expand::expand_outer_enum(&name, &pallets, &scrate, expand::OuterEnumType::Error)?;
+
+    let outer_origin = expand::expand_outer_origin(&name, system_pallet, &pallets, &scrate)?;
+    let all_pallets = decl_all_pallets(&name, pallets.iter(), &features);
+    let pallet_to_index = decl_pallet_runtime_setup(&name, &pallets, &scrate);
+
+    let dispatch = expand::expand_outer_dispatch(&name, system_pallet, &pallets, &scrate);
+    let tasks = expand::expand_outer_task(&name, &pallets, &scrate);
+    let metadata = expand::expand_runtime_metadata(
+        &name,
+        &pallets,
+        &scrate,
+        &unchecked_extrinsic,
+        &system_pallet.path,
+    );
+    let outer_config = expand::expand_outer_config(&name, &pallets, &scrate);
+    let inherent =
+        expand::expand_outer_inherent(&name, &block, &unchecked_extrinsic, &pallets, &scrate);
+    let validate_unsigned = expand::expand_outer_validate_unsigned(&name, &pallets, &scrate);
+    let freeze_reason = expand::expand_outer_freeze_reason(&pallets, &scrate);
+    let hold_reason = expand::expand_outer_hold_reason(&pallets, &scrate);
+    let lock_id = expand::expand_outer_lock_id(&pallets, &scrate);
+    let slash_reason = expand::expand_outer_slash_reason(&pallets, &scrate);
+    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_or_panic(),
+        )
+    });
+
+    let res = quote!(
+        #warning
+
+        #scrate_decl
+
+        // Prevent UncheckedExtrinsic to print unused warning.
+        const _: () = {
+            #[allow(unused)]
+            type __hidden_use_of_unchecked_extrinsic = #unchecked_extrinsic;
+        };
+
+        #[derive(
+            Clone, Copy, PartialEq, Eq, #scrate::sp_runtime::RuntimeDebug,
+            #scrate::__private::scale_info::TypeInfo
+        )]
+        pub struct #name;
+        impl #scrate::sp_runtime::traits::GetRuntimeBlockType for #name {
+            type RuntimeBlock = #block;
+        }
+
+        // Each runtime must expose the `runtime_metadata()` to fetch the runtime API metadata.
+        // The function is implemented by calling `impl_runtime_apis!`.
+        //
+        // However, the `construct_runtime!` may be called without calling `impl_runtime_apis!`.
+        // Rely on the `Deref` trait to differentiate between a runtime that implements
+        // APIs (by macro impl_runtime_apis!) and a runtime that is simply created (by macro construct_runtime!).
+        //
+        // Both `InternalConstructRuntime` and `InternalImplRuntimeApis` expose a `runtime_metadata()` function.
+        // `InternalConstructRuntime` is implemented by the `construct_runtime!` for Runtime references (`& Runtime`),
+        // while `InternalImplRuntimeApis` is implemented by the `impl_runtime_apis!` for Runtime (`Runtime`).
+        //
+        // Therefore, the `Deref` trait will resolve the `runtime_metadata` from `impl_runtime_apis!`
+        // when both macros are called; and will resolve an empty `runtime_metadata` when only the `construct_runtime!`
+        // is called.
+
+        #[doc(hidden)]
+        trait InternalConstructRuntime {
+            #[inline(always)]
+            fn runtime_metadata(&self) -> #scrate::__private::sp_std::vec::Vec<#scrate::__private::metadata_ir::RuntimeApiMetadataIR> {
+                Default::default()
+            }
+        }
+        #[doc(hidden)]
+        impl InternalConstructRuntime for &#name {}
+
+        #outer_event
+
+        #outer_error
+
+        #outer_origin
+
+        #all_pallets
+
+        #pallet_to_index
+
+        #dispatch
+
+        #tasks
+
+        #metadata
+
+        #outer_config
+
+        #inherent
+
+        #validate_unsigned
+
+        #freeze_reason
+
+        #hold_reason
+
+        #lock_id
+
+        #slash_reason
+
+        #integrity_test
+
+        #static_assertions
+    );
+
+    Ok(res)
+}
+
+pub(crate) fn decl_all_pallets<'a>(
+    runtime: &'a Ident,
+    pallet_declarations: impl Iterator<Item = &'a Pallet>,
+    features: &HashSet<&str>,
+) -> TokenStream2 {
+    let mut types = TokenStream2::new();
+
+    // Every feature set to the pallet names that should be included by this feature set.
+    let mut features_to_names = features
+        .iter()
+        .map(|f| *f)
+        .powerset()
+        .map(|feat| (HashSet::from_iter(feat), Vec::new()))
+        .collect::<Vec<(HashSet<_>, Vec<_>)>>();
+
+    for pallet_declaration in pallet_declarations {
+        let type_name = &pallet_declaration.name;
+        let pallet = &pallet_declaration.path;
+        let mut generics = vec![quote!(#runtime)];
+        generics.extend(
+            pallet_declaration
+                .instance
+                .iter()
+                .map(|name| quote!(#pallet::#name)),
+        );
+        let mut attrs = Vec::new();
+        for cfg in &pallet_declaration.cfg_pattern {
+            let feat = format!("#[cfg({})]\n", cfg.original());
+            attrs.extend(TokenStream2::from_str(&feat).expect("was parsed successfully; qed"));
+        }
+        let type_decl = quote!(
+            #(#attrs)*
+            pub type #type_name = #pallet::Pallet <#(#generics),*>;
+        );
+        types.extend(type_decl);
+
+        if pallet_declaration.cfg_pattern.is_empty() {
+            for (_, names) in features_to_names.iter_mut() {
+                names.push(&pallet_declaration.name);
+            }
+        } else {
+            for (feature_set, names) in &mut features_to_names {
+                // Rust tidbit: if we have multiple `#[cfg]` feature on the same item, then the
+                // predicates listed in all `#[cfg]` attributes are effectively joined by `and()`,
+                // meaning that all of them must match in order to activate the item
+                let is_feature_active = pallet_declaration.cfg_pattern.iter().all(|expr| {
+                    expr.eval(|pred| match pred {
+                        Predicate::Feature(f) => feature_set.contains(f),
+                        Predicate::Test => feature_set.contains(&"test"),
+                        _ => false,
+                    })
+                });
+
+                if is_feature_active {
+                    names.push(&pallet_declaration.name);
+                }
+            }
+        }
+    }
+
+    // All possible features. This will be used below for the empty feature set.
+    let mut all_features = features_to_names
+        .iter()
+        .flat_map(|f| f.0.iter().cloned())
+        .collect::<HashSet<_>>();
+    let attribute_to_names = features_to_names
+		.into_iter()
+		.map(|(mut features, names)| {
+			// If this is the empty feature set, it needs to be changed to negate all available
+			// features. So, we ensure that there is some type declared when all features are not
+			// enabled.
+			if features.is_empty() {
+				let test_cfg = all_features.remove("test").then_some(quote!(test)).into_iter();
+				let features = all_features.iter();
+				let attr = quote!(#[cfg(all( #(not(#test_cfg)),* #(not(feature = #features)),* ))]);
+
+				(attr, names)
+			} else {
+				let test_cfg = features.remove("test").then_some(quote!(test)).into_iter();
+				let disabled_features = all_features.difference(&features);
+				let features = features.iter();
+				let attr = quote!(#[cfg(all( #(#test_cfg,)* #(feature = #features,)* #(not(feature = #disabled_features)),* ))]);
+
+				(attr, names)
+			}
+		})
+		.collect::<Vec<_>>();
+
+    let all_pallets_without_system = attribute_to_names.iter().map(|(attr, names)| {
+        let names = names.iter().filter(|n| **n != SYSTEM_PALLET_NAME);
+        quote! {
+            #attr
+            /// All pallets included in the runtime as a nested tuple of types.
+            /// Excludes the System pallet.
+            pub type AllPalletsWithoutSystem = ( #(#names,)* );
+        }
+    });
+
+    let all_pallets_with_system = attribute_to_names.iter().map(|(attr, names)| {
+        quote! {
+            #attr
+            /// All pallets included in the runtime as a nested tuple of types.
+            pub type AllPalletsWithSystem = ( #(#names,)* );
+        }
+    });
+
+    quote!(
+        #types
+
+        #( #all_pallets_with_system )*
+
+        #( #all_pallets_without_system )*
+    )
+}
+
+pub(crate) fn decl_pallet_runtime_setup(
+    runtime: &Ident,
+    pallet_declarations: &[Pallet],
+    scrate: &TokenStream2,
+) -> 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
+        .iter()
+        .map(|pallet| {
+            let path = &pallet.path;
+            match pallet.instance.as_ref() {
+                Some(inst) => quote!(#path::Pallet<#runtime, #path::#inst>),
+                None => quote!(#path::Pallet<#runtime>),
+            }
+        })
+        .collect::<Vec<_>>();
+    let pallet_attrs = pallet_declarations
+        .iter()
+        .map(|pallet| {
+            pallet
+                .cfg_pattern
+                .iter()
+                .fold(TokenStream2::new(), |acc, pattern| {
+                    let attr = TokenStream2::from_str(&format!("#[cfg({})]", pattern.original()))
+                        .expect("was successfully parsed before; qed");
+                    quote! {
+                        #acc
+                        #attr
+                    }
+                })
+        })
+        .collect::<Vec<_>>();
+
+    quote!(
+        /// Provides an implementation of `PalletInfo` to provide information
+        /// about the pallet setup in the runtime.
+        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>();
+                #(
+                    #pallet_attrs
+                    if type_id == #scrate::__private::sp_std::any::TypeId::of::<#names>() {
+                        return Some(#indices)
+                    }
+                )*
+
+                None
+            }
+
+            fn name<P: 'static>() -> Option<&'static str> {
+                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_strings)
+                    }
+                )*
+
+                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>();
+                #(
+                    #pallet_attrs
+                    if type_id == #scrate::__private::sp_std::any::TypeId::of::<#names>() {
+                        return Some(#module_names)
+                    }
+                )*
+
+                None
+            }
+
+            fn crate_version<P: 'static>() -> Option<#scrate::traits::CrateVersion> {
+                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(
+                            <#pallet_structs as #scrate::traits::PalletInfoAccess>::crate_version()
+                        )
+                    }
+                )*
+
+                None
+            }
+        }
+    )
+}
+
+pub(crate) fn decl_integrity_test(scrate: &TokenStream2) -> TokenStream2 {
+    quote!(
+        #[cfg(test)]
+        mod __construct_runtime_integrity_test {
+            use super::*;
+
+            #[test]
+            pub fn runtime_integrity_tests() {
+                #scrate::__private::sp_tracing::try_init_simple();
+                <AllPalletsWithSystem as #scrate::traits::IntegrityTest>::integrity_test();
+            }
+        }
+    )
+}
+
+pub(crate) fn decl_static_assertions(
+    runtime: &Ident,
+    pallet_decls: &[Pallet],
+    scrate: &TokenStream2,
+) -> TokenStream2 {
+    let error_encoded_size_check = pallet_decls.iter().map(|decl| {
+        let path = &decl.path;
+        let assert_message = format!(
+            "The maximum encoded size of the error type in the `{}` pallet exceeds \
+			`MAX_MODULE_ERROR_ENCODED_SIZE`",
+            decl.name,
+        );
+
+        quote! {
+            #scrate::__private::tt_call! {
+                macro = [{ #path::tt_error_token }]
+                your_tt_return = [{ #scrate::__private::tt_return }]
+                ~~> #scrate::assert_error_encoded_size! {
+                    path = [{ #path }]
+                    runtime = [{ #runtime }]
+                    assert_message = [{ #assert_message }]
+                }
+            }
+        }
+    });
+
+    quote! {
+        #(#error_encoded_size_check)*
+    }
+}
+
+pub(crate) fn check_pallet_number(input: TokenStream2, pallet_num: usize) -> Result<()> {
+    let max_pallet_num = {
+        if cfg!(feature = "tuples-96") {
+            96
+        } else if cfg!(feature = "tuples-128") {
+            128
+        } else {
+            64
+        }
+    };
+
+    if pallet_num > max_pallet_num {
+        let no_feature = max_pallet_num == 128;
+        return Err(syn::Error::new(
+            input.span(),
+            format!(
+                "{} To increase this limit, enable the tuples-{} feature of [frame_support]. {}",
+                "The number of pallets exceeds the maximum number of tuple elements.",
+                max_pallet_num + 32,
+                if no_feature {
+                    "If the feature does not exist - it needs to be implemented."
+                } else {
+                    ""
+                },
+            ),
+        ));
+    }
+
+    Ok(())
+}
diff --git a/support/procedural-fork/src/construct_runtime/parse.rs b/support/procedural-fork/src/construct_runtime/parse.rs
new file mode 100644
index 000000000..173a8dd12
--- /dev/null
+++ b/support/procedural-fork/src/construct_runtime/parse.rs
@@ -0,0 +1,839 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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_procedural_tools::syn_ext as ext;
+use proc_macro2::{Span, TokenStream};
+use quote::ToTokens;
+use std::collections::{HashMap, HashSet};
+use syn::{
+    ext::IdentExt,
+    parse::{Parse, ParseStream},
+    punctuated::Punctuated,
+    spanned::Spanned,
+    token, Attribute, Error, Ident, Path, Result, Token,
+};
+
+mod keyword {
+    syn::custom_keyword!(Block);
+    syn::custom_keyword!(NodeBlock);
+    syn::custom_keyword!(UncheckedExtrinsic);
+    syn::custom_keyword!(Pallet);
+    syn::custom_keyword!(Call);
+    syn::custom_keyword!(Storage);
+    syn::custom_keyword!(Event);
+    syn::custom_keyword!(Error);
+    syn::custom_keyword!(Config);
+    syn::custom_keyword!(Origin);
+    syn::custom_keyword!(Inherent);
+    syn::custom_keyword!(ValidateUnsigned);
+    syn::custom_keyword!(FreezeReason);
+    syn::custom_keyword!(HoldReason);
+    syn::custom_keyword!(Task);
+    syn::custom_keyword!(LockId);
+    syn::custom_keyword!(SlashReason);
+    syn::custom_keyword!(exclude_parts);
+    syn::custom_keyword!(use_parts);
+    syn::custom_keyword!(expanded);
+}
+
+/// Declaration of a runtime.
+///
+/// Pallet declare their part either explicitly or implicitly (using no part declaration)
+/// If all pallet have explicit parts then the runtime declaration is explicit, otherwise it is
+/// implicit.
+#[derive(Debug)]
+pub enum RuntimeDeclaration {
+    Implicit(ImplicitRuntimeDeclaration),
+    Explicit(ExplicitRuntimeDeclaration),
+    ExplicitExpanded(ExplicitRuntimeDeclaration),
+}
+
+/// Declaration of a runtime with some pallet with implicit declaration of parts.
+#[derive(Debug)]
+pub struct ImplicitRuntimeDeclaration {
+    pub name: Ident,
+    pub where_section: Option<WhereSection>,
+    pub pallets: Vec<PalletDeclaration>,
+}
+
+/// Declaration of a runtime with all pallet having explicit declaration of parts.
+#[derive(Debug)]
+pub struct ExplicitRuntimeDeclaration {
+    pub name: Ident,
+    pub where_section: Option<WhereSection>,
+    pub pallets: Vec<Pallet>,
+    pub pallets_token: token::Brace,
+}
+
+impl Parse for RuntimeDeclaration {
+    fn parse(input: ParseStream) -> Result<Self> {
+        input.parse::<Token![pub]>()?;
+
+        // Support either `enum` or `struct`.
+        if input.peek(Token![struct]) {
+            input.parse::<Token![struct]>()?;
+        } else {
+            input.parse::<Token![enum]>()?;
+        }
+
+        let name = input.parse::<syn::Ident>()?;
+        let where_section = if input.peek(token::Where) {
+            Some(input.parse()?)
+        } else {
+            None
+        };
+        let pallets =
+            input.parse::<ext::Braces<ext::Punctuated<PalletDeclaration, Token![,]>>>()?;
+        let pallets_token = pallets.token;
+
+        match convert_pallets(pallets.content.inner.into_iter().collect())? {
+            PalletsConversion::Implicit(pallets) => {
+                Ok(RuntimeDeclaration::Implicit(ImplicitRuntimeDeclaration {
+                    name,
+                    where_section,
+                    pallets,
+                }))
+            }
+            PalletsConversion::Explicit(pallets) => {
+                Ok(RuntimeDeclaration::Explicit(ExplicitRuntimeDeclaration {
+                    name,
+                    where_section,
+                    pallets,
+                    pallets_token,
+                }))
+            }
+            PalletsConversion::ExplicitExpanded(pallets) => Ok(
+                RuntimeDeclaration::ExplicitExpanded(ExplicitRuntimeDeclaration {
+                    name,
+                    where_section,
+                    pallets,
+                    pallets_token,
+                }),
+            ),
+        }
+    }
+}
+
+#[derive(Debug)]
+pub struct WhereSection {
+    pub span: Span,
+    pub block: syn::TypePath,
+    pub node_block: syn::TypePath,
+    pub unchecked_extrinsic: syn::TypePath,
+}
+
+impl Parse for WhereSection {
+    fn parse(input: ParseStream) -> Result<Self> {
+        input.parse::<token::Where>()?;
+
+        let mut definitions = Vec::new();
+        while !input.peek(token::Brace) {
+            let definition: WhereDefinition = input.parse()?;
+            definitions.push(definition);
+            if !input.peek(Token![,]) {
+                if !input.peek(token::Brace) {
+                    return Err(input.error("Expected `,` or `{`"));
+                }
+                break;
+            }
+            input.parse::<Token![,]>()?;
+        }
+        let block = remove_kind(input, WhereKind::Block, &mut definitions)?.value;
+        let node_block = remove_kind(input, WhereKind::NodeBlock, &mut definitions)?.value;
+        let unchecked_extrinsic =
+            remove_kind(input, WhereKind::UncheckedExtrinsic, &mut definitions)?.value;
+        if let Some(WhereDefinition {
+            ref kind_span,
+            ref kind,
+            ..
+        }) = definitions.first()
+        {
+            let msg = format!(
+                "`{:?}` was declared above. Please use exactly one declaration for `{:?}`.",
+                kind, kind
+            );
+            return Err(Error::new(*kind_span, msg));
+        }
+        Ok(Self {
+            span: input.span(),
+            block,
+            node_block,
+            unchecked_extrinsic,
+        })
+    }
+}
+
+#[derive(Debug, PartialEq, Eq, Clone, Copy, Hash)]
+pub enum WhereKind {
+    Block,
+    NodeBlock,
+    UncheckedExtrinsic,
+}
+
+#[derive(Debug)]
+pub struct WhereDefinition {
+    pub kind_span: Span,
+    pub kind: WhereKind,
+    pub value: syn::TypePath,
+}
+
+impl Parse for WhereDefinition {
+    fn parse(input: ParseStream) -> Result<Self> {
+        let lookahead = input.lookahead1();
+        let (kind_span, kind) = if lookahead.peek(keyword::Block) {
+            (input.parse::<keyword::Block>()?.span(), WhereKind::Block)
+        } else if lookahead.peek(keyword::NodeBlock) {
+            (
+                input.parse::<keyword::NodeBlock>()?.span(),
+                WhereKind::NodeBlock,
+            )
+        } else if lookahead.peek(keyword::UncheckedExtrinsic) {
+            (
+                input.parse::<keyword::UncheckedExtrinsic>()?.span(),
+                WhereKind::UncheckedExtrinsic,
+            )
+        } else {
+            return Err(lookahead.error());
+        };
+
+        Ok(Self {
+            kind_span,
+            kind,
+            value: {
+                let _: Token![=] = input.parse()?;
+                input.parse()?
+            },
+        })
+    }
+}
+
+/// The declaration of a pallet.
+#[derive(Debug, Clone)]
+pub struct PalletDeclaration {
+    /// Is this pallet fully expanded?
+    pub is_expanded: bool,
+    /// The name of the pallet, e.g.`System` in `System: frame_system`.
+    pub name: Ident,
+    /// Optional attributes tagged right above a pallet declaration.
+    pub attrs: Vec<Attribute>,
+    /// Optional fixed index, e.g. `MyPallet ...  = 3,`.
+    pub index: Option<u8>,
+    /// The path of the pallet, e.g. `frame_system` in `System: frame_system`.
+    pub path: PalletPath,
+    /// The instance of the pallet, e.g. `Instance1` in `Council: pallet_collective::<Instance1>`.
+    pub instance: Option<Ident>,
+    /// The declared pallet parts,
+    /// e.g. `Some([Pallet, Call])` for `System: system::{Pallet, Call}`
+    /// or `None` for `System: system`.
+    pub pallet_parts: Option<Vec<PalletPart>>,
+    /// The specified parts, either use_parts or exclude_parts.
+    pub specified_parts: SpecifiedParts,
+}
+
+/// The possible declaration of pallet parts to use.
+#[derive(Debug, Clone)]
+pub enum SpecifiedParts {
+    /// Use all the pallet parts except those specified.
+    Exclude(Vec<PalletPartNoGeneric>),
+    /// Use only the specified pallet parts.
+    Use(Vec<PalletPartNoGeneric>),
+    /// Use the all the pallet parts.
+    All,
+}
+
+impl Parse for PalletDeclaration {
+    fn parse(input: ParseStream) -> Result<Self> {
+        let attrs = input.call(Attribute::parse_outer)?;
+
+        let name = input.parse()?;
+        let _: Token![:] = input.parse()?;
+        let path = input.parse()?;
+
+        // Parse for instance.
+        let instance = if input.peek(Token![::]) && input.peek3(Token![<]) {
+            let _: Token![::] = input.parse()?;
+            let _: Token![<] = input.parse()?;
+            let res = Some(input.parse()?);
+            let _: Token![>] = input.parse()?;
+            res
+        } else if !(input.peek(Token![::]) && input.peek3(token::Brace))
+            && !input.peek(keyword::expanded)
+            && !input.peek(keyword::exclude_parts)
+            && !input.peek(keyword::use_parts)
+            && !input.peek(Token![=])
+            && !input.peek(Token![,])
+            && !input.is_empty()
+        {
+            return Err(input.error(
+				"Unexpected tokens, expected one of `::$ident` `::{`, `exclude_parts`, `use_parts`, `=`, `,`",
+			));
+        } else {
+            None
+        };
+
+        // Check if the pallet is fully expanded.
+        let (is_expanded, extra_parts) = if input.peek(keyword::expanded) {
+            let _: keyword::expanded = input.parse()?;
+            let _: Token![::] = input.parse()?;
+            (true, parse_pallet_parts(input)?)
+        } else {
+            (false, vec![])
+        };
+
+        // Parse for explicit parts
+        let pallet_parts = if input.peek(Token![::]) && input.peek3(token::Brace) {
+            let _: Token![::] = input.parse()?;
+            let mut parts = parse_pallet_parts(input)?;
+            parts.extend(extra_parts.into_iter());
+            Some(parts)
+        } else if !input.peek(keyword::exclude_parts)
+            && !input.peek(keyword::use_parts)
+            && !input.peek(Token![=])
+            && !input.peek(Token![,])
+            && !input.is_empty()
+        {
+            return Err(input.error(
+                "Unexpected tokens, expected one of `::{`, `exclude_parts`, `use_parts`, `=`, `,`",
+            ));
+        } else {
+            is_expanded.then_some(extra_parts)
+        };
+
+        // Parse for specified parts
+        let specified_parts = if input.peek(keyword::exclude_parts) {
+            let _: keyword::exclude_parts = input.parse()?;
+            SpecifiedParts::Exclude(parse_pallet_parts_no_generic(input)?)
+        } else if input.peek(keyword::use_parts) {
+            let _: keyword::use_parts = input.parse()?;
+            SpecifiedParts::Use(parse_pallet_parts_no_generic(input)?)
+        } else if !input.peek(Token![=]) && !input.peek(Token![,]) && !input.is_empty() {
+            return Err(input.error("Unexpected tokens, expected one of `exclude_parts`, `=`, `,`"));
+        } else {
+            SpecifiedParts::All
+        };
+
+        // Parse for pallet index
+        let index = if input.peek(Token![=]) {
+            input.parse::<Token![=]>()?;
+            let index = input.parse::<syn::LitInt>()?;
+            let index = index.base10_parse::<u8>()?;
+            Some(index)
+        } else if !input.peek(Token![,]) && !input.is_empty() {
+            return Err(input.error("Unexpected tokens, expected one of `=`, `,`"));
+        } else {
+            None
+        };
+
+        Ok(Self {
+            is_expanded,
+            attrs,
+            name,
+            path,
+            instance,
+            pallet_parts,
+            specified_parts,
+            index,
+        })
+    }
+}
+
+/// A struct representing a path to a pallet. `PalletPath` is almost identical to the standard
+/// Rust path with a few restrictions:
+/// - No leading colons allowed
+/// - Path segments can only consist of identifiers separated by colons
+#[derive(Debug, Clone)]
+pub struct PalletPath {
+    pub inner: Path,
+}
+
+impl PalletPath {
+    pub fn module_name(&self) -> String {
+        self.inner
+            .segments
+            .iter()
+            .fold(String::new(), |mut acc, segment| {
+                if !acc.is_empty() {
+                    acc.push_str("::");
+                }
+                acc.push_str(&segment.ident.to_string());
+                acc
+            })
+    }
+}
+
+impl Parse for PalletPath {
+    fn parse(input: ParseStream) -> Result<Self> {
+        let mut res = PalletPath {
+            inner: Path {
+                leading_colon: None,
+                segments: Punctuated::new(),
+            },
+        };
+
+        let lookahead = input.lookahead1();
+        if lookahead.peek(Token![crate])
+            || lookahead.peek(Token![self])
+            || lookahead.peek(Token![super])
+            || lookahead.peek(Ident)
+        {
+            let ident = input.call(Ident::parse_any)?;
+            res.inner.segments.push(ident.into());
+        } else {
+            return Err(lookahead.error());
+        }
+
+        while input.peek(Token![::]) && input.peek3(Ident) {
+            input.parse::<Token![::]>()?;
+            let ident = input.parse::<Ident>()?;
+            res.inner.segments.push(ident.into());
+        }
+        Ok(res)
+    }
+}
+
+impl quote::ToTokens for PalletPath {
+    fn to_tokens(&self, tokens: &mut TokenStream) {
+        self.inner.to_tokens(tokens);
+    }
+}
+
+/// Parse [`PalletPart`]'s from a braces enclosed list that is split by commas, e.g.
+///
+/// `{ Call, Event }`
+fn parse_pallet_parts(input: ParseStream) -> Result<Vec<PalletPart>> {
+    let pallet_parts: ext::Braces<ext::Punctuated<PalletPart, Token![,]>> = input.parse()?;
+
+    let mut resolved = HashSet::new();
+    for part in pallet_parts.content.inner.iter() {
+        if !resolved.insert(part.name()) {
+            let msg = format!(
+                "`{}` was already declared before. Please remove the duplicate declaration",
+                part.name(),
+            );
+            return Err(Error::new(part.keyword.span(), msg));
+        }
+    }
+
+    Ok(pallet_parts.content.inner.into_iter().collect())
+}
+
+#[derive(Debug, Clone)]
+pub enum PalletPartKeyword {
+    Pallet(keyword::Pallet),
+    Call(keyword::Call),
+    Storage(keyword::Storage),
+    Event(keyword::Event),
+    Error(keyword::Error),
+    Config(keyword::Config),
+    Origin(keyword::Origin),
+    Inherent(keyword::Inherent),
+    ValidateUnsigned(keyword::ValidateUnsigned),
+    FreezeReason(keyword::FreezeReason),
+    HoldReason(keyword::HoldReason),
+    Task(keyword::Task),
+    LockId(keyword::LockId),
+    SlashReason(keyword::SlashReason),
+}
+
+impl Parse for PalletPartKeyword {
+    fn parse(input: ParseStream) -> Result<Self> {
+        let lookahead = input.lookahead1();
+
+        if lookahead.peek(keyword::Pallet) {
+            Ok(Self::Pallet(input.parse()?))
+        } else if lookahead.peek(keyword::Call) {
+            Ok(Self::Call(input.parse()?))
+        } else if lookahead.peek(keyword::Storage) {
+            Ok(Self::Storage(input.parse()?))
+        } else if lookahead.peek(keyword::Event) {
+            Ok(Self::Event(input.parse()?))
+        } else if lookahead.peek(keyword::Error) {
+            Ok(Self::Error(input.parse()?))
+        } else if lookahead.peek(keyword::Config) {
+            Ok(Self::Config(input.parse()?))
+        } else if lookahead.peek(keyword::Origin) {
+            Ok(Self::Origin(input.parse()?))
+        } else if lookahead.peek(keyword::Inherent) {
+            Ok(Self::Inherent(input.parse()?))
+        } else if lookahead.peek(keyword::ValidateUnsigned) {
+            Ok(Self::ValidateUnsigned(input.parse()?))
+        } else if lookahead.peek(keyword::FreezeReason) {
+            Ok(Self::FreezeReason(input.parse()?))
+        } else if lookahead.peek(keyword::HoldReason) {
+            Ok(Self::HoldReason(input.parse()?))
+        } else if lookahead.peek(keyword::Task) {
+            Ok(Self::Task(input.parse()?))
+        } else if lookahead.peek(keyword::LockId) {
+            Ok(Self::LockId(input.parse()?))
+        } else if lookahead.peek(keyword::SlashReason) {
+            Ok(Self::SlashReason(input.parse()?))
+        } else {
+            Err(lookahead.error())
+        }
+    }
+}
+
+impl PalletPartKeyword {
+    /// Returns the name of `Self`.
+    fn name(&self) -> &'static str {
+        match self {
+            Self::Pallet(_) => "Pallet",
+            Self::Call(_) => "Call",
+            Self::Storage(_) => "Storage",
+            Self::Event(_) => "Event",
+            Self::Error(_) => "Error",
+            Self::Config(_) => "Config",
+            Self::Origin(_) => "Origin",
+            Self::Inherent(_) => "Inherent",
+            Self::ValidateUnsigned(_) => "ValidateUnsigned",
+            Self::FreezeReason(_) => "FreezeReason",
+            Self::HoldReason(_) => "HoldReason",
+            Self::Task(_) => "Task",
+            Self::LockId(_) => "LockId",
+            Self::SlashReason(_) => "SlashReason",
+        }
+    }
+
+    /// Returns `true` if this pallet part is allowed to have generic arguments.
+    fn allows_generic(&self) -> bool {
+        Self::all_generic_arg().iter().any(|n| *n == self.name())
+    }
+
+    /// Returns the names of all pallet parts that allow to have a generic argument.
+    fn all_generic_arg() -> &'static [&'static str] {
+        &["Event", "Error", "Origin", "Config", "Task"]
+    }
+}
+
+impl ToTokens for PalletPartKeyword {
+    fn to_tokens(&self, tokens: &mut TokenStream) {
+        match self {
+            Self::Pallet(inner) => inner.to_tokens(tokens),
+            Self::Call(inner) => inner.to_tokens(tokens),
+            Self::Storage(inner) => inner.to_tokens(tokens),
+            Self::Event(inner) => inner.to_tokens(tokens),
+            Self::Error(inner) => inner.to_tokens(tokens),
+            Self::Config(inner) => inner.to_tokens(tokens),
+            Self::Origin(inner) => inner.to_tokens(tokens),
+            Self::Inherent(inner) => inner.to_tokens(tokens),
+            Self::ValidateUnsigned(inner) => inner.to_tokens(tokens),
+            Self::FreezeReason(inner) => inner.to_tokens(tokens),
+            Self::HoldReason(inner) => inner.to_tokens(tokens),
+            Self::Task(inner) => inner.to_tokens(tokens),
+            Self::LockId(inner) => inner.to_tokens(tokens),
+            Self::SlashReason(inner) => inner.to_tokens(tokens),
+        }
+    }
+}
+
+#[derive(Debug, Clone)]
+pub struct PalletPart {
+    pub keyword: PalletPartKeyword,
+    pub generics: syn::Generics,
+}
+
+impl Parse for PalletPart {
+    fn parse(input: ParseStream) -> Result<Self> {
+        let keyword: PalletPartKeyword = input.parse()?;
+
+        let generics: syn::Generics = input.parse()?;
+        if !generics.params.is_empty() && !keyword.allows_generic() {
+            let valid_generics = PalletPart::format_names(PalletPartKeyword::all_generic_arg());
+            let msg = format!(
+                "`{}` is not allowed to have generics. \
+				 Only the following pallets are allowed to have generics: {}.",
+                keyword.name(),
+                valid_generics,
+            );
+            return Err(syn::Error::new(keyword.span(), msg));
+        }
+
+        Ok(Self { keyword, generics })
+    }
+}
+
+impl PalletPart {
+    pub fn format_names(names: &[&'static str]) -> String {
+        let res: Vec<_> = names.iter().map(|s| format!("`{}`", s)).collect();
+        res.join(", ")
+    }
+
+    /// The name of this pallet part.
+    pub fn name(&self) -> &'static str {
+        self.keyword.name()
+    }
+}
+
+fn remove_kind(
+    input: ParseStream,
+    kind: WhereKind,
+    definitions: &mut Vec<WhereDefinition>,
+) -> Result<WhereDefinition> {
+    if let Some(pos) = definitions.iter().position(|d| d.kind == kind) {
+        Ok(definitions.remove(pos))
+    } else {
+        let msg = format!(
+            "Missing associated type for `{:?}`. Add `{:?}` = ... to where section.",
+            kind, kind
+        );
+        Err(input.error(msg))
+    }
+}
+
+/// The declaration of a part without its generics
+#[derive(Debug, Clone)]
+pub struct PalletPartNoGeneric {
+    keyword: PalletPartKeyword,
+}
+
+impl Parse for PalletPartNoGeneric {
+    fn parse(input: ParseStream) -> Result<Self> {
+        Ok(Self {
+            keyword: input.parse()?,
+        })
+    }
+}
+
+/// Parse [`PalletPartNoGeneric`]'s from a braces enclosed list that is split by commas, e.g.
+///
+/// `{ Call, Event }`
+fn parse_pallet_parts_no_generic(input: ParseStream) -> Result<Vec<PalletPartNoGeneric>> {
+    let pallet_parts: ext::Braces<ext::Punctuated<PalletPartNoGeneric, Token![,]>> =
+        input.parse()?;
+
+    let mut resolved = HashSet::new();
+    for part in pallet_parts.content.inner.iter() {
+        if !resolved.insert(part.keyword.name()) {
+            let msg = format!(
+                "`{}` was already declared before. Please remove the duplicate declaration",
+                part.keyword.name(),
+            );
+            return Err(Error::new(part.keyword.span(), msg));
+        }
+    }
+
+    Ok(pallet_parts.content.inner.into_iter().collect())
+}
+
+/// The final definition of a pallet with the resulting fixed index and explicit parts.
+#[derive(Debug, Clone)]
+pub struct Pallet {
+    /// Is this pallet fully expanded?
+    pub is_expanded: bool,
+    /// The name of the pallet, e.g.`System` in `System: frame_system`.
+    pub name: Ident,
+    /// Either automatically inferred, or defined (e.g. `MyPallet ...  = 3,`).
+    pub index: u8,
+    /// The path of the pallet, e.g. `frame_system` in `System: frame_system`.
+    pub path: PalletPath,
+    /// The instance of the pallet, e.g. `Instance1` in `Council: pallet_collective::<Instance1>`.
+    pub instance: Option<Ident>,
+    /// The pallet parts to use for the pallet.
+    pub pallet_parts: Vec<PalletPart>,
+    /// Expressions specified inside of a #[cfg] attribute.
+    pub cfg_pattern: Vec<cfg_expr::Expression>,
+}
+
+impl Pallet {
+    /// Get resolved pallet parts
+    pub fn pallet_parts(&self) -> &[PalletPart] {
+        &self.pallet_parts
+    }
+
+    /// Find matching parts
+    pub fn find_part(&self, name: &str) -> Option<&PalletPart> {
+        self.pallet_parts.iter().find(|part| part.name() == name)
+    }
+
+    /// Return whether pallet contains part
+    pub fn exists_part(&self, name: &str) -> bool {
+        self.find_part(name).is_some()
+    }
+}
+
+/// Result of a conversion of a declaration of pallets.
+///
+/// # State Transitions
+///
+/// ```ignore
+/// +----------+    +----------+    +------------------+
+/// | Implicit | -> | Explicit | -> | ExplicitExpanded |
+/// +----------+    +----------+    +------------------+
+/// ```
+enum PalletsConversion {
+    /// Pallets implicitly declare parts.
+    ///
+    /// `System: frame_system`.
+    Implicit(Vec<PalletDeclaration>),
+    /// Pallets explicitly declare parts.
+    ///
+    /// `System: frame_system::{Pallet, Call}`
+    ///
+    /// However, for backwards compatibility with Polkadot/Kusama
+    /// we must propagate some other parts to the pallet by default.
+    Explicit(Vec<Pallet>),
+    /// Pallets explicitly declare parts that are fully expanded.
+    ///
+    /// This is the end state that contains extra parts included by
+    /// default by Substrate.
+    ///
+    /// `System: frame_system expanded::{Error} ::{Pallet, Call}`
+    ///
+    /// For this example, the `Pallet`, `Call` and `Error` parts are collected.
+    ExplicitExpanded(Vec<Pallet>),
+}
+
+/// Convert from the parsed pallet declaration to their final information.
+///
+/// Check if all pallet have explicit declaration of their parts, if so then assign index to each
+/// pallet using same rules as rust for fieldless enum. I.e. implicit are assigned number
+/// incrementally from last explicit or 0.
+fn convert_pallets(pallets: Vec<PalletDeclaration>) -> syn::Result<PalletsConversion> {
+    if pallets.iter().any(|pallet| pallet.pallet_parts.is_none()) {
+        return Ok(PalletsConversion::Implicit(pallets));
+    }
+
+    let mut indices = HashMap::new();
+    let mut last_index: Option<u8> = None;
+    let mut names = HashMap::new();
+    let mut is_expanded = true;
+
+    let pallets = pallets
+        .into_iter()
+        .map(|pallet| {
+            let final_index = match pallet.index {
+                Some(i) => i,
+                None => last_index
+                    .map_or(Some(0), |i| i.checked_add(1))
+                    .ok_or_else(|| {
+                        let msg = "Pallet index doesn't fit into u8, index is 256";
+                        syn::Error::new(pallet.name.span(), msg)
+                    })?,
+            };
+
+            last_index = Some(final_index);
+
+            if let Some(used_pallet) = indices.insert(final_index, pallet.name.clone()) {
+                let msg = format!(
+                    "Pallet indices are conflicting: Both pallets {} and {} are at index {}",
+                    used_pallet, pallet.name, final_index,
+                );
+                let mut err = syn::Error::new(used_pallet.span(), &msg);
+                err.combine(syn::Error::new(pallet.name.span(), msg));
+                return Err(err);
+            }
+
+            if let Some(used_pallet) = names.insert(pallet.name.clone(), pallet.name.span()) {
+                let msg = "Two pallets with the same name!";
+
+                let mut err = syn::Error::new(used_pallet, &msg);
+                err.combine(syn::Error::new(pallet.name.span(), &msg));
+                return Err(err);
+            }
+
+            let mut pallet_parts = pallet.pallet_parts.expect("Checked above");
+
+            let available_parts = pallet_parts
+                .iter()
+                .map(|part| part.keyword.name())
+                .collect::<HashSet<_>>();
+
+            // Check parts are correctly specified
+            match &pallet.specified_parts {
+                SpecifiedParts::Exclude(parts) | SpecifiedParts::Use(parts) => {
+                    for part in parts {
+                        if !available_parts.contains(part.keyword.name()) {
+                            let msg = format!(
+                                "Invalid pallet part specified, the pallet `{}` doesn't have the \
+								`{}` part. Available parts are: {}.",
+                                pallet.name,
+                                part.keyword.name(),
+                                pallet_parts.iter().fold(String::new(), |fold, part| {
+                                    if fold.is_empty() {
+                                        format!("`{}`", part.keyword.name())
+                                    } else {
+                                        format!("{}, `{}`", fold, part.keyword.name())
+                                    }
+                                })
+                            );
+                            return Err(syn::Error::new(part.keyword.span(), msg));
+                        }
+                    }
+                }
+                SpecifiedParts::All => (),
+            }
+
+            // Set only specified parts.
+            match pallet.specified_parts {
+                SpecifiedParts::Exclude(excluded_parts) => pallet_parts.retain(|part| {
+                    !excluded_parts
+                        .iter()
+                        .any(|excluded_part| excluded_part.keyword.name() == part.keyword.name())
+                }),
+                SpecifiedParts::Use(used_parts) => pallet_parts.retain(|part| {
+                    used_parts
+                        .iter()
+                        .any(|use_part| use_part.keyword.name() == part.keyword.name())
+                }),
+                SpecifiedParts::All => (),
+            }
+
+            let cfg_pattern = pallet
+                .attrs
+                .iter()
+                .map(|attr| {
+                    if attr
+                        .path()
+                        .segments
+                        .first()
+                        .map_or(false, |s| s.ident != "cfg")
+                    {
+                        let msg = "Unsupported attribute, only #[cfg] is supported on pallet \
+						declarations in `construct_runtime`";
+                        return Err(syn::Error::new(attr.span(), msg));
+                    }
+
+                    attr.parse_args_with(|input: syn::parse::ParseStream| {
+                        // Required, otherwise the parse stream doesn't advance and will result in
+                        // an error.
+                        let input = input.parse::<proc_macro2::TokenStream>()?;
+                        cfg_expr::Expression::parse(&input.to_string())
+                            .map_err(|e| syn::Error::new(attr.span(), e.to_string()))
+                    })
+                })
+                .collect::<Result<Vec<_>>>()?;
+
+            is_expanded &= pallet.is_expanded;
+
+            Ok(Pallet {
+                is_expanded: pallet.is_expanded,
+                name: pallet.name,
+                index: final_index,
+                path: pallet.path,
+                instance: pallet.instance,
+                cfg_pattern,
+                pallet_parts,
+            })
+        })
+        .collect::<Result<Vec<_>>>()?;
+
+    if is_expanded {
+        Ok(PalletsConversion::ExplicitExpanded(pallets))
+    } else {
+        Ok(PalletsConversion::Explicit(pallets))
+    }
+}
diff --git a/support/procedural-fork/src/crate_version.rs b/support/procedural-fork/src/crate_version.rs
new file mode 100644
index 000000000..63e7c7279
--- /dev/null
+++ b/support/procedural-fork/src/crate_version.rs
@@ -0,0 +1,54 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Implementation of macros related to crate versioning.
+
+use super::get_cargo_env_var;
+use frame_support_procedural_tools::generate_access_from_frame_or_crate;
+use proc_macro2::{Span, TokenStream};
+use syn::{Error, Result};
+
+/// Create an error that will be shown by rustc at the call site of the macro.
+fn create_error(message: &str) -> Error {
+    Error::new(Span::call_site(), message)
+}
+
+/// Implementation of the `crate_to_crate_version!` macro.
+pub fn crate_to_crate_version(input: proc_macro::TokenStream) -> Result<TokenStream> {
+    if !input.is_empty() {
+        return Err(create_error("No arguments expected!"));
+    }
+
+    let major_version = get_cargo_env_var::<u16>("CARGO_PKG_VERSION_MAJOR")
+        .map_err(|_| create_error("Major version needs to fit into `u16`"))?;
+
+    let minor_version = get_cargo_env_var::<u8>("CARGO_PKG_VERSION_MINOR")
+        .map_err(|_| create_error("Minor version needs to fit into `u8`"))?;
+
+    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_access_from_frame_or_crate("frame-support")?;
+
+    Ok(quote::quote! {
+        #crate_::traits::CrateVersion {
+            major: #major_version,
+            minor: #minor_version,
+            patch: #patch_version,
+        }
+    })
+}
diff --git a/support/procedural-fork/src/derive_impl.rs b/support/procedural-fork/src/derive_impl.rs
new file mode 100644
index 000000000..e91f9c534
--- /dev/null
+++ b/support/procedural-fork/src/derive_impl.rs
@@ -0,0 +1,316 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Implementation of the `derive_impl` attribute macro.
+
+use derive_syn_parse::Parse;
+use macro_magic::mm_core::ForeignPath;
+use proc_macro2::TokenStream as TokenStream2;
+use quote::{quote, ToTokens};
+use std::collections::HashSet;
+use syn::{
+    parse2, parse_quote, spanned::Spanned, token, Ident, ImplItem, ItemImpl, Path, Result, Token,
+};
+
+mod keyword {
+    syn::custom_keyword!(inject_runtime_type);
+    syn::custom_keyword!(no_aggregated_types);
+}
+
+#[derive(derive_syn_parse::Parse, PartialEq, Eq)]
+pub enum PalletAttrType {
+    #[peek(keyword::inject_runtime_type, name = "inject_runtime_type")]
+    RuntimeType(keyword::inject_runtime_type),
+}
+
+#[derive(derive_syn_parse::Parse)]
+pub struct PalletAttr {
+    _pound: Token![#],
+    #[bracket]
+    _bracket: token::Bracket,
+    #[inside(_bracket)]
+    typ: PalletAttrType,
+}
+
+fn is_runtime_type(item: &syn::ImplItemType) -> bool {
+    item.attrs.iter().any(|attr| {
+        if let Ok(PalletAttr {
+            typ: PalletAttrType::RuntimeType(_),
+            ..
+        }) = parse2::<PalletAttr>(attr.into_token_stream())
+        {
+            return true;
+        }
+        false
+    })
+}
+
+#[derive(Parse, Debug)]
+pub struct DeriveImplAttrArgs {
+    pub default_impl_path: Path,
+    _as: Option<Token![as]>,
+    #[parse_if(_as.is_some())]
+    pub disambiguation_path: Option<Path>,
+    _comma: Option<Token![,]>,
+    #[parse_if(_comma.is_some())]
+    pub no_aggregated_types: Option<keyword::no_aggregated_types>,
+}
+
+impl ForeignPath for DeriveImplAttrArgs {
+    fn foreign_path(&self) -> &Path {
+        &self.default_impl_path
+    }
+}
+
+impl ToTokens for DeriveImplAttrArgs {
+    fn to_tokens(&self, tokens: &mut TokenStream2) {
+        tokens.extend(self.default_impl_path.to_token_stream());
+        tokens.extend(self._as.to_token_stream());
+        tokens.extend(self.disambiguation_path.to_token_stream());
+        tokens.extend(self._comma.to_token_stream());
+        tokens.extend(self.no_aggregated_types.to_token_stream());
+    }
+}
+
+/// Gets the [`Ident`] representation of the given [`ImplItem`], if one exists. Otherwise
+/// returns [`None`].
+///
+/// Used by [`combine_impls`] to determine whether we can compare [`ImplItem`]s by [`Ident`]
+/// or not.
+fn impl_item_ident(impl_item: &ImplItem) -> Option<&Ident> {
+    match impl_item {
+        ImplItem::Const(item) => Some(&item.ident),
+        ImplItem::Fn(item) => Some(&item.sig.ident),
+        ImplItem::Type(item) => Some(&item.ident),
+        ImplItem::Macro(item) => item.mac.path.get_ident(),
+        _ => None,
+    }
+}
+
+/// The real meat behind `derive_impl`. Takes in a `local_impl`, which is the impl for which we
+/// want to implement defaults (i.e. the one the attribute macro is attached to), and a
+/// `foreign_impl`, which is the impl containing the defaults we want to use, and returns an
+/// [`ItemImpl`] containing the final generated impl.
+///
+/// This process has the following caveats:
+/// * Colliding items that have an ident are not copied into `local_impl`
+/// * Uncolliding items that have an ident are copied into `local_impl` but are qualified as `type
+///   #ident = <#default_impl_path as #disambiguation_path>::#ident;`
+/// * Items that lack an ident are de-duplicated so only unique items that lack an ident are copied
+///   into `local_impl`. Items that lack an ident and also exist verbatim in `local_impl` are not
+///   copied over.
+fn combine_impls(
+    local_impl: ItemImpl,
+    foreign_impl: ItemImpl,
+    default_impl_path: Path,
+    disambiguation_path: Path,
+    inject_runtime_types: bool,
+) -> ItemImpl {
+    let (existing_local_keys, existing_unsupported_items): (HashSet<ImplItem>, HashSet<ImplItem>) =
+        local_impl
+            .items
+            .iter()
+            .cloned()
+            .partition(|impl_item| impl_item_ident(impl_item).is_some());
+    let existing_local_keys: HashSet<Ident> = existing_local_keys
+        .into_iter()
+        .filter_map(|item| impl_item_ident(&item).cloned())
+        .collect();
+    let mut final_impl = local_impl;
+    let extended_items = foreign_impl.items.into_iter().filter_map(|item| {
+        if let Some(ident) = impl_item_ident(&item) {
+            if existing_local_keys.contains(&ident) {
+                // do not copy colliding items that have an ident
+                return None;
+            }
+            if let ImplItem::Type(typ) = item.clone() {
+                let cfg_attrs = typ
+                    .attrs
+                    .iter()
+                    .filter(|attr| {
+                        attr.path()
+                            .get_ident()
+                            .map_or(false, |ident| ident == "cfg")
+                    })
+                    .map(|attr| attr.to_token_stream());
+                if is_runtime_type(&typ) {
+                    let item: ImplItem = if inject_runtime_types {
+                        parse_quote! {
+                            #( #cfg_attrs )*
+                            type #ident = #ident;
+                        }
+                    } else {
+                        item
+                    };
+                    return Some(item);
+                }
+                // modify and insert uncolliding type items
+                let modified_item: ImplItem = parse_quote! {
+                    #( #cfg_attrs )*
+                    type #ident = <#default_impl_path as #disambiguation_path>::#ident;
+                };
+                return Some(modified_item);
+            }
+            // copy uncolliding non-type items that have an ident
+            Some(item)
+        } else {
+            // do not copy colliding items that lack an ident
+            (!existing_unsupported_items.contains(&item))
+                // copy uncolliding items without an ident verbatim
+                .then_some(item)
+        }
+    });
+    final_impl.items.extend(extended_items);
+    final_impl
+}
+
+/// Computes the disambiguation path for the `derive_impl` attribute macro.
+///
+/// When specified explicitly using `as [disambiguation_path]` in the macro attr, the
+/// disambiguation is used as is. If not, we infer the disambiguation path from the
+/// `foreign_impl_path` and the computed scope.
+fn compute_disambiguation_path(
+    disambiguation_path: Option<Path>,
+    foreign_impl: ItemImpl,
+    default_impl_path: Path,
+) -> Result<Path> {
+    match (disambiguation_path, foreign_impl.clone().trait_) {
+        (Some(disambiguation_path), _) => Ok(disambiguation_path),
+        (None, Some((_, foreign_impl_path, _))) => {
+            if default_impl_path.segments.len() > 1 {
+                let scope = default_impl_path.segments.first();
+                Ok(parse_quote!(#scope :: #foreign_impl_path))
+            } else {
+                Ok(foreign_impl_path)
+            }
+        }
+        _ => Err(syn::Error::new(
+            default_impl_path.span(),
+            "Impl statement must have a defined type being implemented \
+			for a defined type such as `impl A for B`",
+        )),
+    }
+}
+
+/// Internal implementation behind [`#[derive_impl(..)]`](`macro@crate::derive_impl`).
+///
+/// `default_impl_path`: the module path of the external `impl` statement whose tokens we are
+///	                     importing via `macro_magic`
+///
+/// `foreign_tokens`: the tokens for the external `impl` statement
+///
+/// `local_tokens`: the tokens for the local `impl` statement this attribute is attached to
+///
+/// `disambiguation_path`: the module path of the external trait we will use to qualify
+///                        defaults imported from the external `impl` statement
+pub fn derive_impl(
+    default_impl_path: TokenStream2,
+    foreign_tokens: TokenStream2,
+    local_tokens: TokenStream2,
+    disambiguation_path: Option<Path>,
+    no_aggregated_types: Option<keyword::no_aggregated_types>,
+) -> Result<TokenStream2> {
+    let local_impl = parse2::<ItemImpl>(local_tokens)?;
+    let foreign_impl = parse2::<ItemImpl>(foreign_tokens)?;
+    let default_impl_path = parse2::<Path>(default_impl_path)?;
+
+    let disambiguation_path = compute_disambiguation_path(
+        disambiguation_path,
+        foreign_impl.clone(),
+        default_impl_path.clone(),
+    )?;
+
+    // generate the combined impl
+    let combined_impl = combine_impls(
+        local_impl,
+        foreign_impl,
+        default_impl_path,
+        disambiguation_path,
+        no_aggregated_types.is_none(),
+    );
+
+    Ok(quote!(#combined_impl))
+}
+
+#[test]
+fn test_derive_impl_attr_args_parsing() {
+    parse2::<DeriveImplAttrArgs>(quote!(
+        some::path::TestDefaultConfig as some::path::DefaultConfig
+    ))
+    .unwrap();
+    parse2::<DeriveImplAttrArgs>(quote!(
+        frame_system::prelude::testing::TestDefaultConfig as DefaultConfig
+    ))
+    .unwrap();
+    parse2::<DeriveImplAttrArgs>(quote!(Something as some::path::DefaultConfig)).unwrap();
+    parse2::<DeriveImplAttrArgs>(quote!(Something as DefaultConfig)).unwrap();
+    parse2::<DeriveImplAttrArgs>(quote!(DefaultConfig)).unwrap();
+    assert!(parse2::<DeriveImplAttrArgs>(quote!()).is_err());
+    assert!(parse2::<DeriveImplAttrArgs>(quote!(Config Config)).is_err());
+}
+
+#[test]
+fn test_runtime_type_with_doc() {
+    trait TestTrait {
+        type Test;
+    }
+    #[allow(unused)]
+    struct TestStruct;
+    let p = parse2::<ItemImpl>(quote!(
+        impl TestTrait for TestStruct {
+            /// Some doc
+            #[inject_runtime_type]
+            type Test = u32;
+        }
+    ))
+    .unwrap();
+    for item in p.items {
+        if let ImplItem::Type(typ) = item {
+            assert_eq!(is_runtime_type(&typ), true);
+        }
+    }
+}
+
+#[test]
+fn test_disambiguation_path() {
+    let foreign_impl: ItemImpl = parse_quote!(impl SomeTrait for SomeType {});
+    let default_impl_path: Path = parse_quote!(SomeScope::SomeType);
+
+    // disambiguation path is specified
+    let disambiguation_path = compute_disambiguation_path(
+        Some(parse_quote!(SomeScope::SomePath)),
+        foreign_impl.clone(),
+        default_impl_path.clone(),
+    );
+    assert_eq!(
+        disambiguation_path.unwrap(),
+        parse_quote!(SomeScope::SomePath)
+    );
+
+    // disambiguation path is not specified and the default_impl_path has more than one segment
+    let disambiguation_path =
+        compute_disambiguation_path(None, foreign_impl.clone(), default_impl_path.clone());
+    assert_eq!(
+        disambiguation_path.unwrap(),
+        parse_quote!(SomeScope::SomeTrait)
+    );
+
+    // disambiguation path is not specified and the default_impl_path has only one segment
+    let disambiguation_path =
+        compute_disambiguation_path(None, foreign_impl.clone(), parse_quote!(SomeType));
+    assert_eq!(disambiguation_path.unwrap(), parse_quote!(SomeTrait));
+}
diff --git a/support/procedural-fork/src/dummy_part_checker.rs b/support/procedural-fork/src/dummy_part_checker.rs
new file mode 100644
index 000000000..6bed541d1
--- /dev/null
+++ b/support/procedural-fork/src/dummy_part_checker.rs
@@ -0,0 +1,81 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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;
+
+pub fn generate_dummy_part_checker(input: TokenStream) -> TokenStream {
+    if !input.is_empty() {
+        return syn::Error::new(proc_macro2::Span::call_site(), "No arguments expected")
+            .to_compile_error()
+            .into();
+    }
+
+    let count = COUNTER.with(|counter| counter.borrow_mut().inc());
+
+    let no_op_macro_ident = syn::Ident::new(
+        &format!("__dummy_part_checker_{}", count),
+        proc_macro2::Span::call_site(),
+    );
+
+    quote::quote!(
+        #[macro_export]
+        #[doc(hidden)]
+        macro_rules! #no_op_macro_ident {
+            ( $( $tt:tt )* ) => {};
+        }
+
+        #[doc(hidden)]
+        pub mod __substrate_genesis_config_check {
+            #[doc(hidden)]
+            pub use #no_op_macro_ident as is_genesis_config_defined;
+            #[doc(hidden)]
+            pub use #no_op_macro_ident as is_std_enabled_for_genesis;
+        }
+
+        #[doc(hidden)]
+        pub mod __substrate_event_check {
+            #[doc(hidden)]
+            pub use #no_op_macro_ident as is_event_part_defined;
+        }
+
+        #[doc(hidden)]
+        pub mod __substrate_inherent_check {
+            #[doc(hidden)]
+            pub use #no_op_macro_ident as is_inherent_part_defined;
+        }
+
+        #[doc(hidden)]
+        pub mod __substrate_validate_unsigned_check {
+            #[doc(hidden)]
+            pub use #no_op_macro_ident as is_validate_unsigned_part_defined;
+        }
+
+        #[doc(hidden)]
+        pub mod __substrate_call_check {
+            #[doc(hidden)]
+            pub use #no_op_macro_ident as is_call_part_defined;
+        }
+
+        #[doc(hidden)]
+        pub mod __substrate_origin_check {
+            #[doc(hidden)]
+            pub use #no_op_macro_ident as is_origin_part_defined;
+        }
+    )
+    .into()
+}
diff --git a/support/procedural-fork/src/dynamic_params.rs b/support/procedural-fork/src/dynamic_params.rs
new file mode 100644
index 000000000..70a18bf34
--- /dev/null
+++ b/support/procedural-fork/src/dynamic_params.rs
@@ -0,0 +1,587 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Code for the `#[dynamic_params]`, `#[dynamic_pallet_params]` and
+//! `#[dynamic_aggregated_params_internal]` macros.
+
+use frame_support_procedural_tools::generate_access_from_frame_or_crate;
+use inflector::Inflector;
+use proc_macro2::{Span, TokenStream};
+use quote::{format_ident, quote, ToTokens};
+use syn::{parse2, spanned::Spanned, visit_mut, visit_mut::VisitMut, Result, Token};
+
+/// Parse and expand a `#[dynamic_params(..)]` module.
+pub fn dynamic_params(attr: TokenStream, item: TokenStream) -> Result<TokenStream> {
+    DynamicParamModAttr::parse(attr, item).map(ToTokens::into_token_stream)
+}
+
+/// Parse and expand `#[dynamic_pallet_params(..)]` attribute.
+pub fn dynamic_pallet_params(attr: TokenStream, item: TokenStream) -> Result<TokenStream> {
+    DynamicPalletParamAttr::parse(attr, item).map(ToTokens::into_token_stream)
+}
+
+/// Parse and expand `#[dynamic_aggregated_params_internal]` attribute.
+pub fn dynamic_aggregated_params_internal(
+    _attr: TokenStream,
+    item: TokenStream,
+) -> Result<TokenStream> {
+    parse2::<DynamicParamAggregatedEnum>(item).map(ToTokens::into_token_stream)
+}
+
+/// A top `#[dynamic_params(..)]` attribute together with a mod.
+#[derive(derive_syn_parse::Parse)]
+pub struct DynamicParamModAttr {
+    params_mod: syn::ItemMod,
+    meta: DynamicParamModAttrMeta,
+}
+
+/// The inner meta of a `#[dynamic_params(..)]` attribute.
+#[derive(derive_syn_parse::Parse)]
+pub struct DynamicParamModAttrMeta {
+    name: syn::Ident,
+    _comma: Option<Token![,]>,
+    #[parse_if(_comma.is_some())]
+    params_pallet: Option<syn::Type>,
+}
+
+impl DynamicParamModAttr {
+    pub fn parse(attr: TokenStream, item: TokenStream) -> Result<Self> {
+        let params_mod = parse2(item)?;
+        let meta = parse2(attr)?;
+        Ok(Self { params_mod, meta })
+    }
+
+    pub fn inner_mods(&self) -> Vec<syn::ItemMod> {
+        self.params_mod
+            .content
+            .as_ref()
+            .map_or(Vec::new(), |(_, items)| {
+                items
+                    .iter()
+                    .filter_map(|i| match i {
+                        syn::Item::Mod(m) => Some(m),
+                        _ => None,
+                    })
+                    .cloned()
+                    .collect()
+            })
+    }
+}
+
+impl ToTokens for DynamicParamModAttr {
+    fn to_tokens(&self, tokens: &mut TokenStream) {
+        let scrate = match crate_access() {
+            Ok(path) => path,
+            Err(err) => return tokens.extend(err),
+        };
+        let (mut params_mod, name) = (self.params_mod.clone(), &self.meta.name);
+        let dynam_params_ident = &params_mod.ident;
+
+        let mut quoted_enum = quote! {};
+        for m in self.inner_mods() {
+            let aggregate_name =
+                syn::Ident::new(&m.ident.to_string().to_class_case(), m.ident.span());
+            let mod_name = &m.ident;
+
+            let mut attrs = m.attrs.clone();
+            attrs.retain(|attr| !attr.path().is_ident("dynamic_pallet_params"));
+            if let Err(err) = ensure_codec_index(&attrs, m.span()) {
+                tokens.extend(err.into_compile_error());
+                return;
+            }
+
+            quoted_enum.extend(quote! {
+                #(#attrs)*
+                #aggregate_name(#dynam_params_ident::#mod_name::Parameters),
+            });
+        }
+
+        // Inject the outer args into the inner `#[dynamic_pallet_params(..)]` attribute.
+        if let Some(params_pallet) = &self.meta.params_pallet {
+            MacroInjectArgs {
+                runtime_params: name.clone(),
+                params_pallet: params_pallet.clone(),
+            }
+            .visit_item_mod_mut(&mut params_mod);
+        }
+
+        tokens.extend(quote! {
+            #params_mod
+
+            #[#scrate::dynamic_params::dynamic_aggregated_params_internal]
+            pub enum #name {
+                #quoted_enum
+            }
+        });
+    }
+}
+
+/// Ensure there is a `#[codec(index = ..)]` attribute.
+fn ensure_codec_index(attrs: &Vec<syn::Attribute>, span: Span) -> Result<()> {
+    let mut found = false;
+
+    for attr in attrs.iter() {
+        if attr.path().is_ident("codec") {
+            let meta: syn::ExprAssign = attr.parse_args()?;
+            if meta.left.to_token_stream().to_string() == "index" {
+                found = true;
+                break;
+            }
+        }
+    }
+
+    if !found {
+        Err(syn::Error::new(
+            span,
+            "Missing explicit `#[codec(index = ..)]` attribute",
+        ))
+    } else {
+        Ok(())
+    }
+}
+
+/// Used to inject arguments into the inner `#[dynamic_pallet_params(..)]` attribute.
+///
+/// This allows the outer `#[dynamic_params(..)]` attribute to specify some arguments that don't
+/// need to be repeated every time.
+struct MacroInjectArgs {
+    runtime_params: syn::Ident,
+    params_pallet: syn::Type,
+}
+impl VisitMut for MacroInjectArgs {
+    fn visit_item_mod_mut(&mut self, item: &mut syn::ItemMod) {
+        // Check if the mod has a `#[dynamic_pallet_params(..)]` attribute.
+        let attr = item
+            .attrs
+            .iter_mut()
+            .find(|attr| attr.path().is_ident("dynamic_pallet_params"));
+
+        if let Some(attr) = attr {
+            match &attr.meta {
+                syn::Meta::Path(path) => {
+                    assert_eq!(path.to_token_stream().to_string(), "dynamic_pallet_params")
+                }
+                _ => (),
+            }
+
+            let runtime_params = &self.runtime_params;
+            let params_pallet = &self.params_pallet;
+
+            attr.meta = syn::parse2::<syn::Meta>(quote! {
+                dynamic_pallet_params(#runtime_params, #params_pallet)
+            })
+            .unwrap()
+            .into();
+        }
+
+        visit_mut::visit_item_mod_mut(self, item);
+    }
+}
+/// The helper attribute of a `#[dynamic_pallet_params(runtime_params, params_pallet)]`
+/// attribute.
+#[derive(derive_syn_parse::Parse)]
+pub struct DynamicPalletParamAttr {
+    inner_mod: syn::ItemMod,
+    meta: DynamicPalletParamAttrMeta,
+}
+
+/// The inner meta of a `#[dynamic_pallet_params(..)]` attribute.
+#[derive(derive_syn_parse::Parse)]
+pub struct DynamicPalletParamAttrMeta {
+    runtime_params: syn::Ident,
+    _comma: Token![,],
+    parameter_pallet: syn::Type,
+}
+
+impl DynamicPalletParamAttr {
+    pub fn parse(attr: TokenStream, item: TokenStream) -> Result<Self> {
+        Ok(Self {
+            inner_mod: parse2(item)?,
+            meta: parse2(attr)?,
+        })
+    }
+
+    pub fn statics(&self) -> Vec<syn::ItemStatic> {
+        self.inner_mod
+            .content
+            .as_ref()
+            .map_or(Vec::new(), |(_, items)| {
+                items
+                    .iter()
+                    .filter_map(|i| match i {
+                        syn::Item::Static(s) => Some(s),
+                        _ => None,
+                    })
+                    .cloned()
+                    .collect()
+            })
+    }
+}
+
+impl ToTokens for DynamicPalletParamAttr {
+    fn to_tokens(&self, tokens: &mut TokenStream) {
+        let scrate = match crate_access() {
+            Ok(path) => path,
+            Err(err) => return tokens.extend(err),
+        };
+        let (params_mod, parameter_pallet, runtime_params) = (
+            &self.inner_mod,
+            &self.meta.parameter_pallet,
+            &self.meta.runtime_params,
+        );
+
+        let aggregate_name = syn::Ident::new(
+            &params_mod.ident.to_string().to_class_case(),
+            params_mod.ident.span(),
+        );
+        let (mod_name, vis) = (&params_mod.ident, &params_mod.vis);
+        let statics = self.statics();
+
+        let (mut key_names, mut key_values, mut defaults, mut attrs, mut value_types): (
+            Vec<_>,
+            Vec<_>,
+            Vec<_>,
+            Vec<_>,
+            Vec<_>,
+        ) = Default::default();
+
+        for s in statics.iter() {
+            if let Err(err) = ensure_codec_index(&s.attrs, s.span()) {
+                tokens.extend(err.into_compile_error());
+                return;
+            }
+
+            key_names.push(&s.ident);
+            key_values.push(format_ident!("{}Value", &s.ident));
+            defaults.push(&s.expr);
+            attrs.push(&s.attrs);
+            value_types.push(&s.ty);
+        }
+
+        let key_ident = syn::Ident::new("ParametersKey", params_mod.ident.span());
+        let value_ident = syn::Ident::new("ParametersValue", params_mod.ident.span());
+        let runtime_key_ident = format_ident!("{}Key", runtime_params);
+        let runtime_value_ident = format_ident!("{}Value", runtime_params);
+
+        tokens.extend(quote! {
+			pub mod #mod_name {
+				use super::*;
+
+				#[doc(hidden)]
+				#[derive(
+					Clone,
+					PartialEq,
+					Eq,
+					#scrate::__private::codec::Encode,
+					#scrate::__private::codec::Decode,
+					#scrate::__private::codec::MaxEncodedLen,
+					#scrate::__private::RuntimeDebug,
+					#scrate::__private::scale_info::TypeInfo
+				)]
+				#vis enum Parameters {
+					#(
+						#(#attrs)*
+						#key_names(#key_names, Option<#value_types>),
+					)*
+				}
+
+				#[doc(hidden)]
+				#[derive(
+					Clone,
+					PartialEq,
+					Eq,
+					#scrate::__private::codec::Encode,
+					#scrate::__private::codec::Decode,
+					#scrate::__private::codec::MaxEncodedLen,
+					#scrate::__private::RuntimeDebug,
+					#scrate::__private::scale_info::TypeInfo
+				)]
+				#vis enum #key_ident {
+					#(
+						#(#attrs)*
+						#key_names(#key_names),
+					)*
+				}
+
+				#[doc(hidden)]
+				#[derive(
+					Clone,
+					PartialEq,
+					Eq,
+					#scrate::__private::codec::Encode,
+					#scrate::__private::codec::Decode,
+					#scrate::__private::codec::MaxEncodedLen,
+					#scrate::__private::RuntimeDebug,
+					#scrate::__private::scale_info::TypeInfo
+				)]
+				#vis enum #value_ident {
+					#(
+						#(#attrs)*
+						#key_names(#value_types),
+					)*
+				}
+
+				impl #scrate::traits::dynamic_params::AggregatedKeyValue for Parameters {
+					type Key = #key_ident;
+					type Value = #value_ident;
+
+					fn into_parts(self) -> (Self::Key, Option<Self::Value>) {
+						match self {
+							#(
+								Parameters::#key_names(key, value) => {
+									(#key_ident::#key_names(key), value.map(#value_ident::#key_names))
+								},
+							)*
+						}
+					}
+				}
+
+				#(
+					#[doc(hidden)]
+					#[derive(
+						Clone,
+						PartialEq,
+						Eq,
+						#scrate::__private::codec::Encode,
+						#scrate::__private::codec::Decode,
+						#scrate::__private::codec::MaxEncodedLen,
+						#scrate::__private::RuntimeDebug,
+						#scrate::__private::scale_info::TypeInfo
+					)]
+					#vis struct #key_names;
+
+					impl #scrate::__private::Get<#value_types> for #key_names {
+						fn get() -> #value_types {
+							match
+								<#parameter_pallet as
+									#scrate::storage::StorageMap<#runtime_key_ident, #runtime_value_ident>
+								>::get(#runtime_key_ident::#aggregate_name(#key_ident::#key_names(#key_names)))
+							{
+								Some(#runtime_value_ident::#aggregate_name(
+									#value_ident::#key_names(inner))) => inner,
+								Some(_) => {
+									#scrate::defensive!("Unexpected value type at key - returning default");
+									#defaults
+								},
+								None => #defaults,
+							}
+						}
+					}
+
+					impl #scrate::traits::dynamic_params::Key for #key_names {
+						type Value = #value_types;
+						type WrappedValue = #key_values;
+					}
+
+					impl From<#key_names> for #key_ident {
+						fn from(key: #key_names) -> Self {
+							#key_ident::#key_names(key)
+						}
+					}
+
+					impl TryFrom<#key_ident> for #key_names {
+						type Error = ();
+
+						fn try_from(key: #key_ident) -> Result<Self, Self::Error> {
+							match key {
+								#key_ident::#key_names(key) => Ok(key),
+								_ => Err(()),
+							}
+						}
+					}
+
+					#[doc(hidden)]
+					#[derive(
+						Clone,
+						PartialEq,
+						Eq,
+						#scrate::sp_runtime::RuntimeDebug,
+					)]
+					#vis struct #key_values(pub #value_types);
+
+					impl From<#key_values> for #value_ident {
+						fn from(value: #key_values) -> Self {
+							#value_ident::#key_names(value.0)
+						}
+					}
+
+					impl From<(#key_names, #value_types)> for Parameters {
+						fn from((key, value): (#key_names, #value_types)) -> Self {
+							Parameters::#key_names(key, Some(value))
+						}
+					}
+
+					impl From<#key_names> for Parameters {
+						fn from(key: #key_names) -> Self {
+							Parameters::#key_names(key, None)
+						}
+					}
+
+					impl TryFrom<#value_ident> for #key_values {
+						type Error = ();
+
+						fn try_from(value: #value_ident) -> Result<Self, Self::Error> {
+							match value {
+								#value_ident::#key_names(value) => Ok(#key_values(value)),
+								_ => Err(()),
+							}
+						}
+					}
+
+					impl From<#key_values> for #value_types {
+						fn from(value: #key_values) -> Self {
+							value.0
+						}
+					}
+				)*
+			}
+		});
+    }
+}
+
+#[derive(derive_syn_parse::Parse)]
+pub struct DynamicParamAggregatedEnum {
+    aggregated_enum: syn::ItemEnum,
+}
+
+impl ToTokens for DynamicParamAggregatedEnum {
+    fn to_tokens(&self, tokens: &mut TokenStream) {
+        let scrate = match crate_access() {
+            Ok(path) => path,
+            Err(err) => return tokens.extend(err),
+        };
+        let params_enum = &self.aggregated_enum;
+        let (name, vis) = (&params_enum.ident, &params_enum.vis);
+
+        let (mut indices, mut param_names, mut param_types): (Vec<_>, Vec<_>, Vec<_>) =
+            Default::default();
+        let mut attributes = Vec::new();
+        for (i, variant) in params_enum.variants.iter().enumerate() {
+            indices.push(i);
+            param_names.push(&variant.ident);
+            attributes.push(&variant.attrs);
+
+            param_types.push(match &variant.fields {
+				syn::Fields::Unnamed(fields) if fields.unnamed.len() == 1 => &fields.unnamed[0].ty,
+				_ => {
+					*tokens = quote! { compile_error!("Only unnamed enum variants with one inner item are supported") };
+					return
+				},
+			});
+        }
+
+        let params_key_ident = format_ident!("{}Key", params_enum.ident);
+        let params_value_ident = format_ident!("{}Value", params_enum.ident);
+
+        tokens.extend(quote! {
+			#[doc(hidden)]
+			#[derive(
+				Clone,
+				PartialEq,
+				Eq,
+				#scrate::__private::codec::Encode,
+				#scrate::__private::codec::Decode,
+				#scrate::__private::codec::MaxEncodedLen,
+				#scrate::sp_runtime::RuntimeDebug,
+				#scrate::__private::scale_info::TypeInfo
+			)]
+			#vis enum #name {
+				#(
+					//#[codec(index = #indices)]
+					#(#attributes)*
+					#param_names(#param_types),
+				)*
+			}
+
+			#[doc(hidden)]
+			#[derive(
+				Clone,
+				PartialEq,
+				Eq,
+				#scrate::__private::codec::Encode,
+				#scrate::__private::codec::Decode,
+				#scrate::__private::codec::MaxEncodedLen,
+				#scrate::sp_runtime::RuntimeDebug,
+				#scrate::__private::scale_info::TypeInfo
+			)]
+			#vis enum #params_key_ident {
+				#(
+					#(#attributes)*
+					#param_names(<#param_types as #scrate::traits::dynamic_params::AggregatedKeyValue>::Key),
+				)*
+			}
+
+			#[doc(hidden)]
+			#[derive(
+				Clone,
+				PartialEq,
+				Eq,
+				#scrate::__private::codec::Encode,
+				#scrate::__private::codec::Decode,
+				#scrate::__private::codec::MaxEncodedLen,
+				#scrate::sp_runtime::RuntimeDebug,
+				#scrate::__private::scale_info::TypeInfo
+			)]
+			#vis enum #params_value_ident {
+				#(
+					#(#attributes)*
+					#param_names(<#param_types as #scrate::traits::dynamic_params::AggregatedKeyValue>::Value),
+				)*
+			}
+
+			impl #scrate::traits::dynamic_params::AggregatedKeyValue for #name {
+				type Key = #params_key_ident;
+				type Value = #params_value_ident;
+
+				fn into_parts(self) -> (Self::Key, Option<Self::Value>) {
+					match self {
+						#(
+							#name::#param_names(parameter) => {
+								let (key, value) = parameter.into_parts();
+								(#params_key_ident::#param_names(key), value.map(#params_value_ident::#param_names))
+							},
+						)*
+					}
+				}
+			}
+
+			#(
+				impl ::core::convert::From<<#param_types as #scrate::traits::dynamic_params::AggregatedKeyValue>::Key> for #params_key_ident {
+					fn from(key: <#param_types as #scrate::traits::dynamic_params::AggregatedKeyValue>::Key) -> Self {
+						#params_key_ident::#param_names(key)
+					}
+				}
+
+				impl ::core::convert::TryFrom<#params_value_ident> for <#param_types as #scrate::traits::dynamic_params::AggregatedKeyValue>::Value {
+					type Error = ();
+
+					fn try_from(value: #params_value_ident) -> Result<Self, Self::Error> {
+						match value {
+							#params_value_ident::#param_names(value) => Ok(value),
+							_ => Err(()),
+						}
+					}
+				}
+			)*
+		});
+    }
+}
+
+/// Get access to the current crate and convert the error to a compile error.
+fn crate_access() -> core::result::Result<syn::Path, TokenStream> {
+    generate_access_from_frame_or_crate("frame-support").map_err(|e| e.to_compile_error())
+}
diff --git a/support/procedural-fork/src/key_prefix.rs b/support/procedural-fork/src/key_prefix.rs
new file mode 100644
index 000000000..aea60ce3b
--- /dev/null
+++ b/support/procedural-fork/src/key_prefix.rs
@@ -0,0 +1,106 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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_procedural_tools::generate_access_from_frame_or_crate;
+use proc_macro2::{Span, TokenStream};
+use quote::{format_ident, quote, ToTokens};
+use syn::{Ident, Result};
+
+const MAX_IDENTS: usize = 18;
+
+pub fn impl_key_prefix_for_tuples(input: proc_macro::TokenStream) -> Result<TokenStream> {
+    if !input.is_empty() {
+        return Err(syn::Error::new(Span::call_site(), "No arguments expected"));
+    }
+
+    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)
+            .map(|n| Ident::new(&format!("Tuple{}", n), Span::call_site()))
+            .collect::<Vec<_>>();
+
+        for prefix_count in 1..i {
+            let (prefixes, suffixes) = current_tuple.split_at(prefix_count);
+
+            let hashers = current_tuple
+                .iter()
+                .map(|ident| format_ident!("Hasher{}", ident))
+                .collect::<Vec<_>>();
+            let kargs = prefixes
+                .iter()
+                .map(|ident| format_ident!("KArg{}", ident))
+                .collect::<Vec<_>>();
+            let partial_keygen = generate_keygen(prefixes);
+            let suffix_keygen = generate_keygen(suffixes);
+            let suffix_tuple = generate_tuple(suffixes);
+
+            let trait_impls = quote! {
+                impl<
+                    #(#current_tuple: FullCodec + StaticTypeInfo,)*
+                    #(#hashers: StorageHasher,)*
+                    #(#kargs: EncodeLike<#prefixes>),*
+                > HasKeyPrefix<( #( #kargs, )* )> for ( #( Key<#hashers, #current_tuple>, )* ) {
+                    type Suffix = #suffix_tuple;
+
+                    fn partial_key(prefix: ( #( #kargs, )* )) -> Vec<u8> {
+                        <#partial_keygen>::final_key(prefix)
+                    }
+                }
+
+                impl<
+                    #(#current_tuple: FullCodec + StaticTypeInfo,)*
+                    #(#hashers: ReversibleStorageHasher,)*
+                    #(#kargs: EncodeLike<#prefixes>),*
+                > HasReversibleKeyPrefix<( #( #kargs, )* )> for ( #( Key<#hashers, #current_tuple>, )* ) {
+                    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)
+                    }
+                }
+            };
+
+            all_trait_impls.extend(trait_impls);
+        }
+    }
+
+    Ok(all_trait_impls)
+}
+
+fn generate_tuple(idents: &[Ident]) -> TokenStream {
+    if idents.len() == 1 {
+        idents[0].to_token_stream()
+    } else {
+        quote!((#(#idents),*))
+    }
+}
+
+fn generate_keygen(idents: &[Ident]) -> TokenStream {
+    if idents.len() == 1 {
+        let key = &idents[0];
+        let hasher = format_ident!("Hasher{}", key);
+
+        quote!(Key<#hasher, #key>)
+    } else {
+        let hashers = idents.iter().map(|ident| format_ident!("Hasher{}", ident));
+
+        quote!((#(Key<#hashers, #idents>),*))
+    }
+}
diff --git a/support/procedural-fork/src/lib.rs b/support/procedural-fork/src/lib.rs
new file mode 100644
index 000000000..c7f1472b2
--- /dev/null
+++ b/support/procedural-fork/src/lib.rs
@@ -0,0 +1,189 @@
+//! This crate is a fork of the `frame-support-procedural` crate from
+//! `substrate/frame/support/procedural` in `polkadot-sdk`. The purpose of this fork is to
+//! re-export all parsing code from the original crate to make it accessible to other crates,
+//! since the original crate is a `proc-macro` crate and therefore cannot have any non-macro
+//! public exports. If Parity ever decides to move the parsing code to a separate crate, this
+//! fork will no longer need to exist, but right now this is the only reliable way to get
+//! access to the core parsing logic of substrate.
+//!
+//! Tags will be created for each major version of `polkadot-sdk` that `subtensor` relies on,
+//! on an as-needed, ad-hoc basis, and versions will matched the corresponding `polkadot-sdk`
+//! version/tag name.
+#![recursion_limit = "512"]
+#![allow(warnings)]
+#![allow(clippy::all)]
+
+extern crate proc_macro;
+
+#[cfg(not(test))]
+mod benchmark;
+#[cfg(not(test))]
+mod construct_runtime;
+#[cfg(not(test))]
+mod crate_version;
+#[cfg(not(test))]
+mod derive_impl;
+#[cfg(not(test))]
+mod dummy_part_checker;
+#[cfg(not(test))]
+mod dynamic_params;
+#[cfg(not(test))]
+mod key_prefix;
+#[cfg(not(test))]
+mod match_and_insert;
+#[cfg(not(test))]
+mod no_bound;
+#[cfg(not(test))]
+mod pallet;
+#[cfg(not(test))]
+mod pallet_error;
+#[cfg(not(test))]
+mod runtime;
+#[cfg(not(test))]
+mod storage_alias;
+#[cfg(not(test))]
+mod transactional;
+#[cfg(not(test))]
+mod tt_macro;
+#[cfg(not(test))]
+use std::{cell::RefCell, str::FromStr};
+
+#[cfg(not(test))]
+pub(crate) const INHERENT_INSTANCE_NAME: &str = "__InherentHiddenInstance";
+
+/// The number of module instances supported by the runtime, starting at index 1,
+/// and up to `NUMBER_OF_INSTANCE`.
+#[cfg(not(test))]
+pub(crate) const NUMBER_OF_INSTANCE: u8 = 16;
+
+thread_local! {
+    /// A global counter, can be used to generate a relatively unique identifier.
+    #[cfg(not(test))]
+    static COUNTER: RefCell<Counter> = const { RefCell::new(Counter(0)) };
+}
+
+/// Counter to generate a relatively unique identifier for macros. This is necessary because
+/// declarative macros gets hoisted to the crate root, which shares the namespace with other pallets
+/// containing the very same macros.
+#[cfg(not(test))]
+struct Counter(u64);
+
+#[cfg(not(test))]
+impl Counter {
+    fn inc(&mut self) -> u64 {
+        let ret = self.0;
+        self.0 += 1;
+        ret
+    }
+}
+
+/// Get the value from the given environment variable set by cargo.
+///
+/// The value is parsed into the requested destination type.
+#[cfg(not(test))]
+fn get_cargo_env_var<T: FromStr>(version_env: &str) -> std::result::Result<T, ()> {
+    let version = std::env::var(version_env)
+        .unwrap_or_else(|_| panic!("`{}` is always set by cargo; qed", version_env));
+
+    T::from_str(&version).map_err(drop)
+}
+
+/// Generate the counter_prefix related to the storage.
+/// counter_prefix is used by counted storage map.
+#[cfg(not(test))]
+fn counter_prefix(prefix: &str) -> String {
+    format!("CounterFor{}", prefix)
+}
+
+#[cfg(not(test))]
+pub mod exports {
+    pub mod benchmark {
+        pub use crate::benchmark::*;
+    }
+
+    pub mod crate_version {
+        pub use crate::crate_version::*;
+    }
+
+    pub mod derive_impl {
+        pub use crate::derive_impl::*;
+    }
+
+    pub mod dummy_part_checker {
+        pub use crate::dummy_part_checker::*;
+    }
+
+    pub mod dynamic_params {
+        pub use crate::dynamic_params::*;
+    }
+
+    pub mod key_prefix {
+        pub use crate::key_prefix::*;
+    }
+
+    pub mod match_and_insert {
+        pub use crate::match_and_insert::*;
+    }
+
+    pub mod pallet_error {
+        pub use crate::pallet_error::*;
+    }
+
+    pub mod storage_alias {
+        pub use crate::storage_alias::*;
+    }
+
+    pub mod transactional {
+        pub use crate::transactional::*;
+    }
+
+    pub mod tt_macro {
+        pub use crate::tt_macro::*;
+    }
+
+    pub mod construct_runtime {
+        pub use crate::construct_runtime::*;
+
+        pub mod parse {
+            pub use crate::construct_runtime::parse::*;
+        }
+
+        pub mod expand {
+            pub use crate::construct_runtime::expand::*;
+        }
+    }
+
+    pub mod no_bound {
+        pub mod clone {
+            pub use crate::no_bound::clone::*;
+        }
+
+        pub mod debug {
+            pub use crate::no_bound::debug::*;
+        }
+
+        pub mod default {
+            pub use crate::no_bound::default::*;
+        }
+
+        pub mod ord {
+            pub use crate::no_bound::ord::*;
+        }
+
+        pub mod partial_eq {
+            pub use crate::no_bound::partial_eq::*;
+        }
+
+        pub mod partial_ord {
+            pub use crate::no_bound::partial_ord::*;
+        }
+    }
+
+    pub mod pallet {
+        pub use crate::pallet::*;
+
+        pub mod parse {
+            pub use crate::pallet::parse::*;
+        }
+    }
+}
diff --git a/support/procedural-fork/src/match_and_insert.rs b/support/procedural-fork/src/match_and_insert.rs
new file mode 100644
index 000000000..a80b6e95f
--- /dev/null
+++ b/support/procedural-fork/src/match_and_insert.rs
@@ -0,0 +1,173 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Implementation of the `match_and_insert` macro.
+
+use proc_macro2::{Group, Span, TokenStream, TokenTree};
+use std::iter::once;
+use syn::spanned::Spanned;
+
+mod keyword {
+    syn::custom_keyword!(target);
+    syn::custom_keyword!(pattern);
+    syn::custom_keyword!(tokens);
+}
+
+pub fn match_and_insert(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
+    let MatchAndInsertDef {
+        pattern,
+        tokens,
+        target,
+    } = syn::parse_macro_input!(input as MatchAndInsertDef);
+
+    match expand_in_stream(&pattern, &mut Some(tokens), target) {
+        Ok(stream) => stream.into(),
+        Err(err) => err.to_compile_error().into(),
+    }
+}
+
+struct MatchAndInsertDef {
+    // Token stream to search and insert tokens into.
+    target: TokenStream,
+    // Pattern to match against, this is ensured to have no TokenTree::Group nor TokenTree::Literal
+    // (i.e. contains only Punct or Ident), and not being empty.
+    pattern: Vec<TokenTree>,
+    // Token stream to insert after the match pattern.
+    tokens: TokenStream,
+}
+
+impl syn::parse::Parse for MatchAndInsertDef {
+    fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
+        let mut target;
+        let _ = input.parse::<keyword::target>()?;
+        let _ = input.parse::<syn::Token![=]>()?;
+        let _replace_with_bracket: syn::token::Bracket = syn::bracketed!(target in input);
+        let _replace_with_brace: syn::token::Brace = syn::braced!(target in target);
+        let target = target.parse()?;
+
+        let mut pattern;
+        let _ = input.parse::<keyword::pattern>()?;
+        let _ = input.parse::<syn::Token![=]>()?;
+        let _replace_with_bracket: syn::token::Bracket = syn::bracketed!(pattern in input);
+        let _replace_with_brace: syn::token::Brace = syn::braced!(pattern in pattern);
+        let pattern = pattern
+            .parse::<TokenStream>()?
+            .into_iter()
+            .collect::<Vec<TokenTree>>();
+
+        if let Some(t) = pattern.iter().find(|t| matches!(t, TokenTree::Group(_))) {
+            return Err(syn::Error::new(t.span(), "Unexpected group token tree"));
+        }
+        if let Some(t) = pattern.iter().find(|t| matches!(t, TokenTree::Literal(_))) {
+            return Err(syn::Error::new(t.span(), "Unexpected literal token tree"));
+        }
+
+        if pattern.is_empty() {
+            return Err(syn::Error::new(
+                Span::call_site(),
+                "empty match pattern is invalid",
+            ));
+        }
+
+        let mut tokens;
+        let _ = input.parse::<keyword::tokens>()?;
+        let _ = input.parse::<syn::Token![=]>()?;
+        let _replace_with_bracket: syn::token::Bracket = syn::bracketed!(tokens in input);
+        let _replace_with_brace: syn::token::Brace = syn::braced!(tokens in tokens);
+        let tokens = tokens.parse()?;
+
+        Ok(Self {
+            tokens,
+            pattern,
+            target,
+        })
+    }
+}
+
+// Insert `tokens` after the first matching `pattern`.
+// `tokens` must be some (Option is used for internal simplification).
+// `pattern` must not be empty and should only contain Ident or Punct.
+fn expand_in_stream(
+    pattern: &[TokenTree],
+    tokens: &mut Option<TokenStream>,
+    stream: TokenStream,
+) -> syn::Result<TokenStream> {
+    assert!(
+        tokens.is_some(),
+        "`tokens` must be some, Option is used because `tokens` is used only once"
+    );
+    assert!(
+        !pattern.is_empty(),
+        "`pattern` must not be empty, otherwise there is nothing to match against"
+    );
+
+    let stream_span = stream.span();
+    let mut stream = stream.into_iter();
+    let mut extended = TokenStream::new();
+    let mut match_cursor = 0;
+
+    while let Some(token) = stream.next() {
+        match token {
+            TokenTree::Group(group) => {
+                match_cursor = 0;
+                let group_stream = group.stream();
+                match expand_in_stream(pattern, tokens, group_stream) {
+                    Ok(s) => {
+                        extended.extend(once(TokenTree::Group(Group::new(group.delimiter(), s))));
+                        extended.extend(stream);
+                        return Ok(extended);
+                    }
+                    Err(_) => {
+                        extended.extend(once(TokenTree::Group(group)));
+                    }
+                }
+            }
+            other => {
+                advance_match_cursor(&other, pattern, &mut match_cursor);
+
+                extended.extend(once(other));
+
+                if match_cursor == pattern.len() {
+                    extended.extend(once(
+                        tokens.take().expect("tokens is used to replace only once"),
+                    ));
+                    extended.extend(stream);
+                    return Ok(extended);
+                }
+            }
+        }
+    }
+    // if we reach this point, it means the stream is empty and we haven't found a matching pattern
+    let msg = format!("Cannot find pattern `{:?}` in given token stream", pattern);
+    Err(syn::Error::new(stream_span, msg))
+}
+
+fn advance_match_cursor(other: &TokenTree, pattern: &[TokenTree], match_cursor: &mut usize) {
+    use TokenTree::{Ident, Punct};
+
+    let does_match_other_pattern = match (other, &pattern[*match_cursor]) {
+        (Ident(i1), Ident(i2)) => i1 == i2,
+        (Punct(p1), Punct(p2)) => p1.as_char() == p2.as_char(),
+        _ => false,
+    };
+
+    if does_match_other_pattern {
+        *match_cursor += 1;
+    } else {
+        *match_cursor = 0;
+    }
+}
diff --git a/support/procedural-fork/src/no_bound/clone.rs b/support/procedural-fork/src/no_bound/clone.rs
new file mode 100644
index 000000000..17039bdc8
--- /dev/null
+++ b/support/procedural-fork/src/no_bound/clone.rs
@@ -0,0 +1,111 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 syn::spanned::Spanned;
+
+/// Derive Clone but do not bound any generic.
+pub fn derive_clone_no_bound(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
+    let input = syn::parse_macro_input!(input as syn::DeriveInput);
+
+    let name = &input.ident;
+    let (impl_generics, ty_generics, where_clause) = input.generics.split_for_impl();
+
+    let impl_ = match input.data {
+        syn::Data::Struct(struct_) => match struct_.fields {
+            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)
+                    )
+                });
+
+                quote::quote!( Self { #( #fields, )* } )
+            }
+            syn::Fields::Unnamed(unnamed) => {
+                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)
+                        )
+                    });
+
+                quote::quote!( Self ( #( #fields, )* ) )
+            }
+            syn::Fields::Unit => {
+                quote::quote!(Self)
+            }
+        },
+        syn::Data::Enum(enum_) => {
+            let variants = enum_.variants.iter().map(|variant| {
+                let ident = &variant.ident;
+                match &variant.fields {
+                    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!(
+                            Self::#ident { #( ref #captured, )* } => Self::#ident { #( #cloned, )*}
+                        )
+                    }
+                    syn::Fields::Unnamed(unnamed) => {
+                        let captured = unnamed
+                            .unnamed
+                            .iter()
+                            .enumerate()
+                            .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)
+                            )
+                        });
+                        quote::quote!(
+                            Self::#ident ( #( ref #captured, )* ) => Self::#ident ( #( #cloned, )*)
+                        )
+                    }
+                    syn::Fields::Unit => quote::quote!( Self::#ident => Self::#ident ),
+                }
+            });
+
+            quote::quote!(match self {
+                #( #variants, )*
+            })
+        }
+        syn::Data::Union(_) => {
+            let msg = "Union type not supported by `derive(CloneNoBound)`";
+            return syn::Error::new(input.span(), msg).to_compile_error().into();
+        }
+    };
+
+    quote::quote!(
+        const _: () = {
+            #[automatically_derived]
+            impl #impl_generics ::core::clone::Clone for #name #ty_generics #where_clause {
+                fn clone(&self) -> Self {
+                    #impl_
+                }
+            }
+        };
+    )
+    .into()
+}
diff --git a/support/procedural-fork/src/no_bound/debug.rs b/support/procedural-fork/src/no_bound/debug.rs
new file mode 100644
index 000000000..8034bb5ec
--- /dev/null
+++ b/support/procedural-fork/src/no_bound/debug.rs
@@ -0,0 +1,121 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 syn::spanned::Spanned;
+
+/// Derive Debug but do not bound any generics.
+pub fn derive_debug_no_bound(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
+    let input = syn::parse_macro_input!(input as syn::DeriveInput);
+
+    let input_ident = &input.ident;
+    let (impl_generics, ty_generics, where_clause) = input.generics.split_for_impl();
+
+    let impl_ = match input.data {
+        syn::Data::Struct(struct_) => match struct_.fields {
+            syn::Fields::Named(named) => {
+                let fields =
+                    named.named.iter().map(|i| &i.ident).map(
+                        |i| quote::quote_spanned!(i.span() => .field(stringify!(#i), &self.#i) ),
+                    );
+
+                quote::quote!(
+                    fmt.debug_struct(stringify!(#input_ident))
+                        #( #fields )*
+                        .finish()
+                )
+            }
+            syn::Fields::Unnamed(unnamed) => {
+                let fields = unnamed
+                    .unnamed
+                    .iter()
+                    .enumerate()
+                    .map(|(i, _)| syn::Index::from(i))
+                    .map(|i| quote::quote_spanned!(i.span() => .field(&self.#i) ));
+
+                quote::quote!(
+                    fmt.debug_tuple(stringify!(#input_ident))
+                        #( #fields )*
+                        .finish()
+                )
+            }
+            syn::Fields::Unit => quote::quote!(fmt.write_str(stringify!(#input_ident))),
+        },
+        syn::Data::Enum(enum_) => {
+            let variants = enum_.variants.iter().map(|variant| {
+                let ident = &variant.ident;
+                let full_variant_str = format!("{}::{}", input_ident, ident);
+                match &variant.fields {
+                    syn::Fields::Named(named) => {
+                        let captured = named.named.iter().map(|i| &i.ident);
+                        let debugged = captured.clone().map(|i| {
+                            quote::quote_spanned!(i.span() =>
+                                .field(stringify!(#i), &#i)
+                            )
+                        });
+                        quote::quote!(
+                            Self::#ident { #( ref #captured, )* } => {
+                                fmt.debug_struct(#full_variant_str)
+                                    #( #debugged )*
+                                    .finish()
+                            }
+                        )
+                    }
+                    syn::Fields::Unnamed(unnamed) => {
+                        let captured = unnamed
+                            .unnamed
+                            .iter()
+                            .enumerate()
+                            .map(|(i, f)| syn::Ident::new(&format!("_{}", i), f.span()));
+                        let debugged = captured
+                            .clone()
+                            .map(|i| quote::quote_spanned!(i.span() => .field(&#i)));
+                        quote::quote!(
+                            Self::#ident ( #( ref #captured, )* ) => {
+                                fmt.debug_tuple(#full_variant_str)
+                                    #( #debugged )*
+                                    .finish()
+                            }
+                        )
+                    }
+                    syn::Fields::Unit => quote::quote!(
+                        Self::#ident => fmt.write_str(#full_variant_str)
+                    ),
+                }
+            });
+
+            quote::quote!(match *self {
+                #( #variants, )*
+            })
+        }
+        syn::Data::Union(_) => {
+            let msg = "Union type not supported by `derive(DebugNoBound)`";
+            return syn::Error::new(input.span(), msg).to_compile_error().into();
+        }
+    };
+
+    quote::quote!(
+        const _: () = {
+            #[automatically_derived]
+            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_
+                }
+            }
+        };
+    )
+    .into()
+}
diff --git a/support/procedural-fork/src/no_bound/default.rs b/support/procedural-fork/src/no_bound/default.rs
new file mode 100644
index 000000000..3f896da35
--- /dev/null
+++ b/support/procedural-fork/src/no_bound/default.rs
@@ -0,0 +1,170 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 proc_macro2::Span;
+use quote::{quote, quote_spanned};
+use syn::{spanned::Spanned, Data, DeriveInput, Fields};
+
+/// Derive Default but do not bound any generic.
+pub fn derive_default_no_bound(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
+    let input = syn::parse_macro_input!(input as DeriveInput);
+
+    let name = &input.ident;
+
+    let (impl_generics, ty_generics, where_clause) = input.generics.split_for_impl();
+
+    let impl_ = match input.data {
+        Data::Struct(struct_) => match struct_.fields {
+            Fields::Named(named) => {
+                let fields = named.named.iter().map(|field| &field.ident).map(|ident| {
+                    quote_spanned! {ident.span() =>
+                        #ident: ::core::default::Default::default()
+                    }
+                });
+
+                quote!(Self { #( #fields, )* })
+            }
+            Fields::Unnamed(unnamed) => {
+                let fields = unnamed.unnamed.iter().map(|field| {
+                    quote_spanned! {field.span()=>
+                        ::core::default::Default::default()
+                    }
+                });
+
+                quote!(Self( #( #fields, )* ))
+            }
+            Fields::Unit => {
+                quote!(Self)
+            }
+        },
+        Data::Enum(enum_) => {
+            if enum_.variants.is_empty() {
+                return syn::Error::new_spanned(name, "cannot derive Default for an empty enum")
+                    .to_compile_error()
+                    .into();
+            }
+
+            // all #[default] attrs with the variant they're on; i.e. a var
+            let default_variants = enum_
+                .variants
+                .into_iter()
+                .filter(|variant| {
+                    variant
+                        .attrs
+                        .iter()
+                        .any(|attr| attr.path().is_ident("default"))
+                })
+                .collect::<Vec<_>>();
+
+            match &*default_variants {
+                [] => 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
+                        .attrs
+                        .iter()
+                        .filter(|a| a.path().is_ident("default"))
+                        .collect::<Vec<_>>();
+
+                    // check that there is only one #[default] attribute on the variant
+                    if let [first_attr, second_attr, additional_attrs @ ..] = &*variant_attrs {
+                        let mut err =
+                            syn::Error::new(Span::call_site(), "multiple `#[default]` attributes");
+
+                        err.combine(syn::Error::new_spanned(
+                            first_attr,
+                            "`#[default]` used here",
+                        ));
+
+                        err.extend([second_attr].into_iter().chain(additional_attrs).map(
+                            |variant| {
+                                syn::Error::new_spanned(variant, "`#[default]` used again here")
+                            },
+                        ));
+
+                        return err.into_compile_error().into();
+                    }
+
+                    let variant_ident = &default_variant.ident;
+
+                    let fully_qualified_variant_path = quote!(Self::#variant_ident);
+
+                    match &default_variant.fields {
+                        Fields::Named(named) => {
+                            let fields =
+                                named.named.iter().map(|field| &field.ident).map(|ident| {
+                                    quote_spanned! {ident.span()=>
+                                        #ident: ::core::default::Default::default()
+                                    }
+                                });
+
+                            quote!(#fully_qualified_variant_path { #( #fields, )* })
+                        }
+                        Fields::Unnamed(unnamed) => {
+                            let fields = unnamed.unnamed.iter().map(|field| {
+                                quote_spanned! {field.span()=>
+                                    ::core::default::Default::default()
+                                }
+                            });
+
+                            quote!(#fully_qualified_variant_path( #( #fields, )* ))
+                        }
+                        Fields::Unit => fully_qualified_variant_path,
+                    }
+                }
+                [first, additional @ ..] => {
+                    let mut err = syn::Error::new(Span::call_site(), "multiple declared defaults");
+
+                    err.combine(syn::Error::new_spanned(first, "first default"));
+
+                    err.extend(
+                        additional
+                            .into_iter()
+                            .map(|variant| syn::Error::new_spanned(variant, "additional default")),
+                    );
+
+                    return err.into_compile_error().into();
+                }
+            }
+        }
+        Data::Union(union_) => {
+            return syn::Error::new_spanned(
+                union_.union_token,
+                "Union type not supported by `derive(DefaultNoBound)`",
+            )
+            .to_compile_error()
+            .into()
+        }
+    };
+
+    quote!(
+        const _: () = {
+            #[automatically_derived]
+            impl #impl_generics ::core::default::Default for #name #ty_generics #where_clause {
+                fn default() -> Self {
+                    #impl_
+                }
+            }
+        };
+    )
+    .into()
+}
diff --git a/support/procedural-fork/src/no_bound/mod.rs b/support/procedural-fork/src/no_bound/mod.rs
new file mode 100644
index 000000000..9e0377dda
--- /dev/null
+++ b/support/procedural-fork/src/no_bound/mod.rs
@@ -0,0 +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.
+
+//! Derive macros to derive traits without bounding generic parameters.
+
+pub mod clone;
+pub mod debug;
+pub mod default;
+pub mod ord;
+pub mod partial_eq;
+pub mod partial_ord;
diff --git a/support/procedural-fork/src/no_bound/ord.rs b/support/procedural-fork/src/no_bound/ord.rs
new file mode 100644
index 000000000..20f30eb9d
--- /dev/null
+++ b/support/procedural-fork/src/no_bound/ord.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.
+
+use syn::spanned::Spanned;
+
+/// Derive Ord but do not bound any generic.
+pub fn derive_ord_no_bound(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
+    let input: syn::DeriveInput = match syn::parse(input) {
+        Ok(input) => input,
+        Err(e) => return e.to_compile_error().into(),
+    };
+
+    let name = &input.ident;
+    let (impl_generics, ty_generics, where_clause) = input.generics.split_for_impl();
+
+    let impl_ = match input.data {
+        syn::Data::Struct(struct_) => match struct_.fields {
+            syn::Fields::Named(named) => {
+                let fields = named
+                    .named
+                    .iter()
+                    .map(|i| &i.ident)
+                    .map(|i| quote::quote_spanned!(i.span() => self.#i.cmp(&other.#i) ));
+
+                quote::quote!( core::cmp::Ordering::Equal #( .then_with(|| #fields) )* )
+            }
+            syn::Fields::Unnamed(unnamed) => {
+                let fields = unnamed
+                    .unnamed
+                    .iter()
+                    .enumerate()
+                    .map(|(i, _)| syn::Index::from(i))
+                    .map(|i| quote::quote_spanned!(i.span() => self.#i.cmp(&other.#i) ));
+
+                quote::quote!( core::cmp::Ordering::Equal #( .then_with(|| #fields) )* )
+            }
+            syn::Fields::Unit => {
+                quote::quote!(core::cmp::Ordering::Equal)
+            }
+        },
+        syn::Data::Enum(_) => {
+            let msg = "Enum type not supported by `derive(OrdNoBound)`";
+            return syn::Error::new(input.span(), msg).to_compile_error().into();
+        }
+        syn::Data::Union(_) => {
+            let msg = "Union type not supported by `derive(OrdNoBound)`";
+            return syn::Error::new(input.span(), msg).to_compile_error().into();
+        }
+    };
+
+    quote::quote!(
+        const _: () = {
+            impl #impl_generics core::cmp::Ord for #name #ty_generics #where_clause {
+                fn cmp(&self, other: &Self) -> core::cmp::Ordering {
+                    #impl_
+                }
+            }
+        };
+    )
+    .into()
+}
diff --git a/support/procedural-fork/src/no_bound/partial_eq.rs b/support/procedural-fork/src/no_bound/partial_eq.rs
new file mode 100644
index 000000000..8833f6e5f
--- /dev/null
+++ b/support/procedural-fork/src/no_bound/partial_eq.rs
@@ -0,0 +1,137 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 syn::spanned::Spanned;
+
+/// Derive PartialEq but do not bound any generic.
+pub fn derive_partial_eq_no_bound(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
+    let input = syn::parse_macro_input!(input as syn::DeriveInput);
+
+    let name = &input.ident;
+    let (impl_generics, ty_generics, where_clause) = input.generics.split_for_impl();
+
+    let impl_ = match input.data {
+        syn::Data::Struct(struct_) => match struct_.fields {
+            syn::Fields::Named(named) => {
+                let fields = named
+                    .named
+                    .iter()
+                    .map(|i| &i.ident)
+                    .map(|i| quote::quote_spanned!(i.span() => self.#i == other.#i ));
+
+                quote::quote!( true #( && #fields )* )
+            }
+            syn::Fields::Unnamed(unnamed) => {
+                let fields = unnamed
+                    .unnamed
+                    .iter()
+                    .enumerate()
+                    .map(|(i, _)| syn::Index::from(i))
+                    .map(|i| quote::quote_spanned!(i.span() => self.#i == other.#i ));
+
+                quote::quote!( true #( && #fields )* )
+            }
+            syn::Fields::Unit => {
+                quote::quote!(true)
+            }
+        },
+        syn::Data::Enum(enum_) => {
+            let variants =
+                enum_.variants.iter().map(|variant| {
+                    let ident = &variant.ident;
+                    match &variant.fields {
+                        syn::Fields::Named(named) => {
+                            let names = named.named.iter().map(|i| &i.ident);
+                            let other_names = names.clone().enumerate().map(|(n, ident)| {
+                                syn::Ident::new(&format!("_{}", n), ident.span())
+                            });
+
+                            let capture = names.clone();
+                            let other_capture = names
+                                .clone()
+                                .zip(other_names.clone())
+                                .map(|(i, other_i)| quote::quote!(#i: #other_i));
+                            let eq = names.zip(other_names).map(
+                                |(i, other_i)| quote::quote_spanned!(i.span() => #i == #other_i),
+                            );
+                            quote::quote!(
+                                (
+                                    Self::#ident { #( #capture, )* },
+                                    Self::#ident { #( #other_capture, )* },
+                                ) => true #( && #eq )*
+                            )
+                        }
+                        syn::Fields::Unnamed(unnamed) => {
+                            let names = unnamed
+                                .unnamed
+                                .iter()
+                                .enumerate()
+                                .map(|(i, f)| syn::Ident::new(&format!("_{}", i), f.span()));
+                            let other_names =
+                                unnamed.unnamed.iter().enumerate().map(|(i, f)| {
+                                    syn::Ident::new(&format!("_{}_other", i), f.span())
+                                });
+                            let eq = names.clone().zip(other_names.clone()).map(
+                                |(i, other_i)| quote::quote_spanned!(i.span() => #i == #other_i),
+                            );
+                            quote::quote!(
+                                (
+                                    Self::#ident ( #( #names, )* ),
+                                    Self::#ident ( #( #other_names, )* ),
+                                ) => true #( && #eq )*
+                            )
+                        }
+                        syn::Fields::Unit => quote::quote!( (Self::#ident, Self::#ident) => true ),
+                    }
+                });
+
+            let mut different_variants = vec![];
+            for (i, i_variant) in enum_.variants.iter().enumerate() {
+                for (j, j_variant) in enum_.variants.iter().enumerate() {
+                    if i != j {
+                        let i_ident = &i_variant.ident;
+                        let j_ident = &j_variant.ident;
+                        different_variants.push(quote::quote!(
+                            (Self::#i_ident { .. }, Self::#j_ident { .. }) => false
+                        ))
+                    }
+                }
+            }
+
+            quote::quote!( match (self, other) {
+                #( #variants, )*
+                #( #different_variants, )*
+            })
+        }
+        syn::Data::Union(_) => {
+            let msg = "Union type not supported by `derive(PartialEqNoBound)`";
+            return syn::Error::new(input.span(), msg).to_compile_error().into();
+        }
+    };
+
+    quote::quote!(
+        const _: () = {
+            #[automatically_derived]
+            impl #impl_generics ::core::cmp::PartialEq for #name #ty_generics #where_clause {
+                fn eq(&self, other: &Self) -> bool {
+                    #impl_
+                }
+            }
+        };
+    )
+    .into()
+}
diff --git a/support/procedural-fork/src/no_bound/partial_ord.rs b/support/procedural-fork/src/no_bound/partial_ord.rs
new file mode 100644
index 000000000..c73199d4e
--- /dev/null
+++ b/support/procedural-fork/src/no_bound/partial_ord.rs
@@ -0,0 +1,90 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 syn::spanned::Spanned;
+
+/// Derive PartialOrd but do not bound any generic.
+pub fn derive_partial_ord_no_bound(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
+    let input: syn::DeriveInput = match syn::parse(input) {
+        Ok(input) => input,
+        Err(e) => return e.to_compile_error().into(),
+    };
+
+    let name = &input.ident;
+    let (impl_generics, ty_generics, where_clause) = input.generics.split_for_impl();
+
+    let impl_ =
+        match input.data {
+            syn::Data::Struct(struct_) => {
+                match struct_.fields {
+                    syn::Fields::Named(named) => {
+                        let fields = named.named.iter().map(|i| &i.ident).map(
+                            |i| quote::quote_spanned!(i.span() => self.#i.partial_cmp(&other.#i)),
+                        );
+
+                        quote::quote!(
+                            Some(core::cmp::Ordering::Equal)
+                                #(
+                                    .and_then(|order| {
+                                        let next_order = #fields?;
+                                        Some(order.then(next_order))
+                                    })
+                                )*
+                        )
+                    }
+                    syn::Fields::Unnamed(unnamed) => {
+                        let fields =
+						unnamed.unnamed.iter().enumerate().map(|(i, _)| syn::Index::from(i)).map(
+							|i| quote::quote_spanned!(i.span() => self.#i.partial_cmp(&other.#i)),
+						);
+
+                        quote::quote!(
+                            Some(core::cmp::Ordering::Equal)
+                                #(
+                                    .and_then(|order| {
+                                        let next_order = #fields?;
+                                        Some(order.then(next_order))
+                                    })
+                                )*
+                        )
+                    }
+                    syn::Fields::Unit => {
+                        quote::quote!(Some(core::cmp::Ordering::Equal))
+                    }
+                }
+            }
+            syn::Data::Enum(_) => {
+                let msg = "Enum type not supported by `derive(PartialOrdNoBound)`";
+                return syn::Error::new(input.span(), msg).to_compile_error().into();
+            }
+            syn::Data::Union(_) => {
+                let msg = "Union type not supported by `derive(PartialOrdNoBound)`";
+                return syn::Error::new(input.span(), msg).to_compile_error().into();
+            }
+        };
+
+    quote::quote!(
+        const _: () = {
+            impl #impl_generics core::cmp::PartialOrd for #name #ty_generics #where_clause {
+                fn partial_cmp(&self, other: &Self) -> Option<core::cmp::Ordering> {
+                    #impl_
+                }
+            }
+        };
+    )
+    .into()
+}
diff --git a/support/procedural-fork/src/pallet/expand/call.rs b/support/procedural-fork/src/pallet/expand/call.rs
new file mode 100644
index 000000000..a39e81fd1
--- /dev/null
+++ b/support/procedural-fork/src/pallet/expand/call.rs
@@ -0,0 +1,498 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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::{
+    pallet::{
+        expand::warnings::{weight_constant_warning, weight_witness_warning},
+        parse::call::CallWeightDef,
+        Def,
+    },
+    COUNTER,
+};
+use proc_macro2::TokenStream as TokenStream2;
+use proc_macro_warning::Warning;
+use quote::{quote, ToTokens};
+use syn::spanned::Spanned;
+
+///
+/// * Generate enum call and implement various trait on it.
+/// * Implement Callable and call_function on `Pallet`
+pub fn expand_call(def: &mut Def) -> proc_macro2::TokenStream {
+    let (span, where_clause, methods, docs) = match def.call.as_ref() {
+        Some(call) => {
+            let span = call.attr_span;
+            let where_clause = call.where_clause.clone();
+            let methods = call.methods.clone();
+            let docs = call.docs.clone();
+
+            (span, where_clause, methods, docs)
+        }
+        None => (
+            def.item.span(),
+            def.config.where_clause.clone(),
+            Vec::new(),
+            Vec::new(),
+        ),
+    };
+    let frame_support = &def.frame_support;
+    let frame_system = &def.frame_system;
+    let type_impl_gen = &def.type_impl_generics(span);
+    let type_decl_bounded_gen = &def.type_decl_bounded_generics(span);
+    let type_use_gen = &def.type_use_generics(span);
+    let call_ident = syn::Ident::new("Call", span);
+    let pallet_ident = &def.pallet_struct.pallet;
+
+    let fn_name = methods
+        .iter()
+        .map(|method| &method.name)
+        .collect::<Vec<_>>();
+    let call_index = methods
+        .iter()
+        .map(|method| method.call_index)
+        .collect::<Vec<_>>();
+    let new_call_variant_fn_name = fn_name
+        .iter()
+        .map(|fn_name| quote::format_ident!("new_call_variant_{}", fn_name))
+        .collect::<Vec<_>>();
+
+    let new_call_variant_doc = fn_name
+        .iter()
+        .map(|fn_name| format!("Create a call with the variant `{}`.", fn_name))
+        .collect::<Vec<_>>();
+
+    let mut call_index_warnings = Vec::new();
+    // Emit a warning for each call that is missing `call_index` when not in dev-mode.
+    for method in &methods {
+        if method.explicit_call_index || def.dev_mode {
+            continue;
+        }
+
+        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")
+			.help_links(&[
+				"https://github.com/paritytech/substrate/pull/12891",
+				"https://github.com/paritytech/substrate/pull/11381"
+			])
+			.span(method.name.span())
+			.build_or_panic();
+        call_index_warnings.push(warning);
+    }
+
+    let mut fn_weight = Vec::<TokenStream2>::new();
+    let mut weight_warnings = Vec::new();
+    for method in &methods {
+        match &method.weight {
+            CallWeightDef::DevModeDefault => fn_weight.push(syn::parse_quote!(0)),
+            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::Inherited => {
+                let pallet_weight = def
+                    .call
+                    .as_ref()
+                    .expect("we have methods; we have calls; qed")
+                    .inherited_call_weight
+                    .as_ref()
+                    .expect("the parser prevents this");
+
+                // Expand `<<T as Config>::WeightInfo>::call_name()`.
+                let t = &pallet_weight.typename;
+                let n = &method.name;
+                fn_weight.push(quote!({ < #t > :: #n ()	}));
+            }
+        }
+    }
+    debug_assert_eq!(fn_weight.len(), methods.len());
+
+    let fn_doc = methods
+        .iter()
+        .map(|method| &method.docs)
+        .collect::<Vec<_>>();
+
+    let args_name = methods
+        .iter()
+        .map(|method| {
+            method
+                .args
+                .iter()
+                .map(|(_, name, _)| name.clone())
+                .collect::<Vec<_>>()
+        })
+        .collect::<Vec<_>>();
+
+    let args_name_stripped = methods
+        .iter()
+        .map(|method| {
+            method
+                .args
+                .iter()
+                .map(|(_, name, _)| {
+                    syn::Ident::new(name.to_string().trim_start_matches('_'), name.span())
+                })
+                .collect::<Vec<_>>()
+        })
+        .collect::<Vec<_>>();
+
+    let make_args_name_pattern = |ref_tok| {
+        args_name
+            .iter()
+            .zip(args_name_stripped.iter())
+            .map(|(args_name, args_name_stripped)| {
+                args_name
+                    .iter()
+                    .zip(args_name_stripped)
+                    .map(|(args_name, args_name_stripped)| {
+                        if args_name == args_name_stripped {
+                            quote::quote!( #ref_tok #args_name )
+                        } else {
+                            quote::quote!( #args_name_stripped: #ref_tok #args_name )
+                        }
+                    })
+                    .collect::<Vec<_>>()
+            })
+            .collect::<Vec<_>>()
+    };
+
+    let args_name_pattern = make_args_name_pattern(None);
+    let args_name_pattern_ref = make_args_name_pattern(Some(quote::quote!(ref)));
+
+    let args_type = methods
+        .iter()
+        .map(|method| {
+            method
+                .args
+                .iter()
+                .map(|(_, _, type_)| type_.clone())
+                .collect::<Vec<_>>()
+        })
+        .collect::<Vec<_>>();
+
+    let args_compact_attr = methods.iter().map(|method| {
+        method
+            .args
+            .iter()
+            .map(|(is_compact, _, type_)| {
+                if *is_compact {
+                    quote::quote_spanned!(type_.span() => #[codec(compact)] )
+                } else {
+                    quote::quote!()
+                }
+            })
+            .collect::<Vec<_>>()
+    });
+
+    let default_docs = [syn::parse_quote!(
+        r"Contains a variant per dispatchable extrinsic that this pallet has."
+    )];
+    let docs = if docs.is_empty() {
+        &default_docs[..]
+    } else {
+        &docs[..]
+    };
+
+    let maybe_compile_error = if def.call.is_none() {
+        quote::quote! {
+            compile_error!(concat!(
+                "`",
+                stringify!($pallet_name),
+                "` does not have #[pallet::call] defined, perhaps you should remove `Call` from \
+                construct_runtime?",
+            ));
+        }
+    } else {
+        proc_macro2::TokenStream::new()
+    };
+
+    let count = COUNTER.with(|counter| counter.borrow_mut().inc());
+    let macro_ident = syn::Ident::new(&format!("__is_call_part_defined_{}", count), span);
+
+    let capture_docs = if cfg!(feature = "no-metadata-docs") {
+        "never"
+    } else {
+        "always"
+    };
+
+    // Wrap all calls inside of storage layers
+    if let Some(syn::Item::Impl(item_impl)) = def
+        .call
+        .as_ref()
+        .map(|c| &mut def.item.content.as_mut().expect("Checked by def parser").1[c.index])
+    {
+        item_impl.items.iter_mut().for_each(|i| {
+            if let syn::ImplItem::Fn(method) = i {
+                let block = &method.block;
+                method.block = syn::parse_quote! {{
+                    // We execute all dispatchable in a new storage layer, allowing them
+                    // to return an error at any point, and undoing any storage changes.
+                    #frame_support::storage::with_storage_layer(|| #block)
+                }};
+            }
+        });
+    }
+
+    // Extracts #[allow] attributes, necessary so that we don't run into compiler warnings
+    let maybe_allow_attrs = methods
+        .iter()
+        .map(|method| {
+            method
+                .attrs
+                .iter()
+                .find(|attr| attr.path().is_ident("allow"))
+                .map_or(proc_macro2::TokenStream::new(), |attr| {
+                    attr.to_token_stream()
+                })
+        })
+        .collect::<Vec<_>>();
+
+    let cfg_attrs = methods
+        .iter()
+        .map(|method| {
+            let attrs = method
+                .cfg_attrs
+                .iter()
+                .map(|attr| attr.to_token_stream())
+                .collect::<Vec<_>>();
+            quote::quote!( #( #attrs )* )
+        })
+        .collect::<Vec<_>>();
+
+    let feeless_check = methods
+        .iter()
+        .map(|method| &method.feeless_check)
+        .collect::<Vec<_>>();
+    let feeless_check_result =
+        feeless_check
+            .iter()
+            .zip(args_name.iter())
+            .map(|(feeless_check, arg_name)| {
+                if let Some(feeless_check) = feeless_check {
+                    quote::quote!(#feeless_check(origin, #( #arg_name, )*))
+                } else {
+                    quote::quote!(false)
+                }
+            });
+
+    quote::quote_spanned!(span =>
+        #[doc(hidden)]
+        mod warnings {
+            #(
+                #call_index_warnings
+            )*
+            #(
+                #weight_warnings
+            )*
+        }
+
+        #[allow(unused_imports)]
+        #[doc(hidden)]
+        pub mod __substrate_call_check {
+            #[macro_export]
+            #[doc(hidden)]
+            macro_rules! #macro_ident {
+                ($pallet_name:ident) => {
+                    #maybe_compile_error
+                };
+            }
+
+            #[doc(hidden)]
+            pub use #macro_ident as is_call_part_defined;
+        }
+
+        #( #[doc = #docs] )*
+        #[derive(
+            #frame_support::RuntimeDebugNoBound,
+            #frame_support::CloneNoBound,
+            #frame_support::EqNoBound,
+            #frame_support::PartialEqNoBound,
+            #frame_support::__private::codec::Encode,
+            #frame_support::__private::codec::Decode,
+            #frame_support::__private::scale_info::TypeInfo,
+        )]
+        #[codec(encode_bound())]
+        #[codec(decode_bound())]
+        #[scale_info(skip_type_params(#type_use_gen), capture_docs = #capture_docs)]
+        #[allow(non_camel_case_types)]
+        pub enum #call_ident<#type_decl_bounded_gen> #where_clause {
+            #[doc(hidden)]
+            #[codec(skip)]
+            __Ignore(
+                ::core::marker::PhantomData<(#type_use_gen,)>,
+                #frame_support::Never,
+            ),
+            #(
+                #cfg_attrs
+                #( #[doc = #fn_doc] )*
+                #[codec(index = #call_index)]
+                #fn_name {
+                    #(
+                        #[allow(missing_docs)]
+                        #args_compact_attr #args_name_stripped: #args_type
+                    ),*
+                },
+            )*
+        }
+
+        impl<#type_impl_gen> #call_ident<#type_use_gen> #where_clause {
+            #(
+                #cfg_attrs
+                #[doc = #new_call_variant_doc]
+                pub fn #new_call_variant_fn_name(
+                    #( #args_name_stripped: #args_type ),*
+                ) -> Self {
+                    Self::#fn_name {
+                        #( #args_name_stripped ),*
+                    }
+                }
+            )*
+        }
+
+        impl<#type_impl_gen> #frame_support::dispatch::GetDispatchInfo
+            for #call_ident<#type_use_gen>
+            #where_clause
+        {
+            fn get_dispatch_info(&self) -> #frame_support::dispatch::DispatchInfo {
+                match *self {
+                    #(
+                        #cfg_attrs
+                        Self::#fn_name { #( #args_name_pattern_ref, )* } => {
+                            let __pallet_base_weight = #fn_weight;
+
+                            let __pallet_weight = <
+                                dyn #frame_support::dispatch::WeighData<( #( & #args_type, )* )>
+                            >::weigh_data(&__pallet_base_weight, ( #( #args_name, )* ));
+
+                            let __pallet_class = <
+                                dyn #frame_support::dispatch::ClassifyDispatch<
+                                    ( #( & #args_type, )* )
+                                >
+                            >::classify_dispatch(&__pallet_base_weight, ( #( #args_name, )* ));
+
+                            let __pallet_pays_fee = <
+                                dyn #frame_support::dispatch::PaysFee<( #( & #args_type, )* )>
+                            >::pays_fee(&__pallet_base_weight, ( #( #args_name, )* ));
+
+                            #frame_support::dispatch::DispatchInfo {
+                                weight: __pallet_weight,
+                                class: __pallet_class,
+                                pays_fee: __pallet_pays_fee,
+                            }
+                        },
+                    )*
+                    Self::__Ignore(_, _) => unreachable!("__Ignore cannot be used"),
+                }
+            }
+        }
+
+        impl<#type_impl_gen> #frame_support::dispatch::CheckIfFeeless for #call_ident<#type_use_gen>
+            #where_clause
+        {
+            type Origin = #frame_system::pallet_prelude::OriginFor<T>;
+            #[allow(unused_variables)]
+            fn is_feeless(&self, origin: &Self::Origin) -> bool {
+                match *self {
+                    #(
+                        #cfg_attrs
+                        Self::#fn_name { #( #args_name_pattern_ref, )* } => {
+                            #feeless_check_result
+                        },
+                    )*
+                    Self::__Ignore(_, _) => unreachable!("__Ignore cannot be used"),
+                }
+            }
+        }
+
+        impl<#type_impl_gen> #frame_support::traits::GetCallName for #call_ident<#type_use_gen>
+            #where_clause
+        {
+            fn get_call_name(&self) -> &'static str {
+                match *self {
+                    #( #cfg_attrs Self::#fn_name { .. } => stringify!(#fn_name), )*
+                    Self::__Ignore(_, _) => unreachable!("__PhantomItem cannot be used."),
+                }
+            }
+
+            fn get_call_names() -> &'static [&'static str] {
+                &[ #( #cfg_attrs stringify!(#fn_name), )* ]
+            }
+        }
+
+        impl<#type_impl_gen> #frame_support::traits::GetCallIndex for #call_ident<#type_use_gen>
+            #where_clause
+        {
+            fn get_call_index(&self) -> u8 {
+                match *self {
+                    #( #cfg_attrs Self::#fn_name { .. } => #call_index, )*
+                    Self::__Ignore(_, _) => unreachable!("__PhantomItem cannot be used."),
+                }
+            }
+
+            fn get_call_indices() -> &'static [u8] {
+                &[ #( #cfg_attrs #call_index, )* ]
+            }
+        }
+
+        impl<#type_impl_gen> #frame_support::traits::UnfilteredDispatchable
+            for #call_ident<#type_use_gen>
+            #where_clause
+        {
+            type RuntimeOrigin = #frame_system::pallet_prelude::OriginFor<T>;
+            fn dispatch_bypass_filter(
+                self,
+                origin: Self::RuntimeOrigin
+            ) -> #frame_support::dispatch::DispatchResultWithPostInfo {
+                #frame_support::dispatch_context::run_in_context(|| {
+                    match self {
+                        #(
+                            #cfg_attrs
+                            Self::#fn_name { #( #args_name_pattern, )* } => {
+                                #frame_support::__private::sp_tracing::enter_span!(
+                                    #frame_support::__private::sp_tracing::trace_span!(stringify!(#fn_name))
+                                );
+                                #maybe_allow_attrs
+                                <#pallet_ident<#type_use_gen>>::#fn_name(origin, #( #args_name, )* )
+                                    .map(Into::into).map_err(Into::into)
+                            },
+                        )*
+                        Self::__Ignore(_, _) => {
+                            let _ = origin; // Use origin for empty Call enum
+                            unreachable!("__PhantomItem cannot be used.");
+                        },
+                    }
+                })
+            }
+        }
+
+        impl<#type_impl_gen> #frame_support::dispatch::Callable<T> for #pallet_ident<#type_use_gen>
+            #where_clause
+        {
+            type RuntimeCall = #call_ident<#type_use_gen>;
+        }
+
+        impl<#type_impl_gen> #pallet_ident<#type_use_gen> #where_clause {
+            #[allow(dead_code)]
+            #[doc(hidden)]
+            pub fn call_functions() -> #frame_support::__private::metadata_ir::PalletCallMetadataIR {
+                #frame_support::__private::scale_info::meta_type::<#call_ident<#type_use_gen>>().into()
+            }
+        }
+    )
+}
diff --git a/support/procedural-fork/src/pallet/expand/composite.rs b/support/procedural-fork/src/pallet/expand/composite.rs
new file mode 100644
index 000000000..49c0ad675
--- /dev/null
+++ b/support/procedural-fork/src/pallet/expand/composite.rs
@@ -0,0 +1,40 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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::pallet::Def;
+use proc_macro2::TokenStream;
+
+/// Expands `composite_enum` and adds the `VariantCount` implementation for it.
+pub fn expand_composites(def: &mut Def) -> TokenStream {
+    let mut expand = quote::quote!();
+    let frame_support = &def.frame_support;
+
+    for composite in &def.composites {
+        let name = &composite.ident;
+        let (impl_generics, ty_generics, where_clause) = composite.generics.split_for_impl();
+        let variants_count = composite.variant_count;
+
+        // add `VariantCount` implementation for `composite_enum`
+        expand.extend(quote::quote_spanned!(composite.attr_span =>
+			impl #impl_generics #frame_support::traits::VariantCount for #name #ty_generics #where_clause {
+				const VARIANT_COUNT: u32 = #variants_count;
+			}
+		));
+    }
+
+    expand
+}
diff --git a/support/procedural-fork/src/pallet/expand/config.rs b/support/procedural-fork/src/pallet/expand/config.rs
new file mode 100644
index 000000000..836c74ae7
--- /dev/null
+++ b/support/procedural-fork/src/pallet/expand/config.rs
@@ -0,0 +1,97 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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::pallet::Def;
+use proc_macro2::TokenStream;
+use quote::quote;
+use syn::{parse_quote, Item};
+
+///
+/// * Generate default rust doc
+pub fn expand_config(def: &mut Def) -> TokenStream {
+    let config = &def.config;
+    let config_item = {
+        let item = &mut def.item.content.as_mut().expect("Checked by def parser").1[config.index];
+        if let Item::Trait(item) = item {
+            item
+        } else {
+            unreachable!("Checked by config parser")
+        }
+    };
+
+    config_item.attrs.insert(
+        0,
+        parse_quote!(
+            #[doc = r"
+Configuration trait of this pallet.
+
+The main purpose of this trait is to act as an interface between this pallet and the runtime in
+which it is embedded in. A type, function, or constant in this trait is essentially left to be
+configured by the runtime that includes this pallet.
+
+Consequently, a runtime that wants to include this pallet must implement this trait."
+            ]
+        ),
+    );
+
+    // we only emit `DefaultConfig` if there are trait items, so an empty `DefaultConfig` is
+    // impossible consequently.
+    match &config.default_sub_trait {
+        Some(default_sub_trait) if default_sub_trait.items.len() > 0 => {
+            let trait_items = &default_sub_trait
+                .items
+                .iter()
+                .map(|item| {
+                    if item.1 {
+                        if let syn::TraitItem::Type(item) = item.0.clone() {
+                            let mut item = item.clone();
+                            item.bounds.clear();
+                            syn::TraitItem::Type(item)
+                        } else {
+                            item.0.clone()
+                        }
+                    } else {
+                        item.0.clone()
+                    }
+                })
+                .collect::<Vec<_>>();
+
+            let type_param_bounds = if default_sub_trait.has_system {
+                let system = &def.frame_system;
+                quote::quote!(: #system::DefaultConfig)
+            } else {
+                quote::quote!()
+            };
+
+            quote!(
+                /// Based on [`Config`]. Auto-generated by
+                /// [`#[pallet::config(with_default)]`](`frame_support::pallet_macros::config`).
+                /// Can be used in tandem with
+                /// [`#[register_default_config]`](`frame_support::register_default_config`) and
+                /// [`#[derive_impl]`](`frame_support::derive_impl`) to derive test config traits
+                /// based on existing pallet config traits in a safe and developer-friendly way.
+                ///
+                /// See [here](`frame_support::pallet_macros::config`) for more information and caveats about
+                /// the auto-generated `DefaultConfig` trait and how it is generated.
+                pub trait DefaultConfig #type_param_bounds {
+                    #(#trait_items)*
+                }
+            )
+        }
+        _ => Default::default(),
+    }
+}
diff --git a/support/procedural-fork/src/pallet/expand/constants.rs b/support/procedural-fork/src/pallet/expand/constants.rs
new file mode 100644
index 000000000..5153ccf49
--- /dev/null
+++ b/support/procedural-fork/src/pallet/expand/constants.rs
@@ -0,0 +1,116 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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::pallet::Def;
+
+struct ConstDef {
+    /// Name of the associated type.
+    pub ident: syn::Ident,
+    /// The type in Get, e.g. `u32` in `type Foo: Get<u32>;`, but `Self` is replaced by `T`
+    pub type_: syn::Type,
+    /// The doc associated
+    pub doc: Vec<syn::Expr>,
+    /// default_byte implementation
+    pub default_byte_impl: proc_macro2::TokenStream,
+    /// Constant name for Metadata (optional)
+    pub metadata_name: Option<syn::Ident>,
+}
+
+///
+/// * Impl fn module_constant_metadata for pallet.
+pub fn expand_constants(def: &mut Def) -> proc_macro2::TokenStream {
+    let frame_support = &def.frame_support;
+    let type_impl_gen = &def.type_impl_generics(proc_macro2::Span::call_site());
+    let type_use_gen = &def.type_use_generics(proc_macro2::Span::call_site());
+    let pallet_ident = &def.pallet_struct.pallet;
+    let trait_use_gen = &def.trait_use_generics(proc_macro2::Span::call_site());
+
+    let mut where_clauses = vec![&def.config.where_clause];
+    where_clauses.extend(def.extra_constants.iter().map(|d| &d.where_clause));
+    let completed_where_clause = super::merge_where_clauses(&where_clauses);
+
+    let config_consts = def.config.consts_metadata.iter().map(|const_| {
+        let ident = &const_.ident;
+        let const_type = &const_.type_;
+
+        ConstDef {
+            ident: const_.ident.clone(),
+            type_: const_.type_.clone(),
+            doc: const_.doc.clone(),
+            default_byte_impl: quote::quote!(
+                let value = <<T as Config #trait_use_gen>::#ident as
+                    #frame_support::traits::Get<#const_type>>::get();
+                #frame_support::__private::codec::Encode::encode(&value)
+            ),
+            metadata_name: None,
+        }
+    });
+
+    let extra_consts = def
+        .extra_constants
+        .iter()
+        .flat_map(|d| &d.extra_constants)
+        .map(|const_| {
+            let ident = &const_.ident;
+
+            ConstDef {
+                ident: const_.ident.clone(),
+                type_: const_.type_.clone(),
+                doc: const_.doc.clone(),
+                default_byte_impl: quote::quote!(
+                    let value = <Pallet<#type_use_gen>>::#ident();
+                    #frame_support::__private::codec::Encode::encode(&value)
+                ),
+                metadata_name: const_.metadata_name.clone(),
+            }
+        });
+
+    let consts = config_consts.chain(extra_consts).map(|const_| {
+        let const_type = &const_.type_;
+        let ident_str = format!("{}", const_.metadata_name.unwrap_or(const_.ident));
+
+        let no_docs = vec![];
+        let doc = if cfg!(feature = "no-metadata-docs") {
+            &no_docs
+        } else {
+            &const_.doc
+        };
+
+        let default_byte_impl = &const_.default_byte_impl;
+
+        quote::quote!({
+            #frame_support::__private::metadata_ir::PalletConstantMetadataIR {
+                name: #ident_str,
+                ty: #frame_support::__private::scale_info::meta_type::<#const_type>(),
+                value: { #default_byte_impl },
+                docs: #frame_support::__private::sp_std::vec![ #( #doc ),* ],
+            }
+        })
+    });
+
+    quote::quote!(
+        impl<#type_impl_gen> #pallet_ident<#type_use_gen> #completed_where_clause{
+
+            #[doc(hidden)]
+            pub fn pallet_constants_metadata()
+                -> #frame_support::__private::sp_std::vec::Vec<#frame_support::__private::metadata_ir::PalletConstantMetadataIR>
+            {
+                #frame_support::__private::sp_std::vec![ #( #consts ),* ]
+            }
+        }
+    )
+}
diff --git a/support/procedural-fork/src/pallet/expand/doc_only.rs b/support/procedural-fork/src/pallet/expand/doc_only.rs
new file mode 100644
index 000000000..3e60e9a9b
--- /dev/null
+++ b/support/procedural-fork/src/pallet/expand/doc_only.rs
@@ -0,0 +1,103 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 proc_macro2::Span;
+
+use crate::pallet::Def;
+
+pub fn expand_doc_only(def: &mut Def) -> proc_macro2::TokenStream {
+    let dispatchables = if let Some(call_def) = &def.call {
+        let type_impl_generics = def.type_impl_generics(Span::call_site());
+        call_def
+            .methods
+            .iter()
+            .map(|method| {
+                let name = &method.name;
+                let args = &method
+                    .args
+                    .iter()
+                    .map(|(_, arg_name, arg_type)| quote::quote!( #arg_name: #arg_type, ))
+                    .collect::<proc_macro2::TokenStream>();
+                let docs = &method.docs;
+
+                let real = format!(" [`Pallet::{}`].", name);
+                quote::quote!(
+                    #( #[doc = #docs] )*
+                    ///
+                    /// # Warning: Doc-Only
+                    ///
+                    /// This function is an automatically generated, and is doc-only, uncallable
+                    /// stub. See the real version in
+                    #[ doc = #real ]
+                    pub fn #name<#type_impl_generics>(#args) { unreachable!(); }
+                )
+            })
+            .collect::<proc_macro2::TokenStream>()
+    } else {
+        quote::quote!()
+    };
+
+    let storage_types = def
+        .storages
+        .iter()
+        .map(|storage| {
+            let storage_name = &storage.ident;
+            let storage_type_docs = &storage.docs;
+            let real = format!("[`pallet::{}`].", storage_name);
+            quote::quote!(
+                #( #[doc = #storage_type_docs] )*
+                ///
+                /// # Warning: Doc-Only
+                ///
+                /// This type is automatically generated, and is doc-only. See the real version in
+                #[ doc = #real ]
+                pub struct #storage_name();
+            )
+        })
+        .collect::<proc_macro2::TokenStream>();
+
+    quote::quote!(
+        /// Auto-generated docs-only module listing all (public and private) defined storage types
+        /// for this pallet.
+        ///
+        /// # Warning: Doc-Only
+        ///
+        /// Members of this module cannot be used directly and are only provided for documentation
+        /// purposes.
+        ///
+        /// To see the actual storage type, find a struct with the same name at the root of the
+        /// pallet, in the list of [*Type Definitions*](../index.html#types).
+        #[cfg(doc)]
+        pub mod storage_types {
+            use super::*;
+            #storage_types
+        }
+
+        /// Auto-generated docs-only module listing all defined dispatchables for this pallet.
+        ///
+        /// # Warning: Doc-Only
+        ///
+        /// Members of this module cannot be used directly and are only provided for documentation
+        /// purposes. To see the real version of each dispatchable, look for them in [`Pallet`] or
+        /// [`Call`].
+        #[cfg(doc)]
+        pub mod dispatchables {
+            use super::*;
+            #dispatchables
+        }
+    )
+}
diff --git a/support/procedural-fork/src/pallet/expand/documentation.rs b/support/procedural-fork/src/pallet/expand/documentation.rs
new file mode 100644
index 000000000..adc4f7ce9
--- /dev/null
+++ b/support/procedural-fork/src/pallet/expand/documentation.rs
@@ -0,0 +1,175 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//      http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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::pallet::Def;
+use proc_macro2::TokenStream;
+use quote::ToTokens;
+use syn::{spanned::Spanned, Attribute, Lit, LitStr};
+
+const DOC: &'static str = "doc";
+const PALLET_DOC: &'static str = "pallet_doc";
+
+/// Get the documentation file path from the `pallet_doc` attribute.
+///
+/// Supported format:
+/// `#[pallet_doc(PATH)]`: The path of the file from which the documentation is loaded
+fn parse_pallet_doc_value(attr: &Attribute) -> syn::Result<DocMetaValue> {
+    let lit: syn::LitStr = attr.parse_args().map_err(|_| {
+		let msg = "The `pallet_doc` received an unsupported argument. Supported format: `pallet_doc(\"PATH\")`";
+		syn::Error::new(attr.span(), msg)
+	})?;
+
+    Ok(DocMetaValue::Path(lit))
+}
+
+/// Get the value from the `doc` comment attribute:
+///
+/// Supported formats:
+/// - `#[doc = "A doc string"]`: Documentation as a string literal
+/// - `#[doc = include_str!(PATH)]`: Documentation obtained from a path
+fn parse_doc_value(attr: &Attribute) -> syn::Result<Option<DocMetaValue>> {
+    if !attr.path().is_ident(DOC) {
+        return Ok(None);
+    }
+
+    let meta = attr.meta.require_name_value()?;
+
+    match &meta.value {
+        syn::Expr::Lit(lit) => Ok(Some(DocMetaValue::Lit(lit.lit.clone()))),
+        syn::Expr::Macro(mac) if mac.mac.path.is_ident("include_str") => {
+            Ok(Some(DocMetaValue::Path(mac.mac.parse_body()?)))
+        }
+        _ => Err(syn::Error::new(
+            attr.span(),
+            "Expected `= \"docs\"` or `= include_str!(\"PATH\")`",
+        )),
+    }
+}
+
+/// Supported documentation tokens.
+#[derive(Debug)]
+enum DocMetaValue {
+    /// Documentation with string literals.
+    ///
+    /// `#[doc = "Lit"]`
+    Lit(Lit),
+    /// Documentation with `include_str!` macro.
+    ///
+    /// The string literal represents the file `PATH`.
+    ///
+    /// `#[doc = include_str!(PATH)]`
+    Path(LitStr),
+}
+
+impl ToTokens for DocMetaValue {
+    fn to_tokens(&self, tokens: &mut TokenStream) {
+        match self {
+            DocMetaValue::Lit(lit) => lit.to_tokens(tokens),
+            DocMetaValue::Path(path_lit) => {
+                let decl = quote::quote!(include_str!(#path_lit));
+                tokens.extend(decl)
+            }
+        }
+    }
+}
+
+/// Extract the documentation from the given pallet definition
+/// to include in the runtime metadata.
+///
+/// Implement a `pallet_documentation_metadata` function to fetch the
+/// documentation that is included in the metadata.
+///
+/// The documentation is placed on the pallet similar to:
+///
+/// ```ignore
+/// #[pallet]
+/// /// Documentation for pallet
+/// #[doc = "Documentation for pallet"]
+/// #[doc = include_str!("../README.md")]
+/// #[pallet_doc("../documentation1.md")]
+/// #[pallet_doc("../documentation2.md")]
+/// pub mod pallet {}
+/// ```
+///
+/// # pallet_doc
+///
+/// The `pallet_doc` attribute can only be provided with one argument,
+/// which is the file path that holds the documentation to be added to the metadata.
+///
+/// Unlike the `doc` attribute, the documentation provided to the `proc_macro` attribute is
+/// not added to the pallet.
+pub fn expand_documentation(def: &mut Def) -> proc_macro2::TokenStream {
+    let frame_support = &def.frame_support;
+    let type_impl_gen = &def.type_impl_generics(proc_macro2::Span::call_site());
+    let type_use_gen = &def.type_use_generics(proc_macro2::Span::call_site());
+    let pallet_ident = &def.pallet_struct.pallet;
+    let where_clauses = &def.config.where_clause;
+
+    // TODO: Use [drain_filter](https://doc.rust-lang.org/std/vec/struct.Vec.html#method.drain_filter) when it is stable.
+
+    // The `pallet_doc` attributes are excluded from the generation of the pallet,
+    // but they are included in the runtime metadata.
+    let mut pallet_docs = Vec::with_capacity(def.item.attrs.len());
+    let mut index = 0;
+    while index < def.item.attrs.len() {
+        let attr = &def.item.attrs[index];
+        if attr.path().get_ident().map_or(false, |i| *i == PALLET_DOC) {
+            pallet_docs.push(def.item.attrs.remove(index));
+            // Do not increment the index, we have just removed the
+            // element from the attributes.
+            continue;
+        }
+
+        index += 1;
+    }
+
+    // Capture the `#[doc = include_str!("../README.md")]` and `#[doc = "Documentation"]`.
+    let docs = match def
+        .item
+        .attrs
+        .iter()
+        .filter_map(|v| parse_doc_value(v).transpose())
+        .collect::<syn::Result<Vec<_>>>()
+    {
+        Ok(r) => r,
+        Err(err) => return err.into_compile_error(),
+    };
+
+    // Capture the `#[pallet_doc("../README.md")]`.
+    let pallet_docs = match pallet_docs
+        .into_iter()
+        .map(|attr| parse_pallet_doc_value(&attr))
+        .collect::<syn::Result<Vec<_>>>()
+    {
+        Ok(docs) => docs,
+        Err(err) => return err.into_compile_error(),
+    };
+
+    let docs = docs.iter().chain(pallet_docs.iter());
+
+    quote::quote!(
+        impl<#type_impl_gen> #pallet_ident<#type_use_gen> #where_clauses{
+
+            #[doc(hidden)]
+            pub fn pallet_documentation_metadata()
+                -> #frame_support::__private::sp_std::vec::Vec<&'static str>
+            {
+                #frame_support::__private::sp_std::vec![ #( #docs ),* ]
+            }
+        }
+    )
+}
diff --git a/support/procedural-fork/src/pallet/expand/error.rs b/support/procedural-fork/src/pallet/expand/error.rs
new file mode 100644
index 000000000..e2c3f680c
--- /dev/null
+++ b/support/procedural-fork/src/pallet/expand/error.rs
@@ -0,0 +1,195 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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::{
+    pallet::{
+        parse::error::{VariantDef, VariantField},
+        Def,
+    },
+    COUNTER,
+};
+use frame_support_procedural_tools::get_doc_literals;
+use quote::ToTokens;
+use syn::spanned::Spanned;
+
+///
+/// * impl various trait on Error
+pub fn expand_error(def: &mut Def) -> proc_macro2::TokenStream {
+    let count = COUNTER.with(|counter| counter.borrow_mut().inc());
+    let error_token_unique_id =
+        syn::Ident::new(&format!("__tt_error_token_{}", count), def.item.span());
+
+    let frame_support = &def.frame_support;
+    let frame_system = &def.frame_system;
+    let config_where_clause = &def.config.where_clause;
+
+    let error = if let Some(error) = &def.error {
+        error
+    } else {
+        return quote::quote! {
+            #[macro_export]
+            #[doc(hidden)]
+            macro_rules! #error_token_unique_id {
+                {
+                    $caller:tt
+                    your_tt_return = [{ $my_tt_return:path }]
+                } => {
+                    $my_tt_return! {
+                        $caller
+                    }
+                };
+            }
+
+            pub use #error_token_unique_id as tt_error_token;
+        };
+    };
+
+    let error_ident = &error.error;
+    let type_impl_gen = &def.type_impl_generics(error.attr_span);
+    let type_use_gen = &def.type_use_generics(error.attr_span);
+
+    let phantom_variant: syn::Variant = syn::parse_quote!(
+        #[doc(hidden)]
+        #[codec(skip)]
+        __Ignore(
+            #frame_support::__private::sp_std::marker::PhantomData<(#type_use_gen)>,
+            #frame_support::Never,
+        )
+    );
+
+    let as_str_matches = error.variants.iter().map(
+		|VariantDef { ident: variant, field: field_ty, docs: _, cfg_attrs }| {
+			let variant_str = variant.to_string();
+			let cfg_attrs = cfg_attrs.iter().map(|attr| attr.to_token_stream());
+			match field_ty {
+				Some(VariantField { is_named: true }) => {
+					quote::quote_spanned!(error.attr_span => #( #cfg_attrs )* Self::#variant { .. } => #variant_str,)
+				},
+				Some(VariantField { is_named: false }) => {
+					quote::quote_spanned!(error.attr_span => #( #cfg_attrs )* Self::#variant(..) => #variant_str,)
+				},
+				None => {
+					quote::quote_spanned!(error.attr_span => #( #cfg_attrs )* Self::#variant => #variant_str,)
+				},
+			}
+		},
+	);
+
+    let error_item = {
+        let item = &mut def.item.content.as_mut().expect("Checked by def parser").1[error.index];
+        if let syn::Item::Enum(item) = item {
+            item
+        } else {
+            unreachable!("Checked by error parser")
+        }
+    };
+
+    error_item.variants.insert(0, phantom_variant);
+
+    let capture_docs = if cfg!(feature = "no-metadata-docs") {
+        "never"
+    } else {
+        "always"
+    };
+
+    // derive TypeInfo for error metadata
+    error_item.attrs.push(syn::parse_quote! {
+        #[derive(
+            #frame_support::__private::codec::Encode,
+            #frame_support::__private::codec::Decode,
+            #frame_support::__private::scale_info::TypeInfo,
+            #frame_support::PalletError,
+        )]
+    });
+    error_item.attrs.push(syn::parse_quote!(
+        #[scale_info(skip_type_params(#type_use_gen), capture_docs = #capture_docs)]
+    ));
+
+    if get_doc_literals(&error_item.attrs).is_empty() {
+        error_item.attrs.push(syn::parse_quote!(
+            #[doc = "The `Error` enum of this pallet."]
+        ));
+    }
+
+    quote::quote_spanned!(error.attr_span =>
+        impl<#type_impl_gen> #frame_support::__private::sp_std::fmt::Debug for #error_ident<#type_use_gen>
+            #config_where_clause
+        {
+            fn fmt(&self, f: &mut #frame_support::__private::sp_std::fmt::Formatter<'_>)
+                -> #frame_support::__private::sp_std::fmt::Result
+            {
+                f.write_str(self.as_str())
+            }
+        }
+
+        impl<#type_impl_gen> #error_ident<#type_use_gen> #config_where_clause {
+            #[doc(hidden)]
+            pub fn as_str(&self) -> &'static str {
+                match &self {
+                    Self::__Ignore(_, _) => unreachable!("`__Ignore` can never be constructed"),
+                    #( #as_str_matches )*
+                }
+            }
+        }
+
+        impl<#type_impl_gen> From<#error_ident<#type_use_gen>> for &'static str
+            #config_where_clause
+        {
+            fn from(err: #error_ident<#type_use_gen>) -> &'static str {
+                err.as_str()
+            }
+        }
+
+        impl<#type_impl_gen> From<#error_ident<#type_use_gen>>
+            for #frame_support::sp_runtime::DispatchError
+            #config_where_clause
+        {
+            fn from(err: #error_ident<#type_use_gen>) -> Self {
+                use #frame_support::__private::codec::Encode;
+                let index = <
+                    <T as #frame_system::Config>::PalletInfo
+                    as #frame_support::traits::PalletInfo
+                >::index::<Pallet<#type_use_gen>>()
+                    .expect("Every active module has an index in the runtime; qed") as u8;
+                let mut encoded = err.encode();
+                encoded.resize(#frame_support::MAX_MODULE_ERROR_ENCODED_SIZE, 0);
+
+                #frame_support::sp_runtime::DispatchError::Module(#frame_support::sp_runtime::ModuleError {
+                    index,
+                    error: TryInto::try_into(encoded).expect("encoded error is resized to be equal to the maximum encoded error size; qed"),
+                    message: Some(err.as_str()),
+                })
+            }
+        }
+
+        #[macro_export]
+        #[doc(hidden)]
+        macro_rules! #error_token_unique_id {
+            {
+                $caller:tt
+                your_tt_return = [{ $my_tt_return:path }]
+            } => {
+                $my_tt_return! {
+                    $caller
+                    error = [{ #error_ident }]
+                }
+            };
+        }
+
+        pub use #error_token_unique_id as tt_error_token;
+    )
+}
diff --git a/support/procedural-fork/src/pallet/expand/event.rs b/support/procedural-fork/src/pallet/expand/event.rs
new file mode 100644
index 000000000..931dcd95a
--- /dev/null
+++ b/support/procedural-fork/src/pallet/expand/event.rs
@@ -0,0 +1,185 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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::{
+    pallet::{parse::event::PalletEventDepositAttr, Def},
+    COUNTER,
+};
+use frame_support_procedural_tools::get_doc_literals;
+use syn::{spanned::Spanned, Ident};
+
+///
+/// * Add __Ignore variant on Event
+/// * Impl various trait on Event including metadata
+/// * if deposit_event is defined, implement deposit_event on module.
+pub fn expand_event(def: &mut Def) -> proc_macro2::TokenStream {
+    let count = COUNTER.with(|counter| counter.borrow_mut().inc());
+
+    let (event, macro_ident) = if let Some(event) = &def.event {
+        let ident = Ident::new(
+            &format!("__is_event_part_defined_{}", count),
+            event.attr_span,
+        );
+        (event, ident)
+    } else {
+        let macro_ident = Ident::new(
+            &format!("__is_event_part_defined_{}", count),
+            def.item.span(),
+        );
+
+        return quote::quote! {
+            #[doc(hidden)]
+            pub mod __substrate_event_check {
+                #[macro_export]
+                #[doc(hidden)]
+                macro_rules! #macro_ident {
+                    ($pallet_name:ident) => {
+                        compile_error!(concat!(
+                            "`",
+                            stringify!($pallet_name),
+                            "` does not have #[pallet::event] defined, perhaps you should \
+                            remove `Event` from construct_runtime?",
+                        ));
+                    }
+                }
+
+                #[doc(hidden)]
+                pub use #macro_ident as is_event_part_defined;
+            }
+        };
+    };
+
+    let event_where_clause = &event.where_clause;
+
+    // NOTE: actually event where clause must be a subset of config where clause because of
+    // `type RuntimeEvent: From<Event<Self>>`. But we merge either way for potential better error
+    // message
+    let completed_where_clause =
+        super::merge_where_clauses(&[&event.where_clause, &def.config.where_clause]);
+
+    let event_ident = &event.event;
+    let frame_system = &def.frame_system;
+    let frame_support = &def.frame_support;
+    let event_use_gen = &event.gen_kind.type_use_gen(event.attr_span);
+    let event_impl_gen = &event.gen_kind.type_impl_gen(event.attr_span);
+
+    let event_item = {
+        let item = &mut def.item.content.as_mut().expect("Checked by def parser").1[event.index];
+        if let syn::Item::Enum(item) = item {
+            item
+        } else {
+            unreachable!("Checked by event parser")
+        }
+    };
+
+    // Phantom data is added for generic event.
+    if event.gen_kind.is_generic() {
+        let variant = syn::parse_quote!(
+            #[doc(hidden)]
+            #[codec(skip)]
+            __Ignore(
+                ::core::marker::PhantomData<(#event_use_gen)>,
+                #frame_support::Never,
+            )
+        );
+
+        // Push ignore variant at the end.
+        event_item.variants.push(variant);
+    }
+
+    if get_doc_literals(&event_item.attrs).is_empty() {
+        event_item
+            .attrs
+            .push(syn::parse_quote!(#[doc = "The `Event` enum of this pallet"]));
+    }
+
+    // derive some traits because system event require Clone, FullCodec, Eq, PartialEq and Debug
+    event_item.attrs.push(syn::parse_quote!(
+        #[derive(
+            #frame_support::CloneNoBound,
+            #frame_support::EqNoBound,
+            #frame_support::PartialEqNoBound,
+            #frame_support::RuntimeDebugNoBound,
+            #frame_support::__private::codec::Encode,
+            #frame_support::__private::codec::Decode,
+            #frame_support::__private::scale_info::TypeInfo,
+        )]
+    ));
+
+    let capture_docs = if cfg!(feature = "no-metadata-docs") {
+        "never"
+    } else {
+        "always"
+    };
+
+    // skip requirement for type params to implement `TypeInfo`, and set docs capture
+    event_item.attrs.push(syn::parse_quote!(
+        #[scale_info(skip_type_params(#event_use_gen), capture_docs = #capture_docs)]
+    ));
+
+    let deposit_event = if let Some(deposit_event) = &event.deposit_event {
+        let event_use_gen = &event.gen_kind.type_use_gen(event.attr_span);
+        let trait_use_gen = &def.trait_use_generics(event.attr_span);
+        let type_impl_gen = &def.type_impl_generics(event.attr_span);
+        let type_use_gen = &def.type_use_generics(event.attr_span);
+        let pallet_ident = &def.pallet_struct.pallet;
+
+        let PalletEventDepositAttr {
+            fn_vis, fn_span, ..
+        } = deposit_event;
+
+        quote::quote_spanned!(*fn_span =>
+            impl<#type_impl_gen> #pallet_ident<#type_use_gen> #completed_where_clause {
+                #fn_vis fn deposit_event(event: Event<#event_use_gen>) {
+                    let event = <
+                        <T as Config #trait_use_gen>::RuntimeEvent as
+                        From<Event<#event_use_gen>>
+                    >::from(event);
+
+                    let event = <
+                        <T as Config #trait_use_gen>::RuntimeEvent as
+                        Into<<T as #frame_system::Config>::RuntimeEvent>
+                    >::into(event);
+
+                    <#frame_system::Pallet<T>>::deposit_event(event)
+                }
+            }
+        )
+    } else {
+        Default::default()
+    };
+
+    quote::quote_spanned!(event.attr_span =>
+        #[doc(hidden)]
+        pub mod __substrate_event_check {
+            #[macro_export]
+            #[doc(hidden)]
+            macro_rules! #macro_ident {
+                ($pallet_name:ident) => {};
+            }
+
+            #[doc(hidden)]
+            pub use #macro_ident as is_event_part_defined;
+        }
+
+        #deposit_event
+
+        impl<#event_impl_gen> From<#event_ident<#event_use_gen>> for () #event_where_clause {
+            fn from(_: #event_ident<#event_use_gen>) {}
+        }
+    )
+}
diff --git a/support/procedural-fork/src/pallet/expand/genesis_build.rs b/support/procedural-fork/src/pallet/expand/genesis_build.rs
new file mode 100644
index 000000000..c6089550d
--- /dev/null
+++ b/support/procedural-fork/src/pallet/expand/genesis_build.rs
@@ -0,0 +1,53 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+use crate::pallet::Def;
+
+///
+/// * implement the trait `sp_runtime::BuildStorage`
+pub fn expand_genesis_build(def: &mut Def) -> proc_macro2::TokenStream {
+    let genesis_config = if let Some(genesis_config) = &def.genesis_config {
+        genesis_config
+    } else {
+        return Default::default();
+    };
+    let genesis_build = def.genesis_build.as_ref().expect("Checked by def parser");
+
+    let frame_support = &def.frame_support;
+    let type_impl_gen = &genesis_config
+        .gen_kind
+        .type_impl_gen(genesis_build.attr_span);
+    let gen_cfg_ident = &genesis_config.genesis_config;
+    let gen_cfg_use_gen = &genesis_config
+        .gen_kind
+        .type_use_gen(genesis_build.attr_span);
+
+    let where_clause = &genesis_build.where_clause;
+
+    quote::quote_spanned!(genesis_build.attr_span =>
+        #[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 #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/support/procedural-fork/src/pallet/expand/genesis_config.rs b/support/procedural-fork/src/pallet/expand/genesis_config.rs
new file mode 100644
index 000000000..e171e2468
--- /dev/null
+++ b/support/procedural-fork/src/pallet/expand/genesis_config.rs
@@ -0,0 +1,152 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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::{pallet::Def, COUNTER};
+use frame_support_procedural_tools::get_doc_literals;
+use quote::ToTokens;
+use syn::{spanned::Spanned, Ident};
+
+///
+/// * add various derive trait on GenesisConfig struct.
+pub fn expand_genesis_config(def: &mut Def) -> proc_macro2::TokenStream {
+    let count = COUNTER.with(|counter| counter.borrow_mut().inc());
+
+    let (genesis_config, def_macro_ident, std_macro_ident) = if let Some(genesis_config) =
+        &def.genesis_config
+    {
+        let def_macro_ident = Ident::new(
+            &format!("__is_genesis_config_defined_{}", count),
+            genesis_config.genesis_config.span(),
+        );
+
+        let std_macro_ident = Ident::new(
+            &format!("__is_std_macro_defined_for_genesis_{}", count),
+            genesis_config.genesis_config.span(),
+        );
+
+        (genesis_config, def_macro_ident, std_macro_ident)
+    } else {
+        let def_macro_ident = Ident::new(
+            &format!("__is_genesis_config_defined_{}", count),
+            def.item.span(),
+        );
+
+        let std_macro_ident = Ident::new(
+            &format!("__is_std_enabled_for_genesis_{}", count),
+            def.item.span(),
+        );
+
+        return quote::quote! {
+            #[doc(hidden)]
+            pub mod __substrate_genesis_config_check {
+                #[macro_export]
+                #[doc(hidden)]
+                macro_rules! #def_macro_ident {
+                    ($pallet_name:ident) => {
+                        compile_error!(concat!(
+                            "`",
+                            stringify!($pallet_name),
+                            "` does not have #[pallet::genesis_config] defined, perhaps you should \
+                            remove `Config` from construct_runtime?",
+                        ));
+                    }
+                }
+
+                #[macro_export]
+                #[doc(hidden)]
+                macro_rules! #std_macro_ident {
+                    ($pallet_name:ident, $pallet_path:expr) => {};
+                }
+
+                #[doc(hidden)]
+                pub use #def_macro_ident as is_genesis_config_defined;
+                #[doc(hidden)]
+                pub use #std_macro_ident as is_std_enabled_for_genesis;
+            }
+        };
+    };
+
+    let frame_support = &def.frame_support;
+
+    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.to_token_stream());
+
+    match genesis_config_item {
+        syn::Item::Enum(syn::ItemEnum { attrs, .. })
+        | syn::Item::Struct(syn::ItemStruct { attrs, .. })
+        | syn::Item::Type(syn::ItemType { attrs, .. }) => {
+            if get_doc_literals(attrs).is_empty() {
+                attrs.push(syn::parse_quote!(
+                    #[doc = r"
+					Can be used to configure the
+					[genesis state](https://docs.substrate.io/build/genesis-configuration/)
+					of this pallet.
+					"]
+                ));
+            }
+            attrs.push(syn::parse_quote!(
+                #[derive(#frame_support::Serialize, #frame_support::Deserialize)]
+            ));
+            attrs.push(syn::parse_quote!( #[serde(rename_all = "camelCase")] ));
+            attrs.push(syn::parse_quote!( #[serde(deny_unknown_fields)] ));
+            attrs.push(syn::parse_quote!( #[serde(bound(serialize = ""))] ));
+            attrs.push(syn::parse_quote!( #[serde(bound(deserialize = ""))] ));
+            attrs.push(syn::parse_quote!( #[serde(crate = #serde_crate)] ));
+        }
+        _ => unreachable!("Checked by genesis_config parser"),
+    }
+
+    quote::quote! {
+        #[doc(hidden)]
+        pub mod __substrate_genesis_config_check {
+            #[macro_export]
+            #[doc(hidden)]
+            macro_rules! #def_macro_ident {
+                ($pallet_name:ident) => {};
+            }
+
+            #[cfg(not(feature = "std"))]
+            #[macro_export]
+            #[doc(hidden)]
+            macro_rules! #std_macro_ident {
+                ($pallet_name:ident, $pallet_path:expr) => {
+                    compile_error!(concat!(
+                        "`",
+                        stringify!($pallet_name),
+                        "` does not have the std feature enabled, this will cause the `",
+                        $pallet_path,
+                        "::GenesisConfig` type to not implement serde traits."
+                    ));
+                };
+            }
+
+            #[cfg(feature = "std")]
+            #[macro_export]
+            #[doc(hidden)]
+            macro_rules! #std_macro_ident {
+                ($pallet_name:ident, $pallet_path:expr) => {};
+            }
+
+            #[doc(hidden)]
+            pub use #def_macro_ident as is_genesis_config_defined;
+            #[doc(hidden)]
+            pub use #std_macro_ident as is_std_enabled_for_genesis;
+        }
+    }
+}
diff --git a/support/procedural-fork/src/pallet/expand/hooks.rs b/support/procedural-fork/src/pallet/expand/hooks.rs
new file mode 100644
index 000000000..6967f4c08
--- /dev/null
+++ b/support/procedural-fork/src/pallet/expand/hooks.rs
@@ -0,0 +1,344 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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::pallet::Def;
+
+/// * implement the individual traits using the Hooks trait
+pub fn expand_hooks(def: &mut Def) -> proc_macro2::TokenStream {
+    let (where_clause, span, has_runtime_upgrade) = match def.hooks.as_ref() {
+        Some(hooks) => {
+            let where_clause = hooks.where_clause.clone();
+            let span = hooks.attr_span;
+            let has_runtime_upgrade = hooks.has_runtime_upgrade;
+            (where_clause, span, has_runtime_upgrade)
+        }
+        None => (
+            def.config.where_clause.clone(),
+            def.pallet_struct.attr_span,
+            false,
+        ),
+    };
+
+    let frame_support = &def.frame_support;
+    let type_impl_gen = &def.type_impl_generics(span);
+    let type_use_gen = &def.type_use_generics(span);
+    let pallet_ident = &def.pallet_struct.pallet;
+    let frame_system = &def.frame_system;
+    let pallet_name = quote::quote! {
+        <
+            <T as #frame_system::Config>::PalletInfo
+            as
+            #frame_support::traits::PalletInfo
+        >::name::<Self>().unwrap_or("<unknown pallet name>")
+    };
+
+    let initialize_on_chain_storage_version = if let Some(in_code_version) =
+        &def.pallet_struct.storage_version
+    {
+        quote::quote! {
+            #frame_support::__private::log::info!(
+                target: #frame_support::LOG_TARGET,
+                "🐥 New pallet {:?} detected in the runtime. Initializing the on-chain storage version to match the storage version defined in the pallet: {:?}",
+                #pallet_name,
+                #in_code_version
+            );
+            #in_code_version.put::<Self>();
+        }
+    } else {
+        quote::quote! {
+            let default_version = #frame_support::traits::StorageVersion::new(0);
+            #frame_support::__private::log::info!(
+                target: #frame_support::LOG_TARGET,
+                "🐥 New pallet {:?} detected in the runtime. The pallet has no defined storage version, so the on-chain version is being initialized to {:?}.",
+                #pallet_name,
+                default_version
+            );
+            default_version.put::<Self>();
+        }
+    };
+
+    let log_runtime_upgrade = if has_runtime_upgrade {
+        // a migration is defined here.
+        quote::quote! {
+            #frame_support::__private::log::info!(
+                target: #frame_support::LOG_TARGET,
+                "⚠️ {} declares internal migrations (which *might* execute). \
+                 On-chain `{:?}` vs in-code storage version `{:?}`",
+                #pallet_name,
+                <Self as #frame_support::traits::GetStorageVersion>::on_chain_storage_version(),
+                <Self as #frame_support::traits::GetStorageVersion>::in_code_storage_version(),
+            );
+        }
+    } else {
+        // default.
+        quote::quote! {
+            #frame_support::__private::log::debug!(
+                target: #frame_support::LOG_TARGET,
+                "✅ no migration for {}",
+                #pallet_name,
+            );
+        }
+    };
+
+    let hooks_impl = if def.hooks.is_none() {
+        let frame_system = &def.frame_system;
+        quote::quote! {
+            impl<#type_impl_gen>
+                #frame_support::traits::Hooks<#frame_system::pallet_prelude::BlockNumberFor::<T>>
+                for #pallet_ident<#type_use_gen> #where_clause {}
+        }
+    } else {
+        proc_macro2::TokenStream::new()
+    };
+
+    // If a storage version is set, we should ensure that the storage version on chain matches the
+    // in-code storage version. This assumes that `Executive` is running custom migrations before
+    // the pallets are called.
+    let post_storage_version_check = if def.pallet_struct.storage_version.is_some() {
+        quote::quote! {
+            let on_chain_version = <Self as #frame_support::traits::GetStorageVersion>::on_chain_storage_version();
+            let in_code_version = <Self as #frame_support::traits::GetStorageVersion>::in_code_storage_version();
+
+            if on_chain_version != in_code_version {
+                #frame_support::__private::log::error!(
+                    target: #frame_support::LOG_TARGET,
+                    "{}: On chain storage version {:?} doesn't match in-code storage version {:?}.",
+                    #pallet_name,
+                    on_chain_version,
+                    in_code_version,
+                );
+
+                return Err("On chain and in-code storage version do not match. Missing runtime upgrade?".into());
+            }
+        }
+    } else {
+        quote::quote! {
+            let on_chain_version = <Self as #frame_support::traits::GetStorageVersion>::on_chain_storage_version();
+
+            if on_chain_version != #frame_support::traits::StorageVersion::new(0) {
+                #frame_support::__private::log::error!(
+                    target: #frame_support::LOG_TARGET,
+                    "{}: On chain storage version {:?} is set to non zero, \
+                     while the pallet is missing the `#[pallet::storage_version(VERSION)]` attribute.",
+                    #pallet_name,
+                    on_chain_version,
+                );
+
+                return Err("On chain storage version set, while the pallet doesn't \
+                            have the `#[pallet::storage_version(VERSION)]` attribute.".into());
+            }
+        }
+    };
+
+    quote::quote_spanned!(span =>
+        #hooks_impl
+
+        impl<#type_impl_gen>
+            #frame_support::traits::OnFinalize<#frame_system::pallet_prelude::BlockNumberFor::<T>>
+            for #pallet_ident<#type_use_gen> #where_clause
+        {
+            fn on_finalize(n: #frame_system::pallet_prelude::BlockNumberFor::<T>) {
+                #frame_support::__private::sp_tracing::enter_span!(
+                    #frame_support::__private::sp_tracing::trace_span!("on_finalize")
+                );
+                <
+                    Self as #frame_support::traits::Hooks<
+                        #frame_system::pallet_prelude::BlockNumberFor::<T>
+                    >
+                >::on_finalize(n)
+            }
+        }
+
+        impl<#type_impl_gen>
+            #frame_support::traits::OnIdle<#frame_system::pallet_prelude::BlockNumberFor::<T>>
+            for #pallet_ident<#type_use_gen> #where_clause
+        {
+            fn on_idle(
+                n: #frame_system::pallet_prelude::BlockNumberFor::<T>,
+                remaining_weight: #frame_support::weights::Weight
+            ) -> #frame_support::weights::Weight {
+                <
+                    Self as #frame_support::traits::Hooks<
+                        #frame_system::pallet_prelude::BlockNumberFor::<T>
+                    >
+                >::on_idle(n, remaining_weight)
+            }
+        }
+
+        impl<#type_impl_gen>
+            #frame_support::traits::OnPoll<#frame_system::pallet_prelude::BlockNumberFor::<T>>
+            for #pallet_ident<#type_use_gen> #where_clause
+        {
+            fn on_poll(
+                n: #frame_system::pallet_prelude::BlockNumberFor::<T>,
+                weight: &mut #frame_support::weights::WeightMeter
+            ) {
+                <
+                    Self as #frame_support::traits::Hooks<
+                        #frame_system::pallet_prelude::BlockNumberFor::<T>
+                    >
+                >::on_poll(n, weight);
+            }
+        }
+
+        impl<#type_impl_gen>
+            #frame_support::traits::OnInitialize<#frame_system::pallet_prelude::BlockNumberFor::<T>>
+            for #pallet_ident<#type_use_gen> #where_clause
+        {
+            fn on_initialize(
+                n: #frame_system::pallet_prelude::BlockNumberFor::<T>
+            ) -> #frame_support::weights::Weight {
+                #frame_support::__private::sp_tracing::enter_span!(
+                    #frame_support::__private::sp_tracing::trace_span!("on_initialize")
+                );
+                <
+                    Self as #frame_support::traits::Hooks<
+                        #frame_system::pallet_prelude::BlockNumberFor::<T>
+                    >
+                >::on_initialize(n)
+            }
+        }
+
+        impl<#type_impl_gen>
+            #frame_support::traits::BeforeAllRuntimeMigrations
+            for #pallet_ident<#type_use_gen> #where_clause
+        {
+            fn before_all_runtime_migrations() -> #frame_support::weights::Weight {
+                use #frame_support::traits::{Get, PalletInfoAccess};
+                use #frame_support::__private::hashing::twox_128;
+                use #frame_support::storage::unhashed::contains_prefixed_key;
+                #frame_support::__private::sp_tracing::enter_span!(
+                    #frame_support::__private::sp_tracing::trace_span!("before_all")
+                );
+
+                // Check if the pallet has any keys set, including the storage version. If there are
+                // no keys set, the pallet was just added to the runtime and needs to have its
+                // version initialized.
+                let pallet_hashed_prefix = <Self as PalletInfoAccess>::name_hash();
+                let exists = contains_prefixed_key(&pallet_hashed_prefix);
+                if !exists {
+                    #initialize_on_chain_storage_version
+                    <T as #frame_system::Config>::DbWeight::get().reads_writes(1, 1)
+                } else {
+                    <T as #frame_system::Config>::DbWeight::get().reads(1)
+                }
+            }
+        }
+
+        impl<#type_impl_gen>
+            #frame_support::traits::OnRuntimeUpgrade
+            for #pallet_ident<#type_use_gen> #where_clause
+        {
+            fn on_runtime_upgrade() -> #frame_support::weights::Weight {
+                #frame_support::__private::sp_tracing::enter_span!(
+                    #frame_support::__private::sp_tracing::trace_span!("on_runtime_update")
+                );
+
+                // log info about the upgrade.
+                #log_runtime_upgrade
+
+                <
+                    Self as #frame_support::traits::Hooks<
+                        #frame_system::pallet_prelude::BlockNumberFor::<T>
+                    >
+                >::on_runtime_upgrade()
+            }
+
+            #[cfg(feature = "try-runtime")]
+            fn pre_upgrade() -> Result<#frame_support::__private::sp_std::vec::Vec<u8>, #frame_support::sp_runtime::TryRuntimeError> {
+                <
+                    Self
+                    as
+                    #frame_support::traits::Hooks<#frame_system::pallet_prelude::BlockNumberFor::<T>>
+                >::pre_upgrade()
+            }
+
+            #[cfg(feature = "try-runtime")]
+            fn post_upgrade(state: #frame_support::__private::sp_std::vec::Vec<u8>) -> Result<(), #frame_support::sp_runtime::TryRuntimeError> {
+                #post_storage_version_check
+
+                <
+                    Self
+                    as
+                    #frame_support::traits::Hooks<#frame_system::pallet_prelude::BlockNumberFor::<T>>
+                >::post_upgrade(state)
+            }
+        }
+
+        impl<#type_impl_gen>
+            #frame_support::traits::OffchainWorker<#frame_system::pallet_prelude::BlockNumberFor::<T>>
+            for #pallet_ident<#type_use_gen> #where_clause
+        {
+            fn offchain_worker(n: #frame_system::pallet_prelude::BlockNumberFor::<T>) {
+                <
+                    Self as #frame_support::traits::Hooks<
+                        #frame_system::pallet_prelude::BlockNumberFor::<T>
+                    >
+                >::offchain_worker(n)
+            }
+        }
+
+        // Integrity tests are only required for when `std` is enabled.
+        #frame_support::std_enabled! {
+            impl<#type_impl_gen>
+                #frame_support::traits::IntegrityTest
+            for #pallet_ident<#type_use_gen> #where_clause
+            {
+                fn integrity_test() {
+                    #frame_support::__private::sp_io::TestExternalities::default().execute_with(|| {
+                        <
+                            Self as #frame_support::traits::Hooks<
+                                #frame_system::pallet_prelude::BlockNumberFor::<T>
+                            >
+                        >::integrity_test()
+                    });
+                }
+            }
+        }
+
+        #[cfg(feature = "try-runtime")]
+        impl<#type_impl_gen>
+            #frame_support::traits::TryState<#frame_system::pallet_prelude::BlockNumberFor::<T>>
+            for #pallet_ident<#type_use_gen> #where_clause
+        {
+            fn try_state(
+                n: #frame_system::pallet_prelude::BlockNumberFor::<T>,
+                _s: #frame_support::traits::TryStateSelect
+            ) -> Result<(), #frame_support::sp_runtime::TryRuntimeError> {
+                #frame_support::__private::log::info!(
+                    target: #frame_support::LOG_TARGET,
+                    "🩺 Running {:?} try-state checks",
+                    #pallet_name,
+                );
+                <
+                    Self as #frame_support::traits::Hooks<
+                        #frame_system::pallet_prelude::BlockNumberFor::<T>
+                    >
+                >::try_state(n).map_err(|err| {
+                    #frame_support::__private::log::error!(
+                        target: #frame_support::LOG_TARGET,
+                        "❌ {:?} try_state checks failed: {:?}",
+                        #pallet_name,
+                        err
+                    );
+
+                    err
+                })
+            }
+        }
+    )
+}
diff --git a/support/procedural-fork/src/pallet/expand/inherent.rs b/support/procedural-fork/src/pallet/expand/inherent.rs
new file mode 100644
index 000000000..0a80d672a
--- /dev/null
+++ b/support/procedural-fork/src/pallet/expand/inherent.rs
@@ -0,0 +1,58 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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::{pallet::Def, COUNTER};
+use proc_macro2::TokenStream;
+use quote::quote;
+use syn::{spanned::Spanned, Ident};
+
+pub fn expand_inherents(def: &mut Def) -> TokenStream {
+    let count = COUNTER.with(|counter| counter.borrow_mut().inc());
+    let macro_ident = Ident::new(
+        &format!("__is_inherent_part_defined_{}", count),
+        def.item.span(),
+    );
+
+    let maybe_compile_error = if def.inherent.is_none() {
+        quote! {
+            compile_error!(concat!(
+                "`",
+                stringify!($pallet_name),
+                "` does not have #[pallet::inherent] defined, perhaps you should \
+                remove `Inherent` from construct_runtime?",
+            ));
+        }
+    } else {
+        TokenStream::new()
+    };
+
+    quote! {
+        #[doc(hidden)]
+        pub mod __substrate_inherent_check {
+            #[macro_export]
+            #[doc(hidden)]
+            macro_rules! #macro_ident {
+                ($pallet_name:ident) => {
+                    #maybe_compile_error
+                }
+            }
+
+            #[doc(hidden)]
+            pub use #macro_ident as is_inherent_part_defined;
+        }
+    }
+}
diff --git a/support/procedural-fork/src/pallet/expand/instances.rs b/support/procedural-fork/src/pallet/expand/instances.rs
new file mode 100644
index 000000000..12423409c
--- /dev/null
+++ b/support/procedural-fork/src/pallet/expand/instances.rs
@@ -0,0 +1,43 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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::{pallet::Def, NUMBER_OF_INSTANCE};
+use proc_macro2::Span;
+
+///
+/// * Provide inherent instance to be used by construct_runtime
+/// * Provide Instance1 ..= Instance16 for instantiable pallet
+pub fn expand_instances(def: &mut Def) -> proc_macro2::TokenStream {
+    let frame_support = &def.frame_support;
+    let inherent_ident = syn::Ident::new(crate::INHERENT_INSTANCE_NAME, Span::call_site());
+    let instances = if def.config.has_instance {
+        (1..=NUMBER_OF_INSTANCE)
+            .map(|i| syn::Ident::new(&format!("Instance{}", i), Span::call_site()))
+            .collect()
+    } else {
+        vec![]
+    };
+
+    quote::quote!(
+        /// Hidden instance generated to be internally used when module is used without
+        /// instance.
+        #[doc(hidden)]
+        pub type #inherent_ident = ();
+
+        #( pub use #frame_support::instances::#instances; )*
+    )
+}
diff --git a/support/procedural-fork/src/pallet/expand/mod.rs b/support/procedural-fork/src/pallet/expand/mod.rs
new file mode 100644
index 000000000..ff4423f85
--- /dev/null
+++ b/support/procedural-fork/src/pallet/expand/mod.rs
@@ -0,0 +1,130 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 call;
+mod composite;
+mod config;
+mod constants;
+mod doc_only;
+mod documentation;
+mod error;
+mod event;
+mod genesis_build;
+mod genesis_config;
+mod hooks;
+mod inherent;
+mod instances;
+mod origin;
+mod pallet_struct;
+mod storage;
+mod tasks;
+mod tt_default_parts;
+mod type_value;
+mod validate_unsigned;
+mod warnings;
+
+use crate::pallet::Def;
+use quote::ToTokens;
+
+/// Merge where clause together, `where` token span is taken from the first not none one.
+pub fn merge_where_clauses(clauses: &[&Option<syn::WhereClause>]) -> Option<syn::WhereClause> {
+    let mut clauses = clauses.iter().filter_map(|f| f.as_ref());
+    let mut res = clauses.next()?.clone();
+    for other in clauses {
+        res.predicates.extend(other.predicates.iter().cloned())
+    }
+    Some(res)
+}
+
+/// Expand definition, in particular:
+/// * add some bounds and variants to type defined,
+/// * create some new types,
+/// * impl stuff on them.
+pub fn expand(mut def: Def) -> proc_macro2::TokenStream {
+    // Remove the `pallet_doc` attribute first.
+    let metadata_docs = documentation::expand_documentation(&mut def);
+    let constants = constants::expand_constants(&mut def);
+    let pallet_struct = pallet_struct::expand_pallet_struct(&mut def);
+    let config = config::expand_config(&mut def);
+    let call = call::expand_call(&mut def);
+    let tasks = tasks::expand_tasks(&mut def);
+    let error = error::expand_error(&mut def);
+    let event = event::expand_event(&mut def);
+    let storages = storage::expand_storages(&mut def);
+    let inherents = inherent::expand_inherents(&mut def);
+    let instances = instances::expand_instances(&mut def);
+    let hooks = hooks::expand_hooks(&mut def);
+    let genesis_build = genesis_build::expand_genesis_build(&mut def);
+    let genesis_config = genesis_config::expand_genesis_config(&mut def);
+    let type_values = type_value::expand_type_values(&mut def);
+    let origins = origin::expand_origins(&mut def);
+    let validate_unsigned = validate_unsigned::expand_validate_unsigned(&mut def);
+    let tt_default_parts = tt_default_parts::expand_tt_default_parts(&mut def);
+    let doc_only = doc_only::expand_doc_only(&mut def);
+    let composites = composite::expand_composites(&mut def);
+
+    def.item.attrs.insert(
+        0,
+        syn::parse_quote!(
+            #[doc = r"The `pallet` module in each FRAME pallet hosts the most important items needed
+to construct this pallet.
+
+The main components of this pallet are:
+- [`Pallet`], which implements all of the dispatchable extrinsics of the pallet, among
+other public functions.
+	- The subset of the functions that are dispatchable can be identified either in the
+	[`dispatchables`] module or in the [`Call`] enum.
+- [`storage_types`], which contains the list of all types that are representing a
+storage item. Otherwise, all storage items are listed among [*Type Definitions*](#types).
+- [`Config`], which contains the configuration trait of this pallet.
+- [`Event`] and [`Error`], which are listed among the [*Enums*](#enums).
+		"]
+        ),
+    );
+
+    let new_items = quote::quote!(
+        #metadata_docs
+        #constants
+        #pallet_struct
+        #config
+        #call
+        #tasks
+        #error
+        #event
+        #storages
+        #inherents
+        #instances
+        #hooks
+        #genesis_build
+        #genesis_config
+        #type_values
+        #origins
+        #validate_unsigned
+        #tt_default_parts
+        #doc_only
+        #composites
+    );
+
+    def.item
+        .content
+        .as_mut()
+        .expect("This is checked by parsing")
+        .1
+        .push(syn::Item::Verbatim(new_items));
+
+    def.item.into_token_stream()
+}
diff --git a/support/procedural-fork/src/pallet/expand/origin.rs b/support/procedural-fork/src/pallet/expand/origin.rs
new file mode 100644
index 000000000..167445ad6
--- /dev/null
+++ b/support/procedural-fork/src/pallet/expand/origin.rs
@@ -0,0 +1,58 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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::{pallet::Def, COUNTER};
+use proc_macro2::TokenStream;
+use quote::quote;
+use syn::{spanned::Spanned, Ident};
+
+pub fn expand_origins(def: &mut Def) -> TokenStream {
+    let count = COUNTER.with(|counter| counter.borrow_mut().inc());
+    let macro_ident = Ident::new(
+        &format!("__is_origin_part_defined_{}", count),
+        def.item.span(),
+    );
+
+    let maybe_compile_error = if def.origin.is_none() {
+        quote! {
+            compile_error!(concat!(
+                "`",
+                stringify!($pallet_name),
+                "` does not have #[pallet::origin] defined, perhaps you should \
+                remove `Origin` from construct_runtime?",
+            ));
+        }
+    } else {
+        TokenStream::new()
+    };
+
+    quote! {
+        #[doc(hidden)]
+        pub mod __substrate_origin_check {
+            #[macro_export]
+            #[doc(hidden)]
+            macro_rules! #macro_ident {
+                ($pallet_name:ident) => {
+                    #maybe_compile_error
+                }
+            }
+
+            #[doc(hidden)]
+            pub use #macro_ident as is_origin_part_defined;
+        }
+    }
+}
diff --git a/support/procedural-fork/src/pallet/expand/pallet_struct.rs b/support/procedural-fork/src/pallet/expand/pallet_struct.rs
new file mode 100644
index 000000000..c5def65ed
--- /dev/null
+++ b/support/procedural-fork/src/pallet/expand/pallet_struct.rs
@@ -0,0 +1,302 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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::pallet::{expand::merge_where_clauses, Def};
+use frame_support_procedural_tools::get_doc_literals;
+
+///
+/// * Add derive trait on Pallet
+/// * Implement GetStorageVersion on Pallet
+/// * Implement OnGenesis on Pallet
+/// * Implement `fn error_metadata` on Pallet
+/// * declare Module type alias for construct_runtime
+/// * replace the first field type of `struct Pallet` with `PhantomData` if it is `_`
+/// * implementation of `PalletInfoAccess` information
+/// * implementation of `StorageInfoTrait` on Pallet
+pub fn expand_pallet_struct(def: &mut Def) -> proc_macro2::TokenStream {
+    let frame_support = &def.frame_support;
+    let frame_system = &def.frame_system;
+    let type_impl_gen = &def.type_impl_generics(def.pallet_struct.attr_span);
+    let type_use_gen = &def.type_use_generics(def.pallet_struct.attr_span);
+    let type_decl_gen = &def.type_decl_generics(def.pallet_struct.attr_span);
+    let pallet_ident = &def.pallet_struct.pallet;
+    let config_where_clause = &def.config.where_clause;
+
+    let mut storages_where_clauses = vec![&def.config.where_clause];
+    storages_where_clauses.extend(def.storages.iter().map(|storage| &storage.where_clause));
+    let storages_where_clauses = merge_where_clauses(&storages_where_clauses);
+
+    let pallet_item = {
+        let pallet_module_items = &mut def.item.content.as_mut().expect("Checked by def").1;
+        let item = &mut pallet_module_items[def.pallet_struct.index];
+        if let syn::Item::Struct(item) = item {
+            item
+        } else {
+            unreachable!("Checked by pallet struct parser")
+        }
+    };
+
+    // If the first field type is `_` then we replace with `PhantomData`
+    if let Some(field) = pallet_item.fields.iter_mut().next() {
+        if field.ty == syn::parse_quote!(_) {
+            field.ty = syn::parse_quote!(
+                #frame_support::__private::sp_std::marker::PhantomData<(#type_use_gen)>
+            );
+        }
+    }
+
+    if get_doc_literals(&pallet_item.attrs).is_empty() {
+        pallet_item.attrs.push(syn::parse_quote!(
+            #[doc = r"
+				The `Pallet` struct, the main type that implements traits and standalone
+				functions within the pallet.
+			"]
+        ));
+    }
+
+    pallet_item.attrs.push(syn::parse_quote!(
+        #[derive(
+            #frame_support::CloneNoBound,
+            #frame_support::EqNoBound,
+            #frame_support::PartialEqNoBound,
+            #frame_support::RuntimeDebugNoBound,
+        )]
+    ));
+
+    let pallet_error_metadata = if let Some(error_def) = &def.error {
+        let error_ident = &error_def.error;
+        quote::quote_spanned!(def.pallet_struct.attr_span =>
+            impl<#type_impl_gen> #pallet_ident<#type_use_gen> #config_where_clause {
+                #[doc(hidden)]
+                pub fn error_metadata() -> Option<#frame_support::__private::metadata_ir::PalletErrorMetadataIR> {
+                    Some(#frame_support::__private::metadata_ir::PalletErrorMetadataIR {
+                        ty: #frame_support::__private::scale_info::meta_type::<#error_ident<#type_use_gen>>()
+                    })
+                }
+            }
+        )
+    } else {
+        quote::quote_spanned!(def.pallet_struct.attr_span =>
+            impl<#type_impl_gen> #pallet_ident<#type_use_gen> #config_where_clause {
+                #[doc(hidden)]
+                pub fn error_metadata() -> Option<#frame_support::__private::metadata_ir::PalletErrorMetadataIR> {
+                    None
+                }
+            }
+        )
+    };
+
+    let storage_info_span = def
+        .pallet_struct
+        .without_storage_info
+        .unwrap_or(def.pallet_struct.attr_span);
+
+    let storage_names = &def
+        .storages
+        .iter()
+        .map(|storage| &storage.ident)
+        .collect::<Vec<_>>();
+    let storage_cfg_attrs = &def
+        .storages
+        .iter()
+        .map(|storage| &storage.cfg_attrs)
+        .collect::<Vec<_>>();
+
+    // Depending on the flag `without_storage_info` and the storage attribute `unbounded`, we use
+    // partial or full storage info from storage.
+    let storage_info_traits = &def
+        .storages
+        .iter()
+        .map(|storage| {
+            if storage.unbounded || def.pallet_struct.without_storage_info.is_some() {
+                quote::quote_spanned!(storage_info_span => PartialStorageInfoTrait)
+            } else {
+                quote::quote_spanned!(storage_info_span => StorageInfoTrait)
+            }
+        })
+        .collect::<Vec<_>>();
+
+    let storage_info_methods = &def
+        .storages
+        .iter()
+        .map(|storage| {
+            if storage.unbounded || def.pallet_struct.without_storage_info.is_some() {
+                quote::quote_spanned!(storage_info_span => partial_storage_info)
+            } else {
+                quote::quote_spanned!(storage_info_span => storage_info)
+            }
+        })
+        .collect::<Vec<_>>();
+
+    let storage_info = quote::quote_spanned!(storage_info_span =>
+        impl<#type_impl_gen> #frame_support::traits::StorageInfoTrait
+            for #pallet_ident<#type_use_gen>
+            #storages_where_clauses
+        {
+            fn storage_info()
+                -> #frame_support::__private::sp_std::vec::Vec<#frame_support::traits::StorageInfo>
+            {
+                #[allow(unused_mut)]
+                let mut res = #frame_support::__private::sp_std::vec![];
+
+                #(
+                    #(#storage_cfg_attrs)*
+                    {
+                        let mut storage_info = <
+                            #storage_names<#type_use_gen>
+                            as #frame_support::traits::#storage_info_traits
+                        >::#storage_info_methods();
+                        res.append(&mut storage_info);
+                    }
+                )*
+
+                res
+            }
+        }
+    );
+
+    let (storage_version, in_code_storage_version_ty) =
+        if let Some(v) = def.pallet_struct.storage_version.as_ref() {
+            (
+                quote::quote! { #v },
+                quote::quote! { #frame_support::traits::StorageVersion },
+            )
+        } else {
+            (
+                quote::quote! { core::default::Default::default() },
+                quote::quote! { #frame_support::traits::NoStorageVersionSet },
+            )
+        };
+
+    let whitelisted_storage_idents: Vec<syn::Ident> = def
+        .storages
+        .iter()
+        .filter_map(|s| s.whitelisted.then_some(s.ident.clone()))
+        .collect();
+
+    let whitelisted_storage_keys_impl = quote::quote![
+        use #frame_support::traits::{StorageInfoTrait, TrackedStorageKey, WhitelistedStorageKeys};
+        impl<#type_impl_gen> WhitelistedStorageKeys for #pallet_ident<#type_use_gen> #storages_where_clauses {
+            fn whitelisted_storage_keys() -> #frame_support::__private::sp_std::vec::Vec<TrackedStorageKey> {
+                use #frame_support::__private::sp_std::vec;
+                vec![#(
+                    TrackedStorageKey::new(#whitelisted_storage_idents::<#type_use_gen>::hashed_key().to_vec())
+                ),*]
+            }
+        }
+    ];
+
+    quote::quote_spanned!(def.pallet_struct.attr_span =>
+        #pallet_error_metadata
+
+        /// Type alias to `Pallet`, to be used by `construct_runtime`.
+        ///
+        /// Generated by `pallet` attribute macro.
+        #[deprecated(note = "use `Pallet` instead")]
+        #[allow(dead_code)]
+        pub type Module<#type_decl_gen> = #pallet_ident<#type_use_gen>;
+
+        // Implement `GetStorageVersion` for `Pallet`
+        impl<#type_impl_gen> #frame_support::traits::GetStorageVersion
+            for #pallet_ident<#type_use_gen>
+            #config_where_clause
+        {
+            type InCodeStorageVersion = #in_code_storage_version_ty;
+
+            fn in_code_storage_version() -> Self::InCodeStorageVersion {
+                #storage_version
+            }
+
+            fn on_chain_storage_version() -> #frame_support::traits::StorageVersion {
+                #frame_support::traits::StorageVersion::get::<Self>()
+            }
+        }
+
+        // Implement `OnGenesis` for `Pallet`
+        impl<#type_impl_gen> #frame_support::traits::OnGenesis
+            for #pallet_ident<#type_use_gen>
+            #config_where_clause
+        {
+            fn on_genesis() {
+                let storage_version: #frame_support::traits::StorageVersion = #storage_version;
+                storage_version.put::<Self>();
+            }
+        }
+
+        // Implement `PalletInfoAccess` for `Pallet`
+        impl<#type_impl_gen> #frame_support::traits::PalletInfoAccess
+            for #pallet_ident<#type_use_gen>
+            #config_where_clause
+        {
+            fn index() -> usize {
+                <
+                    <T as #frame_system::Config>::PalletInfo as #frame_support::traits::PalletInfo
+                >::index::<Self>()
+                    .expect("Pallet is part of the runtime because pallet `Config` trait is \
+                        implemented by the runtime")
+            }
+
+            fn name() -> &'static str {
+                <
+                    <T as #frame_system::Config>::PalletInfo as #frame_support::traits::PalletInfo
+                >::name::<Self>()
+                    .expect("Pallet is part of the runtime because pallet `Config` trait is \
+                        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
+                >::module_name::<Self>()
+                    .expect("Pallet is part of the runtime because pallet `Config` trait is \
+                        implemented by the runtime")
+            }
+
+            fn crate_version() -> #frame_support::traits::CrateVersion {
+                #frame_support::crate_to_crate_version!()
+            }
+        }
+
+        impl<#type_impl_gen> #frame_support::traits::PalletsInfoAccess
+            for #pallet_ident<#type_use_gen>
+            #config_where_clause
+        {
+            fn count() -> usize { 1 }
+            fn infos() -> #frame_support::__private::sp_std::vec::Vec<#frame_support::traits::PalletInfoData> {
+                use #frame_support::traits::PalletInfoAccess;
+                let item = #frame_support::traits::PalletInfoData {
+                    index: Self::index(),
+                    name: Self::name(),
+                    module_name: Self::module_name(),
+                    crate_version: Self::crate_version(),
+                };
+                #frame_support::__private::sp_std::vec![item]
+            }
+        }
+
+        #storage_info
+        #whitelisted_storage_keys_impl
+    )
+}
diff --git a/support/procedural-fork/src/pallet/expand/storage.rs b/support/procedural-fork/src/pallet/expand/storage.rs
new file mode 100644
index 000000000..b77e9846b
--- /dev/null
+++ b/support/procedural-fork/src/pallet/expand/storage.rs
@@ -0,0 +1,956 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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_prefix,
+    pallet::{
+        parse::{
+            helper::two128_str,
+            storage::{Metadata, QueryKind, StorageDef, StorageGenerics},
+        },
+        Def,
+    },
+};
+use quote::ToTokens;
+use std::{collections::HashMap, ops::IndexMut};
+use syn::spanned::Spanned;
+
+/// Generate the prefix_ident related to the storage.
+/// prefix_ident is used for the prefix struct to be given to storage as first generic param.
+fn prefix_ident(storage: &StorageDef) -> syn::Ident {
+    let storage_ident = &storage.ident;
+    syn::Ident::new(
+        &format!("_GeneratedPrefixForStorage{}", storage_ident),
+        storage_ident.span(),
+    )
+}
+
+/// Generate the counter_prefix_ident related to the storage.
+/// counter_prefix_ident is used for the prefix struct to be given to counted storage map.
+fn counter_prefix_ident(storage_ident: &syn::Ident) -> syn::Ident {
+    syn::Ident::new(
+        &format!("_GeneratedCounterPrefixForStorage{}", storage_ident),
+        storage_ident.span(),
+    )
+}
+
+/// Check for duplicated storage prefixes. This step is necessary since users can specify an
+/// alternative storage prefix using the #[pallet::storage_prefix] syntax, and we need to ensure
+/// that the prefix specified by the user is not a duplicate of an existing one.
+fn check_prefix_duplicates(
+    storage_def: &StorageDef,
+    // A hashmap of all already used prefix and their associated error if duplication
+    used_prefixes: &mut HashMap<String, syn::Error>,
+) -> syn::Result<()> {
+    let prefix = storage_def.prefix();
+    let dup_err = syn::Error::new(
+        storage_def.prefix_span(),
+        format!("Duplicate storage prefixes found for `{}`", prefix),
+    );
+
+    if let Some(other_dup_err) = used_prefixes.insert(prefix.clone(), dup_err.clone()) {
+        let mut err = dup_err;
+        err.combine(other_dup_err);
+        return Err(err);
+    }
+
+    if let Metadata::CountedMap { .. } = storage_def.metadata {
+        let counter_prefix = counter_prefix(&prefix);
+        let counter_dup_err = syn::Error::new(
+            storage_def.prefix_span(),
+            format!(
+                "Duplicate storage prefixes found for `{}`, used for counter associated to \
+				counted storage map",
+                counter_prefix,
+            ),
+        );
+
+        if let Some(other_dup_err) = used_prefixes.insert(counter_prefix, counter_dup_err.clone()) {
+            let mut err = counter_dup_err;
+            err.combine(other_dup_err);
+            return Err(err);
+        }
+    }
+
+    Ok(())
+}
+
+pub struct ResultOnEmptyStructMetadata {
+    /// The Rust ident that is going to be used as the name of the OnEmpty struct.
+    pub name: syn::Ident,
+    /// The path to the error type being returned by the ResultQuery.
+    pub error_path: syn::Path,
+    /// The visibility of the OnEmpty struct.
+    pub visibility: syn::Visibility,
+    /// The type of the storage item.
+    pub value_ty: syn::Type,
+    /// The name of the pallet error enum variant that is going to be returned.
+    pub variant_name: syn::Ident,
+    /// The span used to report compilation errors about the OnEmpty struct.
+    pub span: proc_macro2::Span,
+}
+
+///
+/// * if generics are unnamed: replace the first generic `_` by the generated prefix structure
+/// * if generics are named: reorder the generic, remove their name, and add the missing ones.
+/// * Add `#[allow(type_alias_bounds)]`
+pub fn process_generics(def: &mut Def) -> syn::Result<Vec<ResultOnEmptyStructMetadata>> {
+    let frame_support = &def.frame_support;
+    let mut on_empty_struct_metadata = Vec::new();
+
+    for storage_def in def.storages.iter_mut() {
+        let item = &mut def.item.content.as_mut().expect("Checked by def").1[storage_def.index];
+
+        let typ_item = match item {
+            syn::Item::Type(t) => t,
+            _ => unreachable!("Checked by def"),
+        };
+
+        typ_item
+            .attrs
+            .push(syn::parse_quote!(#[allow(type_alias_bounds)]));
+
+        let typ_path = match &mut *typ_item.ty {
+            syn::Type::Path(p) => p,
+            _ => unreachable!("Checked by def"),
+        };
+
+        let args = match &mut typ_path.path.segments[0].arguments {
+            syn::PathArguments::AngleBracketed(args) => args,
+            _ => unreachable!("Checked by def"),
+        };
+
+        let prefix_ident = prefix_ident(storage_def);
+        let type_use_gen = if def.config.has_instance {
+            quote::quote_spanned!(storage_def.attr_span => T, I)
+        } else {
+            quote::quote_spanned!(storage_def.attr_span => T)
+        };
+
+        let default_query_kind: syn::Type =
+            syn::parse_quote!(#frame_support::storage::types::OptionQuery);
+        let mut default_on_empty = |value_ty: syn::Type| -> syn::Type {
+            if let Some(QueryKind::ResultQuery(error_path, variant_name)) =
+                storage_def.query_kind.as_ref()
+            {
+                let on_empty_ident =
+                    quote::format_ident!("__Frame_Internal_Get{}Result", storage_def.ident);
+                on_empty_struct_metadata.push(ResultOnEmptyStructMetadata {
+                    name: on_empty_ident.clone(),
+                    visibility: storage_def.vis.clone(),
+                    value_ty,
+                    error_path: error_path.clone(),
+                    variant_name: variant_name.clone(),
+                    span: storage_def.attr_span,
+                });
+                return syn::parse_quote!(#on_empty_ident);
+            }
+            syn::parse_quote!(#frame_support::traits::GetDefault)
+        };
+        let default_max_values: syn::Type = syn::parse_quote!(#frame_support::traits::GetDefault);
+
+        let set_result_query_type_parameter = |query_type: &mut syn::Type| -> syn::Result<()> {
+            if let Some(QueryKind::ResultQuery(error_path, _)) = storage_def.query_kind.as_ref() {
+                if let syn::Type::Path(syn::TypePath {
+                    path: syn::Path { segments, .. },
+                    ..
+                }) = query_type
+                {
+                    if let Some(seg) = segments.last_mut() {
+                        if let syn::PathArguments::AngleBracketed(
+                            syn::AngleBracketedGenericArguments { args, .. },
+                        ) = &mut seg.arguments
+                        {
+                            args.clear();
+                            args.push(syn::GenericArgument::Type(syn::parse_quote!(#error_path)));
+                        }
+                    }
+                } else {
+                    let msg = format!(
+                        "Invalid pallet::storage, unexpected type for query, expected ResultQuery \
+						with 1 type parameter, found `{}`",
+                        query_type.to_token_stream().to_string()
+                    );
+                    return Err(syn::Error::new(query_type.span(), msg));
+                }
+            }
+            Ok(())
+        };
+
+        if let Some(named_generics) = storage_def.named_generics.clone() {
+            args.args.clear();
+            args.args
+                .push(syn::parse_quote!( #prefix_ident<#type_use_gen> ));
+            match named_generics {
+                StorageGenerics::Value {
+                    value,
+                    query_kind,
+                    on_empty,
+                } => {
+                    args.args.push(syn::GenericArgument::Type(value.clone()));
+                    let mut query_kind = query_kind.unwrap_or_else(|| default_query_kind.clone());
+                    set_result_query_type_parameter(&mut query_kind)?;
+                    args.args.push(syn::GenericArgument::Type(query_kind));
+                    let on_empty = on_empty.unwrap_or_else(|| default_on_empty(value));
+                    args.args.push(syn::GenericArgument::Type(on_empty));
+                }
+                StorageGenerics::Map {
+                    hasher,
+                    key,
+                    value,
+                    query_kind,
+                    on_empty,
+                    max_values,
+                }
+                | StorageGenerics::CountedMap {
+                    hasher,
+                    key,
+                    value,
+                    query_kind,
+                    on_empty,
+                    max_values,
+                } => {
+                    args.args.push(syn::GenericArgument::Type(hasher));
+                    args.args.push(syn::GenericArgument::Type(key));
+                    args.args.push(syn::GenericArgument::Type(value.clone()));
+                    let mut query_kind = query_kind.unwrap_or_else(|| default_query_kind.clone());
+                    set_result_query_type_parameter(&mut query_kind)?;
+                    args.args.push(syn::GenericArgument::Type(query_kind));
+                    let on_empty = on_empty.unwrap_or_else(|| default_on_empty(value));
+                    args.args.push(syn::GenericArgument::Type(on_empty));
+                    let max_values = max_values.unwrap_or_else(|| default_max_values.clone());
+                    args.args.push(syn::GenericArgument::Type(max_values));
+                }
+                StorageGenerics::DoubleMap {
+                    hasher1,
+                    key1,
+                    hasher2,
+                    key2,
+                    value,
+                    query_kind,
+                    on_empty,
+                    max_values,
+                } => {
+                    args.args.push(syn::GenericArgument::Type(hasher1));
+                    args.args.push(syn::GenericArgument::Type(key1));
+                    args.args.push(syn::GenericArgument::Type(hasher2));
+                    args.args.push(syn::GenericArgument::Type(key2));
+                    args.args.push(syn::GenericArgument::Type(value.clone()));
+                    let mut query_kind = query_kind.unwrap_or_else(|| default_query_kind.clone());
+                    set_result_query_type_parameter(&mut query_kind)?;
+                    args.args.push(syn::GenericArgument::Type(query_kind));
+                    let on_empty = on_empty.unwrap_or_else(|| default_on_empty(value));
+                    args.args.push(syn::GenericArgument::Type(on_empty));
+                    let max_values = max_values.unwrap_or_else(|| default_max_values.clone());
+                    args.args.push(syn::GenericArgument::Type(max_values));
+                }
+                StorageGenerics::NMap {
+                    keygen,
+                    value,
+                    query_kind,
+                    on_empty,
+                    max_values,
+                }
+                | StorageGenerics::CountedNMap {
+                    keygen,
+                    value,
+                    query_kind,
+                    on_empty,
+                    max_values,
+                } => {
+                    args.args.push(syn::GenericArgument::Type(keygen));
+                    args.args.push(syn::GenericArgument::Type(value.clone()));
+                    let mut query_kind = query_kind.unwrap_or_else(|| default_query_kind.clone());
+                    set_result_query_type_parameter(&mut query_kind)?;
+                    args.args.push(syn::GenericArgument::Type(query_kind));
+                    let on_empty = on_empty.unwrap_or_else(|| default_on_empty(value));
+                    args.args.push(syn::GenericArgument::Type(on_empty));
+                    let max_values = max_values.unwrap_or_else(|| default_max_values.clone());
+                    args.args.push(syn::GenericArgument::Type(max_values));
+                }
+            }
+        } else {
+            args.args[0] = syn::parse_quote!( #prefix_ident<#type_use_gen> );
+
+            let (value_idx, query_idx, on_empty_idx) = match storage_def.metadata {
+                Metadata::Value { .. } => (1, 2, 3),
+                Metadata::NMap { .. } | Metadata::CountedNMap { .. } => (2, 3, 4),
+                Metadata::Map { .. } | Metadata::CountedMap { .. } => (3, 4, 5),
+                Metadata::DoubleMap { .. } => (5, 6, 7),
+            };
+
+            if storage_def.use_default_hasher {
+                let hasher_indices: Vec<usize> = match storage_def.metadata {
+                    Metadata::Map { .. } | Metadata::CountedMap { .. } => vec![1],
+                    Metadata::DoubleMap { .. } => vec![1, 3],
+                    _ => vec![],
+                };
+                for hasher_idx in hasher_indices {
+                    args.args[hasher_idx] = syn::GenericArgument::Type(
+                        syn::parse_quote!(#frame_support::Blake2_128Concat),
+                    );
+                }
+            }
+
+            if query_idx < args.args.len() {
+                if let syn::GenericArgument::Type(query_kind) = args.args.index_mut(query_idx) {
+                    set_result_query_type_parameter(query_kind)?;
+                }
+            } else if let Some(QueryKind::ResultQuery(error_path, _)) =
+                storage_def.query_kind.as_ref()
+            {
+                args.args
+                    .push(syn::GenericArgument::Type(syn::parse_quote!(#error_path)))
+            }
+
+            // Here, we only need to check if OnEmpty is *not* specified, and if so, then we have to
+            // generate a default OnEmpty struct for it.
+            if on_empty_idx >= args.args.len()
+                && matches!(
+                    storage_def.query_kind.as_ref(),
+                    Some(QueryKind::ResultQuery(_, _))
+                )
+            {
+                let value_ty = match args.args[value_idx].clone() {
+                    syn::GenericArgument::Type(ty) => ty,
+                    _ => unreachable!(),
+                };
+                let on_empty = default_on_empty(value_ty);
+                args.args.push(syn::GenericArgument::Type(on_empty));
+            }
+        }
+    }
+
+    Ok(on_empty_struct_metadata)
+}
+
+fn augment_final_docs(def: &mut Def) {
+    // expand the docs with a new line showing the storage type (value, map, double map, etc), and
+    // the key/value type(s).
+    let mut push_string_literal = |doc_line: &str, storage: &mut StorageDef| {
+        let item = &mut def.item.content.as_mut().expect("Checked by def").1[storage.index];
+        let typ_item = match item {
+            syn::Item::Type(t) => t,
+            _ => unreachable!("Checked by def"),
+        };
+        typ_item.attrs.push(syn::parse_quote!(#[doc = ""]));
+        typ_item.attrs.push(syn::parse_quote!(#[doc = #doc_line]));
+    };
+    def.storages
+        .iter_mut()
+        .for_each(|storage| match &storage.metadata {
+            Metadata::Value { value } => {
+                let doc_line = format!(
+                    "Storage type is [`StorageValue`] with value type `{}`.",
+                    value.to_token_stream()
+                );
+                push_string_literal(&doc_line, storage);
+            }
+            Metadata::Map { key, value } => {
+                let doc_line = format!(
+                    "Storage type is [`StorageMap`] with key type `{}` and value type `{}`.",
+                    key.to_token_stream(),
+                    value.to_token_stream()
+                );
+                push_string_literal(&doc_line, storage);
+            }
+            Metadata::DoubleMap { key1, key2, value } => {
+                let doc_line = format!(
+				"Storage type is [`StorageDoubleMap`] with key1 type {}, key2 type {} and value type {}.",
+				key1.to_token_stream(),
+				key2.to_token_stream(),
+				value.to_token_stream()
+			);
+                push_string_literal(&doc_line, storage);
+            }
+            Metadata::NMap { keys, value, .. } => {
+                let doc_line = format!(
+                    "Storage type is [`StorageNMap`] with keys type ({}) and value type {}.",
+                    keys.iter()
+                        .map(|k| k.to_token_stream().to_string())
+                        .collect::<Vec<_>>()
+                        .join(", "),
+                    value.to_token_stream()
+                );
+                push_string_literal(&doc_line, storage);
+            }
+            Metadata::CountedNMap { keys, value, .. } => {
+                let doc_line = format!(
+                    "Storage type is [`CountedStorageNMap`] with keys type ({}) and value type {}.",
+                    keys.iter()
+                        .map(|k| k.to_token_stream().to_string())
+                        .collect::<Vec<_>>()
+                        .join(", "),
+                    value.to_token_stream()
+                );
+                push_string_literal(&doc_line, storage);
+            }
+            Metadata::CountedMap { key, value } => {
+                let doc_line = format!(
+                    "Storage type is [`CountedStorageMap`] with key type {} and value type {}.",
+                    key.to_token_stream(),
+                    value.to_token_stream()
+                );
+                push_string_literal(&doc_line, storage);
+            }
+        });
+}
+
+///
+/// * generate StoragePrefix structs (e.g. for a storage `MyStorage` a struct with the name
+///   `_GeneratedPrefixForStorage$NameOfStorage` is generated) and implements StorageInstance trait.
+/// * if generics are unnamed: replace the first generic `_` by the generated prefix structure
+/// * if generics are named: reorder the generic, remove their name, and add the missing ones.
+/// * Add `#[allow(type_alias_bounds)]` on storages type alias
+/// * generate metadatas
+pub fn expand_storages(def: &mut Def) -> proc_macro2::TokenStream {
+    let on_empty_struct_metadata = match process_generics(def) {
+        Ok(idents) => idents,
+        Err(e) => return e.into_compile_error(),
+    };
+
+    augment_final_docs(def);
+
+    // Check for duplicate prefixes
+    let mut prefix_set = HashMap::new();
+    let mut errors = def
+        .storages
+        .iter()
+        .filter_map(|storage_def| check_prefix_duplicates(storage_def, &mut prefix_set).err());
+    if let Some(mut final_error) = errors.next() {
+        errors.for_each(|error| final_error.combine(error));
+        return final_error.into_compile_error();
+    }
+
+    let frame_support = &def.frame_support;
+    let frame_system = &def.frame_system;
+    let pallet_ident = &def.pallet_struct.pallet;
+
+    let entries_builder = def.storages.iter().map(|storage| {
+		let no_docs = vec![];
+		let docs = if cfg!(feature = "no-metadata-docs") { &no_docs } else { &storage.docs };
+
+		let ident = &storage.ident;
+		let gen = &def.type_use_generics(storage.attr_span);
+		let full_ident = quote::quote_spanned!(storage.attr_span => #ident<#gen> );
+
+		let cfg_attrs = &storage.cfg_attrs;
+
+		quote::quote_spanned!(storage.attr_span =>
+			#(#cfg_attrs)*
+			{
+				<#full_ident as #frame_support::storage::StorageEntryMetadataBuilder>::build_metadata(
+					#frame_support::__private::sp_std::vec![
+						#( #docs, )*
+					],
+					&mut entries,
+				);
+			}
+		)
+	});
+
+    let getters = def.storages.iter().map(|storage| {
+        if let Some(getter) = &storage.getter {
+            let completed_where_clause =
+                super::merge_where_clauses(&[&storage.where_clause, &def.config.where_clause]);
+
+            let ident = &storage.ident;
+            let gen = &def.type_use_generics(storage.attr_span);
+            let type_impl_gen = &def.type_impl_generics(storage.attr_span);
+            let type_use_gen = &def.type_use_generics(storage.attr_span);
+            let full_ident = quote::quote_spanned!(storage.attr_span => #ident<#gen> );
+
+            let cfg_attrs = &storage.cfg_attrs;
+
+            // 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 {
+                format!("An auto-generated getter for `{}`.", storage.ident)
+            };
+
+            match &storage.metadata {
+                Metadata::Value { value } => {
+                    let query = match storage.query_kind.as_ref().expect("Checked by def") {
+                        QueryKind::OptionQuery => quote::quote_spanned!(storage.attr_span =>
+                            Option<#value>
+                        ),
+                        QueryKind::ResultQuery(error_path, _) => {
+                            quote::quote_spanned!(storage.attr_span =>
+                                Result<#value, #error_path>
+                            )
+                        }
+                        QueryKind::ValueQuery => quote::quote!(#value),
+                    };
+                    quote::quote_spanned!(storage.attr_span =>
+                        #(#cfg_attrs)*
+                        impl<#type_impl_gen> #pallet_ident<#type_use_gen> #completed_where_clause {
+                            #[doc = #getter_doc_line]
+                            pub fn #getter() -> #query {
+                                <
+                                    #full_ident as #frame_support::storage::StorageValue<#value>
+                                >::get()
+                            }
+                        }
+                    )
+                }
+                Metadata::Map { key, value } => {
+                    let query = match storage.query_kind.as_ref().expect("Checked by def") {
+                        QueryKind::OptionQuery => quote::quote_spanned!(storage.attr_span =>
+                            Option<#value>
+                        ),
+                        QueryKind::ResultQuery(error_path, _) => {
+                            quote::quote_spanned!(storage.attr_span =>
+                                Result<#value, #error_path>
+                            )
+                        }
+                        QueryKind::ValueQuery => quote::quote!(#value),
+                    };
+                    quote::quote_spanned!(storage.attr_span =>
+                        #(#cfg_attrs)*
+                        impl<#type_impl_gen> #pallet_ident<#type_use_gen> #completed_where_clause {
+                            #[doc = #getter_doc_line]
+                            pub fn #getter<KArg>(k: KArg) -> #query where
+                                KArg: #frame_support::__private::codec::EncodeLike<#key>,
+                            {
+                                <
+                                    #full_ident as #frame_support::storage::StorageMap<#key, #value>
+                                >::get(k)
+                            }
+                        }
+                    )
+                }
+                Metadata::CountedMap { key, value } => {
+                    let query = match storage.query_kind.as_ref().expect("Checked by def") {
+                        QueryKind::OptionQuery => quote::quote_spanned!(storage.attr_span =>
+                            Option<#value>
+                        ),
+                        QueryKind::ResultQuery(error_path, _) => {
+                            quote::quote_spanned!(storage.attr_span =>
+                                Result<#value, #error_path>
+                            )
+                        }
+                        QueryKind::ValueQuery => quote::quote!(#value),
+                    };
+                    quote::quote_spanned!(storage.attr_span =>
+                        #(#cfg_attrs)*
+                        impl<#type_impl_gen> #pallet_ident<#type_use_gen> #completed_where_clause {
+                            #[doc = #getter_doc_line]
+                            pub fn #getter<KArg>(k: KArg) -> #query where
+                                KArg: #frame_support::__private::codec::EncodeLike<#key>,
+                            {
+                                // NOTE: we can't use any trait here because CountedStorageMap
+                                // doesn't implement any.
+                                <#full_ident>::get(k)
+                            }
+                        }
+                    )
+                }
+                Metadata::DoubleMap { key1, key2, value } => {
+                    let query = match storage.query_kind.as_ref().expect("Checked by def") {
+                        QueryKind::OptionQuery => quote::quote_spanned!(storage.attr_span =>
+                            Option<#value>
+                        ),
+                        QueryKind::ResultQuery(error_path, _) => {
+                            quote::quote_spanned!(storage.attr_span =>
+                                Result<#value, #error_path>
+                            )
+                        }
+                        QueryKind::ValueQuery => quote::quote!(#value),
+                    };
+                    quote::quote_spanned!(storage.attr_span =>
+                        #(#cfg_attrs)*
+                        impl<#type_impl_gen> #pallet_ident<#type_use_gen> #completed_where_clause {
+                            #[doc = #getter_doc_line]
+                            pub fn #getter<KArg1, KArg2>(k1: KArg1, k2: KArg2) -> #query where
+                                KArg1: #frame_support::__private::codec::EncodeLike<#key1>,
+                                KArg2: #frame_support::__private::codec::EncodeLike<#key2>,
+                            {
+                                <
+                                    #full_ident as
+                                    #frame_support::storage::StorageDoubleMap<#key1, #key2, #value>
+                                >::get(k1, k2)
+                            }
+                        }
+                    )
+                }
+                Metadata::NMap { keygen, value, .. } => {
+                    let query = match storage.query_kind.as_ref().expect("Checked by def") {
+                        QueryKind::OptionQuery => quote::quote_spanned!(storage.attr_span =>
+                            Option<#value>
+                        ),
+                        QueryKind::ResultQuery(error_path, _) => {
+                            quote::quote_spanned!(storage.attr_span =>
+                                Result<#value, #error_path>
+                            )
+                        }
+                        QueryKind::ValueQuery => quote::quote!(#value),
+                    };
+                    quote::quote_spanned!(storage.attr_span =>
+                        #(#cfg_attrs)*
+                        impl<#type_impl_gen> #pallet_ident<#type_use_gen> #completed_where_clause {
+                            #[doc = #getter_doc_line]
+                            pub fn #getter<KArg>(key: KArg) -> #query
+                            where
+                                KArg: #frame_support::storage::types::EncodeLikeTuple<
+                                    <#keygen as #frame_support::storage::types::KeyGenerator>::KArg
+                                >
+                                    + #frame_support::storage::types::TupleToEncodedIter,
+                            {
+                                <
+                                    #full_ident as
+                                    #frame_support::storage::StorageNMap<#keygen, #value>
+                                >::get(key)
+                            }
+                        }
+                    )
+                }
+                Metadata::CountedNMap { keygen, value, .. } => {
+                    let query = match storage.query_kind.as_ref().expect("Checked by def") {
+                        QueryKind::OptionQuery => quote::quote_spanned!(storage.attr_span =>
+                            Option<#value>
+                        ),
+                        QueryKind::ResultQuery(error_path, _) => {
+                            quote::quote_spanned!(storage.attr_span =>
+                                Result<#value, #error_path>
+                            )
+                        }
+                        QueryKind::ValueQuery => quote::quote!(#value),
+                    };
+                    quote::quote_spanned!(storage.attr_span =>
+                        #(#cfg_attrs)*
+                        impl<#type_impl_gen> #pallet_ident<#type_use_gen> #completed_where_clause {
+                            #[doc = #getter_doc_line]
+                            pub fn #getter<KArg>(key: KArg) -> #query
+                            where
+                                KArg: #frame_support::storage::types::EncodeLikeTuple<
+                                    <#keygen as #frame_support::storage::types::KeyGenerator>::KArg
+                                >
+                                    + #frame_support::storage::types::TupleToEncodedIter,
+                            {
+                                // NOTE: we can't use any trait here because CountedStorageNMap
+                                // doesn't implement any.
+                                <#full_ident>::get(key)
+                            }
+                        }
+                    )
+                }
+            }
+        } else {
+            Default::default()
+        }
+    });
+
+    let prefix_structs = def.storages.iter().map(|storage_def| {
+		let type_impl_gen = &def.type_impl_generics(storage_def.attr_span);
+		let type_use_gen = &def.type_use_generics(storage_def.attr_span);
+		let prefix_struct_ident = prefix_ident(storage_def);
+		let prefix_struct_vis = &storage_def.vis;
+		let prefix_struct_const = storage_def.prefix();
+		let config_where_clause = &def.config.where_clause;
+
+		let cfg_attrs = &storage_def.cfg_attrs;
+
+		let maybe_counter = match storage_def.metadata {
+			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)]
+					#prefix_struct_vis struct #counter_prefix_struct_ident<#type_use_gen>(
+						core::marker::PhantomData<(#type_use_gen,)>
+					);
+					#(#cfg_attrs)*
+					impl<#type_impl_gen> #frame_support::traits::StorageInstance
+						for #counter_prefix_struct_ident<#type_use_gen>
+						#config_where_clause
+					{
+						fn pallet_prefix() -> &'static str {
+							<
+								<T as #frame_system::Config>::PalletInfo
+								as #frame_support::traits::PalletInfo
+							>::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
+						for #prefix_struct_ident<#type_use_gen>
+						#config_where_clause
+					{
+						type CounterPrefix = #counter_prefix_struct_ident<#type_use_gen>;
+					}
+				)
+			},
+			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)]
+					#prefix_struct_vis struct #counter_prefix_struct_ident<#type_use_gen>(
+						core::marker::PhantomData<(#type_use_gen,)>
+					);
+					#(#cfg_attrs)*
+					impl<#type_impl_gen> #frame_support::traits::StorageInstance
+						for #counter_prefix_struct_ident<#type_use_gen>
+						#config_where_clause
+					{
+						fn pallet_prefix() -> &'static str {
+							<
+								<T as #frame_system::Config>::PalletInfo
+								as #frame_support::traits::PalletInfo
+							>::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
+						for #prefix_struct_ident<#type_use_gen>
+						#config_where_clause
+					{
+						type CounterPrefix = #counter_prefix_struct_ident<#type_use_gen>;
+					}
+				)
+			},
+			_ => proc_macro2::TokenStream::default(),
+		};
+
+		let storage_prefix_hash = two128_str(&prefix_struct_const);
+		quote::quote_spanned!(storage_def.attr_span =>
+			#maybe_counter
+
+			#(#cfg_attrs)*
+			#[doc(hidden)]
+			#prefix_struct_vis struct #prefix_struct_ident<#type_use_gen>(
+				core::marker::PhantomData<(#type_use_gen,)>
+			);
+			#(#cfg_attrs)*
+			impl<#type_impl_gen> #frame_support::traits::StorageInstance
+				for #prefix_struct_ident<#type_use_gen>
+				#config_where_clause
+			{
+				fn pallet_prefix() -> &'static str {
+					<
+						<T as #frame_system::Config>::PalletInfo
+						as #frame_support::traits::PalletInfo
+					>::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
+				}
+			}
+		)
+	});
+
+    let on_empty_structs = on_empty_struct_metadata.into_iter().map(|metadata| {
+        use crate::pallet::parse::GenericKind;
+        use syn::{GenericArgument, Path, PathArguments, PathSegment, Type, TypePath};
+
+        let ResultOnEmptyStructMetadata {
+            name,
+            visibility,
+            value_ty,
+            error_path,
+            variant_name,
+            span,
+        } = metadata;
+
+        let generic_kind = match error_path.segments.last() {
+            Some(PathSegment {
+                arguments: PathArguments::AngleBracketed(args),
+                ..
+            }) => {
+                let (has_config, has_instance) =
+                    args.args
+                        .iter()
+                        .fold(
+                            (false, false),
+                            |(has_config, has_instance), arg| match arg {
+                                GenericArgument::Type(Type::Path(TypePath {
+                                    path: Path { segments, .. },
+                                    ..
+                                })) => {
+                                    let maybe_config =
+                                        segments.first().map_or(false, |seg| seg.ident == "T");
+                                    let maybe_instance =
+                                        segments.first().map_or(false, |seg| seg.ident == "I");
+
+                                    (has_config || maybe_config, has_instance || maybe_instance)
+                                }
+                                _ => (has_config, has_instance),
+                            },
+                        );
+                GenericKind::from_gens(has_config, has_instance).unwrap_or(GenericKind::None)
+            }
+            _ => GenericKind::None,
+        };
+        let type_impl_gen = generic_kind.type_impl_gen(proc_macro2::Span::call_site());
+        let config_where_clause = &def.config.where_clause;
+
+        quote::quote_spanned!(span =>
+            #[doc(hidden)]
+            #[allow(non_camel_case_types)]
+            #visibility struct #name;
+
+            impl<#type_impl_gen> #frame_support::traits::Get<Result<#value_ty, #error_path>>
+                for #name
+                #config_where_clause
+            {
+                fn get() -> Result<#value_ty, #error_path> {
+                    Err(<#error_path>::#variant_name)
+                }
+            }
+        )
+    });
+
+    // aggregated where clause of all storage types and the whole pallet.
+    let mut where_clauses = vec![&def.config.where_clause];
+    where_clauses.extend(def.storages.iter().map(|storage| &storage.where_clause));
+    let completed_where_clause = super::merge_where_clauses(&where_clauses);
+    let type_impl_gen = &def.type_impl_generics(proc_macro2::Span::call_site());
+    let type_use_gen = &def.type_use_generics(proc_macro2::Span::call_site());
+
+    let try_decode_entire_state = {
+        let mut storage_names = def
+            .storages
+            .iter()
+            .filter_map(|storage| {
+                // A little hacky; don't generate for cfg gated storages to not get compile errors
+                // when building "frame-feature-testing" gated storages in the "frame-support-test"
+                // crate.
+                if storage.try_decode && storage.cfg_attrs.is_empty() {
+                    let ident = &storage.ident;
+                    let gen = &def.type_use_generics(storage.attr_span);
+                    Some(quote::quote_spanned!(storage.attr_span => #ident<#gen> ))
+                } else {
+                    None
+                }
+            })
+            .collect::<Vec<_>>();
+        storage_names.sort_by_cached_key(|ident| ident.to_string());
+
+        quote::quote!(
+            #[cfg(feature = "try-runtime")]
+            impl<#type_impl_gen> #frame_support::traits::TryDecodeEntireStorage
+            for #pallet_ident<#type_use_gen> #completed_where_clause
+            {
+                fn try_decode_entire_state() -> Result<usize, #frame_support::__private::sp_std::vec::Vec<#frame_support::traits::TryDecodeEntireStorageError>> {
+                    let pallet_name = <<T as #frame_system::Config>::PalletInfo	as frame_support::traits::PalletInfo>
+                        ::name::<#pallet_ident<#type_use_gen>>()
+                        .expect("Every active pallet has a name in the runtime; qed");
+
+                    #frame_support::__private::log::debug!(target: "runtime::try-decode-state", "trying to decode pallet: {pallet_name}");
+
+                    // NOTE: for now, we have to exclude storage items that are feature gated.
+                    let mut errors = #frame_support::__private::sp_std::vec::Vec::new();
+                    let mut decoded = 0usize;
+
+                    #(
+                        #frame_support::__private::log::debug!(target: "runtime::try-decode-state", "trying to decode storage: \
+                        {pallet_name}::{}", stringify!(#storage_names));
+
+                        match <#storage_names as #frame_support::traits::TryDecodeEntireStorage>::try_decode_entire_state() {
+                            Ok(count) => {
+                                decoded += count;
+                            },
+                            Err(err) => {
+                                errors.extend(err);
+                            },
+                        }
+                    )*
+
+                    if errors.is_empty() {
+                        Ok(decoded)
+                    } else {
+                        Err(errors)
+                    }
+                }
+            }
+        )
+    };
+
+    quote::quote!(
+        impl<#type_impl_gen> #pallet_ident<#type_use_gen>
+            #completed_where_clause
+        {
+            #[doc(hidden)]
+            pub fn storage_metadata() -> #frame_support::__private::metadata_ir::PalletStorageMetadataIR {
+                #frame_support::__private::metadata_ir::PalletStorageMetadataIR {
+                    prefix: <
+                        <T as #frame_system::Config>::PalletInfo as
+                        #frame_support::traits::PalletInfo
+                    >::name::<#pallet_ident<#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!`."),
+                    entries: {
+                        #[allow(unused_mut)]
+                        let mut entries = #frame_support::__private::sp_std::vec![];
+                        #( #entries_builder )*
+                        entries
+                    },
+                }
+            }
+        }
+
+        #( #getters )*
+        #( #prefix_structs )*
+        #( #on_empty_structs )*
+
+        #try_decode_entire_state
+    )
+}
diff --git a/support/procedural-fork/src/pallet/expand/tasks.rs b/support/procedural-fork/src/pallet/expand/tasks.rs
new file mode 100644
index 000000000..8c4dfb54f
--- /dev/null
+++ b/support/procedural-fork/src/pallet/expand/tasks.rs
@@ -0,0 +1,281 @@
+//! Contains logic for expanding task-related items.
+
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Home of the expansion code for the Tasks API
+
+use crate::pallet::{parse::tasks::*, Def};
+use derive_syn_parse::Parse;
+use inflector::Inflector;
+use proc_macro2::TokenStream as TokenStream2;
+use quote::{format_ident, quote, ToTokens};
+use syn::{parse_quote, spanned::Spanned, ItemEnum, ItemImpl};
+
+impl TaskEnumDef {
+    /// Since we optionally allow users to manually specify a `#[pallet::task_enum]`, in the
+    /// event they _don't_ specify one (which is actually the most common behavior) we have to
+    /// generate one based on the existing [`TasksDef`]. This method performs that generation.
+    pub fn generate(
+        tasks: &TasksDef,
+        type_decl_bounded_generics: TokenStream2,
+        type_use_generics: TokenStream2,
+    ) -> Self {
+        let variants = if tasks.tasks_attr.is_some() {
+            tasks
+                .tasks
+                .iter()
+                .map(|task| {
+                    let ident = &task.item.sig.ident;
+                    let ident =
+                        format_ident!("{}", ident.to_string().to_class_case(), span = ident.span());
+
+                    let args = task.item.sig.inputs.iter().collect::<Vec<_>>();
+
+                    if args.is_empty() {
+                        quote!(#ident)
+                    } else {
+                        quote!(#ident {
+                            #(#args),*
+                        })
+                    }
+                })
+                .collect::<Vec<_>>()
+        } else {
+            Vec::new()
+        };
+        let mut task_enum_def: TaskEnumDef = parse_quote! {
+            /// Auto-generated enum that encapsulates all tasks defined by this pallet.
+            ///
+            /// Conceptually similar to the [`Call`] enum, but for tasks. This is only
+            /// generated if there are tasks present in this pallet.
+            #[pallet::task_enum]
+            pub enum Task<#type_decl_bounded_generics> {
+                #(
+                    #variants,
+                )*
+            }
+        };
+        task_enum_def.type_use_generics = type_use_generics;
+        task_enum_def
+    }
+}
+
+impl ToTokens for TaskEnumDef {
+    fn to_tokens(&self, tokens: &mut TokenStream2) {
+        let item_enum = &self.item_enum;
+        let ident = &item_enum.ident;
+        let vis = &item_enum.vis;
+        let attrs = &item_enum.attrs;
+        let generics = &item_enum.generics;
+        let variants = &item_enum.variants;
+        let scrate = &self.scrate;
+        let type_use_generics = &self.type_use_generics;
+        if self.attr.is_some() {
+            // `item_enum` is short-hand / generated enum
+            tokens.extend(quote! {
+                #(#attrs)*
+                #[derive(
+                    #scrate::CloneNoBound,
+                    #scrate::EqNoBound,
+                    #scrate::PartialEqNoBound,
+                    #scrate::pallet_prelude::Encode,
+                    #scrate::pallet_prelude::Decode,
+                    #scrate::pallet_prelude::TypeInfo,
+                )]
+                #[codec(encode_bound())]
+                #[codec(decode_bound())]
+                #[scale_info(skip_type_params(#type_use_generics))]
+                #vis enum #ident #generics {
+                    #variants
+                    #[doc(hidden)]
+                    #[codec(skip)]
+                    __Ignore(core::marker::PhantomData<T>, #scrate::Never),
+                }
+
+                impl<T: Config> core::fmt::Debug for #ident<#type_use_generics> {
+                    fn fmt(&self, f: &mut core::fmt::Formatter<'_>) -> core::fmt::Result {
+                        f.debug_struct(stringify!(#ident)).field("value", self).finish()
+                    }
+                }
+            });
+        } else {
+            // `item_enum` is a manually specified enum (no attribute)
+            tokens.extend(item_enum.to_token_stream());
+        }
+    }
+}
+
+/// Represents an already-expanded [`TasksDef`].
+#[derive(Parse)]
+pub struct ExpandedTasksDef {
+    pub task_item_impl: ItemImpl,
+    pub task_trait_impl: ItemImpl,
+}
+
+impl ToTokens for TasksDef {
+    fn to_tokens(&self, tokens: &mut TokenStream2) {
+        let scrate = &self.scrate;
+        let enum_ident = syn::Ident::new("Task", self.enum_ident.span());
+        let enum_arguments = &self.enum_arguments;
+        let enum_use = quote!(#enum_ident #enum_arguments);
+
+        let task_fn_idents = self
+            .tasks
+            .iter()
+            .map(|task| {
+                format_ident!(
+                    "{}",
+                    &task.item.sig.ident.to_string().to_class_case(),
+                    span = task.item.sig.ident.span()
+                )
+            })
+            .collect::<Vec<_>>();
+        let task_indices = self.tasks.iter().map(|task| &task.index_attr.meta.index);
+        let task_conditions = self.tasks.iter().map(|task| &task.condition_attr.meta.expr);
+        let task_weights = self.tasks.iter().map(|task| &task.weight_attr.meta.expr);
+        let task_iters = self.tasks.iter().map(|task| &task.list_attr.meta.expr);
+
+        let task_fn_impls = self.tasks.iter().map(|task| {
+            let mut task_fn_impl = task.item.clone();
+            task_fn_impl.attrs = vec![];
+            task_fn_impl
+        });
+
+        let task_fn_names = self.tasks.iter().map(|task| &task.item.sig.ident);
+        let task_arg_names = self
+            .tasks
+            .iter()
+            .map(|task| &task.arg_names)
+            .collect::<Vec<_>>();
+
+        let sp_std = quote!(#scrate::__private::sp_std);
+        let impl_generics = &self.item_impl.generics;
+        tokens.extend(quote! {
+			impl #impl_generics #enum_use
+			{
+				#(#task_fn_impls)*
+			}
+
+			impl #impl_generics #scrate::traits::Task for #enum_use
+			{
+				type Enumeration = #sp_std::vec::IntoIter<#enum_use>;
+
+				fn iter() -> Self::Enumeration {
+					let mut all_tasks = #sp_std::vec![];
+					#(all_tasks
+						.extend(#task_iters.map(|(#(#task_arg_names),*)| #enum_ident::#task_fn_idents { #(#task_arg_names: #task_arg_names.clone()),* })
+						.collect::<#sp_std::vec::Vec<_>>());
+					)*
+					all_tasks.into_iter()
+				}
+
+				fn task_index(&self) -> u32 {
+					match self.clone() {
+						#(#enum_ident::#task_fn_idents { .. } => #task_indices,)*
+						Task::__Ignore(_, _) => unreachable!(),
+					}
+				}
+
+				fn is_valid(&self) -> bool {
+					match self.clone() {
+						#(#enum_ident::#task_fn_idents { #(#task_arg_names),* } => (#task_conditions)(#(#task_arg_names),* ),)*
+						Task::__Ignore(_, _) => unreachable!(),
+					}
+				}
+
+				fn run(&self) -> Result<(), #scrate::pallet_prelude::DispatchError> {
+					match self.clone() {
+						#(#enum_ident::#task_fn_idents { #(#task_arg_names),* } => {
+							<#enum_use>::#task_fn_names(#( #task_arg_names, )* )
+						},)*
+						Task::__Ignore(_, _) => unreachable!(),
+					}
+				}
+
+				#[allow(unused_variables)]
+				fn weight(&self) -> #scrate::pallet_prelude::Weight {
+					match self.clone() {
+						#(#enum_ident::#task_fn_idents { #(#task_arg_names),* } => #task_weights,)*
+						Task::__Ignore(_, _) => unreachable!(),
+					}
+				}
+			}
+		});
+    }
+}
+
+/// Expands the [`TasksDef`] in the enclosing [`Def`], if present, and returns its tokens.
+///
+/// This modifies the underlying [`Def`] in addition to returning any tokens that were added.
+pub fn expand_tasks_impl(def: &mut Def) -> TokenStream2 {
+    let Some(tasks) = &mut def.tasks else {
+        return quote!();
+    };
+    let ExpandedTasksDef {
+        task_item_impl,
+        task_trait_impl,
+    } = parse_quote!(#tasks);
+    quote! {
+        #task_item_impl
+        #task_trait_impl
+    }
+}
+
+/// Represents a fully-expanded [`TaskEnumDef`].
+#[derive(Parse)]
+pub struct ExpandedTaskEnum {
+    pub item_enum: ItemEnum,
+    pub debug_impl: ItemImpl,
+}
+
+/// Modifies a [`Def`] to expand the underlying [`TaskEnumDef`] if present, and also returns
+/// its tokens. A blank [`TokenStream2`] is returned if no [`TaskEnumDef`] has been generated
+/// or defined.
+pub fn expand_task_enum(def: &mut Def) -> TokenStream2 {
+    let Some(task_enum) = &mut def.task_enum else {
+        return quote!();
+    };
+    let ExpandedTaskEnum {
+        item_enum,
+        debug_impl,
+    } = parse_quote!(#task_enum);
+    quote! {
+        #item_enum
+        #debug_impl
+    }
+}
+
+/// Modifies a [`Def`] to expand the underlying [`TasksDef`] and also generate a
+/// [`TaskEnumDef`] if applicable. The tokens for these items are returned if they are created.
+pub fn expand_tasks(def: &mut Def) -> TokenStream2 {
+    if let Some(tasks_def) = &def.tasks {
+        if def.task_enum.is_none() {
+            def.task_enum = Some(TaskEnumDef::generate(
+                &tasks_def,
+                def.type_decl_bounded_generics(tasks_def.item_impl.span()),
+                def.type_use_generics(tasks_def.item_impl.span()),
+            ));
+        }
+    }
+    let tasks_extra_output = expand_tasks_impl(def);
+    let task_enum_extra_output = expand_task_enum(def);
+    quote! {
+        #tasks_extra_output
+        #task_enum_extra_output
+    }
+}
diff --git a/support/procedural-fork/src/pallet/expand/tt_default_parts.rs b/support/procedural-fork/src/pallet/expand/tt_default_parts.rs
new file mode 100644
index 000000000..57b78339a
--- /dev/null
+++ b/support/procedural-fork/src/pallet/expand/tt_default_parts.rs
@@ -0,0 +1,226 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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::{
+    pallet::{CompositeKeyword, Def},
+    COUNTER,
+};
+use syn::spanned::Spanned;
+
+/// Generate the `tt_default_parts` macro.
+pub fn expand_tt_default_parts(def: &mut Def) -> proc_macro2::TokenStream {
+    let count = COUNTER.with(|counter| counter.borrow_mut().inc());
+    let default_parts_unique_id =
+        syn::Ident::new(&format!("__tt_default_parts_{}", count), def.item.span());
+    let extra_parts_unique_id =
+        syn::Ident::new(&format!("__tt_extra_parts_{}", count), def.item.span());
+    let default_parts_unique_id_v2 =
+        syn::Ident::new(&format!("__tt_default_parts_v2_{}", count), def.item.span());
+
+    let call_part = def.call.as_ref().map(|_| quote::quote!(Call,));
+
+    let task_part = def.task_enum.as_ref().map(|_| quote::quote!(Task,));
+
+    let storage_part = (!def.storages.is_empty()).then(|| quote::quote!(Storage,));
+
+    let event_part = def.event.as_ref().map(|event| {
+        let gen = event.gen_kind.is_generic().then(|| quote::quote!( <T> ));
+        quote::quote!( Event #gen , )
+    });
+
+    let error_part = def.error.as_ref().map(|_| quote::quote!(Error<T>,));
+
+    let origin_part = def.origin.as_ref().map(|origin| {
+        let gen = origin.is_generic.then(|| quote::quote!( <T> ));
+        quote::quote!( Origin #gen , )
+    });
+
+    let config_part = def.genesis_config.as_ref().map(|genesis_config| {
+        let gen = genesis_config
+            .gen_kind
+            .is_generic()
+            .then(|| quote::quote!( <T> ));
+        quote::quote!( Config #gen , )
+    });
+
+    let inherent_part = def.inherent.as_ref().map(|_| quote::quote!(Inherent,));
+
+    let validate_unsigned_part = def
+        .validate_unsigned
+        .as_ref()
+        .map(|_| quote::quote!(ValidateUnsigned,));
+
+    let freeze_reason_part = def
+        .composites
+        .iter()
+        .any(|c| matches!(c.composite_keyword, CompositeKeyword::FreezeReason(_)))
+        .then_some(quote::quote!(FreezeReason,));
+
+    let hold_reason_part = def
+        .composites
+        .iter()
+        .any(|c| matches!(c.composite_keyword, CompositeKeyword::HoldReason(_)))
+        .then_some(quote::quote!(HoldReason,));
+
+    let lock_id_part = def
+        .composites
+        .iter()
+        .any(|c| matches!(c.composite_keyword, CompositeKeyword::LockId(_)))
+        .then_some(quote::quote!(LockId,));
+
+    let slash_reason_part = def
+        .composites
+        .iter()
+        .any(|c| matches!(c.composite_keyword, CompositeKeyword::SlashReason(_)))
+        .then_some(quote::quote!(SlashReason,));
+
+    let call_part_v2 = def.call.as_ref().map(|_| quote::quote!(+ Call));
+
+    let task_part_v2 = def.task_enum.as_ref().map(|_| quote::quote!(+ Task));
+
+    let storage_part_v2 = (!def.storages.is_empty()).then(|| quote::quote!(+ Storage));
+
+    let event_part_v2 = def.event.as_ref().map(|event| {
+        let gen = event.gen_kind.is_generic().then(|| quote::quote!(<T>));
+        quote::quote!(+ Event #gen)
+    });
+
+    let error_part_v2 = def.error.as_ref().map(|_| quote::quote!(+ Error<T>));
+
+    let origin_part_v2 = def.origin.as_ref().map(|origin| {
+        let gen = origin.is_generic.then(|| quote::quote!(<T>));
+        quote::quote!(+ Origin #gen)
+    });
+
+    let config_part_v2 = def.genesis_config.as_ref().map(|genesis_config| {
+        let gen = genesis_config
+            .gen_kind
+            .is_generic()
+            .then(|| quote::quote!(<T>));
+        quote::quote!(+ Config #gen)
+    });
+
+    let inherent_part_v2 = def.inherent.as_ref().map(|_| quote::quote!(+ Inherent));
+
+    let validate_unsigned_part_v2 = def
+        .validate_unsigned
+        .as_ref()
+        .map(|_| quote::quote!(+ ValidateUnsigned));
+
+    let freeze_reason_part_v2 = def
+        .composites
+        .iter()
+        .any(|c| matches!(c.composite_keyword, CompositeKeyword::FreezeReason(_)))
+        .then_some(quote::quote!(+ FreezeReason));
+
+    let hold_reason_part_v2 = def
+        .composites
+        .iter()
+        .any(|c| matches!(c.composite_keyword, CompositeKeyword::HoldReason(_)))
+        .then_some(quote::quote!(+ HoldReason));
+
+    let lock_id_part_v2 = def
+        .composites
+        .iter()
+        .any(|c| matches!(c.composite_keyword, CompositeKeyword::LockId(_)))
+        .then_some(quote::quote!(+ LockId));
+
+    let slash_reason_part_v2 = def
+        .composites
+        .iter()
+        .any(|c| matches!(c.composite_keyword, CompositeKeyword::SlashReason(_)))
+        .then_some(quote::quote!(+ SlashReason));
+
+    quote::quote!(
+        // This macro follows the conventions as laid out by the `tt-call` crate. It does not
+        // accept any arguments and simply returns the pallet parts, separated by commas, then
+        // wrapped inside of braces and finally prepended with double colons, to the caller inside
+        // of a key named `tokens`.
+        //
+        // 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
+                your_tt_return = [{ $my_tt_return:path }]
+            } => {
+                $my_tt_return! {
+                    $caller
+                    tokens = [{
+                        expanded::{
+                            Pallet, #call_part #storage_part #event_part #error_part #origin_part #config_part
+                            #inherent_part #validate_unsigned_part #freeze_reason_part #task_part
+                            #hold_reason_part #lock_id_part #slash_reason_part
+                        }
+                    }]
+                }
+            };
+        }
+
+        pub use #default_parts_unique_id as tt_default_parts;
+
+
+        // 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:
+        // `System: expanded::{Error} ::{Pallet, Call}`.
+        //
+        // The `expanded` keyword is a marker of the final state of the `construct_runtime!`.
+        #[macro_export]
+        #[doc(hidden)]
+        macro_rules! #extra_parts_unique_id {
+            {
+                $caller:tt
+                your_tt_return = [{ $my_tt_return:path }]
+            } => {
+                $my_tt_return! {
+                    $caller
+                    tokens = [{
+                        expanded::{
+                            #error_part
+                        }
+                    }]
+                }
+            };
+        }
+
+        pub use #extra_parts_unique_id as tt_extra_parts;
+
+        #[macro_export]
+        #[doc(hidden)]
+        macro_rules! #default_parts_unique_id_v2 {
+            {
+                $caller:tt
+                frame_support = [{ $($frame_support:ident)::* }]
+            } => {
+                $($frame_support)*::__private::tt_return! {
+                    $caller
+                    tokens = [{
+                        + Pallet #call_part_v2 #storage_part_v2 #event_part_v2 #error_part_v2 #origin_part_v2 #config_part_v2
+                        #inherent_part_v2 #validate_unsigned_part_v2 #freeze_reason_part_v2 #task_part_v2
+                        #hold_reason_part_v2 #lock_id_part_v2 #slash_reason_part_v2
+                    }]
+                }
+            };
+        }
+
+        pub use #default_parts_unique_id_v2 as tt_default_parts_v2;
+    )
+}
diff --git a/support/procedural-fork/src/pallet/expand/type_value.rs b/support/procedural-fork/src/pallet/expand/type_value.rs
new file mode 100644
index 000000000..84db3e431
--- /dev/null
+++ b/support/procedural-fork/src/pallet/expand/type_value.rs
@@ -0,0 +1,77 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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::pallet::Def;
+
+///
+/// * Generate the struct
+/// * implement the `Get<..>` on it
+/// * Rename the name of the function to internal name
+pub fn expand_type_values(def: &mut Def) -> proc_macro2::TokenStream {
+    let mut expand = quote::quote!();
+    let frame_support = &def.frame_support;
+
+    for type_value in &def.type_values {
+        let fn_name_str = &type_value.ident.to_string();
+        let fn_name_snakecase = inflector::cases::snakecase::to_snake_case(fn_name_str);
+        let fn_ident_renamed = syn::Ident::new(
+            &format!("__type_value_for_{}", fn_name_snakecase),
+            type_value.ident.span(),
+        );
+
+        let type_value_item = {
+            let item = &mut def.item.content.as_mut().expect("Checked by def").1[type_value.index];
+            if let syn::Item::Fn(item) = item {
+                item
+            } else {
+                unreachable!("Checked by error parser")
+            }
+        };
+
+        // Rename the type_value function name
+        type_value_item.sig.ident = fn_ident_renamed.clone();
+
+        let vis = &type_value.vis;
+        let ident = &type_value.ident;
+        let type_ = &type_value.type_;
+        let where_clause = &type_value.where_clause;
+
+        let (struct_impl_gen, struct_use_gen) = if type_value.is_generic {
+            (
+                def.type_impl_generics(type_value.attr_span),
+                def.type_use_generics(type_value.attr_span),
+            )
+        } else {
+            (Default::default(), Default::default())
+        };
+
+        let docs = &type_value.docs;
+
+        expand.extend(quote::quote_spanned!(type_value.attr_span =>
+            #( #[doc = #docs] )*
+            #vis struct #ident<#struct_use_gen>(core::marker::PhantomData<((), #struct_use_gen)>);
+            impl<#struct_impl_gen> #frame_support::traits::Get<#type_> for #ident<#struct_use_gen>
+            #where_clause
+            {
+                fn get() -> #type_ {
+                    #fn_ident_renamed::<#struct_use_gen>()
+                }
+            }
+        ));
+    }
+    expand
+}
diff --git a/support/procedural-fork/src/pallet/expand/validate_unsigned.rs b/support/procedural-fork/src/pallet/expand/validate_unsigned.rs
new file mode 100644
index 000000000..28c78a1c6
--- /dev/null
+++ b/support/procedural-fork/src/pallet/expand/validate_unsigned.rs
@@ -0,0 +1,58 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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::{pallet::Def, COUNTER};
+use proc_macro2::TokenStream;
+use quote::quote;
+use syn::{spanned::Spanned, Ident};
+
+pub fn expand_validate_unsigned(def: &mut Def) -> TokenStream {
+    let count = COUNTER.with(|counter| counter.borrow_mut().inc());
+    let macro_ident = Ident::new(
+        &format!("__is_validate_unsigned_part_defined_{}", count),
+        def.item.span(),
+    );
+
+    let maybe_compile_error = if def.validate_unsigned.is_none() {
+        quote! {
+            compile_error!(concat!(
+                "`",
+                stringify!($pallet_name),
+                "` does not have #[pallet::validate_unsigned] defined, perhaps you should \
+                remove `ValidateUnsigned` from construct_runtime?",
+            ));
+        }
+    } else {
+        TokenStream::new()
+    };
+
+    quote! {
+        #[doc(hidden)]
+        pub mod __substrate_validate_unsigned_check {
+            #[macro_export]
+            #[doc(hidden)]
+            macro_rules! #macro_ident {
+                ($pallet_name:ident) => {
+                    #maybe_compile_error
+                }
+            }
+
+            #[doc(hidden)]
+            pub use #macro_ident as is_validate_unsigned_part_defined;
+        }
+    }
+}
diff --git a/support/procedural-fork/src/pallet/expand/warnings.rs b/support/procedural-fork/src/pallet/expand/warnings.rs
new file mode 100644
index 000000000..3d71b83af
--- /dev/null
+++ b/support/procedural-fork/src/pallet/expand/warnings.rs
@@ -0,0 +1,103 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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/support/procedural-fork/src/pallet/mod.rs b/support/procedural-fork/src/pallet/mod.rs
new file mode 100644
index 000000000..d3796662f
--- /dev/null
+++ b/support/procedural-fork/src/pallet/mod.rs
@@ -0,0 +1,61 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Implementation for pallet attribute macro.
+//!
+//! General workflow:
+//! 1 - parse all pallet attributes:
+//!   This step remove all attributes `#[pallet::*]` from the ItemMod and build the `Def` struct
+//!   which holds the ItemMod without `#[pallet::*]` and information given by those attributes
+//! 2 - expand from the parsed information
+//!   This step will modify the ItemMod by adding some derive attributes or phantom data variants
+//!   to user defined types. And also crate new types and implement block.
+
+mod expand;
+pub(crate) mod parse;
+
+pub use parse::{composite::keyword::CompositeKeyword, Def};
+use syn::spanned::Spanned;
+
+mod keyword {
+    syn::custom_keyword!(dev_mode);
+}
+
+pub fn pallet(
+    attr: proc_macro::TokenStream,
+    item: proc_macro::TokenStream,
+) -> proc_macro::TokenStream {
+    let mut dev_mode = false;
+    if !attr.is_empty() {
+        if let Ok(_) = syn::parse::<keyword::dev_mode>(attr.clone()) {
+            dev_mode = true;
+        } else {
+            let msg = "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)].";
+            let span = proc_macro2::TokenStream::from(attr).span();
+            return syn::Error::new(span, msg).to_compile_error().into();
+        }
+    }
+
+    let item = syn::parse_macro_input!(item as syn::ItemMod);
+    match parse::Def::try_from(item, dev_mode) {
+        Ok(def) => expand::expand(def).into(),
+        Err(e) => e.to_compile_error().into(),
+    }
+}
diff --git a/support/procedural-fork/src/pallet/parse/call.rs b/support/procedural-fork/src/pallet/parse/call.rs
new file mode 100644
index 000000000..865c63473
--- /dev/null
+++ b/support/procedural-fork/src/pallet/parse/call.rs
@@ -0,0 +1,472 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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::{helper, InheritedCallWeightAttr};
+use frame_support_procedural_tools::get_doc_literals;
+use proc_macro2::Span;
+use quote::ToTokens;
+use std::collections::HashMap;
+use syn::{spanned::Spanned, ExprClosure};
+
+/// List of additional token to be used for parsing.
+mod keyword {
+    syn::custom_keyword!(Call);
+    syn::custom_keyword!(OriginFor);
+    syn::custom_keyword!(RuntimeOrigin);
+    syn::custom_keyword!(weight);
+    syn::custom_keyword!(call_index);
+    syn::custom_keyword!(compact);
+    syn::custom_keyword!(T);
+    syn::custom_keyword!(pallet);
+    syn::custom_keyword!(feeless_if);
+}
+
+/// Definition of dispatchables typically `impl<T: Config> Pallet<T> { ... }`
+pub struct CallDef {
+    /// The where_clause used.
+    pub where_clause: Option<syn::WhereClause>,
+    /// A set of usage of instance, must be check for consistency with trait.
+    pub instances: Vec<helper::InstanceUsage>,
+    /// The index of call item in pallet module.
+    pub index: usize,
+    /// Information on methods (used for expansion).
+    pub methods: Vec<CallVariantDef>,
+    /// The span of the pallet::call attribute.
+    pub attr_span: proc_macro2::Span,
+    /// Docs, specified on the impl Block.
+    pub docs: Vec<syn::Expr>,
+    /// The optional `weight` attribute on the `pallet::call`.
+    pub inherited_call_weight: Option<InheritedCallWeightAttr>,
+}
+
+/// The weight of a call.
+#[derive(Clone)]
+pub enum CallWeightDef {
+    /// Explicitly set on the call itself with `#[pallet::weight(…)]`. This value is used.
+    Immediate(syn::Expr),
+
+    /// The default value that should be set for dev-mode pallets. Usually zero.
+    DevModeDefault,
+
+    /// Inherits whatever value is configured on the pallet level.
+    ///
+    /// The concrete value is not known at this point.
+    Inherited,
+}
+
+/// Definition of dispatchable typically: `#[weight...] fn foo(origin .., param1: ...) -> ..`
+#[derive(Clone)]
+pub struct CallVariantDef {
+    /// Function name.
+    pub name: syn::Ident,
+    /// Information on args: `(is_compact, name, type)`
+    pub args: Vec<(bool, syn::Ident, Box<syn::Type>)>,
+    /// Weight for the call.
+    pub weight: CallWeightDef,
+    /// Call index of the dispatchable.
+    pub call_index: u8,
+    /// Whether an explicit call index was specified.
+    pub explicit_call_index: bool,
+    /// Docs, used for metadata.
+    pub docs: Vec<syn::Expr>,
+    /// Attributes annotated at the top of the dispatchable function.
+    pub attrs: Vec<syn::Attribute>,
+    /// The `cfg` attributes.
+    pub cfg_attrs: Vec<syn::Attribute>,
+    /// The optional `feeless_if` attribute on the `pallet::call`.
+    pub feeless_check: Option<syn::ExprClosure>,
+}
+
+/// Attributes for functions in call impl block.
+pub enum FunctionAttr {
+    /// Parse for `#[pallet::call_index(expr)]`
+    CallIndex(u8),
+    /// Parse for `#[pallet::weight(expr)]`
+    Weight(syn::Expr),
+    /// Parse for `#[pallet::feeless_if(expr)]`
+    FeelessIf(Span, syn::ExprClosure),
+}
+
+impl syn::parse::Parse for FunctionAttr {
+    fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
+        input.parse::<syn::Token![#]>()?;
+        let content;
+        syn::bracketed!(content in input);
+        content.parse::<keyword::pallet>()?;
+        content.parse::<syn::Token![::]>()?;
+
+        let lookahead = content.lookahead1();
+        if lookahead.peek(keyword::weight) {
+            content.parse::<keyword::weight>()?;
+            let weight_content;
+            syn::parenthesized!(weight_content in content);
+            Ok(FunctionAttr::Weight(weight_content.parse::<syn::Expr>()?))
+        } else if lookahead.peek(keyword::call_index) {
+            content.parse::<keyword::call_index>()?;
+            let call_index_content;
+            syn::parenthesized!(call_index_content in content);
+            let index = call_index_content.parse::<syn::LitInt>()?;
+            if !index.suffix().is_empty() {
+                let msg = "Number literal must not have a suffix";
+                return Err(syn::Error::new(index.span(), msg));
+            }
+            Ok(FunctionAttr::CallIndex(index.base10_parse()?))
+        } else if lookahead.peek(keyword::feeless_if) {
+            content.parse::<keyword::feeless_if>()?;
+            let closure_content;
+            syn::parenthesized!(closure_content in content);
+            Ok(FunctionAttr::FeelessIf(
+                closure_content.span(),
+                closure_content.parse::<syn::ExprClosure>().map_err(|e| {
+                    let msg = "Invalid feeless_if attribute: expected a closure";
+                    let mut err = syn::Error::new(closure_content.span(), msg);
+                    err.combine(e);
+                    err
+                })?,
+            ))
+        } else {
+            Err(lookahead.error())
+        }
+    }
+}
+
+/// Attribute for arguments in function in call impl block.
+/// Parse for `#[pallet::compact]|
+pub struct ArgAttrIsCompact;
+
+impl syn::parse::Parse for ArgAttrIsCompact {
+    fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
+        input.parse::<syn::Token![#]>()?;
+        let content;
+        syn::bracketed!(content in input);
+        content.parse::<keyword::pallet>()?;
+        content.parse::<syn::Token![::]>()?;
+
+        content.parse::<keyword::compact>()?;
+        Ok(ArgAttrIsCompact)
+    }
+}
+
+/// Check the syntax is `OriginFor<T>`, `&OriginFor<T>` or `T::RuntimeOrigin`.
+pub fn check_dispatchable_first_arg_type(ty: &syn::Type, is_ref: bool) -> syn::Result<()> {
+    pub struct CheckOriginFor(bool);
+    impl syn::parse::Parse for CheckOriginFor {
+        fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
+            let is_ref = input.parse::<syn::Token![&]>().is_ok();
+            input.parse::<keyword::OriginFor>()?;
+            input.parse::<syn::Token![<]>()?;
+            input.parse::<keyword::T>()?;
+            input.parse::<syn::Token![>]>()?;
+
+            Ok(Self(is_ref))
+        }
+    }
+
+    pub struct CheckRuntimeOrigin;
+    impl syn::parse::Parse for CheckRuntimeOrigin {
+        fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
+            input.parse::<keyword::T>()?;
+            input.parse::<syn::Token![::]>()?;
+            input.parse::<keyword::RuntimeOrigin>()?;
+
+            Ok(Self)
+        }
+    }
+
+    let result_origin_for = syn::parse2::<CheckOriginFor>(ty.to_token_stream());
+    let result_runtime_origin = syn::parse2::<CheckRuntimeOrigin>(ty.to_token_stream());
+    return match (result_origin_for, result_runtime_origin) {
+        (Ok(CheckOriginFor(has_ref)), _) if is_ref == has_ref => Ok(()),
+        (_, Ok(_)) => Ok(()),
+        (_, _) => {
+            let msg = if is_ref {
+                "Invalid type: expected `&OriginFor<T>`"
+            } else {
+                "Invalid type: expected `OriginFor<T>` or `T::RuntimeOrigin`"
+            };
+            return Err(syn::Error::new(ty.span(), msg));
+        }
+    };
+}
+
+impl CallDef {
+    pub fn try_from(
+        attr_span: proc_macro2::Span,
+        index: usize,
+        item: &mut syn::Item,
+        dev_mode: bool,
+        inherited_call_weight: Option<InheritedCallWeightAttr>,
+    ) -> syn::Result<Self> {
+        let item_impl = if let syn::Item::Impl(item) = item {
+            item
+        } else {
+            return Err(syn::Error::new(
+                item.span(),
+                "Invalid pallet::call, expected item impl",
+            ));
+        };
+
+        let instances = vec![
+            helper::check_impl_gen(&item_impl.generics, item_impl.impl_token.span())?,
+            helper::check_pallet_struct_usage(&item_impl.self_ty)?,
+        ];
+
+        if let Some((_, _, for_)) = item_impl.trait_ {
+            let msg = "Invalid pallet::call, expected no trait ident as in \
+				`impl<..> Pallet<..> { .. }`";
+            return Err(syn::Error::new(for_.span(), msg));
+        }
+
+        let mut methods = vec![];
+        let mut indices = HashMap::new();
+        let mut last_index: Option<u8> = None;
+        for item in &mut item_impl.items {
+            if let syn::ImplItem::Fn(method) = item {
+                if !matches!(method.vis, syn::Visibility::Public(_)) {
+                    let msg = "Invalid pallet::call, dispatchable function must be public: \
+						`pub fn`";
+
+                    let span = match method.vis {
+                        syn::Visibility::Inherited => method.sig.span(),
+                        _ => method.vis.span(),
+                    };
+
+                    return Err(syn::Error::new(span, msg));
+                }
+
+                match method.sig.inputs.first() {
+                    None => {
+                        let msg = "Invalid pallet::call, must have at least origin arg";
+                        return Err(syn::Error::new(method.sig.span(), msg));
+                    }
+                    Some(syn::FnArg::Receiver(_)) => {
+                        let msg = "Invalid pallet::call, first argument must be a typed argument, \
+							e.g. `origin: OriginFor<T>`";
+                        return Err(syn::Error::new(method.sig.span(), msg));
+                    }
+                    Some(syn::FnArg::Typed(arg)) => {
+                        check_dispatchable_first_arg_type(&arg.ty, false)?;
+                    }
+                }
+
+                if let syn::ReturnType::Type(_, type_) = &method.sig.output {
+                    helper::check_pallet_call_return_type(type_)?;
+                } else {
+                    let msg = "Invalid pallet::call, require return type \
+						DispatchResultWithPostInfo";
+                    return Err(syn::Error::new(method.sig.span(), msg));
+                }
+
+                let cfg_attrs: Vec<syn::Attribute> = helper::get_item_cfg_attrs(&method.attrs);
+                let mut call_idx_attrs = vec![];
+                let mut weight_attrs = vec![];
+                let mut feeless_attrs = vec![];
+                for attr in helper::take_item_pallet_attrs(&mut method.attrs)?.into_iter() {
+                    match attr {
+                        FunctionAttr::CallIndex(_) => {
+                            call_idx_attrs.push(attr);
+                        }
+                        FunctionAttr::Weight(_) => {
+                            weight_attrs.push(attr);
+                        }
+                        FunctionAttr::FeelessIf(span, _) => {
+                            feeless_attrs.push((span, attr));
+                        }
+                    }
+                }
+
+                if weight_attrs.is_empty() && dev_mode {
+                    // inject a default O(1) weight when dev mode is enabled and no weight has
+                    // been specified on the call
+                    let empty_weight: syn::Expr = syn::parse_quote!(0);
+                    weight_attrs.push(FunctionAttr::Weight(empty_weight));
+                }
+
+                let weight = match weight_attrs.len() {
+                    0 if inherited_call_weight.is_some() => CallWeightDef::Inherited,
+                    0 if dev_mode => CallWeightDef::DevModeDefault,
+                    0 => return Err(syn::Error::new(
+                        method.sig.span(),
+                        "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.",
+                    )),
+                    1 => match weight_attrs.pop().unwrap() {
+                        FunctionAttr::Weight(w) => CallWeightDef::Immediate(w),
+                        _ => unreachable!("checked during creation of the let binding"),
+                    },
+                    _ => {
+                        let msg = "Invalid pallet::call, too many weight attributes given";
+                        return Err(syn::Error::new(method.sig.span(), msg));
+                    }
+                };
+
+                if call_idx_attrs.len() > 1 {
+                    let msg = "Invalid pallet::call, too many call_index attributes given";
+                    return Err(syn::Error::new(method.sig.span(), msg));
+                }
+                let call_index = call_idx_attrs.pop().map(|attr| match attr {
+                    FunctionAttr::CallIndex(idx) => idx,
+                    _ => unreachable!("checked during creation of the let binding"),
+                });
+                let explicit_call_index = call_index.is_some();
+
+                let final_index = match call_index {
+                    Some(i) => i,
+                    None => last_index
+                        .map_or(Some(0), |idx| idx.checked_add(1))
+                        .ok_or_else(|| {
+                            let msg = "Call index doesn't fit into u8, index is 256";
+                            syn::Error::new(method.sig.span(), msg)
+                        })?,
+                };
+                last_index = Some(final_index);
+
+                if let Some(used_fn) = indices.insert(final_index, method.sig.ident.clone()) {
+                    let msg = format!(
+                        "Call indices are conflicting: Both functions {} and {} are at index {}",
+                        used_fn, method.sig.ident, final_index,
+                    );
+                    let mut err = syn::Error::new(used_fn.span(), &msg);
+                    err.combine(syn::Error::new(method.sig.ident.span(), msg));
+                    return Err(err);
+                }
+
+                let mut args = vec![];
+                for arg in method.sig.inputs.iter_mut().skip(1) {
+                    let arg = if let syn::FnArg::Typed(arg) = arg {
+                        arg
+                    } else {
+                        unreachable!("Only first argument can be receiver");
+                    };
+
+                    let arg_attrs: Vec<ArgAttrIsCompact> =
+                        helper::take_item_pallet_attrs(&mut arg.attrs)?;
+
+                    if arg_attrs.len() > 1 {
+                        let msg = "Invalid pallet::call, argument has too many attributes";
+                        return Err(syn::Error::new(arg.span(), msg));
+                    }
+
+                    let arg_ident = if let syn::Pat::Ident(pat) = &*arg.pat {
+                        pat.ident.clone()
+                    } else {
+                        let msg = "Invalid pallet::call, argument must be ident";
+                        return Err(syn::Error::new(arg.pat.span(), msg));
+                    };
+
+                    args.push((!arg_attrs.is_empty(), arg_ident, arg.ty.clone()));
+                }
+
+                let docs = get_doc_literals(&method.attrs);
+
+                if feeless_attrs.len() > 1 {
+                    let msg = "Invalid pallet::call, there can only be one feeless_if attribute";
+                    return Err(syn::Error::new(feeless_attrs[1].0, msg));
+                }
+                let feeless_check: Option<ExprClosure> =
+                    feeless_attrs.pop().map(|(_, attr)| match attr {
+                        FunctionAttr::FeelessIf(_, closure) => closure,
+                        _ => unreachable!("checked during creation of the let binding"),
+                    });
+
+                if let Some(ref feeless_check) = feeless_check {
+                    if feeless_check.inputs.len() != args.len() + 1 {
+                        let msg = "Invalid pallet::call, feeless_if closure must have same \
+							number of arguments as the dispatchable function";
+                        return Err(syn::Error::new(feeless_check.span(), msg));
+                    }
+
+                    match feeless_check.inputs.first() {
+                        None => {
+                            let msg = "Invalid pallet::call, feeless_if closure must have at least origin arg";
+                            return Err(syn::Error::new(feeless_check.span(), msg));
+                        }
+                        Some(syn::Pat::Type(arg)) => {
+                            check_dispatchable_first_arg_type(&arg.ty, true)?;
+                        }
+                        _ => {
+                            let msg = "Invalid pallet::call, feeless_if closure first argument must be a typed argument, \
+								e.g. `origin: OriginFor<T>`";
+                            return Err(syn::Error::new(feeless_check.span(), msg));
+                        }
+                    }
+
+                    for (feeless_arg, arg) in feeless_check.inputs.iter().skip(1).zip(args.iter()) {
+                        let feeless_arg_type = if let syn::Pat::Type(syn::PatType { ty, .. }) =
+                            feeless_arg.clone()
+                        {
+                            if let syn::Type::Reference(pat) = *ty {
+                                pat.elem.clone()
+                            } else {
+                                let msg = "Invalid pallet::call, feeless_if closure argument must be a reference";
+                                return Err(syn::Error::new(ty.span(), msg));
+                            }
+                        } else {
+                            let msg = "Invalid pallet::call, feeless_if closure argument must be a type ascription pattern";
+                            return Err(syn::Error::new(feeless_arg.span(), msg));
+                        };
+
+                        if feeless_arg_type != arg.2 {
+                            let msg =
+                                "Invalid pallet::call, feeless_if closure argument must have \
+								a reference to the same type as the dispatchable function argument";
+                            return Err(syn::Error::new(feeless_arg.span(), msg));
+                        }
+                    }
+
+                    let valid_return = match &feeless_check.output {
+                        syn::ReturnType::Type(_, type_) => match *(type_.clone()) {
+                            syn::Type::Path(syn::TypePath { path, .. }) => path.is_ident("bool"),
+                            _ => false,
+                        },
+                        _ => false,
+                    };
+                    if !valid_return {
+                        let msg = "Invalid pallet::call, feeless_if closure must return `bool`";
+                        return Err(syn::Error::new(feeless_check.output.span(), msg));
+                    }
+                }
+
+                methods.push(CallVariantDef {
+                    name: method.sig.ident.clone(),
+                    weight,
+                    call_index: final_index,
+                    explicit_call_index,
+                    args,
+                    docs,
+                    attrs: method.attrs.clone(),
+                    cfg_attrs,
+                    feeless_check,
+                });
+            } else {
+                let msg = "Invalid pallet::call, only method accepted";
+                return Err(syn::Error::new(item.span(), msg));
+            }
+        }
+
+        Ok(Self {
+            index,
+            attr_span,
+            instances,
+            methods,
+            where_clause: item_impl.generics.where_clause.clone(),
+            docs: get_doc_literals(&item_impl.attrs),
+            inherited_call_weight,
+        })
+    }
+}
diff --git a/support/procedural-fork/src/pallet/parse/composite.rs b/support/procedural-fork/src/pallet/parse/composite.rs
new file mode 100644
index 000000000..38da1f205
--- /dev/null
+++ b/support/procedural-fork/src/pallet/parse/composite.rs
@@ -0,0 +1,197 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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::helper;
+use quote::ToTokens;
+use syn::spanned::Spanned;
+
+pub mod keyword {
+    use super::*;
+
+    syn::custom_keyword!(FreezeReason);
+    syn::custom_keyword!(HoldReason);
+    syn::custom_keyword!(LockId);
+    syn::custom_keyword!(SlashReason);
+    syn::custom_keyword!(Task);
+
+    pub enum CompositeKeyword {
+        FreezeReason(FreezeReason),
+        HoldReason(HoldReason),
+        LockId(LockId),
+        SlashReason(SlashReason),
+        Task(Task),
+    }
+
+    impl ToTokens for CompositeKeyword {
+        fn to_tokens(&self, tokens: &mut proc_macro2::TokenStream) {
+            use CompositeKeyword::*;
+            match self {
+                FreezeReason(inner) => inner.to_tokens(tokens),
+                HoldReason(inner) => inner.to_tokens(tokens),
+                LockId(inner) => inner.to_tokens(tokens),
+                SlashReason(inner) => inner.to_tokens(tokens),
+                Task(inner) => inner.to_tokens(tokens),
+            }
+        }
+    }
+
+    impl syn::parse::Parse for CompositeKeyword {
+        fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
+            let lookahead = input.lookahead1();
+            if lookahead.peek(FreezeReason) {
+                Ok(Self::FreezeReason(input.parse()?))
+            } else if lookahead.peek(HoldReason) {
+                Ok(Self::HoldReason(input.parse()?))
+            } else if lookahead.peek(LockId) {
+                Ok(Self::LockId(input.parse()?))
+            } else if lookahead.peek(SlashReason) {
+                Ok(Self::SlashReason(input.parse()?))
+            } else if lookahead.peek(Task) {
+                Ok(Self::Task(input.parse()?))
+            } else {
+                Err(lookahead.error())
+            }
+        }
+    }
+
+    impl std::fmt::Display for CompositeKeyword {
+        fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
+            use CompositeKeyword::*;
+            write!(
+                f,
+                "{}",
+                match self {
+                    FreezeReason(_) => "FreezeReason",
+                    HoldReason(_) => "HoldReason",
+                    Task(_) => "Task",
+                    LockId(_) => "LockId",
+                    SlashReason(_) => "SlashReason",
+                }
+            )
+        }
+    }
+}
+
+pub struct CompositeDef {
+    /// The index of the CompositeDef item in the pallet module.
+    pub index: usize,
+    /// The composite keyword used (contains span).
+    pub composite_keyword: keyword::CompositeKeyword,
+    /// Name of the associated type.
+    pub ident: syn::Ident,
+    /// Type parameters and where clause attached to a declaration of the pallet::composite_enum.
+    pub generics: syn::Generics,
+    /// The span of the pallet::composite_enum attribute.
+    pub attr_span: proc_macro2::Span,
+    /// Variant count of the pallet::composite_enum.
+    pub variant_count: u32,
+}
+
+impl CompositeDef {
+    pub fn try_from(
+        attr_span: proc_macro2::Span,
+        index: usize,
+        scrate: &syn::Path,
+        item: &mut syn::Item,
+    ) -> syn::Result<Self> {
+        let item = if let syn::Item::Enum(item) = item {
+            // check variants: composite enums support only field-less enum variants. This is
+            // because fields can introduce too many possibilities, making it challenging to compute
+            // a fixed variant count.
+            for variant in &item.variants {
+                match variant.fields {
+                    syn::Fields::Named(_) | syn::Fields::Unnamed(_) => {
+                        return Err(syn::Error::new(
+                            variant.ident.span(),
+                            "The composite enum does not support variants with fields!",
+                        ))
+                    }
+                    syn::Fields::Unit => (),
+                }
+            }
+            item
+        } else {
+            return Err(syn::Error::new(
+                item.span(),
+                "Invalid pallet::composite_enum, expected enum item",
+            ));
+        };
+
+        if !matches!(item.vis, syn::Visibility::Public(_)) {
+            let msg = format!(
+                "Invalid pallet::composite_enum, `{}` must be public",
+                item.ident
+            );
+            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)
+            } else {
+                false
+            }
+        });
+
+        if !has_derive_attr {
+            let derive_attr: syn::Attribute = syn::parse_quote! {
+                #[derive(
+                    Copy, Clone, Eq, PartialEq,
+                    #scrate::__private::codec::Encode, #scrate::__private::codec::Decode, #scrate::__private::codec::MaxEncodedLen,
+                    #scrate::__private::scale_info::TypeInfo,
+                    #scrate::__private::RuntimeDebug,
+                )]
+            };
+            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(
+                    ::core::marker::PhantomData<I>,
+                )
+            });
+        }
+
+        let composite_keyword =
+            syn::parse2::<keyword::CompositeKeyword>(item.ident.to_token_stream())?;
+
+        Ok(CompositeDef {
+            index,
+            composite_keyword,
+            attr_span,
+            generics: item.generics.clone(),
+            variant_count: item.variants.len() as u32,
+            ident: item.ident.clone(),
+        })
+    }
+}
diff --git a/support/procedural-fork/src/pallet/parse/config.rs b/support/procedural-fork/src/pallet/parse/config.rs
new file mode 100644
index 000000000..cde565245
--- /dev/null
+++ b/support/procedural-fork/src/pallet/parse/config.rs
@@ -0,0 +1,613 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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::helper;
+use frame_support_procedural_tools::{get_doc_literals, is_using_frame_crate};
+use quote::ToTokens;
+use syn::{spanned::Spanned, token, Token};
+
+/// List of additional token to be used for parsing.
+mod keyword {
+    syn::custom_keyword!(Config);
+    syn::custom_keyword!(From);
+    syn::custom_keyword!(T);
+    syn::custom_keyword!(I);
+    syn::custom_keyword!(config);
+    syn::custom_keyword!(pallet);
+    syn::custom_keyword!(IsType);
+    syn::custom_keyword!(RuntimeEvent);
+    syn::custom_keyword!(Event);
+    syn::custom_keyword!(frame_system);
+    syn::custom_keyword!(disable_frame_system_supertrait_check);
+    syn::custom_keyword!(no_default);
+    syn::custom_keyword!(no_default_bounds);
+    syn::custom_keyword!(constant);
+}
+
+#[derive(Default)]
+pub struct DefaultTrait {
+    /// A bool for each sub-trait item indicates whether the item has
+    /// `#[pallet::no_default_bounds]` attached to it. If true, the item will not have any bounds
+    /// in the generated default sub-trait.
+    pub items: Vec<(syn::TraitItem, bool)>,
+    pub has_system: bool,
+}
+
+/// Input definition for the pallet config.
+pub struct ConfigDef {
+    /// The index of item in pallet module.
+    pub index: usize,
+    /// Whether the trait has instance (i.e. define with `Config<I = ()>`)
+    pub has_instance: bool,
+    /// Const associated type.
+    pub consts_metadata: Vec<ConstMetadataDef>,
+    /// Whether the trait has the associated type `Event`, note that those bounds are
+    /// checked:
+    /// * `IsType<Self as frame_system::Config>::RuntimeEvent`
+    /// * `From<Event>` or `From<Event<T>>` or `From<Event<T, I>>`
+    pub has_event_type: bool,
+    /// The where clause on trait definition but modified so `Self` is `T`.
+    pub where_clause: Option<syn::WhereClause>,
+    /// The span of the pallet::config attribute.
+    pub attr_span: proc_macro2::Span,
+    /// Whether a default sub-trait should be generated.
+    ///
+    /// Contains default sub-trait items (instantiated by `#[pallet::config(with_default)]`).
+    /// Vec will be empty if `#[pallet::config(with_default)]` is not specified or if there are
+    /// no trait items.
+    pub default_sub_trait: Option<DefaultTrait>,
+}
+
+/// Input definition for a constant in pallet config.
+pub struct ConstMetadataDef {
+    /// Name of the associated type.
+    pub ident: syn::Ident,
+    /// The type in Get, e.g. `u32` in `type Foo: Get<u32>;`, but `Self` is replaced by `T`
+    pub type_: syn::Type,
+    /// The doc associated
+    pub doc: Vec<syn::Expr>,
+}
+
+impl TryFrom<&syn::TraitItemType> for ConstMetadataDef {
+    type Error = syn::Error;
+
+    fn try_from(trait_ty: &syn::TraitItemType) -> Result<Self, Self::Error> {
+        let err = |span, msg| {
+            syn::Error::new(
+                span,
+                format!("Invalid usage of `#[pallet::constant]`: {}", msg),
+            )
+        };
+        let doc = get_doc_literals(&trait_ty.attrs);
+        let ident = trait_ty.ident.clone();
+        let bound = trait_ty
+            .bounds
+            .iter()
+            .find_map(|b| {
+                if let syn::TypeParamBound::Trait(tb) = b {
+                    tb.path
+                        .segments
+                        .last()
+                        .and_then(|s| if s.ident == "Get" { Some(s) } else { None })
+                } else {
+                    None
+                }
+            })
+            .ok_or_else(|| err(trait_ty.span(), "`Get<T>` trait bound not found"))?;
+        let type_arg = if let syn::PathArguments::AngleBracketed(ref ab) = bound.arguments {
+            if ab.args.len() == 1 {
+                if let syn::GenericArgument::Type(ref ty) = ab.args[0] {
+                    Ok(ty)
+                } else {
+                    Err(err(ab.args[0].span(), "Expected a type argument"))
+                }
+            } else {
+                Err(err(bound.span(), "Expected a single type argument"))
+            }
+        } else {
+            Err(err(bound.span(), "Expected trait generic args"))
+        }?;
+        let type_ = syn::parse2::<syn::Type>(replace_self_by_t(type_arg.to_token_stream()))
+            .expect("Internal error: replacing `Self` by `T` should result in valid type");
+
+        Ok(Self { ident, type_, doc })
+    }
+}
+
+/// Parse for `#[pallet::disable_frame_system_supertrait_check]`
+pub struct DisableFrameSystemSupertraitCheck;
+
+impl syn::parse::Parse for DisableFrameSystemSupertraitCheck {
+    fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
+        input.parse::<syn::Token![#]>()?;
+        let content;
+        syn::bracketed!(content in input);
+        content.parse::<syn::Ident>()?;
+        content.parse::<syn::Token![::]>()?;
+
+        content.parse::<keyword::disable_frame_system_supertrait_check>()?;
+        Ok(Self)
+    }
+}
+
+/// Parsing for the `typ` portion of `PalletAttr`
+#[derive(derive_syn_parse::Parse, PartialEq, Eq)]
+pub enum PalletAttrType {
+    #[peek(keyword::no_default, name = "no_default")]
+    NoDefault(keyword::no_default),
+    #[peek(keyword::no_default_bounds, name = "no_default_bounds")]
+    NoBounds(keyword::no_default_bounds),
+    #[peek(keyword::constant, name = "constant")]
+    Constant(keyword::constant),
+}
+
+/// Parsing for `#[pallet::X]`
+#[derive(derive_syn_parse::Parse)]
+pub struct PalletAttr {
+    _pound: Token![#],
+    #[bracket]
+    _bracket: token::Bracket,
+    #[inside(_bracket)]
+    _pallet: keyword::pallet,
+    #[prefix(Token![::] in _bracket)]
+    #[inside(_bracket)]
+    typ: PalletAttrType,
+}
+
+/// 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> {
+        input.parse::<keyword::IsType>()?;
+        input.parse::<syn::Token![<]>()?;
+        input.parse::<syn::Token![<]>()?;
+        input.parse::<syn::Token![Self]>()?;
+        input.parse::<syn::Token![as]>()?;
+        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(config_path))
+    }
+}
+
+/// Parse for `From<Event>` or `From<Event<Self>>` or `From<Event<Self, I>>`
+pub struct FromEventParse {
+    is_generic: bool,
+    has_instance: bool,
+}
+
+impl syn::parse::Parse for FromEventParse {
+    fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
+        let mut is_generic = false;
+        let mut has_instance = false;
+
+        input.parse::<keyword::From>()?;
+        input.parse::<syn::Token![<]>()?;
+        input.parse::<keyword::Event>()?;
+        if input.peek(syn::Token![<]) {
+            is_generic = true;
+            input.parse::<syn::Token![<]>()?;
+            input.parse::<syn::Token![Self]>()?;
+            if input.peek(syn::Token![,]) {
+                input.parse::<syn::Token![,]>()?;
+                input.parse::<keyword::I>()?;
+                has_instance = true;
+            }
+            input.parse::<syn::Token![>]>()?;
+        }
+        input.parse::<syn::Token![>]>()?;
+
+        Ok(Self {
+            is_generic,
+            has_instance,
+        })
+    }
+}
+
+/// 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::Path,
+    trait_item: &syn::TraitItem,
+    trait_has_instance: bool,
+) -> syn::Result<bool> {
+    if let syn::TraitItem::Type(type_) = trait_item {
+        if type_.ident == "RuntimeEvent" {
+            // Check event has no generics
+            if !type_.generics.params.is_empty() || type_.generics.where_clause.is_some() {
+                let msg = "Invalid `type RuntimeEvent`, associated type `RuntimeEvent` is reserved and must have\
+					no generics nor where_clause";
+                return Err(syn::Error::new(trait_item.span(), msg));
+            }
+
+            // 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| has_expected_system_config(b.0, frame_system))
+            });
+
+            if !has_is_type_bound {
+                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));
+            }
+
+            let from_event_bound = type_
+                .bounds
+                .iter()
+                .find_map(|s| syn::parse2::<FromEventParse>(s.to_token_stream()).ok());
+
+            let from_event_bound = if let Some(b) = from_event_bound {
+                b
+            } else {
+                let msg = "Invalid `type RuntimeEvent`, associated type `RuntimeEvent` is reserved and must \
+					bound: `From<Event>` or `From<Event<Self>>` or `From<Event<Self, I>>`";
+                return Err(syn::Error::new(type_.span(), msg));
+            };
+
+            if from_event_bound.is_generic && (from_event_bound.has_instance != trait_has_instance)
+            {
+                let msg = "Invalid `type RuntimeEvent`, associated type `RuntimeEvent` bounds inconsistent \
+					`From<Event..>`. Config and generic Event must be both with instance or \
+					without instance";
+                return Err(syn::Error::new(type_.span(), msg));
+            }
+
+            Ok(true)
+        } else {
+            Ok(false)
+        }
+    } else {
+        Ok(false)
+    }
+}
+
+/// 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
+        .into_iter()
+        .map(|token_tree| match token_tree {
+            proc_macro2::TokenTree::Group(group) => {
+                proc_macro2::Group::new(group.delimiter(), replace_self_by_t(group.stream())).into()
+            }
+            proc_macro2::TokenTree::Ident(ident) if ident == "Self" => {
+                proc_macro2::Ident::new("T", ident.span()).into()
+            }
+            other => other,
+        })
+        .collect()
+}
+
+impl ConfigDef {
+    pub fn try_from(
+        frame_system: &syn::Path,
+        attr_span: proc_macro2::Span,
+        index: usize,
+        item: &mut syn::Item,
+        enable_default: bool,
+    ) -> syn::Result<Self> {
+        let item = if let syn::Item::Trait(item) = item {
+            item
+        } else {
+            let msg = "Invalid pallet::config, expected trait definition";
+            return Err(syn::Error::new(item.span(), msg));
+        };
+
+        if !matches!(item.vis, syn::Visibility::Public(_)) {
+            let msg = "Invalid pallet::config, trait must be public";
+            return Err(syn::Error::new(item.span(), msg));
+        }
+
+        syn::parse2::<keyword::Config>(item.ident.to_token_stream())?;
+
+        let where_clause = {
+            let stream = replace_self_by_t(item.generics.where_clause.to_token_stream());
+            syn::parse2::<Option<syn::WhereClause>>(stream).expect(
+                "Internal error: replacing `Self` by `T` should result in valid where
+					clause",
+            )
+        };
+
+        if item.generics.params.len() > 1 {
+            let msg = "Invalid pallet::config, expected no more than one generic";
+            return Err(syn::Error::new(item.generics.params[2].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_frame_system_supertrait = item.supertraits.iter().any(|s| {
+            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;
+        let mut consts_metadata = vec![];
+        let mut default_sub_trait = if enable_default {
+            Some(DefaultTrait {
+                items: Default::default(),
+                has_system: has_frame_system_supertrait,
+            })
+        } else {
+            None
+        };
+        for trait_item in &mut item.items {
+            let is_event = check_event_type(frame_system, trait_item, has_instance)?;
+            has_event_type = has_event_type || is_event;
+
+            let mut already_no_default = false;
+            let mut already_constant = false;
+            let mut already_no_default_bounds = false;
+
+            while let Ok(Some(pallet_attr)) =
+                helper::take_first_item_pallet_attr::<PalletAttr>(trait_item)
+            {
+                match (pallet_attr.typ, &trait_item) {
+                    (PalletAttrType::Constant(_), syn::TraitItem::Type(ref typ)) => {
+                        if already_constant {
+                            return Err(syn::Error::new(
+                                pallet_attr._bracket.span.join(),
+                                "Duplicate #[pallet::constant] attribute not allowed.",
+                            ));
+                        }
+                        already_constant = true;
+                        consts_metadata.push(ConstMetadataDef::try_from(typ)?);
+                    }
+                    (PalletAttrType::Constant(_), _) => {
+                        return Err(syn::Error::new(
+                            trait_item.span(),
+                            "Invalid #[pallet::constant] in #[pallet::config], expected type item",
+                        ))
+                    }
+                    (PalletAttrType::NoDefault(_), _) => {
+                        if !enable_default {
+                            return Err(syn::Error::new(
+								pallet_attr._bracket.span.join(),
+								"`#[pallet:no_default]` can only be used if `#[pallet::config(with_default)]` \
+								has been specified"
+							));
+                        }
+                        if already_no_default {
+                            return Err(syn::Error::new(
+                                pallet_attr._bracket.span.join(),
+                                "Duplicate #[pallet::no_default] attribute not allowed.",
+                            ));
+                        }
+
+                        already_no_default = true;
+                    }
+                    (PalletAttrType::NoBounds(_), _) => {
+                        if !enable_default {
+                            return Err(syn::Error::new(
+								pallet_attr._bracket.span.join(),
+								"`#[pallet:no_default_bounds]` can only be used if `#[pallet::config(with_default)]` \
+								has been specified"
+							));
+                        }
+                        if already_no_default_bounds {
+                            return Err(syn::Error::new(
+                                pallet_attr._bracket.span.join(),
+                                "Duplicate #[pallet::no_default_bounds] attribute not allowed.",
+                            ));
+                        }
+                        already_no_default_bounds = true;
+                    }
+                }
+            }
+
+            if !already_no_default && enable_default {
+                default_sub_trait
+                    .as_mut()
+                    .expect("is 'Some(_)' if 'enable_default'; qed")
+                    .items
+                    .push((trait_item.clone(), already_no_default_bounds));
+            }
+        }
+
+        let attr: Option<DisableFrameSystemSupertraitCheck> =
+            helper::take_first_item_pallet_attr(&mut item.attrs)?;
+        let disable_system_supertrait_check = attr.is_some();
+
+        if !has_frame_system_supertrait && !disable_system_supertrait_check {
+            let found = if item.supertraits.is_empty() {
+                "none".to_string()
+            } else {
+                let mut found = item.supertraits.iter().fold(String::new(), |acc, s| {
+                    format!("{}`{}`, ", acc, quote::quote!(#s))
+                });
+                found.pop();
+                found.pop();
+                found
+            };
+
+            let msg = format!(
+                "Invalid pallet::trait, expected explicit `{}::Config` as supertrait, \
+				found {}. \
+				(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.to_token_stream(),
+                found,
+            );
+            return Err(syn::Error::new(item.span(), msg));
+        }
+
+        Ok(Self {
+            index,
+            has_instance,
+            consts_metadata,
+            has_event_type,
+            where_clause,
+            attr_span,
+            default_sub_trait,
+        })
+    }
+}
+
+#[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/support/procedural-fork/src/pallet/parse/error.rs b/support/procedural-fork/src/pallet/parse/error.rs
new file mode 100644
index 000000000..e93e2113f
--- /dev/null
+++ b/support/procedural-fork/src/pallet/parse/error.rs
@@ -0,0 +1,129 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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::helper;
+use frame_support_procedural_tools::get_doc_literals;
+use quote::ToTokens;
+use syn::{spanned::Spanned, Fields};
+
+/// List of additional token to be used for parsing.
+mod keyword {
+    syn::custom_keyword!(Error);
+}
+
+/// Records information about the error enum variant field.
+pub struct VariantField {
+    /// Whether or not the field is named, i.e. whether it is a tuple variant or struct variant.
+    pub is_named: bool,
+}
+
+/// Records information about the error enum variants.
+pub struct VariantDef {
+    /// The variant ident.
+    pub ident: syn::Ident,
+    /// The variant field, if any.
+    pub field: Option<VariantField>,
+    /// The variant doc literals.
+    pub docs: Vec<syn::Expr>,
+    /// The `cfg` attributes.
+    pub cfg_attrs: Vec<syn::Attribute>,
+}
+
+/// This checks error declaration as a enum declaration with only variants without fields nor
+/// discriminant.
+pub struct ErrorDef {
+    /// The index of error item in pallet module.
+    pub index: usize,
+    /// Variant definitions.
+    pub variants: Vec<VariantDef>,
+    /// A set of usage of instance, must be check for consistency with trait.
+    pub instances: Vec<helper::InstanceUsage>,
+    /// The keyword error used (contains span).
+    pub error: keyword::Error,
+    /// The span of the pallet::error attribute.
+    pub attr_span: proc_macro2::Span,
+}
+
+impl ErrorDef {
+    pub fn try_from(
+        attr_span: proc_macro2::Span,
+        index: usize,
+        item: &mut syn::Item,
+    ) -> syn::Result<Self> {
+        let item = if let syn::Item::Enum(item) = item {
+            item
+        } else {
+            return Err(syn::Error::new(
+                item.span(),
+                "Invalid pallet::error, expected item enum",
+            ));
+        };
+        if !matches!(item.vis, syn::Visibility::Public(_)) {
+            let msg = "Invalid pallet::error, `Error` must be public";
+            return Err(syn::Error::new(item.span(), msg));
+        }
+
+        let instances = vec![helper::check_type_def_gen_no_bounds(
+            &item.generics,
+            item.ident.span(),
+        )?];
+
+        if item.generics.where_clause.is_some() {
+            let msg = "Invalid pallet::error, where clause is not allowed on pallet error item";
+            return Err(syn::Error::new(
+                item.generics.where_clause.as_ref().unwrap().span(),
+                msg,
+            ));
+        }
+
+        let error = syn::parse2::<keyword::Error>(item.ident.to_token_stream())?;
+
+        let variants = item
+            .variants
+            .iter()
+            .map(|variant| {
+                let field_ty = match &variant.fields {
+                    Fields::Unit => None,
+                    Fields::Named(_) => Some(VariantField { is_named: true }),
+                    Fields::Unnamed(_) => Some(VariantField { is_named: false }),
+                };
+                if variant.discriminant.is_some() {
+                    let msg = "Invalid pallet::error, unexpected discriminant, discriminants \
+						are not supported";
+                    let span = variant.discriminant.as_ref().unwrap().0.span();
+                    return Err(syn::Error::new(span, msg));
+                }
+                let cfg_attrs: Vec<syn::Attribute> = helper::get_item_cfg_attrs(&variant.attrs);
+
+                Ok(VariantDef {
+                    ident: variant.ident.clone(),
+                    field: field_ty,
+                    docs: get_doc_literals(&variant.attrs),
+                    cfg_attrs,
+                })
+            })
+            .collect::<Result<_, _>>()?;
+
+        Ok(ErrorDef {
+            attr_span,
+            index,
+            variants,
+            instances,
+            error,
+        })
+    }
+}
diff --git a/support/procedural-fork/src/pallet/parse/event.rs b/support/procedural-fork/src/pallet/parse/event.rs
new file mode 100644
index 000000000..6102dd31f
--- /dev/null
+++ b/support/procedural-fork/src/pallet/parse/event.rs
@@ -0,0 +1,159 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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::helper;
+use quote::ToTokens;
+use syn::spanned::Spanned;
+
+/// List of additional token to be used for parsing.
+mod keyword {
+    syn::custom_keyword!(Event);
+    syn::custom_keyword!(pallet);
+    syn::custom_keyword!(generate_deposit);
+    syn::custom_keyword!(deposit_event);
+}
+
+/// Definition for pallet event enum.
+pub struct EventDef {
+    /// The index of event item in pallet module.
+    pub index: usize,
+    /// The keyword Event used (contains span).
+    pub event: keyword::Event,
+    /// A set of usage of instance, must be check for consistency with trait.
+    pub instances: Vec<helper::InstanceUsage>,
+    /// The kind of generic the type `Event` has.
+    pub gen_kind: super::GenericKind,
+    /// Whether the function `deposit_event` must be generated.
+    pub deposit_event: Option<PalletEventDepositAttr>,
+    /// Where clause used in event definition.
+    pub where_clause: Option<syn::WhereClause>,
+    /// The span of the pallet::event attribute.
+    pub attr_span: proc_macro2::Span,
+}
+
+/// Attribute for a pallet's Event.
+///
+/// Syntax is:
+/// * `#[pallet::generate_deposit($vis fn deposit_event)]`
+pub struct PalletEventDepositAttr {
+    pub fn_vis: syn::Visibility,
+    // Span for the keyword deposit_event
+    pub fn_span: proc_macro2::Span,
+    // Span of the attribute
+    pub span: proc_macro2::Span,
+}
+
+impl syn::parse::Parse for PalletEventDepositAttr {
+    fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
+        input.parse::<syn::Token![#]>()?;
+        let content;
+        syn::bracketed!(content in input);
+        content.parse::<keyword::pallet>()?;
+        content.parse::<syn::Token![::]>()?;
+
+        let span = content.parse::<keyword::generate_deposit>()?.span();
+        let generate_content;
+        syn::parenthesized!(generate_content in content);
+        let fn_vis = generate_content.parse::<syn::Visibility>()?;
+        generate_content.parse::<syn::Token![fn]>()?;
+        let fn_span = generate_content.parse::<keyword::deposit_event>()?.span();
+
+        Ok(PalletEventDepositAttr {
+            fn_vis,
+            span,
+            fn_span,
+        })
+    }
+}
+
+struct PalletEventAttrInfo {
+    deposit_event: Option<PalletEventDepositAttr>,
+}
+
+impl PalletEventAttrInfo {
+    fn from_attrs(attrs: Vec<PalletEventDepositAttr>) -> syn::Result<Self> {
+        let mut deposit_event = None;
+        for attr in attrs {
+            if deposit_event.is_none() {
+                deposit_event = Some(attr)
+            } else {
+                return Err(syn::Error::new(attr.span, "Duplicate attribute"));
+            }
+        }
+
+        Ok(PalletEventAttrInfo { deposit_event })
+    }
+}
+
+impl EventDef {
+    pub fn try_from(
+        attr_span: proc_macro2::Span,
+        index: usize,
+        item: &mut syn::Item,
+    ) -> syn::Result<Self> {
+        let item = if let syn::Item::Enum(item) = item {
+            item
+        } else {
+            return Err(syn::Error::new(
+                item.span(),
+                "Invalid pallet::event, expected enum item",
+            ));
+        };
+
+        let event_attrs: Vec<PalletEventDepositAttr> =
+            helper::take_item_pallet_attrs(&mut item.attrs)?;
+        let attr_info = PalletEventAttrInfo::from_attrs(event_attrs)?;
+        let deposit_event = attr_info.deposit_event;
+
+        if !matches!(item.vis, syn::Visibility::Public(_)) {
+            let msg = "Invalid pallet::event, `Event` must be public";
+            return Err(syn::Error::new(item.span(), msg));
+        }
+
+        let where_clause = item.generics.where_clause.clone();
+
+        let mut instances = vec![];
+        // NOTE: Event is not allowed to be only generic on I because it is not supported
+        // by construct_runtime.
+        if let Some(u) = helper::check_type_def_optional_gen(&item.generics, item.ident.span())? {
+            instances.push(u);
+        } else {
+            // construct_runtime only allow non generic event for non instantiable pallet.
+            instances.push(helper::InstanceUsage {
+                has_instance: false,
+                span: item.ident.span(),
+            })
+        }
+
+        let has_instance = item.generics.type_params().any(|t| t.ident == "I");
+        let has_config = item.generics.type_params().any(|t| t.ident == "T");
+        let gen_kind = super::GenericKind::from_gens(has_config, has_instance)
+            .expect("Checked by `helper::check_type_def_optional_gen` above");
+
+        let event = syn::parse2::<keyword::Event>(item.ident.to_token_stream())?;
+
+        Ok(EventDef {
+            attr_span,
+            index,
+            instances,
+            deposit_event,
+            event,
+            gen_kind,
+            where_clause,
+        })
+    }
+}
diff --git a/support/procedural-fork/src/pallet/parse/extra_constants.rs b/support/procedural-fork/src/pallet/parse/extra_constants.rs
new file mode 100644
index 000000000..38acea21a
--- /dev/null
+++ b/support/procedural-fork/src/pallet/parse/extra_constants.rs
@@ -0,0 +1,168 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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::helper;
+use frame_support_procedural_tools::get_doc_literals;
+use syn::spanned::Spanned;
+
+/// List of additional token to be used for parsing.
+mod keyword {
+    syn::custom_keyword!(DispatchResultWithPostInfo);
+    syn::custom_keyword!(Call);
+    syn::custom_keyword!(OriginFor);
+    syn::custom_keyword!(weight);
+    syn::custom_keyword!(compact);
+    syn::custom_keyword!(T);
+    syn::custom_keyword!(pallet);
+    syn::custom_keyword!(constant_name);
+}
+
+/// Definition of extra constants typically `impl<T: Config> Pallet<T> { ... }`
+pub struct ExtraConstantsDef {
+    /// The where_clause used.
+    pub where_clause: Option<syn::WhereClause>,
+    /// A set of usage of instance, must be check for consistency with trait.
+    pub instances: Vec<helper::InstanceUsage>,
+    /// The index of call item in pallet module.
+    pub index: usize,
+    /// The extra constant defined.
+    pub extra_constants: Vec<ExtraConstantDef>,
+}
+
+/// Input definition for an constant in pallet.
+pub struct ExtraConstantDef {
+    /// Name of the function
+    pub ident: syn::Ident,
+    /// The type returned by the function
+    pub type_: syn::Type,
+    /// The doc associated
+    pub doc: Vec<syn::Expr>,
+    /// Optional MetaData Name
+    pub metadata_name: Option<syn::Ident>,
+}
+
+/// Attributes for functions in extra_constants impl block.
+/// Parse for `#[pallet::constant_name(ConstantName)]`
+pub struct ExtraConstAttr {
+    metadata_name: syn::Ident,
+}
+
+impl syn::parse::Parse for ExtraConstAttr {
+    fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
+        input.parse::<syn::Token![#]>()?;
+        let content;
+        syn::bracketed!(content in input);
+        content.parse::<keyword::pallet>()?;
+        content.parse::<syn::Token![::]>()?;
+        content.parse::<keyword::constant_name>()?;
+
+        let metadata_name;
+        syn::parenthesized!(metadata_name in content);
+        Ok(ExtraConstAttr {
+            metadata_name: metadata_name.parse::<syn::Ident>()?,
+        })
+    }
+}
+
+impl ExtraConstantsDef {
+    pub fn try_from(index: usize, item: &mut syn::Item) -> syn::Result<Self> {
+        let item = if let syn::Item::Impl(item) = item {
+            item
+        } else {
+            return Err(syn::Error::new(
+                item.span(),
+                "Invalid pallet::extra_constants, expected item impl",
+            ));
+        };
+
+        let instances = vec![
+            helper::check_impl_gen(&item.generics, item.impl_token.span())?,
+            helper::check_pallet_struct_usage(&item.self_ty)?,
+        ];
+
+        if let Some((_, _, for_)) = item.trait_ {
+            let msg = "Invalid pallet::call, expected no trait ident as in \
+				`impl<..> Pallet<..> { .. }`";
+            return Err(syn::Error::new(for_.span(), msg));
+        }
+
+        let mut extra_constants = vec![];
+        for impl_item in &mut item.items {
+            let method = if let syn::ImplItem::Fn(method) = impl_item {
+                method
+            } else {
+                let msg = "Invalid pallet::call, only method accepted";
+                return Err(syn::Error::new(impl_item.span(), msg));
+            };
+
+            if !method.sig.inputs.is_empty() {
+                let msg = "Invalid pallet::extra_constants, method must have 0 args";
+                return Err(syn::Error::new(method.sig.span(), msg));
+            }
+
+            if !method.sig.generics.params.is_empty() {
+                let msg = "Invalid pallet::extra_constants, method must have 0 generics";
+                return Err(syn::Error::new(method.sig.generics.params[0].span(), msg));
+            }
+
+            if method.sig.generics.where_clause.is_some() {
+                let msg = "Invalid pallet::extra_constants, method must have no where clause";
+                return Err(syn::Error::new(
+                    method.sig.generics.where_clause.span(),
+                    msg,
+                ));
+            }
+
+            let type_ = match &method.sig.output {
+                syn::ReturnType::Default => {
+                    let msg = "Invalid pallet::extra_constants, method must have a return type";
+                    return Err(syn::Error::new(method.span(), msg));
+                }
+                syn::ReturnType::Type(_, type_) => *type_.clone(),
+            };
+
+            // parse metadata_name
+            let mut extra_constant_attrs: Vec<ExtraConstAttr> =
+                helper::take_item_pallet_attrs(method)?;
+
+            if extra_constant_attrs.len() > 1 {
+                let msg =
+                    "Invalid attribute in pallet::constant_name, only one attribute is expected";
+                return Err(syn::Error::new(
+                    extra_constant_attrs[1].metadata_name.span(),
+                    msg,
+                ));
+            }
+
+            let metadata_name = extra_constant_attrs.pop().map(|attr| attr.metadata_name);
+
+            extra_constants.push(ExtraConstantDef {
+                ident: method.sig.ident.clone(),
+                type_,
+                doc: get_doc_literals(&method.attrs),
+                metadata_name,
+            });
+        }
+
+        Ok(Self {
+            index,
+            instances,
+            where_clause: item.generics.where_clause.clone(),
+            extra_constants,
+        })
+    }
+}
diff --git a/support/procedural-fork/src/pallet/parse/genesis_build.rs b/support/procedural-fork/src/pallet/parse/genesis_build.rs
new file mode 100644
index 000000000..670d4d5ef
--- /dev/null
+++ b/support/procedural-fork/src/pallet/parse/genesis_build.rs
@@ -0,0 +1,66 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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::helper;
+use syn::spanned::Spanned;
+
+/// Definition for pallet genesis build implementation.
+pub struct GenesisBuildDef {
+    /// The index of item in pallet module.
+    pub index: usize,
+    /// A set of usage of instance, must be check for consistency with trait.
+    pub instances: Option<Vec<helper::InstanceUsage>>,
+    /// The where_clause used.
+    pub where_clause: Option<syn::WhereClause>,
+    /// The span of the pallet::genesis_build attribute.
+    pub attr_span: proc_macro2::Span,
+}
+
+impl GenesisBuildDef {
+    pub fn try_from(
+        attr_span: proc_macro2::Span,
+        index: usize,
+        item: &mut syn::Item,
+    ) -> syn::Result<Self> {
+        let item = if let syn::Item::Impl(item) = item {
+            item
+        } else {
+            let msg = "Invalid pallet::genesis_build, expected item impl";
+            return Err(syn::Error::new(item.span(), msg));
+        };
+
+        let item_trait = &item
+            .trait_
+            .as_ref()
+            .ok_or_else(|| {
+                let msg = "Invalid pallet::genesis_build, expected impl<..> GenesisBuild<..> \
+					for GenesisConfig<..>";
+                syn::Error::new(item.span(), msg)
+            })?
+            .1;
+
+        let instances =
+            helper::check_genesis_builder_usage(item_trait)?.map(|instances| vec![instances]);
+
+        Ok(Self {
+            attr_span,
+            index,
+            instances,
+            where_clause: item.generics.where_clause.clone(),
+        })
+    }
+}
diff --git a/support/procedural-fork/src/pallet/parse/genesis_config.rs b/support/procedural-fork/src/pallet/parse/genesis_config.rs
new file mode 100644
index 000000000..1c52345eb
--- /dev/null
+++ b/support/procedural-fork/src/pallet/parse/genesis_config.rs
@@ -0,0 +1,78 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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::helper;
+use syn::spanned::Spanned;
+
+/// Definition for pallet genesis config type.
+///
+/// Either:
+/// * `struct GenesisConfig`
+/// * `enum GenesisConfig`
+pub struct GenesisConfigDef {
+    /// The index of item in pallet module.
+    pub index: usize,
+    /// The kind of generic the type `GenesisConfig` has.
+    pub gen_kind: super::GenericKind,
+    /// A set of usage of instance, must be check for consistency with trait.
+    pub instances: Vec<helper::InstanceUsage>,
+    /// The ident of genesis_config, can be used for span.
+    pub genesis_config: syn::Ident,
+}
+
+impl GenesisConfigDef {
+    pub fn try_from(index: usize, item: &mut syn::Item) -> syn::Result<Self> {
+        let item_span = item.span();
+        let (vis, ident, generics) = match &item {
+            syn::Item::Enum(item) => (&item.vis, &item.ident, &item.generics),
+            syn::Item::Struct(item) => (&item.vis, &item.ident, &item.generics),
+            _ => {
+                let msg = "Invalid pallet::genesis_config, expected enum or struct";
+                return Err(syn::Error::new(item.span(), msg));
+            }
+        };
+
+        let mut instances = vec![];
+        // NOTE: GenesisConfig is not allowed to be only generic on I because it is not supported
+        // by construct_runtime.
+        if let Some(u) = helper::check_type_def_optional_gen(generics, ident.span())? {
+            instances.push(u);
+        }
+
+        let has_instance = generics.type_params().any(|t| t.ident == "I");
+        let has_config = generics.type_params().any(|t| t.ident == "T");
+        let gen_kind = super::GenericKind::from_gens(has_config, has_instance)
+            .expect("Checked by `helper::check_type_def_optional_gen` above");
+
+        if !matches!(vis, syn::Visibility::Public(_)) {
+            let msg = "Invalid pallet::genesis_config, GenesisConfig must be public";
+            return Err(syn::Error::new(item_span, msg));
+        }
+
+        if ident != "GenesisConfig" {
+            let msg = "Invalid pallet::genesis_config, ident must `GenesisConfig`";
+            return Err(syn::Error::new(ident.span(), msg));
+        }
+
+        Ok(GenesisConfigDef {
+            index,
+            genesis_config: ident.clone(),
+            instances,
+            gen_kind,
+        })
+    }
+}
diff --git a/support/procedural-fork/src/pallet/parse/helper.rs b/support/procedural-fork/src/pallet/parse/helper.rs
new file mode 100644
index 000000000..f58c8d81c
--- /dev/null
+++ b/support/procedural-fork/src/pallet/parse/helper.rs
@@ -0,0 +1,665 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 proc_macro2::TokenStream;
+use quote::{quote, ToTokens};
+use syn::spanned::Spanned;
+
+/// List of additional token to be used for parsing.
+mod keyword {
+    syn::custom_keyword!(I);
+    syn::custom_keyword!(compact);
+    syn::custom_keyword!(GenesisBuild);
+    syn::custom_keyword!(BuildGenesisConfig);
+    syn::custom_keyword!(Config);
+    syn::custom_keyword!(T);
+    syn::custom_keyword!(Pallet);
+    syn::custom_keyword!(origin);
+    syn::custom_keyword!(DispatchResult);
+    syn::custom_keyword!(DispatchResultWithPostInfo);
+}
+
+/// A usage of instance, either the trait `Config` has been used with instance or without instance.
+/// Used to check for consistency.
+#[derive(Clone)]
+pub struct InstanceUsage {
+    pub has_instance: bool,
+    pub span: proc_macro2::Span,
+}
+
+/// Trait implemented for syn items to get mutable references on their attributes.
+///
+/// NOTE: verbatim variants are not supported.
+pub trait MutItemAttrs {
+    fn mut_item_attrs(&mut self) -> Option<&mut Vec<syn::Attribute>>;
+}
+
+/// Take the first pallet attribute (e.g. attribute like `#[pallet..]`) and decode it to `Attr`
+pub(crate) fn take_first_item_pallet_attr<Attr>(
+    item: &mut impl MutItemAttrs,
+) -> syn::Result<Option<Attr>>
+where
+    Attr: syn::parse::Parse,
+{
+    let attrs = if let Some(attrs) = item.mut_item_attrs() {
+        attrs
+    } else {
+        return Ok(None);
+    };
+
+    if let Some(index) = attrs.iter().position(|attr| {
+        attr.path()
+            .segments
+            .first()
+            .map_or(false, |segment| segment.ident == "pallet")
+    }) {
+        let pallet_attr = attrs.remove(index);
+        Ok(Some(syn::parse2(pallet_attr.into_token_stream())?))
+    } else {
+        Ok(None)
+    }
+}
+
+/// Take all the pallet attributes (e.g. attribute like `#[pallet..]`) and decode them to `Attr`
+pub(crate) fn take_item_pallet_attrs<Attr>(item: &mut impl MutItemAttrs) -> syn::Result<Vec<Attr>>
+where
+    Attr: syn::parse::Parse,
+{
+    let mut pallet_attrs = Vec::new();
+
+    while let Some(attr) = take_first_item_pallet_attr(item)? {
+        pallet_attrs.push(attr)
+    }
+
+    Ok(pallet_attrs)
+}
+
+/// Get all the cfg attributes (e.g. attribute like `#[cfg..]`) and decode them to `Attr`
+pub fn get_item_cfg_attrs(attrs: &[syn::Attribute]) -> Vec<syn::Attribute> {
+    attrs
+        .iter()
+        .filter_map(|attr| {
+            if attr
+                .path()
+                .segments
+                .first()
+                .map_or(false, |segment| segment.ident == "cfg")
+            {
+                Some(attr.clone())
+            } else {
+                None
+            }
+        })
+        .collect::<Vec<_>>()
+}
+
+impl MutItemAttrs for syn::Item {
+    fn mut_item_attrs(&mut self) -> Option<&mut Vec<syn::Attribute>> {
+        match self {
+            Self::Const(item) => Some(item.attrs.as_mut()),
+            Self::Enum(item) => Some(item.attrs.as_mut()),
+            Self::ExternCrate(item) => Some(item.attrs.as_mut()),
+            Self::Fn(item) => Some(item.attrs.as_mut()),
+            Self::ForeignMod(item) => Some(item.attrs.as_mut()),
+            Self::Impl(item) => Some(item.attrs.as_mut()),
+            Self::Macro(item) => Some(item.attrs.as_mut()),
+            Self::Mod(item) => Some(item.attrs.as_mut()),
+            Self::Static(item) => Some(item.attrs.as_mut()),
+            Self::Struct(item) => Some(item.attrs.as_mut()),
+            Self::Trait(item) => Some(item.attrs.as_mut()),
+            Self::TraitAlias(item) => Some(item.attrs.as_mut()),
+            Self::Type(item) => Some(item.attrs.as_mut()),
+            Self::Union(item) => Some(item.attrs.as_mut()),
+            Self::Use(item) => Some(item.attrs.as_mut()),
+            _ => None,
+        }
+    }
+}
+
+impl MutItemAttrs for syn::TraitItem {
+    fn mut_item_attrs(&mut self) -> Option<&mut Vec<syn::Attribute>> {
+        match self {
+            Self::Const(item) => Some(item.attrs.as_mut()),
+            Self::Fn(item) => Some(item.attrs.as_mut()),
+            Self::Type(item) => Some(item.attrs.as_mut()),
+            Self::Macro(item) => Some(item.attrs.as_mut()),
+            _ => None,
+        }
+    }
+}
+
+impl MutItemAttrs for Vec<syn::Attribute> {
+    fn mut_item_attrs(&mut self) -> Option<&mut Vec<syn::Attribute>> {
+        Some(self)
+    }
+}
+
+impl MutItemAttrs for syn::ItemMod {
+    fn mut_item_attrs(&mut self) -> Option<&mut Vec<syn::Attribute>> {
+        Some(&mut self.attrs)
+    }
+}
+
+impl MutItemAttrs for syn::ImplItemFn {
+    fn mut_item_attrs(&mut self) -> Option<&mut Vec<syn::Attribute>> {
+        Some(&mut self.attrs)
+    }
+}
+
+impl MutItemAttrs for syn::ItemType {
+    fn mut_item_attrs(&mut self) -> Option<&mut Vec<syn::Attribute>> {
+        Some(&mut self.attrs)
+    }
+}
+
+/// Parse for `()`
+struct Unit;
+impl syn::parse::Parse for Unit {
+    fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
+        let content;
+        syn::parenthesized!(content in input);
+        if !content.is_empty() {
+            let msg = "unexpected tokens, expected nothing inside parenthesis as `()`";
+            return Err(syn::Error::new(content.span(), msg));
+        }
+        Ok(Self)
+    }
+}
+
+/// Parse for `'static`
+struct StaticLifetime;
+impl syn::parse::Parse for StaticLifetime {
+    fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
+        let lifetime = input.parse::<syn::Lifetime>()?;
+        if lifetime.ident != "static" {
+            let msg = "unexpected tokens, expected `static`";
+            return Err(syn::Error::new(lifetime.ident.span(), msg));
+        }
+        Ok(Self)
+    }
+}
+
+/// Check the syntax: `I: 'static = ()`
+///
+/// `span` is used in case generics is empty (empty generics has span == call_site).
+///
+/// return the instance if found.
+pub fn check_config_def_gen(gen: &syn::Generics, span: proc_macro2::Span) -> syn::Result<()> {
+    let expected = "expected `I: 'static = ()`";
+    pub struct CheckTraitDefGenerics;
+    impl syn::parse::Parse for CheckTraitDefGenerics {
+        fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
+            input.parse::<keyword::I>()?;
+            input.parse::<syn::Token![:]>()?;
+            input.parse::<StaticLifetime>()?;
+            input.parse::<syn::Token![=]>()?;
+            input.parse::<Unit>()?;
+
+            Ok(Self)
+        }
+    }
+
+    syn::parse2::<CheckTraitDefGenerics>(gen.params.to_token_stream()).map_err(|e| {
+        let msg = format!("Invalid generics: {}", expected);
+        let mut err = syn::Error::new(span, msg);
+        err.combine(e);
+        err
+    })?;
+
+    Ok(())
+}
+
+/// Check the syntax:
+/// * either `T`
+/// * or `T, I = ()`
+///
+/// `span` is used in case generics is empty (empty generics has span == call_site).
+///
+/// return the instance if found.
+pub fn check_type_def_gen_no_bounds(
+    gen: &syn::Generics,
+    span: proc_macro2::Span,
+) -> syn::Result<InstanceUsage> {
+    let expected = "expected `T` or `T, I = ()`";
+    pub struct Checker(InstanceUsage);
+    impl syn::parse::Parse for Checker {
+        fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
+            let mut instance_usage = InstanceUsage {
+                has_instance: false,
+                span: input.span(),
+            };
+
+            input.parse::<keyword::T>()?;
+            if input.peek(syn::Token![,]) {
+                instance_usage.has_instance = true;
+                input.parse::<syn::Token![,]>()?;
+                input.parse::<keyword::I>()?;
+                input.parse::<syn::Token![=]>()?;
+                input.parse::<Unit>()?;
+            }
+
+            Ok(Self(instance_usage))
+        }
+    }
+
+    let i = syn::parse2::<Checker>(gen.params.to_token_stream())
+        .map_err(|e| {
+            let msg = format!("Invalid type def generics: {}", expected);
+            let mut err = syn::Error::new(span, msg);
+            err.combine(e);
+            err
+        })?
+        .0;
+
+    Ok(i)
+}
+
+/// Check the syntax:
+/// * either `` (no generics
+/// * or `T`
+/// * or `T: Config`
+/// * or `T, I = ()`
+/// * or `T: Config<I>, I: 'static = ()`
+///
+/// `span` is used in case generics is empty (empty generics has span == call_site).
+///
+/// return some instance usage if there is some generic, or none otherwise.
+pub fn check_type_def_optional_gen(
+    gen: &syn::Generics,
+    span: proc_macro2::Span,
+) -> syn::Result<Option<InstanceUsage>> {
+    let expected = "expected `` or `T` or `T: Config` or `T, I = ()` or \
+		`T: Config<I>, I: 'static = ()`";
+    pub struct Checker(Option<InstanceUsage>);
+    impl syn::parse::Parse for Checker {
+        fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
+            if input.is_empty() {
+                return Ok(Self(None));
+            }
+
+            let mut instance_usage = InstanceUsage {
+                span: input.span(),
+                has_instance: false,
+            };
+
+            input.parse::<keyword::T>()?;
+
+            if input.is_empty() {
+                return Ok(Self(Some(instance_usage)));
+            }
+
+            let lookahead = input.lookahead1();
+            if lookahead.peek(syn::Token![,]) {
+                instance_usage.has_instance = true;
+                input.parse::<syn::Token![,]>()?;
+                input.parse::<keyword::I>()?;
+                input.parse::<syn::Token![=]>()?;
+                input.parse::<Unit>()?;
+
+                Ok(Self(Some(instance_usage)))
+            } else if lookahead.peek(syn::Token![:]) {
+                input.parse::<syn::Token![:]>()?;
+                input.parse::<keyword::Config>()?;
+
+                if input.is_empty() {
+                    return Ok(Self(Some(instance_usage)));
+                }
+
+                instance_usage.has_instance = true;
+                input.parse::<syn::Token![<]>()?;
+                input.parse::<keyword::I>()?;
+                input.parse::<syn::Token![>]>()?;
+                input.parse::<syn::Token![,]>()?;
+                input.parse::<keyword::I>()?;
+                input.parse::<syn::Token![:]>()?;
+                input.parse::<StaticLifetime>()?;
+                input.parse::<syn::Token![=]>()?;
+                input.parse::<Unit>()?;
+
+                Ok(Self(Some(instance_usage)))
+            } else {
+                Err(lookahead.error())
+            }
+        }
+    }
+
+    let i = syn::parse2::<Checker>(gen.params.to_token_stream())
+        .map_err(|e| {
+            let msg = format!("Invalid type def generics: {}", expected);
+            let mut err = syn::Error::new(span, msg);
+            err.combine(e);
+            err
+        })?
+        .0
+        // Span can be call_site if generic is empty. Thus we replace it.
+        .map(|mut i| {
+            i.span = span;
+            i
+        });
+
+    Ok(i)
+}
+
+/// Check the syntax:
+/// * either `Pallet<T>`
+/// * or `Pallet<T, I>`
+///
+/// return the instance if found.
+pub fn check_pallet_struct_usage(type_: &Box<syn::Type>) -> syn::Result<InstanceUsage> {
+    let expected = "expected `Pallet<T>` or `Pallet<T, I>`";
+    pub struct Checker(InstanceUsage);
+    impl syn::parse::Parse for Checker {
+        fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
+            let mut instance_usage = InstanceUsage {
+                span: input.span(),
+                has_instance: false,
+            };
+
+            input.parse::<keyword::Pallet>()?;
+            input.parse::<syn::Token![<]>()?;
+            input.parse::<keyword::T>()?;
+            if input.peek(syn::Token![,]) {
+                instance_usage.has_instance = true;
+                input.parse::<syn::Token![,]>()?;
+                input.parse::<keyword::I>()?;
+            }
+            input.parse::<syn::Token![>]>()?;
+
+            Ok(Self(instance_usage))
+        }
+    }
+
+    let i = syn::parse2::<Checker>(type_.to_token_stream())
+        .map_err(|e| {
+            let msg = format!("Invalid pallet struct: {}", expected);
+            let mut err = syn::Error::new(type_.span(), msg);
+            err.combine(e);
+            err
+        })?
+        .0;
+
+    Ok(i)
+}
+
+/// Check the generic is:
+/// * either `T: Config`
+/// * or `T: Config<I>, I: 'static`
+///
+/// `span` is used in case generics is empty (empty generics has span == call_site).
+///
+/// return whether it contains instance.
+pub fn check_impl_gen(gen: &syn::Generics, span: proc_macro2::Span) -> syn::Result<InstanceUsage> {
+    let expected = "expected `impl<T: Config>` or `impl<T: Config<I>, I: 'static>`";
+    pub struct Checker(InstanceUsage);
+    impl syn::parse::Parse for Checker {
+        fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
+            let mut instance_usage = InstanceUsage {
+                span: input.span(),
+                has_instance: false,
+            };
+
+            input.parse::<keyword::T>()?;
+            input.parse::<syn::Token![:]>()?;
+            input.parse::<keyword::Config>()?;
+            if input.peek(syn::Token![<]) {
+                instance_usage.has_instance = true;
+                input.parse::<syn::Token![<]>()?;
+                input.parse::<keyword::I>()?;
+                input.parse::<syn::Token![>]>()?;
+                input.parse::<syn::Token![,]>()?;
+                input.parse::<keyword::I>()?;
+                input.parse::<syn::Token![:]>()?;
+                input.parse::<StaticLifetime>()?;
+            }
+
+            Ok(Self(instance_usage))
+        }
+    }
+
+    let i = syn::parse2::<Checker>(gen.params.to_token_stream())
+        .map_err(|e| {
+            let mut err = syn::Error::new(span, format!("Invalid generics: {}", expected));
+            err.combine(e);
+            err
+        })?
+        .0;
+
+    Ok(i)
+}
+
+/// Check the syntax:
+/// * or `T`
+/// * or `T: Config`
+/// * or `T, I = ()`
+/// * or `T: Config<I>, I: 'static = ()`
+///
+/// `span` is used in case generics is empty (empty generics has span == call_site).
+///
+/// return the instance if found.
+pub fn check_type_def_gen(
+    gen: &syn::Generics,
+    span: proc_macro2::Span,
+) -> syn::Result<InstanceUsage> {
+    let expected = "expected `T` or `T: Config` or `T, I = ()` or \
+		`T: Config<I>, I: 'static = ()`";
+    pub struct Checker(InstanceUsage);
+    impl syn::parse::Parse for Checker {
+        fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
+            let mut instance_usage = InstanceUsage {
+                span: input.span(),
+                has_instance: false,
+            };
+
+            input.parse::<keyword::T>()?;
+
+            if input.is_empty() {
+                return Ok(Self(instance_usage));
+            }
+
+            let lookahead = input.lookahead1();
+            if lookahead.peek(syn::Token![,]) {
+                instance_usage.has_instance = true;
+                input.parse::<syn::Token![,]>()?;
+                input.parse::<keyword::I>()?;
+                input.parse::<syn::Token![=]>()?;
+                input.parse::<Unit>()?;
+
+                Ok(Self(instance_usage))
+            } else if lookahead.peek(syn::Token![:]) {
+                input.parse::<syn::Token![:]>()?;
+                input.parse::<keyword::Config>()?;
+
+                if input.is_empty() {
+                    return Ok(Self(instance_usage));
+                }
+
+                instance_usage.has_instance = true;
+                input.parse::<syn::Token![<]>()?;
+                input.parse::<keyword::I>()?;
+                input.parse::<syn::Token![>]>()?;
+                input.parse::<syn::Token![,]>()?;
+                input.parse::<keyword::I>()?;
+                input.parse::<syn::Token![:]>()?;
+                input.parse::<StaticLifetime>()?;
+                input.parse::<syn::Token![=]>()?;
+                input.parse::<Unit>()?;
+
+                Ok(Self(instance_usage))
+            } else {
+                Err(lookahead.error())
+            }
+        }
+    }
+
+    let mut i = syn::parse2::<Checker>(gen.params.to_token_stream())
+        .map_err(|e| {
+            let msg = format!("Invalid type def generics: {}", expected);
+            let mut err = syn::Error::new(span, msg);
+            err.combine(e);
+            err
+        })?
+        .0;
+
+    // Span can be call_site if generic is empty. Thus we replace it.
+    i.span = span;
+
+    Ok(i)
+}
+
+/// Check the syntax:
+/// * either `GenesisBuild<T>`
+/// * or `GenesisBuild<T, I>`
+/// * or `BuildGenesisConfig`
+///
+/// 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 `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> {
+            let mut instance_usage = InstanceUsage {
+                span: input.span(),
+                has_instance: false,
+            };
+
+            if input.peek(keyword::GenesisBuild) {
+                input.parse::<keyword::GenesisBuild>()?;
+                input.parse::<syn::Token![<]>()?;
+                input.parse::<keyword::T>()?;
+                if input.peek(syn::Token![,]) {
+                    instance_usage.has_instance = true;
+                    input.parse::<syn::Token![,]>()?;
+                    input.parse::<keyword::I>()?;
+                }
+                input.parse::<syn::Token![>]>()?;
+                return Ok(Self(Some(instance_usage)));
+            } else {
+                input.parse::<keyword::BuildGenesisConfig>()?;
+                return Ok(Self(None));
+            }
+        }
+    }
+
+    let i = syn::parse2::<Checker>(type_.to_token_stream())
+        .map_err(|e| {
+            let msg = format!("Invalid genesis builder: {}", expected);
+            let mut err = syn::Error::new(type_.span(), msg);
+            err.combine(e);
+            err
+        })?
+        .0;
+
+    Ok(i)
+}
+
+/// Check the syntax:
+/// * either `` (no generics)
+/// * or `T: Config`
+/// * or `T: Config<I>, I: 'static`
+///
+/// `span` is used in case generics is empty (empty generics has span == call_site).
+///
+/// return the instance if found.
+pub fn check_type_value_gen(
+    gen: &syn::Generics,
+    span: proc_macro2::Span,
+) -> syn::Result<Option<InstanceUsage>> {
+    let expected = "expected `` or `T: Config` or `T: Config<I>, I: 'static`";
+    pub struct Checker(Option<InstanceUsage>);
+    impl syn::parse::Parse for Checker {
+        fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
+            if input.is_empty() {
+                return Ok(Self(None));
+            }
+
+            input.parse::<keyword::T>()?;
+            input.parse::<syn::Token![:]>()?;
+            input.parse::<keyword::Config>()?;
+
+            let mut instance_usage = InstanceUsage {
+                span: input.span(),
+                has_instance: false,
+            };
+
+            if input.is_empty() {
+                return Ok(Self(Some(instance_usage)));
+            }
+
+            instance_usage.has_instance = true;
+            input.parse::<syn::Token![<]>()?;
+            input.parse::<keyword::I>()?;
+            input.parse::<syn::Token![>]>()?;
+            input.parse::<syn::Token![,]>()?;
+            input.parse::<keyword::I>()?;
+            input.parse::<syn::Token![:]>()?;
+            input.parse::<StaticLifetime>()?;
+
+            Ok(Self(Some(instance_usage)))
+        }
+    }
+
+    let i = syn::parse2::<Checker>(gen.params.to_token_stream())
+        .map_err(|e| {
+            let msg = format!("Invalid type def generics: {}", expected);
+            let mut err = syn::Error::new(span, msg);
+            err.combine(e);
+            err
+        })?
+        .0
+        // Span can be call_site if generic is empty. Thus we replace it.
+        .map(|mut i| {
+            i.span = span;
+            i
+        });
+
+    Ok(i)
+}
+
+/// Check the keyword `DispatchResultWithPostInfo` or `DispatchResult`.
+pub fn check_pallet_call_return_type(type_: &syn::Type) -> syn::Result<()> {
+    pub struct Checker;
+    impl syn::parse::Parse for Checker {
+        fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
+            let lookahead = input.lookahead1();
+            if lookahead.peek(keyword::DispatchResultWithPostInfo) {
+                input.parse::<keyword::DispatchResultWithPostInfo>()?;
+                Ok(Self)
+            } else if lookahead.peek(keyword::DispatchResult) {
+                input.parse::<keyword::DispatchResult>()?;
+                Ok(Self)
+            } else {
+                Err(lookahead.error())
+            }
+        }
+    }
+
+    syn::parse2::<Checker>(type_.to_token_stream()).map(|_| ())
+}
+
+pub(crate) fn two128_str(s: &str) -> TokenStream {
+    bytes_to_array(sp_crypto_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/support/procedural-fork/src/pallet/parse/hooks.rs b/support/procedural-fork/src/pallet/parse/hooks.rs
new file mode 100644
index 000000000..1cf5c72cc
--- /dev/null
+++ b/support/procedural-fork/src/pallet/parse/hooks.rs
@@ -0,0 +1,86 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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::helper;
+use syn::spanned::Spanned;
+
+/// Implementation of the pallet hooks.
+pub struct HooksDef {
+    /// The index of item in pallet.
+    pub index: usize,
+    /// A set of usage of instance, must be check for consistency with trait.
+    pub instances: Vec<helper::InstanceUsage>,
+    /// The where_clause used.
+    pub where_clause: Option<syn::WhereClause>,
+    /// The span of the pallet::hooks attribute.
+    pub attr_span: proc_macro2::Span,
+    /// Boolean flag, set to true if the `on_runtime_upgrade` method of hooks was implemented.
+    pub has_runtime_upgrade: bool,
+}
+
+impl HooksDef {
+    pub fn try_from(
+        attr_span: proc_macro2::Span,
+        index: usize,
+        item: &mut syn::Item,
+    ) -> syn::Result<Self> {
+        let item = if let syn::Item::Impl(item) = item {
+            item
+        } else {
+            let msg = "Invalid pallet::hooks, expected item impl";
+            return Err(syn::Error::new(item.span(), msg));
+        };
+
+        let instances = vec![
+            helper::check_pallet_struct_usage(&item.self_ty)?,
+            helper::check_impl_gen(&item.generics, item.impl_token.span())?,
+        ];
+
+        let item_trait = &item
+            .trait_
+            .as_ref()
+            .ok_or_else(|| {
+                let msg = "Invalid pallet::hooks, expected impl<..> Hooks \
+					for Pallet<..>";
+                syn::Error::new(item.span(), msg)
+            })?
+            .1;
+
+        if item_trait.segments.len() != 1 || item_trait.segments[0].ident != "Hooks" {
+            let msg = format!(
+                "Invalid pallet::hooks, expected trait to be `Hooks` found `{}`\
+				, you can import from `frame_support::pallet_prelude`",
+                quote::quote!(#item_trait)
+            );
+
+            return Err(syn::Error::new(item_trait.span(), msg));
+        }
+
+        let has_runtime_upgrade = item.items.iter().any(|i| match i {
+            syn::ImplItem::Fn(method) => method.sig.ident == "on_runtime_upgrade",
+            _ => false,
+        });
+
+        Ok(Self {
+            attr_span,
+            index,
+            instances,
+            has_runtime_upgrade,
+            where_clause: item.generics.where_clause.clone(),
+        })
+    }
+}
diff --git a/support/procedural-fork/src/pallet/parse/inherent.rs b/support/procedural-fork/src/pallet/parse/inherent.rs
new file mode 100644
index 000000000..4eb04e914
--- /dev/null
+++ b/support/procedural-fork/src/pallet/parse/inherent.rs
@@ -0,0 +1,60 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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::helper;
+use syn::spanned::Spanned;
+
+/// The definition of the pallet inherent implementation.
+pub struct InherentDef {
+    /// The index of inherent item in pallet module.
+    pub index: usize,
+    /// A set of usage of instance, must be check for consistency with trait.
+    pub instances: Vec<helper::InstanceUsage>,
+}
+
+impl InherentDef {
+    pub fn try_from(index: usize, item: &mut syn::Item) -> syn::Result<Self> {
+        let item = if let syn::Item::Impl(item) = item {
+            item
+        } else {
+            let msg = "Invalid pallet::inherent, expected item impl";
+            return Err(syn::Error::new(item.span(), msg));
+        };
+
+        if item.trait_.is_none() {
+            let msg = "Invalid pallet::inherent, expected impl<..> ProvideInherent for Pallet<..>";
+            return Err(syn::Error::new(item.span(), msg));
+        }
+
+        if let Some(last) = item.trait_.as_ref().unwrap().1.segments.last() {
+            if last.ident != "ProvideInherent" {
+                let msg = "Invalid pallet::inherent, expected trait ProvideInherent";
+                return Err(syn::Error::new(last.span(), msg));
+            }
+        } else {
+            let msg = "Invalid pallet::inherent, expected impl<..> ProvideInherent for Pallet<..>";
+            return Err(syn::Error::new(item.span(), msg));
+        }
+
+        let instances = vec![
+            helper::check_pallet_struct_usage(&item.self_ty)?,
+            helper::check_impl_gen(&item.generics, item.impl_token.span())?,
+        ];
+
+        Ok(InherentDef { index, instances })
+    }
+}
diff --git a/support/procedural-fork/src/pallet/parse/mod.rs b/support/procedural-fork/src/pallet/parse/mod.rs
new file mode 100644
index 000000000..57c252473
--- /dev/null
+++ b/support/procedural-fork/src/pallet/parse/mod.rs
@@ -0,0 +1,807 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Parse for pallet macro.
+//!
+//! Parse the module into `Def` struct through `Def::try_from` function.
+
+pub mod call;
+pub mod composite;
+pub mod config;
+pub mod error;
+pub mod event;
+pub mod extra_constants;
+pub mod genesis_build;
+pub mod genesis_config;
+pub mod helper;
+pub mod hooks;
+pub mod inherent;
+pub mod origin;
+pub mod pallet_struct;
+pub mod storage;
+pub mod tasks;
+pub mod type_value;
+pub mod validate_unsigned;
+
+#[cfg(test)]
+pub mod tests;
+
+use composite::{keyword::CompositeKeyword, CompositeDef};
+use frame_support_procedural_tools::generate_access_from_frame_or_crate;
+use quote::ToTokens;
+use syn::spanned::Spanned;
+
+/// Parsed definition of a pallet.
+pub struct Def {
+    /// The module items.
+    /// (their order must not be modified because they are registered in individual definitions).
+    pub item: syn::ItemMod,
+    pub config: config::ConfigDef,
+    pub pallet_struct: pallet_struct::PalletStructDef,
+    pub hooks: Option<hooks::HooksDef>,
+    pub call: Option<call::CallDef>,
+    pub tasks: Option<tasks::TasksDef>,
+    pub task_enum: Option<tasks::TaskEnumDef>,
+    pub storages: Vec<storage::StorageDef>,
+    pub error: Option<error::ErrorDef>,
+    pub event: Option<event::EventDef>,
+    pub origin: Option<origin::OriginDef>,
+    pub inherent: Option<inherent::InherentDef>,
+    pub genesis_config: Option<genesis_config::GenesisConfigDef>,
+    pub genesis_build: Option<genesis_build::GenesisBuildDef>,
+    pub validate_unsigned: Option<validate_unsigned::ValidateUnsignedDef>,
+    pub extra_constants: Option<extra_constants::ExtraConstantsDef>,
+    pub composites: Vec<composite::CompositeDef>,
+    pub type_values: Vec<type_value::TypeValueDef>,
+    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_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
+            .content
+            .as_mut()
+            .ok_or_else(|| {
+                let msg = "Invalid pallet definition, expected mod to be inlined.";
+                syn::Error::new(item_span, msg)
+            })?
+            .1;
+
+        let mut config = None;
+        let mut pallet_struct = None;
+        let mut hooks = None;
+        let mut call = None;
+        let mut tasks = None;
+        let mut task_enum = None;
+        let mut error = None;
+        let mut event = None;
+        let mut origin = None;
+        let mut inherent = None;
+        let mut genesis_config = None;
+        let mut genesis_build = None;
+        let mut validate_unsigned = None;
+        let mut extra_constants = None;
+        let mut storages = vec![];
+        let mut type_values = vec![];
+        let mut composites: Vec<CompositeDef> = vec![];
+
+        for (index, item) in items.iter_mut().enumerate() {
+            let pallet_attr: Option<PalletAttr> = helper::take_first_item_pallet_attr(item)?;
+
+            match pallet_attr {
+				Some(PalletAttr::Config(span, with_default)) if config.is_none() =>
+					config = Some(config::ConfigDef::try_from(
+						&frame_system,
+						span,
+						index,
+						item,
+						with_default,
+					)?),
+				Some(PalletAttr::Pallet(span)) if pallet_struct.is_none() => {
+					let p = pallet_struct::PalletStructDef::try_from(span, index, item)?;
+					pallet_struct = Some(p);
+				},
+				Some(PalletAttr::Hooks(span)) if hooks.is_none() => {
+					let m = hooks::HooksDef::try_from(span, index, item)?;
+					hooks = Some(m);
+				},
+				Some(PalletAttr::RuntimeCall(cw, span)) if call.is_none() =>
+					call = Some(call::CallDef::try_from(span, index, item, dev_mode, cw)?),
+				Some(PalletAttr::Tasks(_)) if tasks.is_none() => {
+					let item_tokens = item.to_token_stream();
+					// `TasksDef::parse` needs to know if attr was provided so we artificially
+					// re-insert it here
+					tasks = Some(syn::parse2::<tasks::TasksDef>(quote::quote! {
+						#[pallet::tasks_experimental]
+						#item_tokens
+					})?);
+
+					// replace item with a no-op because it will be handled by the expansion of tasks
+					*item = syn::Item::Verbatim(quote::quote!());
+				}
+				Some(PalletAttr::TaskCondition(span)) => return Err(syn::Error::new(
+					span,
+					"`#[pallet::task_condition]` can only be used on items within an `impl` statement."
+				)),
+				Some(PalletAttr::TaskIndex(span)) => return Err(syn::Error::new(
+					span,
+					"`#[pallet::task_index]` can only be used on items within an `impl` statement."
+				)),
+				Some(PalletAttr::TaskList(span)) => return Err(syn::Error::new(
+					span,
+					"`#[pallet::task_list]` can only be used on items within an `impl` statement."
+				)),
+				Some(PalletAttr::RuntimeTask(_)) if task_enum.is_none() =>
+					task_enum = Some(syn::parse2::<tasks::TaskEnumDef>(item.to_token_stream())?),
+				Some(PalletAttr::Error(span)) if error.is_none() =>
+					error = Some(error::ErrorDef::try_from(span, index, item)?),
+				Some(PalletAttr::RuntimeEvent(span)) if event.is_none() =>
+					event = Some(event::EventDef::try_from(span, index, item)?),
+				Some(PalletAttr::GenesisConfig(_)) if genesis_config.is_none() => {
+					let g = genesis_config::GenesisConfigDef::try_from(index, item)?;
+					genesis_config = Some(g);
+				},
+				Some(PalletAttr::GenesisBuild(span)) if genesis_build.is_none() => {
+					let g = genesis_build::GenesisBuildDef::try_from(span, index, item)?;
+					genesis_build = Some(g);
+				},
+				Some(PalletAttr::RuntimeOrigin(_)) if origin.is_none() =>
+					origin = Some(origin::OriginDef::try_from(index, item)?),
+				Some(PalletAttr::Inherent(_)) if inherent.is_none() =>
+					inherent = Some(inherent::InherentDef::try_from(index, item)?),
+				Some(PalletAttr::Storage(span)) =>
+					storages.push(storage::StorageDef::try_from(span, index, item, dev_mode)?),
+				Some(PalletAttr::ValidateUnsigned(_)) if validate_unsigned.is_none() => {
+					let v = validate_unsigned::ValidateUnsignedDef::try_from(index, item)?;
+					validate_unsigned = Some(v);
+				},
+				Some(PalletAttr::TypeValue(span)) =>
+					type_values.push(type_value::TypeValueDef::try_from(span, index, item)?),
+				Some(PalletAttr::ExtraConstants(_)) =>
+					extra_constants =
+						Some(extra_constants::ExtraConstantsDef::try_from(index, item)?),
+				Some(PalletAttr::Composite(span)) => {
+					let composite =
+						composite::CompositeDef::try_from(span, index, &frame_support, item)?;
+					if composites.iter().any(|def| {
+						match (&def.composite_keyword, &composite.composite_keyword) {
+							(
+								CompositeKeyword::FreezeReason(_),
+								CompositeKeyword::FreezeReason(_),
+							) |
+							(CompositeKeyword::HoldReason(_), CompositeKeyword::HoldReason(_)) |
+							(CompositeKeyword::LockId(_), CompositeKeyword::LockId(_)) |
+							(
+								CompositeKeyword::SlashReason(_),
+								CompositeKeyword::SlashReason(_),
+							) => true,
+							_ => false,
+						}
+					}) {
+						let msg = format!(
+							"Invalid duplicated `{}` definition",
+							composite.composite_keyword
+						);
+						return Err(syn::Error::new(composite.composite_keyword.span(), &msg))
+					}
+					composites.push(composite);
+				},
+				Some(attr) => {
+					let msg = "Invalid duplicated attribute";
+					return Err(syn::Error::new(attr.span(), msg))
+				},
+				None => (),
+			}
+        }
+
+        if genesis_config.is_some() != genesis_build.is_some() {
+            let msg = format!(
+                "`#[pallet::genesis_config]` and `#[pallet::genesis_build]` attributes must be \
+				either both used or both not used, instead genesis_config is {} and genesis_build \
+				is {}",
+                genesis_config.as_ref().map_or("unused", |_| "used"),
+                genesis_build.as_ref().map_or("unused", |_| "used"),
+            );
+            return Err(syn::Error::new(item_span, msg));
+        }
+
+        Self::resolve_tasks(&item_span, &mut tasks, &mut task_enum, items)?;
+
+        let def = Def {
+            item,
+            config: config
+                .ok_or_else(|| syn::Error::new(item_span, "Missing `#[pallet::config]`"))?,
+            pallet_struct: pallet_struct
+                .ok_or_else(|| syn::Error::new(item_span, "Missing `#[pallet::pallet]`"))?,
+            hooks,
+            call,
+            tasks,
+            task_enum,
+            extra_constants,
+            genesis_config,
+            genesis_build,
+            validate_unsigned,
+            error,
+            event,
+            origin,
+            inherent,
+            storages,
+            composites,
+            type_values,
+            frame_system,
+            frame_support,
+            dev_mode,
+        };
+
+        def.check_instance_usage()?;
+        def.check_event_usage()?;
+
+        Ok(def)
+    }
+
+    /// Performs extra logic checks necessary for the `#[pallet::tasks_experimental]` feature.
+    fn resolve_tasks(
+        item_span: &proc_macro2::Span,
+        tasks: &mut Option<tasks::TasksDef>,
+        task_enum: &mut Option<tasks::TaskEnumDef>,
+        items: &mut Vec<syn::Item>,
+    ) -> syn::Result<()> {
+        // fallback for manual (without macros) definition of tasks impl
+        Self::resolve_manual_tasks_impl(tasks, task_enum, items)?;
+
+        // fallback for manual (without macros) definition of task enum
+        Self::resolve_manual_task_enum(tasks, task_enum, items)?;
+
+        // ensure that if `task_enum` is specified, `tasks` is also specified
+        match (&task_enum, &tasks) {
+            (Some(_), None) => {
+                return Err(syn::Error::new(
+                    *item_span,
+                    "Missing `#[pallet::tasks_experimental]` impl",
+                ))
+            }
+            (None, Some(tasks)) => {
+                if tasks.tasks_attr.is_none() {
+                    return Err(syn::Error::new(
+						tasks.item_impl.impl_token.span(),
+						"A `#[pallet::tasks_experimental]` attribute must be attached to your `Task` impl if the \
+						task enum has been omitted",
+					));
+                } else {
+                }
+            }
+            _ => (),
+        }
+
+        Ok(())
+    }
+
+    /// Tries to locate task enum based on the tasks impl target if attribute is not specified
+    /// but impl is present. If one is found, `task_enum` is set appropriately.
+    fn resolve_manual_task_enum(
+        tasks: &Option<tasks::TasksDef>,
+        task_enum: &mut Option<tasks::TaskEnumDef>,
+        items: &mut Vec<syn::Item>,
+    ) -> syn::Result<()> {
+        let (None, Some(tasks)) = (&task_enum, &tasks) else {
+            return Ok(());
+        };
+        let syn::Type::Path(type_path) = &*tasks.item_impl.self_ty else {
+            return Ok(());
+        };
+        let type_path = type_path.path.segments.iter().collect::<Vec<_>>();
+        let (Some(seg), None) = (type_path.get(0), type_path.get(1)) else {
+            return Ok(());
+        };
+        let mut result = None;
+        for item in items {
+            let syn::Item::Enum(item_enum) = item else {
+                continue;
+            };
+            if item_enum.ident == seg.ident {
+                result = Some(syn::parse2::<tasks::TaskEnumDef>(
+                    item_enum.to_token_stream(),
+                )?);
+                // replace item with a no-op because it will be handled by the expansion of
+                // `task_enum`. We use a no-op instead of simply removing it from the vec
+                // so that any indices collected by `Def::try_from` remain accurate
+                *item = syn::Item::Verbatim(quote::quote!());
+                break;
+            }
+        }
+        *task_enum = result;
+        Ok(())
+    }
+
+    /// Tries to locate a manual tasks impl (an impl implementing a trait whose last path segment is
+    /// `Task`) in the event that one has not been found already via the attribute macro
+    pub fn resolve_manual_tasks_impl(
+        tasks: &mut Option<tasks::TasksDef>,
+        task_enum: &Option<tasks::TaskEnumDef>,
+        items: &Vec<syn::Item>,
+    ) -> syn::Result<()> {
+        let None = tasks else { return Ok(()) };
+        let mut result = None;
+        for item in items {
+            let syn::Item::Impl(item_impl) = item else {
+                continue;
+            };
+            let Some((_, path, _)) = &item_impl.trait_ else {
+                continue;
+            };
+            let Some(trait_last_seg) = path.segments.last() else {
+                continue;
+            };
+            let syn::Type::Path(target_path) = &*item_impl.self_ty else {
+                continue;
+            };
+            let target_path = target_path.path.segments.iter().collect::<Vec<_>>();
+            let (Some(target_ident), None) = (target_path.get(0), target_path.get(1)) else {
+                continue;
+            };
+            let matches_task_enum = match task_enum {
+                Some(task_enum) => task_enum.item_enum.ident == target_ident.ident,
+                None => true,
+            };
+            if trait_last_seg.ident == "Task" && matches_task_enum {
+                result = Some(syn::parse2::<tasks::TasksDef>(item_impl.to_token_stream())?);
+                break;
+            }
+        }
+        *tasks = result;
+        Ok(())
+    }
+
+    /// Check that usage of trait `Event` is consistent with the definition, i.e. it is declared
+    /// and trait defines type RuntimeEvent, or not declared and no trait associated type.
+    fn check_event_usage(&self) -> syn::Result<()> {
+        match (self.config.has_event_type, self.event.is_some()) {
+            (true, false) => {
+                let msg = "Invalid usage of RuntimeEvent, `Config` contains associated type `RuntimeEvent`, \
+					but enum `Event` is not declared (i.e. no use of `#[pallet::event]`). \
+					Note that type `RuntimeEvent` in trait is reserved to work alongside pallet event.";
+                Err(syn::Error::new(proc_macro2::Span::call_site(), msg))
+            }
+            (false, true) => {
+                let msg = "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`.";
+                Err(syn::Error::new(proc_macro2::Span::call_site(), msg))
+            }
+            _ => Ok(()),
+        }
+    }
+
+    /// Check that usage of trait `Config` is consistent with the definition, i.e. it is used with
+    /// instance iff it is defined with instance.
+    fn check_instance_usage(&self) -> syn::Result<()> {
+        let mut instances = vec![];
+        instances.extend_from_slice(&self.pallet_struct.instances[..]);
+        instances.extend(&mut self.storages.iter().flat_map(|s| s.instances.clone()));
+        if let Some(call) = &self.call {
+            instances.extend_from_slice(&call.instances[..]);
+        }
+        if let Some(hooks) = &self.hooks {
+            instances.extend_from_slice(&hooks.instances[..]);
+        }
+        if let Some(event) = &self.event {
+            instances.extend_from_slice(&event.instances[..]);
+        }
+        if let Some(error) = &self.error {
+            instances.extend_from_slice(&error.instances[..]);
+        }
+        if let Some(inherent) = &self.inherent {
+            instances.extend_from_slice(&inherent.instances[..]);
+        }
+        if let Some(origin) = &self.origin {
+            instances.extend_from_slice(&origin.instances[..]);
+        }
+        if let Some(genesis_config) = &self.genesis_config {
+            instances.extend_from_slice(&genesis_config.instances[..]);
+        }
+        if let Some(genesis_build) = &self.genesis_build {
+            genesis_build
+                .instances
+                .as_ref()
+                .map(|i| instances.extend_from_slice(&i));
+        }
+        if let Some(extra_constants) = &self.extra_constants {
+            instances.extend_from_slice(&extra_constants.instances[..]);
+        }
+
+        let mut errors = instances.into_iter().filter_map(|instances| {
+            if instances.has_instance == self.config.has_instance {
+                return None;
+            }
+            let msg = if self.config.has_instance {
+                "Invalid generic declaration, trait is defined with instance but generic use none"
+            } else {
+                "Invalid generic declaration, trait is defined without instance but generic use \
+						some"
+            };
+            Some(syn::Error::new(instances.span, msg))
+        });
+
+        if let Some(mut first_error) = errors.next() {
+            for error in errors {
+                first_error.combine(error)
+            }
+            Err(first_error)
+        } else {
+            Ok(())
+        }
+    }
+
+    /// Depending on if pallet is instantiable:
+    /// * either `T: Config`
+    /// * or `T: Config<I>, I: 'static`
+    pub fn type_impl_generics(&self, span: proc_macro2::Span) -> proc_macro2::TokenStream {
+        if self.config.has_instance {
+            quote::quote_spanned!(span => T: Config<I>, I: 'static)
+        } else {
+            quote::quote_spanned!(span => T: Config)
+        }
+    }
+
+    /// Depending on if pallet is instantiable:
+    /// * either `T: Config`
+    /// * or `T: Config<I>, I: 'static = ()`
+    pub fn type_decl_bounded_generics(&self, span: proc_macro2::Span) -> proc_macro2::TokenStream {
+        if self.config.has_instance {
+            quote::quote_spanned!(span => T: Config<I>, I: 'static = ())
+        } else {
+            quote::quote_spanned!(span => T: Config)
+        }
+    }
+
+    /// Depending on if pallet is instantiable:
+    /// * either `T`
+    /// * or `T, I = ()`
+    pub fn type_decl_generics(&self, span: proc_macro2::Span) -> proc_macro2::TokenStream {
+        if self.config.has_instance {
+            quote::quote_spanned!(span => T, I = ())
+        } else {
+            quote::quote_spanned!(span => T)
+        }
+    }
+
+    /// Depending on if pallet is instantiable:
+    /// * either ``
+    /// * or `<I>`
+    /// to be used when using pallet trait `Config`
+    pub fn trait_use_generics(&self, span: proc_macro2::Span) -> proc_macro2::TokenStream {
+        if self.config.has_instance {
+            quote::quote_spanned!(span => <I>)
+        } else {
+            quote::quote_spanned!(span => )
+        }
+    }
+
+    /// Depending on if pallet is instantiable:
+    /// * either `T`
+    /// * or `T, I`
+    pub fn type_use_generics(&self, span: proc_macro2::Span) -> proc_macro2::TokenStream {
+        if self.config.has_instance {
+            quote::quote_spanned!(span => T, I)
+        } else {
+            quote::quote_spanned!(span => T)
+        }
+    }
+}
+
+/// Some generic kind for type which can be not generic, or generic over config,
+/// or generic over config and instance, but not generic only over instance.
+pub enum GenericKind {
+    None,
+    Config,
+    ConfigAndInstance,
+}
+
+impl GenericKind {
+    /// Return Err if it is only generics over instance but not over config.
+    pub fn from_gens(has_config: bool, has_instance: bool) -> Result<Self, ()> {
+        match (has_config, has_instance) {
+            (false, false) => Ok(GenericKind::None),
+            (true, false) => Ok(GenericKind::Config),
+            (true, true) => Ok(GenericKind::ConfigAndInstance),
+            (false, true) => Err(()),
+        }
+    }
+
+    /// Return the generic to be used when using the type.
+    ///
+    /// Depending on its definition it can be: ``, `T` or `T, I`
+    pub fn type_use_gen(&self, span: proc_macro2::Span) -> proc_macro2::TokenStream {
+        match self {
+            GenericKind::None => quote::quote!(),
+            GenericKind::Config => quote::quote_spanned!(span => T),
+            GenericKind::ConfigAndInstance => quote::quote_spanned!(span => T, I),
+        }
+    }
+
+    /// Return the generic to be used in `impl<..>` when implementing on the type.
+    pub fn type_impl_gen(&self, span: proc_macro2::Span) -> proc_macro2::TokenStream {
+        match self {
+            GenericKind::None => quote::quote!(),
+            GenericKind::Config => quote::quote_spanned!(span => T: Config),
+            GenericKind::ConfigAndInstance => {
+                quote::quote_spanned!(span => T: Config<I>, I: 'static)
+            }
+        }
+    }
+
+    /// Return whereas the type has some generic.
+    pub fn is_generic(&self) -> bool {
+        match self {
+            GenericKind::None => false,
+            GenericKind::Config | GenericKind::ConfigAndInstance => true,
+        }
+    }
+}
+
+/// List of additional token to be used for parsing.
+mod keyword {
+    syn::custom_keyword!(origin);
+    syn::custom_keyword!(call);
+    syn::custom_keyword!(tasks_experimental);
+    syn::custom_keyword!(task_enum);
+    syn::custom_keyword!(task_list);
+    syn::custom_keyword!(task_condition);
+    syn::custom_keyword!(task_index);
+    syn::custom_keyword!(weight);
+    syn::custom_keyword!(event);
+    syn::custom_keyword!(config);
+    syn::custom_keyword!(with_default);
+    syn::custom_keyword!(hooks);
+    syn::custom_keyword!(inherent);
+    syn::custom_keyword!(error);
+    syn::custom_keyword!(storage);
+    syn::custom_keyword!(genesis_build);
+    syn::custom_keyword!(genesis_config);
+    syn::custom_keyword!(validate_unsigned);
+    syn::custom_keyword!(type_value);
+    syn::custom_keyword!(pallet);
+    syn::custom_keyword!(extra_constants);
+    syn::custom_keyword!(composite_enum);
+}
+
+/// Parse attributes for item in pallet module
+/// syntax must be `pallet::` (e.g. `#[pallet::config]`)
+enum PalletAttr {
+    Config(proc_macro2::Span, bool),
+    Pallet(proc_macro2::Span),
+    Hooks(proc_macro2::Span),
+    /// A `#[pallet::call]` with optional attributes to specialize the behaviour.
+    ///
+    /// # Attributes
+    ///
+    /// Each attribute `attr` can take the form of `#[pallet::call(attr = …)]` or
+    /// `#[pallet::call(attr(…))]`. The possible attributes are:
+    ///
+    /// ## `weight`
+    ///
+    /// Can be used to reduce the repetitive weight annotation in the trivial case. It accepts one
+    /// argument that is expected to be an implementation of the `WeightInfo` or something that
+    /// behaves syntactically equivalent. This allows to annotate a `WeightInfo` for all the calls.
+    /// Now each call does not need to specify its own `#[pallet::weight]` but can instead use the
+    /// one from the `#[pallet::call]` definition. So instead of having to write it on each call:
+    ///
+    /// ```ignore
+    /// #[pallet::call]
+    /// impl<T: Config> Pallet<T> {
+    ///     #[pallet::weight(T::WeightInfo::create())]
+    ///     pub fn create(
+    /// ```
+    /// you can now omit it on the call itself, if the name of the weigh function matches the call:
+    ///
+    /// ```ignore
+    /// #[pallet::call(weight = <T as crate::Config>::WeightInfo)]
+    /// impl<T: Config> Pallet<T> {
+    ///     pub fn create(
+    /// ```
+    ///
+    /// It is possible to use this syntax together with instantiated pallets by using `Config<I>`
+    /// instead.
+    ///
+    /// ### Dev Mode
+    ///
+    /// Normally the `dev_mode` sets all weights of calls without a `#[pallet::weight]` annotation
+    /// to zero. Now when there is a `weight` attribute on the `#[pallet::call]`, then that is used
+    /// instead of the zero weight. So to say: it works together with `dev_mode`.
+    RuntimeCall(Option<InheritedCallWeightAttr>, proc_macro2::Span),
+    Error(proc_macro2::Span),
+    Tasks(proc_macro2::Span),
+    TaskList(proc_macro2::Span),
+    TaskCondition(proc_macro2::Span),
+    TaskIndex(proc_macro2::Span),
+    RuntimeTask(proc_macro2::Span),
+    RuntimeEvent(proc_macro2::Span),
+    RuntimeOrigin(proc_macro2::Span),
+    Inherent(proc_macro2::Span),
+    Storage(proc_macro2::Span),
+    GenesisConfig(proc_macro2::Span),
+    GenesisBuild(proc_macro2::Span),
+    ValidateUnsigned(proc_macro2::Span),
+    TypeValue(proc_macro2::Span),
+    ExtraConstants(proc_macro2::Span),
+    Composite(proc_macro2::Span),
+}
+
+impl PalletAttr {
+    fn span(&self) -> proc_macro2::Span {
+        match self {
+            Self::Config(span, _) => *span,
+            Self::Pallet(span) => *span,
+            Self::Hooks(span) => *span,
+            Self::Tasks(span) => *span,
+            Self::TaskCondition(span) => *span,
+            Self::TaskIndex(span) => *span,
+            Self::TaskList(span) => *span,
+            Self::Error(span) => *span,
+            Self::RuntimeTask(span) => *span,
+            Self::RuntimeCall(_, span) => *span,
+            Self::RuntimeEvent(span) => *span,
+            Self::RuntimeOrigin(span) => *span,
+            Self::Inherent(span) => *span,
+            Self::Storage(span) => *span,
+            Self::GenesisConfig(span) => *span,
+            Self::GenesisBuild(span) => *span,
+            Self::ValidateUnsigned(span) => *span,
+            Self::TypeValue(span) => *span,
+            Self::ExtraConstants(span) => *span,
+            Self::Composite(span) => *span,
+        }
+    }
+}
+
+impl syn::parse::Parse for PalletAttr {
+    fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
+        input.parse::<syn::Token![#]>()?;
+        let content;
+        syn::bracketed!(content in input);
+        content.parse::<keyword::pallet>()?;
+        content.parse::<syn::Token![::]>()?;
+
+        let lookahead = content.lookahead1();
+        if lookahead.peek(keyword::config) {
+            let span = content.parse::<keyword::config>()?.span();
+            let with_default = content.peek(syn::token::Paren);
+            if with_default {
+                let inside_config;
+                let _paren = syn::parenthesized!(inside_config in content);
+                inside_config.parse::<keyword::with_default>()?;
+            }
+            Ok(PalletAttr::Config(span, with_default))
+        } else if lookahead.peek(keyword::pallet) {
+            Ok(PalletAttr::Pallet(
+                content.parse::<keyword::pallet>()?.span(),
+            ))
+        } else if lookahead.peek(keyword::hooks) {
+            Ok(PalletAttr::Hooks(content.parse::<keyword::hooks>()?.span()))
+        } else if lookahead.peek(keyword::call) {
+            let span = content.parse::<keyword::call>().expect("peeked").span();
+            let attr = match content.is_empty() {
+                true => None,
+                false => Some(InheritedCallWeightAttr::parse(&content)?),
+            };
+            Ok(PalletAttr::RuntimeCall(attr, span))
+        } else if lookahead.peek(keyword::tasks_experimental) {
+            Ok(PalletAttr::Tasks(
+                content.parse::<keyword::tasks_experimental>()?.span(),
+            ))
+        } else if lookahead.peek(keyword::task_enum) {
+            Ok(PalletAttr::RuntimeTask(
+                content.parse::<keyword::task_enum>()?.span(),
+            ))
+        } else if lookahead.peek(keyword::task_condition) {
+            Ok(PalletAttr::TaskCondition(
+                content.parse::<keyword::task_condition>()?.span(),
+            ))
+        } else if lookahead.peek(keyword::task_index) {
+            Ok(PalletAttr::TaskIndex(
+                content.parse::<keyword::task_index>()?.span(),
+            ))
+        } else if lookahead.peek(keyword::task_list) {
+            Ok(PalletAttr::TaskList(
+                content.parse::<keyword::task_list>()?.span(),
+            ))
+        } else if lookahead.peek(keyword::error) {
+            Ok(PalletAttr::Error(content.parse::<keyword::error>()?.span()))
+        } else if lookahead.peek(keyword::event) {
+            Ok(PalletAttr::RuntimeEvent(
+                content.parse::<keyword::event>()?.span(),
+            ))
+        } else if lookahead.peek(keyword::origin) {
+            Ok(PalletAttr::RuntimeOrigin(
+                content.parse::<keyword::origin>()?.span(),
+            ))
+        } else if lookahead.peek(keyword::inherent) {
+            Ok(PalletAttr::Inherent(
+                content.parse::<keyword::inherent>()?.span(),
+            ))
+        } else if lookahead.peek(keyword::storage) {
+            Ok(PalletAttr::Storage(
+                content.parse::<keyword::storage>()?.span(),
+            ))
+        } else if lookahead.peek(keyword::genesis_config) {
+            Ok(PalletAttr::GenesisConfig(
+                content.parse::<keyword::genesis_config>()?.span(),
+            ))
+        } else if lookahead.peek(keyword::genesis_build) {
+            Ok(PalletAttr::GenesisBuild(
+                content.parse::<keyword::genesis_build>()?.span(),
+            ))
+        } else if lookahead.peek(keyword::validate_unsigned) {
+            Ok(PalletAttr::ValidateUnsigned(
+                content.parse::<keyword::validate_unsigned>()?.span(),
+            ))
+        } else if lookahead.peek(keyword::type_value) {
+            Ok(PalletAttr::TypeValue(
+                content.parse::<keyword::type_value>()?.span(),
+            ))
+        } else if lookahead.peek(keyword::extra_constants) {
+            Ok(PalletAttr::ExtraConstants(
+                content.parse::<keyword::extra_constants>()?.span(),
+            ))
+        } else if lookahead.peek(keyword::composite_enum) {
+            Ok(PalletAttr::Composite(
+                content.parse::<keyword::composite_enum>()?.span(),
+            ))
+        } else {
+            Err(lookahead.error())
+        }
+    }
+}
+
+/// The optional weight annotation on a `#[pallet::call]` like `#[pallet::call(weight($type))]`.
+#[derive(Clone)]
+pub struct InheritedCallWeightAttr {
+    pub typename: syn::Type,
+    pub span: proc_macro2::Span,
+}
+
+impl syn::parse::Parse for InheritedCallWeightAttr {
+    // Parses `(weight($type))` or `(weight = $type)`.
+    fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
+        let content;
+        syn::parenthesized!(content in input);
+        content.parse::<keyword::weight>()?;
+        let lookahead = content.lookahead1();
+
+        let buffer = if lookahead.peek(syn::token::Paren) {
+            let inner;
+            syn::parenthesized!(inner in content);
+            inner
+        } else if lookahead.peek(syn::Token![=]) {
+            content.parse::<syn::Token![=]>().expect("peeked");
+            content
+        } else {
+            return Err(lookahead.error());
+        };
+
+        Ok(Self {
+            typename: buffer.parse()?,
+            span: input.span(),
+        })
+    }
+}
diff --git a/support/procedural-fork/src/pallet/parse/origin.rs b/support/procedural-fork/src/pallet/parse/origin.rs
new file mode 100644
index 000000000..2dd84c40d
--- /dev/null
+++ b/support/procedural-fork/src/pallet/parse/origin.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.
+
+use super::helper;
+use syn::spanned::Spanned;
+
+/// Definition of the pallet origin type.
+///
+/// Either:
+/// * `type Origin`
+/// * `struct Origin`
+/// * `enum Origin`
+pub struct OriginDef {
+    /// The index of item in pallet module.
+    pub index: usize,
+    pub has_instance: bool,
+    pub is_generic: bool,
+    /// A set of usage of instance, must be check for consistency with trait.
+    pub instances: Vec<helper::InstanceUsage>,
+}
+
+impl OriginDef {
+    pub fn try_from(index: usize, item: &mut syn::Item) -> syn::Result<Self> {
+        let item_span = item.span();
+        let (vis, ident, generics) = match &item {
+            syn::Item::Enum(item) => (&item.vis, &item.ident, &item.generics),
+            syn::Item::Struct(item) => (&item.vis, &item.ident, &item.generics),
+            syn::Item::Type(item) => (&item.vis, &item.ident, &item.generics),
+            _ => {
+                let msg = "Invalid pallet::origin, expected enum or struct or type";
+                return Err(syn::Error::new(item.span(), msg));
+            }
+        };
+
+        let has_instance = generics.params.len() == 2;
+        let is_generic = !generics.params.is_empty();
+
+        let mut instances = vec![];
+        if let Some(u) = helper::check_type_def_optional_gen(generics, item.span())? {
+            instances.push(u);
+        } else {
+            // construct_runtime only allow generic event for instantiable pallet.
+            instances.push(helper::InstanceUsage {
+                has_instance: false,
+                span: ident.span(),
+            })
+        }
+
+        if !matches!(vis, syn::Visibility::Public(_)) {
+            let msg = "Invalid pallet::origin, Origin must be public";
+            return Err(syn::Error::new(item_span, msg));
+        }
+
+        if ident != "Origin" {
+            let msg = "Invalid pallet::origin, ident must `Origin`";
+            return Err(syn::Error::new(ident.span(), msg));
+        }
+
+        Ok(OriginDef {
+            index,
+            has_instance,
+            is_generic,
+            instances,
+        })
+    }
+}
diff --git a/support/procedural-fork/src/pallet/parse/pallet_struct.rs b/support/procedural-fork/src/pallet/parse/pallet_struct.rs
new file mode 100644
index 000000000..320cf01fa
--- /dev/null
+++ b/support/procedural-fork/src/pallet/parse/pallet_struct.rs
@@ -0,0 +1,157 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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::helper;
+use quote::ToTokens;
+use syn::spanned::Spanned;
+
+/// List of additional token to be used for parsing.
+mod keyword {
+    syn::custom_keyword!(pallet);
+    syn::custom_keyword!(Pallet);
+    syn::custom_keyword!(without_storage_info);
+    syn::custom_keyword!(storage_version);
+}
+
+/// Definition of the pallet pallet.
+pub struct PalletStructDef {
+    /// The index of item in pallet pallet.
+    pub index: usize,
+    /// A set of usage of instance, must be check for consistency with config trait.
+    pub instances: Vec<helper::InstanceUsage>,
+    /// The keyword Pallet used (contains span).
+    pub pallet: keyword::Pallet,
+    /// The span of the pallet::pallet attribute.
+    pub attr_span: proc_macro2::Span,
+    /// Whether to specify the storages max encoded len when implementing `StorageInfoTrait`.
+    /// Contains the span of the attribute.
+    pub without_storage_info: Option<proc_macro2::Span>,
+    /// The in-code storage version of the pallet.
+    pub storage_version: Option<syn::Path>,
+}
+
+/// Parse for one variant of:
+/// * `#[pallet::without_storage_info]`
+/// * `#[pallet::storage_version(STORAGE_VERSION)]`
+pub enum PalletStructAttr {
+    WithoutStorageInfoTrait(proc_macro2::Span),
+    StorageVersion {
+        storage_version: syn::Path,
+        span: proc_macro2::Span,
+    },
+}
+
+impl PalletStructAttr {
+    fn span(&self) -> proc_macro2::Span {
+        match self {
+            Self::WithoutStorageInfoTrait(span) | Self::StorageVersion { span, .. } => *span,
+        }
+    }
+}
+
+impl syn::parse::Parse for PalletStructAttr {
+    fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
+        input.parse::<syn::Token![#]>()?;
+        let content;
+        syn::bracketed!(content in input);
+        content.parse::<keyword::pallet>()?;
+        content.parse::<syn::Token![::]>()?;
+
+        let lookahead = content.lookahead1();
+        if lookahead.peek(keyword::without_storage_info) {
+            let span = content.parse::<keyword::without_storage_info>()?.span();
+            Ok(Self::WithoutStorageInfoTrait(span))
+        } else if lookahead.peek(keyword::storage_version) {
+            let span = content.parse::<keyword::storage_version>()?.span();
+
+            let version_content;
+            syn::parenthesized!(version_content in content);
+            let storage_version = version_content.parse::<syn::Path>()?;
+
+            Ok(Self::StorageVersion {
+                storage_version,
+                span,
+            })
+        } else {
+            Err(lookahead.error())
+        }
+    }
+}
+
+impl PalletStructDef {
+    pub fn try_from(
+        attr_span: proc_macro2::Span,
+        index: usize,
+        item: &mut syn::Item,
+    ) -> syn::Result<Self> {
+        let item = if let syn::Item::Struct(item) = item {
+            item
+        } else {
+            let msg = "Invalid pallet::pallet, expected struct definition";
+            return Err(syn::Error::new(item.span(), msg));
+        };
+
+        let mut without_storage_info = None;
+        let mut storage_version_found = None;
+
+        let struct_attrs: Vec<PalletStructAttr> = helper::take_item_pallet_attrs(&mut item.attrs)?;
+        for attr in struct_attrs {
+            match attr {
+                PalletStructAttr::WithoutStorageInfoTrait(span)
+                    if without_storage_info.is_none() =>
+                {
+                    without_storage_info = Some(span);
+                }
+                PalletStructAttr::StorageVersion {
+                    storage_version, ..
+                } if storage_version_found.is_none() => {
+                    storage_version_found = Some(storage_version);
+                }
+                attr => {
+                    let msg = "Unexpected duplicated attribute";
+                    return Err(syn::Error::new(attr.span(), msg));
+                }
+            }
+        }
+
+        let pallet = syn::parse2::<keyword::Pallet>(item.ident.to_token_stream())?;
+
+        if !matches!(item.vis, syn::Visibility::Public(_)) {
+            let msg = "Invalid pallet::pallet, Pallet must be public";
+            return Err(syn::Error::new(item.span(), msg));
+        }
+
+        if item.generics.where_clause.is_some() {
+            let msg = "Invalid pallet::pallet, where clause not supported on Pallet declaration";
+            return Err(syn::Error::new(item.generics.where_clause.span(), msg));
+        }
+
+        let instances = vec![helper::check_type_def_gen_no_bounds(
+            &item.generics,
+            item.ident.span(),
+        )?];
+
+        Ok(Self {
+            index,
+            instances,
+            pallet,
+            attr_span,
+            without_storage_info,
+            storage_version: storage_version_found,
+        })
+    }
+}
diff --git a/support/procedural-fork/src/pallet/parse/storage.rs b/support/procedural-fork/src/pallet/parse/storage.rs
new file mode 100644
index 000000000..64a5e685b
--- /dev/null
+++ b/support/procedural-fork/src/pallet/parse/storage.rs
@@ -0,0 +1,1044 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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::helper;
+use frame_support_procedural_tools::get_doc_literals;
+use quote::ToTokens;
+use std::collections::HashMap;
+use syn::spanned::Spanned;
+
+/// List of additional token to be used for parsing.
+mod keyword {
+    syn::custom_keyword!(Error);
+    syn::custom_keyword!(pallet);
+    syn::custom_keyword!(getter);
+    syn::custom_keyword!(storage_prefix);
+    syn::custom_keyword!(unbounded);
+    syn::custom_keyword!(whitelist_storage);
+    syn::custom_keyword!(disable_try_decode_storage);
+    syn::custom_keyword!(OptionQuery);
+    syn::custom_keyword!(ResultQuery);
+    syn::custom_keyword!(ValueQuery);
+}
+
+/// Parse for one of the following:
+/// * `#[pallet::getter(fn dummy)]`
+/// * `#[pallet::storage_prefix = "CustomName"]`
+/// * `#[pallet::unbounded]`
+/// * `#[pallet::whitelist_storage]
+/// * `#[pallet::disable_try_decode_storage]`
+pub enum PalletStorageAttr {
+    Getter(syn::Ident, proc_macro2::Span),
+    StorageName(syn::LitStr, proc_macro2::Span),
+    Unbounded(proc_macro2::Span),
+    WhitelistStorage(proc_macro2::Span),
+    DisableTryDecodeStorage(proc_macro2::Span),
+}
+
+impl PalletStorageAttr {
+    fn attr_span(&self) -> proc_macro2::Span {
+        match self {
+            Self::Getter(_, span)
+            | Self::StorageName(_, span)
+            | Self::Unbounded(span)
+            | Self::WhitelistStorage(span) => *span,
+            Self::DisableTryDecodeStorage(span) => *span,
+        }
+    }
+}
+
+impl syn::parse::Parse for PalletStorageAttr {
+    fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
+        input.parse::<syn::Token![#]>()?;
+        let attr_span = input.span();
+        let content;
+        syn::bracketed!(content in input);
+        content.parse::<keyword::pallet>()?;
+        content.parse::<syn::Token![::]>()?;
+
+        let lookahead = content.lookahead1();
+        if lookahead.peek(keyword::getter) {
+            content.parse::<keyword::getter>()?;
+
+            let generate_content;
+            syn::parenthesized!(generate_content in content);
+            generate_content.parse::<syn::Token![fn]>()?;
+            Ok(Self::Getter(
+                generate_content.parse::<syn::Ident>()?,
+                attr_span,
+            ))
+        } else if lookahead.peek(keyword::storage_prefix) {
+            content.parse::<keyword::storage_prefix>()?;
+            content.parse::<syn::Token![=]>()?;
+
+            let renamed_prefix = content.parse::<syn::LitStr>()?;
+            // Ensure the renamed prefix is a proper Rust identifier
+            syn::parse_str::<syn::Ident>(&renamed_prefix.value()).map_err(|_| {
+                let msg = format!("`{}` is not a valid identifier", renamed_prefix.value());
+                syn::Error::new(renamed_prefix.span(), msg)
+            })?;
+
+            Ok(Self::StorageName(renamed_prefix, attr_span))
+        } else if lookahead.peek(keyword::unbounded) {
+            content.parse::<keyword::unbounded>()?;
+
+            Ok(Self::Unbounded(attr_span))
+        } else if lookahead.peek(keyword::whitelist_storage) {
+            content.parse::<keyword::whitelist_storage>()?;
+            Ok(Self::WhitelistStorage(attr_span))
+        } else if lookahead.peek(keyword::disable_try_decode_storage) {
+            content.parse::<keyword::disable_try_decode_storage>()?;
+            Ok(Self::DisableTryDecodeStorage(attr_span))
+        } else {
+            Err(lookahead.error())
+        }
+    }
+}
+
+struct PalletStorageAttrInfo {
+    getter: Option<syn::Ident>,
+    rename_as: Option<syn::LitStr>,
+    unbounded: bool,
+    whitelisted: bool,
+    try_decode: bool,
+}
+
+impl PalletStorageAttrInfo {
+    fn from_attrs(attrs: Vec<PalletStorageAttr>) -> syn::Result<Self> {
+        let mut getter = None;
+        let mut rename_as = None;
+        let mut unbounded = false;
+        let mut whitelisted = false;
+        let mut disable_try_decode_storage = false;
+        for attr in attrs {
+            match attr {
+                PalletStorageAttr::Getter(ident, ..) if getter.is_none() => getter = Some(ident),
+                PalletStorageAttr::StorageName(name, ..) if rename_as.is_none() => {
+                    rename_as = Some(name)
+                }
+                PalletStorageAttr::Unbounded(..) if !unbounded => unbounded = true,
+                PalletStorageAttr::WhitelistStorage(..) if !whitelisted => whitelisted = true,
+                PalletStorageAttr::DisableTryDecodeStorage(..) if !disable_try_decode_storage => {
+                    disable_try_decode_storage = true
+                }
+                attr => {
+                    return Err(syn::Error::new(
+                        attr.attr_span(),
+                        "Invalid attribute: Duplicate attribute",
+                    ))
+                }
+            }
+        }
+
+        Ok(PalletStorageAttrInfo {
+            getter,
+            rename_as,
+            unbounded,
+            whitelisted,
+            try_decode: !disable_try_decode_storage,
+        })
+    }
+}
+
+/// The value and key types used by storages. Needed to expand metadata.
+pub enum Metadata {
+    Value {
+        value: syn::Type,
+    },
+    Map {
+        value: syn::Type,
+        key: syn::Type,
+    },
+    CountedMap {
+        value: syn::Type,
+        key: syn::Type,
+    },
+    DoubleMap {
+        value: syn::Type,
+        key1: syn::Type,
+        key2: syn::Type,
+    },
+    NMap {
+        keys: Vec<syn::Type>,
+        keygen: syn::Type,
+        value: syn::Type,
+    },
+    CountedNMap {
+        keys: Vec<syn::Type>,
+        keygen: syn::Type,
+        value: syn::Type,
+    },
+}
+
+pub enum QueryKind {
+    OptionQuery,
+    ResultQuery(syn::Path, syn::Ident),
+    ValueQuery,
+}
+
+/// Definition of a storage, storage is a storage type like
+/// `type MyStorage = StorageValue<MyStorageP, u32>`
+/// The keys and values types are parsed in order to get metadata
+pub struct StorageDef {
+    /// The index of storage item in pallet module.
+    pub index: usize,
+    /// Visibility of the storage type.
+    pub vis: syn::Visibility,
+    /// The type ident, to generate the StoragePrefix for.
+    pub ident: syn::Ident,
+    /// The keys and value metadata of the storage.
+    pub metadata: Metadata,
+    /// The doc associated to the storage.
+    pub docs: Vec<syn::Expr>,
+    /// A set of usage of instance, must be check for consistency with config.
+    pub instances: Vec<helper::InstanceUsage>,
+    /// Optional getter to generate. If some then query_kind is ensured to be some as well.
+    pub getter: Option<syn::Ident>,
+    /// Optional expression that evaluates to a type that can be used as StoragePrefix instead of
+    /// ident.
+    pub rename_as: Option<syn::LitStr>,
+    /// Whereas the querytype of the storage is OptionQuery, ResultQuery or ValueQuery.
+    /// Note that this is best effort as it can't be determined when QueryKind is generic, and
+    /// result can be false if user do some unexpected type alias.
+    pub query_kind: Option<QueryKind>,
+    /// Where clause of type definition.
+    pub where_clause: Option<syn::WhereClause>,
+    /// The span of the pallet::storage attribute.
+    pub attr_span: proc_macro2::Span,
+    /// The `cfg` attributes.
+    pub cfg_attrs: Vec<syn::Attribute>,
+    /// If generics are named (e.g. `StorageValue<Value = u32, ..>`) then this contains all the
+    /// generics of the storage.
+    /// If generics are not named, this is none.
+    pub named_generics: Option<StorageGenerics>,
+    /// If the value stored in this storage is unbounded.
+    pub unbounded: bool,
+    /// Whether or not reads to this storage key will be ignored by benchmarking
+    pub whitelisted: bool,
+    /// Whether or not to try to decode the storage key when running try-runtime checks.
+    pub try_decode: bool,
+    /// Whether or not a default hasher is allowed to replace `_`
+    pub use_default_hasher: bool,
+}
+
+/// The parsed generic from the
+#[derive(Clone)]
+pub enum StorageGenerics {
+    DoubleMap {
+        hasher1: syn::Type,
+        key1: syn::Type,
+        hasher2: syn::Type,
+        key2: syn::Type,
+        value: syn::Type,
+        query_kind: Option<syn::Type>,
+        on_empty: Option<syn::Type>,
+        max_values: Option<syn::Type>,
+    },
+    Map {
+        hasher: syn::Type,
+        key: syn::Type,
+        value: syn::Type,
+        query_kind: Option<syn::Type>,
+        on_empty: Option<syn::Type>,
+        max_values: Option<syn::Type>,
+    },
+    CountedMap {
+        hasher: syn::Type,
+        key: syn::Type,
+        value: syn::Type,
+        query_kind: Option<syn::Type>,
+        on_empty: Option<syn::Type>,
+        max_values: Option<syn::Type>,
+    },
+    Value {
+        value: syn::Type,
+        query_kind: Option<syn::Type>,
+        on_empty: Option<syn::Type>,
+    },
+    NMap {
+        keygen: syn::Type,
+        value: syn::Type,
+        query_kind: Option<syn::Type>,
+        on_empty: Option<syn::Type>,
+        max_values: Option<syn::Type>,
+    },
+    CountedNMap {
+        keygen: syn::Type,
+        value: syn::Type,
+        query_kind: Option<syn::Type>,
+        on_empty: Option<syn::Type>,
+        max_values: Option<syn::Type>,
+    },
+}
+
+impl StorageGenerics {
+    /// Return the metadata from the defined generics
+    fn metadata(&self) -> syn::Result<Metadata> {
+        let res = match self.clone() {
+            Self::DoubleMap {
+                value, key1, key2, ..
+            } => Metadata::DoubleMap { value, key1, key2 },
+            Self::Map { value, key, .. } => Metadata::Map { value, key },
+            Self::CountedMap { value, key, .. } => Metadata::CountedMap { value, key },
+            Self::Value { value, .. } => Metadata::Value { value },
+            Self::NMap { keygen, value, .. } => Metadata::NMap {
+                keys: collect_keys(&keygen)?,
+                keygen,
+                value,
+            },
+            Self::CountedNMap { keygen, value, .. } => Metadata::CountedNMap {
+                keys: collect_keys(&keygen)?,
+                keygen,
+                value,
+            },
+        };
+
+        Ok(res)
+    }
+
+    /// Return the query kind from the defined generics
+    fn query_kind(&self) -> Option<syn::Type> {
+        match &self {
+            Self::DoubleMap { query_kind, .. }
+            | Self::Map { query_kind, .. }
+            | Self::CountedMap { query_kind, .. }
+            | Self::Value { query_kind, .. }
+            | Self::NMap { query_kind, .. }
+            | Self::CountedNMap { query_kind, .. } => query_kind.clone(),
+        }
+    }
+}
+
+enum StorageKind {
+    Value,
+    Map,
+    CountedMap,
+    DoubleMap,
+    NMap,
+    CountedNMap,
+}
+
+/// Check the generics in the `map` contains the generics in `gen` may contains generics in
+/// `optional_gen`, and doesn't contains any other.
+fn check_generics(
+    map: &HashMap<String, syn::AssocType>,
+    mandatory_generics: &[&str],
+    optional_generics: &[&str],
+    storage_type_name: &str,
+    args_span: proc_macro2::Span,
+) -> syn::Result<()> {
+    let mut errors = vec![];
+
+    let expectation = {
+        let mut e = format!(
+            "`{}` expect generics {}and optional generics {}",
+            storage_type_name,
+            mandatory_generics
+                .iter()
+                .map(|name| format!("`{}`, ", name))
+                .collect::<String>(),
+            &optional_generics
+                .iter()
+                .map(|name| format!("`{}`, ", name))
+                .collect::<String>(),
+        );
+        e.pop();
+        e.pop();
+        e.push('.');
+        e
+    };
+
+    for (gen_name, gen_binding) in map {
+        if !mandatory_generics.contains(&gen_name.as_str())
+            && !optional_generics.contains(&gen_name.as_str())
+        {
+            let msg = format!(
+                "Invalid pallet::storage, Unexpected generic `{}` for `{}`. {}",
+                gen_name, storage_type_name, expectation,
+            );
+            errors.push(syn::Error::new(gen_binding.span(), msg));
+        }
+    }
+
+    for mandatory_generic in mandatory_generics {
+        if !map.contains_key(&mandatory_generic.to_string()) {
+            let msg = format!(
+                "Invalid pallet::storage, cannot find `{}` generic, required for `{}`.",
+                mandatory_generic, storage_type_name
+            );
+            errors.push(syn::Error::new(args_span, msg));
+        }
+    }
+
+    let mut errors = errors.drain(..);
+    if let Some(mut error) = errors.next() {
+        for other_error in errors {
+            error.combine(other_error);
+        }
+        Err(error)
+    } else {
+        Ok(())
+    }
+}
+
+/// Returns `(named generics, metadata, query kind, use_default_hasher)`
+fn process_named_generics(
+    storage: &StorageKind,
+    args_span: proc_macro2::Span,
+    args: &[syn::AssocType],
+    dev_mode: bool,
+) -> syn::Result<(Option<StorageGenerics>, Metadata, Option<syn::Type>, bool)> {
+    let mut parsed = HashMap::<String, syn::AssocType>::new();
+
+    // Ensure no duplicate.
+    for arg in args {
+        if let Some(other) = parsed.get(&arg.ident.to_string()) {
+            let msg = "Invalid pallet::storage, Duplicated named generic";
+            let mut err = syn::Error::new(arg.ident.span(), msg);
+            err.combine(syn::Error::new(other.ident.span(), msg));
+            return Err(err);
+        }
+        parsed.insert(arg.ident.to_string(), arg.clone());
+    }
+
+    let mut map_mandatory_generics = vec!["Key", "Value"];
+    let mut map_optional_generics = vec!["QueryKind", "OnEmpty", "MaxValues"];
+    if dev_mode {
+        map_optional_generics.push("Hasher");
+    } else {
+        map_mandatory_generics.push("Hasher");
+    }
+
+    let generics = match storage {
+        StorageKind::Value => {
+            check_generics(
+                &parsed,
+                &["Value"],
+                &["QueryKind", "OnEmpty"],
+                "StorageValue",
+                args_span,
+            )?;
+
+            StorageGenerics::Value {
+                value: parsed
+                    .remove("Value")
+                    .map(|binding| binding.ty)
+                    .expect("checked above as mandatory generic"),
+                query_kind: parsed.remove("QueryKind").map(|binding| binding.ty),
+                on_empty: parsed.remove("OnEmpty").map(|binding| binding.ty),
+            }
+        }
+        StorageKind::Map => {
+            check_generics(
+                &parsed,
+                &map_mandatory_generics,
+                &map_optional_generics,
+                "StorageMap",
+                args_span,
+            )?;
+
+            StorageGenerics::Map {
+                hasher: parsed
+                    .remove("Hasher")
+                    .map(|binding| binding.ty)
+                    .unwrap_or(syn::parse_quote!(Blake2_128Concat)),
+                key: parsed
+                    .remove("Key")
+                    .map(|binding| binding.ty)
+                    .expect("checked above as mandatory generic"),
+                value: parsed
+                    .remove("Value")
+                    .map(|binding| binding.ty)
+                    .expect("checked above as mandatory generic"),
+                query_kind: parsed.remove("QueryKind").map(|binding| binding.ty),
+                on_empty: parsed.remove("OnEmpty").map(|binding| binding.ty),
+                max_values: parsed.remove("MaxValues").map(|binding| binding.ty),
+            }
+        }
+        StorageKind::CountedMap => {
+            check_generics(
+                &parsed,
+                &map_mandatory_generics,
+                &map_optional_generics,
+                "CountedStorageMap",
+                args_span,
+            )?;
+
+            StorageGenerics::CountedMap {
+                hasher: parsed
+                    .remove("Hasher")
+                    .map(|binding| binding.ty)
+                    .unwrap_or(syn::Type::Verbatim(quote::quote! { Blake2_128Concat })),
+                key: parsed
+                    .remove("Key")
+                    .map(|binding| binding.ty)
+                    .expect("checked above as mandatory generic"),
+                value: parsed
+                    .remove("Value")
+                    .map(|binding| binding.ty)
+                    .expect("checked above as mandatory generic"),
+                query_kind: parsed.remove("QueryKind").map(|binding| binding.ty),
+                on_empty: parsed.remove("OnEmpty").map(|binding| binding.ty),
+                max_values: parsed.remove("MaxValues").map(|binding| binding.ty),
+            }
+        }
+        StorageKind::DoubleMap => {
+            let mut double_map_mandatory_generics = vec!["Key1", "Key2", "Value"];
+            if dev_mode {
+                map_optional_generics.extend(["Hasher1", "Hasher2"]);
+            } else {
+                double_map_mandatory_generics.extend(["Hasher1", "Hasher2"]);
+            }
+
+            check_generics(
+                &parsed,
+                &double_map_mandatory_generics,
+                &map_optional_generics,
+                "StorageDoubleMap",
+                args_span,
+            )?;
+
+            StorageGenerics::DoubleMap {
+                hasher1: parsed
+                    .remove("Hasher1")
+                    .map(|binding| binding.ty)
+                    .unwrap_or(syn::parse_quote!(Blake2_128Concat)),
+                key1: parsed
+                    .remove("Key1")
+                    .map(|binding| binding.ty)
+                    .expect("checked above as mandatory generic"),
+                hasher2: parsed
+                    .remove("Hasher2")
+                    .map(|binding| binding.ty)
+                    .unwrap_or(syn::parse_quote!(Blake2_128Concat)),
+                key2: parsed
+                    .remove("Key2")
+                    .map(|binding| binding.ty)
+                    .expect("checked above as mandatory generic"),
+                value: parsed
+                    .remove("Value")
+                    .map(|binding| binding.ty)
+                    .expect("checked above as mandatory generic"),
+                query_kind: parsed.remove("QueryKind").map(|binding| binding.ty),
+                on_empty: parsed.remove("OnEmpty").map(|binding| binding.ty),
+                max_values: parsed.remove("MaxValues").map(|binding| binding.ty),
+            }
+        }
+        StorageKind::NMap => {
+            check_generics(
+                &parsed,
+                &["Key", "Value"],
+                &["QueryKind", "OnEmpty", "MaxValues"],
+                "StorageNMap",
+                args_span,
+            )?;
+
+            StorageGenerics::NMap {
+                keygen: parsed
+                    .remove("Key")
+                    .map(|binding| binding.ty)
+                    .expect("checked above as mandatory generic"),
+                value: parsed
+                    .remove("Value")
+                    .map(|binding| binding.ty)
+                    .expect("checked above as mandatory generic"),
+                query_kind: parsed.remove("QueryKind").map(|binding| binding.ty),
+                on_empty: parsed.remove("OnEmpty").map(|binding| binding.ty),
+                max_values: parsed.remove("MaxValues").map(|binding| binding.ty),
+            }
+        }
+        StorageKind::CountedNMap => {
+            check_generics(
+                &parsed,
+                &["Key", "Value"],
+                &["QueryKind", "OnEmpty", "MaxValues"],
+                "CountedStorageNMap",
+                args_span,
+            )?;
+
+            StorageGenerics::CountedNMap {
+                keygen: parsed
+                    .remove("Key")
+                    .map(|binding| binding.ty)
+                    .expect("checked above as mandatory generic"),
+                value: parsed
+                    .remove("Value")
+                    .map(|binding| binding.ty)
+                    .expect("checked above as mandatory generic"),
+                query_kind: parsed.remove("QueryKind").map(|binding| binding.ty),
+                on_empty: parsed.remove("OnEmpty").map(|binding| binding.ty),
+                max_values: parsed.remove("MaxValues").map(|binding| binding.ty),
+            }
+        }
+    };
+
+    let metadata = generics.metadata()?;
+    let query_kind = generics.query_kind();
+
+    Ok((Some(generics), metadata, query_kind, false))
+}
+
+/// Returns `(named generics, metadata, query kind, use_default_hasher)`
+fn process_unnamed_generics(
+    storage: &StorageKind,
+    args_span: proc_macro2::Span,
+    args: &[syn::Type],
+    dev_mode: bool,
+) -> syn::Result<(Option<StorageGenerics>, Metadata, Option<syn::Type>, bool)> {
+    let retrieve_arg = |arg_pos| {
+        args.get(arg_pos).cloned().ok_or_else(|| {
+            let msg = format!(
+                "Invalid pallet::storage, unexpected number of generic argument, \
+						expect at least {} args, found {}.",
+                arg_pos + 1,
+                args.len(),
+            );
+            syn::Error::new(args_span, msg)
+        })
+    };
+
+    let prefix_arg = retrieve_arg(0)?;
+    syn::parse2::<syn::Token![_]>(prefix_arg.to_token_stream()).map_err(|e| {
+        let msg = "Invalid pallet::storage, for unnamed generic arguments the type \
+				first generic argument must be `_`, the argument is then replaced by macro.";
+        let mut err = syn::Error::new(prefix_arg.span(), msg);
+        err.combine(e);
+        err
+    })?;
+
+    let use_default_hasher = |arg_pos| {
+        let arg = retrieve_arg(arg_pos)?;
+        if syn::parse2::<syn::Token![_]>(arg.to_token_stream()).is_ok() {
+            if dev_mode {
+                Ok(true)
+            } else {
+                let msg = "`_` can only be used in dev_mode. Please specify an appropriate hasher.";
+                Err(syn::Error::new(arg.span(), msg))
+            }
+        } else {
+            Ok(false)
+        }
+    };
+
+    let res = match storage {
+        StorageKind::Value => (
+            None,
+            Metadata::Value {
+                value: retrieve_arg(1)?,
+            },
+            retrieve_arg(2).ok(),
+            false,
+        ),
+        StorageKind::Map => (
+            None,
+            Metadata::Map {
+                key: retrieve_arg(2)?,
+                value: retrieve_arg(3)?,
+            },
+            retrieve_arg(4).ok(),
+            use_default_hasher(1)?,
+        ),
+        StorageKind::CountedMap => (
+            None,
+            Metadata::CountedMap {
+                key: retrieve_arg(2)?,
+                value: retrieve_arg(3)?,
+            },
+            retrieve_arg(4).ok(),
+            use_default_hasher(1)?,
+        ),
+        StorageKind::DoubleMap => (
+            None,
+            Metadata::DoubleMap {
+                key1: retrieve_arg(2)?,
+                key2: retrieve_arg(4)?,
+                value: retrieve_arg(5)?,
+            },
+            retrieve_arg(6).ok(),
+            use_default_hasher(1)? && use_default_hasher(3)?,
+        ),
+        StorageKind::NMap => {
+            let keygen = retrieve_arg(1)?;
+            let keys = collect_keys(&keygen)?;
+            (
+                None,
+                Metadata::NMap {
+                    keys,
+                    keygen,
+                    value: retrieve_arg(2)?,
+                },
+                retrieve_arg(3).ok(),
+                false,
+            )
+        }
+        StorageKind::CountedNMap => {
+            let keygen = retrieve_arg(1)?;
+            let keys = collect_keys(&keygen)?;
+            (
+                None,
+                Metadata::CountedNMap {
+                    keys,
+                    keygen,
+                    value: retrieve_arg(2)?,
+                },
+                retrieve_arg(3).ok(),
+                false,
+            )
+        }
+    };
+
+    Ok(res)
+}
+
+/// Returns `(named generics, metadata, query kind, use_default_hasher)`
+fn process_generics(
+    segment: &syn::PathSegment,
+    dev_mode: bool,
+) -> syn::Result<(Option<StorageGenerics>, Metadata, Option<syn::Type>, bool)> {
+    let storage_kind = match &*segment.ident.to_string() {
+        "StorageValue" => StorageKind::Value,
+        "StorageMap" => StorageKind::Map,
+        "CountedStorageMap" => StorageKind::CountedMap,
+        "StorageDoubleMap" => StorageKind::DoubleMap,
+        "StorageNMap" => StorageKind::NMap,
+        "CountedStorageNMap" => StorageKind::CountedNMap,
+        found => {
+            let msg = format!(
+                "Invalid pallet::storage, expected ident: `StorageValue` or \
+				`StorageMap` or `CountedStorageMap` or `StorageDoubleMap` or `StorageNMap` or `CountedStorageNMap` \
+				in order to expand metadata, found `{}`.",
+                found,
+            );
+            return Err(syn::Error::new(segment.ident.span(), msg));
+        }
+    };
+
+    let args_span = segment.arguments.span();
+
+    let args = match &segment.arguments {
+        syn::PathArguments::AngleBracketed(args) if !args.args.is_empty() => args,
+        _ => {
+            let msg = "Invalid pallet::storage, invalid number of generic generic arguments, \
+				expect more that 0 generic arguments.";
+            return Err(syn::Error::new(segment.span(), msg));
+        }
+    };
+
+    if args
+        .args
+        .iter()
+        .all(|gen| matches!(gen, syn::GenericArgument::Type(_)))
+    {
+        let args = args
+            .args
+            .iter()
+            .map(|gen| match gen {
+                syn::GenericArgument::Type(gen) => gen.clone(),
+                _ => unreachable!("It is asserted above that all generics are types"),
+            })
+            .collect::<Vec<_>>();
+        process_unnamed_generics(&storage_kind, args_span, &args, dev_mode)
+    } else if args
+        .args
+        .iter()
+        .all(|gen| matches!(gen, syn::GenericArgument::AssocType(_)))
+    {
+        let args = args
+            .args
+            .iter()
+            .map(|gen| match gen {
+                syn::GenericArgument::AssocType(gen) => gen.clone(),
+                _ => unreachable!("It is asserted above that all generics are bindings"),
+            })
+            .collect::<Vec<_>>();
+        process_named_generics(&storage_kind, args_span, &args, dev_mode)
+    } else {
+        let msg = "Invalid pallet::storage, invalid generic declaration for storage. Expect only \
+			type generics or binding generics, e.g. `<Name1 = Gen1, Name2 = Gen2, ..>` or \
+			`<Gen1, Gen2, ..>`.";
+        Err(syn::Error::new(segment.span(), msg))
+    }
+}
+
+/// Parse the 2nd type argument to `StorageNMap` and return its keys.
+fn collect_keys(keygen: &syn::Type) -> syn::Result<Vec<syn::Type>> {
+    if let syn::Type::Tuple(tup) = keygen {
+        tup.elems
+            .iter()
+            .map(extract_key)
+            .collect::<syn::Result<Vec<_>>>()
+    } else {
+        Ok(vec![extract_key(keygen)?])
+    }
+}
+
+/// In `Key<H, K>`, extract K and return it.
+fn extract_key(ty: &syn::Type) -> syn::Result<syn::Type> {
+    let typ = if let syn::Type::Path(typ) = ty {
+        typ
+    } else {
+        let msg = "Invalid pallet::storage, expected type path";
+        return Err(syn::Error::new(ty.span(), msg));
+    };
+
+    let key_struct = typ.path.segments.last().ok_or_else(|| {
+        let msg = "Invalid pallet::storage, expected type path with at least one segment";
+        syn::Error::new(typ.path.span(), msg)
+    })?;
+    if key_struct.ident != "Key" && key_struct.ident != "NMapKey" {
+        let msg = "Invalid pallet::storage, expected Key or NMapKey struct";
+        return Err(syn::Error::new(key_struct.ident.span(), msg));
+    }
+
+    let ty_params = if let syn::PathArguments::AngleBracketed(args) = &key_struct.arguments {
+        args
+    } else {
+        let msg = "Invalid pallet::storage, expected angle bracketed arguments";
+        return Err(syn::Error::new(key_struct.arguments.span(), msg));
+    };
+
+    if ty_params.args.len() != 2 {
+        let msg = format!(
+            "Invalid pallet::storage, unexpected number of generic arguments \
+			for Key struct, expected 2 args, found {}",
+            ty_params.args.len()
+        );
+        return Err(syn::Error::new(ty_params.span(), msg));
+    }
+
+    let key = match &ty_params.args[1] {
+        syn::GenericArgument::Type(key_ty) => key_ty.clone(),
+        _ => {
+            let msg = "Invalid pallet::storage, expected type";
+            return Err(syn::Error::new(ty_params.args[1].span(), msg));
+        }
+    };
+
+    Ok(key)
+}
+
+impl StorageDef {
+    /// Return the storage prefix for this storage item
+    pub fn prefix(&self) -> String {
+        self.rename_as
+            .as_ref()
+            .map(syn::LitStr::value)
+            .unwrap_or_else(|| self.ident.to_string())
+    }
+
+    /// Return either the span of the ident or the span of the literal in the
+    /// #[storage_prefix] attribute
+    pub fn prefix_span(&self) -> proc_macro2::Span {
+        self.rename_as
+            .as_ref()
+            .map(syn::LitStr::span)
+            .unwrap_or_else(|| self.ident.span())
+    }
+
+    pub fn try_from(
+        attr_span: proc_macro2::Span,
+        index: usize,
+        item: &mut syn::Item,
+        dev_mode: bool,
+    ) -> syn::Result<Self> {
+        let item = if let syn::Item::Type(item) = item {
+            item
+        } else {
+            return Err(syn::Error::new(
+                item.span(),
+                "Invalid pallet::storage, expect item type.",
+            ));
+        };
+
+        let attrs: Vec<PalletStorageAttr> = helper::take_item_pallet_attrs(&mut item.attrs)?;
+        let PalletStorageAttrInfo {
+            getter,
+            rename_as,
+            mut unbounded,
+            whitelisted,
+            try_decode,
+        } = PalletStorageAttrInfo::from_attrs(attrs)?;
+
+        // set all storages to be unbounded if dev_mode is enabled
+        unbounded |= dev_mode;
+        let cfg_attrs = helper::get_item_cfg_attrs(&item.attrs);
+
+        let instances = vec![helper::check_type_def_gen(
+            &item.generics,
+            item.ident.span(),
+        )?];
+
+        let where_clause = item.generics.where_clause.clone();
+        let docs = get_doc_literals(&item.attrs);
+
+        let typ = if let syn::Type::Path(typ) = &*item.ty {
+            typ
+        } else {
+            let msg = "Invalid pallet::storage, expected type path";
+            return Err(syn::Error::new(item.ty.span(), msg));
+        };
+
+        if typ.path.segments.len() != 1 {
+            let msg = "Invalid pallet::storage, expected type path with one segment";
+            return Err(syn::Error::new(item.ty.span(), msg));
+        }
+
+        let (named_generics, metadata, query_kind, use_default_hasher) =
+            process_generics(&typ.path.segments[0], dev_mode)?;
+
+        let query_kind = query_kind
+            .map(|query_kind| {
+                use syn::{
+                    AngleBracketedGenericArguments, GenericArgument, Path, PathArguments, Type,
+                    TypePath,
+                };
+
+                let result_query = match query_kind {
+                    Type::Path(path)
+                        if path
+                            .path
+                            .segments
+                            .last()
+                            .map_or(false, |s| s.ident == "OptionQuery") =>
+                    {
+                        return Ok(Some(QueryKind::OptionQuery))
+                    }
+                    Type::Path(TypePath {
+                        path: Path { segments, .. },
+                        ..
+                    }) if segments.last().map_or(false, |s| s.ident == "ResultQuery") => segments
+                        .last()
+                        .expect("segments is checked to have the last value; qed")
+                        .clone(),
+                    Type::Path(path)
+                        if path
+                            .path
+                            .segments
+                            .last()
+                            .map_or(false, |s| s.ident == "ValueQuery") =>
+                    {
+                        return Ok(Some(QueryKind::ValueQuery))
+                    }
+                    _ => return Ok(None),
+                };
+
+                let error_type = match result_query.arguments {
+                    PathArguments::AngleBracketed(AngleBracketedGenericArguments {
+                        args, ..
+                    }) => {
+                        if args.len() != 1 {
+                            let msg = format!(
+                                "Invalid pallet::storage, unexpected number of generic arguments \
+								for ResultQuery, expected 1 type argument, found {}",
+                                args.len(),
+                            );
+                            return Err(syn::Error::new(args.span(), msg));
+                        }
+
+                        args[0].clone()
+                    }
+                    args => {
+                        let msg = format!(
+                            "Invalid pallet::storage, unexpected generic args for ResultQuery, \
+							expected angle-bracketed arguments, found `{}`",
+                            args.to_token_stream().to_string()
+                        );
+                        return Err(syn::Error::new(args.span(), msg));
+                    }
+                };
+
+                match error_type {
+                    GenericArgument::Type(Type::Path(TypePath {
+                        path:
+                            Path {
+                                segments: err_variant,
+                                leading_colon,
+                            },
+                        ..
+                    })) => {
+                        if err_variant.len() < 2 {
+                            let msg = format!(
+                                "Invalid pallet::storage, unexpected number of path segments for \
+								the generics in ResultQuery, expected a path with at least 2 \
+								segments, found {}",
+                                err_variant.len(),
+                            );
+                            return Err(syn::Error::new(err_variant.span(), msg));
+                        }
+                        let mut error = err_variant.clone();
+                        let err_variant = error
+                            .pop()
+                            .expect("Checked to have at least 2; qed")
+                            .into_value()
+                            .ident;
+
+                        // Necessary here to eliminate the last double colon
+                        let last = error
+                            .pop()
+                            .expect("Checked to have at least 2; qed")
+                            .into_value();
+                        error.push_value(last);
+
+                        Ok(Some(QueryKind::ResultQuery(
+                            syn::Path {
+                                leading_colon,
+                                segments: error,
+                            },
+                            err_variant,
+                        )))
+                    }
+                    gen_arg => {
+                        let msg = format!(
+							"Invalid pallet::storage, unexpected generic argument kind, expected a \
+							type path to a `PalletError` enum variant, found `{}`",
+							gen_arg.to_token_stream().to_string(),
+						);
+                        Err(syn::Error::new(gen_arg.span(), msg))
+                    }
+                }
+            })
+            .transpose()?
+            .unwrap_or(Some(QueryKind::OptionQuery));
+
+        if let (None, Some(getter)) = (query_kind.as_ref(), getter.as_ref()) {
+            let msg = "Invalid pallet::storage, cannot generate getter because QueryKind is not \
+				identifiable. QueryKind must be `OptionQuery`, `ResultQuery`, `ValueQuery`, or default \
+				one to be identifiable.";
+            return Err(syn::Error::new(getter.span(), msg));
+        }
+
+        Ok(StorageDef {
+            attr_span,
+            index,
+            vis: item.vis.clone(),
+            ident: item.ident.clone(),
+            instances,
+            metadata,
+            docs,
+            getter,
+            rename_as,
+            query_kind,
+            where_clause,
+            cfg_attrs,
+            named_generics,
+            unbounded,
+            whitelisted,
+            try_decode,
+            use_default_hasher,
+        })
+    }
+}
diff --git a/support/procedural-fork/src/pallet/parse/tasks.rs b/support/procedural-fork/src/pallet/parse/tasks.rs
new file mode 100644
index 000000000..50633fbd0
--- /dev/null
+++ b/support/procedural-fork/src/pallet/parse/tasks.rs
@@ -0,0 +1,1005 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Home of the parsing code for the Tasks API
+
+use std::collections::HashSet;
+
+#[cfg(test)]
+use crate::assert_parse_error_matches;
+
+#[cfg(test)]
+use crate::pallet::parse::tests::simulate_manifest_dir;
+
+use derive_syn_parse::Parse;
+use frame_support_procedural_tools::generate_access_from_frame_or_crate;
+use proc_macro2::TokenStream as TokenStream2;
+use quote::{quote, ToTokens};
+use syn::{
+    parse::ParseStream,
+    parse2,
+    spanned::Spanned,
+    token::{Bracket, Paren, PathSep, Pound},
+    Attribute, Error, Expr, Ident, ImplItem, ImplItemFn, ItemEnum, ItemImpl, LitInt, Path,
+    PathArguments, Result, TypePath,
+};
+
+pub mod keywords {
+    use syn::custom_keyword;
+
+    custom_keyword!(tasks_experimental);
+    custom_keyword!(task_enum);
+    custom_keyword!(task_list);
+    custom_keyword!(task_condition);
+    custom_keyword!(task_index);
+    custom_keyword!(task_weight);
+    custom_keyword!(pallet);
+}
+
+/// Represents the `#[pallet::tasks_experimental]` attribute and its attached item. Also includes
+/// metadata about the linked [`TaskEnumDef`] if applicable.
+#[derive(Clone, Debug)]
+pub struct TasksDef {
+    pub tasks_attr: Option<PalletTasksAttr>,
+    pub tasks: Vec<TaskDef>,
+    pub item_impl: ItemImpl,
+    /// Path to `frame_support`
+    pub scrate: Path,
+    pub enum_ident: Ident,
+    pub enum_arguments: PathArguments,
+}
+
+impl syn::parse::Parse for TasksDef {
+    fn parse(input: ParseStream) -> Result<Self> {
+        let item_impl: ItemImpl = input.parse()?;
+        let (tasks_attrs, normal_attrs) = partition_tasks_attrs(&item_impl);
+        let tasks_attr = match tasks_attrs.first() {
+            Some(attr) => Some(parse2::<PalletTasksAttr>(attr.to_token_stream())?),
+            None => None,
+        };
+        if let Some(extra_tasks_attr) = tasks_attrs.get(1) {
+            return Err(Error::new(
+                extra_tasks_attr.span(),
+                "unexpected extra `#[pallet::tasks_experimental]` attribute",
+            ));
+        }
+        let tasks: Vec<TaskDef> = if tasks_attr.is_some() {
+            item_impl
+                .items
+                .clone()
+                .into_iter()
+                .filter(|impl_item| matches!(impl_item, ImplItem::Fn(_)))
+                .map(|item| parse2::<TaskDef>(item.to_token_stream()))
+                .collect::<Result<_>>()?
+        } else {
+            Vec::new()
+        };
+        let mut task_indices = HashSet::<LitInt>::new();
+        for task in tasks.iter() {
+            let task_index = &task.index_attr.meta.index;
+            if !task_indices.insert(task_index.clone()) {
+                return Err(Error::new(
+                    task_index.span(),
+                    format!("duplicate task index `{}`", task_index),
+                ));
+            }
+        }
+        let mut item_impl = item_impl;
+        item_impl.attrs = normal_attrs;
+
+        // we require the path on the impl to be a TypePath
+        let enum_path = parse2::<TypePath>(item_impl.self_ty.to_token_stream())?;
+        let segments = enum_path.path.segments.iter().collect::<Vec<_>>();
+        let (Some(last_seg), None) = (segments.get(0), segments.get(1)) else {
+            return Err(Error::new(
+                enum_path.span(),
+                "if specified manually, the task enum must be defined locally in this \
+				pallet and cannot be a re-export",
+            ));
+        };
+        let enum_ident = last_seg.ident.clone();
+        let enum_arguments = last_seg.arguments.clone();
+
+        // We do this here because it would be improper to do something fallible like this at
+        // the expansion phase. Fallible stuff should happen during parsing.
+        let scrate = generate_access_from_frame_or_crate("frame-support")?;
+
+        Ok(TasksDef {
+            tasks_attr,
+            item_impl,
+            tasks,
+            scrate,
+            enum_ident,
+            enum_arguments,
+        })
+    }
+}
+
+/// Parsing for a `#[pallet::tasks_experimental]` attr.
+pub type PalletTasksAttr = PalletTaskAttr<keywords::tasks_experimental>;
+
+/// Parsing for any of the attributes that can be used within a `#[pallet::tasks_experimental]`
+/// [`ItemImpl`].
+pub type TaskAttr = PalletTaskAttr<TaskAttrMeta>;
+
+/// Parsing for a `#[pallet::task_index]` attr.
+pub type TaskIndexAttr = PalletTaskAttr<TaskIndexAttrMeta>;
+
+/// Parsing for a `#[pallet::task_condition]` attr.
+pub type TaskConditionAttr = PalletTaskAttr<TaskConditionAttrMeta>;
+
+/// Parsing for a `#[pallet::task_list]` attr.
+pub type TaskListAttr = PalletTaskAttr<TaskListAttrMeta>;
+
+/// Parsing for a `#[pallet::task_weight]` attr.
+pub type TaskWeightAttr = PalletTaskAttr<TaskWeightAttrMeta>;
+
+/// Parsing for a `#[pallet:task_enum]` attr.
+pub type PalletTaskEnumAttr = PalletTaskAttr<keywords::task_enum>;
+
+/// Parsing for a manually-specified (or auto-generated) task enum, optionally including the
+/// attached `#[pallet::task_enum]` attribute.
+#[derive(Clone, Debug)]
+pub struct TaskEnumDef {
+    pub attr: Option<PalletTaskEnumAttr>,
+    pub item_enum: ItemEnum,
+    pub scrate: Path,
+    pub type_use_generics: TokenStream2,
+}
+
+impl syn::parse::Parse for TaskEnumDef {
+    fn parse(input: ParseStream) -> Result<Self> {
+        let mut item_enum = input.parse::<ItemEnum>()?;
+        let attr = extract_pallet_attr(&mut item_enum)?;
+        let attr = match attr {
+            Some(attr) => Some(parse2(attr)?),
+            None => None,
+        };
+
+        // We do this here because it would be improper to do something fallible like this at
+        // the expansion phase. Fallible stuff should happen during parsing.
+        let scrate = generate_access_from_frame_or_crate("frame-support")?;
+
+        let type_use_generics = quote!(T);
+
+        Ok(TaskEnumDef {
+            attr,
+            item_enum,
+            scrate,
+            type_use_generics,
+        })
+    }
+}
+
+/// Represents an individual tasks within a [`TasksDef`].
+#[derive(Debug, Clone)]
+pub struct TaskDef {
+    pub index_attr: TaskIndexAttr,
+    pub condition_attr: TaskConditionAttr,
+    pub list_attr: TaskListAttr,
+    pub weight_attr: TaskWeightAttr,
+    pub normal_attrs: Vec<Attribute>,
+    pub item: ImplItemFn,
+    pub arg_names: Vec<Ident>,
+}
+
+impl syn::parse::Parse for TaskDef {
+    fn parse(input: ParseStream) -> Result<Self> {
+        let item = input.parse::<ImplItemFn>()?;
+        // we only want to activate TaskAttrType parsing errors for tasks-related attributes,
+        // so we filter them here
+        let (task_attrs, normal_attrs) = partition_task_attrs(&item);
+
+        let task_attrs: Vec<TaskAttr> = task_attrs
+            .into_iter()
+            .map(|attr| parse2(attr.to_token_stream()))
+            .collect::<Result<_>>()?;
+
+        let Some(index_attr) = task_attrs
+            .iter()
+            .find(|attr| matches!(attr.meta, TaskAttrMeta::TaskIndex(_)))
+            .cloned()
+        else {
+            return Err(Error::new(
+                item.sig.ident.span(),
+                "missing `#[pallet::task_index(..)]` attribute",
+            ));
+        };
+
+        let Some(condition_attr) = task_attrs
+            .iter()
+            .find(|attr| matches!(attr.meta, TaskAttrMeta::TaskCondition(_)))
+            .cloned()
+        else {
+            return Err(Error::new(
+                item.sig.ident.span(),
+                "missing `#[pallet::task_condition(..)]` attribute",
+            ));
+        };
+
+        let Some(list_attr) = task_attrs
+            .iter()
+            .find(|attr| matches!(attr.meta, TaskAttrMeta::TaskList(_)))
+            .cloned()
+        else {
+            return Err(Error::new(
+                item.sig.ident.span(),
+                "missing `#[pallet::task_list(..)]` attribute",
+            ));
+        };
+
+        let Some(weight_attr) = task_attrs
+            .iter()
+            .find(|attr| matches!(attr.meta, TaskAttrMeta::TaskWeight(_)))
+            .cloned()
+        else {
+            return Err(Error::new(
+                item.sig.ident.span(),
+                "missing `#[pallet::task_weight(..)]` attribute",
+            ));
+        };
+
+        if let Some(duplicate) = task_attrs
+            .iter()
+            .filter(|attr| matches!(attr.meta, TaskAttrMeta::TaskCondition(_)))
+            .collect::<Vec<_>>()
+            .get(1)
+        {
+            return Err(Error::new(
+                duplicate.span(),
+                "unexpected extra `#[pallet::task_condition(..)]` attribute",
+            ));
+        }
+
+        if let Some(duplicate) = task_attrs
+            .iter()
+            .filter(|attr| matches!(attr.meta, TaskAttrMeta::TaskList(_)))
+            .collect::<Vec<_>>()
+            .get(1)
+        {
+            return Err(Error::new(
+                duplicate.span(),
+                "unexpected extra `#[pallet::task_list(..)]` attribute",
+            ));
+        }
+
+        if let Some(duplicate) = task_attrs
+            .iter()
+            .filter(|attr| matches!(attr.meta, TaskAttrMeta::TaskIndex(_)))
+            .collect::<Vec<_>>()
+            .get(1)
+        {
+            return Err(Error::new(
+                duplicate.span(),
+                "unexpected extra `#[pallet::task_index(..)]` attribute",
+            ));
+        }
+
+        let mut arg_names = vec![];
+        for input in item.sig.inputs.iter() {
+            match input {
+                syn::FnArg::Typed(pat_type) => match &*pat_type.pat {
+                    syn::Pat::Ident(ident) => arg_names.push(ident.ident.clone()),
+                    _ => return Err(Error::new(input.span(), "unexpected pattern type")),
+                },
+                _ => {
+                    return Err(Error::new(
+                        input.span(),
+                        "unexpected function argument type",
+                    ))
+                }
+            }
+        }
+
+        let index_attr = index_attr.try_into().expect("we check the type above; QED");
+        let condition_attr = condition_attr
+            .try_into()
+            .expect("we check the type above; QED");
+        let list_attr = list_attr.try_into().expect("we check the type above; QED");
+        let weight_attr = weight_attr
+            .try_into()
+            .expect("we check the type above; QED");
+
+        Ok(TaskDef {
+            index_attr,
+            condition_attr,
+            list_attr,
+            weight_attr,
+            normal_attrs,
+            item,
+            arg_names,
+        })
+    }
+}
+
+/// The contents of a [`TasksDef`]-related attribute.
+#[derive(Parse, Debug, Clone)]
+pub enum TaskAttrMeta {
+    #[peek(keywords::task_list, name = "#[pallet::task_list(..)]")]
+    TaskList(TaskListAttrMeta),
+    #[peek(keywords::task_index, name = "#[pallet::task_index(..)")]
+    TaskIndex(TaskIndexAttrMeta),
+    #[peek(keywords::task_condition, name = "#[pallet::task_condition(..)")]
+    TaskCondition(TaskConditionAttrMeta),
+    #[peek(keywords::task_weight, name = "#[pallet::task_weight(..)")]
+    TaskWeight(TaskWeightAttrMeta),
+}
+
+/// The contents of a `#[pallet::task_list]` attribute.
+#[derive(Parse, Debug, Clone)]
+pub struct TaskListAttrMeta {
+    pub task_list: keywords::task_list,
+    #[paren]
+    _paren: Paren,
+    #[inside(_paren)]
+    pub expr: Expr,
+}
+
+/// The contents of a `#[pallet::task_index]` attribute.
+#[derive(Parse, Debug, Clone)]
+pub struct TaskIndexAttrMeta {
+    pub task_index: keywords::task_index,
+    #[paren]
+    _paren: Paren,
+    #[inside(_paren)]
+    pub index: LitInt,
+}
+
+/// The contents of a `#[pallet::task_condition]` attribute.
+#[derive(Parse, Debug, Clone)]
+pub struct TaskConditionAttrMeta {
+    pub task_condition: keywords::task_condition,
+    #[paren]
+    _paren: Paren,
+    #[inside(_paren)]
+    pub expr: Expr,
+}
+
+/// The contents of a `#[pallet::task_weight]` attribute.
+#[derive(Parse, Debug, Clone)]
+pub struct TaskWeightAttrMeta {
+    pub task_weight: keywords::task_weight,
+    #[paren]
+    _paren: Paren,
+    #[inside(_paren)]
+    pub expr: Expr,
+}
+
+/// The contents of a `#[pallet::task]` attribute.
+#[derive(Parse, Debug, Clone)]
+pub struct PalletTaskAttr<T: syn::parse::Parse + core::fmt::Debug + ToTokens> {
+    pub pound: Pound,
+    #[bracket]
+    _bracket: Bracket,
+    #[inside(_bracket)]
+    pub pallet: keywords::pallet,
+    #[inside(_bracket)]
+    pub colons: PathSep,
+    #[inside(_bracket)]
+    pub meta: T,
+}
+
+impl ToTokens for TaskListAttrMeta {
+    fn to_tokens(&self, tokens: &mut TokenStream2) {
+        let task_list = self.task_list;
+        let expr = &self.expr;
+        tokens.extend(quote!(#task_list(#expr)));
+    }
+}
+
+impl ToTokens for TaskConditionAttrMeta {
+    fn to_tokens(&self, tokens: &mut TokenStream2) {
+        let task_condition = self.task_condition;
+        let expr = &self.expr;
+        tokens.extend(quote!(#task_condition(#expr)));
+    }
+}
+
+impl ToTokens for TaskWeightAttrMeta {
+    fn to_tokens(&self, tokens: &mut TokenStream2) {
+        let task_weight = self.task_weight;
+        let expr = &self.expr;
+        tokens.extend(quote!(#task_weight(#expr)));
+    }
+}
+
+impl ToTokens for TaskIndexAttrMeta {
+    fn to_tokens(&self, tokens: &mut TokenStream2) {
+        let task_index = self.task_index;
+        let index = &self.index;
+        tokens.extend(quote!(#task_index(#index)))
+    }
+}
+
+impl ToTokens for TaskAttrMeta {
+    fn to_tokens(&self, tokens: &mut TokenStream2) {
+        match self {
+            TaskAttrMeta::TaskList(list) => tokens.extend(list.to_token_stream()),
+            TaskAttrMeta::TaskIndex(index) => tokens.extend(index.to_token_stream()),
+            TaskAttrMeta::TaskCondition(condition) => tokens.extend(condition.to_token_stream()),
+            TaskAttrMeta::TaskWeight(weight) => tokens.extend(weight.to_token_stream()),
+        }
+    }
+}
+
+impl<T: syn::parse::Parse + core::fmt::Debug + ToTokens> ToTokens for PalletTaskAttr<T> {
+    fn to_tokens(&self, tokens: &mut TokenStream2) {
+        let pound = self.pound;
+        let pallet = self.pallet;
+        let colons = self.colons;
+        let meta = &self.meta;
+        tokens.extend(quote!(#pound[#pallet #colons #meta]));
+    }
+}
+
+impl TryFrom<PalletTaskAttr<TaskAttrMeta>> for TaskIndexAttr {
+    type Error = syn::Error;
+
+    fn try_from(value: PalletTaskAttr<TaskAttrMeta>) -> Result<Self> {
+        let pound = value.pound;
+        let pallet = value.pallet;
+        let colons = value.colons;
+        match value.meta {
+            TaskAttrMeta::TaskIndex(meta) => parse2(quote!(#pound[#pallet #colons #meta])),
+            _ => {
+                return Err(Error::new(
+                    value.span(),
+                    format!(
+                        "`{:?}` cannot be converted to a `TaskIndexAttr`",
+                        value.meta
+                    ),
+                ))
+            }
+        }
+    }
+}
+
+impl TryFrom<PalletTaskAttr<TaskAttrMeta>> for TaskConditionAttr {
+    type Error = syn::Error;
+
+    fn try_from(value: PalletTaskAttr<TaskAttrMeta>) -> Result<Self> {
+        let pound = value.pound;
+        let pallet = value.pallet;
+        let colons = value.colons;
+        match value.meta {
+            TaskAttrMeta::TaskCondition(meta) => parse2(quote!(#pound[#pallet #colons #meta])),
+            _ => {
+                return Err(Error::new(
+                    value.span(),
+                    format!(
+                        "`{:?}` cannot be converted to a `TaskConditionAttr`",
+                        value.meta
+                    ),
+                ))
+            }
+        }
+    }
+}
+
+impl TryFrom<PalletTaskAttr<TaskAttrMeta>> for TaskWeightAttr {
+    type Error = syn::Error;
+
+    fn try_from(value: PalletTaskAttr<TaskAttrMeta>) -> Result<Self> {
+        let pound = value.pound;
+        let pallet = value.pallet;
+        let colons = value.colons;
+        match value.meta {
+            TaskAttrMeta::TaskWeight(meta) => parse2(quote!(#pound[#pallet #colons #meta])),
+            _ => {
+                return Err(Error::new(
+                    value.span(),
+                    format!(
+                        "`{:?}` cannot be converted to a `TaskWeightAttr`",
+                        value.meta
+                    ),
+                ))
+            }
+        }
+    }
+}
+
+impl TryFrom<PalletTaskAttr<TaskAttrMeta>> for TaskListAttr {
+    type Error = syn::Error;
+
+    fn try_from(value: PalletTaskAttr<TaskAttrMeta>) -> Result<Self> {
+        let pound = value.pound;
+        let pallet = value.pallet;
+        let colons = value.colons;
+        match value.meta {
+            TaskAttrMeta::TaskList(meta) => parse2(quote!(#pound[#pallet #colons #meta])),
+            _ => {
+                return Err(Error::new(
+                    value.span(),
+                    format!("`{:?}` cannot be converted to a `TaskListAttr`", value.meta),
+                ))
+            }
+        }
+    }
+}
+
+fn extract_pallet_attr(item_enum: &mut ItemEnum) -> Result<Option<TokenStream2>> {
+    let mut duplicate = None;
+    let mut attr = None;
+    item_enum.attrs = item_enum
+        .attrs
+        .iter()
+        .filter(|found_attr| {
+            let segs = found_attr
+                .path()
+                .segments
+                .iter()
+                .map(|seg| seg.ident.clone())
+                .collect::<Vec<_>>();
+            let (Some(seg1), Some(_), None) = (segs.get(0), segs.get(1), segs.get(2)) else {
+                return true;
+            };
+            if seg1 != "pallet" {
+                return true;
+            }
+            if attr.is_some() {
+                duplicate = Some(found_attr.span());
+            }
+            attr = Some(found_attr.to_token_stream());
+            false
+        })
+        .cloned()
+        .collect();
+    if let Some(span) = duplicate {
+        return Err(Error::new(
+            span,
+            "only one `#[pallet::_]` attribute is supported on this item",
+        ));
+    }
+    Ok(attr)
+}
+
+fn partition_tasks_attrs(item_impl: &ItemImpl) -> (Vec<syn::Attribute>, Vec<syn::Attribute>) {
+    item_impl.attrs.clone().into_iter().partition(|attr| {
+        let mut path_segs = attr.path().segments.iter();
+        let (Some(prefix), Some(suffix), None) =
+            (path_segs.next(), path_segs.next(), path_segs.next())
+        else {
+            return false;
+        };
+        prefix.ident == "pallet" && suffix.ident == "tasks_experimental"
+    })
+}
+
+fn partition_task_attrs(item: &ImplItemFn) -> (Vec<syn::Attribute>, Vec<syn::Attribute>) {
+    item.attrs.clone().into_iter().partition(|attr| {
+        let mut path_segs = attr.path().segments.iter();
+        let (Some(prefix), Some(suffix)) = (path_segs.next(), path_segs.next()) else {
+            return false;
+        };
+        // N.B: the `PartialEq` impl between `Ident` and `&str` is more efficient than
+        // parsing and makes no stack or heap allocations
+        prefix.ident == "pallet"
+            && (suffix.ident == "tasks_experimental"
+                || suffix.ident == "task_list"
+                || suffix.ident == "task_condition"
+                || suffix.ident == "task_weight"
+                || suffix.ident == "task_index")
+    })
+}
+
+#[test]
+fn test_parse_task_list_() {
+    parse2::<TaskAttr>(quote!(#[pallet::task_list(Something::iter())])).unwrap();
+    parse2::<TaskAttr>(quote!(#[pallet::task_list(Numbers::<T, I>::iter_keys())])).unwrap();
+    parse2::<TaskAttr>(quote!(#[pallet::task_list(iter())])).unwrap();
+    assert_parse_error_matches!(
+        parse2::<TaskAttr>(quote!(#[pallet::task_list()])),
+        "expected an expression"
+    );
+    assert_parse_error_matches!(
+        parse2::<TaskAttr>(quote!(#[pallet::task_list])),
+        "expected parentheses"
+    );
+}
+
+#[test]
+fn test_parse_task_index() {
+    parse2::<TaskAttr>(quote!(#[pallet::task_index(3)])).unwrap();
+    parse2::<TaskAttr>(quote!(#[pallet::task_index(0)])).unwrap();
+    parse2::<TaskAttr>(quote!(#[pallet::task_index(17)])).unwrap();
+    assert_parse_error_matches!(
+        parse2::<TaskAttr>(quote!(#[pallet::task_index])),
+        "expected parentheses"
+    );
+    assert_parse_error_matches!(
+        parse2::<TaskAttr>(quote!(#[pallet::task_index("hey")])),
+        "expected integer literal"
+    );
+    assert_parse_error_matches!(
+        parse2::<TaskAttr>(quote!(#[pallet::task_index(0.3)])),
+        "expected integer literal"
+    );
+}
+
+#[test]
+fn test_parse_task_condition() {
+    parse2::<TaskAttr>(quote!(#[pallet::task_condition(|x| x.is_some())])).unwrap();
+    parse2::<TaskAttr>(quote!(#[pallet::task_condition(|_x| some_expr())])).unwrap();
+    parse2::<TaskAttr>(quote!(#[pallet::task_condition(|| some_expr())])).unwrap();
+    parse2::<TaskAttr>(quote!(#[pallet::task_condition(some_expr())])).unwrap();
+}
+
+#[test]
+fn test_parse_tasks_attr() {
+    parse2::<PalletTasksAttr>(quote!(#[pallet::tasks_experimental])).unwrap();
+    assert_parse_error_matches!(
+        parse2::<PalletTasksAttr>(quote!(#[pallet::taskss])),
+        "expected `tasks_experimental`"
+    );
+    assert_parse_error_matches!(
+        parse2::<PalletTasksAttr>(quote!(#[pallet::tasks_])),
+        "expected `tasks_experimental`"
+    );
+    assert_parse_error_matches!(
+        parse2::<PalletTasksAttr>(quote!(#[pal::tasks])),
+        "expected `pallet`"
+    );
+    assert_parse_error_matches!(
+        parse2::<PalletTasksAttr>(quote!(#[pallet::tasks_experimental()])),
+        "unexpected token"
+    );
+}
+
+#[test]
+fn test_parse_tasks_def_basic() {
+    simulate_manifest_dir("../../examples/basic", || {
+        let parsed = parse2::<TasksDef>(quote! {
+            #[pallet::tasks_experimental]
+            impl<T: Config<I>, I: 'static> Pallet<T, I> {
+                /// Add a pair of numbers into the totals and remove them.
+                #[pallet::task_list(Numbers::<T, I>::iter_keys())]
+                #[pallet::task_condition(|i| Numbers::<T, I>::contains_key(i))]
+                #[pallet::task_index(0)]
+                #[pallet::task_weight(0)]
+                pub fn add_number_into_total(i: u32) -> DispatchResult {
+                    let v = Numbers::<T, I>::take(i).ok_or(Error::<T, I>::NotFound)?;
+                    Total::<T, I>::mutate(|(total_keys, total_values)| {
+                        *total_keys += i;
+                        *total_values += v;
+                    });
+                    Ok(())
+                }
+            }
+        })
+        .unwrap();
+        assert_eq!(parsed.tasks.len(), 1);
+    });
+}
+
+#[test]
+fn test_parse_tasks_def_basic_increment_decrement() {
+    simulate_manifest_dir("../../examples/basic", || {
+        let parsed = parse2::<TasksDef>(quote! {
+            #[pallet::tasks_experimental]
+            impl<T: Config<I>, I: 'static> Pallet<T, I> {
+                /// Get the value and check if it can be incremented
+                #[pallet::task_index(0)]
+                #[pallet::task_condition(|| {
+                    let value = Value::<T>::get().unwrap();
+                    value < 255
+                })]
+                #[pallet::task_list(Vec::<Task<T>>::new())]
+                #[pallet::task_weight(0)]
+                fn increment() -> DispatchResult {
+                    let value = Value::<T>::get().unwrap_or_default();
+                    if value >= 255 {
+                        Err(Error::<T>::ValueOverflow.into())
+                    } else {
+                        let new_val = value.checked_add(1).ok_or(Error::<T>::ValueOverflow)?;
+                        Value::<T>::put(new_val);
+                        Pallet::<T>::deposit_event(Event::Incremented { new_val });
+                        Ok(())
+                    }
+                }
+
+                // Get the value and check if it can be decremented
+                #[pallet::task_index(1)]
+                #[pallet::task_condition(|| {
+                    let value = Value::<T>::get().unwrap();
+                    value > 0
+                })]
+                #[pallet::task_list(Vec::<Task<T>>::new())]
+                #[pallet::task_weight(0)]
+                fn decrement() -> DispatchResult {
+                    let value = Value::<T>::get().unwrap_or_default();
+                    if value == 0 {
+                        Err(Error::<T>::ValueUnderflow.into())
+                    } else {
+                        let new_val = value.checked_sub(1).ok_or(Error::<T>::ValueUnderflow)?;
+                        Value::<T>::put(new_val);
+                        Pallet::<T>::deposit_event(Event::Decremented { new_val });
+                        Ok(())
+                    }
+                }
+            }
+        })
+        .unwrap();
+        assert_eq!(parsed.tasks.len(), 2);
+    });
+}
+
+#[test]
+fn test_parse_tasks_def_duplicate_index() {
+    simulate_manifest_dir("../../examples/basic", || {
+        assert_parse_error_matches!(
+            parse2::<TasksDef>(quote! {
+                #[pallet::tasks_experimental]
+                impl<T: Config<I>, I: 'static> Pallet<T, I> {
+                    #[pallet::task_list(Something::iter())]
+                    #[pallet::task_condition(|i| i % 2 == 0)]
+                    #[pallet::task_index(0)]
+                    #[pallet::task_weight(0)]
+                    pub fn foo(i: u32) -> DispatchResult {
+                        Ok(())
+                    }
+
+                    #[pallet::task_list(Numbers::<T, I>::iter_keys())]
+                    #[pallet::task_condition(|i| Numbers::<T, I>::contains_key(i))]
+                    #[pallet::task_index(0)]
+                    #[pallet::task_weight(0)]
+                    pub fn bar(i: u32) -> DispatchResult {
+                        Ok(())
+                    }
+                }
+            }),
+            "duplicate task index `0`"
+        );
+    });
+}
+
+#[test]
+fn test_parse_tasks_def_missing_task_list() {
+    simulate_manifest_dir("../../examples/basic", || {
+        assert_parse_error_matches!(
+            parse2::<TasksDef>(quote! {
+                #[pallet::tasks_experimental]
+                impl<T: Config<I>, I: 'static> Pallet<T, I> {
+                    #[pallet::task_condition(|i| i % 2 == 0)]
+                    #[pallet::task_index(0)]
+                    pub fn foo(i: u32) -> DispatchResult {
+                        Ok(())
+                    }
+                }
+            }),
+            r"missing `#\[pallet::task_list\(\.\.\)\]`"
+        );
+    });
+}
+
+#[test]
+fn test_parse_tasks_def_missing_task_condition() {
+    simulate_manifest_dir("../../examples/basic", || {
+        assert_parse_error_matches!(
+            parse2::<TasksDef>(quote! {
+                #[pallet::tasks_experimental]
+                impl<T: Config<I>, I: 'static> Pallet<T, I> {
+                    #[pallet::task_list(Something::iter())]
+                    #[pallet::task_index(0)]
+                    pub fn foo(i: u32) -> DispatchResult {
+                        Ok(())
+                    }
+                }
+            }),
+            r"missing `#\[pallet::task_condition\(\.\.\)\]`"
+        );
+    });
+}
+
+#[test]
+fn test_parse_tasks_def_missing_task_index() {
+    simulate_manifest_dir("../../examples/basic", || {
+        assert_parse_error_matches!(
+            parse2::<TasksDef>(quote! {
+                #[pallet::tasks_experimental]
+                impl<T: Config<I>, I: 'static> Pallet<T, I> {
+                    #[pallet::task_condition(|i| i % 2 == 0)]
+                    #[pallet::task_list(Something::iter())]
+                    pub fn foo(i: u32) -> DispatchResult {
+                        Ok(())
+                    }
+                }
+            }),
+            r"missing `#\[pallet::task_index\(\.\.\)\]`"
+        );
+    });
+}
+
+#[test]
+fn test_parse_tasks_def_missing_task_weight() {
+    simulate_manifest_dir("../../examples/basic", || {
+        assert_parse_error_matches!(
+            parse2::<TasksDef>(quote! {
+                #[pallet::tasks_experimental]
+                impl<T: Config<I>, I: 'static> Pallet<T, I> {
+                    #[pallet::task_condition(|i| i % 2 == 0)]
+                    #[pallet::task_list(Something::iter())]
+                    #[pallet::task_index(0)]
+                    pub fn foo(i: u32) -> DispatchResult {
+                        Ok(())
+                    }
+                }
+            }),
+            r"missing `#\[pallet::task_weight\(\.\.\)\]`"
+        );
+    });
+}
+
+#[test]
+fn test_parse_tasks_def_unexpected_extra_task_list_attr() {
+    simulate_manifest_dir("../../examples/basic", || {
+        assert_parse_error_matches!(
+            parse2::<TasksDef>(quote! {
+                #[pallet::tasks_experimental]
+                impl<T: Config<I>, I: 'static> Pallet<T, I> {
+                    #[pallet::task_condition(|i| i % 2 == 0)]
+                    #[pallet::task_index(0)]
+                    #[pallet::task_weight(0)]
+                    #[pallet::task_list(Something::iter())]
+                    #[pallet::task_list(SomethingElse::iter())]
+                    pub fn foo(i: u32) -> DispatchResult {
+                        Ok(())
+                    }
+                }
+            }),
+            r"unexpected extra `#\[pallet::task_list\(\.\.\)\]`"
+        );
+    });
+}
+
+#[test]
+fn test_parse_tasks_def_unexpected_extra_task_condition_attr() {
+    simulate_manifest_dir("../../examples/basic", || {
+        assert_parse_error_matches!(
+            parse2::<TasksDef>(quote! {
+                #[pallet::tasks_experimental]
+                impl<T: Config<I>, I: 'static> Pallet<T, I> {
+                    #[pallet::task_condition(|i| i % 2 == 0)]
+                    #[pallet::task_condition(|i| i % 4 == 0)]
+                    #[pallet::task_index(0)]
+                    #[pallet::task_list(Something::iter())]
+                    #[pallet::task_weight(0)]
+                    pub fn foo(i: u32) -> DispatchResult {
+                        Ok(())
+                    }
+                }
+            }),
+            r"unexpected extra `#\[pallet::task_condition\(\.\.\)\]`"
+        );
+    });
+}
+
+#[test]
+fn test_parse_tasks_def_unexpected_extra_task_index_attr() {
+    simulate_manifest_dir("../../examples/basic", || {
+        assert_parse_error_matches!(
+            parse2::<TasksDef>(quote! {
+                #[pallet::tasks_experimental]
+                impl<T: Config<I>, I: 'static> Pallet<T, I> {
+                    #[pallet::task_condition(|i| i % 2 == 0)]
+                    #[pallet::task_index(0)]
+                    #[pallet::task_index(0)]
+                    #[pallet::task_list(Something::iter())]
+                    #[pallet::task_weight(0)]
+                    pub fn foo(i: u32) -> DispatchResult {
+                        Ok(())
+                    }
+                }
+            }),
+            r"unexpected extra `#\[pallet::task_index\(\.\.\)\]`"
+        );
+    });
+}
+
+#[test]
+fn test_parse_tasks_def_extra_tasks_attribute() {
+    simulate_manifest_dir("../../examples/basic", || {
+        assert_parse_error_matches!(
+            parse2::<TasksDef>(quote! {
+                #[pallet::tasks_experimental]
+                #[pallet::tasks_experimental]
+                impl<T: Config<I>, I: 'static> Pallet<T, I> {}
+            }),
+            r"unexpected extra `#\[pallet::tasks_experimental\]` attribute"
+        );
+    });
+}
+
+#[test]
+fn test_parse_task_enum_def_basic() {
+    simulate_manifest_dir("../../examples/basic", || {
+        parse2::<TaskEnumDef>(quote! {
+            #[pallet::task_enum]
+            pub enum Task<T: Config> {
+                Increment,
+                Decrement,
+            }
+        })
+        .unwrap();
+    });
+}
+
+#[test]
+fn test_parse_task_enum_def_non_task_name() {
+    simulate_manifest_dir("../../examples/basic", || {
+        parse2::<TaskEnumDef>(quote! {
+            #[pallet::task_enum]
+            pub enum Something {
+                Foo
+            }
+        })
+        .unwrap();
+    });
+}
+
+#[test]
+fn test_parse_task_enum_def_missing_attr_allowed() {
+    simulate_manifest_dir("../../examples/basic", || {
+        parse2::<TaskEnumDef>(quote! {
+            pub enum Task<T: Config> {
+                Increment,
+                Decrement,
+            }
+        })
+        .unwrap();
+    });
+}
+
+#[test]
+fn test_parse_task_enum_def_missing_attr_alternate_name_allowed() {
+    simulate_manifest_dir("../../examples/basic", || {
+        parse2::<TaskEnumDef>(quote! {
+            pub enum Foo {
+                Red,
+            }
+        })
+        .unwrap();
+    });
+}
+
+#[test]
+fn test_parse_task_enum_def_wrong_attr() {
+    simulate_manifest_dir("../../examples/basic", || {
+        assert_parse_error_matches!(
+            parse2::<TaskEnumDef>(quote! {
+                #[pallet::something]
+                pub enum Task<T: Config> {
+                    Increment,
+                    Decrement,
+                }
+            }),
+            "expected `task_enum`"
+        );
+    });
+}
+
+#[test]
+fn test_parse_task_enum_def_wrong_item() {
+    simulate_manifest_dir("../../examples/basic", || {
+        assert_parse_error_matches!(
+            parse2::<TaskEnumDef>(quote! {
+                #[pallet::task_enum]
+                pub struct Something;
+            }),
+            "expected `enum`"
+        );
+    });
+}
diff --git a/support/procedural-fork/src/pallet/parse/tests/mod.rs b/support/procedural-fork/src/pallet/parse/tests/mod.rs
new file mode 100644
index 000000000..fd7dc2dbe
--- /dev/null
+++ b/support/procedural-fork/src/pallet/parse/tests/mod.rs
@@ -0,0 +1,264 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 std::{panic, sync::Mutex};
+use syn::parse_quote;
+
+#[doc(hidden)]
+pub mod __private {
+    pub use regex;
+}
+
+/// Allows you to assert that the input expression resolves to an error whose string
+/// representation matches the specified regex literal.
+///
+/// ## Example:
+///
+/// ```
+/// use super::tasks::*;
+///
+/// assert_parse_error_matches!(
+/// 	parse2::<TaskEnumDef>(quote! {
+/// 		#[pallet::task_enum]
+/// 		pub struct Something;
+/// 	}),
+/// 	"expected `enum`"
+/// );
+/// ```
+///
+/// More complex regular expressions are also possible (anything that could pass as a regex for
+/// use with the [`regex`] crate.):
+///
+/// ```ignore
+/// assert_parse_error_matches!(
+/// 	parse2::<TasksDef>(quote! {
+/// 		#[pallet::tasks_experimental]
+/// 		impl<T: Config<I>, I: 'static> Pallet<T, I> {
+/// 			#[pallet::task_condition(|i| i % 2 == 0)]
+/// 			#[pallet::task_index(0)]
+/// 			pub fn foo(i: u32) -> DispatchResult {
+/// 				Ok(())
+/// 			}
+/// 		}
+/// 	}),
+/// 	r"missing `#\[pallet::task_list\(\.\.\)\]`"
+/// );
+/// ```
+///
+/// Although this is primarily intended to be used with parsing errors, this macro is general
+/// enough that it will work with any error with a reasonable [`core::fmt::Display`] impl.
+#[macro_export]
+macro_rules! assert_parse_error_matches {
+    ($expr:expr, $reg:literal) => {
+        match $expr {
+            Ok(_) => panic!("Expected an `Error(..)`, but got Ok(..)"),
+            Err(e) => {
+                let error_message = e.to_string();
+                let re = $crate::pallet::parse::tests::__private::regex::Regex::new($reg)
+                    .expect("Invalid regex pattern");
+                assert!(
+                    re.is_match(&error_message),
+                    "Error message \"{}\" does not match the pattern \"{}\"",
+                    error_message,
+                    $reg
+                );
+            }
+        }
+    };
+}
+
+/// Allows you to assert that an entire pallet parses successfully. A custom syntax is used for
+/// specifying arguments so please pay attention to the docs below.
+///
+/// The general syntax is:
+///
+/// ```ignore
+/// assert_pallet_parses! {
+/// 	#[manifest_dir("../../examples/basic")]
+/// 	#[frame_support::pallet]
+/// 	pub mod pallet {
+/// 		#[pallet::config]
+/// 		pub trait Config: frame_system::Config {}
+///
+/// 		#[pallet::pallet]
+/// 		pub struct Pallet<T>(_);
+/// 	}
+/// };
+/// ```
+///
+/// The `#[manifest_dir(..)]` attribute _must_ be specified as the _first_ attribute on the
+/// pallet module, and should reference the relative (to your current directory) path of a
+/// directory containing containing the `Cargo.toml` of a valid pallet. Typically you will only
+/// ever need to use the `examples/basic` pallet, but sometimes it might be advantageous to
+/// specify a different one that has additional dependencies.
+///
+/// The reason this must be specified is that our underlying parsing of pallets depends on
+/// reaching out into the file system to look for particular `Cargo.toml` dependencies via the
+/// [`generate_access_from_frame_or_crate`] method, so to simulate this properly in a proc
+/// macro crate, we need to temporarily convince this function that we are running from the
+/// directory of a valid pallet.
+#[macro_export]
+macro_rules! assert_pallet_parses {
+	(
+		#[manifest_dir($manifest_dir:literal)]
+		$($tokens:tt)*
+	) => {
+		{
+			let mut pallet: Option<$crate::pallet::parse::Def> = None;
+			$crate::pallet::parse::tests::simulate_manifest_dir($manifest_dir, core::panic::AssertUnwindSafe(|| {
+				pallet = Some($crate::pallet::parse::Def::try_from(syn::parse_quote! {
+					$($tokens)*
+				}, false).unwrap());
+			}));
+			pallet.unwrap()
+		}
+	}
+}
+
+/// Similar to [`assert_pallet_parses`], except this instead expects the pallet not to parse,
+/// and allows you to specify a regex matching the expected parse error.
+///
+/// This is identical syntactically to [`assert_pallet_parses`] in every way except there is a
+/// second attribute that must be specified immediately after `#[manifest_dir(..)]` which is
+/// `#[error_regex(..)]` which should contain a string/regex literal designed to match what you
+/// consider to be the correct parsing error we should see when we try to parse this particular
+/// pallet.
+///
+/// ## Example:
+///
+/// ```
+/// assert_pallet_parse_error! {
+/// 	#[manifest_dir("../../examples/basic")]
+/// 	#[error_regex("Missing `\\#\\[pallet::pallet\\]`")]
+/// 	#[frame_support::pallet]
+/// 	pub mod pallet {
+/// 		#[pallet::config]
+/// 		pub trait Config: frame_system::Config {}
+/// 	}
+/// }
+/// ```
+#[macro_export]
+macro_rules! assert_pallet_parse_error {
+	(
+		#[manifest_dir($manifest_dir:literal)]
+		#[error_regex($reg:literal)]
+		$($tokens:tt)*
+	) => {
+		$crate::pallet::parse::tests::simulate_manifest_dir($manifest_dir, || {
+			$crate::assert_parse_error_matches!(
+				$crate::pallet::parse::Def::try_from(
+					parse_quote! {
+						$($tokens)*
+					},
+					false
+				),
+				$reg
+			);
+		});
+	}
+}
+
+/// Safely runs the specified `closure` while simulating an alternative `CARGO_MANIFEST_DIR`,
+/// restoring `CARGO_MANIFEST_DIR` to its original value upon completion regardless of whether
+/// the closure panics.
+///
+/// This is useful in tests of `Def::try_from` and other pallet-related methods that internally
+/// make use of [`generate_access_from_frame_or_crate`], which is sensitive to entries in the
+/// "current" `Cargo.toml` files.
+///
+/// This function uses a [`Mutex`] to avoid a race condition created when multiple tests try to
+/// modify and then restore the `CARGO_MANIFEST_DIR` ENV var in an overlapping way.
+pub fn simulate_manifest_dir<P: AsRef<std::path::Path>, F: FnOnce() + std::panic::UnwindSafe>(
+    path: P,
+    closure: F,
+) {
+    use std::{env::*, path::*};
+
+    /// Ensures that only one thread can modify/restore the `CARGO_MANIFEST_DIR` ENV var at a time,
+    /// avoiding a race condition because `cargo test` runs tests in parallel.
+    ///
+    /// Although this forces all tests that use [`simulate_manifest_dir`] to run sequentially with
+    /// respect to each other, this is still several orders of magnitude faster than using UI
+    /// tests, even if they are run in parallel.
+    static MANIFEST_DIR_LOCK: Mutex<()> = Mutex::new(());
+
+    // avoid race condition when swapping out `CARGO_MANIFEST_DIR`
+    let guard = MANIFEST_DIR_LOCK.lock().unwrap();
+
+    // obtain the current/original `CARGO_MANIFEST_DIR`
+    let orig = PathBuf::from(
+        var("CARGO_MANIFEST_DIR").expect("failed to read ENV var `CARGO_MANIFEST_DIR`"),
+    );
+
+    // set `CARGO_MANIFEST_DIR` to the provided path, relative to current working dir
+    set_var("CARGO_MANIFEST_DIR", orig.join(path.as_ref()));
+
+    // safely run closure catching any panics
+    let result = panic::catch_unwind(closure);
+
+    // restore original `CARGO_MANIFEST_DIR` before unwinding
+    set_var("CARGO_MANIFEST_DIR", &orig);
+
+    // unlock the mutex so we don't poison it if there is a panic
+    drop(guard);
+
+    // unwind any panics originally encountered when running closure
+    result.unwrap();
+}
+
+mod tasks;
+
+#[test]
+fn test_parse_minimal_pallet() {
+    assert_pallet_parses! {
+        #[manifest_dir("../../examples/basic")]
+        #[frame_support::pallet]
+        pub mod pallet {
+            #[pallet::config]
+            pub trait Config: frame_system::Config {}
+
+            #[pallet::pallet]
+            pub struct Pallet<T>(_);
+        }
+    };
+}
+
+#[test]
+fn test_parse_pallet_missing_pallet() {
+    assert_pallet_parse_error! {
+        #[manifest_dir("../../examples/basic")]
+        #[error_regex("Missing `\\#\\[pallet::pallet\\]`")]
+        #[frame_support::pallet]
+        pub mod pallet {
+            #[pallet::config]
+            pub trait Config: frame_system::Config {}
+        }
+    }
+}
+
+#[test]
+fn test_parse_pallet_missing_config() {
+    assert_pallet_parse_error! {
+        #[manifest_dir("../../examples/basic")]
+        #[error_regex("Missing `\\#\\[pallet::config\\]`")]
+        #[frame_support::pallet]
+        pub mod pallet {
+            #[pallet::pallet]
+            pub struct Pallet<T>(_);
+        }
+    }
+}
diff --git a/support/procedural-fork/src/pallet/parse/tests/tasks.rs b/support/procedural-fork/src/pallet/parse/tests/tasks.rs
new file mode 100644
index 000000000..6cd4d13bb
--- /dev/null
+++ b/support/procedural-fork/src/pallet/parse/tests/tasks.rs
@@ -0,0 +1,240 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 syn::parse_quote;
+
+#[test]
+fn test_parse_pallet_with_task_enum_missing_impl() {
+    assert_pallet_parse_error! {
+        #[manifest_dir("../../examples/basic")]
+        #[error_regex("Missing `\\#\\[pallet::tasks_experimental\\]` impl")]
+        #[frame_support::pallet]
+        pub mod pallet {
+            #[pallet::task_enum]
+            pub enum Task<T: Config> {
+                Something,
+            }
+
+            #[pallet::config]
+            pub trait Config: frame_system::Config {}
+
+            #[pallet::pallet]
+            pub struct Pallet<T>(_);
+        }
+    }
+}
+
+#[test]
+fn test_parse_pallet_with_task_enum_wrong_attribute() {
+    assert_pallet_parse_error! {
+        #[manifest_dir("../../examples/basic")]
+        #[error_regex("expected one of")]
+        #[frame_support::pallet]
+        pub mod pallet {
+            #[pallet::wrong_attribute]
+            pub enum Task<T: Config> {
+                Something,
+            }
+
+            #[pallet::task_list]
+            impl<T: Config> frame_support::traits::Task for Task<T>
+            where
+                T: TypeInfo,
+            {}
+
+            #[pallet::config]
+            pub trait Config: frame_system::Config {}
+
+            #[pallet::pallet]
+            pub struct Pallet<T>(_);
+        }
+    }
+}
+
+#[test]
+fn test_parse_pallet_missing_task_enum() {
+    assert_pallet_parses! {
+        #[manifest_dir("../../examples/basic")]
+        #[frame_support::pallet]
+        pub mod pallet {
+            #[pallet::tasks_experimental]
+            #[cfg(test)] // aha, this means it's being eaten
+            impl<T: Config> frame_support::traits::Task for Task<T>
+            where
+                T: TypeInfo,
+            {}
+
+            #[pallet::config]
+            pub trait Config: frame_system::Config {}
+
+            #[pallet::pallet]
+            pub struct Pallet<T>(_);
+        }
+    };
+}
+
+#[test]
+fn test_parse_pallet_task_list_in_wrong_place() {
+    assert_pallet_parse_error! {
+        #[manifest_dir("../../examples/basic")]
+        #[error_regex("can only be used on items within an `impl` statement.")]
+        #[frame_support::pallet]
+        pub mod pallet {
+            pub enum MyCustomTaskEnum<T: Config> {
+                Something,
+            }
+
+            #[pallet::task_list]
+            pub fn something() {
+                println!("hey");
+            }
+
+            #[pallet::config]
+            pub trait Config: frame_system::Config {}
+
+            #[pallet::pallet]
+            pub struct Pallet<T>(_);
+        }
+    }
+}
+
+#[test]
+fn test_parse_pallet_manual_tasks_impl_without_manual_tasks_enum() {
+    assert_pallet_parse_error! {
+        #[manifest_dir("../../examples/basic")]
+        #[error_regex(".*attribute must be attached to your.*")]
+        #[frame_support::pallet]
+        pub mod pallet {
+
+            impl<T: Config> frame_support::traits::Task for Task<T>
+            where
+                T: TypeInfo,
+            {
+                type Enumeration = sp_std::vec::IntoIter<Task<T>>;
+
+                fn iter() -> Self::Enumeration {
+                    sp_std::vec![Task::increment, Task::decrement].into_iter()
+                }
+            }
+
+            #[pallet::config]
+            pub trait Config: frame_system::Config {}
+
+            #[pallet::pallet]
+            pub struct Pallet<T>(_);
+        }
+    }
+}
+
+#[test]
+fn test_parse_pallet_manual_task_enum_non_manual_impl() {
+    assert_pallet_parses! {
+        #[manifest_dir("../../examples/basic")]
+        #[frame_support::pallet]
+        pub mod pallet {
+            pub enum MyCustomTaskEnum<T: Config> {
+                Something,
+            }
+
+            #[pallet::tasks_experimental]
+            impl<T: Config> frame_support::traits::Task for MyCustomTaskEnum<T>
+            where
+                T: TypeInfo,
+            {}
+
+            #[pallet::config]
+            pub trait Config: frame_system::Config {}
+
+            #[pallet::pallet]
+            pub struct Pallet<T>(_);
+        }
+    };
+}
+
+#[test]
+fn test_parse_pallet_non_manual_task_enum_manual_impl() {
+    assert_pallet_parses! {
+        #[manifest_dir("../../examples/basic")]
+        #[frame_support::pallet]
+        pub mod pallet {
+            #[pallet::task_enum]
+            pub enum MyCustomTaskEnum<T: Config> {
+                Something,
+            }
+
+            impl<T: Config> frame_support::traits::Task for MyCustomTaskEnum<T>
+            where
+                T: TypeInfo,
+            {}
+
+            #[pallet::config]
+            pub trait Config: frame_system::Config {}
+
+            #[pallet::pallet]
+            pub struct Pallet<T>(_);
+        }
+    };
+}
+
+#[test]
+fn test_parse_pallet_manual_task_enum_manual_impl() {
+    assert_pallet_parses! {
+        #[manifest_dir("../../examples/basic")]
+        #[frame_support::pallet]
+        pub mod pallet {
+            pub enum MyCustomTaskEnum<T: Config> {
+                Something,
+            }
+
+            impl<T: Config> frame_support::traits::Task for MyCustomTaskEnum<T>
+            where
+                T: TypeInfo,
+            {}
+
+            #[pallet::config]
+            pub trait Config: frame_system::Config {}
+
+            #[pallet::pallet]
+            pub struct Pallet<T>(_);
+        }
+    };
+}
+
+#[test]
+fn test_parse_pallet_manual_task_enum_mismatch_ident() {
+    assert_pallet_parses! {
+        #[manifest_dir("../../examples/basic")]
+        #[frame_support::pallet]
+        pub mod pallet {
+            pub enum WrongIdent<T: Config> {
+                Something,
+            }
+
+            #[pallet::tasks_experimental]
+            impl<T: Config> frame_support::traits::Task for MyCustomTaskEnum<T>
+            where
+                T: TypeInfo,
+            {}
+
+            #[pallet::config]
+            pub trait Config: frame_system::Config {}
+
+            #[pallet::pallet]
+            pub struct Pallet<T>(_);
+        }
+    };
+}
diff --git a/support/procedural-fork/src/pallet/parse/type_value.rs b/support/procedural-fork/src/pallet/parse/type_value.rs
new file mode 100644
index 000000000..d5c85248f
--- /dev/null
+++ b/support/procedural-fork/src/pallet/parse/type_value.rs
@@ -0,0 +1,123 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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::helper;
+use syn::spanned::Spanned;
+
+/// Definition of type value. Just a function which is expanded to a struct implementing `Get`.
+pub struct TypeValueDef {
+    /// The index of error item in pallet module.
+    pub index: usize,
+    /// Visibility of the struct to generate.
+    pub vis: syn::Visibility,
+    /// Ident of the struct to generate.
+    pub ident: syn::Ident,
+    /// The type return by Get.
+    pub type_: Box<syn::Type>,
+    /// The block returning the value to get
+    pub block: Box<syn::Block>,
+    /// If type value is generic over `T` (or `T` and `I` for instantiable pallet)
+    pub is_generic: bool,
+    /// A set of usage of instance, must be check for consistency with config.
+    pub instances: Vec<helper::InstanceUsage>,
+    /// The where clause of the function.
+    pub where_clause: Option<syn::WhereClause>,
+    /// The span of the pallet::type_value attribute.
+    pub attr_span: proc_macro2::Span,
+    /// Docs on the item.
+    pub docs: Vec<syn::Expr>,
+}
+
+impl TypeValueDef {
+    pub fn try_from(
+        attr_span: proc_macro2::Span,
+        index: usize,
+        item: &mut syn::Item,
+    ) -> syn::Result<Self> {
+        let item = if let syn::Item::Fn(item) = item {
+            item
+        } else {
+            let msg = "Invalid pallet::type_value, expected item fn";
+            return Err(syn::Error::new(item.span(), msg));
+        };
+
+        let mut docs = vec![];
+        for attr in &item.attrs {
+            if let syn::Meta::NameValue(meta) = &attr.meta {
+                if meta.path.get_ident().map_or(false, |ident| ident == "doc") {
+                    docs.push(meta.value.clone());
+                    continue;
+                }
+            }
+
+            let msg = "Invalid pallet::type_value, unexpected attribute, only doc attribute are \
+				allowed";
+            return Err(syn::Error::new(attr.span(), msg));
+        }
+
+        if let Some(span) = item
+            .sig
+            .constness
+            .as_ref()
+            .map(|t| t.span())
+            .or_else(|| item.sig.asyncness.as_ref().map(|t| t.span()))
+            .or_else(|| item.sig.unsafety.as_ref().map(|t| t.span()))
+            .or_else(|| item.sig.abi.as_ref().map(|t| t.span()))
+            .or_else(|| item.sig.variadic.as_ref().map(|t| t.span()))
+        {
+            let msg = "Invalid pallet::type_value, unexpected token";
+            return Err(syn::Error::new(span, msg));
+        }
+
+        if !item.sig.inputs.is_empty() {
+            let msg = "Invalid pallet::type_value, unexpected argument";
+            return Err(syn::Error::new(item.sig.inputs[0].span(), msg));
+        }
+
+        let vis = item.vis.clone();
+        let ident = item.sig.ident.clone();
+        let block = item.block.clone();
+        let type_ = match item.sig.output.clone() {
+            syn::ReturnType::Type(_, type_) => type_,
+            syn::ReturnType::Default => {
+                let msg = "Invalid pallet::type_value, expected return type";
+                return Err(syn::Error::new(item.sig.span(), msg));
+            }
+        };
+
+        let mut instances = vec![];
+        if let Some(usage) = helper::check_type_value_gen(&item.sig.generics, item.sig.span())? {
+            instances.push(usage);
+        }
+
+        let is_generic = item.sig.generics.type_params().count() > 0;
+        let where_clause = item.sig.generics.where_clause.clone();
+
+        Ok(TypeValueDef {
+            attr_span,
+            index,
+            is_generic,
+            vis,
+            ident,
+            block,
+            type_,
+            instances,
+            where_clause,
+            docs,
+        })
+    }
+}
diff --git a/support/procedural-fork/src/pallet/parse/validate_unsigned.rs b/support/procedural-fork/src/pallet/parse/validate_unsigned.rs
new file mode 100644
index 000000000..6e5109a74
--- /dev/null
+++ b/support/procedural-fork/src/pallet/parse/validate_unsigned.rs
@@ -0,0 +1,62 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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::helper;
+use syn::spanned::Spanned;
+
+/// The definition of the pallet validate unsigned implementation.
+pub struct ValidateUnsignedDef {
+    /// The index of validate unsigned item in pallet module.
+    pub index: usize,
+    /// A set of usage of instance, must be check for consistency with config.
+    pub instances: Vec<helper::InstanceUsage>,
+}
+
+impl ValidateUnsignedDef {
+    pub fn try_from(index: usize, item: &mut syn::Item) -> syn::Result<Self> {
+        let item = if let syn::Item::Impl(item) = item {
+            item
+        } else {
+            let msg = "Invalid pallet::validate_unsigned, expected item impl";
+            return Err(syn::Error::new(item.span(), msg));
+        };
+
+        if item.trait_.is_none() {
+            let msg = "Invalid pallet::validate_unsigned, expected impl<..> ValidateUnsigned for \
+				Pallet<..>";
+            return Err(syn::Error::new(item.span(), msg));
+        }
+
+        if let Some(last) = item.trait_.as_ref().unwrap().1.segments.last() {
+            if last.ident != "ValidateUnsigned" {
+                let msg = "Invalid pallet::validate_unsigned, expected trait ValidateUnsigned";
+                return Err(syn::Error::new(last.span(), msg));
+            }
+        } else {
+            let msg = "Invalid pallet::validate_unsigned, expected impl<..> ValidateUnsigned for \
+				Pallet<..>";
+            return Err(syn::Error::new(item.span(), msg));
+        }
+
+        let instances = vec![
+            helper::check_pallet_struct_usage(&item.self_ty)?,
+            helper::check_impl_gen(&item.generics, item.impl_token.span())?,
+        ];
+
+        Ok(ValidateUnsignedDef { index, instances })
+    }
+}
diff --git a/support/procedural-fork/src/pallet_error.rs b/support/procedural-fork/src/pallet_error.rs
new file mode 100644
index 000000000..bdf8330cd
--- /dev/null
+++ b/support/procedural-fork/src/pallet_error.rs
@@ -0,0 +1,191 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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_procedural_tools::generate_access_from_frame_or_crate;
+use quote::ToTokens;
+
+// Derive `PalletError`
+pub fn derive_pallet_error(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
+    let syn::DeriveInput {
+        ident: name,
+        generics,
+        data,
+        ..
+    } = match syn::parse(input) {
+        Ok(input) => input,
+        Err(e) => return e.to_compile_error().into(),
+    };
+
+    let frame_support = match generate_access_from_frame_or_crate("frame-support") {
+        Ok(c) => c,
+        Err(e) => return e.into_compile_error().into(),
+    };
+    let frame_support = &frame_support;
+    let (impl_generics, ty_generics, where_clause) = generics.split_for_impl();
+
+    let max_encoded_size = match data {
+        syn::Data::Struct(syn::DataStruct { fields, .. }) => match fields {
+            syn::Fields::Named(syn::FieldsNamed { named: fields, .. })
+            | syn::Fields::Unnamed(syn::FieldsUnnamed {
+                unnamed: fields, ..
+            }) => {
+                let maybe_field_tys = fields
+                    .iter()
+                    .map(|f| generate_field_types(f, &frame_support))
+                    .collect::<syn::Result<Vec<_>>>();
+                let field_tys = match maybe_field_tys {
+                    Ok(tys) => tys.into_iter().flatten(),
+                    Err(e) => return e.into_compile_error().into(),
+                };
+                quote::quote! {
+                    0_usize
+                    #(
+                        .saturating_add(<
+                            #field_tys as #frame_support::traits::PalletError
+                        >::MAX_ENCODED_SIZE)
+                    )*
+                }
+            }
+            syn::Fields::Unit => quote::quote!(0),
+        },
+        syn::Data::Enum(syn::DataEnum { variants, .. }) => {
+            let field_tys = variants
+                .iter()
+                .map(|variant| generate_variant_field_types(variant, &frame_support))
+                .collect::<Result<Vec<Option<Vec<proc_macro2::TokenStream>>>, syn::Error>>();
+
+            let field_tys = match field_tys {
+                Ok(tys) => tys.into_iter().flatten().collect::<Vec<_>>(),
+                Err(e) => return e.to_compile_error().into(),
+            };
+
+            // We start with `1`, because the discriminant of an enum is stored as u8
+            if field_tys.is_empty() {
+                quote::quote!(1)
+            } else {
+                let variant_sizes = field_tys.into_iter().map(|variant_field_tys| {
+                    quote::quote! {
+                        1_usize
+                        #(.saturating_add(<
+                            #variant_field_tys as #frame_support::traits::PalletError
+                        >::MAX_ENCODED_SIZE))*
+                    }
+                });
+
+                quote::quote! {{
+                    let mut size = 1_usize;
+                    let mut tmp = 0_usize;
+                    #(
+                        tmp = #variant_sizes;
+                        size = if tmp > size { tmp } else { size };
+                        tmp = 0_usize;
+                    )*
+                    size
+                }}
+            }
+        }
+        syn::Data::Union(syn::DataUnion { union_token, .. }) => {
+            let msg = "Cannot derive `PalletError` for union; please implement it directly";
+            return syn::Error::new(union_token.span, msg)
+                .into_compile_error()
+                .into();
+        }
+    };
+
+    quote::quote!(
+        const _: () = {
+            impl #impl_generics #frame_support::traits::PalletError
+                for #name #ty_generics #where_clause
+            {
+                const MAX_ENCODED_SIZE: usize = #max_encoded_size;
+            }
+        };
+    )
+    .into()
+}
+
+fn generate_field_types(
+    field: &syn::Field,
+    scrate: &syn::Path,
+) -> syn::Result<Option<proc_macro2::TokenStream>> {
+    let attrs = &field.attrs;
+
+    for attr in attrs {
+        if attr.path().is_ident("codec") {
+            let mut res = None;
+
+            attr.parse_nested_meta(|meta| {
+                if meta.path.is_ident("skip") {
+                    res = Some(None);
+                } else if meta.path.is_ident("compact") {
+                    let field_ty = &field.ty;
+                    res = Some(Some(
+                        quote::quote!(#scrate::__private::codec::Compact<#field_ty>),
+                    ));
+                } else if meta.path.is_ident("compact") {
+                    res = Some(Some(meta.value()?.parse()?));
+                }
+
+                Ok(())
+            })?;
+
+            if let Some(v) = res {
+                return Ok(v);
+            }
+        }
+    }
+
+    Ok(Some(field.ty.to_token_stream()))
+}
+
+fn generate_variant_field_types(
+    variant: &syn::Variant,
+    scrate: &syn::Path,
+) -> syn::Result<Option<Vec<proc_macro2::TokenStream>>> {
+    let attrs = &variant.attrs;
+
+    for attr in attrs {
+        if attr.path().is_ident("codec") {
+            let mut skip = false;
+
+            // We ignore the error intentionally as this isn't `codec(skip)` when
+            // `parse_nested_meta` fails.
+            let _ = attr.parse_nested_meta(|meta| {
+                skip = meta.path.is_ident("skip");
+                Ok(())
+            });
+
+            if skip {
+                return Ok(None);
+            }
+        }
+    }
+
+    match &variant.fields {
+        syn::Fields::Named(syn::FieldsNamed { named: fields, .. })
+        | syn::Fields::Unnamed(syn::FieldsUnnamed {
+            unnamed: fields, ..
+        }) => {
+            let field_tys = fields
+                .iter()
+                .map(|field| generate_field_types(field, scrate))
+                .collect::<syn::Result<Vec<_>>>()?;
+            Ok(Some(field_tys.into_iter().flatten().collect()))
+        }
+        syn::Fields::Unit => Ok(None),
+    }
+}
diff --git a/support/procedural-fork/src/runtime/expand/mod.rs b/support/procedural-fork/src/runtime/expand/mod.rs
new file mode 100644
index 000000000..c26cbccb7
--- /dev/null
+++ b/support/procedural-fork/src/runtime/expand/mod.rs
@@ -0,0 +1,340 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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::parse::runtime_types::RuntimeType;
+use crate::{
+    construct_runtime::{
+        check_pallet_number, decl_all_pallets, decl_integrity_test, decl_pallet_runtime_setup,
+        decl_static_assertions, expand,
+    },
+    runtime::{
+        parse::{
+            AllPalletsDeclaration, ExplicitAllPalletsDeclaration, ImplicitAllPalletsDeclaration,
+        },
+        Def,
+    },
+};
+use cfg_expr::Predicate;
+use frame_support_procedural_tools::{
+    generate_access_from_frame_or_crate, generate_crate_access, generate_hidden_includes,
+};
+use proc_macro2::TokenStream as TokenStream2;
+use quote::quote;
+use std::collections::HashSet;
+use syn::{Ident, Result};
+
+/// The fixed name of the system pallet.
+const SYSTEM_PALLET_NAME: &str = "System";
+
+pub fn expand(def: Def, legacy_ordering: bool) -> TokenStream2 {
+    let input = def.input;
+
+    let (check_pallet_number_res, res) = match def.pallets {
+        AllPalletsDeclaration::Implicit(ref decl) => (
+            check_pallet_number(input.clone(), decl.pallet_count),
+            construct_runtime_implicit_to_explicit(input.into(), decl.clone(), legacy_ordering),
+        ),
+        AllPalletsDeclaration::Explicit(ref decl) => (
+            check_pallet_number(input, decl.pallets.len()),
+            construct_runtime_final_expansion(
+                def.runtime_struct.ident.clone(),
+                decl.clone(),
+                def.runtime_types.clone(),
+                legacy_ordering,
+            ),
+        ),
+    };
+
+    let res = res.unwrap_or_else(|e| e.to_compile_error());
+
+    // We want to provide better error messages to the user and thus, handle the error here
+    // separately. If there is an error, we print the error and still generate all of the code to
+    // get in overall less errors for the user.
+    let res = if let Err(error) = check_pallet_number_res {
+        let error = error.to_compile_error();
+
+        quote! {
+            #error
+
+            #res
+        }
+    } else {
+        res
+    };
+
+    let res = expander::Expander::new("construct_runtime")
+        .dry(std::env::var("FRAME_EXPAND").is_err())
+        .verbose(true)
+        .write_to_out_dir(res)
+        .expect("Does not fail because of IO in OUT_DIR; qed");
+
+    res.into()
+}
+
+fn construct_runtime_implicit_to_explicit(
+    input: TokenStream2,
+    definition: ImplicitAllPalletsDeclaration,
+    legacy_ordering: bool,
+) -> Result<TokenStream2> {
+    let frame_support = generate_access_from_frame_or_crate("frame-support")?;
+    let attr = if legacy_ordering {
+        quote!((legacy_ordering))
+    } else {
+        quote!()
+    };
+    let mut expansion = quote::quote!(
+        #[frame_support::runtime #attr]
+        #input
+    );
+    for pallet in definition.pallet_decls.iter() {
+        let pallet_path = &pallet.path;
+        let pallet_name = &pallet.name;
+        let pallet_instance = pallet
+            .instance
+            .as_ref()
+            .map(|instance| quote::quote!(<#instance>));
+        expansion = quote::quote!(
+            #frame_support::__private::tt_call! {
+                macro = [{ #pallet_path::tt_default_parts_v2 }]
+                frame_support = [{ #frame_support }]
+                ~~> #frame_support::match_and_insert! {
+                    target = [{ #expansion }]
+                    pattern = [{ #pallet_name = #pallet_path #pallet_instance  }]
+                }
+            }
+        );
+    }
+
+    Ok(expansion)
+}
+
+fn construct_runtime_final_expansion(
+    name: Ident,
+    definition: ExplicitAllPalletsDeclaration,
+    runtime_types: Vec<RuntimeType>,
+    legacy_ordering: bool,
+) -> Result<TokenStream2> {
+    let ExplicitAllPalletsDeclaration {
+        mut pallets,
+        name: pallets_name,
+    } = definition;
+
+    if !legacy_ordering {
+        // Ensure that order of hooks is based on the pallet index
+        pallets.sort_by_key(|p| p.index);
+    }
+
+    let system_pallet = pallets
+        .iter()
+        .find(|decl| decl.name == SYSTEM_PALLET_NAME)
+        .ok_or_else(|| {
+            syn::Error::new(
+                pallets_name.span(),
+                "`System` pallet declaration is missing. \
+			 Please add this line: `pub type System = frame_system;`",
+            )
+        })?;
+    if !system_pallet.cfg_pattern.is_empty() {
+        return Err(syn::Error::new(
+            system_pallet.name.span(),
+            "`System` pallet declaration is feature gated, please remove any `#[cfg]` attributes",
+        ));
+    }
+
+    let features = pallets
+        .iter()
+        .filter_map(|decl| {
+            (!decl.cfg_pattern.is_empty()).then(|| {
+                decl.cfg_pattern.iter().flat_map(|attr| {
+                    attr.predicates().filter_map(|pred| match pred {
+                        Predicate::Feature(feat) => Some(feat),
+                        Predicate::Test => Some("test"),
+                        _ => None,
+                    })
+                })
+            })
+        })
+        .flatten()
+        .collect::<HashSet<_>>();
+
+    let hidden_crate_name = "construct_runtime";
+    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_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);
+
+    let mut dispatch = None;
+    let mut outer_event = None;
+    let mut outer_error = None;
+    let mut outer_origin = None;
+    let mut freeze_reason = None;
+    let mut hold_reason = None;
+    let mut slash_reason = None;
+    let mut lock_id = None;
+    let mut task = None;
+
+    for runtime_type in runtime_types.iter() {
+        match runtime_type {
+            RuntimeType::RuntimeCall(_) => {
+                dispatch = Some(expand::expand_outer_dispatch(
+                    &name,
+                    system_pallet,
+                    &pallets,
+                    &scrate,
+                ));
+            }
+            RuntimeType::RuntimeEvent(_) => {
+                outer_event = Some(expand::expand_outer_enum(
+                    &name,
+                    &pallets,
+                    &scrate,
+                    expand::OuterEnumType::Event,
+                )?);
+            }
+            RuntimeType::RuntimeError(_) => {
+                outer_error = Some(expand::expand_outer_enum(
+                    &name,
+                    &pallets,
+                    &scrate,
+                    expand::OuterEnumType::Error,
+                )?);
+            }
+            RuntimeType::RuntimeOrigin(_) => {
+                outer_origin = Some(expand::expand_outer_origin(
+                    &name,
+                    system_pallet,
+                    &pallets,
+                    &scrate,
+                )?);
+            }
+            RuntimeType::RuntimeFreezeReason(_) => {
+                freeze_reason = Some(expand::expand_outer_freeze_reason(&pallets, &scrate));
+            }
+            RuntimeType::RuntimeHoldReason(_) => {
+                hold_reason = Some(expand::expand_outer_hold_reason(&pallets, &scrate));
+            }
+            RuntimeType::RuntimeSlashReason(_) => {
+                slash_reason = Some(expand::expand_outer_slash_reason(&pallets, &scrate));
+            }
+            RuntimeType::RuntimeLockId(_) => {
+                lock_id = Some(expand::expand_outer_lock_id(&pallets, &scrate));
+            }
+            RuntimeType::RuntimeTask(_) => {
+                task = Some(expand::expand_outer_task(&name, &pallets, &scrate));
+            }
+        }
+    }
+
+    let all_pallets = decl_all_pallets(&name, pallets.iter(), &features);
+    let pallet_to_index = decl_pallet_runtime_setup(&name, &pallets, &scrate);
+
+    let metadata = expand::expand_runtime_metadata(
+        &name,
+        &pallets,
+        &scrate,
+        &unchecked_extrinsic,
+        &system_pallet.path,
+    );
+    let outer_config = expand::expand_outer_config(&name, &pallets, &scrate);
+    let inherent =
+        expand::expand_outer_inherent(&name, &block, &unchecked_extrinsic, &pallets, &scrate);
+    let validate_unsigned = expand::expand_outer_validate_unsigned(&name, &pallets, &scrate);
+    let integrity_test = decl_integrity_test(&scrate);
+    let static_assertions = decl_static_assertions(&name, &pallets, &scrate);
+
+    let res = quote!(
+        #scrate_decl
+
+        // Prevent UncheckedExtrinsic to print unused warning.
+        const _: () = {
+            #[allow(unused)]
+            type __hidden_use_of_unchecked_extrinsic = #unchecked_extrinsic;
+        };
+
+        #[derive(
+            Clone, Copy, PartialEq, Eq, #scrate::sp_runtime::RuntimeDebug,
+            #scrate::__private::scale_info::TypeInfo
+        )]
+        pub struct #name;
+        impl #scrate::sp_runtime::traits::GetRuntimeBlockType for #name {
+            type RuntimeBlock = #block;
+        }
+
+        // Each runtime must expose the `runtime_metadata()` to fetch the runtime API metadata.
+        // The function is implemented by calling `impl_runtime_apis!`.
+        //
+        // However, the `runtime` may be used without calling `impl_runtime_apis!`.
+        // Rely on the `Deref` trait to differentiate between a runtime that implements
+        // APIs (by macro impl_runtime_apis!) and a runtime that is simply created (by macro runtime).
+        //
+        // Both `InternalConstructRuntime` and `InternalImplRuntimeApis` expose a `runtime_metadata()` function.
+        // `InternalConstructRuntime` is implemented by the `runtime` for Runtime references (`& Runtime`),
+        // while `InternalImplRuntimeApis` is implemented by the `impl_runtime_apis!` for Runtime (`Runtime`).
+        //
+        // Therefore, the `Deref` trait will resolve the `runtime_metadata` from `impl_runtime_apis!`
+        // when both macros are called; and will resolve an empty `runtime_metadata` when only the `runtime`
+        // is used.
+
+        #[doc(hidden)]
+        trait InternalConstructRuntime {
+            #[inline(always)]
+            fn runtime_metadata(&self) -> #scrate::__private::sp_std::vec::Vec<#scrate::__private::metadata_ir::RuntimeApiMetadataIR> {
+                Default::default()
+            }
+        }
+        #[doc(hidden)]
+        impl InternalConstructRuntime for &#name {}
+
+        #outer_event
+
+        #outer_error
+
+        #outer_origin
+
+        #all_pallets
+
+        #pallet_to_index
+
+        #dispatch
+
+        #task
+
+        #metadata
+
+        #outer_config
+
+        #inherent
+
+        #validate_unsigned
+
+        #freeze_reason
+
+        #hold_reason
+
+        #lock_id
+
+        #slash_reason
+
+        #integrity_test
+
+        #static_assertions
+    );
+
+    Ok(res)
+}
diff --git a/support/procedural-fork/src/runtime/mod.rs b/support/procedural-fork/src/runtime/mod.rs
new file mode 100644
index 000000000..589acff6c
--- /dev/null
+++ b/support/procedural-fork/src/runtime/mod.rs
@@ -0,0 +1,236 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Implementation of `runtime`.
+//!
+//! `runtime` implementation is recursive and can generate code which will call itself
+//! in order to get all the pallet parts for each pallet.
+//!
+//! Pallets can define their parts:
+//!  - Implicitly: `pub type System = frame_system;`
+//!  - Explicitly: `pub type System = frame_system + Pallet + Call;`
+//!
+//! The `runtime` transitions from the implicit definition to the explicit one.
+//! From the explicit state, Substrate expands the pallets with additional information
+//! that is to be included in the runtime metadata.
+//!
+//! Pallets must provide the `tt_default_parts_v2` macro for these transitions.
+//! These are automatically implemented by the `#[pallet::pallet]` macro.
+//!
+//! This macro also generates the following enums for ease of decoding if the respective type
+//! is defined inside `#[runtime::derive]`:
+//!  - `enum RuntimeCall`: This type contains the information needed to decode extrinsics.
+//!  - `enum RuntimeEvent`: This type contains the information needed to decode events.
+//!  - `enum RuntimeError`: While this cannot be used directly to decode `sp_runtime::DispatchError`
+//!    from the chain, it contains the information needed to decode the
+//!    `sp_runtime::DispatchError::Module`.
+//!
+//! # State Transitions
+//!
+//! ```ignore
+//!  +----------+
+//!  | Implicit |
+//!  +----------+           
+//!      |                  
+//!      v                  
+//!  +----------+
+//!  | Explicit |
+//!  +----------+
+//! ```
+//!
+//! The `runtime` macro transforms the implicit declaration of each pallet
+//! `System: frame_system` to an explicit one `System: frame_system + Pallet + Call` using the
+//! `tt_default_parts_v2` macro.
+//!
+//! The `tt_default_parts_v2` macro exposes a plus separated list of pallet parts. For example, the
+//! `Event` part is exposed only if the pallet implements an event via `#[pallet::event]` macro.
+//! The tokens generated by this macro are `+ Pallet + Call` for our example.
+//!
+//! The `match_and_insert` macro takes in 3 arguments:
+//!  - target: This is the `TokenStream` that contains the `runtime` macro.
+//!  - pattern: The pattern to match against in the target stream.
+//!  - tokens: The tokens to added after the pattern match.
+//!
+//! The `runtime` macro uses the `tt_call` to get the default pallet parts via
+//! the `tt_default_parts_v2` macro defined by each pallet. The pallet parts are then returned as
+//! input to the `match_and_replace` macro.
+//! The `match_and_replace` then will modify the `runtime` to expand the implicit
+//! definition to the explicit one.
+//!
+//! For example,
+//!
+//! ```ignore
+//! #[frame_support::runtime]
+//! mod runtime {
+//! 	//...
+//!
+//!     #[runtime::pallet_index(0)]
+//! 	pub type System = frame_system; // Implicit definition of parts
+//!
+//!     #[runtime::pallet_index(1)]
+//! 	pub type Balances = pallet_balances; // Implicit definition of parts
+//! }
+//! ```
+//! This call has some implicit pallet parts, thus it will expand to:
+//! ```ignore
+//! frame_support::__private::tt_call! {
+//! 	macro = [{ pallet_balances::tt_default_parts_v2 }]
+//! 	~~> frame_support::match_and_insert! {
+//! 		target = [{
+//! 			frame_support::__private::tt_call! {
+//! 				macro = [{ frame_system::tt_default_parts_v2 }]
+//! 				~~> frame_support::match_and_insert! {
+//! 					target = [{
+//!                         #[frame_support::runtime]
+//!                         mod runtime {
+//! 	                        //...
+//!
+//!                             #[runtime::pallet_index(0)]
+//! 		                    pub type System = frame_system;
+//!                             
+//! 							#[runtime::pallet_index(1)]
+//! 		                    pub type Balances = pallet_balances;
+//!                         }
+//! 					}]
+//! 					pattern = [{ System = frame_system }]
+//! 				}
+//! 			}
+//! 		}]
+//! 		pattern = [{ Balances = pallet_balances }]
+//! 	}
+//! }
+//! ```
+//! `tt_default_parts_v2` must be defined. It returns the pallet parts inside some tokens, and
+//! then `tt_call` will pipe the returned pallet parts into the input of `match_and_insert`.
+//! Thus `match_and_insert` will initially receive the following inputs:
+//! ```ignore
+//! frame_support::match_and_insert! {
+//! 	target = [{
+//! 		frame_support::match_and_insert! {
+//! 			target = [{
+//!                  #[frame_support::runtime]
+//!                  mod runtime {
+//! 	                 //...
+//!
+//!                      #[runtime::pallet_index(0)]
+//! 		             pub type System = frame_system;
+//!
+//!                      #[runtime::pallet_index(1)]
+//! 		             pub type Balances = pallet_balances;
+//!                  }
+//! 			}]
+//! 			pattern = [{ System = frame_system }]
+//! 			tokens = [{ ::{+ Pallet + Call} }]
+//! 		}
+//! 	}]
+//! 	pattern = [{ Balances = pallet_balances }]
+//! 	tokens = [{ ::{+ Pallet + Call} }]
+//! }
+//! ```
+//! After dealing with `pallet_balances`, the inner `match_and_insert` will expand to:
+//! ```ignore
+//! frame_support::match_and_insert! {
+//! 	target = [{
+//! 		#[frame_support::runtime]
+//!         mod runtime {
+//! 	        //...
+//!
+//!             #[runtime::pallet_index(0)]
+//! 		    pub type System = frame_system; // Implicit definition of parts
+//!
+//!             #[runtime::pallet_index(1)]
+//! 		    pub type Balances = pallet_balances + Pallet + Call; // Explicit definition of parts
+//!         }
+//! 	}]
+//! 	pattern = [{ System = frame_system }]
+//! 	tokens = [{ ::{+ Pallet + Call} }]
+//! }
+//! ```
+//!
+//! Which will then finally expand to the following:
+//! ```ignore
+//! #[frame_support::runtime]
+//! mod runtime {
+//! 	//...
+//!
+//!     #[runtime::pallet_index(0)]
+//! 	pub type System = frame_system + Pallet + Call;
+//!
+//!     #[runtime::pallet_index(1)]
+//! 	pub type Balances = pallet_balances + Pallet + Call;
+//! }
+//! ```
+//!
+//! This call has no implicit pallet parts, thus it will expand to the runtime construction:
+//! ```ignore
+//! pub struct Runtime { ... }
+//! pub struct Call { ... }
+//! impl Call ...
+//! pub enum Origin { ... }
+//! ...
+//! ```
+//!
+//! Visualizing the entire flow of `#[frame_support::runtime]`, it would look like the following:
+//!
+//! ```ignore
+//! +----------------------+     +------------------------+     +-------------------+
+//! |                      |     | (defined in pallet)    |     |                   |
+//! | runtime              | --> |  tt_default_parts_v2!  | --> | match_and_insert! |
+//! | w/ no pallet parts   |     |                        |     |                   |
+//! +----------------------+     +------------------------+     +-------------------+
+//!
+//!     +----------------------+
+//!     |                      |
+//! --> | runtime              |
+//!     |  w/ pallet parts     |
+//!     +----------------------+
+//! ```
+
+#![cfg(feature = "experimental")]
+
+pub use parse::Def;
+use proc_macro::TokenStream;
+use syn::spanned::Spanned;
+
+mod expand;
+mod parse;
+
+mod keyword {
+    syn::custom_keyword!(legacy_ordering);
+}
+
+pub fn runtime(attr: TokenStream, tokens: TokenStream) -> TokenStream {
+    let mut legacy_ordering = false;
+    if !attr.is_empty() {
+        if let Ok(_) = syn::parse::<keyword::legacy_ordering>(attr.clone()) {
+            legacy_ordering = true;
+        } else {
+            let msg = "Invalid runtime macro call: unexpected attribute. Macro call must be \
+				bare, such as `#[frame_support::runtime]` or `#[runtime]`, or must specify the \
+				`legacy_ordering` attribute, such as `#[frame_support::runtime(legacy_ordering)]` or \
+				#[runtime(legacy_ordering)].";
+            let span = proc_macro2::TokenStream::from(attr).span();
+            return syn::Error::new(span, msg).to_compile_error().into();
+        }
+    }
+
+    let item = syn::parse_macro_input!(tokens as syn::ItemMod);
+    match parse::Def::try_from(item) {
+        Ok(def) => expand::expand(def, legacy_ordering).into(),
+        Err(e) => e.to_compile_error().into(),
+    }
+}
diff --git a/support/procedural-fork/src/runtime/parse/helper.rs b/support/procedural-fork/src/runtime/parse/helper.rs
new file mode 100644
index 000000000..17e362410
--- /dev/null
+++ b/support/procedural-fork/src/runtime/parse/helper.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.
+
+use crate::pallet::parse::helper::MutItemAttrs;
+use quote::ToTokens;
+
+pub(crate) fn take_first_item_runtime_attr<Attr>(
+    item: &mut impl MutItemAttrs,
+) -> syn::Result<Option<Attr>>
+where
+    Attr: syn::parse::Parse,
+{
+    let attrs = if let Some(attrs) = item.mut_item_attrs() {
+        attrs
+    } else {
+        return Ok(None);
+    };
+
+    if let Some(index) = attrs.iter().position(|attr| {
+        attr.path()
+            .segments
+            .first()
+            .map_or(false, |segment| segment.ident == "runtime")
+    }) {
+        let runtime_attr = attrs.remove(index);
+        Ok(Some(syn::parse2(runtime_attr.into_token_stream())?))
+    } else {
+        Ok(None)
+    }
+}
diff --git a/support/procedural-fork/src/runtime/parse/mod.rs b/support/procedural-fork/src/runtime/parse/mod.rs
new file mode 100644
index 000000000..79cf894e8
--- /dev/null
+++ b/support/procedural-fork/src/runtime/parse/mod.rs
@@ -0,0 +1,275 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 helper;
+pub mod pallet;
+pub mod pallet_decl;
+pub mod runtime_struct;
+pub mod runtime_types;
+
+use crate::construct_runtime::parse::Pallet;
+use pallet_decl::PalletDeclaration;
+use proc_macro2::TokenStream as TokenStream2;
+use quote::ToTokens;
+use std::collections::HashMap;
+use syn::{spanned::Spanned, Ident, Token};
+
+use frame_support_procedural_tools::syn_ext as ext;
+use runtime_types::RuntimeType;
+
+mod keyword {
+    use syn::custom_keyword;
+
+    custom_keyword!(runtime);
+    custom_keyword!(derive);
+    custom_keyword!(pallet_index);
+    custom_keyword!(disable_call);
+    custom_keyword!(disable_unsigned);
+}
+
+enum RuntimeAttr {
+    Runtime(proc_macro2::Span),
+    Derive(proc_macro2::Span, Vec<RuntimeType>),
+    PalletIndex(proc_macro2::Span, u8),
+    DisableCall(proc_macro2::Span),
+    DisableUnsigned(proc_macro2::Span),
+}
+
+impl RuntimeAttr {
+    fn span(&self) -> proc_macro2::Span {
+        match self {
+            Self::Runtime(span) => *span,
+            Self::Derive(span, _) => *span,
+            Self::PalletIndex(span, _) => *span,
+            Self::DisableCall(span) => *span,
+            Self::DisableUnsigned(span) => *span,
+        }
+    }
+}
+
+impl syn::parse::Parse for RuntimeAttr {
+    fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
+        input.parse::<syn::Token![#]>()?;
+        let content;
+        syn::bracketed!(content in input);
+        content.parse::<keyword::runtime>()?;
+        content.parse::<syn::Token![::]>()?;
+
+        let lookahead = content.lookahead1();
+        if lookahead.peek(keyword::runtime) {
+            Ok(RuntimeAttr::Runtime(
+                content.parse::<keyword::runtime>()?.span(),
+            ))
+        } else if lookahead.peek(keyword::derive) {
+            let _ = content.parse::<keyword::derive>();
+            let derive_content;
+            syn::parenthesized!(derive_content in content);
+            let runtime_types =
+                derive_content.parse::<ext::Punctuated<RuntimeType, Token![,]>>()?;
+            let runtime_types = runtime_types.inner.into_iter().collect();
+            Ok(RuntimeAttr::Derive(derive_content.span(), runtime_types))
+        } else if lookahead.peek(keyword::pallet_index) {
+            let _ = content.parse::<keyword::pallet_index>();
+            let pallet_index_content;
+            syn::parenthesized!(pallet_index_content in content);
+            let pallet_index = pallet_index_content.parse::<syn::LitInt>()?;
+            if !pallet_index.suffix().is_empty() {
+                let msg = "Number literal must not have a suffix";
+                return Err(syn::Error::new(pallet_index.span(), msg));
+            }
+            Ok(RuntimeAttr::PalletIndex(
+                pallet_index.span(),
+                pallet_index.base10_parse()?,
+            ))
+        } else if lookahead.peek(keyword::disable_call) {
+            Ok(RuntimeAttr::DisableCall(
+                content.parse::<keyword::disable_call>()?.span(),
+            ))
+        } else if lookahead.peek(keyword::disable_unsigned) {
+            Ok(RuntimeAttr::DisableUnsigned(
+                content.parse::<keyword::disable_unsigned>()?.span(),
+            ))
+        } else {
+            Err(lookahead.error())
+        }
+    }
+}
+
+#[derive(Debug, Clone)]
+pub enum AllPalletsDeclaration {
+    Implicit(ImplicitAllPalletsDeclaration),
+    Explicit(ExplicitAllPalletsDeclaration),
+}
+
+/// Declaration of a runtime with some pallet with implicit declaration of parts.
+#[derive(Debug, Clone)]
+pub struct ImplicitAllPalletsDeclaration {
+    pub name: Ident,
+    pub pallet_decls: Vec<PalletDeclaration>,
+    pub pallet_count: usize,
+}
+
+/// Declaration of a runtime with all pallet having explicit declaration of parts.
+#[derive(Debug, Clone)]
+pub struct ExplicitAllPalletsDeclaration {
+    pub name: Ident,
+    pub pallets: Vec<Pallet>,
+}
+
+pub struct Def {
+    pub input: TokenStream2,
+    pub item: syn::ItemMod,
+    pub runtime_struct: runtime_struct::RuntimeStructDef,
+    pub pallets: AllPalletsDeclaration,
+    pub runtime_types: Vec<RuntimeType>,
+}
+
+impl Def {
+    pub fn try_from(mut item: syn::ItemMod) -> syn::Result<Self> {
+        let input: TokenStream2 = item.to_token_stream().into();
+        let item_span = item.span();
+        let items = &mut item
+            .content
+            .as_mut()
+            .ok_or_else(|| {
+                let msg = "Invalid runtime definition, expected mod to be inlined.";
+                syn::Error::new(item_span, msg)
+            })?
+            .1;
+
+        let mut runtime_struct = None;
+        let mut runtime_types = None;
+
+        let mut indices = HashMap::new();
+        let mut names = HashMap::new();
+
+        let mut pallet_decls = vec![];
+        let mut pallets = vec![];
+
+        for item in items.iter_mut() {
+            let mut pallet_item = None;
+            let mut pallet_index = 0;
+
+            let mut disable_call = false;
+            let mut disable_unsigned = false;
+
+            while let Some(runtime_attr) =
+                helper::take_first_item_runtime_attr::<RuntimeAttr>(item)?
+            {
+                match runtime_attr {
+                    RuntimeAttr::Runtime(span) if runtime_struct.is_none() => {
+                        let p = runtime_struct::RuntimeStructDef::try_from(span, item)?;
+                        runtime_struct = Some(p);
+                    }
+                    RuntimeAttr::Derive(_, types) if runtime_types.is_none() => {
+                        runtime_types = Some(types);
+                    }
+                    RuntimeAttr::PalletIndex(span, index) => {
+                        pallet_index = index;
+                        pallet_item = if let syn::Item::Type(item) = item {
+                            Some(item.clone())
+                        } else {
+                            let msg = "Invalid runtime::pallet_index, expected type definition";
+                            return Err(syn::Error::new(span, msg));
+                        };
+                    }
+                    RuntimeAttr::DisableCall(_) => disable_call = true,
+                    RuntimeAttr::DisableUnsigned(_) => disable_unsigned = true,
+                    attr => {
+                        let msg = "Invalid duplicated attribute";
+                        return Err(syn::Error::new(attr.span(), msg));
+                    }
+                }
+            }
+
+            if let Some(pallet_item) = pallet_item {
+                match *pallet_item.ty.clone() {
+                    syn::Type::Path(ref path) => {
+                        let pallet_decl =
+                            PalletDeclaration::try_from(item.span(), &pallet_item, path)?;
+
+                        if let Some(used_pallet) =
+                            names.insert(pallet_decl.name.clone(), pallet_decl.name.span())
+                        {
+                            let msg = "Two pallets with the same name!";
+
+                            let mut err = syn::Error::new(used_pallet, &msg);
+                            err.combine(syn::Error::new(pallet_decl.name.span(), &msg));
+                            return Err(err);
+                        }
+
+                        pallet_decls.push(pallet_decl);
+                    }
+                    syn::Type::TraitObject(syn::TypeTraitObject { bounds, .. }) => {
+                        let pallet = Pallet::try_from(
+                            item.span(),
+                            &pallet_item,
+                            pallet_index,
+                            disable_call,
+                            disable_unsigned,
+                            &bounds,
+                        )?;
+
+                        if let Some(used_pallet) = indices.insert(pallet.index, pallet.name.clone())
+                        {
+                            let msg = format!(
+								"Pallet indices are conflicting: Both pallets {} and {} are at index {}",
+								used_pallet, pallet.name, pallet.index,
+							);
+                            let mut err = syn::Error::new(used_pallet.span(), &msg);
+                            err.combine(syn::Error::new(pallet.name.span(), msg));
+                            return Err(err);
+                        }
+
+                        pallets.push(pallet);
+                    }
+                    _ => continue,
+                }
+            }
+        }
+
+        let name = item.ident.clone();
+        let decl_count = pallet_decls.len();
+        let pallets = if decl_count > 0 {
+            AllPalletsDeclaration::Implicit(ImplicitAllPalletsDeclaration {
+                name,
+                pallet_decls,
+                pallet_count: decl_count.saturating_add(pallets.len()),
+            })
+        } else {
+            AllPalletsDeclaration::Explicit(ExplicitAllPalletsDeclaration { name, pallets })
+        };
+
+        let def = Def {
+            input,
+            item,
+            runtime_struct: runtime_struct.ok_or_else(|| {
+                syn::Error::new(item_span,
+					"Missing Runtime. Please add a struct inside the module and annotate it with `#[runtime::runtime]`"
+				)
+            })?,
+            pallets,
+            runtime_types: runtime_types.ok_or_else(|| {
+                syn::Error::new(item_span,
+					"Missing Runtime Types. Please annotate the runtime struct with `#[runtime::derive]`"
+				)
+            })?,
+        };
+
+        Ok(def)
+    }
+}
diff --git a/support/procedural-fork/src/runtime/parse/pallet.rs b/support/procedural-fork/src/runtime/parse/pallet.rs
new file mode 100644
index 000000000..039e2631b
--- /dev/null
+++ b/support/procedural-fork/src/runtime/parse/pallet.rs
@@ -0,0 +1,107 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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::{Pallet, PalletPart, PalletPartKeyword, PalletPath};
+use quote::ToTokens;
+use syn::{punctuated::Punctuated, spanned::Spanned, token, Error, Ident, PathArguments};
+
+impl Pallet {
+    pub fn try_from(
+        attr_span: proc_macro2::Span,
+        item: &syn::ItemType,
+        pallet_index: u8,
+        disable_call: bool,
+        disable_unsigned: bool,
+        bounds: &Punctuated<syn::TypeParamBound, token::Plus>,
+    ) -> syn::Result<Self> {
+        let name = item.ident.clone();
+
+        let mut pallet_path = None;
+        let mut pallet_parts = vec![];
+
+        for (index, bound) in bounds.into_iter().enumerate() {
+            if let syn::TypeParamBound::Trait(syn::TraitBound { path, .. }) = bound {
+                if index == 0 {
+                    pallet_path = Some(PalletPath {
+                        inner: path.clone(),
+                    });
+                } else {
+                    let pallet_part = syn::parse2::<PalletPart>(bound.into_token_stream())?;
+                    pallet_parts.push(pallet_part);
+                }
+            } else {
+                return Err(Error::new(
+                    attr_span,
+                    "Invalid pallet declaration, expected a path or a trait object",
+                ));
+            };
+        }
+
+        let mut path = pallet_path.ok_or(Error::new(
+            attr_span,
+            "Invalid pallet declaration, expected a path or a trait object",
+        ))?;
+
+        let mut instance = None;
+        if let Some(segment) = path
+            .inner
+            .segments
+            .iter_mut()
+            .find(|seg| !seg.arguments.is_empty())
+        {
+            if let PathArguments::AngleBracketed(syn::AngleBracketedGenericArguments {
+                args, ..
+            }) = segment.arguments.clone()
+            {
+                if let Some(syn::GenericArgument::Type(syn::Type::Path(arg_path))) = args.first() {
+                    instance = Some(Ident::new(
+                        &arg_path.to_token_stream().to_string(),
+                        arg_path.span(),
+                    ));
+                    segment.arguments = PathArguments::None;
+                }
+            }
+        }
+
+        pallet_parts = pallet_parts
+            .into_iter()
+            .filter(|part| {
+                if let (true, &PalletPartKeyword::Call(_)) = (disable_call, &part.keyword) {
+                    false
+                } else if let (true, &PalletPartKeyword::ValidateUnsigned(_)) =
+                    (disable_unsigned, &part.keyword)
+                {
+                    false
+                } else {
+                    true
+                }
+            })
+            .collect();
+
+        let cfg_pattern = vec![];
+
+        Ok(Pallet {
+            is_expanded: true,
+            name,
+            index: pallet_index,
+            path,
+            instance,
+            cfg_pattern,
+            pallet_parts,
+        })
+    }
+}
diff --git a/support/procedural-fork/src/runtime/parse/pallet_decl.rs b/support/procedural-fork/src/runtime/parse/pallet_decl.rs
new file mode 100644
index 000000000..bb1246606
--- /dev/null
+++ b/support/procedural-fork/src/runtime/parse/pallet_decl.rs
@@ -0,0 +1,71 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 quote::ToTokens;
+use syn::{spanned::Spanned, Attribute, Ident, PathArguments};
+
+/// The declaration of a pallet.
+#[derive(Debug, Clone)]
+pub struct PalletDeclaration {
+    /// The name of the pallet, e.g.`System` in `System: frame_system`.
+    pub name: Ident,
+    /// Optional attributes tagged right above a pallet declaration.
+    pub attrs: Vec<Attribute>,
+    /// The path of the pallet, e.g. `frame_system` in `System: frame_system`.
+    pub path: syn::Path,
+    /// The instance of the pallet, e.g. `Instance1` in `Council: pallet_collective::<Instance1>`.
+    pub instance: Option<Ident>,
+}
+
+impl PalletDeclaration {
+    pub fn try_from(
+        _attr_span: proc_macro2::Span,
+        item: &syn::ItemType,
+        path: &syn::TypePath,
+    ) -> syn::Result<Self> {
+        let name = item.ident.clone();
+
+        let mut path = path.path.clone();
+
+        let mut instance = None;
+        if let Some(segment) = path
+            .segments
+            .iter_mut()
+            .find(|seg| !seg.arguments.is_empty())
+        {
+            if let PathArguments::AngleBracketed(syn::AngleBracketedGenericArguments {
+                args, ..
+            }) = segment.arguments.clone()
+            {
+                if let Some(syn::GenericArgument::Type(syn::Type::Path(arg_path))) = args.first() {
+                    instance = Some(Ident::new(
+                        &arg_path.to_token_stream().to_string(),
+                        arg_path.span(),
+                    ));
+                    segment.arguments = PathArguments::None;
+                }
+            }
+        }
+
+        Ok(Self {
+            name,
+            path,
+            instance,
+            attrs: item.attrs.clone(),
+        })
+    }
+}
diff --git a/support/procedural-fork/src/runtime/parse/runtime_struct.rs b/support/procedural-fork/src/runtime/parse/runtime_struct.rs
new file mode 100644
index 000000000..7ddbdcfeb
--- /dev/null
+++ b/support/procedural-fork/src/runtime/parse/runtime_struct.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.
+
+use syn::spanned::Spanned;
+pub struct RuntimeStructDef {
+    pub ident: syn::Ident,
+    pub attr_span: proc_macro2::Span,
+}
+
+impl RuntimeStructDef {
+    pub fn try_from(attr_span: proc_macro2::Span, item: &mut syn::Item) -> syn::Result<Self> {
+        let item = if let syn::Item::Struct(item) = item {
+            item
+        } else {
+            let msg = "Invalid runtime::runtime, expected struct definition";
+            return Err(syn::Error::new(item.span(), msg));
+        };
+
+        Ok(Self {
+            ident: item.ident.clone(),
+            attr_span,
+        })
+    }
+}
diff --git a/support/procedural-fork/src/runtime/parse/runtime_types.rs b/support/procedural-fork/src/runtime/parse/runtime_types.rs
new file mode 100644
index 000000000..4d8c8358c
--- /dev/null
+++ b/support/procedural-fork/src/runtime/parse/runtime_types.rs
@@ -0,0 +1,76 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT 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 syn::{
+    parse::{Parse, ParseStream},
+    Result,
+};
+
+mod keyword {
+    use syn::custom_keyword;
+
+    custom_keyword!(RuntimeCall);
+    custom_keyword!(RuntimeEvent);
+    custom_keyword!(RuntimeError);
+    custom_keyword!(RuntimeOrigin);
+    custom_keyword!(RuntimeFreezeReason);
+    custom_keyword!(RuntimeHoldReason);
+    custom_keyword!(RuntimeSlashReason);
+    custom_keyword!(RuntimeLockId);
+    custom_keyword!(RuntimeTask);
+}
+
+#[derive(Debug, Clone, PartialEq)]
+pub enum RuntimeType {
+    RuntimeCall(keyword::RuntimeCall),
+    RuntimeEvent(keyword::RuntimeEvent),
+    RuntimeError(keyword::RuntimeError),
+    RuntimeOrigin(keyword::RuntimeOrigin),
+    RuntimeFreezeReason(keyword::RuntimeFreezeReason),
+    RuntimeHoldReason(keyword::RuntimeHoldReason),
+    RuntimeSlashReason(keyword::RuntimeSlashReason),
+    RuntimeLockId(keyword::RuntimeLockId),
+    RuntimeTask(keyword::RuntimeTask),
+}
+
+impl Parse for RuntimeType {
+    fn parse(input: ParseStream) -> Result<Self> {
+        let lookahead = input.lookahead1();
+
+        if lookahead.peek(keyword::RuntimeCall) {
+            Ok(Self::RuntimeCall(input.parse()?))
+        } else if lookahead.peek(keyword::RuntimeEvent) {
+            Ok(Self::RuntimeEvent(input.parse()?))
+        } else if lookahead.peek(keyword::RuntimeError) {
+            Ok(Self::RuntimeError(input.parse()?))
+        } else if lookahead.peek(keyword::RuntimeOrigin) {
+            Ok(Self::RuntimeOrigin(input.parse()?))
+        } else if lookahead.peek(keyword::RuntimeFreezeReason) {
+            Ok(Self::RuntimeFreezeReason(input.parse()?))
+        } else if lookahead.peek(keyword::RuntimeHoldReason) {
+            Ok(Self::RuntimeHoldReason(input.parse()?))
+        } else if lookahead.peek(keyword::RuntimeSlashReason) {
+            Ok(Self::RuntimeSlashReason(input.parse()?))
+        } else if lookahead.peek(keyword::RuntimeLockId) {
+            Ok(Self::RuntimeLockId(input.parse()?))
+        } else if lookahead.peek(keyword::RuntimeTask) {
+            Ok(Self::RuntimeTask(input.parse()?))
+        } else {
+            Err(lookahead.error())
+        }
+    }
+}
diff --git a/support/procedural-fork/src/storage_alias.rs b/support/procedural-fork/src/storage_alias.rs
new file mode 100644
index 000000000..7099239f9
--- /dev/null
+++ b/support/procedural-fork/src/storage_alias.rs
@@ -0,0 +1,709 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Implementation of the `storage_alias` attribute macro.
+
+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::{
+    parenthesized,
+    parse::{Parse, ParseStream},
+    punctuated::Punctuated,
+    spanned::Spanned,
+    token,
+    visit::Visit,
+    Attribute, Error, Ident, Result, Token, Type, TypeParam, Visibility, WhereClause,
+};
+
+/// Extension trait for [`Type`].
+trait TypeExt {
+    fn get_ident(&self) -> Option<&Ident>;
+    fn contains_ident(&self, ident: &Ident) -> bool;
+}
+
+impl TypeExt for Type {
+    fn get_ident(&self) -> Option<&Ident> {
+        match self {
+            Type::Path(p) => match &p.qself {
+                Some(qself) => qself.ty.get_ident(),
+                None => p.path.get_ident(),
+            },
+            _ => None,
+        }
+    }
+
+    fn contains_ident(&self, ident: &Ident) -> bool {
+        struct ContainsIdent<'a> {
+            ident: &'a Ident,
+            found: bool,
+        }
+        impl<'a, 'ast> Visit<'ast> for ContainsIdent<'a> {
+            fn visit_ident(&mut self, i: &'ast Ident) {
+                if i == self.ident {
+                    self.found = true;
+                }
+            }
+        }
+
+        let mut visitor = ContainsIdent {
+            ident,
+            found: false,
+        };
+        syn::visit::visit_type(&mut visitor, self);
+        visitor.found
+    }
+}
+
+/// Represents generics which only support [`TypeParam`] separated by commas.
+struct SimpleGenerics {
+    lt_token: Token![<],
+    params: Punctuated<TypeParam, token::Comma>,
+    gt_token: Token![>],
+}
+
+impl SimpleGenerics {
+    /// Returns the generics for types declarations etc.
+    fn type_generics(&self) -> impl Iterator<Item = &Ident> {
+        self.params.iter().map(|p| &p.ident)
+    }
+
+    /// Returns the generics for the `impl` block.
+    fn impl_generics(&self) -> impl Iterator<Item = &TypeParam> {
+        self.params.iter()
+    }
+}
+
+impl Parse for SimpleGenerics {
+    fn parse(input: ParseStream<'_>) -> Result<Self> {
+        Ok(Self {
+            lt_token: input.parse()?,
+            params: Punctuated::parse_separated_nonempty(input)?,
+            gt_token: input.parse()?,
+        })
+    }
+}
+
+impl ToTokens for SimpleGenerics {
+    fn to_tokens(&self, tokens: &mut TokenStream) {
+        self.lt_token.to_tokens(tokens);
+        self.params.to_tokens(tokens);
+        self.gt_token.to_tokens(tokens);
+    }
+}
+
+mod storage_types {
+    syn::custom_keyword!(StorageValue);
+    syn::custom_keyword!(StorageMap);
+    syn::custom_keyword!(CountedStorageMap);
+    syn::custom_keyword!(StorageDoubleMap);
+    syn::custom_keyword!(StorageNMap);
+}
+
+/// The types of prefixes the storage alias macro supports.
+mod prefix_types {
+    // Use the verbatim/unmodified input name as the prefix.
+    syn::custom_keyword!(verbatim);
+    // The input type is a pallet and its pallet name should be used as the prefix.
+    syn::custom_keyword!(pallet_name);
+    // The input type implements `Get<'static str>` and this `str` should be used as the prefix.
+    syn::custom_keyword!(dynamic);
+}
+
+/// The supported storage types
+enum StorageType {
+    Value {
+        _kw: storage_types::StorageValue,
+        _lt_token: Token![<],
+        prefix: Type,
+        _value_comma: Token![,],
+        value_ty: Type,
+        query_type: Option<(Token![,], Type)>,
+        _trailing_comma: Option<Token![,]>,
+        _gt_token: Token![>],
+    },
+    Map {
+        _kw: storage_types::StorageMap,
+        _lt_token: Token![<],
+        prefix: Type,
+        _hasher_comma: Token![,],
+        hasher_ty: Type,
+        _key_comma: Token![,],
+        key_ty: Type,
+        _value_comma: Token![,],
+        value_ty: Type,
+        query_type: Option<(Token![,], Type)>,
+        _trailing_comma: Option<Token![,]>,
+        _gt_token: Token![>],
+    },
+    CountedMap {
+        _kw: storage_types::CountedStorageMap,
+        _lt_token: Token![<],
+        prefix: Type,
+        _hasher_comma: Token![,],
+        hasher_ty: Type,
+        _key_comma: Token![,],
+        key_ty: Type,
+        _value_comma: Token![,],
+        value_ty: Type,
+        query_type: Option<(Token![,], Type)>,
+        _trailing_comma: Option<Token![,]>,
+        _gt_token: Token![>],
+    },
+    DoubleMap {
+        _kw: storage_types::StorageDoubleMap,
+        _lt_token: Token![<],
+        prefix: Type,
+        _hasher1_comma: Token![,],
+        hasher1_ty: Type,
+        _key1_comma: Token![,],
+        key1_ty: Type,
+        _hasher2_comma: Token![,],
+        hasher2_ty: Type,
+        _key2_comma: Token![,],
+        key2_ty: Type,
+        _value_comma: Token![,],
+        value_ty: Type,
+        query_type: Option<(Token![,], Type)>,
+        _trailing_comma: Option<Token![,]>,
+        _gt_token: Token![>],
+    },
+    NMap {
+        _kw: storage_types::StorageNMap,
+        _lt_token: Token![<],
+        prefix: Type,
+        _paren_comma: Token![,],
+        _paren_token: token::Paren,
+        key_types: Punctuated<Type, Token![,]>,
+        _value_comma: Token![,],
+        value_ty: Type,
+        query_type: Option<(Token![,], Type)>,
+        _trailing_comma: Option<Token![,]>,
+        _gt_token: Token![>],
+    },
+}
+
+impl StorageType {
+    /// Generate the actual type declaration.
+    fn generate_type_declaration(
+        &self,
+        crate_: &syn::Path,
+        storage_instance: &StorageInstance,
+        storage_name: &Ident,
+        storage_generics: Option<&SimpleGenerics>,
+        visibility: &Visibility,
+        attributes: &[Attribute],
+    ) -> TokenStream {
+        let storage_instance_generics = &storage_instance.generics;
+        let storage_instance = &storage_instance.name;
+        let attributes = attributes.iter();
+        let storage_generics = storage_generics.map(|g| {
+            let generics = g.type_generics();
+
+            quote!( < #( #generics ),* > )
+        });
+
+        match self {
+            Self::Value {
+                value_ty,
+                query_type,
+                ..
+            } => {
+                let query_type = query_type.as_ref().map(|(c, t)| quote!(#c #t));
+
+                quote! {
+                    #( #attributes )*
+                    #visibility type #storage_name #storage_generics = #crate_::storage::types::StorageValue<
+                        #storage_instance #storage_instance_generics,
+                        #value_ty
+                        #query_type
+                    >;
+                }
+            }
+            Self::CountedMap {
+                value_ty,
+                query_type,
+                hasher_ty,
+                key_ty,
+                ..
+            }
+            | Self::Map {
+                value_ty,
+                query_type,
+                hasher_ty,
+                key_ty,
+                ..
+            } => {
+                let query_type = query_type.as_ref().map(|(c, t)| quote!(#c #t));
+                let map_type = Ident::new(
+                    match self {
+                        Self::Map { .. } => "StorageMap",
+                        _ => "CountedStorageMap",
+                    },
+                    Span::call_site(),
+                );
+
+                quote! {
+                    #( #attributes )*
+                    #visibility type #storage_name #storage_generics = #crate_::storage::types::#map_type<
+                        #storage_instance #storage_instance_generics,
+                        #hasher_ty,
+                        #key_ty,
+                        #value_ty
+                        #query_type
+                    >;
+                }
+            }
+            Self::DoubleMap {
+                value_ty,
+                query_type,
+                hasher1_ty,
+                key1_ty,
+                hasher2_ty,
+                key2_ty,
+                ..
+            } => {
+                let query_type = query_type.as_ref().map(|(c, t)| quote!(#c #t));
+
+                quote! {
+                    #( #attributes )*
+                    #visibility type #storage_name #storage_generics = #crate_::storage::types::StorageDoubleMap<
+                        #storage_instance #storage_instance_generics,
+                        #hasher1_ty,
+                        #key1_ty,
+                        #hasher2_ty,
+                        #key2_ty,
+                        #value_ty
+                        #query_type
+                    >;
+                }
+            }
+            Self::NMap {
+                value_ty,
+                query_type,
+                key_types,
+                ..
+            } => {
+                let query_type = query_type.as_ref().map(|(c, t)| quote!(#c #t));
+                let key_types = key_types.iter();
+
+                quote! {
+                    #( #attributes )*
+                    #visibility type #storage_name #storage_generics = #crate_::storage::types::StorageNMap<
+                        #storage_instance #storage_instance_generics,
+                        ( #( #key_types ),* ),
+                        #value_ty
+                        #query_type
+                    >;
+                }
+            }
+        }
+    }
+
+    /// The prefix for this storage type.
+    fn prefix(&self) -> &Type {
+        match self {
+            Self::Value { prefix, .. }
+            | Self::Map { prefix, .. }
+            | Self::CountedMap { prefix, .. }
+            | Self::NMap { prefix, .. }
+            | Self::DoubleMap { prefix, .. } => prefix,
+        }
+    }
+}
+
+impl Parse for StorageType {
+    fn parse(input: ParseStream<'_>) -> Result<Self> {
+        let lookahead = input.lookahead1();
+
+        let parse_query_type = |input: ParseStream<'_>| -> Result<Option<(Token![,], Type)>> {
+            if input.peek(Token![,]) && !input.peek2(Token![>]) {
+                Ok(Some((input.parse()?, input.parse()?)))
+            } else {
+                Ok(None)
+            }
+        };
+
+        if lookahead.peek(storage_types::StorageValue) {
+            Ok(Self::Value {
+                _kw: input.parse()?,
+                _lt_token: input.parse()?,
+                prefix: input.parse()?,
+                _value_comma: input.parse()?,
+                value_ty: input.parse()?,
+                query_type: parse_query_type(input)?,
+                _trailing_comma: input.peek(Token![,]).then(|| input.parse()).transpose()?,
+                _gt_token: input.parse()?,
+            })
+        } else if lookahead.peek(storage_types::StorageMap) {
+            Ok(Self::Map {
+                _kw: input.parse()?,
+                _lt_token: input.parse()?,
+                prefix: input.parse()?,
+                _hasher_comma: input.parse()?,
+                hasher_ty: input.parse()?,
+                _key_comma: input.parse()?,
+                key_ty: input.parse()?,
+                _value_comma: input.parse()?,
+                value_ty: input.parse()?,
+                query_type: parse_query_type(input)?,
+                _trailing_comma: input.peek(Token![,]).then(|| input.parse()).transpose()?,
+                _gt_token: input.parse()?,
+            })
+        } else if lookahead.peek(storage_types::CountedStorageMap) {
+            Ok(Self::CountedMap {
+                _kw: input.parse()?,
+                _lt_token: input.parse()?,
+                prefix: input.parse()?,
+                _hasher_comma: input.parse()?,
+                hasher_ty: input.parse()?,
+                _key_comma: input.parse()?,
+                key_ty: input.parse()?,
+                _value_comma: input.parse()?,
+                value_ty: input.parse()?,
+                query_type: parse_query_type(input)?,
+                _trailing_comma: input.peek(Token![,]).then(|| input.parse()).transpose()?,
+                _gt_token: input.parse()?,
+            })
+        } else if lookahead.peek(storage_types::StorageDoubleMap) {
+            Ok(Self::DoubleMap {
+                _kw: input.parse()?,
+                _lt_token: input.parse()?,
+                prefix: input.parse()?,
+                _hasher1_comma: input.parse()?,
+                hasher1_ty: input.parse()?,
+                _key1_comma: input.parse()?,
+                key1_ty: input.parse()?,
+                _hasher2_comma: input.parse()?,
+                hasher2_ty: input.parse()?,
+                _key2_comma: input.parse()?,
+                key2_ty: input.parse()?,
+                _value_comma: input.parse()?,
+                value_ty: input.parse()?,
+                query_type: parse_query_type(input)?,
+                _trailing_comma: input.peek(Token![,]).then(|| input.parse()).transpose()?,
+                _gt_token: input.parse()?,
+            })
+        } else if lookahead.peek(storage_types::StorageNMap) {
+            let content;
+            Ok(Self::NMap {
+                _kw: input.parse()?,
+                _lt_token: input.parse()?,
+                prefix: input.parse()?,
+                _paren_comma: input.parse()?,
+                _paren_token: parenthesized!(content in input),
+                key_types: Punctuated::parse_terminated(&content)?,
+                _value_comma: input.parse()?,
+                value_ty: input.parse()?,
+                query_type: parse_query_type(input)?,
+                _trailing_comma: input.peek(Token![,]).then(|| input.parse()).transpose()?,
+                _gt_token: input.parse()?,
+            })
+        } else {
+            Err(lookahead.error())
+        }
+    }
+}
+
+/// The input expected by this macro.
+struct Input {
+    attributes: Vec<Attribute>,
+    visibility: Visibility,
+    _type: Token![type],
+    storage_name: Ident,
+    storage_generics: Option<SimpleGenerics>,
+    where_clause: Option<WhereClause>,
+    _equal: Token![=],
+    storage_type: StorageType,
+    _semicolon: Token![;],
+}
+
+impl Parse for Input {
+    fn parse(input: ParseStream<'_>) -> Result<Self> {
+        let attributes = input.call(Attribute::parse_outer)?;
+        let visibility = input.parse()?;
+        let _type = input.parse()?;
+        let storage_name = input.parse()?;
+
+        let lookahead = input.lookahead1();
+        let storage_generics = if lookahead.peek(Token![<]) {
+            Some(input.parse()?)
+        } else if lookahead.peek(Token![=]) {
+            None
+        } else {
+            return Err(lookahead.error());
+        };
+
+        let lookahead = input.lookahead1();
+        let where_clause = if lookahead.peek(Token![where]) {
+            Some(input.parse()?)
+        } else if lookahead.peek(Token![=]) {
+            None
+        } else {
+            return Err(lookahead.error());
+        };
+
+        let _equal = input.parse()?;
+
+        let storage_type = input.parse()?;
+
+        let _semicolon = input.parse()?;
+
+        Ok(Self {
+            attributes,
+            visibility,
+            _type,
+            storage_name,
+            storage_generics,
+            _equal,
+            storage_type,
+            where_clause,
+            _semicolon,
+        })
+    }
+}
+
+/// Defines which type of prefix the storage alias is using.
+#[derive(Clone, Copy)]
+enum PrefixType {
+    /// An appropriate prefix will be determined automatically.
+    ///
+    /// If generics are passed, this is assumed to be a pallet and the pallet name should be used.
+    /// Otherwise use the verbatim passed name as prefix.
+    Compatibility,
+    /// The provided ident/name will be used as the prefix.
+    Verbatim,
+    /// The provided type will be used to determine the prefix. This type must
+    /// implement `PalletInfoAccess` which specifies the proper name. This
+    /// name is then used as the prefix.
+    PalletName,
+    /// Uses the provided type implementing `Get<'static str>` to determine the prefix.
+    Dynamic,
+}
+
+/// 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_access_from_frame_or_crate("frame-support")?;
+
+    let prefix_type = if attributes.is_empty() {
+        PrefixType::Compatibility
+    } else if syn::parse2::<prefix_types::verbatim>(attributes.clone()).is_ok() {
+        PrefixType::Verbatim
+    } else if syn::parse2::<prefix_types::pallet_name>(attributes.clone()).is_ok() {
+        PrefixType::PalletName
+    } else if syn::parse2::<prefix_types::dynamic>(attributes.clone()).is_ok() {
+        PrefixType::Dynamic
+    } else {
+        return Err(Error::new(attributes.span(), "Unknown attributes"));
+    };
+
+    let storage_instance = generate_storage_instance(
+        &crate_,
+        &input.storage_name,
+        input.storage_generics.as_ref(),
+        input.where_clause.as_ref(),
+        input.storage_type.prefix(),
+        &input.visibility,
+        matches!(input.storage_type, StorageType::CountedMap { .. }),
+        prefix_type,
+    )?;
+
+    let definition = input.storage_type.generate_type_declaration(
+        &crate_,
+        &storage_instance,
+        &input.storage_name,
+        input.storage_generics.as_ref(),
+        &input.visibility,
+        &input.attributes,
+    );
+
+    let storage_instance_code = storage_instance.code;
+
+    Ok(quote! {
+        #storage_instance_code
+
+        #definition
+    })
+}
+
+/// The storage instance to use for the storage alias.
+struct StorageInstance {
+    name: Ident,
+    generics: TokenStream,
+    code: TokenStream,
+}
+
+/// Generate the [`StorageInstance`] for the storage alias.
+fn generate_storage_instance(
+    crate_: &syn::Path,
+    storage_name: &Ident,
+    storage_generics: Option<&SimpleGenerics>,
+    storage_where_clause: Option<&WhereClause>,
+    prefix: &Type,
+    visibility: &Visibility,
+    is_counted_map: bool,
+    prefix_type: PrefixType,
+) -> Result<StorageInstance> {
+    if let Type::Infer(_) = prefix {
+        return Err(Error::new(
+            prefix.span(),
+            "`_` is not allowed as prefix by `storage_alias`.",
+        ));
+    }
+
+    let impl_generics_used_by_prefix = storage_generics
+        .as_ref()
+        .map(|g| {
+            g.impl_generics()
+                .filter(|g| prefix.contains_ident(&g.ident))
+                .collect::<Vec<_>>()
+        })
+        .unwrap_or_default();
+
+    let (pallet_prefix, impl_generics, type_generics) = match prefix_type {
+        PrefixType::Compatibility => {
+            if !impl_generics_used_by_prefix.is_empty() {
+                let type_generics = impl_generics_used_by_prefix.iter().map(|g| &g.ident);
+                let impl_generics = impl_generics_used_by_prefix.iter();
+
+                (
+                    quote! {
+                        < #prefix as #crate_::traits::PalletInfoAccess>::name()
+                    },
+                    quote!( #( #impl_generics ),* ),
+                    quote!( #( #type_generics ),* ),
+                )
+            } else if let Some(prefix) = prefix.get_ident() {
+                let prefix_str = prefix.to_string();
+
+                (quote!(#prefix_str), quote!(), quote!())
+            } else {
+                return Err(Error::new_spanned(
+                    prefix,
+                    "If there are no generics, the prefix is only allowed to be an identifier.",
+                ));
+            }
+        }
+        PrefixType::Verbatim => {
+            let prefix_str = match prefix.get_ident() {
+                Some(p) => p.to_string(),
+                None => {
+                    return Err(Error::new_spanned(
+                        prefix,
+                        "Prefix type `verbatim` requires that the prefix is an ident.",
+                    ))
+                }
+            };
+
+            (quote!(#prefix_str), quote!(), quote!())
+        }
+        PrefixType::PalletName => {
+            let type_generics = impl_generics_used_by_prefix.iter().map(|g| &g.ident);
+            let impl_generics = impl_generics_used_by_prefix.iter();
+
+            (
+                quote! {
+                    <#prefix as #crate_::traits::PalletInfoAccess>::name()
+                },
+                quote!( #( #impl_generics ),* ),
+                quote!( #( #type_generics ),* ),
+            )
+        }
+        PrefixType::Dynamic => {
+            let type_generics = impl_generics_used_by_prefix.iter().map(|g| &g.ident);
+            let impl_generics = impl_generics_used_by_prefix.iter();
+
+            (
+                quote! {
+                    <#prefix as #crate_::traits::Get<_>>::get()
+                },
+                quote!( #( #impl_generics ),* ),
+                quote!( #( #type_generics ),* ),
+            )
+        }
+    };
+
+    let where_clause = storage_where_clause.map(|w| quote!(#w)).unwrap_or_default();
+
+    let name_str = format!("{}_Storage_Instance", storage_name);
+    let name = Ident::new(&name_str, Span::call_site());
+    let storage_name_str = storage_name.to_string();
+
+    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 >(
+                ::core::marker::PhantomData<(#type_generics)>
+            ) #where_clause;
+
+            impl<#impl_generics> #crate_::traits::StorageInstance
+                for #counter_name< #type_generics > #where_clause
+            {
+                fn pallet_prefix() -> &'static str {
+                    #pallet_prefix
+                }
+
+                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
+                for #name< #type_generics > #where_clause
+            {
+                type CounterPrefix = #counter_name < #type_generics >;
+            }
+        }
+    });
+
+    let storage_prefix_hash = helper::two128_str(&storage_name_str);
+
+    // Implement `StorageInstance` trait.
+    let code = quote! {
+        #[allow(non_camel_case_types)]
+        #visibility struct #name< #impl_generics >(
+            ::core::marker::PhantomData<(#type_generics)>
+        ) #where_clause;
+
+        impl<#impl_generics> #crate_::traits::StorageInstance
+            for #name< #type_generics > #where_clause
+        {
+            fn pallet_prefix() -> &'static str {
+                #pallet_prefix
+            }
+
+            const STORAGE_PREFIX: &'static str = #storage_name_str;
+            fn storage_prefix_hash() -> [u8; 16] {
+                #storage_prefix_hash
+            }
+        }
+
+        #counter_code
+    };
+
+    Ok(StorageInstance {
+        name,
+        code,
+        generics: quote!( < #type_generics > ),
+    })
+}
diff --git a/support/procedural-fork/src/transactional.rs b/support/procedural-fork/src/transactional.rs
new file mode 100644
index 000000000..73a841d9b
--- /dev/null
+++ b/support/procedural-fork/src/transactional.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 frame_support_procedural_tools::generate_access_from_frame_or_crate;
+use proc_macro::TokenStream;
+use quote::quote;
+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_access_from_frame_or_crate("frame-support")?;
+    let output = quote! {
+        #(#attrs)*
+        #vis #sig {
+            use #crate_::storage::{with_transaction, TransactionOutcome};
+            with_transaction(|| {
+                let r = (|| { #block })();
+                if r.is_ok() {
+                    TransactionOutcome::Commit(r)
+                } else {
+                    TransactionOutcome::Rollback(r)
+                }
+            })
+        }
+    };
+
+    Ok(output.into())
+}
+
+pub fn require_transactional(_attr: TokenStream, input: TokenStream) -> Result<TokenStream> {
+    let ItemFn {
+        attrs,
+        vis,
+        sig,
+        block,
+    } = syn::parse(input)?;
+
+    let crate_ = generate_access_from_frame_or_crate("frame-support")?;
+    let output = quote! {
+        #(#attrs)*
+        #vis #sig {
+            if !#crate_::storage::transactional::is_transactional() {
+                return Err(#crate_::sp_runtime::TransactionalError::NoLayer.into());
+            }
+            #block
+        }
+    };
+
+    Ok(output.into())
+}
diff --git a/support/procedural-fork/src/tt_macro.rs b/support/procedural-fork/src/tt_macro.rs
new file mode 100644
index 000000000..3f280013f
--- /dev/null
+++ b/support/procedural-fork/src/tt_macro.rs
@@ -0,0 +1,105 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! Implementation of the `create_tt_return_macro` macro
+
+use crate::COUNTER;
+use proc_macro2::{Ident, TokenStream};
+use quote::format_ident;
+
+struct CreateTtReturnMacroDef {
+    name: Ident,
+    args: Vec<(Ident, TokenStream)>,
+}
+
+impl syn::parse::Parse for CreateTtReturnMacroDef {
+    fn parse(input: syn::parse::ParseStream) -> syn::Result<Self> {
+        let name = input.parse()?;
+        let _ = input.parse::<syn::Token![,]>()?;
+
+        let mut args = Vec::new();
+        while !input.is_empty() {
+            let mut value;
+            let key: Ident = input.parse()?;
+            let _ = input.parse::<syn::Token![=]>()?;
+            let _: syn::token::Bracket = syn::bracketed!(value in input);
+            let _: syn::token::Brace = syn::braced!(value in value);
+            let value: TokenStream = value.parse()?;
+
+            args.push((key, value))
+        }
+
+        Ok(Self { name, args })
+    }
+}
+
+/// A proc macro that accepts a name and any number of key-value pairs, to be used to create a
+/// declarative macro that follows tt-call conventions and simply calls
+/// [`tt_call::tt_return`], accepting an optional `frame-support` argument and returning
+/// the key-value pairs that were supplied to the proc macro.
+///
+/// # Example
+/// ```ignore
+/// __create_tt_macro! {
+///     my_tt_macro,
+///     foo = [{ bar }]
+/// }
+///
+/// // Creates the following declarative macro:
+///
+/// macro_rules! my_tt_macro {
+///     {
+///         $caller:tt
+///         $(your_tt_return = [{ $my_tt_return:path }])?
+///     } => {
+///         $my_tt_return! {
+///             $caller
+///             foo = [{ bar }]
+///         }
+///     }
+/// }
+/// ```
+pub fn create_tt_return_macro(input: proc_macro::TokenStream) -> proc_macro::TokenStream {
+    let CreateTtReturnMacroDef { name, args } =
+        syn::parse_macro_input!(input as CreateTtReturnMacroDef);
+
+    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);
+
+    let decl_macro = quote::quote! {
+        #[macro_export]
+        #[doc(hidden)]
+        macro_rules! #unique_name {
+            {
+                $caller:tt
+                $(your_tt_return = [{ $my_tt_macro:path }])?
+            } => {
+                $my_tt_return! {
+                    $caller
+                    #(
+                        #keys = [{ #values }]
+                    )*
+                }
+            }
+        }
+
+        pub use #unique_name as #name;
+    };
+
+    decl_macro.into()
+}
diff --git a/support/procedural-fork/update.sh b/support/procedural-fork/update.sh
new file mode 100755
index 000000000..a8793b261
--- /dev/null
+++ b/support/procedural-fork/update.sh
@@ -0,0 +1,46 @@
+#!/bin/sh
+
+# Enable error handling
+set -e
+
+# Set the repository and tag
+REPO_URL="git@github.com:paritytech/polkadot-sdk.git"
+POLKADOT_SDK_TAG="v1.10.0-rc3"
+
+# Create a temporary directory for cloning
+TMP_DIR=$(mktemp -d)
+
+# Define source and destination directories
+SRC_DIR="substrate/frame/support/procedural/src"
+DEST_DIR="$(pwd)/src"  # Absolute path to `src` directory of procedural-fork
+
+# Check if DEST_DIR exists
+if [ ! -d "$DEST_DIR" ]; then
+    echo "Error: Destination directory $DEST_DIR does not exist."
+    rm -rf "$TMP_DIR"
+    exit 1
+fi
+
+# Clone only the required directory from the repository
+echo "Cloning $REPO_URL at tag $POLKADOT_SDK_TAG ..."
+git clone --depth 1 --branch "$POLKADOT_SDK_TAG" --filter=blob:none --sparse "$REPO_URL" "$TMP_DIR"
+
+# Navigate to the cloned directory
+cd "$TMP_DIR"
+
+# Initialize sparse-checkout and set the correct directory
+git sparse-checkout init --cone
+git sparse-checkout set "$SRC_DIR"
+
+# Debugging: List the contents of the sparse-checked-out directory
+echo "Contents of $TMP_DIR/$SRC_DIR after sparse-checkout:"
+ls -l "$TMP_DIR/$SRC_DIR" || { echo "Error: Sparse checkout failed, $SRC_DIR not found."; rm -rf "$TMP_DIR"; exit 1; }
+
+# Copy all files from `src` except `lib.rs` to the destination folder
+echo "Copying files to $DEST_DIR ..."
+rsync -a --exclude='lib.rs' "$TMP_DIR/$SRC_DIR/" "$DEST_DIR/"
+
+# Clean up the temporary directory
+rm -rf "$TMP_DIR"
+
+echo "Update completed successfully."