From f9451269241e54fa8e8169a776761657db346a8c Mon Sep 17 00:00:00 2001
From: Xavier Lau <xavier@inv.cafe>
Date: Fri, 14 Jun 2024 11:41:49 +0800
Subject: [PATCH 01/59] Setup deps

---
 Cargo.lock      | 5457 ++++++++++++++++++++++++++++-------------------
 Cargo.toml      |  284 ++-
 node/Cargo.toml |    9 -
 3 files changed, 3335 insertions(+), 2415 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 4dfdc5765..0007aea73 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -23,11 +23,11 @@ dependencies = [
 
 [[package]]
 name = "addr2line"
-version = "0.21.0"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
+checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678"
 dependencies = [
- "gimli 0.28.1",
+ "gimli 0.29.0",
 ]
 
 [[package]]
@@ -53,7 +53,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b169f7a6d4742236a0a00c541b845991d0ac43e546831af1249753ab4c3aa3a0"
 dependencies = [
  "cfg-if",
- "cipher",
+ "cipher 0.4.4",
  "cpufeatures",
 ]
 
@@ -65,10 +65,19 @@ checksum = "831010a0f742e1209b3bcea8fab6a8e149051ba6099432c8cb2cc117dec3ead1"
 dependencies = [
  "aead",
  "aes",
- "cipher",
+ "cipher 0.4.4",
  "ctr",
  "ghash",
- "subtle",
+ "subtle 2.5.0",
+]
+
+[[package]]
+name = "affix"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "50e7ea84d3fa2009f355f8429a0b418a96849135a4188fadf384f59127d5d4bc"
+dependencies = [
+ "convert_case 0.5.0",
 ]
 
 [[package]]
@@ -77,7 +86,7 @@ version = "0.7.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "891477e0c6a8957309ee5c45a6368af3ae14bb510732d2684ffa19af310920f9"
 dependencies = [
- "getrandom 0.2.14",
+ "getrandom 0.2.15",
  "once_cell",
  "version_check",
 ]
@@ -89,7 +98,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e89da841a80418a9b391ebaea17f5c112ffaaa96f621d2c285b5174da76b9011"
 dependencies = [
  "cfg-if",
- "getrandom 0.2.14",
+ "getrandom 0.2.15",
  "once_cell",
  "version_check",
  "zerocopy",
@@ -142,47 +151,48 @@ dependencies = [
 
 [[package]]
 name = "anstream"
-version = "0.6.13"
+version = "0.6.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d96bd03f33fe50a863e394ee9718a706f988b9079b20c3784fb726e7678b62fb"
+checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b"
 dependencies = [
  "anstyle",
  "anstyle-parse",
  "anstyle-query",
  "anstyle-wincon",
  "colorchoice",
+ "is_terminal_polyfill",
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle"
-version = "1.0.6"
+version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8901269c6307e8d93993578286ac0edf7f195079ffff5ebdeea6a59ffb7e36bc"
+checksum = "038dfcf04a5feb68e9c60b21c9625a54c2c0616e79b72b0fd87075a056ae1d1b"
 
 [[package]]
 name = "anstyle-parse"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c75ac65da39e5fe5ab759307499ddad880d724eed2f6ce5b5e8a26f4f387928c"
+checksum = "c03a11a9034d92058ceb6ee011ce58af4a9bf61491aa7e1e59ecd24bd40d22d4"
 dependencies = [
  "utf8parse",
 ]
 
 [[package]]
 name = "anstyle-query"
-version = "1.0.2"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e28923312444cdd728e4738b3f9c9cac739500909bb3d3c94b43551b16517648"
+checksum = "ad186efb764318d35165f1758e7dcef3b10628e26d41a44bc5550652e6804391"
 dependencies = [
  "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "anstyle-wincon"
-version = "3.0.2"
+version = "3.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1cd54b81ec8d6180e24654d0b371ad22fc3dd083b6ff8ba325b72e00c87660a7"
+checksum = "61a38449feb7068f52bb06c12759005cf459ee52bb4adc1d5a7c4322d716fb19"
 dependencies = [
  "anstyle",
  "windows-sys 0.52.0",
@@ -190,9 +200,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.82"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f538837af36e6f6a9be0faa67f9a314f8119e4e4b5867c6ab40ed60360142519"
+checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
 
 [[package]]
 name = "approx"
@@ -205,16 +215,39 @@ dependencies = [
 
 [[package]]
 name = "aquamarine"
-version = "0.3.3"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1da02abba9f9063d786eab1509833ebb2fac0f966862ca59439c76b9c566760"
+checksum = "21cc1548309245035eb18aa7f0967da6bc65587005170c56e6ef2788a4cf3f4e"
 dependencies = [
  "include_dir",
  "itertools 0.10.5",
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.66",
+]
+
+[[package]]
+name = "ark-bls12-377"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb00293ba84f51ce3bd026bd0de55899c4e68f0a39a5728cebae3a73ffdc0a4f"
+dependencies = [
+ "ark-ec",
+ "ark-ff",
+ "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]]
@@ -229,6 +262,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"
@@ -243,9 +315,35 @@ 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"
@@ -258,6 +356,19 @@ dependencies = [
  "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"
@@ -302,29 +413,29 @@ dependencies = [
 ]
 
 [[package]]
-name = "ark-poly"
-version = "0.4.2"
+name = "ark-models-ext"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d320bfc44ee185d899ccbadfa8bc31aab923ce1558716e1997a1e74057fe86bf"
+checksum = "3e9eab5d4b5ff2f228b763d38442adc9b084b0a465409b059fac5c2308835ec2"
 dependencies = [
+ "ark-ec",
  "ark-ff",
  "ark-serialize",
  "ark-std",
  "derivative",
- "hashbrown 0.13.2",
 ]
 
 [[package]]
-name = "ark-scale"
-version = "0.0.10"
+name = "ark-poly"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49b08346a3e38e2be792ef53ee168623c9244d968ff00cd70fb9932f6fe36393"
+checksum = "d320bfc44ee185d899ccbadfa8bc31aab923ce1558716e1997a1e74057fe86bf"
 dependencies = [
- "ark-ec",
  "ark-ff",
  "ark-serialize",
  "ark-std",
- "parity-scale-codec",
+ "derivative",
+ "hashbrown 0.13.2",
 ]
 
 [[package]]
@@ -344,7 +455,7 @@ dependencies = [
 [[package]]
 name = "ark-secret-scalar"
 version = "0.0.2"
-source = "git+https://github.com/w3f/ring-vrf?rev=3119f51#3119f51b54b69308abfb0671f6176cb125ae1bf1"
+source = "git+https://github.com/w3f/ring-vrf?rev=e9782f9#e9782f938629c90f3adb3fff2358bc8d1386af3e"
 dependencies = [
  "ark-ec",
  "ark-ff",
@@ -352,7 +463,7 @@ dependencies = [
  "ark-std",
  "ark-transcript",
  "digest 0.10.7",
- "rand_core 0.6.4",
+ "getrandom_or_panic",
  "zeroize",
 ]
 
@@ -386,13 +497,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94893f1e0c6eeab764ade8dc4c0db24caf4fe7cbbaafc0eba0a9030f447b5185"
 dependencies = [
  "num-traits",
- "rand 0.8.5",
+ "rand",
+ "rayon",
 ]
 
 [[package]]
 name = "ark-transcript"
 version = "0.0.2"
-source = "git+https://github.com/w3f/ring-vrf?rev=3119f51#3119f51b54b69308abfb0671f6176cb125ae1bf1"
+source = "git+https://github.com/w3f/ring-vrf?rev=e9782f9#e9782f938629c90f3adb3fff2358bc8d1386af3e"
 dependencies = [
  "ark-ff",
  "ark-serialize",
@@ -404,9 +516,15 @@ dependencies = [
 
 [[package]]
 name = "array-bytes"
-version = "6.2.2"
+version = "4.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f52f63c5c1316a16a4b35eaac8b76a98248961a533f061684cb2a7cb0eafb6c6"
+
+[[package]]
+name = "array-bytes"
+version = "6.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f840fb7195bcfc5e17ea40c26e5ce6d5b9ce5d584466e17703209657e459ae0"
+checksum = "5d5dde061bd34119e902bbb2d9b90c5692635cf59fb91d582c2b68043f1b8293"
 
 [[package]]
 name = "arrayref"
@@ -423,12 +541,6 @@ dependencies = [
  "nodrop",
 ]
 
-[[package]]
-name = "arrayvec"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
-
 [[package]]
 name = "arrayvec"
 version = "0.7.4"
@@ -460,7 +572,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "syn 1.0.109",
- "synstructure",
+ "synstructure 0.12.6",
 ]
 
 [[package]]
@@ -493,26 +605,25 @@ dependencies = [
 
 [[package]]
 name = "async-channel"
-version = "2.2.1"
+version = "2.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "136d4d23bcc79e27423727b36823d86233aad06dfea531837b038394d11e9928"
+checksum = "89b47800b0be77592da0afd425cc03468052844aff33b84e33cc696f64e77b6a"
 dependencies = [
  "concurrent-queue",
- "event-listener 5.3.0",
- "event-listener-strategy 0.5.1",
+ "event-listener-strategy",
  "futures-core",
  "pin-project-lite 0.2.14",
 ]
 
 [[package]]
 name = "async-executor"
-version = "1.11.0"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b10202063978b3351199d68f8b22c4e47e4b1b822f8d43fd862d5ea8c006b29a"
+checksum = "c8828ec6e544c02b0d6691d21ed9f9218d0384a82542855073c2a3f58304aaf0"
 dependencies = [
  "async-task",
  "concurrent-queue",
- "fastrand 2.0.2",
+ "fastrand 2.1.0",
  "futures-lite 2.3.0",
  "slab",
 ]
@@ -551,18 +662,18 @@ dependencies = [
 
 [[package]]
 name = "async-io"
-version = "2.3.2"
+version = "2.3.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcccb0f599cfa2f8ace422d3555572f47424da5648a4382a9dd0310ff8210884"
+checksum = "0d6baa8f0178795da0e71bc42c9e5d13261aac7ee549853162e66a241ba17964"
 dependencies = [
- "async-lock 3.3.0",
+ "async-lock 3.4.0",
  "cfg-if",
  "concurrent-queue",
  "futures-io",
  "futures-lite 2.3.0",
  "parking",
- "polling 3.6.0",
- "rustix 0.38.32",
+ "polling 3.7.1",
+ "rustix 0.38.34",
  "slab",
  "tracing",
  "windows-sys 0.52.0",
@@ -579,12 +690,12 @@ dependencies = [
 
 [[package]]
 name = "async-lock"
-version = "3.3.0"
+version = "3.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d034b430882f8381900d3fe6f0aaa3ad94f2cb4ac519b429692a1bc2dda4ae7b"
+checksum = "ff6e472cdea888a4bd64f342f09b3f50e1886d32afe8df3d663c01140b811b18"
 dependencies = [
- "event-listener 4.0.3",
- "event-listener-strategy 0.4.0",
+ "event-listener 5.3.1",
+ "event-listener-strategy",
  "pin-project-lite 0.2.14",
 ]
 
@@ -612,44 +723,33 @@ dependencies = [
  "cfg-if",
  "event-listener 3.1.0",
  "futures-lite 1.13.0",
- "rustix 0.38.32",
+ "rustix 0.38.34",
  "windows-sys 0.48.0",
 ]
 
-[[package]]
-name = "async-recursion"
-version = "1.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "30c5ef0ede93efbf733c1a727f3b6b5a1060bbedd5600183e66f6e4be4af0ec5"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.59",
-]
-
 [[package]]
 name = "async-signal"
-version = "0.2.5"
+version = "0.2.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e47d90f65a225c4527103a8d747001fc56e375203592b25ad103e1ca13124c5"
+checksum = "794f185324c2f00e771cd9f1ae8b5ac68be2ca7abb129a87afd6e86d228bc54d"
 dependencies = [
- "async-io 2.3.2",
- "async-lock 2.8.0",
+ "async-io 2.3.3",
+ "async-lock 3.4.0",
  "atomic-waker",
  "cfg-if",
  "futures-core",
  "futures-io",
- "rustix 0.38.32",
+ "rustix 0.38.34",
  "signal-hook-registry",
  "slab",
- "windows-sys 0.48.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
 name = "async-task"
-version = "4.7.0"
+version = "4.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbb36e985947064623dbd357f727af08ffd077f93d696782f3c56365fa2e2799"
+checksum = "8b75356056920673b02621b35afd0f7dda9306d03c79a30f5c56c44cf256e3de"
 
 [[package]]
 name = "async-trait"
@@ -659,7 +759,7 @@ checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.59",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -696,17 +796,6 @@ version = "1.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1505bd5d3d116872e7271a6d4e16d81d0c8570876c8de68093a09ac269d8aac0"
 
-[[package]]
-name = "atty"
-version = "0.2.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9b39be18770d11421cdb1b9947a45dd3f37e93092cbf377614828a319d5fee8"
-dependencies = [
- "hermit-abi 0.1.19",
- "libc",
- "winapi",
-]
-
 [[package]]
 name = "auto_impl"
 version = "1.2.0"
@@ -715,49 +804,50 @@ checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.59",
+ "syn 2.0.66",
 ]
 
 [[package]]
 name = "autocfg"
-version = "1.2.0"
+version = "1.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1fdabc7756949593fe60f30ec81974b613357de856987752631dea1e3394c80"
+checksum = "0c4b4d0bd25bd0b74681c0ad21497610ce1b7c91b1022cd21c80c6fbdd9476b0"
 
 [[package]]
 name = "backtrace"
-version = "0.3.71"
+version = "0.3.73"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d"
+checksum = "5cc23269a4f8976d0a4d2e7109211a419fe30e8d88d677cd60b6bc79c5732e0a"
 dependencies = [
- "addr2line 0.21.0",
+ "addr2line 0.22.0",
  "cc",
  "cfg-if",
  "libc",
  "miniz_oxide",
- "object 0.32.2",
+ "object 0.36.0",
  "rustc-demangle",
 ]
 
 [[package]]
 name = "bandersnatch_vrfs"
-version = "0.0.1"
-source = "git+https://github.com/w3f/ring-vrf?rev=3119f51#3119f51b54b69308abfb0671f6176cb125ae1bf1"
+version = "0.0.4"
+source = "git+https://github.com/w3f/ring-vrf?rev=e9782f9#e9782f938629c90f3adb3fff2358bc8d1386af3e"
 dependencies = [
  "ark-bls12-381",
  "ark-ec",
  "ark-ed-on-bls12-381-bandersnatch",
  "ark-ff",
- "ark-scale 0.0.12",
  "ark-serialize",
  "ark-std",
  "dleq_vrf",
  "fflonk",
- "merlin 3.0.0",
+ "merlin",
  "rand_chacha 0.3.1",
  "rand_core 0.6.4",
  "ring 0.1.0",
  "sha2 0.10.8",
+ "sp-ark-bls12-381",
+ "sp-ark-ed-on-bls12-381-bandersnatch",
  "zeroize",
 ]
 
@@ -785,6 +875,12 @@ version = "0.21.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9d297deb1925b89f2ccc13d7635fa0714f12c87adce1c75356b39ca9b7178567"
 
+[[package]]
+name = "base64"
+version = "0.22.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
+
 [[package]]
 name = "base64ct"
 version = "1.6.0"
@@ -802,8 +898,8 @@ dependencies = [
 
 [[package]]
 name = "binary-merkle-tree"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "13.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "hash-db",
  "log",
@@ -830,13 +926,13 @@ dependencies = [
  "lazy_static",
  "lazycell",
  "peeking_take_while",
- "prettyplease 0.2.19",
+ "prettyplease 0.2.20",
  "proc-macro2",
  "quote",
  "regex",
  "rustc-hash",
  "shlex",
- "syn 2.0.59",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -846,6 +942,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "93f2635620bf0b9d4576eb7bb9a38a55df78bd1205d26fa994b25911a69f212f"
 dependencies = [
  "bitcoin_hashes",
+ "rand",
+ "rand_core 0.6.4",
+ "serde",
+ "unicode-normalization",
 ]
 
 [[package]]
@@ -874,10 +974,23 @@ checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c"
 dependencies = [
  "funty",
  "radium",
+ "serde",
  "tap",
  "wyz",
 ]
 
+[[package]]
+name = "blake2"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94cb07b0da6a73955f8fb85d24c466778e70cda767a568229b104f0264089330"
+dependencies = [
+ "byte-tools",
+ "crypto-mac 0.7.0",
+ "digest 0.8.1",
+ "opaque-debug 0.2.3",
+]
+
 [[package]]
 name = "blake2"
 version = "0.10.6"
@@ -932,18 +1045,6 @@ dependencies = [
  "constant_time_eq 0.3.0",
 ]
 
-[[package]]
-name = "block-buffer"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b"
-dependencies = [
- "block-padding",
- "byte-tools",
- "byteorder",
- "generic-array 0.12.4",
-]
-
 [[package]]
 name = "block-buffer"
 version = "0.9.0"
@@ -962,36 +1063,24 @@ dependencies = [
  "generic-array 0.14.7",
 ]
 
-[[package]]
-name = "block-padding"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5"
-dependencies = [
- "byte-tools",
-]
-
 [[package]]
 name = "blocking"
-version = "1.5.1"
+version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a37913e8dc4ddcc604f0c6d3bf2887c995153af3611de9e23c352b44c1b9118"
+checksum = "703f41c54fc768e63e091340b424302bb1c29ef4aa0c7f10fe849dfb114d29ea"
 dependencies = [
- "async-channel 2.2.1",
- "async-lock 3.3.0",
+ "async-channel 2.3.1",
  "async-task",
- "fastrand 2.0.2",
  "futures-io",
  "futures-lite 2.3.0",
  "piper",
- "tracing",
 ]
 
 [[package]]
 name = "bounded-collections"
-version = "0.1.9"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca548b6163b872067dc5eb82fd130c56881435e30367d2073594a3d9744120dd"
+checksum = "d32385ecb91a31bddaf908e8dcf4a15aef1bcd3913cc03ebfad02ff6d568abc1"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -1008,6 +1097,17 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "bp-xcm-bridge-hub-router"
+version = "0.6.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+dependencies = [
+ "parity-scale-codec",
+ "scale-info",
+ "sp-core",
+ "sp-runtime",
+]
+
 [[package]]
 name = "bs58"
 version = "0.4.0"
@@ -1073,9 +1173,9 @@ checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"
 
 [[package]]
 name = "bytemuck"
-version = "1.15.0"
+version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5d6d68c57235a3a081186990eca2867354726650f42f7516ca50c28d6281fd15"
+checksum = "78834c15cb5d5efe3452d58b1e8ba890dd62d21907f867f383358198e56ebca5"
 
 [[package]]
 name = "byteorder"
@@ -1100,11 +1200,21 @@ dependencies = [
  "pkg-config",
 ]
 
+[[package]]
+name = "c2-chacha"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d27dae93fe7b1e0424dc57179ac396908c26b035a87234809f5c4dfd1b47dc80"
+dependencies = [
+ "cipher 0.2.5",
+ "ppv-lite86",
+]
+
 [[package]]
 name = "camino"
-version = "1.1.6"
+version = "1.1.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c59e92b5a388f549b863a7bea62612c09f24c8393560709a54558a9abdfb3b9c"
+checksum = "e0ec6b951b160caa93cc0c7b209e5a3bff7aae9062213451ac99493cd844c239"
 dependencies = [
  "serde",
 ]
@@ -1126,7 +1236,7 @@ checksum = "eee4243f1f26fc7a42710e7439c149e2b10b05472f88090acce52632f231a73a"
 dependencies = [
  "camino",
  "cargo-platform",
- "semver 1.0.22",
+ "semver 1.0.23",
  "serde",
  "serde_json",
  "thiserror",
@@ -1140,12 +1250,13 @@ checksum = "fd6c0e7b807d60291f42f33f58480c0bfafe28ed08286446f45e463728cf9c1c"
 
 [[package]]
 name = "cc"
-version = "1.0.94"
+version = "1.0.99"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17f6e324229dc011159fcc089755d1e2e216a90d43a7dea6853ca740b84f35e7"
+checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695"
 dependencies = [
  "jobserver",
  "libc",
+ "once_cell",
 ]
 
 [[package]]
@@ -1178,6 +1289,16 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
 
+[[package]]
+name = "chacha"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ddf3c081b5fba1e5615640aae998e0fbd10c24cbd897ee39ed754a77601a4862"
+dependencies = [
+ "byteorder",
+ "keystream",
+]
+
 [[package]]
 name = "chacha20"
 version = "0.9.1"
@@ -1185,7 +1306,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3613f74bd2eac03dad61bd53dbe620703d4371614fe0bc3b9f04dd36fe4e818"
 dependencies = [
  "cfg-if",
- "cipher",
+ "cipher 0.4.4",
  "cpufeatures",
 ]
 
@@ -1197,7 +1318,7 @@ checksum = "10cd79432192d1c0f4e1a0fef9527696cc039165d729fb41b3f4f4f354c2dc35"
 dependencies = [
  "aead",
  "chacha20",
- "cipher",
+ "cipher 0.4.4",
  "poly1305",
  "zeroize",
 ]
@@ -1224,11 +1345,20 @@ checksum = "b9b68e3193982cd54187d71afdb2a271ad4cf8af157858e9cb911b91321de143"
 dependencies = [
  "core2",
  "multibase",
- "multihash",
+ "multihash 0.17.0",
  "serde",
  "unsigned-varint",
 ]
 
+[[package]]
+name = "cipher"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "12f8e7987cbd042a63249497f41aed09f8e65add917ea6566effbc56578d6801"
+dependencies = [
+ "generic-array 0.14.7",
+]
+
 [[package]]
 name = "cipher"
 version = "0.4.4"
@@ -1251,9 +1381,9 @@ dependencies = [
 
 [[package]]
 name = "clang-sys"
-version = "1.7.0"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67523a3b4be3ce1989d607a828d036249522dd9c1c8de7f4dd2dae43a37369d1"
+checksum = "0b023947811758c97c59bf9d1c188fd619ad4718dcaa767947df1cadb14f39f4"
 dependencies = [
  "glob",
  "libc",
@@ -1262,9 +1392,9 @@ dependencies = [
 
 [[package]]
 name = "clap"
-version = "4.5.4"
+version = "4.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0"
+checksum = "5db83dced34638ad474f39f250d7fea9598bdd239eaced1bdf45d597da0f433f"
 dependencies = [
  "clap_builder",
  "clap_derive",
@@ -1272,33 +1402,34 @@ dependencies = [
 
 [[package]]
 name = "clap_builder"
-version = "4.5.2"
+version = "4.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4"
+checksum = "f7e204572485eb3fbf28f871612191521df159bc3e15a9f5064c66dba3a8c05f"
 dependencies = [
  "anstream",
  "anstyle",
  "clap_lex",
  "strsim",
+ "terminal_size",
 ]
 
 [[package]]
 name = "clap_derive"
-version = "4.5.4"
+version = "4.5.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64"
+checksum = "c780290ccf4fb26629baa7a1081e68ced113f1d3ec302fa5948f1c381ebf06c6"
 dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.59",
+ "syn 2.0.66",
 ]
 
 [[package]]
 name = "clap_lex"
-version = "0.7.0"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce"
+checksum = "4b82cf0babdbd58558212896d1a4272303a57bdb245c2bf1147185fb45640e70"
 
 [[package]]
 name = "coarsetime"
@@ -1323,9 +1454,9 @@ dependencies = [
 
 [[package]]
 name = "colorchoice"
-version = "1.0.0"
+version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
+checksum = "0b6a852b24ab71dffc585bcb46eaf7959d175cb865a7152e35b348d1b2960422"
 
 [[package]]
 name = "comfy-table"
@@ -1334,14 +1465,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b34115915337defe99b2aff5c2ce6771e5fbc4079f4b506301f5cf394c8452f7"
 dependencies = [
  "strum 0.26.2",
- "strum_macros 0.26.2",
+ "strum_macros 0.26.4",
  "unicode-width",
 ]
 
 [[package]]
 name = "common"
 version = "0.1.0"
-source = "git+https://github.com/w3f/ring-proof?rev=0e948f3#0e948f3c28cbacecdd3020403c4841c0eb339213"
+source = "git+https://github.com/w3f/ring-proof#b273d33f9981e2bb3375ab45faeb537f7ee35224"
 dependencies = [
  "ark-ec",
  "ark-ff",
@@ -1349,7 +1480,9 @@ dependencies = [
  "ark-serialize",
  "ark-std",
  "fflonk",
- "merlin 3.0.0",
+ "getrandom_or_panic",
+ "merlin",
+ "rand_chacha 0.3.1",
 ]
 
 [[package]]
@@ -1360,9 +1493,9 @@ checksum = "2382f75942f4b3be3690fe4f86365e9c853c1587d6ee58212cebf6e2a9ccd101"
 
 [[package]]
 name = "concurrent-queue"
-version = "2.4.0"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d16048cd947b08fa32c24458a22f5dc5e835264f689f4f5653210c69fd107363"
+checksum = "4ca0197aee26d1ae37445ee532fefce43251d24cc7c166799f4d46817f1d3973"
 dependencies = [
  "crossbeam-utils",
 ]
@@ -1401,7 +1534,7 @@ version = "0.1.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f9d839f2a20b0aee515dc581a6172f2321f96cab76c1a38a4c584a194955390e"
 dependencies = [
- "getrandom 0.2.14",
+ "getrandom 0.2.15",
  "once_cell",
  "tiny-keccak",
 ]
@@ -1418,12 +1551,24 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2"
 
+[[package]]
+name = "constcat"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd7e35aee659887cbfb97aaf227ac12cad1a9d7c71e55ff3376839ed4e282d08"
+
 [[package]]
 name = "convert_case"
 version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6245d59a3e82a7fc217c5828a6692dbc6dfb63a0c8c90495621f7b9d79704a0e"
 
+[[package]]
+name = "convert_case"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb4a24b1aaf0fd0ce8b45161144d6f42cd91677fd5940fd431183eb023b3a2b8"
+
 [[package]]
 name = "core-foundation"
 version = "0.9.4"
@@ -1481,7 +1626,7 @@ dependencies = [
 name = "crab-runtime"
 version = "6.6.3"
 dependencies = [
- "array-bytes",
+ "array-bytes 6.2.3",
  "cumulus-pallet-aura-ext",
  "cumulus-pallet-dmp-queue",
  "cumulus-pallet-parachain-system",
@@ -1501,7 +1646,7 @@ dependencies = [
  "darwinia-precompile-state-storage",
  "darwinia-staking",
  "dc-primitives",
- "fp-evm",
+ "fp-evm 3.0.0-dev (git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730)",
  "fp-rpc",
  "fp-self-contained",
  "frame-benchmarking",
@@ -1544,18 +1689,17 @@ dependencies = [
  "pallet-vesting",
  "pallet-whitelist",
  "pallet-xcm",
- "parachain-info",
  "parity-scale-codec",
  "polkadot-parachain-primitives",
  "polkadot-primitives",
  "polkadot-runtime-common",
- "precompile-utils",
+ "precompile-utils 0.1.0",
  "scale-info",
  "sp-api",
  "sp-block-builder",
  "sp-consensus-aura",
  "sp-core",
- "sp-debug-derive",
+ "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-inherents",
  "sp-io",
  "sp-keyring",
@@ -1563,9 +1707,10 @@ dependencies = [
  "sp-runtime",
  "sp-session",
  "sp-staking",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-transaction-pool",
  "sp-version",
+ "staging-parachain-info",
  "staging-xcm",
  "staging-xcm-builder",
  "staging-xcm-executor",
@@ -1690,18 +1835,18 @@ checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5"
 
 [[package]]
 name = "crc32fast"
-version = "1.4.0"
+version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b3855a8a784b474f333699ef2bbca9db2c4a1f6d9088a90a2d25b1eb53111eaa"
+checksum = "a97769d94ddab943e4510d138150169a2758b5ef3eb191a9ee688de3e23ef7b3"
 dependencies = [
  "cfg-if",
 ]
 
 [[package]]
 name = "crossbeam-channel"
-version = "0.5.12"
+version = "0.5.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ab3db02a9c5b5121e1e42fbdb1aeb65f5e02624cc58c43f2884c6ccac0b82f95"
+checksum = "33480d6946193aa8033910124896ca395333cae7e2d1113d1fef6c3272217df2"
 dependencies = [
  "crossbeam-utils",
 ]
@@ -1736,9 +1881,9 @@ dependencies = [
 
 [[package]]
 name = "crossbeam-utils"
-version = "0.8.19"
+version = "0.8.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "248e3bacc7dc6baa3b21e405ee045c3047101a49145e7e9eca583ab4c2ca5345"
+checksum = "22ec99545bb0ed0ea7bb9b8e1e9122ea386ff8a48c0922e43f36d45ab09e0e80"
 
 [[package]]
 name = "crunchy"
@@ -1754,7 +1899,7 @@ checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76"
 dependencies = [
  "generic-array 0.14.7",
  "rand_core 0.6.4",
- "subtle",
+ "subtle 2.5.0",
  "zeroize",
 ]
 
@@ -1769,6 +1914,16 @@ dependencies = [
  "typenum",
 ]
 
+[[package]]
+name = "crypto-mac"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4434400df11d95d556bac068ddfedd482915eb18fe8bea89bc80b6e4b1c179e5"
+dependencies = [
+ "generic-array 0.12.4",
+ "subtle 1.0.0",
+]
+
 [[package]]
 name = "crypto-mac"
 version = "0.8.0"
@@ -1776,17 +1931,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab"
 dependencies = [
  "generic-array 0.14.7",
- "subtle",
+ "subtle 2.5.0",
 ]
 
 [[package]]
 name = "crypto-mac"
-version = "0.11.1"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714"
+checksum = "25fab6889090c8133f3deb8f73ba3c65a7f456f66436fc012a1b1e272b1e103e"
 dependencies = [
  "generic-array 0.14.7",
- "subtle",
+ "subtle 2.5.0",
 ]
 
 [[package]]
@@ -1795,13 +1950,13 @@ version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835"
 dependencies = [
- "cipher",
+ "cipher 0.4.4",
 ]
 
 [[package]]
 name = "cumulus-client-cli"
-version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "0.7.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "clap",
  "parity-scale-codec",
@@ -1809,6 +1964,7 @@ dependencies = [
  "sc-cli",
  "sc-client-api",
  "sc-service",
+ "sp-blockchain",
  "sp-core",
  "sp-runtime",
  "url",
@@ -1816,15 +1972,15 @@ dependencies = [
 
 [[package]]
 name = "cumulus-client-collator"
-version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "0.7.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "cumulus-client-consensus-common",
  "cumulus-client-network",
  "cumulus-primitives-core",
  "futures 0.3.30",
  "parity-scale-codec",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "polkadot-node-primitives",
  "polkadot-node-subsystem",
  "polkadot-overseer",
@@ -1839,16 +1995,16 @@ dependencies = [
 
 [[package]]
 name = "cumulus-client-consensus-aura"
-version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "0.7.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "async-trait",
  "cumulus-client-collator",
  "cumulus-client-consensus-common",
  "cumulus-client-consensus-proposer",
+ "cumulus-client-parachain-inherent",
  "cumulus-primitives-aura",
  "cumulus-primitives-core",
- "cumulus-primitives-parachain-inherent",
  "cumulus-relay-chain-interface",
  "futures 0.3.30",
  "parity-scale-codec",
@@ -1881,8 +2037,8 @@ dependencies = [
 
 [[package]]
 name = "cumulus-client-consensus-common"
-version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "0.7.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "async-trait",
  "cumulus-client-pov-recovery",
@@ -1910,8 +2066,8 @@ dependencies = [
 
 [[package]]
 name = "cumulus-client-consensus-proposer"
-version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "0.7.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -1925,15 +2081,15 @@ dependencies = [
 
 [[package]]
 name = "cumulus-client-network"
-version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "0.7.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "async-trait",
  "cumulus-relay-chain-interface",
  "futures 0.3.30",
  "futures-timer",
  "parity-scale-codec",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "polkadot-node-primitives",
  "polkadot-parachain-primitives",
  "polkadot-primitives",
@@ -1947,9 +2103,33 @@ dependencies = [
 ]
 
 [[package]]
-name = "cumulus-client-pov-recovery"
+name = "cumulus-client-parachain-inherent"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+dependencies = [
+ "async-trait",
+ "cumulus-primitives-core",
+ "cumulus-primitives-parachain-inherent",
+ "cumulus-relay-chain-interface",
+ "cumulus-test-relay-sproof-builder",
+ "parity-scale-codec",
+ "sc-client-api",
+ "scale-info",
+ "sp-api",
+ "sp-crypto-hashing",
+ "sp-inherents",
+ "sp-runtime",
+ "sp-state-machine",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-trie",
+ "tracing",
+]
+
+[[package]]
+name = "cumulus-client-pov-recovery"
+version = "0.7.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "async-trait",
  "cumulus-primitives-core",
@@ -1961,7 +2141,7 @@ dependencies = [
  "polkadot-node-subsystem",
  "polkadot-overseer",
  "polkadot-primitives",
- "rand 0.8.5",
+ "rand",
  "sc-client-api",
  "sc-consensus",
  "sp-consensus",
@@ -1972,8 +2152,8 @@ dependencies = [
 
 [[package]]
 name = "cumulus-client-service"
-version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "0.7.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "cumulus-client-cli",
  "cumulus-client-collator",
@@ -1981,6 +2161,7 @@ dependencies = [
  "cumulus-client-network",
  "cumulus-client-pov-recovery",
  "cumulus-primitives-core",
+ "cumulus-primitives-proof-size-hostfunction",
  "cumulus-relay-chain-inprocess-interface",
  "cumulus-relay-chain-interface",
  "cumulus-relay-chain-minimal-node",
@@ -2007,8 +2188,8 @@ dependencies = [
 
 [[package]]
 name = "cumulus-pallet-aura-ext"
-version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "0.7.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "cumulus-pallet-parachain-system",
  "frame-support",
@@ -2020,15 +2201,16 @@ dependencies = [
  "sp-application-crypto",
  "sp-consensus-aura",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "cumulus-pallet-dmp-queue"
-version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "0.7.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "cumulus-primitives-core",
+ "frame-benchmarking",
  "frame-support",
  "frame-system",
  "log",
@@ -2036,34 +2218,38 @@ dependencies = [
  "scale-info",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "staging-xcm",
 ]
 
 [[package]]
 name = "cumulus-pallet-parachain-system"
-version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "0.7.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "bytes",
  "cumulus-pallet-parachain-system-proc-macro",
  "cumulus-primitives-core",
  "cumulus-primitives-parachain-inherent",
+ "cumulus-primitives-proof-size-hostfunction",
  "environmental",
+ "frame-benchmarking",
  "frame-support",
  "frame-system",
  "impl-trait-for-tuples",
  "log",
+ "pallet-message-queue",
  "parity-scale-codec",
  "polkadot-parachain-primitives",
+ "polkadot-runtime-parachains",
  "scale-info",
  "sp-core",
- "sp-externalities",
+ "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-inherents",
  "sp-io",
  "sp-runtime",
  "sp-state-machine",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-trie",
  "sp-version",
  "staging-xcm",
@@ -2072,19 +2258,19 @@ dependencies = [
 
 [[package]]
 name = "cumulus-pallet-parachain-system-proc-macro"
-version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "0.6.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
- "proc-macro-crate 1.3.1",
+ "proc-macro-crate 3.1.0",
  "proc-macro2",
  "quote",
- "syn 2.0.59",
+ "syn 2.0.66",
 ]
 
 [[package]]
 name = "cumulus-pallet-session-benchmarking"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "9.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -2092,13 +2278,13 @@ dependencies = [
  "pallet-session",
  "parity-scale-codec",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "cumulus-pallet-xcm"
-version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "0.7.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "cumulus-primitives-core",
  "frame-support",
@@ -2107,35 +2293,39 @@ dependencies = [
  "scale-info",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "staging-xcm",
 ]
 
 [[package]]
 name = "cumulus-pallet-xcmp-queue"
-version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "0.7.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
+ "bounded-collections",
+ "bp-xcm-bridge-hub-router",
  "cumulus-primitives-core",
  "frame-benchmarking",
  "frame-support",
  "frame-system",
  "log",
+ "pallet-message-queue",
  "parity-scale-codec",
  "polkadot-runtime-common",
- "rand_chacha 0.3.1",
+ "polkadot-runtime-parachains",
  "scale-info",
+ "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "staging-xcm",
  "staging-xcm-executor",
 ]
 
 [[package]]
 name = "cumulus-primitives-aura"
-version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "0.7.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "parity-scale-codec",
  "polkadot-core-primitives",
@@ -2143,13 +2333,13 @@ dependencies = [
  "sp-api",
  "sp-consensus-aura",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "cumulus-primitives-core"
-version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "0.7.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "parity-scale-codec",
  "polkadot-core-primitives",
@@ -2158,47 +2348,52 @@ dependencies = [
  "scale-info",
  "sp-api",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-trie",
  "staging-xcm",
 ]
 
 [[package]]
 name = "cumulus-primitives-parachain-inherent"
-version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "0.7.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "async-trait",
  "cumulus-primitives-core",
- "cumulus-relay-chain-interface",
- "cumulus-test-relay-sproof-builder",
  "parity-scale-codec",
- "sc-client-api",
  "scale-info",
- "sp-api",
  "sp-core",
  "sp-inherents",
- "sp-runtime",
- "sp-state-machine",
- "sp-std",
- "sp-storage",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-trie",
+]
+
+[[package]]
+name = "cumulus-primitives-proof-size-hostfunction"
+version = "0.2.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+dependencies = [
+ "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-trie",
- "tracing",
 ]
 
 [[package]]
 name = "cumulus-primitives-utility"
-version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "0.7.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "cumulus-primitives-core",
  "frame-support",
  "log",
+ "pallet-asset-conversion",
+ "pallet-xcm-benchmarks",
  "parity-scale-codec",
  "polkadot-runtime-common",
+ "polkadot-runtime-parachains",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "staging-xcm",
  "staging-xcm-builder",
  "staging-xcm-executor",
@@ -2206,8 +2401,8 @@ dependencies = [
 
 [[package]]
 name = "cumulus-relay-chain-inprocess-interface"
-version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "0.7.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "async-trait",
  "cumulus-primitives-core",
@@ -2230,13 +2425,13 @@ dependencies = [
 
 [[package]]
 name = "cumulus-relay-chain-interface"
-version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "0.7.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "async-trait",
  "cumulus-primitives-core",
  "futures 0.3.30",
- "jsonrpsee-core",
+ "jsonrpsee-core 0.20.3",
  "parity-scale-codec",
  "polkadot-overseer",
  "sc-client-api",
@@ -2248,43 +2443,49 @@ dependencies = [
 
 [[package]]
 name = "cumulus-relay-chain-minimal-node"
-version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "0.7.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
- "array-bytes",
+ "array-bytes 6.2.3",
  "async-trait",
  "cumulus-primitives-core",
  "cumulus-relay-chain-interface",
  "cumulus-relay-chain-rpc-interface",
  "futures 0.3.30",
+ "parking_lot 0.12.3",
  "polkadot-availability-recovery",
  "polkadot-collator-protocol",
  "polkadot-core-primitives",
  "polkadot-network-bridge",
  "polkadot-node-collation-generation",
+ "polkadot-node-core-chain-api",
+ "polkadot-node-core-prospective-parachains",
  "polkadot-node-core-runtime-api",
  "polkadot-node-network-protocol",
  "polkadot-node-subsystem-util",
  "polkadot-overseer",
  "polkadot-primitives",
  "sc-authority-discovery",
+ "sc-client-api",
  "sc-network",
  "sc-network-common",
  "sc-service",
  "sc-tracing",
  "sc-utils",
- "schnellru",
  "sp-api",
+ "sp-blockchain",
  "sp-consensus",
  "sp-consensus-babe",
  "sp-runtime",
+ "substrate-prometheus-endpoint",
+ "tokio",
  "tracing",
 ]
 
 [[package]]
 name = "cumulus-relay-chain-rpc-interface"
-version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "0.7.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "async-trait",
  "cumulus-primitives-core",
@@ -2292,11 +2493,11 @@ dependencies = [
  "either",
  "futures 0.3.30",
  "futures-timer",
- "jsonrpsee",
+ "jsonrpsee 0.20.3",
  "parity-scale-codec",
  "pin-project",
  "polkadot-overseer",
- "rand 0.8.5",
+ "rand",
  "sc-client-api",
  "sc-rpc-api",
  "sc-service",
@@ -2311,7 +2512,8 @@ dependencies = [
  "sp-core",
  "sp-runtime",
  "sp-state-machine",
- "sp-storage",
+ "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-version",
  "thiserror",
  "tokio",
  "tokio-util",
@@ -2321,31 +2523,18 @@ dependencies = [
 
 [[package]]
 name = "cumulus-test-relay-sproof-builder"
-version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "0.7.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "cumulus-primitives-core",
  "parity-scale-codec",
  "polkadot-primitives",
  "sp-runtime",
  "sp-state-machine",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-trie",
 ]
 
-[[package]]
-name = "curve25519-dalek"
-version = "2.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a9b85542f99a2dfa2a1b8e192662741c9859a846b296bef1c92ef9b58b5a216"
-dependencies = [
- "byteorder",
- "digest 0.8.1",
- "rand_core 0.5.1",
- "subtle",
- "zeroize",
-]
-
 [[package]]
 name = "curve25519-dalek"
 version = "3.2.0"
@@ -2355,7 +2544,7 @@ dependencies = [
  "byteorder",
  "digest 0.9.0",
  "rand_core 0.5.1",
- "subtle",
+ "subtle 2.5.0",
  "zeroize",
 ]
 
@@ -2372,7 +2561,7 @@ dependencies = [
  "fiat-crypto",
  "platforms",
  "rustc_version",
- "subtle",
+ "subtle 2.5.0",
  "zeroize",
 ]
 
@@ -2384,7 +2573,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.59",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -2402,9 +2591,9 @@ dependencies = [
 
 [[package]]
 name = "cxx"
-version = "1.0.121"
+version = "1.0.123"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "21db378d04296a84d8b7d047c36bb3954f0b46529db725d7e62fb02f9ba53ccc"
+checksum = "8194f089b6da4751d6c1da1ef37c17255df51f9346cdb160f8b096562ae4a85c"
 dependencies = [
  "cc",
  "cxxbridge-flags",
@@ -2414,9 +2603,9 @@ dependencies = [
 
 [[package]]
 name = "cxx-build"
-version = "1.0.121"
+version = "1.0.123"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e5262a7fa3f0bae2a55b767c223ba98032d7c328f5c13fa5cdc980b77fc0658"
+checksum = "1e8df9a089caae66634d754672d5f909395f30f38af6ff19366980d8a8b57501"
 dependencies = [
  "cc",
  "codespan-reporting",
@@ -2424,31 +2613,31 @@ dependencies = [
  "proc-macro2",
  "quote",
  "scratch",
- "syn 2.0.59",
+ "syn 2.0.66",
 ]
 
 [[package]]
 name = "cxxbridge-flags"
-version = "1.0.121"
+version = "1.0.123"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be8dcadd2e2fb4a501e1d9e93d6e88e6ea494306d8272069c92d5a9edf8855c0"
+checksum = "25290be4751803672a70b98c68b51c1e7d0a640ab5a4377f240f9d2e70054cd1"
 
 [[package]]
 name = "cxxbridge-macro"
-version = "1.0.121"
+version = "1.0.123"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ad08a837629ad949b73d032c637653d069e909cffe4ee7870b02301939ce39cc"
+checksum = "b8cb317cb13604b4752416783bb25070381c36e844743e4146b7f8e55de7d140"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.59",
+ "syn 2.0.66",
 ]
 
 [[package]]
 name = "darwinia"
 version = "6.6.3"
 dependencies = [
- "array-bytes",
+ "array-bytes 6.2.3",
  "async-trait",
  "clap",
  "crab-runtime",
@@ -2469,12 +2658,12 @@ dependencies = [
  "fc-rpc",
  "fc-rpc-core",
  "fc-storage",
- "fp-evm",
+ "fp-evm 3.0.0-dev (git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730)",
  "fp-rpc",
  "frame-benchmarking",
  "frame-benchmarking-cli",
  "futures 0.3.30",
- "jsonrpsee",
+ "jsonrpsee 0.16.3",
  "koi-runtime",
  "log",
  "moonbeam-primitives-ext",
@@ -2526,7 +2715,7 @@ dependencies = [
 name = "darwinia-account-migration"
 version = "6.6.3"
 dependencies = [
- "array-bytes",
+ "array-bytes 6.2.3",
  "darwinia-deposit",
  "darwinia-staking",
  "dc-primitives",
@@ -2543,7 +2732,7 @@ dependencies = [
  "sp-io",
  "sp-keyring",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-version",
 ]
 
@@ -2579,7 +2768,7 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "staging-xcm",
  "staging-xcm-builder",
  "staging-xcm-executor",
@@ -2603,17 +2792,17 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "darwinia-ethtx-forwarder"
 version = "6.6.3"
 dependencies = [
- "array-bytes",
+ "array-bytes 6.2.3",
  "ethereum",
  "fp-ethereum",
- "fp-evm",
+ "fp-evm 3.0.0-dev (git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730)",
  "fp-self-contained",
  "frame-support",
  "frame-system",
@@ -2628,14 +2817,14 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "darwinia-precompile-assets"
 version = "6.6.3"
 dependencies = [
- "fp-evm",
+ "fp-evm 3.0.0-dev (git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730)",
  "frame-support",
  "frame-system",
  "pallet-assets",
@@ -2643,13 +2832,13 @@ dependencies = [
  "pallet-evm",
  "pallet-timestamp",
  "parity-scale-codec",
- "precompile-utils",
+ "precompile-utils 0.1.0",
  "scale-info",
  "sha3",
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
@@ -2661,13 +2850,13 @@ dependencies = [
  "ark-ff",
  "ark-serialize",
  "ark-std",
- "fp-evm",
+ "fp-evm 3.0.0-dev (git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730)",
  "frame-support",
  "pallet-evm",
- "precompile-utils",
- "rand 0.8.5",
+ "precompile-utils 0.1.0",
+ "rand",
  "sha2 0.10.8",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
@@ -2675,19 +2864,19 @@ name = "darwinia-precompile-deposit"
 version = "6.6.3"
 dependencies = [
  "darwinia-deposit",
- "fp-evm",
+ "fp-evm 3.0.0-dev (git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730)",
  "frame-support",
  "frame-system",
  "pallet-balances",
  "pallet-evm",
  "pallet-timestamp",
  "parity-scale-codec",
- "precompile-utils",
+ "precompile-utils 0.1.0",
  "scale-info",
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
@@ -2696,45 +2885,45 @@ version = "6.6.3"
 dependencies = [
  "darwinia-deposit",
  "darwinia-staking",
- "fp-evm",
+ "fp-evm 3.0.0-dev (git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730)",
  "frame-support",
  "frame-system",
  "pallet-balances",
  "pallet-evm",
  "pallet-timestamp",
  "parity-scale-codec",
- "precompile-utils",
+ "precompile-utils 0.1.0",
  "scale-info",
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "darwinia-precompile-state-storage"
 version = "6.6.3"
 dependencies = [
- "fp-evm",
+ "fp-evm 3.0.0-dev (git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730)",
  "frame-support",
  "frame-system",
  "pallet-balances",
  "pallet-evm",
  "pallet-timestamp",
  "parity-scale-codec",
- "precompile-utils",
+ "precompile-utils 0.1.0",
  "scale-info",
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "darwinia-runtime"
 version = "6.6.3"
 dependencies = [
- "array-bytes",
+ "array-bytes 6.2.3",
  "cumulus-pallet-aura-ext",
  "cumulus-pallet-dmp-queue",
  "cumulus-pallet-parachain-system",
@@ -2756,7 +2945,7 @@ dependencies = [
  "darwinia-staking",
  "dc-inflation",
  "dc-primitives",
- "fp-evm",
+ "fp-evm 3.0.0-dev (git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730)",
  "fp-rpc",
  "fp-self-contained",
  "frame-benchmarking",
@@ -2802,18 +2991,17 @@ dependencies = [
  "pallet-vesting",
  "pallet-whitelist",
  "pallet-xcm",
- "parachain-info",
  "parity-scale-codec",
  "polkadot-parachain-primitives",
  "polkadot-primitives",
  "polkadot-runtime-common",
- "precompile-utils",
+ "precompile-utils 0.1.0",
  "scale-info",
  "sp-api",
  "sp-block-builder",
  "sp-consensus-aura",
  "sp-core",
- "sp-debug-derive",
+ "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-inherents",
  "sp-io",
  "sp-keyring",
@@ -2821,9 +3009,10 @@ dependencies = [
  "sp-runtime",
  "sp-session",
  "sp-staking",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-transaction-pool",
  "sp-version",
+ "staging-parachain-info",
  "staging-xcm",
  "staging-xcm-builder",
  "staging-xcm-executor",
@@ -2859,7 +3048,7 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "substrate-test-utils",
 ]
 
@@ -2874,15 +3063,15 @@ dependencies = [
 
 [[package]]
 name = "data-encoding"
-version = "2.5.0"
+version = "2.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e962a19be5cfc3f3bf6dd8f61eb50107f356ad6270fbb3ed41476571db78be5"
+checksum = "e8566979429cf69b49a5c740c60791108e86440e8be149bbea4fe54d2c32d6e2"
 
 [[package]]
 name = "data-encoding-macro"
-version = "0.1.14"
+version = "0.1.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "20c01c06f5f429efdf2bae21eb67c28b3df3cf85b7dd2d8ef09c0838dac5d33e"
+checksum = "f1559b6cba622276d6d63706db152618eeb15b89b3e4041446b05876e352e639"
 dependencies = [
  "data-encoding",
  "data-encoding-macro-internal",
@@ -2890,9 +3079,9 @@ dependencies = [
 
 [[package]]
 name = "data-encoding-macro-internal"
-version = "0.1.12"
+version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0047d07f2c89b17dd631c80450d69841a6b5d7fb17278cbc43d7e4cfcf2576f3"
+checksum = "332d754c0af53bc87c108fed664d121ecf59207ec4196041f04d6ab9002ad33f"
 dependencies = [
  "data-encoding",
  "syn 1.0.109",
@@ -2985,7 +3174,7 @@ checksum = "d65d7ce8132b7c0e54497a4d9a55a1c2a0912a0d786cf894472ba818fba45762"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.59",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -2994,7 +3183,7 @@ version = "0.99.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321"
 dependencies = [
- "convert_case",
+ "convert_case 0.4.0",
  "proc-macro2",
  "quote",
  "rustc_version",
@@ -3034,14 +3223,14 @@ dependencies = [
  "block-buffer 0.10.4",
  "const-oid",
  "crypto-common",
- "subtle",
+ "subtle 2.5.0",
 ]
 
 [[package]]
 name = "directories"
-version = "4.0.1"
+version = "5.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f51c5d4ddabd36886dd3e1438cb358cdcb0d7c499cb99cb4ac2e38e18b5cb210"
+checksum = "9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35"
 dependencies = [
  "dirs-sys",
 ]
@@ -3058,13 +3247,14 @@ dependencies = [
 
 [[package]]
 name = "dirs-sys"
-version = "0.3.7"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6"
+checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
 dependencies = [
  "libc",
+ "option-ext",
  "redox_users",
- "winapi",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -3086,23 +3276,22 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.59",
+ "syn 2.0.66",
 ]
 
 [[package]]
 name = "dleq_vrf"
 version = "0.0.2"
-source = "git+https://github.com/w3f/ring-vrf?rev=3119f51#3119f51b54b69308abfb0671f6176cb125ae1bf1"
+source = "git+https://github.com/w3f/ring-vrf?rev=e9782f9#e9782f938629c90f3adb3fff2358bc8d1386af3e"
 dependencies = [
  "ark-ec",
  "ark-ff",
- "ark-scale 0.0.10",
+ "ark-scale",
  "ark-secret-scalar",
  "ark-serialize",
  "ark-std",
  "ark-transcript",
  "arrayvec 0.7.4",
- "rand_core 0.6.4",
  "zeroize",
 ]
 
@@ -3127,9 +3316,9 @@ dependencies = [
  "proc-macro2",
  "quote",
  "regex",
- "syn 2.0.59",
+ "syn 2.0.66",
  "termcolor",
- "toml 0.8.2",
+ "toml 0.8.14",
  "walkdir",
 ]
 
@@ -3219,7 +3408,7 @@ dependencies = [
  "rand_core 0.6.4",
  "serde",
  "sha2 0.10.8",
- "subtle",
+ "subtle 2.5.0",
  "zeroize",
 ]
 
@@ -3245,7 +3434,7 @@ checksum = "7d9ce6874da5d4415896cd45ffbc4d1cfc0c4f9c079427bd870742c30f2f65a9"
 dependencies = [
  "curve25519-dalek 4.1.2",
  "ed25519",
- "hashbrown 0.14.3",
+ "hashbrown 0.14.5",
  "hex",
  "rand_core 0.6.4",
  "sha2 0.10.8",
@@ -3254,9 +3443,9 @@ dependencies = [
 
 [[package]]
 name = "either"
-version = "1.11.0"
+version = "1.12.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a47c1c47d2f5964e29c61246e81db715514cd532db6b5116a25ea3c03d6780a2"
+checksum = "3dca9240753cf90908d7e4aac30f630662b02aebaa1b58a3cadabdb23385b58b"
 dependencies = [
  "serde",
 ]
@@ -3276,7 +3465,7 @@ dependencies = [
  "pkcs8",
  "rand_core 0.6.4",
  "sec1",
- "subtle",
+ "subtle 2.5.0",
  "zeroize",
 ]
 
@@ -3309,22 +3498,22 @@ dependencies = [
 
 [[package]]
 name = "enumflags2"
-version = "0.7.9"
+version = "0.7.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3278c9d5fb675e0a51dabcf4c0d355f692b064171535ba72361be1528a9d8e8d"
+checksum = "d232db7f5956f3f14313dc2f87985c58bd2c695ce124c8cdd984e08e15ac133d"
 dependencies = [
  "enumflags2_derive",
 ]
 
 [[package]]
 name = "enumflags2_derive"
-version = "0.7.9"
+version = "0.7.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c785274071b1b420972453b306eeca06acf4633829db4223b58a2a8c5953bc4"
+checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.59",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -3335,20 +3524,7 @@ checksum = "6fd000fd6988e73bbe993ea3db9b1aa64906ab88766d654973924340c8cddb42"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.59",
-]
-
-[[package]]
-name = "env_logger"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7"
-dependencies = [
- "atty",
- "humantime",
- "log",
- "regex",
- "termcolor",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -3378,9 +3554,9 @@ checksum = "5443807d6dff69373d433ab9ef5378ad8df50ca6298caf15de6e52e24aaf54d5"
 
 [[package]]
 name = "errno"
-version = "0.3.8"
+version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a258e46cdc063eb8519c00b9fc845fc47bcfca4130e2f08e88665ceda8474245"
+checksum = "534c5cf6194dfab3db3242765c03bbe257cf92f22b38f6bc0c58d59108a820ba"
 dependencies = [
  "libc",
  "windows-sys 0.52.0",
@@ -3468,20 +3644,9 @@ dependencies = [
 
 [[package]]
 name = "event-listener"
-version = "4.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e"
-dependencies = [
- "concurrent-queue",
- "parking",
- "pin-project-lite 0.2.14",
-]
-
-[[package]]
-name = "event-listener"
-version = "5.3.0"
+version = "5.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6d9944b8ca13534cdfb2800775f8dd4902ff3fc75a50101466decadfdf322a24"
+checksum = "6032be9bd27023a771701cc49f9f053c751055f71efb2e0ae5c15809093675ba"
 dependencies = [
  "concurrent-queue",
  "parking",
@@ -3490,21 +3655,11 @@ dependencies = [
 
 [[package]]
 name = "event-listener-strategy"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "958e4d70b6d5e81971bebec42271ec641e7ff4e170a6fa605f2b8a8b65cb97d3"
-dependencies = [
- "event-listener 4.0.3",
- "pin-project-lite 0.2.14",
-]
-
-[[package]]
-name = "event-listener-strategy"
-version = "0.5.1"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "332f51cb23d20b0de8458b86580878211da09bcd4503cb579c225b3d124cabb3"
+checksum = "0f214dc438f977e6d4e3500aaa277f5ad94ca83fbbd9b1a15713ce2344ccc5a1"
 dependencies = [
- "event-listener 5.3.0",
+ "event-listener 5.3.1",
  "pin-project-lite 0.2.14",
 ]
 
@@ -3569,7 +3724,7 @@ dependencies = [
 [[package]]
 name = "evm-tracing-events"
 version = "0.1.0"
-source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.1.0#078eff3e62d8a69e0ff744525f4d4b049630d3cd"
+source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.7.2#0950345857f05a6997b5edcc2b6f7340cb7f0d5c"
 dependencies = [
  "environmental",
  "ethereum",
@@ -3578,7 +3733,7 @@ dependencies = [
  "evm-gasometer",
  "evm-runtime",
  "parity-scale-codec",
- "sp-runtime-interface",
+ "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
@@ -3604,36 +3759,17 @@ dependencies = [
 
 [[package]]
 name = "expander"
-version = "0.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3774182a5df13c3d1690311ad32fbe913feef26baba609fa2dd5f72042bd2ab6"
-dependencies = [
- "blake2",
- "fs-err",
- "proc-macro2",
- "quote",
-]
-
-[[package]]
-name = "expander"
-version = "2.1.0"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "00e83c02035136f1592a47964ea60c05a50e4ed8b5892cfac197063850898d4d"
+checksum = "5f86a749cf851891866c10515ef6c299b5c69661465e9c3bbe7e07a2b77fb0f7"
 dependencies = [
- "blake2",
+ "blake2 0.10.6",
  "fs-err",
- "prettier-please",
  "proc-macro2",
  "quote",
- "syn 2.0.59",
+ "syn 2.0.66",
 ]
 
-[[package]]
-name = "fake-simd"
-version = "0.1.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed"
-
 [[package]]
 name = "fallible-iterator"
 version = "0.2.0"
@@ -3651,9 +3787,9 @@ dependencies = [
 
 [[package]]
 name = "fastrand"
-version = "2.0.2"
+version = "2.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "658bd65b1cf4c852a3cc96f18a8ce7b5640f6b703f905c7d74532294c2a63984"
+checksum = "9fc0510504f03c51ada170672ac806f1f105a88aa97a5281117e1ddc3368e51a"
 
 [[package]]
 name = "fatality"
@@ -3673,7 +3809,7 @@ checksum = "f5aa1e3ae159e592ad222dc90c5acbad632b527779ba88486abe92782ab268bd"
 dependencies = [
  "expander 0.0.4",
  "indexmap 1.9.3",
- "proc-macro-crate 1.3.1",
+ "proc-macro-crate 1.1.3",
  "proc-macro2",
  "quote",
  "syn 1.0.109",
@@ -3683,7 +3819,7 @@ dependencies = [
 [[package]]
 name = "fc-api"
 version = "1.0.0-dev"
-source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.1.0-patch#a562b6654f759d3550b27c7a89e396b14638d5e2"
+source = "git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730#f017a18123eb0802ca1c68c0f707f63aacbbb730"
 dependencies = [
  "async-trait",
  "fp-storage",
@@ -3695,7 +3831,7 @@ dependencies = [
 [[package]]
 name = "fc-consensus"
 version = "2.0.0-dev"
-source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.1.0-patch#a562b6654f759d3550b27c7a89e396b14638d5e2"
+source = "git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730#f017a18123eb0802ca1c68c0f707f63aacbbb730"
 dependencies = [
  "async-trait",
  "fp-consensus",
@@ -3711,7 +3847,7 @@ dependencies = [
 [[package]]
 name = "fc-db"
 version = "2.0.0-dev"
-source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.1.0-patch#a562b6654f759d3550b27c7a89e396b14638d5e2"
+source = "git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730#f017a18123eb0802ca1c68c0f707f63aacbbb730"
 dependencies = [
  "async-trait",
  "ethereum",
@@ -3725,7 +3861,7 @@ dependencies = [
  "log",
  "parity-db",
  "parity-scale-codec",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "sc-client-api",
  "sc-client-db",
  "smallvec",
@@ -3734,7 +3870,7 @@ dependencies = [
  "sp-core",
  "sp-database",
  "sp-runtime",
- "sp-storage",
+ "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sqlx",
  "tokio",
 ]
@@ -3742,7 +3878,7 @@ dependencies = [
 [[package]]
 name = "fc-mapping-sync"
 version = "2.0.0-dev"
-source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.1.0-patch#a562b6654f759d3550b27c7a89e396b14638d5e2"
+source = "git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730#f017a18123eb0802ca1c68c0f707f63aacbbb730"
 dependencies = [
  "fc-db",
  "fc-storage",
@@ -3751,7 +3887,7 @@ dependencies = [
  "futures 0.3.30",
  "futures-timer",
  "log",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "sc-client-api",
  "sc-utils",
  "sp-api",
@@ -3765,7 +3901,7 @@ dependencies = [
 [[package]]
 name = "fc-rpc"
 version = "2.0.0-dev"
-source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.1.0-patch#a562b6654f759d3550b27c7a89e396b14638d5e2"
+source = "git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730#f017a18123eb0802ca1c68c0f707f63aacbbb730"
 dependencies = [
  "ethereum",
  "ethereum-types",
@@ -3774,18 +3910,18 @@ dependencies = [
  "fc-mapping-sync",
  "fc-rpc-core",
  "fc-storage",
- "fp-evm",
+ "fp-evm 3.0.0-dev (git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730)",
  "fp-rpc",
  "fp-storage",
  "futures 0.3.30",
  "hex",
- "jsonrpsee",
+ "jsonrpsee 0.20.3",
  "libsecp256k1",
  "log",
  "pallet-evm",
  "parity-scale-codec",
  "prometheus",
- "rand 0.8.5",
+ "rand",
  "rlp",
  "sc-client-api",
  "sc-consensus-aura",
@@ -3805,11 +3941,12 @@ dependencies = [
  "sp-consensus",
  "sp-consensus-aura",
  "sp-core",
+ "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-inherents",
  "sp-io",
  "sp-runtime",
  "sp-state-machine",
- "sp-storage",
+ "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-timestamp",
  "substrate-prometheus-endpoint",
  "thiserror",
@@ -3819,20 +3956,22 @@ dependencies = [
 [[package]]
 name = "fc-rpc-core"
 version = "1.1.0-dev"
-source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.1.0-patch#a562b6654f759d3550b27c7a89e396b14638d5e2"
+source = "git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730#f017a18123eb0802ca1c68c0f707f63aacbbb730"
 dependencies = [
  "ethereum",
  "ethereum-types",
- "jsonrpsee",
+ "jsonrpsee 0.20.3",
+ "rlp",
  "rustc-hex",
  "serde",
  "serde_json",
+ "sp-core-hashing",
 ]
 
 [[package]]
 name = "fc-storage"
 version = "1.0.0-dev"
-source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.1.0-patch#a562b6654f759d3550b27c7a89e396b14638d5e2"
+source = "git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730#f017a18123eb0802ca1c68c0f707f63aacbbb730"
 dependencies = [
  "ethereum",
  "ethereum-types",
@@ -3844,16 +3983,17 @@ dependencies = [
  "sp-blockchain",
  "sp-io",
  "sp-runtime",
- "sp-storage",
+ "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "fdlimit"
-version = "0.2.1"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c4c9e43643f5a3be4ca5b67d26b98031ff9db6806c3440ae32e02e3ceac3f1b"
+checksum = "e182f7dbc2ef73d9ef67351c5fbbea084729c48362d3ce9dd44c28e32e277fe5"
 dependencies = [
  "libc",
+ "thiserror",
 ]
 
 [[package]]
@@ -3863,7 +4003,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449"
 dependencies = [
  "rand_core 0.6.4",
- "subtle",
+ "subtle 2.5.0",
 ]
 
 [[package]]
@@ -3876,14 +4016,14 @@ dependencies = [
  "ark-poly",
  "ark-serialize",
  "ark-std",
- "merlin 3.0.0",
+ "merlin",
 ]
 
 [[package]]
 name = "fiat-crypto"
-version = "0.2.7"
+version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c007b1ae3abe1cb6f85a16305acd418b7ca6343b953633fee2b76d8f108b830f"
+checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d"
 
 [[package]]
 name = "file-per-thread-logger"
@@ -3891,7 +4031,7 @@ version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "84f2e425d9790201ba4af4630191feac6dcc98765b118d4d18e91d23c2353866"
 dependencies = [
- "env_logger 0.10.2",
+ "env_logger",
  "log",
 ]
 
@@ -3919,7 +4059,7 @@ dependencies = [
  "log",
  "num-traits",
  "parity-scale-codec",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "scale-info",
 ]
 
@@ -3930,7 +4070,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "835c052cb0c08c1acf6ffd71c022172e18723949c8282f2b9f27efbc51e64534"
 dependencies = [
  "byteorder",
- "rand 0.8.5",
+ "rand",
  "rustc-hex",
  "static_assertions",
 ]
@@ -3943,9 +4083,9 @@ checksum = "0ce7134b9999ecaf8bcd65542e436736ef32ddca1b3e06094cb6ec5755203b80"
 
 [[package]]
 name = "flate2"
-version = "1.0.28"
+version = "1.0.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "46303f565772937ffe1d394a4fac6f411c6013172fadde9dcdb1e147a086940e"
+checksum = "5f54427cfd1c7829e2a139fcefea601bf088ebca651d2bf53ebc600eac295dae"
 dependencies = [
  "crc32fast",
  "libz-sys",
@@ -3995,8 +4135,8 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
 
 [[package]]
 name = "fork-tree"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "12.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "parity-scale-codec",
 ]
@@ -4013,7 +4153,7 @@ dependencies = [
 [[package]]
 name = "fp-account"
 version = "1.0.0-dev"
-source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.1.0-patch#a562b6654f759d3550b27c7a89e396b14638d5e2"
+source = "git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730#f017a18123eb0802ca1c68c0f707f63aacbbb730"
 dependencies = [
  "hex",
  "impl-serde",
@@ -4025,39 +4165,55 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-runtime-interface",
- "sp-std",
+ "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "fp-consensus"
 version = "2.0.0-dev"
-source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.1.0-patch#a562b6654f759d3550b27c7a89e396b14638d5e2"
+source = "git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730#f017a18123eb0802ca1c68c0f707f63aacbbb730"
 dependencies = [
  "ethereum",
  "parity-scale-codec",
  "sp-core",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "fp-ethereum"
 version = "1.0.0-dev"
-source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.1.0-patch#a562b6654f759d3550b27c7a89e396b14638d5e2"
+source = "git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730#f017a18123eb0802ca1c68c0f707f63aacbbb730"
 dependencies = [
  "ethereum",
  "ethereum-types",
- "fp-evm",
+ "fp-evm 3.0.0-dev (git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730)",
+ "frame-support",
+ "parity-scale-codec",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+]
+
+[[package]]
+name = "fp-evm"
+version = "3.0.0-dev"
+source = "git+https://github.com/darwinia-network/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730#f017a18123eb0802ca1c68c0f707f63aacbbb730"
+dependencies = [
+ "evm",
  "frame-support",
+ "num_enum 0.7.2",
  "parity-scale-codec",
- "sp-std",
+ "scale-info",
+ "serde",
+ "sp-core",
+ "sp-runtime",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "fp-evm"
 version = "3.0.0-dev"
-source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.1.0-patch#a562b6654f759d3550b27c7a89e396b14638d5e2"
+source = "git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730#f017a18123eb0802ca1c68c0f707f63aacbbb730"
 dependencies = [
  "evm",
  "frame-support",
@@ -4067,30 +4223,30 @@ dependencies = [
  "serde",
  "sp-core",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "fp-rpc"
 version = "3.0.0-dev"
-source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.1.0-patch#a562b6654f759d3550b27c7a89e396b14638d5e2"
+source = "git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730#f017a18123eb0802ca1c68c0f707f63aacbbb730"
 dependencies = [
  "ethereum",
  "ethereum-types",
- "fp-evm",
+ "fp-evm 3.0.0-dev (git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730)",
  "parity-scale-codec",
  "scale-info",
  "sp-api",
  "sp-core",
  "sp-runtime",
  "sp-state-machine",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "fp-self-contained"
 version = "1.0.0-dev"
-source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.1.0-patch#a562b6654f759d3550b27c7a89e396b14638d5e2"
+source = "git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730#f017a18123eb0802ca1c68c0f707f63aacbbb730"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
@@ -4102,7 +4258,7 @@ dependencies = [
 [[package]]
 name = "fp-storage"
 version = "2.0.0"
-source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.1.0-patch#a562b6654f759d3550b27c7a89e396b14638d5e2"
+source = "git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730#f017a18123eb0802ca1c68c0f707f63aacbbb730"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -4116,8 +4272,8 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa"
 
 [[package]]
 name = "frame-benchmarking"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "frame-support",
  "frame-support-procedural",
@@ -4133,19 +4289,19 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-runtime-interface",
- "sp-std",
- "sp-storage",
+ "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "static_assertions",
 ]
 
 [[package]]
 name = "frame-benchmarking-cli"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "32.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "Inflector",
- "array-bytes",
+ "array-bytes 6.2.3",
  "chrono",
  "clap",
  "comfy-table",
@@ -4159,7 +4315,7 @@ dependencies = [
  "linked-hash-map",
  "log",
  "parity-scale-codec",
- "rand 0.8.5",
+ "rand",
  "rand_pcg",
  "sc-block-builder",
  "sc-cli",
@@ -4174,34 +4330,34 @@ dependencies = [
  "sp-blockchain",
  "sp-core",
  "sp-database",
- "sp-externalities",
+ "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "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?branch=release-polkadot-v1.7.2)",
  "sp-trie",
- "sp-wasm-interface",
+ "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "thiserror",
  "thousands",
 ]
 
 [[package]]
 name = "frame-election-provider-solution-type"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "13.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
- "proc-macro-crate 1.3.1",
+ "proc-macro-crate 3.1.0",
  "proc-macro2",
  "quote",
- "syn 2.0.59",
+ "syn 2.0.66",
 ]
 
 [[package]]
 name = "frame-election-provider-support"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "frame-election-provider-solution-type",
  "frame-support",
@@ -4212,13 +4368,13 @@ dependencies = [
  "sp-core",
  "sp-npos-elections",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "frame-executive"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4229,8 +4385,8 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
- "sp-tracing",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
@@ -4245,19 +4401,34 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "frame-metadata-hash-extension"
+version = "0.1.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+dependencies = [
+ "array-bytes 6.2.3",
+ "docify",
+ "frame-support",
+ "frame-system",
+ "log",
+ "parity-scale-codec",
+ "scale-info",
+ "sp-runtime",
+]
+
 [[package]]
 name = "frame-remote-externalities"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "0.35.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
- "async-recursion",
  "futures 0.3.30",
  "indicatif",
- "jsonrpsee",
+ "jsonrpsee 0.20.3",
  "log",
  "parity-scale-codec",
  "serde",
  "sp-core",
+ "sp-crypto-hashing",
  "sp-io",
  "sp-runtime",
  "sp-state-machine",
@@ -4269,10 +4440,11 @@ dependencies = [
 
 [[package]]
 name = "frame-support"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "aquamarine",
+ "array-bytes 6.2.3",
  "bitflags 1.3.2",
  "docify",
  "environmental",
@@ -4291,8 +4463,8 @@ dependencies = [
  "sp-api",
  "sp-arithmetic",
  "sp-core",
- "sp-core-hashing-proc-macro",
- "sp-debug-derive",
+ "sp-crypto-hashing-proc-macro",
+ "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-genesis-builder",
  "sp-inherents",
  "sp-io",
@@ -4300,8 +4472,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?branch=release-polkadot-v1.7.2)",
+ "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-weights",
  "static_assertions",
  "tt-call",
@@ -4309,50 +4481,52 @@ dependencies = [
 
 [[package]]
 name = "frame-support-procedural"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "23.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "Inflector",
  "cfg-expr",
  "derive-syn-parse 0.1.5",
- "expander 2.1.0",
+ "expander 2.0.0",
  "frame-support-procedural-tools",
  "itertools 0.10.5",
  "macro_magic",
  "proc-macro-warning",
  "proc-macro2",
  "quote",
- "syn 2.0.59",
+ "sp-crypto-hashing",
+ "syn 2.0.66",
 ]
 
 [[package]]
 name = "frame-support-procedural-tools"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "10.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "frame-support-procedural-tools-derive",
- "proc-macro-crate 1.3.1",
+ "proc-macro-crate 3.1.0",
  "proc-macro2",
  "quote",
- "syn 2.0.59",
+ "syn 2.0.66",
 ]
 
 [[package]]
 name = "frame-support-procedural-tools-derive"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "11.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.59",
+ "syn 2.0.66",
 ]
 
 [[package]]
 name = "frame-system"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "cfg-if",
+ "docify",
  "frame-support",
  "log",
  "parity-scale-codec",
@@ -4361,15 +4535,15 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-version",
  "sp-weights",
 ]
 
 [[package]]
 name = "frame-system-benchmarking"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4378,13 +4552,13 @@ dependencies = [
  "scale-info",
  "sp-core",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "frame-system-rpc-runtime-api"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "26.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -4392,14 +4566,14 @@ dependencies = [
 
 [[package]]
 name = "frame-try-runtime"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "0.34.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
  "sp-api",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
@@ -4423,11 +4597,11 @@ dependencies = [
 
 [[package]]
 name = "fs4"
-version = "0.6.6"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2eeb4ed9e12f43b7fa0baae3f9cdda28352770132ef2e09a23760c29cae8bd47"
+checksum = "29f9df8a11882c4e3335eb2d18a0137c505d9ca927470b0cac9c6f0ae07d28f7"
 dependencies = [
- "rustix 0.38.32",
+ "rustix 0.38.34",
  "windows-sys 0.48.0",
 ]
 
@@ -4494,7 +4668,7 @@ checksum = "1d930c203dd0b6ff06e0201a4a2fe9149b43c684fd4420555b26d21b1a02956f"
 dependencies = [
  "futures-core",
  "lock_api",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
 ]
 
 [[package]]
@@ -4524,7 +4698,7 @@ version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "52527eb5074e35e9339c6b4e8d12600c7128b68fb25dcb9fa9dec18f7c25f3a5"
 dependencies = [
- "fastrand 2.0.2",
+ "fastrand 2.1.0",
  "futures-core",
  "futures-io",
  "parking",
@@ -4539,7 +4713,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.59",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -4642,9 +4816,9 @@ dependencies = [
 
 [[package]]
 name = "getrandom"
-version = "0.2.14"
+version = "0.2.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "94b22e06ecb0110981051723910cbf0b5f5e09a2062dd7663334ee79a9d1286c"
+checksum = "c4567c8db10ae91089c99af84c68c38da3ec2f087c3f82960bcdbf3656b6f4d7"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -4659,6 +4833,7 @@ version = "0.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6ea1015b5a70616b688dc230cfe50c8af89d972cb132d5a622814d29773b10b9"
 dependencies = [
+ "rand",
  "rand_core 0.6.4",
 ]
 
@@ -4685,9 +4860,9 @@ dependencies = [
 
 [[package]]
 name = "gimli"
-version = "0.28.1"
+version = "0.29.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
+checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"
 
 [[package]]
 name = "glob"
@@ -4704,8 +4879,8 @@ dependencies = [
  "aho-corasick",
  "bstr 1.9.1",
  "log",
- "regex-automata 0.4.6",
- "regex-syntax 0.8.3",
+ "regex-automata 0.4.7",
+ "regex-syntax 0.8.4",
 ]
 
 [[package]]
@@ -4716,7 +4891,7 @@ checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63"
 dependencies = [
  "ff",
  "rand_core 0.6.4",
- "subtle",
+ "subtle 2.5.0",
 ]
 
 [[package]]
@@ -4730,7 +4905,26 @@ dependencies = [
  "futures-core",
  "futures-sink",
  "futures-util",
- "http",
+ "http 0.2.12",
+ "indexmap 2.2.6",
+ "slab",
+ "tokio",
+ "tokio-util",
+ "tracing",
+]
+
+[[package]]
+name = "h2"
+version = "0.4.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fa82e28a107a8cc405f0839610bdc9b15f1e25ec7d696aa5cf173edbcb1486ab"
+dependencies = [
+ "atomic-waker",
+ "bytes",
+ "fnv",
+ "futures-core",
+ "futures-sink",
+ "http 1.1.0",
  "indexmap 2.2.6",
  "slab",
  "tokio",
@@ -4787,9 +4981,9 @@ dependencies = [
 
 [[package]]
 name = "hashbrown"
-version = "0.14.3"
+version = "0.14.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "290f1a1d9242c78d09ce40a5e87e7554ee637af1351968159f4952f028f75604"
+checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1"
 dependencies = [
  "ahash 0.8.11",
  "allocator-api2",
@@ -4802,7 +4996,7 @@ version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7"
 dependencies = [
- "hashbrown 0.14.3",
+ "hashbrown 0.14.5",
 ]
 
 [[package]]
@@ -4820,15 +5014,6 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
 
-[[package]]
-name = "hermit-abi"
-version = "0.1.19"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62b467343b94ba476dcb2500d242dadbb39557df889310ac77c5d99100aaac33"
-dependencies = [
- "libc",
-]
-
 [[package]]
 name = "hermit-abi"
 version = "0.3.9"
@@ -4881,7 +5066,7 @@ version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b"
 dependencies = [
- "crypto-mac 0.11.1",
+ "crypto-mac 0.11.0",
  "digest 0.9.0",
 ]
 
@@ -4937,14 +5122,48 @@ dependencies = [
 ]
 
 [[package]]
-name = "http-body"
-version = "0.4.6"
+name = "http"
+version = "1.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2"
+checksum = "21b9ddb458710bc376481b842f5da65cdf31522de232c1ca8146abce2a358258"
 dependencies = [
  "bytes",
- "http",
- "pin-project-lite 0.2.14",
+ "fnv",
+ "itoa",
+]
+
+[[package]]
+name = "http-body"
+version = "0.4.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7ceab25649e9960c0311ea418d17bee82c0dcec1bd053b5f9a66e265a693bed2"
+dependencies = [
+ "bytes",
+ "http 0.2.12",
+ "pin-project-lite 0.2.14",
+]
+
+[[package]]
+name = "http-body"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1cac85db508abc24a2e48553ba12a996e87244a0395ce011e62b37158745d643"
+dependencies = [
+ "bytes",
+ "http 1.1.0",
+]
+
+[[package]]
+name = "http-body-util"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "793429d76616a256bcb62c2a2ec2bed781c8307e797e2598c50010f2bee2544f"
+dependencies = [
+ "bytes",
+ "futures-util",
+ "http 1.1.0",
+ "http-body 1.0.0",
+ "pin-project-lite 0.2.14",
 ]
 
 [[package]]
@@ -4955,9 +5174,9 @@ checksum = "add0ab9360ddbd88cfeb3bd9574a1d85cfdfa14db10b3e21d3700dbc4328758f"
 
 [[package]]
 name = "httparse"
-version = "1.8.0"
+version = "1.9.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d897f394bad6a705d5f4104762e116a75639e470d80901eed05a860a95cb1904"
+checksum = "d0e7a4dd27b9476dc40cb050d3632d3bba3a70ddbff012285f7f8559a1e7e545"
 
 [[package]]
 name = "httpdate"
@@ -4973,28 +5192,48 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
 [[package]]
 name = "hyper"
-version = "0.14.28"
+version = "0.14.29"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf96e135eb83a2a8ddf766e426a841d8ddd7449d5f00d34ea02b41d2f19eef80"
+checksum = "f361cde2f109281a220d4307746cdfd5ee3f410da58a70377762396775634b33"
 dependencies = [
  "bytes",
  "futures-channel",
  "futures-core",
  "futures-util",
- "h2",
- "http",
- "http-body",
+ "h2 0.3.26",
+ "http 0.2.12",
+ "http-body 0.4.6",
  "httparse",
  "httpdate",
  "itoa",
  "pin-project-lite 0.2.14",
- "socket2 0.5.6",
+ "socket2 0.5.7",
  "tokio",
  "tower-service",
  "tracing",
  "want",
 ]
 
+[[package]]
+name = "hyper"
+version = "1.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fe575dd17d0862a9a33781c8c4696a55c320909004a67a00fb286ba8b1bc496d"
+dependencies = [
+ "bytes",
+ "futures-channel",
+ "futures-util",
+ "h2 0.4.5",
+ "http 1.1.0",
+ "http-body 1.0.0",
+ "httparse",
+ "itoa",
+ "pin-project-lite 0.2.14",
+ "smallvec",
+ "tokio",
+ "want",
+]
+
 [[package]]
 name = "hyper-rustls"
 version = "0.24.2"
@@ -5002,27 +5241,49 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590"
 dependencies = [
  "futures-util",
- "http",
- "hyper",
+ "http 0.2.12",
+ "hyper 0.14.29",
  "log",
- "rustls 0.21.10",
+ "rustls 0.21.12",
  "rustls-native-certs",
  "tokio",
  "tokio-rustls",
- "webpki-roots 0.25.4",
 ]
 
 [[package]]
 name = "hyper-tls"
-version = "0.5.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d6183ddfa99b85da61a140bea0efc93fdf56ceaa041b37d553518030827f9905"
+checksum = "70206fc6890eaca9fde8a0bf71caa2ddfc9fe045ac9e5c70df101a7dbde866e0"
 dependencies = [
  "bytes",
- "hyper",
+ "http-body-util",
+ "hyper 1.3.1",
+ "hyper-util",
  "native-tls",
  "tokio",
  "tokio-native-tls",
+ "tower-service",
+]
+
+[[package]]
+name = "hyper-util"
+version = "0.1.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7b875924a60b96e5d7b9ae7b066540b1dd1cbd90d1828f54c92e02a283351c56"
+dependencies = [
+ "bytes",
+ "futures-channel",
+ "futures-util",
+ "http 1.1.0",
+ "http-body 1.0.0",
+ "hyper 1.3.1",
+ "pin-project-lite 0.2.14",
+ "socket2 0.5.7",
+ "tokio",
+ "tower",
+ "tower-service",
+ "tracing",
 ]
 
 [[package]]
@@ -5048,6 +5309,124 @@ dependencies = [
  "cc",
 ]
 
+[[package]]
+name = "icu_collections"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
+dependencies = [
+ "displaydoc",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
+dependencies = [
+ "displaydoc",
+ "litemap",
+ "tinystr",
+ "writeable",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_locid_transform_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_locid_transform_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e"
+
+[[package]]
+name = "icu_normalizer"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_normalizer_data",
+ "icu_properties",
+ "icu_provider",
+ "smallvec",
+ "utf16_iter",
+ "utf8_iter",
+ "write16",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_normalizer_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516"
+
+[[package]]
+name = "icu_properties"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1f8ac670d7422d7f76b32e17a5db556510825b29ec9154f235977c9caba61036"
+dependencies = [
+ "displaydoc",
+ "icu_collections",
+ "icu_locid_transform",
+ "icu_properties_data",
+ "icu_provider",
+ "tinystr",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_properties_data"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"
+
+[[package]]
+name = "icu_provider"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
+dependencies = [
+ "displaydoc",
+ "icu_locid",
+ "icu_provider_macros",
+ "stable_deref_trait",
+ "tinystr",
+ "writeable",
+ "yoke",
+ "zerofrom",
+ "zerovec",
+]
+
+[[package]]
+name = "icu_provider_macros"
+version = "1.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+]
+
 [[package]]
 name = "idna"
 version = "0.2.3"
@@ -5061,12 +5440,14 @@ dependencies = [
 
 [[package]]
 name = "idna"
-version = "0.5.0"
+version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
+checksum = "4716a3a0933a1d01c2f72450e89596eb51dd34ef3c211ccd875acdf1f8fe47ed"
 dependencies = [
- "unicode-bidi",
- "unicode-normalization",
+ "icu_normalizer",
+ "icu_properties",
+ "smallvec",
+ "utf8_iter",
 ]
 
 [[package]]
@@ -5085,7 +5466,7 @@ version = "3.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d6b0422c86d7ce0e97169cc42e04ae643caf278874a7a3c87b8150a220dc7e1e"
 dependencies = [
- "async-io 2.3.2",
+ "async-io 2.3.3",
  "core-foundation",
  "fnv",
  "futures 0.3.30",
@@ -5173,7 +5554,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "168fb715dda47215e360912c096649d23d58bf392ac62f73919e831745e40f26"
 dependencies = [
  "equivalent",
- "hashbrown 0.14.3",
+ "hashbrown 0.14.5",
 ]
 
 [[package]]
@@ -5206,9 +5587,9 @@ dependencies = [
 
 [[package]]
 name = "instant"
-version = "0.1.12"
+version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a5bbe824c507c5da5956355e86a746d82e0e1464f65d862cc5e71da70e94b2c"
+checksum = "e0242819d153cba4b4b05a5a8f2a7e9bbf97b6055b2a002b395c96b5ff3c0222"
 dependencies = [
  "cfg-if",
  "js-sys",
@@ -5237,7 +5618,7 @@ version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
 dependencies = [
- "hermit-abi 0.3.9",
+ "hermit-abi",
  "libc",
  "windows-sys 0.48.0",
 ]
@@ -5254,10 +5635,10 @@ version = "0.3.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b58db92f96b720de98181bbbe63c831e87005ab460c1bf306eb2622b4707997f"
 dependencies = [
- "socket2 0.5.6",
+ "socket2 0.5.7",
  "widestring",
  "windows-sys 0.48.0",
- "winreg",
+ "winreg 0.50.0",
 ]
 
 [[package]]
@@ -5272,7 +5653,7 @@ version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b"
 dependencies = [
- "hermit-abi 0.3.9",
+ "hermit-abi",
  "libc",
  "windows-sys 0.52.0",
 ]
@@ -5286,6 +5667,12 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "is_terminal_polyfill"
+version = "1.70.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800"
+
 [[package]]
 name = "itertools"
 version = "0.10.5"
@@ -5321,9 +5708,9 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
 
 [[package]]
 name = "jobserver"
-version = "0.1.30"
+version = "0.1.31"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "685a7d121ee3f65ae4fddd72b25a04bb36b6af81bc0828f7d5434c0fe60fa3a2"
+checksum = "d2b099aaa34a9751c5bf0878add70444e1ed2dd73f347be99003d4577277de6e"
 dependencies = [
  "libc",
 ]
@@ -5343,25 +5730,36 @@ version = "0.16.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "367a292944c07385839818bb71c8d76611138e2dedb0677d035b8da21d29c78b"
 dependencies = [
- "jsonrpsee-core",
+ "jsonrpsee-core 0.16.3",
+ "jsonrpsee-server 0.16.3",
+ "jsonrpsee-types 0.16.3",
+]
+
+[[package]]
+name = "jsonrpsee"
+version = "0.20.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "affdc52f7596ccb2d7645231fc6163bb314630c989b64998f3699a28b4d5d4dc"
+dependencies = [
+ "jsonrpsee-core 0.20.3",
  "jsonrpsee-http-client",
  "jsonrpsee-proc-macros",
- "jsonrpsee-server",
- "jsonrpsee-types",
+ "jsonrpsee-server 0.20.3",
+ "jsonrpsee-types 0.20.3",
  "jsonrpsee-ws-client",
+ "tokio",
  "tracing",
 ]
 
 [[package]]
 name = "jsonrpsee-client-transport"
-version = "0.16.3"
+version = "0.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8b3815d9f5d5de348e5f162b316dc9cdf4548305ebb15b4eb9328e66cf27d7a"
+checksum = "b5b005c793122d03217da09af68ba9383363caa950b90d3436106df8cabce935"
 dependencies = [
  "futures-util",
- "http",
- "jsonrpsee-core",
- "jsonrpsee-types",
+ "http 0.2.12",
+ "jsonrpsee-core 0.20.3",
  "pin-project",
  "rustls-native-certs",
  "soketto",
@@ -5370,7 +5768,7 @@ dependencies = [
  "tokio-rustls",
  "tokio-util",
  "tracing",
- "webpki-roots 0.25.4",
+ "url",
 ]
 
 [[package]]
@@ -5381,17 +5779,40 @@ checksum = "2b5dde66c53d6dcdc8caea1874a45632ec0fcf5b437789f1e45766a1512ce803"
 dependencies = [
  "anyhow",
  "arrayvec 0.7.4",
- "async-lock 2.8.0",
  "async-trait",
  "beef",
  "futures-channel",
- "futures-timer",
  "futures-util",
  "globset",
- "hyper",
- "jsonrpsee-types",
- "parking_lot 0.12.1",
- "rand 0.8.5",
+ "hyper 0.14.29",
+ "jsonrpsee-types 0.16.3",
+ "parking_lot 0.12.3",
+ "rand",
+ "rustc-hash",
+ "serde",
+ "serde_json",
+ "soketto",
+ "thiserror",
+ "tokio",
+ "tracing",
+]
+
+[[package]]
+name = "jsonrpsee-core"
+version = "0.20.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "da2327ba8df2fdbd5e897e2b5ed25ce7f299d345b9736b6828814c3dbd1fd47b"
+dependencies = [
+ "anyhow",
+ "async-lock 2.8.0",
+ "async-trait",
+ "beef",
+ "futures-timer",
+ "futures-util",
+ "hyper 0.14.29",
+ "jsonrpsee-types 0.20.3",
+ "parking_lot 0.12.3",
+ "rand",
  "rustc-hash",
  "serde",
  "serde_json",
@@ -5403,31 +5824,32 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-http-client"
-version = "0.16.3"
+version = "0.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e5f9fabdd5d79344728521bb65e3106b49ec405a78b66fbff073b72b389fa43"
+checksum = "5f80c17f62c7653ce767e3d7288b793dfec920f97067ceb189ebdd3570f2bc20"
 dependencies = [
  "async-trait",
- "hyper",
+ "hyper 0.14.29",
  "hyper-rustls",
- "jsonrpsee-core",
- "jsonrpsee-types",
- "rustc-hash",
+ "jsonrpsee-core 0.20.3",
+ "jsonrpsee-types 0.20.3",
  "serde",
  "serde_json",
  "thiserror",
  "tokio",
+ "tower",
  "tracing",
+ "url",
 ]
 
 [[package]]
 name = "jsonrpsee-proc-macros"
-version = "0.16.3"
+version = "0.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44e8ab85614a08792b9bff6c8feee23be78c98d0182d4c622c05256ab553892a"
+checksum = "29110019693a4fa2dbda04876499d098fa16d70eba06b1e6e2b3f1b251419515"
 dependencies = [
  "heck 0.4.1",
- "proc-macro-crate 1.3.1",
+ "proc-macro-crate 1.1.3",
  "proc-macro2",
  "quote",
  "syn 1.0.109",
@@ -5441,13 +5863,36 @@ checksum = "cf4d945a6008c9b03db3354fb3c83ee02d2faa9f2e755ec1dfb69c3551b8f4ba"
 dependencies = [
  "futures-channel",
  "futures-util",
- "http",
- "hyper",
- "jsonrpsee-core",
- "jsonrpsee-types",
+ "http 0.2.12",
+ "hyper 0.14.29",
+ "jsonrpsee-core 0.16.3",
+ "jsonrpsee-types 0.16.3",
+ "serde",
+ "serde_json",
+ "soketto",
+ "tokio",
+ "tokio-stream",
+ "tokio-util",
+ "tower",
+ "tracing",
+]
+
+[[package]]
+name = "jsonrpsee-server"
+version = "0.20.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "82c39a00449c9ef3f50b84fc00fc4acba20ef8f559f07902244abf4c15c5ab9c"
+dependencies = [
+ "futures-util",
+ "http 0.2.12",
+ "hyper 0.14.29",
+ "jsonrpsee-core 0.20.3",
+ "jsonrpsee-types 0.20.3",
+ "route-recognizer",
  "serde",
  "serde_json",
  "soketto",
+ "thiserror",
  "tokio",
  "tokio-stream",
  "tokio-util",
@@ -5469,16 +5914,31 @@ dependencies = [
  "tracing",
 ]
 
+[[package]]
+name = "jsonrpsee-types"
+version = "0.20.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5be0be325642e850ed0bdff426674d2e66b2b7117c9be23a7caef68a2902b7d9"
+dependencies = [
+ "anyhow",
+ "beef",
+ "serde",
+ "serde_json",
+ "thiserror",
+ "tracing",
+]
+
 [[package]]
 name = "jsonrpsee-ws-client"
-version = "0.16.3"
+version = "0.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e1b3975ed5d73f456478681a417128597acd6a2487855fdb7b4a3d4d195bf5e"
+checksum = "bca9cb3933ccae417eb6b08c3448eb1cb46e39834e5b503e395e5e5bd08546c0"
 dependencies = [
- "http",
+ "http 0.2.12",
  "jsonrpsee-client-transport",
- "jsonrpsee-core",
- "jsonrpsee-types",
+ "jsonrpsee-core 0.20.3",
+ "jsonrpsee-types 0.20.3",
+ "url",
 ]
 
 [[package]]
@@ -5503,11 +5963,17 @@ dependencies = [
  "cpufeatures",
 ]
 
+[[package]]
+name = "keystream"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c33070833c9ee02266356de0c43f723152bd38bd96ddf52c82b3af10c9138b28"
+
 [[package]]
 name = "koi-runtime"
 version = "6.6.3"
 dependencies = [
- "array-bytes",
+ "array-bytes 6.2.3",
  "cumulus-pallet-aura-ext",
  "cumulus-pallet-dmp-queue",
  "cumulus-pallet-parachain-system",
@@ -5527,7 +5993,7 @@ dependencies = [
  "darwinia-precompile-state-storage",
  "darwinia-staking",
  "dc-primitives",
- "fp-evm",
+ "fp-evm 3.0.0-dev (git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730)",
  "fp-rpc",
  "fp-self-contained",
  "frame-benchmarking",
@@ -5575,18 +6041,17 @@ dependencies = [
  "pallet-utility",
  "pallet-whitelist",
  "pallet-xcm",
- "parachain-info",
  "parity-scale-codec",
  "polkadot-parachain-primitives",
  "polkadot-primitives",
  "polkadot-runtime-common",
- "precompile-utils",
+ "precompile-utils 0.1.0",
  "scale-info",
  "sp-api",
  "sp-block-builder",
  "sp-consensus-aura",
  "sp-core",
- "sp-debug-derive",
+ "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-inherents",
  "sp-io",
  "sp-keyring",
@@ -5594,9 +6059,10 @@ dependencies = [
  "sp-runtime",
  "sp-session",
  "sp-staking",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-transaction-pool",
  "sp-version",
+ "staging-parachain-info",
  "staging-xcm",
  "staging-xcm-builder",
  "staging-xcm-executor",
@@ -5606,20 +6072,6 @@ dependencies = [
  "xcm-primitives",
 ]
 
-[[package]]
-name = "kusama-runtime-constants"
-version = "1.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
-dependencies = [
- "frame-support",
- "polkadot-primitives",
- "polkadot-runtime-common",
- "smallvec",
- "sp-core",
- "sp-runtime",
- "sp-weights",
-]
-
 [[package]]
 name = "kvdb"
 version = "0.13.0"
@@ -5636,7 +6088,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bf7a85fe66f9ff9cd74e169fdd2c94c6e1e74c412c99a73b4df3200b5d3760b2"
 dependencies = [
  "kvdb",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
 ]
 
 [[package]]
@@ -5647,7 +6099,7 @@ checksum = "b644c70b92285f66bfc2032922a79000ea30af7bc2ab31902992a5dcb9b434f6"
 dependencies = [
  "kvdb",
  "num_cpus",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "regex",
  "rocksdb",
  "smallvec",
@@ -5655,9 +6107,9 @@ dependencies = [
 
 [[package]]
 name = "landlock"
-version = "0.2.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "520baa32708c4e957d2fc3a186bc5bd8d26637c33137f399ddfc202adb240068"
+checksum = "9baa9eeb6e315942429397e617a190f4fdc696ef1ee0342939d641029cbb4ea7"
 dependencies = [
  "enumflags2",
  "libc",
@@ -5681,9 +6133,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
 
 [[package]]
 name = "libc"
-version = "0.2.153"
+version = "0.2.155"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c198f91728a82281a64e1f4f9eeb25d82cb32a5de251c6bd1b5154d63a8e7bd"
+checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
 
 [[package]]
 name = "libloading"
@@ -5710,7 +6162,7 @@ dependencies = [
  "bytes",
  "futures 0.3.30",
  "futures-timer",
- "getrandom 0.2.14",
+ "getrandom 0.2.15",
  "instant",
  "libp2p-allow-block-list",
  "libp2p-connection-limits",
@@ -5772,13 +6224,13 @@ dependencies = [
  "libp2p-identity",
  "log",
  "multiaddr",
- "multihash",
+ "multihash 0.17.0",
  "multistream-select",
  "once_cell",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "pin-project",
  "quick-protobuf",
- "rand 0.8.5",
+ "rand",
  "rw-stream-sink",
  "smallvec",
  "thiserror",
@@ -5795,7 +6247,7 @@ dependencies = [
  "futures 0.3.30",
  "libp2p-core",
  "log",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "smallvec",
  "trust-dns-resolver",
 ]
@@ -5832,9 +6284,9 @@ dependencies = [
  "ed25519-dalek",
  "log",
  "multiaddr",
- "multihash",
+ "multihash 0.17.0",
  "quick-protobuf",
- "rand 0.8.5",
+ "rand",
  "sha2 0.10.8",
  "thiserror",
  "zeroize",
@@ -5859,7 +6311,7 @@ dependencies = [
  "libp2p-swarm",
  "log",
  "quick-protobuf",
- "rand 0.8.5",
+ "rand",
  "sha2 0.10.8",
  "smallvec",
  "thiserror",
@@ -5881,7 +6333,7 @@ dependencies = [
  "libp2p-identity",
  "libp2p-swarm",
  "log",
- "rand 0.8.5",
+ "rand",
  "smallvec",
  "socket2 0.4.10",
  "tokio",
@@ -5917,7 +6369,7 @@ dependencies = [
  "log",
  "once_cell",
  "quick-protobuf",
- "rand 0.8.5",
+ "rand",
  "sha2 0.10.8",
  "snow",
  "static_assertions",
@@ -5939,7 +6391,7 @@ dependencies = [
  "libp2p-core",
  "libp2p-swarm",
  "log",
- "rand 0.8.5",
+ "rand",
  "void",
 ]
 
@@ -5957,9 +6409,9 @@ dependencies = [
  "libp2p-identity",
  "libp2p-tls",
  "log",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "quinn-proto",
- "rand 0.8.5",
+ "rand",
  "rustls 0.20.9",
  "thiserror",
  "tokio",
@@ -5977,7 +6429,7 @@ dependencies = [
  "libp2p-core",
  "libp2p-identity",
  "libp2p-swarm",
- "rand 0.8.5",
+ "rand",
  "smallvec",
 ]
 
@@ -5996,7 +6448,7 @@ dependencies = [
  "libp2p-identity",
  "libp2p-swarm-derive",
  "log",
- "rand 0.8.5",
+ "rand",
  "smallvec",
  "tokio",
  "void",
@@ -6073,12 +6525,12 @@ dependencies = [
  "futures-rustls",
  "libp2p-core",
  "log",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "quicksink",
  "rw-stream-sink",
  "soketto",
  "url",
- "webpki-roots 0.22.6",
+ "webpki-roots",
 ]
 
 [[package]]
@@ -6132,7 +6584,7 @@ dependencies = [
  "libsecp256k1-core",
  "libsecp256k1-gen-ecmult",
  "libsecp256k1-gen-genmult",
- "rand 0.8.5",
+ "rand",
  "serde",
  "sha2 0.9.9",
  "typenum",
@@ -6146,7 +6598,7 @@ checksum = "5be9b9bb642d8522a44d533eab56c16c738301965504753b03ad1de3425d5451"
 dependencies = [
  "crunchy",
  "digest 0.9.0",
- "subtle",
+ "subtle 2.5.0",
 ]
 
 [[package]]
@@ -6180,9 +6632,9 @@ dependencies = [
 
 [[package]]
 name = "libz-sys"
-version = "1.1.16"
+version = "1.1.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e143b5e666b2695d28f6bca6497720813f699c9602dd7f5cac91008b8ada7f9"
+checksum = "c15da26e5af7e25c90b37a2d75cdbf940cf4a55316de9d84c679c9b8bfabf82e"
 dependencies = [
  "cc",
  "pkg-config",
@@ -6236,15 +6688,33 @@ checksum = "ef53942eb7bf7ff43a617b3e2c1c4a5ecf5944a7c1bc12d7ee39bbb15e5c1519"
 
 [[package]]
 name = "linux-raw-sys"
-version = "0.4.13"
+version = "0.4.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01cda141df6706de531b6c46c3a33ecca755538219bd484262fa09410c13539c"
+checksum = "78b3ae25bc7c8c38cec158d1f2757ee79e9b3740fbc7ccf0e59e4b08d793fa89"
+
+[[package]]
+name = "lioness"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ae926706ba42c425c9457121178330d75e273df2e82e28b758faf3de3a9acb9"
+dependencies = [
+ "arrayref",
+ "blake2 0.8.1",
+ "chacha",
+ "keystream",
+]
+
+[[package]]
+name = "litemap"
+version = "0.7.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704"
 
 [[package]]
 name = "lock_api"
-version = "0.4.11"
+version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c168f8615b12bc01f9c17e2eb0cc07dcae1940121185446edc3744920e8ef45"
+checksum = "07af8b9cdd281b7915f413fa73f29ebd5d55d0d3f0155584dade1ff18cea1b17"
 dependencies = [
  "autocfg",
  "scopeguard",
@@ -6282,9 +6752,9 @@ dependencies = [
 
 [[package]]
 name = "lz4"
-version = "1.24.0"
+version = "1.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e9e2dd86df36ce760a60f6ff6ad526f7ba1f14ba0356f8254fb6905e6494df1"
+checksum = "d6eab492fe7f8651add23237ea56dbf11b3c4ff762ab83d40a47f11433421f91"
 dependencies = [
  "libc",
  "lz4-sys",
@@ -6292,9 +6762,9 @@ dependencies = [
 
 [[package]]
 name = "lz4-sys"
-version = "1.9.4"
+version = "1.9.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57d27b317e207b10f69f5e75494119e391a96f48861ae870d1da6edac98ca900"
+checksum = "e9764018d143cc854c9f17f0b907de70f14393b1f502da6375dce70f00514eb3"
 dependencies = [
  "cc",
  "libc",
@@ -6311,50 +6781,50 @@ dependencies = [
 
 [[package]]
 name = "macro_magic"
-version = "0.4.2"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aee866bfee30d2d7e83835a4574aad5b45adba4cc807f2a3bbba974e5d4383c9"
+checksum = "e03844fc635e92f3a0067e25fa4bf3e3dbf3f2927bf3aa01bb7bc8f1c428949d"
 dependencies = [
  "macro_magic_core",
  "macro_magic_macros",
  "quote",
- "syn 2.0.59",
+ "syn 2.0.66",
 ]
 
 [[package]]
 name = "macro_magic_core"
-version = "0.4.2"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e766a20fd9c72bab3e1e64ed63f36bd08410e75803813df210d1ce297d7ad00"
+checksum = "468155613a44cfd825f1fb0ffa532b018253920d404e6fca1e8d43155198a46d"
 dependencies = [
  "const-random",
  "derive-syn-parse 0.1.5",
  "macro_magic_core_macros",
  "proc-macro2",
  "quote",
- "syn 2.0.59",
+ "syn 2.0.66",
 ]
 
 [[package]]
 name = "macro_magic_core_macros"
-version = "0.4.3"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d710e1214dffbab3b5dacb21475dde7d6ed84c69ff722b3a47a782668d44fbac"
+checksum = "9ea73aa640dc01d62a590d48c0c3521ed739d53b27f919b25c3551e233481654"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.59",
+ "syn 2.0.66",
 ]
 
 [[package]]
 name = "macro_magic_macros"
-version = "0.4.2"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8fb85ec1620619edf2984a7693497d4ec88a9665d8b87e942856884c92dbf2a"
+checksum = "ef9d79ae96aaba821963320eb2b6e34d17df1e5a83d8a1985c29cc5be59577b3"
 dependencies = [
  "macro_magic_core",
  "quote",
- "syn 2.0.59",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -6378,6 +6848,15 @@ dependencies = [
  "regex-automata 0.1.10",
 ]
 
+[[package]]
+name = "matchers"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
+dependencies = [
+ "regex-automata 0.1.10",
+]
+
 [[package]]
 name = "matches"
 version = "0.1.10"
@@ -6386,9 +6865,9 @@ checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5"
 
 [[package]]
 name = "matchit"
-version = "0.7.3"
+version = "0.8.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e7465ac9959cc2b1404e8e2367b43684a6d13790fe23056cc8c6c5a6b7bcb94"
+checksum = "540f1c43aed89909c0cc0cc604e3bb2f7e7a341a3728a9e6cfe760e733cd11ed"
 
 [[package]]
 name = "matrixmultiply"
@@ -6402,9 +6881,9 @@ dependencies = [
 
 [[package]]
 name = "memchr"
-version = "2.7.2"
+version = "2.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c8640c5d730cb13ebd907d8d04b52f55ac9a2eec55b440c8892f40d56c76c1d"
+checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
 
 [[package]]
 name = "memfd"
@@ -6412,7 +6891,7 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b2cffa4ad52c6f791f4f8b15f0c05f9824b2ced1160e88cc393d64fff9a8ac64"
 dependencies = [
- "rustix 0.38.32",
+ "rustix 0.38.34",
 ]
 
 [[package]]
@@ -6425,8 +6904,17 @@ dependencies = [
 ]
 
 [[package]]
-name = "memoffset"
-version = "0.8.0"
+name = "memmap2"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322"
+dependencies = [
+ "libc",
+]
+
+[[package]]
+name = "memoffset"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d61c719bcfbcf5d62b3a09efa6088de8c54bc0bfcd3ea7ae39fcc186108b8de1"
 dependencies = [
@@ -6442,18 +6930,6 @@ dependencies = [
  "hash-db",
 ]
 
-[[package]]
-name = "merlin"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e261cf0f8b3c42ded9f7d2bb59dea03aa52bc8a1cbc7482f9fc3fd1229d3b42"
-dependencies = [
- "byteorder",
- "keccak",
- "rand_core 0.5.1",
- "zeroize",
-]
-
 [[package]]
 name = "merlin"
 version = "3.0.0"
@@ -6473,7 +6949,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "69672161530e8aeca1d1400fbf3f1a1747ff60ea604265a4e906c2442df20532"
 dependencies = [
  "futures 0.3.30",
- "rand 0.8.5",
+ "rand",
  "thrift",
 ]
 
@@ -6483,16 +6959,6 @@ version = "0.3.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6877bb514081ee2a7ff5ef9de3281f14a4dd4bceac4c09388074a6b5df8a139a"
 
-[[package]]
-name = "mime_guess"
-version = "2.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4192263c238a5f0d0c6bfd21f336a313a4ce1c450542449ca191bb657b4642ef"
-dependencies = [
- "mime",
- "unicase",
-]
-
 [[package]]
 name = "minimal-lexical"
 version = "0.2.1"
@@ -6501,9 +6967,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.7.2"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d811f3e15f28568be3407c8e7fdb6514c1cda3cb30683f15b6a1a1dc4ea14a7"
+checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae"
 dependencies = [
  "adler",
 ]
@@ -6519,10 +6985,35 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "mixnet"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "daa3eb39495d8e2e2947a1d862852c90cc6a4a8845f8b41c8829cb9fcc047f4a"
+dependencies = [
+ "arrayref",
+ "arrayvec 0.7.4",
+ "bitflags 1.3.2",
+ "blake2 0.10.6",
+ "c2-chacha",
+ "curve25519-dalek 4.1.2",
+ "either",
+ "hashlink",
+ "lioness",
+ "log",
+ "parking_lot 0.12.3",
+ "rand",
+ "rand_chacha 0.3.1",
+ "rand_distr",
+ "subtle 2.5.0",
+ "thiserror",
+ "zeroize",
+]
+
 [[package]]
 name = "mmr-gadget"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "29.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "futures 0.3.30",
  "log",
@@ -6540,11 +7031,10 @@ dependencies = [
 
 [[package]]
 name = "mmr-rpc"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
- "anyhow",
- "jsonrpsee",
+ "jsonrpsee 0.20.3",
  "parity-scale-codec",
  "serde",
  "sp-api",
@@ -6584,7 +7074,7 @@ dependencies = [
 [[package]]
 name = "moonbeam-client-evm-tracing"
 version = "0.1.0"
-source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.1.0#078eff3e62d8a69e0ff744525f4d4b049630d3cd"
+source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.7.2#0950345857f05a6997b5edcc2b6f7340cb7f0d5c"
 dependencies = [
  "ethereum-types",
  "evm-tracing-events",
@@ -6593,50 +7083,53 @@ dependencies = [
  "parity-scale-codec",
  "serde",
  "serde_json",
- "sp-std",
+ "sp-runtime",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "moonbeam-evm-tracer"
 version = "0.1.0"
-source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.1.0#078eff3e62d8a69e0ff744525f4d4b049630d3cd"
+source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.7.2#0950345857f05a6997b5edcc2b6f7340cb7f0d5c"
 dependencies = [
  "ethereum-types",
  "evm",
  "evm-gasometer",
  "evm-runtime",
  "evm-tracing-events",
- "fp-evm",
+ "fp-evm 3.0.0-dev (git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730)",
  "moonbeam-primitives-ext",
  "pallet-evm",
  "parity-scale-codec",
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "moonbeam-primitives-ext"
 version = "0.1.0"
-source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.1.0#078eff3e62d8a69e0ff744525f4d4b049630d3cd"
+source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.7.2#0950345857f05a6997b5edcc2b6f7340cb7f0d5c"
 dependencies = [
  "ethereum-types",
  "evm-tracing-events",
  "parity-scale-codec",
- "sp-externalities",
- "sp-runtime-interface",
- "sp-std",
+ "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "moonbeam-rpc-core-debug"
 version = "0.1.0"
-source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.1.0#078eff3e62d8a69e0ff744525f4d4b049630d3cd"
+source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.7.2#0950345857f05a6997b5edcc2b6f7340cb7f0d5c"
 dependencies = [
+ "ethereum",
  "ethereum-types",
+ "fc-rpc-core",
  "futures 0.3.30",
- "jsonrpsee",
+ "jsonrpsee 0.20.3",
  "moonbeam-client-evm-tracing",
  "moonbeam-rpc-core-types",
  "serde",
@@ -6647,11 +7140,11 @@ dependencies = [
 [[package]]
 name = "moonbeam-rpc-core-trace"
 version = "0.6.0"
-source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.1.0#078eff3e62d8a69e0ff744525f4d4b049630d3cd"
+source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.7.2#0950345857f05a6997b5edcc2b6f7340cb7f0d5c"
 dependencies = [
  "ethereum-types",
  "futures 0.3.30",
- "jsonrpsee",
+ "jsonrpsee 0.20.3",
  "moonbeam-client-evm-tracing",
  "moonbeam-rpc-core-types",
  "serde",
@@ -6661,7 +7154,7 @@ dependencies = [
 [[package]]
 name = "moonbeam-rpc-core-types"
 version = "0.1.0"
-source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.1.0#078eff3e62d8a69e0ff744525f4d4b049630d3cd"
+source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.7.2#0950345857f05a6997b5edcc2b6f7340cb7f0d5c"
 dependencies = [
  "ethereum-types",
  "serde",
@@ -6671,7 +7164,7 @@ dependencies = [
 [[package]]
 name = "moonbeam-rpc-debug"
 version = "0.1.0"
-source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.1.0#078eff3e62d8a69e0ff744525f4d4b049630d3cd"
+source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.7.2#0950345857f05a6997b5edcc2b6f7340cb7f0d5c"
 dependencies = [
  "ethereum",
  "ethereum-types",
@@ -6679,11 +7172,12 @@ dependencies = [
  "fc-consensus",
  "fc-db",
  "fc-rpc",
+ "fc-rpc-core",
  "fc-storage",
  "fp-rpc",
  "futures 0.3.30",
  "hex-literal 0.3.4",
- "jsonrpsee",
+ "jsonrpsee 0.20.3",
  "moonbeam-client-evm-tracing",
  "moonbeam-rpc-core-debug",
  "moonbeam-rpc-core-types",
@@ -6702,7 +7196,7 @@ dependencies = [
 [[package]]
 name = "moonbeam-rpc-primitives-debug"
 version = "0.1.0"
-source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.1.0#078eff3e62d8a69e0ff744525f4d4b049630d3cd"
+source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.7.2#0950345857f05a6997b5edcc2b6f7340cb7f0d5c"
 dependencies = [
  "environmental",
  "ethereum",
@@ -6714,13 +7208,13 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "moonbeam-rpc-trace"
 version = "0.6.0"
-source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.1.0#078eff3e62d8a69e0ff744525f4d4b049630d3cd"
+source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.7.2#0950345857f05a6997b5edcc2b6f7340cb7f0d5c"
 dependencies = [
  "ethereum",
  "ethereum-types",
@@ -6730,7 +7224,7 @@ dependencies = [
  "fc-storage",
  "fp-rpc",
  "futures 0.3.30",
- "jsonrpsee",
+ "jsonrpsee 0.20.3",
  "log",
  "moonbeam-client-evm-tracing",
  "moonbeam-rpc-core-trace",
@@ -6746,7 +7240,7 @@ dependencies = [
  "sp-blockchain",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-transaction-pool",
  "substrate-prometheus-endpoint",
  "tokio",
@@ -6764,7 +7258,7 @@ dependencies = [
  "data-encoding",
  "log",
  "multibase",
- "multihash",
+ "multihash 0.17.0",
  "percent-encoding",
  "serde",
  "static_assertions",
@@ -6794,24 +7288,92 @@ dependencies = [
  "blake3",
  "core2",
  "digest 0.10.7",
- "multihash-derive",
+ "multihash-derive 0.8.1",
  "sha2 0.10.8",
  "sha3",
  "unsigned-varint",
 ]
 
+[[package]]
+name = "multihash"
+version = "0.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cfd8a792c1694c6da4f68db0a9d707c72bd260994da179e6030a5dcee00bb815"
+dependencies = [
+ "core2",
+ "digest 0.10.7",
+ "multihash-derive 0.8.1",
+ "sha2 0.10.8",
+ "unsigned-varint",
+]
+
+[[package]]
+name = "multihash"
+version = "0.19.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "076d548d76a0e2a0d4ab471d0b1c36c577786dfc4471242035d97a12a735c492"
+dependencies = [
+ "core2",
+ "unsigned-varint",
+]
+
+[[package]]
+name = "multihash-codetable"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6d815ecb3c8238d00647f8630ede7060a642c9f704761cd6082cb4028af6935"
+dependencies = [
+ "blake2b_simd",
+ "blake2s_simd",
+ "blake3",
+ "core2",
+ "digest 0.10.7",
+ "multihash-derive 0.9.0",
+ "ripemd",
+ "serde",
+ "sha1",
+ "sha2 0.10.8",
+ "sha3",
+ "strobe-rs",
+]
+
 [[package]]
 name = "multihash-derive"
-version = "0.8.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fc076939022111618a5026d3be019fd8b366e76314538ff9a1b59ffbcbf98bcd"
+checksum = "1d6d4752e6230d8ef7adf7bd5d8c4b1f6561c1014c5ba9a37445ccefe18aa1db"
 dependencies = [
- "proc-macro-crate 1.3.1",
+ "proc-macro-crate 1.1.3",
  "proc-macro-error",
  "proc-macro2",
  "quote",
  "syn 1.0.109",
- "synstructure",
+ "synstructure 0.12.6",
+]
+
+[[package]]
+name = "multihash-derive"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "890e72cb7396cb99ed98c1246a97b243cc16394470d94e0bc8b0c2c11d84290e"
+dependencies = [
+ "core2",
+ "multihash 0.19.1",
+ "multihash-derive-impl",
+]
+
+[[package]]
+name = "multihash-derive-impl"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3958713ce794e12f7c6326fac9aa274c68d74c4881dd37b3e2662b8a2046bb19"
+dependencies = [
+ "proc-macro-crate 2.0.0",
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+ "synstructure 0.13.1",
 ]
 
 [[package]]
@@ -6836,9 +7398,9 @@ dependencies = [
 
 [[package]]
 name = "nalgebra"
-version = "0.32.5"
+version = "0.32.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3ea4908d4f23254adda3daa60ffef0f1ac7b8c3e9a864cf3cc154b251908a2ef"
+checksum = "7b5c17de023a86f59ed79891b2e5d5a94c705dbe904a5b5c9c952ea6221b03e4"
 dependencies = [
  "approx",
  "matrixmultiply",
@@ -6863,11 +7425,11 @@ dependencies = [
 
 [[package]]
 name = "names"
-version = "0.13.0"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7d66043b25d4a6cccb23619d10c19c25304b355a7dccd4a8e11423dd2382146"
+checksum = "7bddcd3bf5144b6392de80e04c347cd7fab2508f6df16a85fc496ecd5cec39bc"
 dependencies = [
- "rand 0.8.5",
+ "rand",
 ]
 
 [[package]]
@@ -6878,11 +7440,10 @@ checksum = "6a51313c5820b0b02bd422f4b44776fbf47961755c74ce64afc73bfad10226c3"
 
 [[package]]
 name = "native-tls"
-version = "0.2.11"
+version = "0.2.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "07226173c32f2926027b63cce4bcd8076c3552846cbe7925f3aaffeac0a3b92e"
+checksum = "a8614eb2c83d59d1c8cc974dd3f920198647674a0a035e1af1fa58707e317466"
 dependencies = [
- "lazy_static",
  "libc",
  "log",
  "openssl",
@@ -6971,6 +7532,17 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "nix"
+version = "0.27.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053"
+dependencies = [
+ "bitflags 2.5.0",
+ "cfg-if",
+ "libc",
+]
+
 [[package]]
 name = "no-std-net"
 version = "0.6.0"
@@ -7017,9 +7589,9 @@ dependencies = [
 
 [[package]]
 name = "num"
-version = "0.4.2"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3135b08af27d103b0a51f2ae0f8632117b7b185ccf931445affa8df530576a41"
+checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23"
 dependencies = [
  "num-bigint",
  "num-complex",
@@ -7031,20 +7603,19 @@ dependencies = [
 
 [[package]]
 name = "num-bigint"
-version = "0.4.4"
+version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0"
+checksum = "c165a9ab64cf766f73521c0dd2cfdff64f488b8f0b3e621face3462d3db536d7"
 dependencies = [
- "autocfg",
  "num-integer",
  "num-traits",
 ]
 
 [[package]]
 name = "num-complex"
-version = "0.4.5"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23c6602fda94a57c990fe0df199a035d83576b496aa29f4e634a8ac6004e68a6"
+checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495"
 dependencies = [
  "num-traits",
 ]
@@ -7076,9 +7647,9 @@ dependencies = [
 
 [[package]]
 name = "num-iter"
-version = "0.1.44"
+version = "0.1.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9"
+checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf"
 dependencies = [
  "autocfg",
  "num-integer",
@@ -7087,11 +7658,10 @@ dependencies = [
 
 [[package]]
 name = "num-rational"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0"
+checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824"
 dependencies = [
- "autocfg",
  "num-bigint",
  "num-integer",
  "num-traits",
@@ -7099,11 +7669,12 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.18"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da0df0e5185db44f69b44f26786fe401b6c293d1907744beaa7fa62b2e5a517a"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
+ "libm",
 ]
 
 [[package]]
@@ -7112,7 +7683,7 @@ version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
 dependencies = [
- "hermit-abi 0.3.9",
+ "hermit-abi",
  "libc",
 ]
 
@@ -7151,10 +7722,10 @@ version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b"
 dependencies = [
- "proc-macro-crate 2.0.2",
+ "proc-macro-crate 3.1.0",
  "proc-macro2",
  "quote",
- "syn 2.0.59",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -7177,9 +7748,9 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.32.2"
+version = "0.36.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
+checksum = "576dfe1fc8f9df304abb159d767a29d0476f7750fbf8aa7ad07816004a207434"
 dependencies = [
  "memchr",
 ]
@@ -7234,7 +7805,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.59",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -7257,74 +7828,84 @@ dependencies = [
 
 [[package]]
 name = "opentelemetry"
-version = "0.17.0"
+version = "0.22.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6105e89802af13fdf48c49d7646d3b533a70e536d818aae7e78ba0433d01acb8"
+checksum = "900d57987be3f2aeb70d385fff9b27fb74c5723cc9a52d904d4f9c807a0667bf"
 dependencies = [
- "async-trait",
- "crossbeam-channel",
- "futures-channel",
- "futures-executor",
- "futures-util",
+ "futures-core",
+ "futures-sink",
  "js-sys",
- "lazy_static",
- "percent-encoding",
- "pin-project",
- "rand 0.8.5",
+ "once_cell",
+ "pin-project-lite 0.2.14",
  "thiserror",
+ "urlencoding",
 ]
 
 [[package]]
 name = "opentelemetry"
-version = "0.20.0"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9591d937bc0e6d2feb6f71a559540ab300ea49955229c347a517a28d27784c54"
+checksum = "1b69a91d4893e713e06f724597ad630f1fa76057a5e1026c0ca67054a9032a76"
 dependencies = [
- "opentelemetry_api",
- "opentelemetry_sdk",
+ "futures-core",
+ "futures-sink",
+ "js-sys",
+ "once_cell",
+ "pin-project-lite 0.2.14",
+ "thiserror",
 ]
 
 [[package]]
-name = "opentelemetry_api"
-version = "0.20.0"
+name = "opentelemetry_sdk"
+version = "0.22.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a81f725323db1b1206ca3da8bb19874bbd3f57c3bcd59471bfb04525b265b9b"
+checksum = "9e90c7113be649e31e9a0f8b5ee24ed7a16923b322c3c5ab6367469c049d6b7e"
 dependencies = [
+ "async-trait",
+ "crossbeam-channel",
  "futures-channel",
+ "futures-executor",
  "futures-util",
- "indexmap 1.9.3",
- "js-sys",
+ "glob",
  "once_cell",
- "pin-project-lite 0.2.14",
+ "opentelemetry 0.22.0",
+ "ordered-float 4.2.0",
+ "percent-encoding",
+ "rand",
  "thiserror",
- "urlencoding",
 ]
 
 [[package]]
 name = "opentelemetry_sdk"
-version = "0.20.0"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa8e705a0612d48139799fcbaba0d4a90f06277153e43dd2bdc16c6f0edd8026"
+checksum = "ae312d58eaa90a82d2e627fd86e075cf5230b3f11794e2ed74199ebbe572d4fd"
 dependencies = [
  "async-trait",
- "crossbeam-channel",
  "futures-channel",
  "futures-executor",
  "futures-util",
+ "glob",
+ "lazy_static",
  "once_cell",
- "opentelemetry_api",
- "ordered-float 3.9.2",
+ "opentelemetry 0.23.0",
+ "ordered-float 4.2.0",
  "percent-encoding",
- "rand 0.8.5",
- "regex",
+ "rand",
  "thiserror",
 ]
 
+[[package]]
+name = "option-ext"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
+
 [[package]]
 name = "orchestra"
-version = "0.0.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "227585216d05ba65c7ab0a0450a3cf2cbd81a98862a54c4df8e14d5ac6adb015"
+checksum = "92829eef0328a3d1cd22a02c0e51deb92a5362df3e7d21a4e9bdc38934694e66"
 dependencies = [
  "async-trait",
  "dyn-clonable",
@@ -7339,14 +7920,15 @@ dependencies = [
 
 [[package]]
 name = "orchestra-proc-macro"
-version = "0.0.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2871aadd82a2c216ee68a69837a526dfe788ecbe74c4c5038a6acdbff6653066"
+checksum = "1344346d5af32c95bbddea91b18a88cc83eac394192d20ef2fc4c40a74332355"
 dependencies = [
- "expander 0.0.6",
- "itertools 0.10.5",
+ "expander 2.0.0",
+ "indexmap 2.2.6",
+ "itertools 0.11.0",
  "petgraph",
- "proc-macro-crate 1.3.1",
+ "proc-macro-crate 3.1.0",
  "proc-macro2",
  "quote",
  "syn 1.0.109",
@@ -7363,17 +7945,17 @@ dependencies = [
 
 [[package]]
 name = "ordered-float"
-version = "3.9.2"
+version = "4.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f1e1c390732d15f1d48471625cd92d154e66db2c56645e29a9cd26f4699f72dc"
+checksum = "a76df7075c7d4d01fdcb46c912dd17fba5b60c78ea480b475f2b6ab6f666584e"
 dependencies = [
  "num-traits",
 ]
 
 [[package]]
 name = "orml-traits"
-version = "0.4.1-dev"
-source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v1.1.0#b3694e631df7f1ca16b1973122937753fcdee9d4"
+version = "0.8.0"
+source = "git+https://github.com/darwinia-network/open-runtime-module-library?branch=polkadot-v1.7.2#0d647d0a86614276ab4b48a5d5cd4850e070abaa"
 dependencies = [
  "frame-support",
  "impl-trait-for-tuples",
@@ -7386,14 +7968,14 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "staging-xcm",
 ]
 
 [[package]]
 name = "orml-utilities"
-version = "0.4.1-dev"
-source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v1.1.0#b3694e631df7f1ca16b1973122937753fcdee9d4"
+version = "0.8.0"
+source = "git+https://github.com/darwinia-network/open-runtime-module-library?branch=polkadot-v1.7.2#0d647d0a86614276ab4b48a5d5cd4850e070abaa"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
@@ -7402,29 +7984,28 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "orml-xcm-support"
-version = "0.4.1-dev"
-source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v1.1.0#b3694e631df7f1ca16b1973122937753fcdee9d4"
+version = "0.8.0"
+source = "git+https://github.com/darwinia-network/open-runtime-module-library?branch=polkadot-v1.7.2#0d647d0a86614276ab4b48a5d5cd4850e070abaa"
 dependencies = [
  "frame-support",
  "orml-traits",
  "parity-scale-codec",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "staging-xcm",
  "staging-xcm-executor",
 ]
 
 [[package]]
 name = "orml-xtokens"
-version = "0.4.1-dev"
-source = "git+https://github.com/open-web3-stack/open-runtime-module-library?branch=polkadot-v1.1.0#b3694e631df7f1ca16b1973122937753fcdee9d4"
+version = "0.8.0"
+source = "git+https://github.com/darwinia-network/open-runtime-module-library?branch=polkadot-v1.7.2#0d647d0a86614276ab4b48a5d5cd4850e070abaa"
 dependencies = [
- "cumulus-primitives-core",
  "frame-support",
  "frame-system",
  "log",
@@ -7436,7 +8017,7 @@ dependencies = [
  "serde",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "staging-xcm",
  "staging-xcm-executor",
 ]
@@ -7447,10 +8028,28 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
 
+[[package]]
+name = "pallet-asset-conversion"
+version = "10.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+dependencies = [
+ "frame-benchmarking",
+ "frame-support",
+ "frame-system",
+ "parity-scale-codec",
+ "scale-info",
+ "sp-api",
+ "sp-arithmetic",
+ "sp-core",
+ "sp-io",
+ "sp-runtime",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+]
+
 [[package]]
 name = "pallet-asset-manager"
 version = "0.1.0"
-source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.1.0#078eff3e62d8a69e0ff744525f4d4b049630d3cd"
+source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.7.2#0950345857f05a6997b5edcc2b6f7340cb7f0d5c"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -7461,15 +8060,30 @@ dependencies = [
  "serde",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "staging-xcm",
  "xcm-primitives",
 ]
 
+[[package]]
+name = "pallet-asset-rate"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+dependencies = [
+ "frame-benchmarking",
+ "frame-support",
+ "frame-system",
+ "parity-scale-codec",
+ "scale-info",
+ "sp-core",
+ "sp-runtime",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+]
+
 [[package]]
 name = "pallet-assets"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "29.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -7479,13 +8093,13 @@ dependencies = [
  "scale-info",
  "sp-core",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-aura"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "27.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -7496,13 +8110,13 @@ dependencies = [
  "sp-application-crypto",
  "sp-consensus-aura",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-authority-discovery"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -7512,13 +8126,13 @@ dependencies = [
  "sp-application-crypto",
  "sp-authority-discovery",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-authorship"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -7526,13 +8140,13 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-babe"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -7550,13 +8164,13 @@ dependencies = [
  "sp-runtime",
  "sp-session",
  "sp-staking",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-bags-list"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "27.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "aquamarine",
  "docify",
@@ -7571,15 +8185,16 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
- "sp-tracing",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-balances"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
+ "docify",
  "frame-benchmarking",
  "frame-support",
  "frame-system",
@@ -7587,13 +8202,13 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-beefy"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -7607,15 +8222,15 @@ dependencies = [
  "sp-runtime",
  "sp-session",
  "sp-staking",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-beefy-mmr"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
- "array-bytes",
+ "array-bytes 6.2.3",
  "binary-merkle-tree",
  "frame-support",
  "frame-system",
@@ -7632,13 +8247,13 @@ dependencies = [
  "sp-io",
  "sp-runtime",
  "sp-state-machine",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-bounties"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "27.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -7650,13 +8265,30 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+]
+
+[[package]]
+name = "pallet-broker"
+version = "0.6.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+dependencies = [
+ "bitvec",
+ "frame-benchmarking",
+ "frame-support",
+ "frame-system",
+ "parity-scale-codec",
+ "scale-info",
+ "sp-arithmetic",
+ "sp-core",
+ "sp-runtime",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-child-bounties"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "27.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -7669,13 +8301,13 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-collective"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -7686,13 +8318,13 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-conviction-voting"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "assert_matches",
  "frame-benchmarking",
@@ -7703,13 +8335,13 @@ dependencies = [
  "serde",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-democracy"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -7721,13 +8353,13 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-election-provider-multi-phase"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "27.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -7736,21 +8368,21 @@ dependencies = [
  "log",
  "pallet-election-provider-support-benchmarking",
  "parity-scale-codec",
- "rand 0.8.5",
+ "rand",
  "scale-info",
  "sp-arithmetic",
  "sp-core",
  "sp-io",
  "sp-npos-elections",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "strum 0.24.1",
 ]
 
 [[package]]
 name = "pallet-election-provider-support-benchmarking"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "27.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -7758,13 +8390,13 @@ dependencies = [
  "parity-scale-codec",
  "sp-npos-elections",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-elections-phragmen"
-version = "5.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "29.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -7777,20 +8409,20 @@ dependencies = [
  "sp-npos-elections",
  "sp-runtime",
  "sp-staking",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-ethereum"
 version = "4.0.0-dev"
-source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.1.0-patch#a562b6654f759d3550b27c7a89e396b14638d5e2"
+source = "git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730#f017a18123eb0802ca1c68c0f707f63aacbbb730"
 dependencies = [
  "ethereum",
  "ethereum-types",
  "evm",
  "fp-consensus",
  "fp-ethereum",
- "fp-evm",
+ "fp-evm 3.0.0-dev (git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730)",
  "fp-rpc",
  "fp-storage",
  "frame-support",
@@ -7800,18 +8432,18 @@ dependencies = [
  "scale-info",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-ethereum-xcm"
 version = "1.0.0-dev"
-source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.1.0#078eff3e62d8a69e0ff744525f4d4b049630d3cd"
+source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.7.2#0950345857f05a6997b5edcc2b6f7340cb7f0d5c"
 dependencies = [
  "ethereum",
  "ethereum-types",
  "fp-ethereum",
- "fp-evm",
+ "fp-evm 3.0.0-dev (git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730)",
  "fp-rpc",
  "fp-self-contained",
  "frame-benchmarking",
@@ -7825,19 +8457,19 @@ dependencies = [
  "serde",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "xcm-primitives",
 ]
 
 [[package]]
 name = "pallet-evm"
 version = "6.0.0-dev"
-source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.1.0-patch#a562b6654f759d3550b27c7a89e396b14638d5e2"
+source = "git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730#f017a18123eb0802ca1c68c0f707f63aacbbb730"
 dependencies = [
  "environmental",
  "evm",
  "fp-account",
- "fp-evm",
+ "fp-evm 3.0.0-dev (git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730)",
  "frame-benchmarking",
  "frame-support",
  "frame-system",
@@ -7852,35 +8484,35 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-evm-precompile-blake2"
 version = "2.0.0-dev"
-source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.1.0-patch#a562b6654f759d3550b27c7a89e396b14638d5e2"
+source = "git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730#f017a18123eb0802ca1c68c0f707f63aacbbb730"
 dependencies = [
- "fp-evm",
+ "fp-evm 3.0.0-dev (git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730)",
 ]
 
 [[package]]
 name = "pallet-evm-precompile-bls12381"
 version = "1.0.0-dev"
-source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.1.0-patch#a562b6654f759d3550b27c7a89e396b14638d5e2"
+source = "git+https://github.com/darwinia-network/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730#f017a18123eb0802ca1c68c0f707f63aacbbb730"
 dependencies = [
  "ark-bls12-381",
  "ark-ec",
  "ark-ff",
  "ark-std",
- "fp-evm",
+ "fp-evm 3.0.0-dev (git+https://github.com/darwinia-network/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730)",
 ]
 
 [[package]]
 name = "pallet-evm-precompile-bn128"
 version = "2.0.0-dev"
-source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.1.0-patch#a562b6654f759d3550b27c7a89e396b14638d5e2"
+source = "git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730#f017a18123eb0802ca1c68c0f707f63aacbbb730"
 dependencies = [
- "fp-evm",
+ "fp-evm 3.0.0-dev (git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730)",
  "sp-core",
  "substrate-bn",
 ]
@@ -7888,9 +8520,9 @@ dependencies = [
 [[package]]
 name = "pallet-evm-precompile-conviction-voting"
 version = "0.1.0"
-source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.1.0#078eff3e62d8a69e0ff744525f4d4b049630d3cd"
+source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.7.2#0950345857f05a6997b5edcc2b6f7340cb7f0d5c"
 dependencies = [
- "fp-evm",
+ "fp-evm 3.0.0-dev (git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730)",
  "frame-support",
  "frame-system",
  "log",
@@ -7898,19 +8530,19 @@ dependencies = [
  "pallet-conviction-voting",
  "pallet-evm",
  "parity-scale-codec",
- "precompile-utils",
+ "precompile-utils 0.1.1",
  "rustc-hex",
  "sp-core",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-evm-precompile-dispatch"
 version = "2.0.0-dev"
-source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.1.0-patch#a562b6654f759d3550b27c7a89e396b14638d5e2"
+source = "git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730#f017a18123eb0802ca1c68c0f707f63aacbbb730"
 dependencies = [
- "fp-evm",
+ "fp-evm 3.0.0-dev (git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730)",
  "frame-support",
  "pallet-evm",
  "parity-scale-codec",
@@ -7920,26 +8552,26 @@ dependencies = [
 [[package]]
 name = "pallet-evm-precompile-modexp"
 version = "2.0.0-dev"
-source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.1.0-patch#a562b6654f759d3550b27c7a89e396b14638d5e2"
+source = "git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730#f017a18123eb0802ca1c68c0f707f63aacbbb730"
 dependencies = [
- "fp-evm",
+ "fp-evm 3.0.0-dev (git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730)",
  "num",
 ]
 
 [[package]]
 name = "pallet-evm-precompile-simple"
 version = "2.0.0-dev"
-source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.1.0-patch#a562b6654f759d3550b27c7a89e396b14638d5e2"
+source = "git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730#f017a18123eb0802ca1c68c0f707f63aacbbb730"
 dependencies = [
- "fp-evm",
+ "fp-evm 3.0.0-dev (git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730)",
  "ripemd",
  "sp-io",
 ]
 
 [[package]]
 name = "pallet-fast-unstake"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "27.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "docify",
  "frame-benchmarking",
@@ -7952,13 +8584,13 @@ dependencies = [
  "sp-io",
  "sp-runtime",
  "sp-staking",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-grandpa"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -7975,29 +8607,30 @@ dependencies = [
  "sp-runtime",
  "sp-session",
  "sp-staking",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-identity"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "enumflags2",
  "frame-benchmarking",
  "frame-support",
  "frame-system",
+ "log",
  "parity-scale-codec",
  "scale-info",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-im-online"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "27.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8011,13 +8644,13 @@ dependencies = [
  "sp-io",
  "sp-runtime",
  "sp-staking",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-indices"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8028,13 +8661,13 @@ dependencies = [
  "sp-io",
  "sp-keyring",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-membership"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8045,14 +8678,15 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-message-queue"
-version = "7.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "31.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
+ "environmental",
  "frame-benchmarking",
  "frame-support",
  "frame-system",
@@ -8063,14 +8697,14 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-weights",
 ]
 
 [[package]]
 name = "pallet-mmr"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "27.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8082,13 +8716,13 @@ dependencies = [
  "sp-io",
  "sp-mmr-primitives",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-multisig"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8098,13 +8732,13 @@ dependencies = [
  "scale-info",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-nis"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8114,13 +8748,13 @@ dependencies = [
  "sp-arithmetic",
  "sp-core",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-nomination-pools"
-version = "1.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "25.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -8132,14 +8766,14 @@ dependencies = [
  "sp-io",
  "sp-runtime",
  "sp-staking",
- "sp-std",
- "sp-tracing",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-nomination-pools-benchmarking"
-version = "1.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "26.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -8151,26 +8785,26 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-runtime",
- "sp-runtime-interface",
+ "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-staking",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-nomination-pools-runtime-api"
-version = "1.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "23.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "pallet-nomination-pools",
  "parity-scale-codec",
  "sp-api",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-offences"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "27.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -8181,13 +8815,13 @@ dependencies = [
  "serde",
  "sp-runtime",
  "sp-staking",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-offences-benchmarking"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -8205,13 +8839,13 @@ dependencies = [
  "scale-info",
  "sp-runtime",
  "sp-staking",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-preimage"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8222,13 +8856,13 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-proxy"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8237,17 +8871,18 @@ dependencies = [
  "scale-info",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-ranked-collective"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
  "frame-system",
+ "impl-trait-for-tuples",
  "log",
  "parity-scale-codec",
  "scale-info",
@@ -8255,13 +8890,13 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-recovery"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8270,13 +8905,13 @@ dependencies = [
  "scale-info",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-referenda"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "assert_matches",
  "frame-benchmarking",
@@ -8289,13 +8924,28 @@ dependencies = [
  "sp-arithmetic",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+]
+
+[[package]]
+name = "pallet-root-testing"
+version = "4.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+dependencies = [
+ "frame-support",
+ "frame-system",
+ "parity-scale-codec",
+ "scale-info",
+ "sp-core",
+ "sp-io",
+ "sp-runtime",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-scheduler"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "29.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "docify",
  "frame-benchmarking",
@@ -8306,14 +8956,14 @@ dependencies = [
  "scale-info",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-weights",
 ]
 
 [[package]]
 name = "pallet-session"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -8328,14 +8978,14 @@ dependencies = [
  "sp-session",
  "sp-staking",
  "sp-state-machine",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-trie",
 ]
 
 [[package]]
 name = "pallet-session-benchmarking"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8343,16 +8993,16 @@ dependencies = [
  "pallet-session",
  "pallet-staking",
  "parity-scale-codec",
- "rand 0.8.5",
+ "rand",
  "sp-runtime",
  "sp-session",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-society"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8364,13 +9014,13 @@ dependencies = [
  "sp-arithmetic",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-staking"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -8387,24 +9037,24 @@ dependencies = [
  "sp-io",
  "sp-runtime",
  "sp-staking",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-staking-reward-curve"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "11.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
- "proc-macro-crate 1.3.1",
+ "proc-macro-crate 3.1.0",
  "proc-macro2",
  "quote",
- "syn 2.0.59",
+ "syn 2.0.66",
 ]
 
 [[package]]
 name = "pallet-staking-reward-fn"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "19.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "log",
  "sp-arithmetic",
@@ -8412,17 +9062,18 @@ dependencies = [
 
 [[package]]
 name = "pallet-staking-runtime-api"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "14.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
+ "sp-staking",
 ]
 
 [[package]]
 name = "pallet-state-trie-migration"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "29.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8433,14 +9084,15 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-sudo"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
+ "docify",
  "frame-benchmarking",
  "frame-support",
  "frame-system",
@@ -8448,14 +9100,15 @@ dependencies = [
  "scale-info",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-timestamp"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "27.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
+ "docify",
  "frame-benchmarking",
  "frame-support",
  "frame-system",
@@ -8465,15 +9118,15 @@ dependencies = [
  "sp-inherents",
  "sp-io",
  "sp-runtime",
- "sp-std",
- "sp-storage",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-timestamp",
 ]
 
 [[package]]
 name = "pallet-tips"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "27.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8486,13 +9139,13 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-transaction-payment"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -8502,15 +9155,15 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-transaction-payment-rpc"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "30.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
- "jsonrpsee",
+ "jsonrpsee 0.20.3",
  "pallet-transaction-payment-rpc-runtime-api",
  "parity-scale-codec",
  "sp-api",
@@ -8523,8 +9176,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-transaction-payment-rpc-runtime-api"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "pallet-transaction-payment",
  "parity-scale-codec",
@@ -8535,9 +9188,10 @@ dependencies = [
 
 [[package]]
 name = "pallet-treasury"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "27.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
+ "docify",
  "frame-benchmarking",
  "frame-support",
  "frame-system",
@@ -8546,15 +9200,17 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "serde",
+ "sp-core",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-tx-pause"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "9.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
+ "docify",
  "frame-benchmarking",
  "frame-support",
  "frame-system",
@@ -8564,13 +9220,13 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-utility"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8580,13 +9236,13 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-vesting"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8595,13 +9251,13 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-whitelist"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "27.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8610,34 +9266,36 @@ dependencies = [
  "scale-info",
  "sp-api",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-xcm"
-version = "1.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "bounded-collections",
  "frame-benchmarking",
  "frame-support",
  "frame-system",
  "log",
+ "pallet-balances",
  "parity-scale-codec",
  "scale-info",
  "serde",
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "staging-xcm",
+ "staging-xcm-builder",
  "staging-xcm-executor",
 ]
 
 [[package]]
 name = "pallet-xcm-benchmarks"
-version = "1.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8647,42 +9305,28 @@ dependencies = [
  "scale-info",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "staging-xcm",
  "staging-xcm-builder",
  "staging-xcm-executor",
 ]
 
-[[package]]
-name = "parachain-info"
-version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
-dependencies = [
- "cumulus-primitives-core",
- "frame-support",
- "frame-system",
- "parity-scale-codec",
- "scale-info",
- "sp-runtime",
- "sp-std",
-]
-
 [[package]]
 name = "parity-db"
 version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "592a28a24b09c9dc20ac8afaa6839abc417c720afe42c12e1e4a9d6aa2508d2e"
 dependencies = [
- "blake2",
+ "blake2 0.10.6",
  "crc32fast",
  "fs2",
  "hex",
  "libc",
  "log",
  "lz4",
- "memmap2",
- "parking_lot 0.12.1",
- "rand 0.8.5",
+ "memmap2 0.5.10",
+ "parking_lot 0.12.3",
+ "rand",
  "siphasher",
  "snap",
  "winapi",
@@ -8690,9 +9334,9 @@ dependencies = [
 
 [[package]]
 name = "parity-scale-codec"
-version = "3.6.9"
+version = "3.6.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "881331e34fa842a2fb61cc2db9643a8fedc615e47cfcc52597d1af0db9a7e8fe"
+checksum = "306800abfa29c7f16596b5970a588435e3d5b3149683d00c12b699cc19f895ee"
 dependencies = [
  "arrayvec 0.7.4",
  "bitvec",
@@ -8705,11 +9349,11 @@ dependencies = [
 
 [[package]]
 name = "parity-scale-codec-derive"
-version = "3.6.9"
+version = "3.6.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "be30eaf4b0a9fba5336683b38de57bb86d179a35862ba6bfcf57625d006bde5b"
+checksum = "d830939c76d294956402033aee57a6da7b438f2294eb94864c37b0569053a42c"
 dependencies = [
- "proc-macro-crate 2.0.2",
+ "proc-macro-crate 3.1.0",
  "proc-macro2",
  "quote",
  "syn 1.0.109",
@@ -8746,12 +9390,12 @@ dependencies = [
 
 [[package]]
 name = "parking_lot"
-version = "0.12.1"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
+checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
 dependencies = [
  "lock_api",
- "parking_lot_core 0.9.9",
+ "parking_lot_core 0.9.10",
 ]
 
 [[package]]
@@ -8770,15 +9414,15 @@ dependencies = [
 
 [[package]]
 name = "parking_lot_core"
-version = "0.9.9"
+version = "0.9.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c42a9226546d68acdd9c0a280d17ce19bfe27a46bf68784e4066115788d008e"
+checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall 0.4.1",
+ "redox_syscall 0.5.1",
  "smallvec",
- "windows-targets 0.48.5",
+ "windows-targets 0.52.5",
 ]
 
 [[package]]
@@ -8789,9 +9433,9 @@ checksum = "7924d1d0ad836f665c9065e26d016c673ece3993f30d340068b16f282afc1156"
 
 [[package]]
 name = "paste"
-version = "1.0.14"
+version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c"
+checksum = "57c0d7b74b563b49d38dae00a0c37d4d6de9b432382b2892f0574ddcae73fd0a"
 
 [[package]]
 name = "pbkdf2"
@@ -8799,16 +9443,7 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d95f5254224e617595d2cc3cc73ff0a5eaf2637519e25f03388154e9378b6ffa"
 dependencies = [
- "crypto-mac 0.11.1",
-]
-
-[[package]]
-name = "pbkdf2"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917"
-dependencies = [
- "digest 0.10.7",
+ "crypto-mac 0.11.0",
 ]
 
 [[package]]
@@ -8843,9 +9478,9 @@ checksum = "e3148f5046208a5d56bcfc03053e3ca6334e51da8dfb19b6cdc8b306fae3283e"
 
 [[package]]
 name = "pest"
-version = "2.7.9"
+version = "2.7.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "311fb059dee1a7b802f036316d790138c613a4e8b180c822e3925a662e9f0c95"
+checksum = "560131c633294438da9f7c4b08189194b20946c8274c6b9e38881a7874dc8ee8"
 dependencies = [
  "memchr",
  "thiserror",
@@ -8854,9 +9489,9 @@ dependencies = [
 
 [[package]]
 name = "pest_derive"
-version = "2.7.9"
+version = "2.7.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f73541b156d32197eecda1a4014d7f868fd2bcb3c550d5386087cfba442bf69c"
+checksum = "26293c9193fbca7b1a3bf9b79dc1e388e927e6cacaa78b4a3ab705a1d3d41459"
 dependencies = [
  "pest",
  "pest_generator",
@@ -8864,22 +9499,22 @@ dependencies = [
 
 [[package]]
 name = "pest_generator"
-version = "2.7.9"
+version = "2.7.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c35eeed0a3fab112f75165fdc026b3913f4183133f19b49be773ac9ea966e8bd"
+checksum = "3ec22af7d3fb470a85dd2ca96b7c577a1eb4ef6f1683a9fe9a8c16e136c04687"
 dependencies = [
  "pest",
  "pest_meta",
  "proc-macro2",
  "quote",
- "syn 2.0.59",
+ "syn 2.0.66",
 ]
 
 [[package]]
 name = "pest_meta"
-version = "2.7.9"
+version = "2.7.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2adbf29bb9776f28caece835398781ab24435585fe0d4dc1374a61db5accedca"
+checksum = "d7a240022f37c361ec1878d646fc5b7d7c4d28d5946e1a80ad5a7a4f4ca0bdcd"
 dependencies = [
  "once_cell",
  "pest",
@@ -8888,9 +9523,9 @@ dependencies = [
 
 [[package]]
 name = "petgraph"
-version = "0.6.4"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e1d3afd2628e69da2be385eb6f2fd57c8ac7977ceeff6dc166ff1657b0e386a9"
+checksum = "b4c5cc86750666a3ed20bdaf5ca2a0344f9c67674cae0515bec2da16fbaa47db"
 dependencies = [
  "fixedbitset",
  "indexmap 2.2.6",
@@ -8913,7 +9548,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.59",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -8936,12 +9571,12 @@ checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
 
 [[package]]
 name = "piper"
-version = "0.2.1"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "668d31b1c4eba19242f2088b2bf3316b82ca31082a8335764db4e083db7485d4"
+checksum = "ae1d5c74c9876f070d3e8fd503d748c7d974c3e48da8f41350fa5222ef9b4391"
 dependencies = [
  "atomic-waker",
- "fastrand 2.0.2",
+ "fastrand 2.1.0",
  "futures-io",
 ]
 
@@ -8969,11 +9604,13 @@ checksum = "db23d408679286588f4d4644f965003d056e3dd5abcaaa938116871d7ce2fee7"
 
 [[package]]
 name = "polkadot-approval-distribution"
-version = "1.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
+ "bitvec",
  "futures 0.3.30",
  "futures-timer",
+ "itertools 0.10.5",
  "polkadot-node-jaeger",
  "polkadot-node-metrics",
  "polkadot-node-network-protocol",
@@ -8981,14 +9618,14 @@ dependencies = [
  "polkadot-node-subsystem",
  "polkadot-node-subsystem-util",
  "polkadot-primitives",
- "rand 0.8.5",
+ "rand",
  "tracing-gum",
 ]
 
 [[package]]
 name = "polkadot-availability-bitfield-distribution"
-version = "1.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "always-assert",
  "futures 0.3.30",
@@ -8997,14 +9634,14 @@ dependencies = [
  "polkadot-node-subsystem",
  "polkadot-node-subsystem-util",
  "polkadot-primitives",
- "rand 0.8.5",
+ "rand",
  "tracing-gum",
 ]
 
 [[package]]
 name = "polkadot-availability-distribution"
-version = "1.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "derive_more",
  "fatality",
@@ -9016,7 +9653,7 @@ dependencies = [
  "polkadot-node-subsystem",
  "polkadot-node-subsystem-util",
  "polkadot-primitives",
- "rand 0.8.5",
+ "rand",
  "schnellru",
  "sp-core",
  "sp-keystore",
@@ -9026,9 +9663,10 @@ dependencies = [
 
 [[package]]
 name = "polkadot-availability-recovery"
-version = "1.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
+ "async-trait",
  "fatality",
  "futures 0.3.30",
  "parity-scale-codec",
@@ -9038,24 +9676,26 @@ dependencies = [
  "polkadot-node-subsystem",
  "polkadot-node-subsystem-util",
  "polkadot-primitives",
- "rand 0.8.5",
+ "rand",
  "sc-network",
  "schnellru",
  "thiserror",
+ "tokio",
  "tracing-gum",
 ]
 
 [[package]]
 name = "polkadot-cli"
-version = "1.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
+ "cfg-if",
  "clap",
  "frame-benchmarking-cli",
  "futures 0.3.30",
  "log",
  "polkadot-node-metrics",
- "polkadot-performance-test",
+ "polkadot-node-primitives",
  "polkadot-service",
  "sc-cli",
  "sc-executor",
@@ -9074,8 +9714,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-collator-protocol"
-version = "1.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "bitvec",
  "fatality",
@@ -9096,26 +9736,26 @@ dependencies = [
 
 [[package]]
 name = "polkadot-core-primitives"
-version = "1.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-core",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "polkadot-dispute-distribution"
-version = "1.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "derive_more",
  "fatality",
  "futures 0.3.30",
  "futures-timer",
- "indexmap 1.9.3",
+ "indexmap 2.2.6",
  "parity-scale-codec",
  "polkadot-erasure-coding",
  "polkadot-node-network-protocol",
@@ -9133,8 +9773,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-erasure-coding"
-version = "1.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "parity-scale-codec",
  "polkadot-node-primitives",
@@ -9147,8 +9787,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-gossip-support"
-version = "1.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "futures 0.3.30",
  "futures-timer",
@@ -9156,20 +9796,21 @@ dependencies = [
  "polkadot-node-subsystem",
  "polkadot-node-subsystem-util",
  "polkadot-primitives",
- "rand 0.8.5",
+ "rand",
  "rand_chacha 0.3.1",
  "sc-network",
  "sc-network-common",
  "sp-application-crypto",
  "sp-core",
+ "sp-crypto-hashing",
  "sp-keystore",
  "tracing-gum",
 ]
 
 [[package]]
 name = "polkadot-network-bridge"
-version = "1.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "always-assert",
  "async-trait",
@@ -9177,7 +9818,7 @@ dependencies = [
  "fatality",
  "futures 0.3.30",
  "parity-scale-codec",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "polkadot-node-metrics",
  "polkadot-node-network-protocol",
  "polkadot-node-subsystem",
@@ -9191,8 +9832,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-collation-generation"
-version = "1.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "futures 0.3.30",
  "parity-scale-codec",
@@ -9209,15 +9850,16 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-approval-voting"
-version = "1.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "bitvec",
  "derive_more",
  "futures 0.3.30",
  "futures-timer",
+ "itertools 0.10.5",
  "kvdb",
- "merlin 2.0.1",
+ "merlin",
  "parity-scale-codec",
  "polkadot-node-jaeger",
  "polkadot-node-primitives",
@@ -9225,9 +9867,12 @@ dependencies = [
  "polkadot-node-subsystem-util",
  "polkadot-overseer",
  "polkadot-primitives",
+ "rand",
+ "rand_chacha 0.3.1",
+ "rand_core 0.6.4",
  "sc-keystore",
  "schnellru",
- "schnorrkel 0.9.1",
+ "schnorrkel 0.11.4",
  "sp-application-crypto",
  "sp-consensus",
  "sp-consensus-slots",
@@ -9238,8 +9883,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-av-store"
-version = "1.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "bitvec",
  "futures 0.3.30",
@@ -9260,8 +9905,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-backing"
-version = "1.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "bitvec",
  "fatality",
@@ -9272,6 +9917,7 @@ dependencies = [
  "polkadot-node-subsystem-util",
  "polkadot-primitives",
  "polkadot-statement-table",
+ "schnellru",
  "sp-keystore",
  "thiserror",
  "tracing-gum",
@@ -9279,8 +9925,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-bitfield-signing"
-version = "1.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "futures 0.3.30",
  "polkadot-node-subsystem",
@@ -9294,8 +9940,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-candidate-validation"
-version = "1.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "async-trait",
  "futures 0.3.30",
@@ -9315,23 +9961,22 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-chain-api"
-version = "1.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "futures 0.3.30",
  "polkadot-node-metrics",
  "polkadot-node-subsystem",
- "polkadot-primitives",
+ "polkadot-node-subsystem-types",
  "sc-client-api",
  "sc-consensus-babe",
- "sp-blockchain",
  "tracing-gum",
 ]
 
 [[package]]
 name = "polkadot-node-core-chain-selection"
-version = "1.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "futures 0.3.30",
  "futures-timer",
@@ -9347,8 +9992,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-dispute-coordinator"
-version = "1.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "fatality",
  "futures 0.3.30",
@@ -9366,8 +10011,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-parachains-inherent"
-version = "1.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "async-trait",
  "futures 0.3.30",
@@ -9383,8 +10028,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-prospective-parachains"
-version = "1.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "6.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "bitvec",
  "fatality",
@@ -9400,8 +10045,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-provisioner"
-version = "1.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "bitvec",
  "fatality",
@@ -9417,12 +10062,16 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-pvf"
-version = "1.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "always-assert",
+ "array-bytes 6.2.3",
+ "blake3",
+ "cfg-if",
  "futures 0.3.30",
  "futures-timer",
+ "is_executable",
  "libc",
  "parity-scale-codec",
  "pin-project",
@@ -9430,23 +10079,24 @@ dependencies = [
  "polkadot-node-core-pvf-common",
  "polkadot-node-metrics",
  "polkadot-node-primitives",
+ "polkadot-node-subsystem",
  "polkadot-parachain-primitives",
  "polkadot-primitives",
- "rand 0.8.5",
+ "rand",
  "slotmap",
  "sp-core",
  "sp-maybe-compressed-blob",
- "sp-wasm-interface",
- "substrate-build-script-utils",
+ "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "tempfile",
+ "thiserror",
  "tokio",
  "tracing-gum",
 ]
 
 [[package]]
 name = "polkadot-node-core-pvf-checker"
-version = "1.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "futures 0.3.30",
  "polkadot-node-primitives",
@@ -9461,54 +10111,35 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-pvf-common"
-version = "1.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
+ "cfg-if",
  "cpu-time",
  "futures 0.3.30",
  "landlock",
  "libc",
+ "nix 0.27.1",
  "parity-scale-codec",
  "polkadot-parachain-primitives",
  "polkadot-primitives",
  "sc-executor",
  "sc-executor-common",
  "sc-executor-wasmtime",
+ "seccompiler",
  "sp-core",
- "sp-externalities",
- "sp-io",
- "sp-tracing",
- "tokio",
- "tracing-gum",
-]
-
-[[package]]
-name = "polkadot-node-core-pvf-prepare-worker"
-version = "1.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
-dependencies = [
- "futures 0.3.30",
- "libc",
- "parity-scale-codec",
- "polkadot-node-core-pvf-common",
- "polkadot-parachain-primitives",
- "polkadot-primitives",
- "rayon",
- "sc-executor",
- "sc-executor-common",
- "sc-executor-wasmtime",
+ "sp-crypto-hashing",
+ "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-io",
- "sp-maybe-compressed-blob",
- "sp-tracing",
- "tikv-jemalloc-ctl",
- "tokio",
+ "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "thiserror",
  "tracing-gum",
 ]
 
 [[package]]
 name = "polkadot-node-core-runtime-api"
-version = "1.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "futures 0.3.30",
  "polkadot-node-metrics",
@@ -9522,14 +10153,14 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-jaeger"
-version = "1.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "lazy_static",
  "log",
  "mick-jaeger",
  "parity-scale-codec",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "polkadot-node-primitives",
  "polkadot-primitives",
  "sc-network",
@@ -9540,8 +10171,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-metrics"
-version = "1.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "bs58 0.5.1",
  "futures 0.3.30",
@@ -9559,8 +10190,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-network-protocol"
-version = "1.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "async-channel 1.9.0",
  "async-trait",
@@ -9573,7 +10204,7 @@ dependencies = [
  "polkadot-node-jaeger",
  "polkadot-node-primitives",
  "polkadot-primitives",
- "rand 0.8.5",
+ "rand",
  "sc-authority-discovery",
  "sc-network",
  "strum 0.24.1",
@@ -9583,15 +10214,16 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-primitives"
-version = "1.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
+ "bitvec",
  "bounded-vec",
  "futures 0.3.30",
  "parity-scale-codec",
  "polkadot-parachain-primitives",
  "polkadot-primitives",
- "schnorrkel 0.9.1",
+ "schnorrkel 0.11.4",
  "serde",
  "sp-application-crypto",
  "sp-consensus-babe",
@@ -9605,8 +10237,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-subsystem"
-version = "1.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "polkadot-node-jaeger",
  "polkadot-node-subsystem-types",
@@ -9615,10 +10247,11 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-subsystem-types"
-version = "1.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "async-trait",
+ "bitvec",
  "derive_more",
  "futures 0.3.30",
  "orchestra",
@@ -9627,20 +10260,23 @@ dependencies = [
  "polkadot-node-primitives",
  "polkadot-primitives",
  "polkadot-statement-table",
+ "sc-client-api",
  "sc-network",
  "sc-transaction-pool-api",
  "smallvec",
  "sp-api",
  "sp-authority-discovery",
+ "sp-blockchain",
  "sp-consensus-babe",
+ "sp-runtime",
  "substrate-prometheus-endpoint",
  "thiserror",
 ]
 
 [[package]]
 name = "polkadot-node-subsystem-util"
-version = "1.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -9651,17 +10287,19 @@ dependencies = [
  "kvdb",
  "parity-db",
  "parity-scale-codec",
- "parking_lot 0.11.2",
+ "parking_lot 0.12.3",
  "pin-project",
  "polkadot-node-jaeger",
  "polkadot-node-metrics",
  "polkadot-node-network-protocol",
  "polkadot-node-primitives",
  "polkadot-node-subsystem",
+ "polkadot-node-subsystem-types",
  "polkadot-overseer",
  "polkadot-primitives",
  "prioritized-metered-channel",
- "rand 0.8.5",
+ "rand",
+ "sc-client-api",
  "schnellru",
  "sp-application-crypto",
  "sp-core",
@@ -9672,21 +10310,20 @@ dependencies = [
 
 [[package]]
 name = "polkadot-overseer"
-version = "1.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "async-trait",
  "futures 0.3.30",
  "futures-timer",
  "orchestra",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "polkadot-node-metrics",
  "polkadot-node-network-protocol",
  "polkadot-node-primitives",
  "polkadot-node-subsystem-types",
  "polkadot-primitives",
  "sc-client-api",
- "schnellru",
  "sp-api",
  "sp-core",
  "tikv-jemalloc-ctl",
@@ -9695,46 +10332,29 @@ dependencies = [
 
 [[package]]
 name = "polkadot-parachain-primitives"
-version = "1.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "6.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "bounded-collections",
  "derive_more",
- "frame-support",
  "parity-scale-codec",
  "polkadot-core-primitives",
  "scale-info",
  "serde",
  "sp-core",
  "sp-runtime",
- "sp-std",
-]
-
-[[package]]
-name = "polkadot-performance-test"
-version = "1.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
-dependencies = [
- "env_logger 0.9.3",
- "log",
- "polkadot-erasure-coding",
- "polkadot-node-core-pvf-prepare-worker",
- "polkadot-node-primitives",
- "polkadot-primitives",
- "quote",
- "sc-executor-common",
- "sp-maybe-compressed-blob",
- "staging-kusama-runtime",
- "thiserror",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-weights",
 ]
 
 [[package]]
 name = "polkadot-primitives"
-version = "1.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "bitvec",
  "hex-literal 0.4.1",
+ "log",
  "parity-scale-codec",
  "polkadot-core-primitives",
  "polkadot-parachain-primitives",
@@ -9751,15 +10371,15 @@ dependencies = [
  "sp-keystore",
  "sp-runtime",
  "sp-staking",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "polkadot-rpc"
-version = "1.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
- "jsonrpsee",
+ "jsonrpsee 0.20.3",
  "mmr-rpc",
  "pallet-transaction-payment-rpc",
  "polkadot-primitives",
@@ -9773,6 +10393,7 @@ dependencies = [
  "sc-consensus-grandpa",
  "sc-consensus-grandpa-rpc",
  "sc-rpc",
+ "sc-rpc-spec-v2",
  "sc-sync-state-rpc",
  "sc-transaction-pool-api",
  "sp-api",
@@ -9787,179 +10408,74 @@ dependencies = [
 ]
 
 [[package]]
-name = "polkadot-runtime"
-version = "1.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+name = "polkadot-runtime-common"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "bitvec",
  "frame-benchmarking",
  "frame-election-provider-support",
- "frame-executive",
  "frame-support",
  "frame-system",
- "frame-system-benchmarking",
- "frame-system-rpc-runtime-api",
- "frame-try-runtime",
- "hex-literal 0.4.1",
+ "impl-trait-for-tuples",
+ "libsecp256k1",
  "log",
- "pallet-authority-discovery",
+ "pallet-asset-rate",
  "pallet-authorship",
  "pallet-babe",
- "pallet-bags-list",
  "pallet-balances",
- "pallet-bounties",
- "pallet-child-bounties",
- "pallet-collective",
- "pallet-conviction-voting",
- "pallet-democracy",
+ "pallet-broker",
  "pallet-election-provider-multi-phase",
- "pallet-election-provider-support-benchmarking",
- "pallet-elections-phragmen",
  "pallet-fast-unstake",
- "pallet-grandpa",
  "pallet-identity",
- "pallet-im-online",
- "pallet-indices",
- "pallet-membership",
- "pallet-message-queue",
- "pallet-multisig",
- "pallet-nomination-pools",
- "pallet-nomination-pools-benchmarking",
- "pallet-nomination-pools-runtime-api",
- "pallet-offences",
- "pallet-offences-benchmarking",
- "pallet-preimage",
- "pallet-proxy",
- "pallet-referenda",
- "pallet-scheduler",
  "pallet-session",
- "pallet-session-benchmarking",
  "pallet-staking",
- "pallet-staking-reward-curve",
- "pallet-staking-runtime-api",
+ "pallet-staking-reward-fn",
  "pallet-timestamp",
- "pallet-tips",
  "pallet-transaction-payment",
- "pallet-transaction-payment-rpc-runtime-api",
  "pallet-treasury",
- "pallet-utility",
  "pallet-vesting",
- "pallet-whitelist",
- "pallet-xcm",
  "pallet-xcm-benchmarks",
  "parity-scale-codec",
  "polkadot-primitives",
- "polkadot-runtime-common",
- "polkadot-runtime-constants",
  "polkadot-runtime-parachains",
  "rustc-hex",
  "scale-info",
  "serde",
  "serde_derive",
- "smallvec",
+ "slot-range-helper",
  "sp-api",
- "sp-arithmetic",
- "sp-authority-discovery",
- "sp-block-builder",
- "sp-consensus-babe",
- "sp-consensus-beefy",
  "sp-core",
  "sp-inherents",
  "sp-io",
- "sp-mmr-primitives",
  "sp-npos-elections",
- "sp-offchain",
  "sp-runtime",
  "sp-session",
  "sp-staking",
- "sp-std",
- "sp-storage",
- "sp-transaction-pool",
- "sp-version",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "staging-xcm",
  "staging-xcm-builder",
  "staging-xcm-executor",
  "static_assertions",
- "substrate-wasm-builder",
 ]
 
 [[package]]
-name = "polkadot-runtime-common"
-version = "1.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+name = "polkadot-runtime-metrics"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
- "bitvec",
- "frame-benchmarking",
- "frame-election-provider-support",
- "frame-support",
- "frame-system",
- "impl-trait-for-tuples",
- "libsecp256k1",
- "log",
- "pallet-authorship",
- "pallet-babe",
- "pallet-balances",
- "pallet-election-provider-multi-phase",
- "pallet-fast-unstake",
- "pallet-session",
- "pallet-staking",
- "pallet-staking-reward-fn",
- "pallet-timestamp",
- "pallet-transaction-payment",
- "pallet-treasury",
- "pallet-vesting",
- "parity-scale-codec",
- "polkadot-primitives",
- "polkadot-runtime-parachains",
- "rustc-hex",
- "scale-info",
- "serde",
- "serde_derive",
- "slot-range-helper",
- "sp-api",
- "sp-core",
- "sp-inherents",
- "sp-io",
- "sp-npos-elections",
- "sp-runtime",
- "sp-session",
- "sp-staking",
- "sp-std",
- "staging-xcm",
- "static_assertions",
-]
-
-[[package]]
-name = "polkadot-runtime-constants"
-version = "1.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
-dependencies = [
- "frame-support",
- "polkadot-primitives",
- "polkadot-runtime-common",
- "smallvec",
- "sp-core",
- "sp-runtime",
- "sp-weights",
-]
-
-[[package]]
-name = "polkadot-runtime-metrics"
-version = "1.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
-dependencies = [
- "bs58 0.5.1",
+ "bs58 0.5.1",
  "frame-benchmarking",
  "parity-scale-codec",
  "polkadot-primitives",
- "sp-std",
- "sp-tracing",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "polkadot-runtime-parachains"
-version = "1.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "bitflags 1.3.2",
  "bitvec",
@@ -9973,22 +10489,25 @@ dependencies = [
  "pallet-authorship",
  "pallet-babe",
  "pallet-balances",
+ "pallet-broker",
  "pallet-message-queue",
  "pallet-session",
  "pallet-staking",
  "pallet-timestamp",
  "pallet-vesting",
  "parity-scale-codec",
+ "polkadot-core-primitives",
  "polkadot-parachain-primitives",
  "polkadot-primitives",
  "polkadot-runtime-metrics",
- "rand 0.8.5",
+ "rand",
  "rand_chacha 0.3.1",
  "rustc-hex",
  "scale-info",
  "serde",
  "sp-api",
  "sp-application-crypto",
+ "sp-arithmetic",
  "sp-core",
  "sp-inherents",
  "sp-io",
@@ -9996,7 +10515,7 @@ dependencies = [
  "sp-runtime",
  "sp-session",
  "sp-staking",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "staging-xcm",
  "staging-xcm-executor",
  "static_assertions",
@@ -10004,8 +10523,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-service"
-version = "1.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "async-trait",
  "frame-benchmarking",
@@ -10016,7 +10535,6 @@ dependencies = [
  "futures 0.3.30",
  "hex-literal 0.4.1",
  "is_executable",
- "kusama-runtime-constants",
  "kvdb",
  "kvdb-rocksdb",
  "log",
@@ -10028,6 +10546,7 @@ dependencies = [
  "pallet-transaction-payment-rpc-runtime-api",
  "parity-db",
  "parity-scale-codec",
+ "parking_lot 0.12.3",
  "polkadot-approval-distribution",
  "polkadot-availability-bitfield-distribution",
  "polkadot-availability-distribution",
@@ -10061,13 +10580,9 @@ dependencies = [
  "polkadot-parachain-primitives",
  "polkadot-primitives",
  "polkadot-rpc",
- "polkadot-runtime",
- "polkadot-runtime-common",
- "polkadot-runtime-constants",
  "polkadot-runtime-parachains",
  "polkadot-statement-distribution",
  "rococo-runtime",
- "rococo-runtime-constants",
  "sc-authority-discovery",
  "sc-basic-authorship",
  "sc-block-builder",
@@ -10112,12 +10627,11 @@ dependencies = [
  "sp-runtime",
  "sp-session",
  "sp-state-machine",
- "sp-storage",
+ "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-timestamp",
  "sp-transaction-pool",
  "sp-version",
  "sp-weights",
- "staging-kusama-runtime",
  "substrate-prometheus-endpoint",
  "thiserror",
  "tracing-gum",
@@ -10126,20 +10640,19 @@ dependencies = [
 
 [[package]]
 name = "polkadot-statement-distribution"
-version = "1.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "arrayvec 0.7.4",
  "bitvec",
  "fatality",
  "futures 0.3.30",
  "futures-timer",
- "indexmap 1.9.3",
+ "indexmap 2.2.6",
  "parity-scale-codec",
  "polkadot-node-network-protocol",
  "polkadot-node-primitives",
  "polkadot-node-subsystem",
- "polkadot-node-subsystem-types",
  "polkadot-node-subsystem-util",
  "polkadot-primitives",
  "sp-keystore",
@@ -10150,12 +10663,50 @@ dependencies = [
 
 [[package]]
 name = "polkadot-statement-table"
-version = "1.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "parity-scale-codec",
  "polkadot-primitives",
  "sp-core",
+ "tracing-gum",
+]
+
+[[package]]
+name = "polkavm-common"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d9428a5cfcc85c5d7b9fc4b6a18c4b802d0173d768182a51cc7751640f08b92"
+
+[[package]]
+name = "polkavm-derive"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae8c4bea6f3e11cd89bb18bcdddac10bd9a24015399bd1c485ad68a985a19606"
+dependencies = [
+ "polkavm-derive-impl-macro",
+]
+
+[[package]]
+name = "polkavm-derive-impl"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c4fdfc49717fb9a196e74a5d28e0bc764eb394a2c803eb11133a31ac996c60c"
+dependencies = [
+ "polkavm-common",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+]
+
+[[package]]
+name = "polkavm-derive-impl-macro"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ba81f7b5faac81e528eb6158a6f3c9e0bb1008e0ffa19653bc8dea925ecb429"
+dependencies = [
+ "polkavm-derive-impl",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -10176,15 +10727,15 @@ dependencies = [
 
 [[package]]
 name = "polling"
-version = "3.6.0"
+version = "3.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e0c976a60b2d7e99d6f229e414670a9b85d13ac305cc6d1e9c134de58c5aaaf6"
+checksum = "5e6a007746f34ed64099e88783b0ae369eaa3da6392868ba262e2af9b8fbaea1"
 dependencies = [
  "cfg-if",
  "concurrent-queue",
- "hermit-abi 0.3.9",
+ "hermit-abi",
  "pin-project-lite 0.2.14",
- "rustix 0.38.32",
+ "rustix 0.38.34",
  "tracing",
  "windows-sys 0.52.0",
 ]
@@ -10233,12 +10784,12 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
 [[package]]
 name = "precompile-utils"
 version = "0.1.0"
-source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.1.0-patch#a562b6654f759d3550b27c7a89e396b14638d5e2"
+source = "git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730#f017a18123eb0802ca1c68c0f707f63aacbbb730"
 dependencies = [
  "derive_more",
  "environmental",
  "evm",
- "fp-evm",
+ "fp-evm 3.0.0-dev (git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730)",
  "frame-support",
  "frame-system",
  "hex",
@@ -10248,30 +10799,73 @@ dependencies = [
  "num_enum 0.7.2",
  "pallet-evm",
  "parity-scale-codec",
- "precompile-utils-macro",
+ "precompile-utils-macro 0.1.0",
  "scale-info",
  "serde",
  "similar-asserts",
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-weights",
+ "staging-xcm",
+]
+
+[[package]]
+name = "precompile-utils"
+version = "0.1.1"
+source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.7.2#0950345857f05a6997b5edcc2b6f7340cb7f0d5c"
+dependencies = [
+ "affix",
+ "environmental",
+ "evm",
+ "fp-evm 3.0.0-dev (git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730)",
+ "frame-support",
+ "frame-system",
+ "hex",
+ "impl-trait-for-tuples",
+ "log",
+ "num_enum 0.5.11",
+ "pallet-evm",
+ "parity-scale-codec",
+ "paste",
+ "precompile-utils-macro 0.1.1",
+ "sha3",
+ "sp-core",
+ "sp-io",
+ "sp-runtime",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-weights",
 ]
 
 [[package]]
 name = "precompile-utils-macro"
 version = "0.1.0"
-source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.1.0-patch#a562b6654f759d3550b27c7a89e396b14638d5e2"
+source = "git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730#f017a18123eb0802ca1c68c0f707f63aacbbb730"
 dependencies = [
  "case",
  "num_enum 0.7.2",
- "prettyplease 0.2.19",
+ "prettyplease 0.2.20",
  "proc-macro2",
  "quote",
  "sp-core-hashing",
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "precompile-utils-macro"
+version = "0.1.1"
+source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.7.2#0950345857f05a6997b5edcc2b6f7340cb7f0d5c"
+dependencies = [
+ "case",
+ "num_enum 0.5.11",
+ "prettyplease 0.1.25",
+ "proc-macro2",
+ "quote",
+ "sha3",
+ "syn 1.0.109",
+]
+
 [[package]]
 name = "predicates"
 version = "2.1.5"
@@ -10302,31 +10896,21 @@ dependencies = [
  "termtree",
 ]
 
-[[package]]
-name = "prettier-please"
-version = "0.2.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22020dfcf177fcc7bf5deaf7440af371400c67c0de14c399938d8ed4fb4645d3"
-dependencies = [
- "proc-macro2",
- "syn 2.0.59",
-]
-
 [[package]]
 name = "pretty_env_logger"
 version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "865724d4dbe39d9f3dd3b52b88d859d66bcb2d6a0acfd5ea68a65fb66d4bdc1c"
 dependencies = [
- "env_logger 0.10.2",
+ "env_logger",
  "log",
 ]
 
 [[package]]
 name = "prettyplease"
-version = "0.1.11"
+version = "0.1.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f28f53e8b192565862cf99343194579a022eb9c7dd3a8d03134734803c7b3125"
+checksum = "6c8646e95016a7a6c4adea95bafa8a16baab64b583356217f2c85db4a39d9a86"
 dependencies = [
  "proc-macro2",
  "syn 1.0.109",
@@ -10334,12 +10918,12 @@ dependencies = [
 
 [[package]]
 name = "prettyplease"
-version = "0.2.19"
+version = "0.2.20"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5ac2cf0f2e4f42b49f5ffd07dae8d746508ef7526c13940e5f524012ae6c6550"
+checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e"
 dependencies = [
  "proc-macro2",
- "syn 2.0.59",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -10358,9 +10942,9 @@ dependencies = [
 
 [[package]]
 name = "prioritized-metered-channel"
-version = "0.2.0"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "382698e48a268c832d0b181ed438374a6bb708a82a8ca273bb0f61c74cf209c4"
+checksum = "a172e6cc603231f2cf004232eabcecccc0da53ba576ab286ef7baa0cfc7927ad"
 dependencies = [
  "coarsetime",
  "crossbeam-queue",
@@ -10374,22 +10958,30 @@ dependencies = [
 
 [[package]]
 name = "proc-macro-crate"
-version = "1.3.1"
+version = "1.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f4c021e1093a56626774e81216a4ce732a735e5bad4868a03f3ed65ca0c3919"
+checksum = "e17d47ce914bf4de440332250b0edd23ce48c005f59fab39d3335866b114f11a"
 dependencies = [
- "once_cell",
- "toml_edit 0.19.15",
+ "thiserror",
+ "toml 0.5.11",
 ]
 
 [[package]]
 name = "proc-macro-crate"
-version = "2.0.2"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b00f26d3400549137f92511a46ac1cd8ce37cb5598a96d382381458b992a5d24"
+checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8"
 dependencies = [
- "toml_datetime",
- "toml_edit 0.20.2",
+ "toml_edit 0.20.7",
+]
+
+[[package]]
+name = "proc-macro-crate"
+version = "3.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284"
+dependencies = [
+ "toml_edit 0.21.1",
 ]
 
 [[package]]
@@ -10418,35 +11010,35 @@ dependencies = [
 
 [[package]]
 name = "proc-macro-warning"
-version = "0.4.2"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d1eaa7fa0aa1929ffdf7eeb6eac234dde6268914a14ad44d23521ab6a9b258e"
+checksum = "834da187cfe638ae8abb0203f0b33e5ccdb02a28e7199f2f47b3e2754f50edca"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.59",
+ "syn 2.0.66",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.81"
+version = "1.0.85"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d1597b0c024618f09a9c3b8655b7e430397a36d23fdafec26d6965e9eec3eba"
+checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "prometheus"
-version = "0.13.3"
+version = "0.13.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "449811d15fbdf5ceb5c1144416066429cf82316e2ec8ce0c1f6f8a02e7bbcf8c"
+checksum = "3d33c28a30771f7f96db69893f78b857f7450d7e0237e9c8fc6427a81bae7ed1"
 dependencies = [
  "cfg-if",
  "fnv",
  "lazy_static",
  "memchr",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "thiserror",
 ]
 
@@ -10458,7 +11050,7 @@ checksum = "5d6fa99d535dd930d1249e6c79cb3c2915f9172a540fe2b02a4c8f9ca954721e"
 dependencies = [
  "dtoa",
  "itoa",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "prometheus-client-derive-encode",
 ]
 
@@ -10470,7 +11062,7 @@ checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.59",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -10480,7 +11072,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd"
 dependencies = [
  "bytes",
- "prost-derive",
+ "prost-derive 0.11.9",
+]
+
+[[package]]
+name = "prost"
+version = "0.12.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "deb1435c188b76130da55f17a466d252ff7b1418b2ad3e037d127b94e3411f29"
+dependencies = [
+ "bytes",
+ "prost-derive 0.12.6",
 ]
 
 [[package]]
@@ -10496,8 +11098,8 @@ dependencies = [
  "log",
  "multimap",
  "petgraph",
- "prettyplease 0.1.11",
- "prost",
+ "prettyplease 0.1.25",
+ "prost 0.11.9",
  "prost-types",
  "regex",
  "syn 1.0.109",
@@ -10518,13 +11120,26 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "prost-derive"
+version = "0.12.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "81bddcdb20abf9501610992b6759a4c888aef7d1a7247ef75e2404275ac24af1"
+dependencies = [
+ "anyhow",
+ "itertools 0.12.1",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+]
+
 [[package]]
 name = "prost-types"
 version = "0.11.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13"
 dependencies = [
- "prost",
+ "prost 0.11.9",
 ]
 
 [[package]]
@@ -10582,7 +11197,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94b0b33c13a79f669c85defaf4c275dc86a0c0372807d0ca3d78e0bb87274863"
 dependencies = [
  "bytes",
- "rand 0.8.5",
+ "rand",
  "ring 0.16.20",
  "rustc-hash",
  "rustls 0.20.9",
@@ -10608,19 +11223,6 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
 
-[[package]]
-name = "rand"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
-dependencies = [
- "getrandom 0.1.16",
- "libc",
- "rand_chacha 0.2.2",
- "rand_core 0.5.1",
- "rand_hc",
-]
-
 [[package]]
 name = "rand"
 version = "0.8.5"
@@ -10667,16 +11269,17 @@ version = "0.6.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ec0be4795e2f6a28069bec0b5ff3e2ac9bafc99e6a9a7dc3547996c5c816922c"
 dependencies = [
- "getrandom 0.2.14",
+ "getrandom 0.2.15",
 ]
 
 [[package]]
-name = "rand_hc"
-version = "0.2.0"
+name = "rand_distr"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
+checksum = "32cb0b9bc82b0a0876c2dd994a7e7a2683d3e7390ca40e6886785ef0c7e3ee31"
 dependencies = [
- "rand_core 0.5.1",
+ "num-traits",
+ "rand",
 ]
 
 [[package]]
@@ -10744,48 +11347,56 @@ dependencies = [
  "bitflags 1.3.2",
 ]
 
+[[package]]
+name = "redox_syscall"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e"
+dependencies = [
+ "bitflags 2.5.0",
+]
+
 [[package]]
 name = "redox_users"
 version = "0.4.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bd283d9651eeda4b2a83a43c1c91b266c40fd76ecd39a50a8c630ae69dc72891"
 dependencies = [
- "getrandom 0.2.14",
+ "getrandom 0.2.15",
  "libredox",
  "thiserror",
 ]
 
 [[package]]
 name = "reed-solomon-novelpoly"
-version = "1.0.2"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58130877ca403ab42c864fbac74bb319a0746c07a634a92a5cfc7f54af272582"
+checksum = "87413ebb313323d431e85d0afc5a68222aaed972843537cbfe5f061cf1b4bcab"
 dependencies = [
  "derive_more",
  "fs-err",
- "itertools 0.11.0",
  "static_init",
  "thiserror",
 ]
 
 [[package]]
 name = "ref-cast"
-version = "1.0.22"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4846d4c50d1721b1a3bef8af76924eef20d5e723647333798c1b519b3a9473f"
+checksum = "ccf0a6f84d5f1d581da8b41b47ec8600871962f2a528115b542b362d4b744931"
 dependencies = [
  "ref-cast-impl",
 ]
 
 [[package]]
 name = "ref-cast-impl"
-version = "1.0.22"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fddb4f8d99b0a2ebafc65a87a69a7b9875e4b1ae1f00db265d300ef7f28bccc"
+checksum = "bcc303e793d3734489387d205e9b186fac9c6cfacedd98cbb2e8a5943595f3e6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.59",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -10802,14 +11413,14 @@ dependencies = [
 
 [[package]]
 name = "regex"
-version = "1.10.4"
+version = "1.10.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c117dbdfde9c8308975b6a18d71f3f385c89461f7b3fb054288ecf2a2058ba4c"
+checksum = "b91213439dad192326a0d7c6ee3955910425f441d7038e0d6933b0aec5c4517f"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-automata 0.4.6",
- "regex-syntax 0.8.3",
+ "regex-automata 0.4.7",
+ "regex-syntax 0.8.4",
 ]
 
 [[package]]
@@ -10823,13 +11434,13 @@ dependencies = [
 
 [[package]]
 name = "regex-automata"
-version = "0.4.6"
+version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "86b83b8b9847f9bf95ef68afb0b8e6cdb80f498442f5179a29fad448fcc1eaea"
+checksum = "38caf58cc5ef2fed281f89292ef23f6365465ed9a41b7a7754eb4e26496c92df"
 dependencies = [
  "aho-corasick",
  "memchr",
- "regex-syntax 0.8.3",
+ "regex-syntax 0.8.4",
 ]
 
 [[package]]
@@ -10840,36 +11451,37 @@ checksum = "f162c6dd7b008981e4d40210aca20b4bd0f9b60ca9271061b07f78537722f2e1"
 
 [[package]]
 name = "regex-syntax"
-version = "0.8.3"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adad44e29e4c806119491a7f06f03de4d1af22c3a680dd47f1e6e179439d1f56"
+checksum = "7a66a03ae7c801facd77a29370b4faec201768915ac14a721ba36f20bc9c209b"
 
 [[package]]
 name = "reqwest"
-version = "0.11.27"
+version = "0.12.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd67538700a17451e7cba03ac727fb961abb7607553461627b97de0b89cf4a62"
+checksum = "566cafdd92868e0939d3fb961bd0dc25fcfaaed179291093b3d43e6b3150ea10"
 dependencies = [
- "base64 0.21.7",
+ "base64 0.22.1",
  "bytes",
  "encoding_rs",
  "futures-core",
  "futures-util",
- "h2",
- "http",
- "http-body",
- "hyper",
+ "h2 0.4.5",
+ "http 1.1.0",
+ "http-body 1.0.0",
+ "http-body-util",
+ "hyper 1.3.1",
  "hyper-tls",
+ "hyper-util",
  "ipnet",
  "js-sys",
  "log",
  "mime",
- "mime_guess",
  "native-tls",
  "once_cell",
  "percent-encoding",
  "pin-project-lite 0.2.14",
- "rustls-pemfile",
+ "rustls-pemfile 2.1.2",
  "serde",
  "serde_json",
  "serde_urlencoded",
@@ -10885,42 +11497,41 @@ dependencies = [
  "wasm-bindgen-futures",
  "wasm-streams",
  "web-sys",
- "winreg",
+ "winreg 0.52.0",
 ]
 
 [[package]]
 name = "reqwest-middleware"
-version = "0.2.5"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5a735987236a8e238bf0296c7e351b999c188ccc11477f311b82b55c93984216"
+checksum = "a45d100244a467870f6cb763c4484d010a6bed6bd610b3676e3825d93fb4cfbd"
 dependencies = [
  "anyhow",
  "async-trait",
- "http",
+ "http 1.1.0",
  "reqwest",
  "serde",
- "task-local-extensions",
  "thiserror",
+ "tower-service",
 ]
 
 [[package]]
 name = "reqwest-retry"
-version = "0.3.0"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9af20b65c2ee9746cc575acb6bd28a05ffc0d15e25c992a8f4462d8686aacb4f"
+checksum = "40f342894422862af74c50e1e9601cf0931accc9c6981e5eb413c46603b616b5"
 dependencies = [
  "anyhow",
  "async-trait",
  "chrono",
  "futures 0.3.30",
- "getrandom 0.2.14",
- "http",
- "hyper",
+ "getrandom 0.2.15",
+ "http 1.1.0",
+ "hyper 1.3.1",
  "parking_lot 0.11.2",
  "reqwest",
  "reqwest-middleware",
  "retry-policies",
- "task-local-extensions",
  "tokio",
  "tracing",
  "wasm-timer",
@@ -10928,20 +11539,20 @@ dependencies = [
 
 [[package]]
 name = "reqwest-tracing"
-version = "0.4.8"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "190838e54153d7a7e2ea98851304b3ce92daeabf14c54d32b01b84a3e636f683"
+checksum = "b253954a1979e02eabccd7e9c3d61d8f86576108baa160775e7f160bb4e800a3"
 dependencies = [
  "anyhow",
  "async-trait",
- "getrandom 0.2.14",
+ "getrandom 0.2.15",
+ "http 1.1.0",
  "matchit",
- "opentelemetry 0.17.0",
+ "opentelemetry 0.22.0",
  "reqwest",
  "reqwest-middleware",
- "task-local-extensions",
  "tracing",
- "tracing-opentelemetry 0.17.4",
+ "tracing-opentelemetry 0.23.0",
 ]
 
 [[package]]
@@ -10956,13 +11567,13 @@ dependencies = [
 
 [[package]]
 name = "retry-policies"
-version = "0.2.1"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "17dd00bff1d737c40dbcd47d4375281bf4c17933f9eef0a185fc7bacca23ecbd"
+checksum = "493b4243e32d6eedd29f9a398896e35c6943a123b55eec97dcaee98310d25810"
 dependencies = [
  "anyhow",
  "chrono",
- "rand 0.8.5",
+ "rand",
 ]
 
 [[package]]
@@ -10972,22 +11583,23 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2"
 dependencies = [
  "hmac 0.12.1",
- "subtle",
+ "subtle 2.5.0",
 ]
 
 [[package]]
 name = "ring"
 version = "0.1.0"
-source = "git+https://github.com/w3f/ring-proof?rev=0e948f3#0e948f3c28cbacecdd3020403c4841c0eb339213"
+source = "git+https://github.com/w3f/ring-proof#b273d33f9981e2bb3375ab45faeb537f7ee35224"
 dependencies = [
  "ark-ec",
  "ark-ff",
  "ark-poly",
  "ark-serialize",
  "ark-std",
+ "blake2 0.10.6",
  "common",
  "fflonk",
- "merlin 3.0.0",
+ "merlin",
 ]
 
 [[package]]
@@ -11013,7 +11625,7 @@ checksum = "c17fa4cb658e3583423e915b9f3acc01cceaee1860e33d59ebae66adc3a2dc0d"
 dependencies = [
  "cc",
  "cfg-if",
- "getrandom 0.2.14",
+ "getrandom 0.2.15",
  "libc",
  "spin 0.9.8",
  "untrusted 0.9.0",
@@ -11063,12 +11675,13 @@ dependencies = [
 
 [[package]]
 name = "rococo-runtime"
-version = "1.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "binary-merkle-tree",
  "frame-benchmarking",
  "frame-executive",
+ "frame-metadata-hash-extension",
  "frame-support",
  "frame-system",
  "frame-system-benchmarking",
@@ -11076,6 +11689,7 @@ dependencies = [
  "frame-try-runtime",
  "hex-literal 0.4.1",
  "log",
+ "pallet-asset-rate",
  "pallet-authority-discovery",
  "pallet-authorship",
  "pallet-babe",
@@ -11085,6 +11699,7 @@ dependencies = [
  "pallet-bounties",
  "pallet-child-bounties",
  "pallet-collective",
+ "pallet-conviction-voting",
  "pallet-democracy",
  "pallet-elections-phragmen",
  "pallet-grandpa",
@@ -11099,7 +11714,10 @@ dependencies = [
  "pallet-offences",
  "pallet-preimage",
  "pallet-proxy",
+ "pallet-ranked-collective",
  "pallet-recovery",
+ "pallet-referenda",
+ "pallet-root-testing",
  "pallet-scheduler",
  "pallet-session",
  "pallet-society",
@@ -11113,6 +11731,7 @@ dependencies = [
  "pallet-treasury",
  "pallet-utility",
  "pallet-vesting",
+ "pallet-whitelist",
  "pallet-xcm",
  "pallet-xcm-benchmarks",
  "parity-scale-codec",
@@ -11126,11 +11745,13 @@ dependencies = [
  "serde_derive",
  "smallvec",
  "sp-api",
+ "sp-arithmetic",
  "sp-authority-discovery",
  "sp-block-builder",
  "sp-consensus-babe",
  "sp-consensus-beefy",
  "sp-core",
+ "sp-genesis-builder",
  "sp-inherents",
  "sp-io",
  "sp-mmr-primitives",
@@ -11138,8 +11759,8 @@ dependencies = [
  "sp-runtime",
  "sp-session",
  "sp-staking",
- "sp-std",
- "sp-storage",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-transaction-pool",
  "sp-version",
  "staging-xcm",
@@ -11151,8 +11772,8 @@ dependencies = [
 
 [[package]]
 name = "rococo-runtime-constants"
-version = "1.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "frame-support",
  "polkadot-primitives",
@@ -11161,8 +11782,16 @@ dependencies = [
  "sp-core",
  "sp-runtime",
  "sp-weights",
+ "staging-xcm",
+ "staging-xcm-builder",
 ]
 
+[[package]]
+name = "route-recognizer"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "afab94fb28594581f62d981211a9a4d53cc8130bbcbbb89a0440d9b8e81a7746"
+
 [[package]]
 name = "rpassword"
 version = "7.3.1"
@@ -11184,7 +11813,7 @@ dependencies = [
  "log",
  "netlink-packet-route",
  "netlink-proto",
- "nix",
+ "nix 0.24.3",
  "thiserror",
  "tokio",
 ]
@@ -11201,9 +11830,9 @@ dependencies = [
 
 [[package]]
 name = "rustc-demangle"
-version = "0.1.23"
+version = "0.1.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d626bb9dae77e28219937af045c257c28bfd3f69333c512553507f5f9798cb76"
+checksum = "719b953e2095829ee67db738b3bfa9fa368c94900df327b3f07fe6e794d2fe1f"
 
 [[package]]
 name = "rustc-hash"
@@ -11223,7 +11852,7 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bfa0f585226d2e68097d4f95d113b15b83a82e819ab25717ec0590d9584ef366"
 dependencies = [
- "semver 1.0.22",
+ "semver 1.0.23",
 ]
 
 [[package]]
@@ -11265,14 +11894,14 @@ dependencies = [
 
 [[package]]
 name = "rustix"
-version = "0.38.32"
+version = "0.38.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "65e04861e65f21776e67888bfbea442b3642beaa0138fdb1dd7a84a52dffdb89"
+checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
 dependencies = [
  "bitflags 2.5.0",
  "errno",
  "libc",
- "linux-raw-sys 0.4.13",
+ "linux-raw-sys 0.4.14",
  "windows-sys 0.52.0",
 ]
 
@@ -11290,9 +11919,9 @@ dependencies = [
 
 [[package]]
 name = "rustls"
-version = "0.21.10"
+version = "0.21.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba"
+checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e"
 dependencies = [
  "log",
  "ring 0.17.8",
@@ -11307,7 +11936,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00"
 dependencies = [
  "openssl-probe",
- "rustls-pemfile",
+ "rustls-pemfile 1.0.4",
  "schannel",
  "security-framework",
 ]
@@ -11321,6 +11950,22 @@ dependencies = [
  "base64 0.21.7",
 ]
 
+[[package]]
+name = "rustls-pemfile"
+version = "2.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d"
+dependencies = [
+ "base64 0.22.1",
+ "rustls-pki-types",
+]
+
+[[package]]
+name = "rustls-pki-types"
+version = "1.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d"
+
 [[package]]
 name = "rustls-webpki"
 version = "0.101.7"
@@ -11333,9 +11978,9 @@ dependencies = [
 
 [[package]]
 name = "rustversion"
-version = "1.0.15"
+version = "1.0.17"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "80af6f9131f277a45a3fba6ce8e2258037bb0477a67e610d3c1fe046ab31de47"
+checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6"
 
 [[package]]
 name = "ruzstd"
@@ -11361,9 +12006,9 @@ dependencies = [
 
 [[package]]
 name = "ryu"
-version = "1.0.17"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e86697c916019a8588c99b5fac3cead74ec0b4b819707a682fd4d23fa0ce1ba1"
+checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
 
 [[package]]
 name = "safe_arch"
@@ -11385,19 +12030,19 @@ dependencies = [
 
 [[package]]
 name = "sc-allocator"
-version = "4.1.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "23.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "log",
  "sp-core",
- "sp-wasm-interface",
+ "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "thiserror",
 ]
 
 [[package]]
 name = "sc-authority-discovery"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "0.34.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "async-trait",
  "futures 0.3.30",
@@ -11405,11 +12050,12 @@ dependencies = [
  "ip_network",
  "libp2p",
  "log",
- "multihash",
+ "multihash 0.18.1",
+ "multihash-codetable",
  "parity-scale-codec",
- "prost",
+ "prost 0.12.6",
  "prost-build",
- "rand 0.8.5",
+ "rand",
  "sc-client-api",
  "sc-network",
  "sp-api",
@@ -11424,15 +12070,14 @@ dependencies = [
 
 [[package]]
 name = "sc-basic-authorship"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "0.34.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "futures 0.3.30",
  "futures-timer",
  "log",
  "parity-scale-codec",
  "sc-block-builder",
- "sc-client-api",
  "sc-proposer-metrics",
  "sc-telemetry",
  "sc-transaction-pool-api",
@@ -11447,25 +12092,29 @@ dependencies = [
 
 [[package]]
 name = "sc-block-builder"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "0.33.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "parity-scale-codec",
- "sc-client-api",
  "sp-api",
  "sp-block-builder",
  "sp-blockchain",
  "sp-core",
  "sp-inherents",
  "sp-runtime",
+ "sp-trie",
 ]
 
 [[package]]
 name = "sc-chain-spec"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "27.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
- "memmap2",
+ "array-bytes 6.2.3",
+ "docify",
+ "log",
+ "memmap2 0.9.4",
+ "parity-scale-codec",
  "sc-chain-spec-derive",
  "sc-client-api",
  "sc-executor",
@@ -11475,41 +12124,47 @@ dependencies = [
  "serde_json",
  "sp-blockchain",
  "sp-core",
+ "sp-crypto-hashing",
+ "sp-genesis-builder",
+ "sp-io",
  "sp-runtime",
  "sp-state-machine",
 ]
 
 [[package]]
 name = "sc-chain-spec-derive"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "11.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
- "proc-macro-crate 1.3.1",
+ "proc-macro-crate 3.1.0",
  "proc-macro2",
  "quote",
- "syn 2.0.59",
+ "syn 2.0.66",
 ]
 
 [[package]]
 name = "sc-cli"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "0.36.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
- "array-bytes",
+ "array-bytes 6.2.3",
+ "bip39",
  "chrono",
  "clap",
  "fdlimit",
  "futures 0.3.30",
+ "itertools 0.10.5",
  "libp2p-identity",
  "log",
  "names",
  "parity-scale-codec",
- "rand 0.8.5",
+ "rand",
  "regex",
  "rpassword",
  "sc-client-api",
  "sc-client-db",
  "sc-keystore",
+ "sc-mixnet",
  "sc-network",
  "sc-service",
  "sc-telemetry",
@@ -11525,20 +12180,19 @@ dependencies = [
  "sp-runtime",
  "sp-version",
  "thiserror",
- "tiny-bip39",
  "tokio",
 ]
 
 [[package]]
 name = "sc-client-api"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "fnv",
  "futures 0.3.30",
  "log",
  "parity-scale-codec",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "sc-executor",
  "sc-transaction-pool-api",
  "sc-utils",
@@ -11547,18 +12201,19 @@ dependencies = [
  "sp-consensus",
  "sp-core",
  "sp-database",
- "sp-externalities",
+ "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-runtime",
  "sp-state-machine",
  "sp-statement-store",
- "sp-storage",
+ "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-trie",
  "substrate-prometheus-endpoint",
 ]
 
 [[package]]
 name = "sc-client-db"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "0.35.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "hash-db",
  "kvdb",
@@ -11568,7 +12223,7 @@ dependencies = [
  "log",
  "parity-db",
  "parity-scale-codec",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "sc-client-api",
  "sc-state-db",
  "schnellru",
@@ -11583,8 +12238,8 @@ dependencies = [
 
 [[package]]
 name = "sc-consensus"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "0.33.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "async-trait",
  "futures 0.3.30",
@@ -11592,7 +12247,7 @@ dependencies = [
  "libp2p-identity",
  "log",
  "mockall",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "sc-client-api",
  "sc-utils",
  "serde",
@@ -11608,8 +12263,8 @@ dependencies = [
 
 [[package]]
 name = "sc-consensus-aura"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "0.34.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "async-trait",
  "futures 0.3.30",
@@ -11637,8 +12292,8 @@ dependencies = [
 
 [[package]]
 name = "sc-consensus-babe"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "0.34.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "async-trait",
  "fork-tree",
@@ -11648,14 +12303,13 @@ dependencies = [
  "num-rational",
  "num-traits",
  "parity-scale-codec",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "sc-client-api",
  "sc-consensus",
  "sc-consensus-epochs",
  "sc-consensus-slots",
  "sc-telemetry",
  "sc-transaction-pool-api",
- "scale-info",
  "sp-api",
  "sp-application-crypto",
  "sp-block-builder",
@@ -11664,6 +12318,7 @@ dependencies = [
  "sp-consensus-babe",
  "sp-consensus-slots",
  "sp-core",
+ "sp-crypto-hashing",
  "sp-inherents",
  "sp-keystore",
  "sp-runtime",
@@ -11673,11 +12328,11 @@ dependencies = [
 
 [[package]]
 name = "sc-consensus-babe-rpc"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "0.34.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "futures 0.3.30",
- "jsonrpsee",
+ "jsonrpsee 0.20.3",
  "sc-consensus-babe",
  "sc-consensus-epochs",
  "sc-rpc-api",
@@ -11695,17 +12350,17 @@ dependencies = [
 
 [[package]]
 name = "sc-consensus-beefy"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "13.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
- "array-bytes",
+ "array-bytes 6.2.3",
  "async-channel 1.9.0",
  "async-trait",
  "fnv",
  "futures 0.3.30",
  "log",
  "parity-scale-codec",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "sc-client-api",
  "sc-consensus",
  "sc-network",
@@ -11719,24 +12374,26 @@ dependencies = [
  "sp-consensus",
  "sp-consensus-beefy",
  "sp-core",
+ "sp-crypto-hashing",
  "sp-keystore",
  "sp-mmr-primitives",
  "sp-runtime",
  "substrate-prometheus-endpoint",
  "thiserror",
+ "tokio",
  "wasm-timer",
 ]
 
 [[package]]
 name = "sc-consensus-beefy-rpc"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "13.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "futures 0.3.30",
- "jsonrpsee",
+ "jsonrpsee 0.20.3",
  "log",
  "parity-scale-codec",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "sc-consensus-beefy",
  "sc-rpc",
  "serde",
@@ -11748,8 +12405,8 @@ dependencies = [
 
 [[package]]
 name = "sc-consensus-epochs"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "0.33.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "fork-tree",
  "parity-scale-codec",
@@ -11761,11 +12418,11 @@ dependencies = [
 
 [[package]]
 name = "sc-consensus-grandpa"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "0.19.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "ahash 0.8.11",
- "array-bytes",
+ "array-bytes 6.2.3",
  "async-trait",
  "dyn-clone",
  "finality-grandpa",
@@ -11774,8 +12431,8 @@ dependencies = [
  "futures-timer",
  "log",
  "parity-scale-codec",
- "parking_lot 0.12.1",
- "rand 0.8.5",
+ "parking_lot 0.12.3",
+ "rand",
  "sc-block-builder",
  "sc-chain-spec",
  "sc-client-api",
@@ -11783,6 +12440,7 @@ dependencies = [
  "sc-network",
  "sc-network-common",
  "sc-network-gossip",
+ "sc-network-sync",
  "sc-telemetry",
  "sc-transaction-pool-api",
  "sc-utils",
@@ -11794,6 +12452,7 @@ dependencies = [
  "sp-consensus",
  "sp-consensus-grandpa",
  "sp-core",
+ "sp-crypto-hashing",
  "sp-keystore",
  "sp-runtime",
  "substrate-prometheus-endpoint",
@@ -11802,12 +12461,12 @@ dependencies = [
 
 [[package]]
 name = "sc-consensus-grandpa-rpc"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "0.19.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "finality-grandpa",
  "futures 0.3.30",
- "jsonrpsee",
+ "jsonrpsee 0.20.3",
  "log",
  "parity-scale-codec",
  "sc-client-api",
@@ -11822,8 +12481,8 @@ dependencies = [
 
 [[package]]
 name = "sc-consensus-slots"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "0.33.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "async-trait",
  "futures 0.3.30",
@@ -11845,59 +12504,60 @@ dependencies = [
 
 [[package]]
 name = "sc-executor"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "0.32.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "parity-scale-codec",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "sc-executor-common",
  "sc-executor-wasmtime",
  "schnellru",
  "sp-api",
  "sp-core",
- "sp-externalities",
+ "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-io",
  "sp-panic-handler",
- "sp-runtime-interface",
+ "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-trie",
  "sp-version",
- "sp-wasm-interface",
+ "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "tracing",
 ]
 
 [[package]]
 name = "sc-executor-common"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "0.29.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "sc-allocator",
  "sp-maybe-compressed-blob",
- "sp-wasm-interface",
+ "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "thiserror",
  "wasm-instrument",
 ]
 
 [[package]]
 name = "sc-executor-wasmtime"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "0.29.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "anyhow",
  "cfg-if",
  "libc",
  "log",
+ "parking_lot 0.12.3",
  "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?branch=release-polkadot-v1.7.2)",
+ "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "wasmtime",
 ]
 
 [[package]]
 name = "sc-informant"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "0.33.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "ansi_term",
  "futures 0.3.30",
@@ -11906,17 +12566,18 @@ dependencies = [
  "sc-client-api",
  "sc-network",
  "sc-network-common",
+ "sc-network-sync",
  "sp-blockchain",
  "sp-runtime",
 ]
 
 [[package]]
 name = "sc-keystore"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "25.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
- "array-bytes",
- "parking_lot 0.12.1",
+ "array-bytes 6.2.3",
+ "parking_lot 0.12.3",
  "serde_json",
  "sp-application-crypto",
  "sp-core",
@@ -11924,12 +12585,41 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "sc-mixnet"
+version = "0.4.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+dependencies = [
+ "array-bytes 4.2.0",
+ "arrayvec 0.7.4",
+ "blake2 0.10.6",
+ "bytes",
+ "futures 0.3.30",
+ "futures-timer",
+ "libp2p-identity",
+ "log",
+ "mixnet",
+ "multiaddr",
+ "parity-scale-codec",
+ "parking_lot 0.12.3",
+ "sc-client-api",
+ "sc-network",
+ "sc-transaction-pool-api",
+ "sp-api",
+ "sp-consensus",
+ "sp-core",
+ "sp-keystore",
+ "sp-mixnet",
+ "sp-runtime",
+ "thiserror",
+]
+
 [[package]]
 name = "sc-network"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "0.34.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
- "array-bytes",
+ "array-bytes 6.2.3",
  "async-channel 1.9.0",
  "async-trait",
  "asynchronous-codec",
@@ -11944,10 +12634,10 @@ dependencies = [
  "log",
  "mockall",
  "parity-scale-codec",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "partial_sort",
  "pin-project",
- "rand 0.8.5",
+ "rand",
  "sc-client-api",
  "sc-network-common",
  "sc-utils",
@@ -11960,6 +12650,8 @@ dependencies = [
  "sp-runtime",
  "substrate-prometheus-endpoint",
  "thiserror",
+ "tokio",
+ "tokio-stream",
  "unsigned-varint",
  "wasm-timer",
  "zeroize",
@@ -11967,15 +12659,15 @@ dependencies = [
 
 [[package]]
 name = "sc-network-bitswap"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "0.33.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "async-channel 1.9.0",
  "cid",
  "futures 0.3.30",
  "libp2p-identity",
  "log",
- "prost",
+ "prost 0.12.6",
  "prost-build",
  "sc-client-api",
  "sc-network",
@@ -11987,8 +12679,8 @@ dependencies = [
 
 [[package]]
 name = "sc-network-common"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "0.33.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "async-trait",
  "bitflags 1.3.2",
@@ -12004,8 +12696,8 @@ dependencies = [
 
 [[package]]
 name = "sc-network-gossip"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "0.34.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "ahash 0.8.11",
  "futures 0.3.30",
@@ -12014,6 +12706,7 @@ dependencies = [
  "log",
  "sc-network",
  "sc-network-common",
+ "sc-network-sync",
  "schnellru",
  "sp-runtime",
  "substrate-prometheus-endpoint",
@@ -12022,16 +12715,16 @@ dependencies = [
 
 [[package]]
 name = "sc-network-light"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "0.33.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
- "array-bytes",
+ "array-bytes 6.2.3",
  "async-channel 1.9.0",
  "futures 0.3.30",
  "libp2p-identity",
  "log",
  "parity-scale-codec",
- "prost",
+ "prost 0.12.6",
  "prost-build",
  "sc-client-api",
  "sc-network",
@@ -12043,10 +12736,10 @@ dependencies = [
 
 [[package]]
 name = "sc-network-sync"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "0.33.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
- "array-bytes",
+ "array-bytes 6.2.3",
  "async-channel 1.9.0",
  "async-trait",
  "fork-tree",
@@ -12056,7 +12749,7 @@ dependencies = [
  "log",
  "mockall",
  "parity-scale-codec",
- "prost",
+ "prost 0.12.6",
  "prost-build",
  "sc-client-api",
  "sc-consensus",
@@ -12073,20 +12766,23 @@ dependencies = [
  "sp-runtime",
  "substrate-prometheus-endpoint",
  "thiserror",
+ "tokio",
+ "tokio-stream",
 ]
 
 [[package]]
 name = "sc-network-transactions"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "0.33.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
- "array-bytes",
+ "array-bytes 6.2.3",
  "futures 0.3.30",
  "libp2p",
  "log",
  "parity-scale-codec",
  "sc-network",
  "sc-network-common",
+ "sc-network-sync",
  "sc-utils",
  "sp-consensus",
  "sp-runtime",
@@ -12095,23 +12791,23 @@ dependencies = [
 
 [[package]]
 name = "sc-offchain"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "29.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
- "array-bytes",
+ "array-bytes 6.2.3",
  "bytes",
  "fnv",
  "futures 0.3.30",
  "futures-timer",
- "hyper",
+ "hyper 0.14.29",
  "hyper-rustls",
  "libp2p",
  "log",
  "num_cpus",
  "once_cell",
  "parity-scale-codec",
- "parking_lot 0.12.1",
- "rand 0.8.5",
+ "parking_lot 0.12.3",
+ "rand",
  "sc-client-api",
  "sc-network",
  "sc-network-common",
@@ -12119,7 +12815,7 @@ dependencies = [
  "sc-utils",
  "sp-api",
  "sp-core",
- "sp-externalities",
+ "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-keystore",
  "sp-offchain",
  "sp-runtime",
@@ -12129,8 +12825,8 @@ dependencies = [
 
 [[package]]
 name = "sc-proposer-metrics"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "0.17.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "log",
  "substrate-prometheus-endpoint",
@@ -12138,17 +12834,18 @@ dependencies = [
 
 [[package]]
 name = "sc-rpc"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "29.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "futures 0.3.30",
- "jsonrpsee",
+ "jsonrpsee 0.20.3",
  "log",
  "parity-scale-codec",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "sc-block-builder",
  "sc-chain-spec",
  "sc-client-api",
+ "sc-mixnet",
  "sc-rpc-api",
  "sc-tracing",
  "sc-transaction-pool-api",
@@ -12169,12 +12866,13 @@ dependencies = [
 
 [[package]]
 name = "sc-rpc-api"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "0.33.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
- "jsonrpsee",
+ "jsonrpsee 0.20.3",
  "parity-scale-codec",
  "sc-chain-spec",
+ "sc-mixnet",
  "sc-transaction-pool-api",
  "scale-info",
  "serde",
@@ -12188,11 +12886,11 @@ dependencies = [
 
 [[package]]
 name = "sc-rpc-server"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "11.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
- "http",
- "jsonrpsee",
+ "http 0.2.12",
+ "jsonrpsee 0.20.3",
  "log",
  "serde_json",
  "substrate-prometheus-endpoint",
@@ -12203,25 +12901,27 @@ dependencies = [
 
 [[package]]
 name = "sc-rpc-spec-v2"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "0.34.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
- "array-bytes",
+ "array-bytes 6.2.3",
  "futures 0.3.30",
  "futures-util",
  "hex",
- "jsonrpsee",
+ "jsonrpsee 0.20.3",
  "log",
  "parity-scale-codec",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "sc-chain-spec",
  "sc-client-api",
+ "sc-rpc",
  "sc-transaction-pool-api",
  "sc-utils",
  "serde",
  "sp-api",
  "sp-blockchain",
  "sp-core",
+ "sp-rpc",
  "sp-runtime",
  "sp-version",
  "thiserror",
@@ -12231,21 +12931,20 @@ dependencies = [
 
 [[package]]
 name = "sc-service"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "0.35.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "async-trait",
  "directories",
  "exit-future",
  "futures 0.3.30",
  "futures-timer",
- "jsonrpsee",
+ "jsonrpsee 0.20.3",
  "log",
  "parity-scale-codec",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "pin-project",
- "rand 0.8.5",
- "sc-block-builder",
+ "rand",
  "sc-chain-spec",
  "sc-client-api",
  "sc-client-db",
@@ -12274,12 +12973,12 @@ dependencies = [
  "sp-blockchain",
  "sp-consensus",
  "sp-core",
- "sp-externalities",
+ "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-keystore",
  "sp-runtime",
  "sp-session",
  "sp-state-machine",
- "sp-storage",
+ "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-transaction-pool",
  "sp-transaction-storage-proof",
  "sp-trie",
@@ -12295,24 +12994,23 @@ dependencies = [
 
 [[package]]
 name = "sc-state-db"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "0.30.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "log",
  "parity-scale-codec",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "sp-core",
 ]
 
 [[package]]
 name = "sc-storage-monitor"
-version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "0.16.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "clap",
  "fs4",
  "log",
- "sc-client-db",
  "sp-core",
  "thiserror",
  "tokio",
@@ -12320,10 +13018,10 @@ dependencies = [
 
 [[package]]
 name = "sc-sync-state-rpc"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "0.34.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
- "jsonrpsee",
+ "jsonrpsee 0.20.3",
  "parity-scale-codec",
  "sc-chain-spec",
  "sc-client-api",
@@ -12339,35 +13037,37 @@ dependencies = [
 
 [[package]]
 name = "sc-sysinfo"
-version = "6.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "27.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
+ "derive_more",
  "futures 0.3.30",
  "libc",
  "log",
- "rand 0.8.5",
+ "rand",
  "rand_pcg",
  "regex",
  "sc-telemetry",
  "serde",
  "serde_json",
  "sp-core",
+ "sp-crypto-hashing",
  "sp-io",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "sc-telemetry"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "15.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "chrono",
  "futures 0.3.30",
  "libp2p",
  "log",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "pin-project",
- "rand 0.8.5",
+ "rand",
  "sc-utils",
  "serde",
  "serde_json",
@@ -12377,16 +13077,17 @@ dependencies = [
 
 [[package]]
 name = "sc-tracing"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "ansi_term",
- "atty",
  "chrono",
+ "is-terminal",
  "lazy_static",
  "libc",
  "log",
- "parking_lot 0.12.1",
+ "parity-scale-codec",
+ "parking_lot 0.12.3",
  "regex",
  "rustc-hash",
  "sc-client-api",
@@ -12397,7 +13098,7 @@ dependencies = [
  "sp-core",
  "sp-rpc",
  "sp-runtime",
- "sp-tracing",
+ "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "thiserror",
  "tracing",
  "tracing-log 0.1.4",
@@ -12406,19 +13107,19 @@ dependencies = [
 
 [[package]]
 name = "sc-tracing-proc-macro"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "11.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
- "proc-macro-crate 1.3.1",
+ "proc-macro-crate 3.1.0",
  "proc-macro2",
  "quote",
- "syn 2.0.59",
+ "syn 2.0.66",
 ]
 
 [[package]]
 name = "sc-transaction-pool"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "async-trait",
  "futures 0.3.30",
@@ -12426,7 +13127,7 @@ dependencies = [
  "linked-hash-map",
  "log",
  "parity-scale-codec",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "sc-client-api",
  "sc-transaction-pool-api",
  "sc-utils",
@@ -12434,8 +13135,9 @@ dependencies = [
  "sp-api",
  "sp-blockchain",
  "sp-core",
+ "sp-crypto-hashing",
  "sp-runtime",
- "sp-tracing",
+ "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-transaction-pool",
  "substrate-prometheus-endpoint",
  "thiserror",
@@ -12443,8 +13145,8 @@ dependencies = [
 
 [[package]]
 name = "sc-transaction-pool-api"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "async-trait",
  "futures 0.3.30",
@@ -12459,24 +13161,24 @@ dependencies = [
 
 [[package]]
 name = "sc-utils"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "14.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "async-channel 1.9.0",
  "futures 0.3.30",
  "futures-timer",
  "lazy_static",
  "log",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "prometheus",
  "sp-arithmetic",
 ]
 
 [[package]]
 name = "scale-info"
-version = "2.11.2"
+version = "2.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c453e59a955f81fb62ee5d596b450383d699f152d350e9d23a0db2adb78e4c0"
+checksum = "eca070c12893629e2cc820a9761bedf6ce1dcddc9852984d1dc734b8bd9bd024"
 dependencies = [
  "bitvec",
  "cfg-if",
@@ -12488,11 +13190,11 @@ dependencies = [
 
 [[package]]
 name = "scale-info-derive"
-version = "2.11.2"
+version = "2.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18cf6c6447f813ef19eb450e985bcce6705f9ce7660db221b59093d15c79c4b7"
+checksum = "2d35494501194174bda522a32605929eefc9ecf7e0a326c26db1fdd85881eb62"
 dependencies = [
- "proc-macro-crate 1.3.1",
+ "proc-macro-crate 3.1.0",
  "proc-macro2",
  "quote",
  "syn 1.0.109",
@@ -12509,33 +13211,15 @@ dependencies = [
 
 [[package]]
 name = "schnellru"
-version = "0.2.1"
+version = "0.2.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "772575a524feeb803e5b0fcbc6dd9f367e579488197c94c6e4023aad2305774d"
+checksum = "c9a8ef13a93c54d20580de1e5c413e624e53121d42fc7e2c11d10ef7f8b02367"
 dependencies = [
  "ahash 0.8.11",
  "cfg-if",
  "hashbrown 0.13.2",
 ]
 
-[[package]]
-name = "schnorrkel"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "021b403afe70d81eea68f6ea12f6b3c9588e5d536a94c3bf80f15e7faa267862"
-dependencies = [
- "arrayref",
- "arrayvec 0.5.2",
- "curve25519-dalek 2.1.3",
- "getrandom 0.1.16",
- "merlin 2.0.1",
- "rand 0.7.3",
- "rand_core 0.5.1",
- "sha2 0.8.2",
- "subtle",
- "zeroize",
-]
-
 [[package]]
 name = "schnorrkel"
 version = "0.10.2"
@@ -12545,7 +13229,7 @@ dependencies = [
  "arrayref",
  "arrayvec 0.7.4",
  "curve25519-dalek-ng",
- "merlin 3.0.0",
+ "merlin",
  "rand_core 0.6.4",
  "sha2 0.9.9",
  "subtle-ng",
@@ -12558,14 +13242,16 @@ version = "0.11.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8de18f6d8ba0aad7045f5feae07ec29899c1112584a38509a84ad7b04451eaa0"
 dependencies = [
+ "aead",
  "arrayref",
  "arrayvec 0.7.4",
  "curve25519-dalek 4.1.2",
  "getrandom_or_panic",
- "merlin 3.0.0",
+ "merlin",
  "rand_core 0.6.4",
+ "serde_bytes",
  "sha2 0.10.8",
- "subtle",
+ "subtle 2.5.0",
  "zeroize",
 ]
 
@@ -12601,24 +13287,33 @@ dependencies = [
  "der",
  "generic-array 0.14.7",
  "pkcs8",
- "subtle",
+ "subtle 2.5.0",
  "zeroize",
 ]
 
+[[package]]
+name = "seccompiler"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "345a3e4dddf721a478089d4697b83c6c0a8f5bf16086f6c13397e4534eb6e2e5"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "secp256k1"
-version = "0.24.3"
+version = "0.28.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b1629c9c557ef9b293568b338dddfc8208c98a18c59d722a9d53f859d9c9b62"
+checksum = "d24b59d129cdadea20aea4fb2352fa053712e5d713eee47d700cd4b2bc002f10"
 dependencies = [
  "secp256k1-sys",
 ]
 
 [[package]]
 name = "secp256k1-sys"
-version = "0.6.1"
+version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83080e2c2fc1006e625be82e5d1eb6a43b7fd9578b617fcc55814daf286bba4b"
+checksum = "e5d1746aae42c19d583c3c1a8c646bfad910498e2051c551a7f2e3c0c9fbb7eb"
 dependencies = [
  "cc",
 ]
@@ -12634,11 +13329,11 @@ dependencies = [
 
 [[package]]
 name = "security-framework"
-version = "2.10.0"
+version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "770452e37cad93e0a50d5abc3990d2bc351c36d0328f86cefec2f2fb206eaef6"
+checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0"
 dependencies = [
- "bitflags 1.3.2",
+ "bitflags 2.5.0",
  "core-foundation",
  "core-foundation-sys",
  "libc",
@@ -12647,9 +13342,9 @@ dependencies = [
 
 [[package]]
 name = "security-framework-sys"
-version = "2.10.0"
+version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41f3cc463c0ef97e11c3461a9d3787412d30e8e7eb907c79180c4a57bf7c04ef"
+checksum = "317936bbbd05227752583946b9e66d7ce3b489f84e11a94a510b4437fef407d7"
 dependencies = [
  "core-foundation-sys",
  "libc",
@@ -12666,9 +13361,9 @@ dependencies = [
 
 [[package]]
 name = "semver"
-version = "1.0.22"
+version = "1.0.23"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "92d43fe69e652f3df9bdc2b85b2854a0825b86e4fb76bc44d945137d053639ca"
+checksum = "61697e0a1c7e512e84a621326239844a24d8207b4669b41bc18b32ea5cbf988b"
 dependencies = [
  "serde",
 ]
@@ -12681,29 +13376,38 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
 
 [[package]]
 name = "serde"
-version = "1.0.198"
+version = "1.0.203"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9846a40c979031340571da2545a4e5b7c4163bdae79b301d5f86d03979451fcc"
+checksum = "7253ab4de971e72fb7be983802300c30b5a7f0c2e56fab8abfc6a214307c0094"
 dependencies = [
  "serde_derive",
 ]
 
+[[package]]
+name = "serde_bytes"
+version = "0.11.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b8497c313fd43ab992087548117643f6fcd935cbf36f176ffda0aacf9591734"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "serde_derive"
-version = "1.0.198"
+version = "1.0.203"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e88edab869b01783ba905e7d0153f9fc1a6505a96e4ad3018011eedb838566d9"
+checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.59",
+ "syn 2.0.66",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.116"
+version = "1.0.117"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3e17db7126d17feb94eb3fad46bf1a96b034e8aacbc2e775fe81505f8b0b2813"
+checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3"
 dependencies = [
  "itoa",
  "ryu",
@@ -12712,9 +13416,9 @@ dependencies = [
 
 [[package]]
 name = "serde_spanned"
-version = "0.6.5"
+version = "0.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb3622f419d1296904700073ea6cc23ad690adbd66f13ea683df73298736f0c1"
+checksum = "79e674e01f999af37c49f70a6ede167a8a60b2503e56c5599532a65baa5969a0"
 dependencies = [
  "serde",
 ]
@@ -12745,15 +13449,14 @@ dependencies = [
 ]
 
 [[package]]
-name = "sha2"
-version = "0.8.2"
+name = "sha1"
+version = "0.10.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a256f46ea78a0c0d9ff00077504903ac881a1dafdc20da66545699e7776b3e69"
+checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
 dependencies = [
- "block-buffer 0.7.3",
- "digest 0.8.1",
- "fake-simd",
- "opaque-debug 0.2.3",
+ "cfg-if",
+ "cpufeatures",
+ "digest 0.10.7",
 ]
 
 [[package]]
@@ -12807,9 +13510,9 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 
 [[package]]
 name = "signal-hook-registry"
-version = "1.4.1"
+version = "1.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8229b473baa5980ac72ef434c4415e70c4b5e71b423043adb4ba059f89c99a1"
+checksum = "a9e9e0b4211b72e7b8b6e85c807d36c212bdb33ea8587f7569562a84df5465b1"
 dependencies = [
  "libc",
 ]
@@ -12857,6 +13560,11 @@ dependencies = [
  "similar",
 ]
 
+[[package]]
+name = "simple-mermaid"
+version = "0.1.0"
+source = "git+https://github.com/kianenigma/simple-mermaid.git?rev=e48b187bcfd5cc75111acd9d241f1bd36604344b#e48b187bcfd5cc75111acd9d241f1bd36604344b"
+
 [[package]]
 name = "siphasher"
 version = "0.3.11"
@@ -12880,14 +13588,14 @@ checksum = "826167069c09b99d56f31e9ae5c99049e932a98c9dc2dac47645b08dbbf76ba7"
 
 [[package]]
 name = "slot-range-helper"
-version = "1.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "enumn",
  "parity-scale-codec",
  "paste",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
@@ -12944,12 +13652,12 @@ dependencies = [
  "fnv",
  "futures-lite 1.13.0",
  "futures-util",
- "hashbrown 0.14.3",
+ "hashbrown 0.14.5",
  "hex",
  "hmac 0.12.1",
  "itertools 0.11.0",
  "libsecp256k1",
- "merlin 3.0.0",
+ "merlin",
  "no-std-net",
  "nom",
  "num-bigint",
@@ -12958,7 +13666,7 @@ dependencies = [
  "pbkdf2 0.12.2",
  "pin-project",
  "poly1305",
- "rand 0.8.5",
+ "rand",
  "rand_chacha 0.3.1",
  "ruzstd",
  "schnorrkel 0.10.2",
@@ -12993,15 +13701,15 @@ dependencies = [
  "futures-channel",
  "futures-lite 1.13.0",
  "futures-util",
- "hashbrown 0.14.3",
+ "hashbrown 0.14.5",
  "hex",
  "itertools 0.11.0",
  "log",
  "lru 0.11.1",
  "no-std-net",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "pin-project",
- "rand 0.8.5",
+ "rand",
  "rand_chacha 0.3.1",
  "serde",
  "serde_json",
@@ -13025,14 +13733,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "850948bee068e713b8ab860fe1adc4d109676ab4c3b621fd8147f06b261f2f85"
 dependencies = [
  "aes-gcm",
- "blake2",
+ "blake2 0.10.6",
  "chacha20poly1305",
  "curve25519-dalek 4.1.2",
  "rand_core 0.6.4",
  "ring 0.17.8",
  "rustc_version",
  "sha2 0.10.8",
- "subtle",
+ "subtle 2.5.0",
 ]
 
 [[package]]
@@ -13047,9 +13755,9 @@ dependencies = [
 
 [[package]]
 name = "socket2"
-version = "0.5.6"
+version = "0.5.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05ffd9c0a93b7543e062e759284fcf5f5e3b098501104bfbdde4d404db792871"
+checksum = "ce305eb0b4296696835b71df73eb912e0f1ffd2556a501fcede6e0c50349191c"
 dependencies = [
  "libc",
  "windows-sys 0.52.0",
@@ -13065,17 +13773,17 @@ dependencies = [
  "bytes",
  "flate2",
  "futures 0.3.30",
- "http",
+ "http 0.2.12",
  "httparse",
  "log",
- "rand 0.8.5",
+ "rand",
  "sha-1",
 ]
 
 [[package]]
 name = "sp-api"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "26.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "hash-db",
  "log",
@@ -13083,11 +13791,11 @@ dependencies = [
  "scale-info",
  "sp-api-proc-macro",
  "sp-core",
- "sp-externalities",
+ "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-metadata-ir",
  "sp-runtime",
  "sp-state-machine",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-trie",
  "sp-version",
  "thiserror",
@@ -13095,78 +13803,96 @@ dependencies = [
 
 [[package]]
 name = "sp-api-proc-macro"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "15.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "Inflector",
- "blake2",
- "expander 2.1.0",
- "proc-macro-crate 1.3.1",
+ "blake2 0.10.6",
+ "expander 2.0.0",
+ "proc-macro-crate 3.1.0",
  "proc-macro2",
  "quote",
- "syn 2.0.59",
+ "syn 2.0.66",
 ]
 
 [[package]]
 name = "sp-application-crypto"
-version = "23.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "30.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
  "serde",
  "sp-core",
  "sp-io",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "sp-arithmetic"
-version = "16.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "23.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "integer-sqrt",
  "num-traits",
  "parity-scale-codec",
  "scale-info",
  "serde",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "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-authority-discovery"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "26.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-api",
  "sp-application-crypto",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "sp-block-builder"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "26.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "sp-api",
  "sp-inherents",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "sp-blockchain"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "futures 0.3.30",
  "log",
  "parity-scale-codec",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "schnellru",
  "sp-api",
  "sp-consensus",
@@ -13178,8 +13904,8 @@ dependencies = [
 
 [[package]]
 name = "sp-consensus"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "0.32.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "async-trait",
  "futures 0.3.30",
@@ -13193,8 +13919,8 @@ dependencies = [
 
 [[package]]
 name = "sp-consensus-aura"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "0.32.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -13204,14 +13930,14 @@ dependencies = [
  "sp-consensus-slots",
  "sp-inherents",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-timestamp",
 ]
 
 [[package]]
 name = "sp-consensus-babe"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "0.32.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -13223,14 +13949,14 @@ dependencies = [
  "sp-core",
  "sp-inherents",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-timestamp",
 ]
 
 [[package]]
 name = "sp-consensus-beefy"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "13.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "lazy_static",
  "parity-scale-codec",
@@ -13239,17 +13965,18 @@ dependencies = [
  "sp-api",
  "sp-application-crypto",
  "sp-core",
+ "sp-crypto-hashing",
  "sp-io",
  "sp-mmr-primitives",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "strum 0.24.1",
 ]
 
 [[package]]
 name = "sp-consensus-grandpa"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "13.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "finality-grandpa",
  "log",
@@ -13261,31 +13988,31 @@ dependencies = [
  "sp-core",
  "sp-keystore",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "sp-consensus-slots"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "0.32.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
  "serde",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-timestamp",
 ]
 
 [[package]]
 name = "sp-core"
-version = "21.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
- "array-bytes",
- "arrayvec 0.7.4",
+ "array-bytes 6.2.3",
  "bandersnatch_vrfs",
+ "bip39",
  "bitflags 1.3.2",
- "blake2",
+ "blake2 0.10.6",
  "bounded-collections",
  "bs58 0.5.1",
  "dyn-clonable",
@@ -13294,39 +14021,66 @@ dependencies = [
  "hash-db",
  "hash256-std-hasher",
  "impl-serde",
- "lazy_static",
+ "itertools 0.10.5",
  "libsecp256k1",
  "log",
- "merlin 2.0.1",
+ "merlin",
  "parity-scale-codec",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "paste",
  "primitive-types",
- "rand 0.8.5",
- "regex",
+ "rand",
  "scale-info",
- "schnorrkel 0.9.1",
+ "schnorrkel 0.11.4",
  "secp256k1",
  "secrecy",
  "serde",
- "sp-core-hashing",
- "sp-debug-derive",
- "sp-externalities",
- "sp-runtime-interface",
- "sp-std",
- "sp-storage",
+ "sp-crypto-hashing",
+ "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "ss58-registry",
  "substrate-bip39",
  "thiserror",
- "tiny-bip39",
  "tracing",
+ "w3f-bls",
  "zeroize",
 ]
 
 [[package]]
 name = "sp-core-hashing"
-version = "9.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "15.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+dependencies = [
+ "sp-crypto-hashing",
+]
+
+[[package]]
+name = "sp-crypto-ec-utils"
+version = "0.10.0"
+source = "git+https://github.com/paritytech/polkadot-sdk#7b6b783cd1a3953ef5fa6e53f3965b1454e3efc8"
+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.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "blake2b_simd",
  "byteorder",
@@ -13337,74 +14091,94 @@ dependencies = [
 ]
 
 [[package]]
-name = "sp-core-hashing-proc-macro"
-version = "9.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+name = "sp-crypto-hashing-proc-macro"
+version = "0.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "quote",
- "sp-core-hashing",
- "syn 2.0.59",
+ "sp-crypto-hashing",
+ "syn 2.0.66",
 ]
 
 [[package]]
 name = "sp-database"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "10.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "kvdb",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
+]
+
+[[package]]
+name = "sp-debug-derive"
+version = "14.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
 ]
 
 [[package]]
 name = "sp-debug-derive"
-version = "8.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "14.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk#7b6b783cd1a3953ef5fa6e53f3965b1454e3efc8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.59",
+ "syn 2.0.66",
 ]
 
 [[package]]
 name = "sp-externalities"
-version = "0.19.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "0.25.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "environmental",
  "parity-scale-codec",
- "sp-std",
- "sp-storage",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+]
+
+[[package]]
+name = "sp-externalities"
+version = "0.25.0"
+source = "git+https://github.com/paritytech/polkadot-sdk#7b6b783cd1a3953ef5fa6e53f3965b1454e3efc8"
+dependencies = [
+ "environmental",
+ "parity-scale-codec",
+ "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk)",
 ]
 
 [[package]]
 name = "sp-genesis-builder"
-version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "0.7.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "serde_json",
  "sp-api",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "sp-inherents"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "26.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "async-trait",
  "impl-trait-for-tuples",
  "parity-scale-codec",
  "scale-info",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "thiserror",
 ]
 
 [[package]]
 name = "sp-io"
-version = "23.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "30.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "bytes",
  "ed25519-dalek",
@@ -13414,12 +14188,13 @@ dependencies = [
  "rustversion",
  "secp256k1",
  "sp-core",
- "sp-externalities",
+ "sp-crypto-hashing",
+ "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-keystore",
- "sp-runtime-interface",
+ "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-state-machine",
- "sp-std",
- "sp-tracing",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-trie",
  "tracing",
  "tracing-core",
@@ -13427,10 +14202,9 @@ dependencies = [
 
 [[package]]
 name = "sp-keyring"
-version = "24.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "31.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
- "lazy_static",
  "sp-core",
  "sp-runtime",
  "strum 0.24.1",
@@ -13438,20 +14212,20 @@ dependencies = [
 
 [[package]]
 name = "sp-keystore"
-version = "0.27.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "0.34.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "parity-scale-codec",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "sp-core",
- "sp-externalities",
+ "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "thiserror",
 ]
 
 [[package]]
 name = "sp-maybe-compressed-blob"
-version = "4.1.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "11.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "thiserror",
  "zstd 0.12.4",
@@ -13459,19 +14233,31 @@ dependencies = [
 
 [[package]]
 name = "sp-metadata-ir"
-version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "0.6.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "frame-metadata",
  "parity-scale-codec",
  "scale-info",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+]
+
+[[package]]
+name = "sp-mixnet"
+version = "0.4.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+dependencies = [
+ "parity-scale-codec",
+ "scale-info",
+ "sp-api",
+ "sp-application-crypto",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "sp-mmr-primitives"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "26.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "ckb-merkle-mountain-range",
  "log",
@@ -13480,16 +14266,16 @@ dependencies = [
  "serde",
  "sp-api",
  "sp-core",
- "sp-debug-derive",
+ "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "thiserror",
 ]
 
 [[package]]
 name = "sp-npos-elections"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "26.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -13497,13 +14283,13 @@ dependencies = [
  "sp-arithmetic",
  "sp-core",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "sp-offchain"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "26.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "sp-api",
  "sp-core",
@@ -13512,8 +14298,8 @@ dependencies = [
 
 [[package]]
 name = "sp-panic-handler"
-version = "8.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "13.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "backtrace",
  "lazy_static",
@@ -13522,8 +14308,8 @@ dependencies = [
 
 [[package]]
 name = "sp-rpc"
-version = "6.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "26.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "rustc-hash",
  "serde",
@@ -13532,60 +14318,95 @@ dependencies = [
 
 [[package]]
 name = "sp-runtime"
-version = "24.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "31.0.1"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
+ "docify",
  "either",
  "hash256-std-hasher",
  "impl-trait-for-tuples",
  "log",
  "parity-scale-codec",
  "paste",
- "rand 0.8.5",
+ "rand",
  "scale-info",
  "serde",
+ "simple-mermaid",
  "sp-application-crypto",
  "sp-arithmetic",
  "sp-core",
  "sp-io",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-weights",
 ]
 
 [[package]]
 name = "sp-runtime-interface"
-version = "17.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "24.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "bytes",
  "impl-trait-for-tuples",
  "parity-scale-codec",
  "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?branch=release-polkadot-v1.7.2)",
+ "sp-runtime-interface-proc-macro 17.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "static_assertions",
+]
+
+[[package]]
+name = "sp-runtime-interface"
+version = "24.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk#7b6b783cd1a3953ef5fa6e53f3965b1454e3efc8"
+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)",
+ "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 = "11.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "17.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "Inflector",
- "proc-macro-crate 1.3.1",
+ "expander 2.0.0",
+ "proc-macro-crate 3.1.0",
  "proc-macro2",
  "quote",
- "syn 2.0.59",
+ "syn 2.0.66",
+]
+
+[[package]]
+name = "sp-runtime-interface-proc-macro"
+version = "17.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk#7b6b783cd1a3953ef5fa6e53f3965b1454e3efc8"
+dependencies = [
+ "Inflector",
+ "expander 2.0.0",
+ "proc-macro-crate 3.1.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
 ]
 
 [[package]]
 name = "sp-session"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "27.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -13594,13 +14415,13 @@ dependencies = [
  "sp-keystore",
  "sp-runtime",
  "sp-staking",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "sp-staking"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "26.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -13608,24 +14429,24 @@ dependencies = [
  "serde",
  "sp-core",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "sp-state-machine"
-version = "0.28.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "0.35.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "hash-db",
  "log",
  "parity-scale-codec",
- "parking_lot 0.12.1",
- "rand 0.8.5",
+ "parking_lot 0.12.3",
+ "rand",
  "smallvec",
  "sp-core",
- "sp-externalities",
+ "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-panic-handler",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-trie",
  "thiserror",
  "tracing",
@@ -13634,75 +14455,104 @@ dependencies = [
 
 [[package]]
 name = "sp-statement-store"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "10.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "aes-gcm",
  "curve25519-dalek 4.1.2",
  "ed25519-dalek",
  "hkdf",
  "parity-scale-codec",
- "rand 0.8.5",
+ "rand",
  "scale-info",
  "sha2 0.10.8",
  "sp-api",
  "sp-application-crypto",
  "sp-core",
- "sp-externalities",
+ "sp-crypto-hashing",
+ "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-runtime",
- "sp-runtime-interface",
- "sp-std",
+ "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "thiserror",
  "x25519-dalek 2.0.1",
 ]
 
 [[package]]
 name = "sp-std"
-version = "8.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "14.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+
+[[package]]
+name = "sp-std"
+version = "14.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk#7b6b783cd1a3953ef5fa6e53f3965b1454e3efc8"
 
 [[package]]
 name = "sp-storage"
-version = "13.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "19.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
  "ref-cast",
  "serde",
- "sp-debug-derive",
- "sp-std",
+ "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+]
+
+[[package]]
+name = "sp-storage"
+version = "19.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk#7b6b783cd1a3953ef5fa6e53f3965b1454e3efc8"
+dependencies = [
+ "impl-serde",
+ "parity-scale-codec",
+ "ref-cast",
+ "serde",
+ "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk)",
 ]
 
 [[package]]
 name = "sp-timestamp"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "26.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
  "sp-inherents",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "thiserror",
 ]
 
 [[package]]
 name = "sp-tracing"
-version = "10.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "16.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "parity-scale-codec",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "tracing",
  "tracing-core",
  "tracing-subscriber 0.2.25",
 ]
 
+[[package]]
+name = "sp-tracing"
+version = "16.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk#7b6b783cd1a3953ef5fa6e53f3965b1454e3efc8"
+dependencies = [
+ "parity-scale-codec",
+ "tracing",
+ "tracing-core",
+ "tracing-subscriber 0.3.18",
+]
+
 [[package]]
 name = "sp-transaction-pool"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "26.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "sp-api",
  "sp-runtime",
@@ -13710,8 +14560,8 @@ dependencies = [
 
 [[package]]
 name = "sp-transaction-storage-proof"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "26.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -13719,27 +14569,28 @@ dependencies = [
  "sp-core",
  "sp-inherents",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-trie",
 ]
 
 [[package]]
 name = "sp-trie"
-version = "22.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "29.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "ahash 0.8.11",
  "hash-db",
- "hashbrown 0.13.2",
  "lazy_static",
  "memory-db",
  "nohash-hasher",
  "parity-scale-codec",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
+ "rand",
  "scale-info",
  "schnellru",
  "sp-core",
- "sp-std",
+ "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "thiserror",
  "tracing",
  "trie-db",
@@ -13748,58 +14599,68 @@ dependencies = [
 
 [[package]]
 name = "sp-version"
-version = "22.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "29.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
  "parity-wasm",
  "scale-info",
  "serde",
- "sp-core-hashing-proc-macro",
+ "sp-crypto-hashing-proc-macro",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-version-proc-macro",
  "thiserror",
 ]
 
 [[package]]
 name = "sp-version-proc-macro"
-version = "8.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "13.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "parity-scale-codec",
  "proc-macro2",
  "quote",
- "syn 2.0.59",
+ "syn 2.0.66",
 ]
 
 [[package]]
 name = "sp-wasm-interface"
-version = "14.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "20.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "anyhow",
  "impl-trait-for-tuples",
  "log",
  "parity-scale-codec",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "wasmtime",
 ]
 
 [[package]]
-name = "sp-weights"
+name = "sp-wasm-interface"
 version = "20.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+source = "git+https://github.com/paritytech/polkadot-sdk#7b6b783cd1a3953ef5fa6e53f3965b1454e3efc8"
+dependencies = [
+ "impl-trait-for-tuples",
+ "log",
+ "parity-scale-codec",
+]
+
+[[package]]
+name = "sp-weights"
+version = "27.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
+ "bounded-collections",
  "parity-scale-codec",
  "scale-info",
  "serde",
  "smallvec",
  "sp-arithmetic",
- "sp-core",
- "sp-debug-derive",
- "sp-std",
+ "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
@@ -13840,11 +14701,10 @@ dependencies = [
 
 [[package]]
 name = "sqlformat"
-version = "0.2.3"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ce81b7bd7c4493975347ef60d8c7e8b742d4694f4c49f93e0a12ea263938176c"
+checksum = "f895e3734318cc55f1fe66258926c9b910c124d47520339efecbb6c59cec7c1f"
 dependencies = [
- "itertools 0.12.1",
  "nom",
  "unicode_categories",
 ]
@@ -13981,116 +14841,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
 
 [[package]]
-name = "staging-kusama-runtime"
-version = "1.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+name = "staging-parachain-info"
+version = "0.7.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
- "binary-merkle-tree",
- "bitvec",
- "frame-benchmarking",
- "frame-election-provider-support",
- "frame-executive",
+ "cumulus-primitives-core",
  "frame-support",
  "frame-system",
- "frame-system-benchmarking",
- "frame-system-rpc-runtime-api",
- "frame-try-runtime",
- "hex-literal 0.4.1",
- "kusama-runtime-constants",
- "log",
- "pallet-authority-discovery",
- "pallet-authorship",
- "pallet-babe",
- "pallet-bags-list",
- "pallet-balances",
- "pallet-beefy",
- "pallet-beefy-mmr",
- "pallet-bounties",
- "pallet-child-bounties",
- "pallet-collective",
- "pallet-conviction-voting",
- "pallet-democracy",
- "pallet-election-provider-multi-phase",
- "pallet-election-provider-support-benchmarking",
- "pallet-elections-phragmen",
- "pallet-fast-unstake",
- "pallet-grandpa",
- "pallet-identity",
- "pallet-im-online",
- "pallet-indices",
- "pallet-membership",
- "pallet-message-queue",
- "pallet-mmr",
- "pallet-multisig",
- "pallet-nis",
- "pallet-nomination-pools",
- "pallet-nomination-pools-benchmarking",
- "pallet-nomination-pools-runtime-api",
- "pallet-offences",
- "pallet-offences-benchmarking",
- "pallet-preimage",
- "pallet-proxy",
- "pallet-ranked-collective",
- "pallet-recovery",
- "pallet-referenda",
- "pallet-scheduler",
- "pallet-session",
- "pallet-session-benchmarking",
- "pallet-society",
- "pallet-staking",
- "pallet-staking-runtime-api",
- "pallet-state-trie-migration",
- "pallet-timestamp",
- "pallet-tips",
- "pallet-transaction-payment",
- "pallet-transaction-payment-rpc-runtime-api",
- "pallet-treasury",
- "pallet-utility",
- "pallet-vesting",
- "pallet-whitelist",
- "pallet-xcm",
- "pallet-xcm-benchmarks",
- "parity-scale-codec",
- "polkadot-primitives",
- "polkadot-runtime-common",
- "polkadot-runtime-parachains",
- "rustc-hex",
- "scale-info",
- "serde",
- "serde_derive",
- "smallvec",
- "sp-api",
- "sp-application-crypto",
- "sp-arithmetic",
- "sp-authority-discovery",
- "sp-block-builder",
- "sp-consensus-babe",
- "sp-consensus-beefy",
- "sp-core",
- "sp-inherents",
- "sp-io",
- "sp-mmr-primitives",
- "sp-npos-elections",
- "sp-offchain",
+ "parity-scale-codec",
+ "scale-info",
  "sp-runtime",
- "sp-session",
- "sp-staking",
- "sp-std",
- "sp-storage",
- "sp-transaction-pool",
- "sp-version",
- "staging-xcm",
- "staging-xcm-builder",
- "staging-xcm-executor",
- "static_assertions",
- "substrate-wasm-builder",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "staging-xcm"
-version = "1.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
+ "array-bytes 6.2.3",
  "bounded-collections",
  "derivative",
  "environmental",
@@ -14105,8 +14874,8 @@ dependencies = [
 
 [[package]]
 name = "staging-xcm-builder"
-version = "1.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -14119,7 +14888,7 @@ dependencies = [
  "sp-arithmetic",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-weights",
  "staging-xcm",
  "staging-xcm-executor",
@@ -14127,8 +14896,8 @@ dependencies = [
 
 [[package]]
 name = "staging-xcm-executor"
-version = "1.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "environmental",
  "frame-benchmarking",
@@ -14136,11 +14905,12 @@ dependencies = [
  "impl-trait-for-tuples",
  "log",
  "parity-scale-codec",
+ "scale-info",
  "sp-arithmetic",
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-weights",
  "staging-xcm",
 ]
@@ -14179,6 +14949,19 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "strobe-rs"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fabb238a1cccccfa4c4fb703670c0d157e1256c1ba695abf1b93bd2bb14bab2d"
+dependencies = [
+ "bitflags 1.3.2",
+ "byteorder",
+ "keccak",
+ "subtle 2.5.0",
+ "zeroize",
+]
+
 [[package]]
 name = "strsim"
 version = "0.11.1"
@@ -14200,7 +14983,7 @@ version = "0.26.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5d8cec3501a5194c432b2b7976db6b7d10ec95c253208b45f83f7136aa985e29"
 dependencies = [
- "strum_macros 0.26.2",
+ "strum_macros 0.26.4",
 ]
 
 [[package]]
@@ -14218,15 +15001,15 @@ dependencies = [
 
 [[package]]
 name = "strum_macros"
-version = "0.26.2"
+version = "0.26.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6cf59daf282c0a494ba14fd21610a0325f9f90ec9d1231dea26bcb1d696c946"
+checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be"
 dependencies = [
- "heck 0.4.1",
+ "heck 0.5.0",
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 2.0.59",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -14251,14 +15034,14 @@ dependencies = [
  "byteorder",
  "crunchy",
  "lazy_static",
- "rand 0.8.5",
+ "rand",
  "rustc-hex",
 ]
 
 [[package]]
 name = "substrate-build-script-utils"
-version = "3.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "11.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 
 [[package]]
 name = "substrate-fixed"
@@ -14273,12 +15056,12 @@ dependencies = [
 
 [[package]]
 name = "substrate-frame-rpc-system"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "frame-system-rpc-runtime-api",
  "futures 0.3.30",
- "jsonrpsee",
+ "jsonrpsee 0.20.3",
  "log",
  "parity-scale-codec",
  "sc-rpc-api",
@@ -14292,10 +15075,10 @@ dependencies = [
 
 [[package]]
 name = "substrate-prometheus-endpoint"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "0.17.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
- "hyper",
+ "hyper 0.14.29",
  "log",
  "prometheus",
  "thiserror",
@@ -14304,11 +15087,11 @@ dependencies = [
 
 [[package]]
 name = "substrate-rpc-client"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "0.33.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "async-trait",
- "jsonrpsee",
+ "jsonrpsee 0.20.3",
  "log",
  "sc-rpc-api",
  "serde",
@@ -14317,10 +15100,10 @@ dependencies = [
 
 [[package]]
 name = "substrate-state-trie-migration-rpc"
-version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "27.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
- "jsonrpsee",
+ "jsonrpsee 0.20.3",
  "parity-scale-codec",
  "sc-client-api",
  "sc-rpc-api",
@@ -14335,7 +15118,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-utils"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "futures 0.3.30",
  "tokio",
@@ -14353,27 +15136,33 @@ dependencies = [
 
 [[package]]
 name = "substrate-wasm-builder"
-version = "5.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "17.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
- "ansi_term",
  "build-helper",
  "cargo_metadata",
+ "console",
  "filetime",
  "parity-wasm",
  "sp-maybe-compressed-blob",
  "strum 0.24.1",
  "tempfile",
- "toml 0.7.8",
+ "toml 0.8.14",
  "walkdir",
  "wasm-opt",
 ]
 
 [[package]]
 name = "subtle"
-version = "2.4.1"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee"
+
+[[package]]
+name = "subtle"
+version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
+checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
 
 [[package]]
 name = "subtle-ng"
@@ -14394,9 +15183,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.59"
+version = "2.0.66"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a6531ffc7b071655e4ce2e04bd464c4830bb585a61cabb96cf808f05172615a"
+checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -14421,6 +15210,17 @@ dependencies = [
  "unicode-xid",
 ]
 
+[[package]]
+name = "synstructure"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+]
+
 [[package]]
 name = "system-configuration"
 version = "0.5.1"
@@ -14470,8 +15270,8 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "85b77fafb263dd9d05cbeac119526425676db3784113aa9295c88498cbf8bff1"
 dependencies = [
  "cfg-if",
- "fastrand 2.0.2",
- "rustix 0.38.32",
+ "fastrand 2.1.0",
+ "rustix 0.38.34",
  "windows-sys 0.52.0",
 ]
 
@@ -14484,6 +15284,16 @@ dependencies = [
  "winapi-util",
 ]
 
+[[package]]
+name = "terminal_size"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7"
+dependencies = [
+ "rustix 0.38.34",
+ "windows-sys 0.48.0",
+]
+
 [[package]]
 name = "termtree"
 version = "0.4.1"
@@ -14492,9 +15302,9 @@ checksum = "3369f5ac52d5eb6ab48c6b4ffdc8efbcad6b89c765749064ba298f2c68a16a76"
 
 [[package]]
 name = "thiserror"
-version = "1.0.58"
+version = "1.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03468839009160513471e86a034bb2c5c0e4baae3b43f79ffc55c4a5427b3297"
+checksum = "c546c80d6be4bc6a00c0f01730c08df82eaa7a7a61f11d656526506112cc1709"
 dependencies = [
  "thiserror-impl",
 ]
@@ -14516,18 +15326,18 @@ checksum = "e4c60d69f36615a077cc7663b9cb8e42275722d23e58a7fa3d2c7f2915d09d04"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.59",
+ "syn 2.0.66",
 ]
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.58"
+version = "1.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c61f3ba182994efc43764a46c018c347bc492c79f024e705f46567b418f6d4f7"
+checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.59",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -14621,31 +15431,22 @@ dependencies = [
 ]
 
 [[package]]
-name = "tiny-bip39"
-version = "1.0.0"
+name = "tiny-keccak"
+version = "2.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62cc94d358b5a1e84a5cb9109f559aa3c4d634d2b1b4de3d0fa4adc7c78e2861"
+checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237"
 dependencies = [
- "anyhow",
- "hmac 0.12.1",
- "once_cell",
- "pbkdf2 0.11.0",
- "rand 0.8.5",
- "rustc-hash",
- "sha2 0.10.8",
- "thiserror",
- "unicode-normalization",
- "wasm-bindgen",
- "zeroize",
+ "crunchy",
 ]
 
 [[package]]
-name = "tiny-keccak"
-version = "2.0.2"
+name = "tinystr"
+version = "0.7.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c9d3793400a45f954c52e73d068316d76b6f4e36977e3fcebb13a2721e80237"
+checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
 dependencies = [
- "crunchy",
+ "displaydoc",
+ "zerovec",
 ]
 
 [[package]]
@@ -14665,32 +15466,32 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.37.0"
+version = "1.38.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787"
+checksum = "ba4f4a02a7a80d6f274636f0aa95c7e383b912d41fe721a31f29e29698585a4a"
 dependencies = [
  "backtrace",
  "bytes",
  "libc",
  "mio",
  "num_cpus",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "pin-project-lite 0.2.14",
  "signal-hook-registry",
- "socket2 0.5.6",
+ "socket2 0.5.7",
  "tokio-macros",
  "windows-sys 0.48.0",
 ]
 
 [[package]]
 name = "tokio-macros"
-version = "2.2.0"
+version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
+checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.59",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -14710,7 +15511,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f57eb36ecbe0fc510036adff84824dd3c24bb781e21bfa67b69d556aa85214f"
 dependencies = [
  "pin-project",
- "rand 0.8.5",
+ "rand",
  "tokio",
 ]
 
@@ -14720,7 +15521,7 @@ version = "0.24.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081"
 dependencies = [
- "rustls 0.21.10",
+ "rustls 0.21.12",
  "tokio",
 ]
 
@@ -14750,9 +15551,9 @@ dependencies = [
 
 [[package]]
 name = "tokio-util"
-version = "0.7.10"
+version = "0.7.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15"
+checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1"
 dependencies = [
  "bytes",
  "futures-core",
@@ -14760,7 +15561,6 @@ dependencies = [
  "futures-sink",
  "pin-project-lite 0.2.14",
  "tokio",
- "tracing",
 ]
 
 [[package]]
@@ -14774,61 +15574,58 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.7.8"
+version = "0.8.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd79e69d3b627db300ff956027cc6c3798cef26d22526befdfcd12feeb6d2257"
+checksum = "6f49eb2ab21d2f26bd6db7bf383edc527a7ebaee412d17af4d40fdccd442f335"
 dependencies = [
  "serde",
  "serde_spanned",
  "toml_datetime",
- "toml_edit 0.19.15",
+ "toml_edit 0.22.14",
 ]
 
 [[package]]
-name = "toml"
-version = "0.8.2"
+name = "toml_datetime"
+version = "0.6.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d"
+checksum = "4badfd56924ae69bcc9039335b2e017639ce3f9b001c393c1b2d1ef846ce2cbf"
 dependencies = [
  "serde",
- "serde_spanned",
- "toml_datetime",
- "toml_edit 0.20.2",
 ]
 
 [[package]]
-name = "toml_datetime"
-version = "0.6.3"
+name = "toml_edit"
+version = "0.20.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b"
+checksum = "70f427fce4d84c72b5b732388bf4a9f4531b53f74e2887e3ecb2481f68f66d81"
 dependencies = [
- "serde",
+ "indexmap 2.2.6",
+ "toml_datetime",
+ "winnow 0.5.40",
 ]
 
 [[package]]
 name = "toml_edit"
-version = "0.19.15"
+version = "0.21.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b5bb770da30e5cbfde35a2d7b9b8a2c4b8ef89548a7a6aeab5c9a576e3e7421"
+checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
 dependencies = [
  "indexmap 2.2.6",
- "serde",
- "serde_spanned",
  "toml_datetime",
- "winnow",
+ "winnow 0.5.40",
 ]
 
 [[package]]
 name = "toml_edit"
-version = "0.20.2"
+version = "0.22.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338"
+checksum = "f21c7aaf97f1bd9ca9d4f9e73b0a6c74bd5afef56f2bc931943a6e1c37e04e38"
 dependencies = [
  "indexmap 2.2.6",
  "serde",
  "serde_spanned",
  "toml_datetime",
- "winnow",
+ "winnow 0.6.13",
 ]
 
 [[package]]
@@ -14837,6 +15634,11 @@ version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"
 dependencies = [
+ "futures-core",
+ "futures-util",
+ "pin-project",
+ "pin-project-lite 0.2.14",
+ "tokio",
  "tower-layer",
  "tower-service",
  "tracing",
@@ -14852,8 +15654,8 @@ dependencies = [
  "bytes",
  "futures-core",
  "futures-util",
- "http",
- "http-body",
+ "http 0.2.12",
+ "http-body 0.4.6",
  "http-range-header",
  "pin-project-lite 0.2.14",
  "tower-layer",
@@ -14892,7 +15694,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.59",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -14917,11 +15719,10 @@ dependencies = [
 
 [[package]]
 name = "tracing-gum"
-version = "1.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "coarsetime",
- "polkadot-node-jaeger",
  "polkadot-primitives",
  "tracing",
  "tracing-gum-proc-macro",
@@ -14929,14 +15730,14 @@ dependencies = [
 
 [[package]]
 name = "tracing-gum-proc-macro"
-version = "1.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "5.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
- "expander 2.1.0",
- "proc-macro-crate 1.3.1",
+ "expander 2.0.0",
+ "proc-macro-crate 3.1.0",
  "proc-macro2",
  "quote",
- "syn 2.0.59",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -14963,32 +15764,38 @@ dependencies = [
 
 [[package]]
 name = "tracing-opentelemetry"
-version = "0.17.4"
+version = "0.23.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fbbe89715c1dbbb790059e2565353978564924ee85017b5fff365c872ff6721f"
+checksum = "a9be14ba1bbe4ab79e9229f7f89fab8d120b865859f10527f31c033e599d2284"
 dependencies = [
+ "js-sys",
  "once_cell",
- "opentelemetry 0.17.0",
+ "opentelemetry 0.22.0",
+ "opentelemetry_sdk 0.22.1",
+ "smallvec",
  "tracing",
  "tracing-core",
- "tracing-log 0.1.4",
+ "tracing-log 0.2.0",
  "tracing-subscriber 0.3.18",
+ "web-time",
 ]
 
 [[package]]
 name = "tracing-opentelemetry"
-version = "0.21.0"
+version = "0.24.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75327c6b667828ddc28f5e3f169036cb793c3f588d83bf0f262a7f062ffed3c8"
+checksum = "f68803492bf28ab40aeccaecc7021096bd256baf7ca77c3d425d89b35a7be4e4"
 dependencies = [
+ "js-sys",
  "once_cell",
- "opentelemetry 0.20.0",
- "opentelemetry_sdk",
+ "opentelemetry 0.23.0",
+ "opentelemetry_sdk 0.23.0",
  "smallvec",
  "tracing",
  "tracing-core",
- "tracing-log 0.1.4",
+ "tracing-log 0.2.0",
  "tracing-subscriber 0.3.18",
+ "web-time",
 ]
 
 [[package]]
@@ -15010,7 +15817,7 @@ dependencies = [
  "ansi_term",
  "chrono",
  "lazy_static",
- "matchers",
+ "matchers 0.0.1",
  "parking_lot 0.11.2",
  "regex",
  "serde",
@@ -15030,19 +15837,23 @@ version = "0.3.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b"
 dependencies = [
+ "matchers 0.1.0",
  "nu-ansi-term",
+ "once_cell",
+ "regex",
  "sharded-slab",
  "smallvec",
  "thread_local",
+ "tracing",
  "tracing-core",
  "tracing-log 0.2.0",
 ]
 
 [[package]]
 name = "trauma"
-version = "2.2.4"
+version = "2.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59ae7ce1c475d187abe9d40c6584286941aa4de07c0bff6873538f53297a843a"
+checksum = "3ace5c192c2741c39c4e74f5456e20331b406625487aea18bdf405dbb08a53fe"
 dependencies = [
  "form_urlencoded",
  "futures 0.3.30",
@@ -15055,15 +15866,15 @@ dependencies = [
  "thiserror",
  "tokio",
  "tracing",
- "tracing-opentelemetry 0.21.0",
+ "tracing-opentelemetry 0.24.0",
  "tracing-subscriber 0.3.18",
 ]
 
 [[package]]
 name = "trie-db"
-version = "0.27.1"
+version = "0.28.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "767abe6ffed88a1889671a102c2861ae742726f52e0a5a425b92c9fbfa7e9c85"
+checksum = "ff28e0f815c2fea41ebddf148e008b077d2faddb026c9555b29696114d602642"
 dependencies = [
  "hash-db",
  "hashbrown 0.13.2",
@@ -15097,7 +15908,7 @@ dependencies = [
  "idna 0.2.3",
  "ipnet",
  "lazy_static",
- "rand 0.8.5",
+ "rand",
  "smallvec",
  "socket2 0.4.10",
  "thiserror",
@@ -15118,7 +15929,7 @@ dependencies = [
  "ipconfig",
  "lazy_static",
  "lru-cache",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "resolv-conf",
  "smallvec",
  "thiserror",
@@ -15135,8 +15946,8 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 
 [[package]]
 name = "try-runtime-cli"
-version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "0.38.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "async-trait",
  "clap",
@@ -15153,8 +15964,8 @@ dependencies = [
  "sp-consensus-aura",
  "sp-consensus-babe",
  "sp-core",
- "sp-debug-derive",
- "sp-externalities",
+ "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-inherents",
  "sp-io",
  "sp-keystore",
@@ -15183,7 +15994,7 @@ checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675"
 dependencies = [
  "cfg-if",
  "digest 0.10.7",
- "rand 0.8.5",
+ "rand",
  "static_assertions",
 ]
 
@@ -15211,15 +16022,6 @@ dependencies = [
  "static_assertions",
 ]
 
-[[package]]
-name = "unicase"
-version = "2.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89"
-dependencies = [
- "version_check",
-]
-
 [[package]]
 name = "unicode-bidi"
 version = "0.3.15"
@@ -15234,9 +16036,9 @@ checksum = "3354b9ac3fae1ff6755cb6db53683adb661634f67557942dea4facebec0fee4b"
 
 [[package]]
 name = "unicode-normalization"
-version = "0.1.23"
+version = "0.1.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a56d1686db2308d901306f92a263857ef59ea39678a5458e7cb17f01415101f5"
+checksum = "5c5713f0fc4b5db668a2ac63cdb7bb4469d8c9fed047b1d0292cc7b0ce2ba921"
 dependencies = [
  "tinyvec",
 ]
@@ -15249,9 +16051,9 @@ checksum = "d4c87d22b6e3f4a18d4d40ef354e97c90fcb14dd91d7dc0aa9d8a1172ebf7202"
 
 [[package]]
 name = "unicode-width"
-version = "0.1.11"
+version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e51733f11c9c4f72aa0c160008246859e340b00807569a0da0e7a1079b27ba85"
+checksum = "0336d538f7abc86d282a4189614dfaa90810dfc2c6f6427eaf88e16311dd225d"
 
 [[package]]
 name = "unicode-xid"
@@ -15272,7 +16074,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea"
 dependencies = [
  "crypto-common",
- "subtle",
+ "subtle 2.5.0",
 ]
 
 [[package]]
@@ -15301,12 +16103,12 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
 
 [[package]]
 name = "url"
-version = "2.5.0"
+version = "2.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "31e6302e3bb753d46e83516cae55ae196fc0c309407cf11ab35cc51a4c2a4633"
+checksum = "f7c25da092f0a868cdf09e8674cd3b7ef3a7d92a24253e663a2fb85e2496de56"
 dependencies = [
  "form_urlencoded",
- "idna 0.5.0",
+ "idna 1.0.0",
  "percent-encoding",
 ]
 
@@ -15316,11 +16118,23 @@ version = "2.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da"
 
+[[package]]
+name = "utf16_iter"
+version = "1.0.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
+
+[[package]]
+name = "utf8_iter"
+version = "1.0.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
+
 [[package]]
 name = "utf8parse"
-version = "0.2.1"
+version = "0.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "711b9620af191e0cdc7468a8d14e709c3dcdb115b36f838e601583af800a370a"
+checksum = "06abde3611657adf66d383f00b093d7faecc7fa57071cce2578660c9f1010821"
 
 [[package]]
 name = "valuable"
@@ -15346,11 +16160,35 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
 
+[[package]]
+name = "w3f-bls"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c5da5fa2c6afa2c9158eaa7cd9aee249765eb32b5fb0c63ad8b9e79336a47ec"
+dependencies = [
+ "ark-bls12-377",
+ "ark-bls12-381",
+ "ark-ec",
+ "ark-ff",
+ "ark-serialize",
+ "ark-serialize-derive",
+ "arrayref",
+ "constcat",
+ "digest 0.10.7",
+ "rand",
+ "rand_chacha 0.3.1",
+ "rand_core 0.6.4",
+ "sha2 0.10.8",
+ "sha3",
+ "thiserror",
+ "zeroize",
+]
+
 [[package]]
 name = "waker-fn"
-version = "1.1.1"
+version = "1.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3c4517f54858c779bbcbf228f4fca63d121bf85fbecb2dc578cdf4a39395690"
+checksum = "317211a0dc0ceedd78fb2ca9a44aed3d7b9b26f81870d485c07122b4350673b7"
 
 [[package]]
 name = "walkdir"
@@ -15413,7 +16251,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.59",
+ "syn 2.0.66",
  "wasm-bindgen-shared",
 ]
 
@@ -15447,7 +16285,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.59",
+ "syn 2.0.66",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -15460,18 +16298,18 @@ checksum = "af190c94f2773fdb3729c55b007a722abb5384da03bc0986df4c289bf5567e96"
 
 [[package]]
 name = "wasm-instrument"
-version = "0.3.0"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa1dafb3e60065305741e83db35c6c2584bb3725b692b5b66148a38d72ace6cd"
+checksum = "2a47ecb37b9734d1085eaa5ae1a81e60801fd8c28d4cabdd8aedb982021918bc"
 dependencies = [
  "parity-wasm",
 ]
 
 [[package]]
 name = "wasm-opt"
-version = "0.114.2"
+version = "0.116.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "effbef3bd1dde18acb401f73e740a6f3d4a1bc651e9773bddc512fe4d8d68f67"
+checksum = "2fd87a4c135535ffed86123b6fb0f0a5a0bc89e50416c942c5f0662c645f679c"
 dependencies = [
  "anyhow",
  "libc",
@@ -15485,9 +16323,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-opt-cxx-sys"
-version = "0.114.2"
+version = "0.116.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c09e24eb283919ace2ed5733bda4842a59ce4c8de110ef5c6d98859513d17047"
+checksum = "8c57b28207aa724318fcec6575fe74803c23f6f266fce10cbc9f3f116762f12e"
 dependencies = [
  "anyhow",
  "cxx",
@@ -15497,9 +16335,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-opt-sys"
-version = "0.114.2"
+version = "0.116.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36f2f817bed2e8d65eb779fa37317e74de15585751f903c9118342d1970703a4"
+checksum = "8a1cce564dc768dacbdb718fc29df2dba80bd21cb47d8f77ae7e3d95ceb98cbe"
 dependencies = [
  "anyhow",
  "cc",
@@ -15578,9 +16416,9 @@ dependencies = [
 
 [[package]]
 name = "wasmparser-nostd"
-version = "0.100.1"
+version = "0.100.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9157cab83003221bfd385833ab587a039f5d6fa7304854042ba358a3b09e0724"
+checksum = "d5a015fe95f3504a94bb1462c717aae75253e39b9dd6c3fb1062c934535c64aa"
 dependencies = [
  "indexmap-nostd",
 ]
@@ -15760,7 +16598,7 @@ dependencies = [
  "memfd",
  "memoffset",
  "paste",
- "rand 0.8.5",
+ "rand",
  "rustix 0.36.17",
  "wasmtime-asm-macros",
  "wasmtime-environ",
@@ -15790,6 +16628,16 @@ dependencies = [
  "wasm-bindgen",
 ]
 
+[[package]]
+name = "web-time"
+version = "1.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5a6580f308b1fad9207618087a65c04e7a10bc77e02c8e84e9b00dd4b12fa0bb"
+dependencies = [
+ "js-sys",
+ "wasm-bindgen",
+]
+
 [[package]]
 name = "webpki"
 version = "0.22.4"
@@ -15809,22 +16657,17 @@ dependencies = [
  "webpki",
 ]
 
-[[package]]
-name = "webpki-roots"
-version = "0.25.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1"
-
 [[package]]
 name = "westend-runtime"
-version = "1.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "binary-merkle-tree",
  "bitvec",
  "frame-benchmarking",
  "frame-election-provider-support",
  "frame-executive",
+ "frame-metadata-hash-extension",
  "frame-support",
  "frame-system",
  "frame-system-benchmarking",
@@ -15832,6 +16675,7 @@ dependencies = [
  "frame-try-runtime",
  "hex-literal 0.4.1",
  "log",
+ "pallet-asset-rate",
  "pallet-authority-discovery",
  "pallet-authorship",
  "pallet-babe",
@@ -15840,6 +16684,7 @@ dependencies = [
  "pallet-beefy",
  "pallet-beefy-mmr",
  "pallet-collective",
+ "pallet-conviction-voting",
  "pallet-democracy",
  "pallet-election-provider-multi-phase",
  "pallet-election-provider-support-benchmarking",
@@ -15861,6 +16706,8 @@ dependencies = [
  "pallet-preimage",
  "pallet-proxy",
  "pallet-recovery",
+ "pallet-referenda",
+ "pallet-root-testing",
  "pallet-scheduler",
  "pallet-session",
  "pallet-session-benchmarking",
@@ -15876,6 +16723,7 @@ dependencies = [
  "pallet-treasury",
  "pallet-utility",
  "pallet-vesting",
+ "pallet-whitelist",
  "pallet-xcm",
  "pallet-xcm-benchmarks",
  "parity-scale-codec",
@@ -15890,11 +16738,13 @@ dependencies = [
  "smallvec",
  "sp-api",
  "sp-application-crypto",
+ "sp-arithmetic",
  "sp-authority-discovery",
  "sp-block-builder",
  "sp-consensus-babe",
  "sp-consensus-beefy",
  "sp-core",
+ "sp-genesis-builder",
  "sp-inherents",
  "sp-io",
  "sp-mmr-primitives",
@@ -15903,8 +16753,8 @@ dependencies = [
  "sp-runtime",
  "sp-session",
  "sp-staking",
- "sp-std",
- "sp-storage",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-transaction-pool",
  "sp-version",
  "staging-xcm",
@@ -15916,8 +16766,8 @@ dependencies = [
 
 [[package]]
 name = "westend-runtime-constants"
-version = "1.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "frame-support",
  "polkadot-primitives",
@@ -15926,6 +16776,8 @@ dependencies = [
  "sp-core",
  "sp-runtime",
  "sp-weights",
+ "staging-xcm",
+ "staging-xcm-builder",
 ]
 
 [[package]]
@@ -15937,14 +16789,14 @@ dependencies = [
  "either",
  "home",
  "once_cell",
- "rustix 0.38.32",
+ "rustix 0.38.34",
 ]
 
 [[package]]
 name = "wide"
-version = "0.7.16"
+version = "0.7.24"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81a1851a719f11d1d2fea40e15c72f6c00de8c142d7ac47c1441cc7e4d0d5bc6"
+checksum = "8a040b111774ab63a19ef46bbc149398ab372b4ccdcfd719e9814dbd7dfd76c8"
 dependencies = [
  "bytemuck",
  "safe_arch",
@@ -15974,11 +16826,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
 
 [[package]]
 name = "winapi-util"
-version = "0.1.6"
+version = "0.1.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f29e6f9198ba0d26b4c9f07dbe6f9ed633e1f3d5b8b414090084349e46a52596"
+checksum = "4d4cc384e1e73b93bafa6fb4f1df8c41695c8a91cf9c4c64358067d15a7b6c6b"
 dependencies = [
- "winapi",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -16229,6 +17081,15 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "winnow"
+version = "0.6.13"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "59b5e5f6c299a3c7890b876a2a587f3115162487e704907d9b6cd29473052ba1"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "winreg"
 version = "0.50.0"
@@ -16239,6 +17100,28 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "winreg"
+version = "0.52.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a277a57398d4bfa075df44f501a17cfdf8542d224f0d36095a2adc7aee4ef0a5"
+dependencies = [
+ "cfg-if",
+ "windows-sys 0.48.0",
+]
+
+[[package]]
+name = "write16"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
+
+[[package]]
+name = "writeable"
+version = "0.5.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
+
 [[package]]
 name = "wyz"
 version = "0.5.1"
@@ -16292,7 +17175,7 @@ dependencies = [
 [[package]]
 name = "xcm-primitives"
 version = "0.1.1"
-source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.1.0#078eff3e62d8a69e0ff744525f4d4b049630d3cd"
+source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.7.2#0950345857f05a6997b5edcc2b6f7340cb7f0d5c"
 dependencies = [
  "cumulus-primitives-core",
  "ethereum",
@@ -16306,12 +17189,13 @@ dependencies = [
  "orml-traits",
  "pallet-staking",
  "parity-scale-codec",
+ "polkadot-runtime-common",
  "scale-info",
  "serde",
  "sha3",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "staging-xcm",
  "staging-xcm-builder",
  "staging-xcm-executor",
@@ -16319,13 +17203,13 @@ dependencies = [
 
 [[package]]
 name = "xcm-procedural"
-version = "1.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.1.0#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "Inflector",
  "proc-macro2",
  "quote",
- "syn 2.0.59",
+ "syn 2.0.66",
 ]
 
 [[package]]
@@ -16337,8 +17221,8 @@ dependencies = [
  "futures 0.3.30",
  "log",
  "nohash-hasher",
- "parking_lot 0.12.1",
- "rand 0.8.5",
+ "parking_lot 0.12.3",
+ "rand",
  "static_assertions",
 ]
 
@@ -16351,31 +17235,76 @@ dependencies = [
  "time",
 ]
 
+[[package]]
+name = "yoke"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5"
+dependencies = [
+ "serde",
+ "stable_deref_trait",
+ "yoke-derive",
+ "zerofrom",
+]
+
+[[package]]
+name = "yoke-derive"
+version = "0.7.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+ "synstructure 0.13.1",
+]
+
 [[package]]
 name = "zerocopy"
-version = "0.7.32"
+version = "0.7.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "74d4d3961e53fa4c9a25a8637fc2bfaf2595b3d3ae34875568a5cf64787716be"
+checksum = "ae87e3fcd617500e5d106f0380cf7b77f3c6092aae37191433159dda23cfb087"
 dependencies = [
  "zerocopy-derive",
 ]
 
 [[package]]
 name = "zerocopy-derive"
-version = "0.7.32"
+version = "0.7.34"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
+]
+
+[[package]]
+name = "zerofrom"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55"
+dependencies = [
+ "zerofrom-derive",
+]
+
+[[package]]
+name = "zerofrom-derive"
+version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
+checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.59",
+ "syn 2.0.66",
+ "synstructure 0.13.1",
 ]
 
 [[package]]
 name = "zeroize"
-version = "1.7.0"
+version = "1.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "525b4ec142c6b68a2d10f01f7bbf6755599ca3f81ea53b8431b7dd348f5fdb2d"
+checksum = "ced3678a2879b30306d323f4542626697a464a97c0a07c9aebf7ebca65cd4dde"
 dependencies = [
  "zeroize_derive",
 ]
@@ -16388,7 +17317,29 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.59",
+ "syn 2.0.66",
+]
+
+[[package]]
+name = "zerovec"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bb2cc8827d6c0994478a15c53f374f46fbd41bea663d809b14744bc42e6b109c"
+dependencies = [
+ "yoke",
+ "zerofrom",
+ "zerovec-derive",
+]
+
+[[package]]
+name = "zerovec-derive"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97cf56601ee5052b4417d90c8755c6683473c926039908196cf35d99f893ebe7"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.66",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 2af63b6ca..567cbbac0 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -33,23 +33,23 @@ static_assertions = { version = "1.1" }
 strum             = { version = "0.26", default-features = false }
 
 # cumulus
-cumulus-client-cli                    = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
-cumulus-client-collator               = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
-cumulus-client-consensus-aura         = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
-cumulus-client-consensus-common       = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
-cumulus-client-consensus-proposer     = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
-cumulus-client-service                = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
-cumulus-pallet-aura-ext               = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
-cumulus-pallet-dmp-queue              = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
-cumulus-pallet-parachain-system       = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
-cumulus-pallet-session-benchmarking   = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
-cumulus-pallet-xcm                    = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
-cumulus-pallet-xcmp-queue             = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
-cumulus-primitives-core               = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
-cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
-cumulus-primitives-utility            = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
-cumulus-relay-chain-interface         = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
-parachain-info                        = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+cumulus-client-cli                    = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+cumulus-client-collator               = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+cumulus-client-consensus-aura         = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+cumulus-client-consensus-common       = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+cumulus-client-consensus-proposer     = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+cumulus-client-service                = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+cumulus-pallet-aura-ext               = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+cumulus-pallet-dmp-queue              = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+cumulus-pallet-parachain-system       = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+cumulus-pallet-session-benchmarking   = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+cumulus-pallet-xcm                    = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+cumulus-pallet-xcmp-queue             = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+cumulus-primitives-core               = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+cumulus-primitives-utility            = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+cumulus-relay-chain-interface         = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+parachain-info                        = { package = "staging-parachain-info", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
 
 # darwinia
 crab-runtime                      = { path = "runtime/crab" }
@@ -72,150 +72,128 @@ dc-types                          = { path = "core/types" }
 koi-runtime                       = { path = "runtime/koi" }
 
 # frontier
-fc-api                         = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v1.1.0" }
-fc-consensus                   = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v1.1.0" }
-fc-db                          = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v1.1.0" }
-fc-mapping-sync                = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v1.1.0", features = ["sql"] }
-fc-rpc                         = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v1.1.0", features = ["rpc-binary-search-estimate", "txpool"] }
-fc-rpc-core                    = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v1.1.0" }
-fc-storage                     = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v1.1.0" }
-fp-account                     = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v1.1.0", default-features = false, features = ["serde"] }
-fp-ethereum                    = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v1.1.0", default-features = false }
-fp-evm                         = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v1.1.0", default-features = false }
-fp-rpc                         = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v1.1.0", default-features = false }
-fp-self-contained              = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v1.1.0", default-features = false, features = ["serde"] }
-pallet-ethereum                = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v1.1.0", default-features = false, features = ["forbid-evm-reentrancy"] }
-pallet-evm                     = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v1.1.0", default-features = false, features = ["forbid-evm-reentrancy"] }
-pallet-evm-precompile-blake2   = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v1.1.0", default-features = false }
-pallet-evm-precompile-bls12381 = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v1.1.0-patch", default-features = false }
-pallet-evm-precompile-bn128    = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v1.1.0", default-features = false }
-pallet-evm-precompile-dispatch = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v1.1.0", default-features = false }
-pallet-evm-precompile-modexp   = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v1.1.0", default-features = false }
-pallet-evm-precompile-simple   = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v1.1.0", default-features = false }
-precompile-utils               = { git = "https://github.com/paritytech/frontier", branch = "polkadot-v1.1.0", default-features = false }
+fc-api                         = { git = "https://github.com/paritytech/frontier", rev = "f017a18123eb0802ca1c68c0f707f63aacbbb730" }
+fc-consensus                   = { git = "https://github.com/paritytech/frontier", rev = "f017a18123eb0802ca1c68c0f707f63aacbbb730" }
+fc-db                          = { git = "https://github.com/paritytech/frontier", rev = "f017a18123eb0802ca1c68c0f707f63aacbbb730" }
+fc-mapping-sync                = { git = "https://github.com/paritytech/frontier", rev = "f017a18123eb0802ca1c68c0f707f63aacbbb730", features = ["sql"] }
+fc-rpc                         = { git = "https://github.com/paritytech/frontier", rev = "f017a18123eb0802ca1c68c0f707f63aacbbb730", features = ["rpc-binary-search-estimate", "txpool"] }
+fc-rpc-core                    = { git = "https://github.com/paritytech/frontier", rev = "f017a18123eb0802ca1c68c0f707f63aacbbb730" }
+fc-storage                     = { git = "https://github.com/paritytech/frontier", rev = "f017a18123eb0802ca1c68c0f707f63aacbbb730" }
+fp-account                     = { git = "https://github.com/paritytech/frontier", rev = "f017a18123eb0802ca1c68c0f707f63aacbbb730", default-features = false, features = ["serde"] }
+fp-ethereum                    = { git = "https://github.com/paritytech/frontier", rev = "f017a18123eb0802ca1c68c0f707f63aacbbb730", default-features = false }
+fp-evm                         = { git = "https://github.com/paritytech/frontier", rev = "f017a18123eb0802ca1c68c0f707f63aacbbb730", default-features = false }
+fp-rpc                         = { git = "https://github.com/paritytech/frontier", rev = "f017a18123eb0802ca1c68c0f707f63aacbbb730", default-features = false }
+fp-self-contained              = { git = "https://github.com/paritytech/frontier", rev = "f017a18123eb0802ca1c68c0f707f63aacbbb730", default-features = false, features = ["serde"] }
+pallet-ethereum                = { git = "https://github.com/paritytech/frontier", rev = "f017a18123eb0802ca1c68c0f707f63aacbbb730", default-features = false, features = ["forbid-evm-reentrancy"] }
+pallet-evm                     = { git = "https://github.com/paritytech/frontier", rev = "f017a18123eb0802ca1c68c0f707f63aacbbb730", default-features = false, features = ["forbid-evm-reentrancy"] }
+pallet-evm-precompile-blake2   = { git = "https://github.com/paritytech/frontier", rev = "f017a18123eb0802ca1c68c0f707f63aacbbb730", default-features = false }
+pallet-evm-precompile-bls12381 = { git = "https://github.com/darwinia-network/frontier", rev = "f017a18123eb0802ca1c68c0f707f63aacbbb730", default-features = false }
+pallet-evm-precompile-bn128    = { git = "https://github.com/paritytech/frontier", rev = "f017a18123eb0802ca1c68c0f707f63aacbbb730", default-features = false }
+pallet-evm-precompile-dispatch = { git = "https://github.com/paritytech/frontier", rev = "f017a18123eb0802ca1c68c0f707f63aacbbb730", default-features = false }
+pallet-evm-precompile-modexp   = { git = "https://github.com/paritytech/frontier", rev = "f017a18123eb0802ca1c68c0f707f63aacbbb730", default-features = false }
+pallet-evm-precompile-simple   = { git = "https://github.com/paritytech/frontier", rev = "f017a18123eb0802ca1c68c0f707f63aacbbb730", default-features = false }
+precompile-utils               = { git = "https://github.com/paritytech/frontier", rev = "f017a18123eb0802ca1c68c0f707f63aacbbb730", default-features = false }
 
 # moonbeam
-moonbeam-evm-tracer                     = { git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v1.1.0", default-features = false }
-moonbeam-primitives-ext                 = { git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v1.1.0", default-features = false }
-moonbeam-rpc-debug                      = { git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v1.1.0" }
-moonbeam-rpc-primitives-debug           = { git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v1.1.0", default-features = false }
-moonbeam-rpc-trace                      = { git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v1.1.0" }
-pallet-asset-manager                    = { git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v1.1.0", default-features = false }
-pallet-ethereum-xcm                     = { git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v1.1.0", default-features = false }
-pallet-evm-precompile-conviction-voting = { git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v1.1.0", default-features = false }
-xcm-primitives                          = { git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v1.1.0", default-features = false }
+moonbeam-evm-tracer                     = { git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v1.7.2", default-features = false }
+moonbeam-primitives-ext                 = { git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v1.7.2", default-features = false }
+moonbeam-rpc-debug                      = { git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v1.7.2" }
+moonbeam-rpc-primitives-debug           = { git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v1.7.2", default-features = false }
+moonbeam-rpc-trace                      = { git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v1.7.2" }
+pallet-asset-manager                    = { git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v1.7.2", default-features = false }
+pallet-ethereum-xcm                     = { git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v1.7.2", default-features = false }
+pallet-evm-precompile-conviction-voting = { git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v1.7.2", default-features = false }
+xcm-primitives                          = { git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v1.7.2", default-features = false }
 
 # open-web3-stack
-orml-xcm-support = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v1.1.0", default-features = false }
-orml-xtokens     = { git = "https://github.com/open-web3-stack/open-runtime-module-library", branch = "polkadot-v1.1.0", default-features = false }
+orml-xcm-support = { git = "https://github.com/darwinia-network/open-runtime-module-library", branch = "polkadot-v1.7.2", default-features = false }
+orml-xtokens     = { git = "https://github.com/darwinia-network/open-runtime-module-library", branch = "polkadot-v1.7.2", default-features = false }
 
 # polkadot
-pallet-xcm              = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
-polkadot-cli            = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
-polkadot-parachain      = { package = "polkadot-parachain-primitives", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
-polkadot-primitives     = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
-polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
-xcm                     = { package = "staging-xcm", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
-xcm-builder             = { package = "staging-xcm-builder", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
-xcm-executor            = { package = "staging-xcm-executor", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
+pallet-xcm              = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+polkadot-cli            = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+polkadot-parachain      = { package = "polkadot-parachain-primitives", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+polkadot-primitives     = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+xcm                     = { package = "staging-xcm", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+xcm-builder             = { package = "staging-xcm-builder", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+xcm-executor            = { package = "staging-xcm-executor", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
 
 # substrate
-frame-benchmarking                         = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
-frame-benchmarking-cli                     = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
-frame-executive                            = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
-frame-support                              = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
-frame-system                               = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
-frame-system-benchmarking                  = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
-frame-system-rpc-runtime-api               = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
-frame-try-runtime                          = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
-pallet-assets                              = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
-pallet-aura                                = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
-pallet-authorship                          = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
-pallet-balances                            = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false, features = ["insecure_zero_ed"] }
-pallet-collective                          = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
-pallet-conviction-voting                   = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
-pallet-democracy                           = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
-pallet-identity                            = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
-pallet-preimage                            = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
-pallet-proxy                               = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
-pallet-referenda                           = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
-pallet-scheduler                           = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
-pallet-session                             = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
-pallet-sudo                                = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
-pallet-timestamp                           = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
-pallet-transaction-payment                 = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
-pallet-transaction-payment-rpc             = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
-pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
-pallet-treasury                            = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
-pallet-tx-pause                            = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
-pallet-utility                             = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
-pallet-vesting                             = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
-pallet-whitelist                           = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
-sc-basic-authorship                        = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
-sc-chain-spec                              = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
-sc-cli                                     = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
-sc-client-api                              = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
-sc-consensus                               = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
-sc-consensus-aura                          = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
-sc-executor                                = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
-sc-keystore                                = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
-sc-network                                 = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
-sc-network-sync                            = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
-sc-offchain                                = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
-sc-rpc                                     = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
-sc-rpc-api                                 = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
-sc-service                                 = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
-sc-sysinfo                                 = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
-sc-telemetry                               = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
-sc-tracing                                 = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
-sc-transaction-pool                        = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
-sc-transaction-pool-api                    = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
-sp-api                                     = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
-sp-arithmetic                              = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
-sp-block-builder                           = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
-sp-blockchain                              = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
-sp-consensus-aura                          = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
-sp-core                                    = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
-sp-debug-derive                            = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
-sp-inherents                               = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
-sp-io                                      = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
-sp-keyring                                 = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
-sp-keystore                                = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
-sp-offchain                                = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
-sp-runtime                                 = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
-sp-session                                 = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
-sp-staking                                 = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
-sp-std                                     = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
-sp-timestamp                               = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
-sp-transaction-pool                        = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
-sp-version                                 = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0", default-features = false }
-substrate-build-script-utils               = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
-substrate-frame-rpc-system                 = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
-substrate-prometheus-endpoint              = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
-substrate-test-utils                       = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
-substrate-wasm-builder                     = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.1.0" }
-
-[patch."https://github.com/paritytech/frontier"]
-fc-api                         = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v1.1.0-patch" }
-fc-consensus                   = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v1.1.0-patch" }
-fc-db                          = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v1.1.0-patch" }
-fc-mapping-sync                = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v1.1.0-patch" }
-fc-rpc                         = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v1.1.0-patch" }
-fc-rpc-core                    = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v1.1.0-patch" }
-fc-storage                     = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v1.1.0-patch" }
-fp-account                     = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v1.1.0-patch" }
-fp-ethereum                    = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v1.1.0-patch" }
-fp-evm                         = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v1.1.0-patch" }
-fp-rpc                         = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v1.1.0-patch" }
-fp-self-contained              = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v1.1.0-patch" }
-pallet-ethereum                = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v1.1.0-patch" }
-pallet-evm                     = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v1.1.0-patch" }
-pallet-evm-precompile-blake2   = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v1.1.0-patch" }
-pallet-evm-precompile-bn128    = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v1.1.0-patch" }
-pallet-evm-precompile-dispatch = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v1.1.0-patch" }
-pallet-evm-precompile-modexp   = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v1.1.0-patch" }
-pallet-evm-precompile-simple   = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v1.1.0-patch" }
-precompile-utils               = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v1.1.0-patch" }
+frame-benchmarking                         = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+frame-benchmarking-cli                     = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+frame-executive                            = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+frame-support                              = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+frame-system                               = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+frame-system-benchmarking                  = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+frame-system-rpc-runtime-api               = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+frame-try-runtime                          = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+pallet-assets                              = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+pallet-aura                                = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+pallet-authorship                          = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+pallet-balances                            = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false, features = ["insecure_zero_ed"] }
+pallet-collective                          = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+pallet-conviction-voting                   = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+pallet-democracy                           = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+pallet-identity                            = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+pallet-preimage                            = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+pallet-proxy                               = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+pallet-referenda                           = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+pallet-scheduler                           = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+pallet-session                             = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+pallet-sudo                                = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+pallet-timestamp                           = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+pallet-transaction-payment                 = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+pallet-transaction-payment-rpc             = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+pallet-treasury                            = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+pallet-tx-pause                            = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+pallet-utility                             = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+pallet-vesting                             = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+pallet-whitelist                           = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sc-basic-authorship                        = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sc-chain-spec                              = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sc-cli                                     = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sc-client-api                              = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sc-consensus                               = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sc-consensus-aura                          = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sc-executor                                = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sc-keystore                                = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sc-network                                 = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sc-network-sync                            = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sc-offchain                                = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sc-rpc                                     = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sc-rpc-api                                 = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sc-service                                 = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sc-sysinfo                                 = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sc-telemetry                               = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sc-tracing                                 = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sc-transaction-pool                        = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sc-transaction-pool-api                    = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sp-api                                     = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sp-arithmetic                              = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sp-block-builder                           = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sp-blockchain                              = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sp-consensus-aura                          = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sp-core                                    = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sp-debug-derive                            = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sp-inherents                               = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sp-io                                      = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sp-keyring                                 = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sp-keystore                                = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sp-offchain                                = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sp-runtime                                 = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sp-session                                 = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sp-staking                                 = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sp-std                                     = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sp-timestamp                               = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sp-transaction-pool                        = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sp-version                                 = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+substrate-build-script-utils               = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+substrate-frame-rpc-system                 = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+substrate-prometheus-endpoint              = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+substrate-test-utils                       = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+substrate-wasm-builder                     = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
 
 [profile.release]
 panic = "unwind"
diff --git a/node/Cargo.toml b/node/Cargo.toml
index 6e23cb3f5..41682b310 100644
--- a/node/Cargo.toml
+++ b/node/Cargo.toml
@@ -157,21 +157,12 @@ all-natives = [
 crab-native = [
 	# darwinia
 	"crab-runtime",
-
-	# polkadot
-	"polkadot-cli/kusama-native",
 ]
 darwinia-native = [
 	# darwinia
 	"darwinia-runtime",
-
-	# polkadot
-	"polkadot-cli/polkadot-native",
 ]
 koi-native = [
 	# darwinia
 	"koi-runtime",
-
-	# polkadot
-	"polkadot-cli/rococo-native",
 ]

From 7abc723ec69e948f33a9366ff5269a232a432bd8 Mon Sep 17 00:00:00 2001
From: Xavier Lau <xavier@inv.cafe>
Date: Fri, 14 Jun 2024 11:42:24 +0800
Subject: [PATCH 02/59] Remove Koi from account migration test

---
 pallet/account-migration/src/tests.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pallet/account-migration/src/tests.rs b/pallet/account-migration/src/tests.rs
index cb219da8f..dc4156c12 100644
--- a/pallet/account-migration/src/tests.rs
+++ b/pallet/account-migration/src/tests.rs
@@ -30,7 +30,7 @@ use sp_runtime::{
 
 #[test]
 fn signable_message_should_work() {
-	["Darwinia2", "Crab2", "Koi"].iter().for_each(|s| {
+	["Darwinia2", "Crab2"].iter().for_each(|s| {
 		assert_eq!(
 			signable_message(s.as_bytes(), &Default::default()),
 			format!(

From 9475ce47ee663f8ee6f9bd335196d961818fe2ea Mon Sep 17 00:00:00 2001
From: Xavier Lau <xavier@inv.cafe>
Date: Thu, 20 Jun 2024 16:29:05 +0800
Subject: [PATCH 03/59] paritytech/polkadot-sdk#1495

---
 node/src/cli.rs     | 10 ++++++++++
 node/src/command.rs |  6 ++++--
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/node/src/cli.rs b/node/src/cli.rs
index 2319ab12a..aa20c69d4 100644
--- a/node/src/cli.rs
+++ b/node/src/cli.rs
@@ -16,6 +16,16 @@
 // You should have received a copy of the GNU General Public License
 // along with Darwinia. If not, see <https://www.gnu.org/licenses/>.
 
+/// The version of the node.
+///
+/// This is the version that is used for versioning this node binary.
+/// By default the `minor` version is bumped in every release. `Major` or `patch` releases are only
+/// expected in very rare cases.
+///
+/// The worker binaries associated to the node binary should ensure that they are using the same
+/// version as the main node that started them.
+pub const NODE_VERSION: &'static str = "6.6.3";
+
 /// Sub-commands supported by the collator.
 #[derive(Debug, clap::Subcommand)]
 pub enum Subcommand {
diff --git a/node/src/command.rs b/node/src/command.rs
index d0a256059..ab2eb1b10 100644
--- a/node/src/command.rs
+++ b/node/src/command.rs
@@ -23,7 +23,7 @@ use cumulus_primitives_core::ParaId;
 // darwinia
 use crate::{
 	chain_spec::*,
-	cli::{Cli, FrontierBackendType, RelayChainCli, Subcommand},
+	cli::{Cli, FrontierBackendType, RelayChainCli, Subcommand, NODE_VERSION},
 	service::{self, *},
 };
 // substrate
@@ -44,7 +44,9 @@ impl SubstrateCli for Cli {
 	}
 
 	fn impl_version() -> String {
-		env!("SUBSTRATE_CLI_IMPL_VERSION").into()
+		let commit_hash = env!("SUBSTRATE_CLI_COMMIT_HASH");
+
+		format!("{NODE_VERSION}-{commit_hash}")
 	}
 
 	fn description() -> String {

From 950b3b980b3bc5cde4ebada085b19bde77bad393 Mon Sep 17 00:00:00 2001
From: Xavier Lau <xavier@inv.cafe>
Date: Thu, 20 Jun 2024 16:29:12 +0800
Subject: [PATCH 04/59] Bump

---
 rust-toolchain.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/rust-toolchain.toml b/rust-toolchain.toml
index f7f1fd09d..2d71432ac 100644
--- a/rust-toolchain.toml
+++ b/rust-toolchain.toml
@@ -1,5 +1,5 @@
 [toolchain]
-channel    = "1.74.0"
+channel    = "1.77.0"
 components = ["cargo", "clippy", "rust-src", "rustc", "rustfmt"]
 profile    = "minimal"
 targets    = ["wasm32-unknown-unknown"]

From b86f455112f587dc26cc2c056c7fcb8b91b668e8 Mon Sep 17 00:00:00 2001
From: Xavier Lau <xavier@inv.cafe>
Date: Thu, 20 Jun 2024 16:36:18 +0800
Subject: [PATCH 05/59] paritytech/polkadot-sdk#1524

---
 node/src/service/mod.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/node/src/service/mod.rs b/node/src/service/mod.rs
index 3aeeb2f0e..471bac9e6 100644
--- a/node/src/service/mod.rs
+++ b/node/src/service/mod.rs
@@ -724,6 +724,7 @@ where
 			import_queue,
 			block_announce_validator_builder: None,
 			warp_sync_params: None,
+			block_relay: None,
 		})?;
 
 	if config.offchain_worker.enabled {

From 48bb6c7ba4222236f483118cfea46e2252566975 Mon Sep 17 00:00:00 2001
From: Xavier Lau <xavier@inv.cafe>
Date: Thu, 20 Jun 2024 16:52:55 +0800
Subject: [PATCH 06/59] !! paritytech/polkadot-sdk#1363

---
 runtime/crab/src/pallets/balances.rs     |  2 +-
 runtime/crab/src/pallets/preimage.rs     | 14 ++++++++++++--
 runtime/darwinia/src/pallets/balances.rs |  2 +-
 runtime/darwinia/src/pallets/preimage.rs | 14 ++++++++++++--
 runtime/koi/src/pallets/balances.rs      |  2 +-
 runtime/koi/src/pallets/preimage.rs      | 16 +++++++++++++---
 6 files changed, 40 insertions(+), 10 deletions(-)

diff --git a/runtime/crab/src/pallets/balances.rs b/runtime/crab/src/pallets/balances.rs
index b4e79658c..169981e2e 100644
--- a/runtime/crab/src/pallets/balances.rs
+++ b/runtime/crab/src/pallets/balances.rs
@@ -26,7 +26,7 @@ impl pallet_balances::Config for Runtime {
 	type ExistentialDeposit = pallet_config::ExistentialDeposit;
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
-	type MaxHolds = ();
+	type MaxHolds = ConstU32<1>;
 	type MaxLocks = ConstU32<50>;
 	type MaxReserves = ConstU32<50>;
 	type ReserveIdentifier = [u8; 8];
diff --git a/runtime/crab/src/pallets/preimage.rs b/runtime/crab/src/pallets/preimage.rs
index a8adc3778..b23165866 100644
--- a/runtime/crab/src/pallets/preimage.rs
+++ b/runtime/crab/src/pallets/preimage.rs
@@ -19,9 +19,19 @@
 // darwinia
 use crate::*;
 
+frame_support::parameter_types! {
+	pub const PreimageBaseDeposit: Balance = deposit(2, 64);
+	pub const PreimageByteDeposit: Balance = deposit(0, 1);
+	pub const PreimageHoldReason: RuntimeHoldReason = RuntimeHoldReason::Preimage(pallet_preimage::HoldReason::Preimage);
+}
+
 impl pallet_preimage::Config for Runtime {
-	type BaseDeposit = ConstU128<{ 500 * UNIT }>;
-	type ByteDeposit = ConstU128<{ darwinia_deposit(0, 1) }>;
+	type Consideration = HoldConsideration<
+		AccountId,
+		Balances,
+		PreimageHoldReason,
+		LinearStoragePrice<PreimageBaseDeposit, PreimageByteDeposit, Balance>,
+	>;
 	type Currency = Balances;
 	type ManagerOrigin = Root;
 	type RuntimeEvent = RuntimeEvent;
diff --git a/runtime/darwinia/src/pallets/balances.rs b/runtime/darwinia/src/pallets/balances.rs
index b4e79658c..169981e2e 100644
--- a/runtime/darwinia/src/pallets/balances.rs
+++ b/runtime/darwinia/src/pallets/balances.rs
@@ -26,7 +26,7 @@ impl pallet_balances::Config for Runtime {
 	type ExistentialDeposit = pallet_config::ExistentialDeposit;
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
-	type MaxHolds = ();
+	type MaxHolds = ConstU32<1>;
 	type MaxLocks = ConstU32<50>;
 	type MaxReserves = ConstU32<50>;
 	type ReserveIdentifier = [u8; 8];
diff --git a/runtime/darwinia/src/pallets/preimage.rs b/runtime/darwinia/src/pallets/preimage.rs
index a8adc3778..b23165866 100644
--- a/runtime/darwinia/src/pallets/preimage.rs
+++ b/runtime/darwinia/src/pallets/preimage.rs
@@ -19,9 +19,19 @@
 // darwinia
 use crate::*;
 
+frame_support::parameter_types! {
+	pub const PreimageBaseDeposit: Balance = deposit(2, 64);
+	pub const PreimageByteDeposit: Balance = deposit(0, 1);
+	pub const PreimageHoldReason: RuntimeHoldReason = RuntimeHoldReason::Preimage(pallet_preimage::HoldReason::Preimage);
+}
+
 impl pallet_preimage::Config for Runtime {
-	type BaseDeposit = ConstU128<{ 500 * UNIT }>;
-	type ByteDeposit = ConstU128<{ darwinia_deposit(0, 1) }>;
+	type Consideration = HoldConsideration<
+		AccountId,
+		Balances,
+		PreimageHoldReason,
+		LinearStoragePrice<PreimageBaseDeposit, PreimageByteDeposit, Balance>,
+	>;
 	type Currency = Balances;
 	type ManagerOrigin = Root;
 	type RuntimeEvent = RuntimeEvent;
diff --git a/runtime/koi/src/pallets/balances.rs b/runtime/koi/src/pallets/balances.rs
index b4e79658c..169981e2e 100644
--- a/runtime/koi/src/pallets/balances.rs
+++ b/runtime/koi/src/pallets/balances.rs
@@ -26,7 +26,7 @@ impl pallet_balances::Config for Runtime {
 	type ExistentialDeposit = pallet_config::ExistentialDeposit;
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
-	type MaxHolds = ();
+	type MaxHolds = ConstU32<1>;
 	type MaxLocks = ConstU32<50>;
 	type MaxReserves = ConstU32<50>;
 	type ReserveIdentifier = [u8; 8];
diff --git a/runtime/koi/src/pallets/preimage.rs b/runtime/koi/src/pallets/preimage.rs
index b18c1a2d5..b23165866 100644
--- a/runtime/koi/src/pallets/preimage.rs
+++ b/runtime/koi/src/pallets/preimage.rs
@@ -19,11 +19,21 @@
 // darwinia
 use crate::*;
 
+frame_support::parameter_types! {
+	pub const PreimageBaseDeposit: Balance = deposit(2, 64);
+	pub const PreimageByteDeposit: Balance = deposit(0, 1);
+	pub const PreimageHoldReason: RuntimeHoldReason = RuntimeHoldReason::Preimage(pallet_preimage::HoldReason::Preimage);
+}
+
 impl pallet_preimage::Config for Runtime {
-	type BaseDeposit = ConstU128<{ 500 * UNIT }>;
-	type ByteDeposit = ConstU128<{ darwinia_deposit(0, 1) }>;
+	type Consideration = HoldConsideration<
+		AccountId,
+		Balances,
+		PreimageHoldReason,
+		LinearStoragePrice<PreimageBaseDeposit, PreimageByteDeposit, Balance>,
+	>;
 	type Currency = Balances;
-	type ManagerOrigin = RootOr<GeneralAdmin>;
+	type ManagerOrigin = Root;
 	type RuntimeEvent = RuntimeEvent;
 	type WeightInfo = weights::pallet_preimage::WeightInfo<Self>;
 }

From 720fd47b2118a5752553fadb6ea2b432e91e3826 Mon Sep 17 00:00:00 2001
From: Xavier Lau <xavier@inv.cafe>
Date: Thu, 20 Jun 2024 18:18:10 +0800
Subject: [PATCH 07/59] paritytech/polkadot-sdk#1492

---
 Cargo.lock                  |  3 +++
 Cargo.toml                  |  1 +
 runtime/crab/Cargo.toml     |  2 ++
 runtime/crab/src/lib.rs     | 10 ++++++++++
 runtime/darwinia/Cargo.toml |  2 ++
 runtime/darwinia/src/lib.rs | 10 ++++++++++
 runtime/koi/Cargo.toml      |  2 ++
 runtime/koi/src/lib.rs      | 10 ++++++++++
 8 files changed, 40 insertions(+)

diff --git a/Cargo.lock b/Cargo.lock
index 0007aea73..dc403c2a2 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1700,6 +1700,7 @@ dependencies = [
  "sp-consensus-aura",
  "sp-core",
  "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-genesis-builder",
  "sp-inherents",
  "sp-io",
  "sp-keyring",
@@ -3002,6 +3003,7 @@ dependencies = [
  "sp-consensus-aura",
  "sp-core",
  "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-genesis-builder",
  "sp-inherents",
  "sp-io",
  "sp-keyring",
@@ -6052,6 +6054,7 @@ dependencies = [
  "sp-consensus-aura",
  "sp-core",
  "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-genesis-builder",
  "sp-inherents",
  "sp-io",
  "sp-keyring",
diff --git a/Cargo.toml b/Cargo.toml
index 567cbbac0..9bb63606e 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -177,6 +177,7 @@ sp-blockchain                              = { git = "https://github.com/parityt
 sp-consensus-aura                          = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
 sp-core                                    = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
 sp-debug-derive                            = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sp-genesis-builder                         = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
 sp-inherents                               = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
 sp-io                                      = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
 sp-keyring                                 = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
diff --git a/runtime/crab/Cargo.toml b/runtime/crab/Cargo.toml
index 9feec2ad6..87d386960 100644
--- a/runtime/crab/Cargo.toml
+++ b/runtime/crab/Cargo.toml
@@ -104,6 +104,7 @@ sp-block-builder                           = { workspace = true }
 sp-consensus-aura                          = { workspace = true }
 sp-core                                    = { workspace = true }
 sp-debug-derive                            = { workspace = true, optional = true, features = ["force-debug"] }
+sp-genesis-builder                         = { workspace = true }
 sp-inherents                               = { workspace = true }
 sp-offchain                                = { workspace = true }
 sp-runtime                                 = { workspace = true }
@@ -218,6 +219,7 @@ std = [
 	"sp-consensus-aura/std",
 	"sp-core/std",
 	"sp-debug-derive?/std",
+	"sp-genesis-builder/std",
 	"sp-inherents/std",
 	"sp-offchain/std",
 	"sp-runtime/std",
diff --git a/runtime/crab/src/lib.rs b/runtime/crab/src/lib.rs
index 65732dfd9..d4ec7d59e 100644
--- a/runtime/crab/src/lib.rs
+++ b/runtime/crab/src/lib.rs
@@ -325,6 +325,16 @@ sp_api::impl_runtime_apis! {
 		}
 	}
 
+	impl sp_genesis_builder::GenesisBuilder<Block> for Runtime {
+		fn create_default_config() -> Vec<u8> {
+			sp_genesis_builder::create_default_config::<RuntimeGenesisConfig>()
+		}
+
+		fn build_config(config: Vec<u8>) -> sp_genesis_builder::Result {
+			sp_genesis_builder::build_config::<RuntimeGenesisConfig>(config)
+		}
+	}
+
 	impl cumulus_primitives_core::CollectCollationInfo<Block> for Runtime {
 		fn collect_collation_info(header: &<Block as sp_runtime::traits::Block>::Header) -> cumulus_primitives_core::CollationInfo {
 			ParachainSystem::collect_collation_info(header)
diff --git a/runtime/darwinia/Cargo.toml b/runtime/darwinia/Cargo.toml
index ae4b1afe3..729daaf93 100644
--- a/runtime/darwinia/Cargo.toml
+++ b/runtime/darwinia/Cargo.toml
@@ -112,6 +112,7 @@ sp-block-builder    = { workspace = true }
 sp-consensus-aura   = { workspace = true }
 sp-core             = { workspace = true }
 sp-debug-derive     = { workspace = true, optional = true, features = ["force-debug"] }
+sp-genesis-builder  = { workspace = true }
 sp-inherents        = { workspace = true }
 sp-offchain         = { workspace = true }
 sp-runtime          = { workspace = true }
@@ -234,6 +235,7 @@ std = [
 	"sp-consensus-aura/std",
 	"sp-core/std",
 	"sp-debug-derive?/std",
+	"sp-genesis-builder/std",
 	"sp-inherents/std",
 	"sp-offchain/std",
 	"sp-runtime/std",
diff --git a/runtime/darwinia/src/lib.rs b/runtime/darwinia/src/lib.rs
index 8b3c85315..00b26501d 100644
--- a/runtime/darwinia/src/lib.rs
+++ b/runtime/darwinia/src/lib.rs
@@ -330,6 +330,16 @@ sp_api::impl_runtime_apis! {
 		}
 	}
 
+	impl sp_genesis_builder::GenesisBuilder<Block> for Runtime {
+		fn create_default_config() -> Vec<u8> {
+			sp_genesis_builder::create_default_config::<RuntimeGenesisConfig>()
+		}
+
+		fn build_config(config: Vec<u8>) -> sp_genesis_builder::Result {
+			sp_genesis_builder::build_config::<RuntimeGenesisConfig>(config)
+		}
+	}
+
 	impl cumulus_primitives_core::CollectCollationInfo<Block> for Runtime {
 		fn collect_collation_info(header: &<Block as sp_runtime::traits::Block>::Header) -> cumulus_primitives_core::CollationInfo {
 			ParachainSystem::collect_collation_info(header)
diff --git a/runtime/koi/Cargo.toml b/runtime/koi/Cargo.toml
index c0cfef743..09e776173 100644
--- a/runtime/koi/Cargo.toml
+++ b/runtime/koi/Cargo.toml
@@ -110,6 +110,7 @@ sp-block-builder                           = { workspace = true }
 sp-consensus-aura                          = { workspace = true }
 sp-core                                    = { workspace = true }
 sp-debug-derive                            = { workspace = true, optional = true, features = ["force-debug"] }
+sp-genesis-builder                         = { workspace = true }
 sp-inherents                               = { workspace = true }
 sp-offchain                                = { workspace = true }
 sp-runtime                                 = { workspace = true }
@@ -231,6 +232,7 @@ std = [
 	"sp-consensus-aura/std",
 	"sp-core/std",
 	"sp-debug-derive?/std",
+	"sp-genesis-builder/std",
 	"sp-inherents/std",
 	"sp-offchain/std",
 	"sp-runtime/std",
diff --git a/runtime/koi/src/lib.rs b/runtime/koi/src/lib.rs
index fa04055cc..0621e618c 100644
--- a/runtime/koi/src/lib.rs
+++ b/runtime/koi/src/lib.rs
@@ -310,6 +310,16 @@ sp_api::impl_runtime_apis! {
 		}
 	}
 
+	impl sp_genesis_builder::GenesisBuilder<Block> for Runtime {
+		fn create_default_config() -> Vec<u8> {
+			sp_genesis_builder::create_default_config::<RuntimeGenesisConfig>()
+		}
+
+		fn build_config(config: Vec<u8>) -> sp_genesis_builder::Result {
+			sp_genesis_builder::build_config::<RuntimeGenesisConfig>(config)
+		}
+	}
+
 	impl cumulus_primitives_core::CollectCollationInfo<Block> for Runtime {
 		fn collect_collation_info(header: &<Block as sp_runtime::traits::Block>::Header) -> cumulus_primitives_core::CollationInfo {
 			ParachainSystem::collect_collation_info(header)

From 09a7bef4a684d5920516121881d199fa5e43f482 Mon Sep 17 00:00:00 2001
From: Xavier Lau <xavier@inv.cafe>
Date: Thu, 20 Jun 2024 21:41:38 +0800
Subject: [PATCH 08/59] paritytech/polkadot-sdk#1911

---
 node/src/service/mod.rs | 1 +
 1 file changed, 1 insertion(+)

diff --git a/node/src/service/mod.rs b/node/src/service/mod.rs
index 471bac9e6..935ba176c 100644
--- a/node/src/service/mod.rs
+++ b/node/src/service/mod.rs
@@ -651,6 +651,7 @@ where
 				collator_service,
 				// Very limited proposal time.
 				authoring_duration: Duration::from_millis(500),
+				collation_request_receiver: None,
 			};
 			let fut = cumulus_client_consensus_aura::collators::basic::run::<
 				Block,

From ce3c17437a1d0235ba1b8b2fa93a9722849e7561 Mon Sep 17 00:00:00 2001
From: Xavier Lau <xavier@inv.cafe>
Date: Thu, 20 Jun 2024 21:57:46 +0800
Subject: [PATCH 09/59] paritytech/polkadot-sdk#1900

Signed-off-by: Xavier Lau <xavier@inv.cafe>
---
 node/src/chain_spec/crab.rs              | 4 ++--
 node/src/chain_spec/darwinia.rs          | 4 ++--
 node/src/chain_spec/koi.rs               | 4 ++--
 runtime/crab/src/pallets/balances.rs     | 1 +
 runtime/darwinia/src/pallets/balances.rs | 1 +
 runtime/koi/src/pallets/balances.rs      | 1 +
 6 files changed, 9 insertions(+), 6 deletions(-)

diff --git a/node/src/chain_spec/crab.rs b/node/src/chain_spec/crab.rs
index c720844bc..4c4c6cba3 100644
--- a/node/src/chain_spec/crab.rs
+++ b/node/src/chain_spec/crab.rs
@@ -33,12 +33,12 @@ use crab_runtime::*;
 use fp_evm::GenesisAccount;
 // substrate
 use sc_chain_spec::Properties;
-use sc_service::ChainType;
+use sc_service::{ChainType, GenericChainSpec};
 use sc_telemetry::TelemetryEndpoints;
 use sp_core::{crypto::UncheckedInto, H160};
 
 /// Specialized `ChainSpec` for the normal parachain runtime.
-pub type ChainSpec = sc_service::GenericChainSpec<RuntimeGenesisConfig, Extensions>;
+pub type ChainSpec = GenericChainSpec<RuntimeGenesisConfig, Extensions>;
 
 fn properties() -> Properties {
 	super::properties("CRAB")
diff --git a/node/src/chain_spec/darwinia.rs b/node/src/chain_spec/darwinia.rs
index b86debe47..37f068214 100644
--- a/node/src/chain_spec/darwinia.rs
+++ b/node/src/chain_spec/darwinia.rs
@@ -33,12 +33,12 @@ use darwinia_runtime::*;
 use fp_evm::GenesisAccount;
 // substrate
 use sc_chain_spec::Properties;
-use sc_service::ChainType;
+use sc_service::{ChainType, GenericChainSpec};
 use sc_telemetry::TelemetryEndpoints;
 use sp_core::{crypto::UncheckedInto, H160};
 
 /// Specialized `ChainSpec` for the normal parachain runtime.
-pub type ChainSpec = sc_service::GenericChainSpec<RuntimeGenesisConfig, Extensions>;
+pub type ChainSpec = GenericChainSpec<RuntimeGenesisConfig, Extensions>;
 
 fn properties() -> Properties {
 	super::properties("RING")
diff --git a/node/src/chain_spec/koi.rs b/node/src/chain_spec/koi.rs
index f9dc20dfd..9d57995a6 100644
--- a/node/src/chain_spec/koi.rs
+++ b/node/src/chain_spec/koi.rs
@@ -33,12 +33,12 @@ use koi_runtime::*;
 use fp_evm::GenesisAccount;
 // substrate
 use sc_chain_spec::Properties;
-use sc_service::ChainType;
+use sc_service::{ChainType, GenericChainSpec};
 use sc_telemetry::TelemetryEndpoints;
 use sp_core::{crypto::UncheckedInto, H160};
 
 /// Specialized `ChainSpec` for the normal parachain runtime.
-pub type ChainSpec = sc_service::GenericChainSpec<RuntimeGenesisConfig, Extensions>;
+pub type ChainSpec = GenericChainSpec<RuntimeGenesisConfig, Extensions>;
 
 fn properties() -> Properties {
 	super::properties("KRING")
diff --git a/runtime/crab/src/pallets/balances.rs b/runtime/crab/src/pallets/balances.rs
index 169981e2e..5dfd17cd9 100644
--- a/runtime/crab/src/pallets/balances.rs
+++ b/runtime/crab/src/pallets/balances.rs
@@ -31,6 +31,7 @@ impl pallet_balances::Config for Runtime {
 	type MaxReserves = ConstU32<50>;
 	type ReserveIdentifier = [u8; 8];
 	type RuntimeEvent = RuntimeEvent;
+	type RuntimeFreezeReason = RuntimeFreezeReason;
 	type RuntimeHoldReason = ();
 	type WeightInfo = weights::pallet_balances::WeightInfo<Self>;
 }
diff --git a/runtime/darwinia/src/pallets/balances.rs b/runtime/darwinia/src/pallets/balances.rs
index 169981e2e..5dfd17cd9 100644
--- a/runtime/darwinia/src/pallets/balances.rs
+++ b/runtime/darwinia/src/pallets/balances.rs
@@ -31,6 +31,7 @@ impl pallet_balances::Config for Runtime {
 	type MaxReserves = ConstU32<50>;
 	type ReserveIdentifier = [u8; 8];
 	type RuntimeEvent = RuntimeEvent;
+	type RuntimeFreezeReason = RuntimeFreezeReason;
 	type RuntimeHoldReason = ();
 	type WeightInfo = weights::pallet_balances::WeightInfo<Self>;
 }
diff --git a/runtime/koi/src/pallets/balances.rs b/runtime/koi/src/pallets/balances.rs
index 169981e2e..5dfd17cd9 100644
--- a/runtime/koi/src/pallets/balances.rs
+++ b/runtime/koi/src/pallets/balances.rs
@@ -31,6 +31,7 @@ impl pallet_balances::Config for Runtime {
 	type MaxReserves = ConstU32<50>;
 	type ReserveIdentifier = [u8; 8];
 	type RuntimeEvent = RuntimeEvent;
+	type RuntimeFreezeReason = RuntimeFreezeReason;
 	type RuntimeHoldReason = ();
 	type WeightInfo = weights::pallet_balances::WeightInfo<Self>;
 }

From a7b8a9a6a7f6156c03aea9d5dcfa29eb6ba5d8b6 Mon Sep 17 00:00:00 2001
From: Xavier Lau <xavier@inv.cafe>
Date: Thu, 20 Jun 2024 22:09:26 +0800
Subject: [PATCH 10/59] paritytech/polkadot-sdk#1661

---
 runtime/crab/src/pallets/identity.rs     | 1 +
 runtime/darwinia/src/pallets/identity.rs | 1 +
 runtime/koi/src/pallets/identity.rs      | 1 +
 3 files changed, 3 insertions(+)

diff --git a/runtime/crab/src/pallets/identity.rs b/runtime/crab/src/pallets/identity.rs
index 0f57a2fe7..b3cceee20 100644
--- a/runtime/crab/src/pallets/identity.rs
+++ b/runtime/crab/src/pallets/identity.rs
@@ -27,6 +27,7 @@ impl pallet_identity::Config for Runtime {
 	// 66 bytes on-chain.
 	type FieldDeposit = ConstU128<{ darwinia_deposit(0, 66) }>;
 	type ForceOrigin = RootOr<GeneralAdmin>;
+	type IdentityInformation = IdentityInfo<ConstU32<100>>;
 	type MaxAdditionalFields = ConstU32<100>;
 	type MaxRegistrars = ConstU32<20>;
 	type MaxSubAccounts = ConstU32<100>;
diff --git a/runtime/darwinia/src/pallets/identity.rs b/runtime/darwinia/src/pallets/identity.rs
index 2ba2101ee..5745eea5b 100644
--- a/runtime/darwinia/src/pallets/identity.rs
+++ b/runtime/darwinia/src/pallets/identity.rs
@@ -27,6 +27,7 @@ impl pallet_identity::Config for Runtime {
 	// 66 bytes on-chain.
 	type FieldDeposit = ConstU128<{ darwinia_deposit(0, 66) }>;
 	type ForceOrigin = RootOrMoreThanHalf<CouncilCollective>;
+	type IdentityInformation = IdentityInfo<ConstU32<100>>;
 	type MaxAdditionalFields = ConstU32<100>;
 	type MaxRegistrars = ConstU32<20>;
 	type MaxSubAccounts = ConstU32<100>;
diff --git a/runtime/koi/src/pallets/identity.rs b/runtime/koi/src/pallets/identity.rs
index 0f57a2fe7..b3cceee20 100644
--- a/runtime/koi/src/pallets/identity.rs
+++ b/runtime/koi/src/pallets/identity.rs
@@ -27,6 +27,7 @@ impl pallet_identity::Config for Runtime {
 	// 66 bytes on-chain.
 	type FieldDeposit = ConstU128<{ darwinia_deposit(0, 66) }>;
 	type ForceOrigin = RootOr<GeneralAdmin>;
+	type IdentityInformation = IdentityInfo<ConstU32<100>>;
 	type MaxAdditionalFields = ConstU32<100>;
 	type MaxRegistrars = ConstU32<20>;
 	type MaxSubAccounts = ConstU32<100>;

From 852765a68c333419f62d5cece69f2c175e90a2ee Mon Sep 17 00:00:00 2001
From: Xavier Lau <xavier@inv.cafe>
Date: Thu, 20 Jun 2024 22:42:20 +0800
Subject: [PATCH 11/59] paritytech/polkadot-sdk#2144

---
 node/src/service/mod.rs | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/node/src/service/mod.rs b/node/src/service/mod.rs
index 935ba176c..570b0b47a 100644
--- a/node/src/service/mod.rs
+++ b/node/src/service/mod.rs
@@ -472,11 +472,9 @@ where
 		// Here you can check whether the hardware meets your chains' requirements. Putting a link
 		// in there and swapping out the requirements for your own are probably a good idea. The
 		// requirements for a para-chain are dictated by its relay-chain.
-		if !frame_benchmarking_cli::SUBSTRATE_REFERENCE_HARDWARE.check_hardware(&hwbench)
-			&& validator
-		{
+		if let Err(e) = SUBSTRATE_REFERENCE_HARDWARE.check_hardware(&hwbench) {
 			log::warn!(
-				"⚠️  The hardware does not meet the minimal requirements for role 'Authority'."
+				"⚠️  The hardware does not meet the minimal requirements {e} for role 'Authority'.",
 			);
 		}
 

From bac551f6707e1af2e92252f88da25472762919cb Mon Sep 17 00:00:00 2001
From: Xavier Lau <xavier@inv.cafe>
Date: Thu, 20 Jun 2024 23:07:02 +0800
Subject: [PATCH 12/59] paritytech/polkadot-sdk#2048

---
 runtime/crab/src/pallets/identity.rs     |  7 +++----
 runtime/crab/src/pallets/tx_pause.rs     |  4 ++--
 runtime/darwinia/src/pallets/identity.rs |  7 +++----
 runtime/koi/src/pallets/identity.rs      | 12 ++++++------
 runtime/koi/src/pallets/tx_pause.rs      |  4 ++--
 5 files changed, 16 insertions(+), 18 deletions(-)

diff --git a/runtime/crab/src/pallets/identity.rs b/runtime/crab/src/pallets/identity.rs
index b3cceee20..e269dfe03 100644
--- a/runtime/crab/src/pallets/identity.rs
+++ b/runtime/crab/src/pallets/identity.rs
@@ -22,13 +22,12 @@ use crate::*;
 impl pallet_identity::Config for Runtime {
 	// Minimum 100 bytes/UNIT deposited (1 MILLIUNIT/byte).
 	// 258 bytes on-chain.
-	type BasicDeposit = ConstU128<{ darwinia_deposit(1, 258) }>;
-	type Currency = Balances;
+	type BasicDeposit = ConstU128<{ darwinia_deposit(1, 17) }>;
 	// 66 bytes on-chain.
-	type FieldDeposit = ConstU128<{ darwinia_deposit(0, 66) }>;
+	type ByteDeposit = ConstU128<{ darwinia_deposit(0, 1) }>;
+	type Currency = Balances;
 	type ForceOrigin = RootOr<GeneralAdmin>;
 	type IdentityInformation = IdentityInfo<ConstU32<100>>;
-	type MaxAdditionalFields = ConstU32<100>;
 	type MaxRegistrars = ConstU32<20>;
 	type MaxSubAccounts = ConstU32<100>;
 	type RegistrarOrigin = RootOr<GeneralAdmin>;
diff --git a/runtime/crab/src/pallets/tx_pause.rs b/runtime/crab/src/pallets/tx_pause.rs
index 17f5964eb..66236c0b6 100644
--- a/runtime/crab/src/pallets/tx_pause.rs
+++ b/runtime/crab/src/pallets/tx_pause.rs
@@ -43,8 +43,8 @@ impl frame_support::traits::Contains<pallet_tx_pause::RuntimeCallNameOf<Runtime>
 				| b"Assets" | b"Vesting"
 				| b"Deposit" | b"AccountMigration"
 				| b"DarwiniaStaking"
-				| b"Ethereum" | b"EVM"
-				| b"EthTxForwarder"
+				| b"Ethereum"
+				| b"EVM" | b"EthTxForwarder"
 		)
 	}
 }
diff --git a/runtime/darwinia/src/pallets/identity.rs b/runtime/darwinia/src/pallets/identity.rs
index 5745eea5b..37723f90a 100644
--- a/runtime/darwinia/src/pallets/identity.rs
+++ b/runtime/darwinia/src/pallets/identity.rs
@@ -22,13 +22,12 @@ use crate::*;
 impl pallet_identity::Config for Runtime {
 	// Minimum 100 bytes/UNIT deposited (1 MILLIUNIT/byte).
 	// 258 bytes on-chain.
-	type BasicDeposit = ConstU128<{ darwinia_deposit(1, 258) }>;
-	type Currency = Balances;
+	type BasicDeposit = ConstU128<{ darwinia_deposit(1, 17) }>;
 	// 66 bytes on-chain.
-	type FieldDeposit = ConstU128<{ darwinia_deposit(0, 66) }>;
+	type ByteDeposit = ConstU128<{ darwinia_deposit(0, 1) }>;
+	type Currency = Balances;
 	type ForceOrigin = RootOrMoreThanHalf<CouncilCollective>;
 	type IdentityInformation = IdentityInfo<ConstU32<100>>;
-	type MaxAdditionalFields = ConstU32<100>;
 	type MaxRegistrars = ConstU32<20>;
 	type MaxSubAccounts = ConstU32<100>;
 	type RegistrarOrigin = RootOrMoreThanHalf<CouncilCollective>;
diff --git a/runtime/koi/src/pallets/identity.rs b/runtime/koi/src/pallets/identity.rs
index b3cceee20..d6378b120 100644
--- a/runtime/koi/src/pallets/identity.rs
+++ b/runtime/koi/src/pallets/identity.rs
@@ -20,15 +20,15 @@
 use crate::*;
 
 impl pallet_identity::Config for Runtime {
-	// Minimum 100 bytes/UNIT deposited (1 MILLIUNIT/byte).
-	// 258 bytes on-chain.
-	type BasicDeposit = ConstU128<{ darwinia_deposit(1, 258) }>;
+	//   27 | Min encoded size of `Registration`
+	// - 10 | Min encoded size of `IdentityInfo`
+	// -----|
+	//   17 | Min size without `IdentityInfo` (accounted for in byte deposit)
+	type BasicDeposit = ConstU128<{ darwinia_deposit(1, 17) }>;
+	type ByteDeposit = ConstU128<{ darwinia_deposit(0, 1) }>;
 	type Currency = Balances;
-	// 66 bytes on-chain.
-	type FieldDeposit = ConstU128<{ darwinia_deposit(0, 66) }>;
 	type ForceOrigin = RootOr<GeneralAdmin>;
 	type IdentityInformation = IdentityInfo<ConstU32<100>>;
-	type MaxAdditionalFields = ConstU32<100>;
 	type MaxRegistrars = ConstU32<20>;
 	type MaxSubAccounts = ConstU32<100>;
 	type RegistrarOrigin = RootOr<GeneralAdmin>;
diff --git a/runtime/koi/src/pallets/tx_pause.rs b/runtime/koi/src/pallets/tx_pause.rs
index 8c25d6d4e..a1895c1f9 100644
--- a/runtime/koi/src/pallets/tx_pause.rs
+++ b/runtime/koi/src/pallets/tx_pause.rs
@@ -42,8 +42,8 @@ impl frame_support::traits::Contains<pallet_tx_pause::RuntimeCallNameOf<Runtime>
 			b"Balances"
 				| b"Assets" | b"Vesting"
 				| b"Deposit" | b"DarwiniaStaking"
-				| b"Ethereum" | b"EVM"
-				| b"EthTxForwarder"
+				| b"Ethereum"
+				| b"EVM" | b"EthTxForwarder"
 		)
 	}
 }

From 548e407e53a7f251242801e791c3e6af3553974d Mon Sep 17 00:00:00 2001
From: Xavier Lau <xavier@inv.cafe>
Date: Fri, 21 Jun 2024 01:17:59 +0800
Subject: [PATCH 13/59] paritytech/polkadot-sdk#1672

---
 runtime/crab/src/pallets/polkadot_xcm.rs     | 7 -------
 runtime/darwinia/src/pallets/polkadot_xcm.rs | 7 -------
 runtime/koi/src/pallets/polkadot_xcm.rs      | 7 -------
 3 files changed, 21 deletions(-)

diff --git a/runtime/crab/src/pallets/polkadot_xcm.rs b/runtime/crab/src/pallets/polkadot_xcm.rs
index 7f3282cfc..7ec8bc8cb 100644
--- a/runtime/crab/src/pallets/polkadot_xcm.rs
+++ b/runtime/crab/src/pallets/polkadot_xcm.rs
@@ -186,11 +186,6 @@ pub type XcmRouter = xcm_builder::WithUniqueTopic<(
 	XcmpQueue,
 )>;
 
-#[cfg(feature = "runtime-benchmarks")]
-frame_support::parameter_types! {
-	pub ReachableDest: Option<MultiLocation> = Some(Parent.into());
-}
-
 impl pallet_xcm::Config for Runtime {
 	type AdminOrigin = Root;
 	// ^ Override for AdvertisedXcmVersion default
@@ -200,8 +195,6 @@ impl pallet_xcm::Config for Runtime {
 	type ExecuteXcmOrigin = xcm_builder::EnsureXcmOrigin<RuntimeOrigin, LocalOriginToLocation>;
 	type MaxLockers = ConstU32<8>;
 	type MaxRemoteLockConsumers = ();
-	#[cfg(feature = "runtime-benchmarks")]
-	type ReachableDest = ReachableDest;
 	type RemoteLockConsumerIdentifier = ();
 	type RuntimeCall = RuntimeCall;
 	type RuntimeEvent = RuntimeEvent;
diff --git a/runtime/darwinia/src/pallets/polkadot_xcm.rs b/runtime/darwinia/src/pallets/polkadot_xcm.rs
index 18a53f59c..a3c65da4f 100644
--- a/runtime/darwinia/src/pallets/polkadot_xcm.rs
+++ b/runtime/darwinia/src/pallets/polkadot_xcm.rs
@@ -282,11 +282,6 @@ pub type XcmRouter = xcm_builder::WithUniqueTopic<(
 	XcmpQueue,
 )>;
 
-#[cfg(feature = "runtime-benchmarks")]
-frame_support::parameter_types! {
-	pub ReachableDest: Option<MultiLocation> = Some(Parent.into());
-}
-
 impl pallet_xcm::Config for Runtime {
 	type AdminOrigin = Root;
 	// ^ Override for AdvertisedXcmVersion default
@@ -296,8 +291,6 @@ impl pallet_xcm::Config for Runtime {
 	type ExecuteXcmOrigin = xcm_builder::EnsureXcmOrigin<RuntimeOrigin, LocalOriginToLocation>;
 	type MaxLockers = ConstU32<8>;
 	type MaxRemoteLockConsumers = ();
-	#[cfg(feature = "runtime-benchmarks")]
-	type ReachableDest = ReachableDest;
 	type RemoteLockConsumerIdentifier = ();
 	type RuntimeCall = RuntimeCall;
 	type RuntimeEvent = RuntimeEvent;
diff --git a/runtime/koi/src/pallets/polkadot_xcm.rs b/runtime/koi/src/pallets/polkadot_xcm.rs
index 1f15c3392..a88545076 100644
--- a/runtime/koi/src/pallets/polkadot_xcm.rs
+++ b/runtime/koi/src/pallets/polkadot_xcm.rs
@@ -282,11 +282,6 @@ pub type XcmRouter = xcm_builder::WithUniqueTopic<(
 	XcmpQueue,
 )>;
 
-#[cfg(feature = "runtime-benchmarks")]
-frame_support::parameter_types! {
-	pub ReachableDest: Option<MultiLocation> = Some(Parent.into());
-}
-
 impl pallet_xcm::Config for Runtime {
 	type AdminOrigin = RootOr<GeneralAdmin>;
 	// ^ Override for AdvertisedXcmVersion default
@@ -296,8 +291,6 @@ impl pallet_xcm::Config for Runtime {
 	type ExecuteXcmOrigin = xcm_builder::EnsureXcmOrigin<RuntimeOrigin, LocalOriginToLocation>;
 	type MaxLockers = ConstU32<8>;
 	type MaxRemoteLockConsumers = ();
-	#[cfg(feature = "runtime-benchmarks")]
-	type ReachableDest = ReachableDest;
 	type RemoteLockConsumerIdentifier = ();
 	type RuntimeCall = RuntimeCall;
 	type RuntimeEvent = RuntimeEvent;

From 06dcfec0335ec732376bd492aee7de1c90aa865d Mon Sep 17 00:00:00 2001
From: Xavier Lau <xavier@inv.cafe>
Date: Fri, 21 Jun 2024 02:00:00 +0800
Subject: [PATCH 14/59] paritytech/polkadot-sdk#2303

---
 node/src/rpc.rs | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/node/src/rpc.rs b/node/src/rpc.rs
index 78ab26944..5f306b8a2 100644
--- a/node/src/rpc.rs
+++ b/node/src/rpc.rs
@@ -105,14 +105,12 @@ where
 	C: 'static
 		+ Send
 		+ Sync
-		+ sc_client_api::backend::AuxStore
 		+ sc_client_api::backend::StorageProvider<Block, BE>
 		+ sc_client_api::BlockchainEvents<Block>
+		+ sc_client_api::UsageProvider<Block>
 		+ sp_api::CallApiAt<Block>
 		+ sp_api::ProvideRuntimeApi<Block>
 		+ sp_blockchain::HeaderBackend<Block>
-		+ sc_client_api::backend::AuxStore
-		+ sc_client_api::UsageProvider<Block>
 		+ sp_blockchain::HeaderMetadata<Block, Error = sp_blockchain::Error>,
 	C::Api: fp_rpc::ConvertTransactionRuntimeApi<Block>
 		+ fp_rpc::EthereumRuntimeRPCApi<Block>

From 28d5d8aec848cd438be864e951760fad61e90b0c Mon Sep 17 00:00:00 2001
From: Xavier Lau <xavier@inv.cafe>
Date: Fri, 21 Jun 2024 19:38:14 +0800
Subject: [PATCH 15/59] paritytech/polkadot-sdk#1256

---
 Cargo.lock                      |   1 +
 node/Cargo.toml                 |   1 +
 node/src/chain_spec/crab.rs     | 491 +++++++++++++-------------------
 node/src/chain_spec/darwinia.rs | 478 ++++++++++++-------------------
 node/src/chain_spec/koi.rs      | 433 ++++++++++------------------
 node/src/chain_spec/mod.rs      |  49 ++--
 node/src/command.rs             |  42 +--
 7 files changed, 584 insertions(+), 911 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index dc403c2a2..f4f7276ad 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2692,6 +2692,7 @@ dependencies = [
  "sc-transaction-pool",
  "sc-transaction-pool-api",
  "serde",
+ "serde_json",
  "sp-api",
  "sp-block-builder",
  "sp-blockchain",
diff --git a/node/Cargo.toml b/node/Cargo.toml
index 41682b310..57c46fdff 100644
--- a/node/Cargo.toml
+++ b/node/Cargo.toml
@@ -18,6 +18,7 @@ futures     = { version = "0.3" }
 jsonrpsee   = { version = "0.16", features = ["server"] }
 log         = { version = "0.4" }
 serde       = { version = "1.0", features = ["derive"] }
+serde_json  = { version = "1.0" }
 tokio       = { version = "1.33" }
 trauma      = { version = "2.2" }
 
diff --git a/node/src/chain_spec/crab.rs b/node/src/chain_spec/crab.rs
index 4c4c6cba3..92520db34 100644
--- a/node/src/chain_spec/crab.rs
+++ b/node/src/chain_spec/crab.rs
@@ -37,311 +37,50 @@ use sc_service::{ChainType, GenericChainSpec};
 use sc_telemetry::TelemetryEndpoints;
 use sp_core::{crypto::UncheckedInto, H160};
 
-/// Specialized `ChainSpec` for the normal parachain runtime.
-pub type ChainSpec = GenericChainSpec<RuntimeGenesisConfig, Extensions>;
+const PARA_ID: u32 = 2105;
 
-fn properties() -> Properties {
-	super::properties("CRAB")
-}
-
-// Generate the session keys from individual elements.
-//
-// The input must be a tuple of individual keys (a single arg for now since we have just one key).
-fn session_keys(keys: AuraId) -> SessionKeys {
-	SessionKeys { aura: keys }
-}
+// FIXME: https://github.com/paritytech/polkadot-sdk/issues/4853.
 
 pub fn development_config() -> ChainSpec {
-	ChainSpec::from_genesis(
-		// Fulfill Polkadot.JS metadata upgrade requirements.
-		"Crab2 D",
-		"crab2-d",
-		ChainType::Live,
-		move || {
-			testnet_genesis(
-				vec![
-					// Bind the `Alice` to `Alith` to make `--alice` available for testnet.
-					(
-						array_bytes::hex_n_into_unchecked::<_, _, 20>(ALITH),
-						get_collator_keys_from_seed("Alice"),
-					),
-				],
-				vec![
-					array_bytes::hex_n_into_unchecked::<_, _, 20>(ALITH),
-					array_bytes::hex_n_into_unchecked::<_, _, 20>(BALTATHAR),
-					array_bytes::hex_n_into_unchecked::<_, _, 20>(CHARLETH),
-					array_bytes::hex_n_into_unchecked::<_, _, 20>(DOROTHY),
-					array_bytes::hex_n_into_unchecked::<_, _, 20>(ETHAN),
-					array_bytes::hex_n_into_unchecked::<_, _, 20>(FAITH),
-				],
-				2105.into(),
-			)
-		},
-		Vec::new(),
-		None,
-		Some(PROTOCOL_ID),
-		None,
-		Some(properties()),
-		Extensions {
-			relay_chain: "rococo-local".into(), // You MUST set this to the correct network!
-			para_id: 2105,
-		},
-	)
-}
-
-pub fn local_config() -> ChainSpec {
-	ChainSpec::from_genesis(
-		// Fulfill Polkadot.JS metadata upgrade requirements.
-		"Crab2 L",
-		"crab2-l",
-		ChainType::Live,
-		move || {
-			testnet_genesis(
-				vec![
-					// Bind the `Alice` to `Alith` to make `--alice` available for testnet.
-					(
-						array_bytes::hex_n_into_unchecked::<_, _, 20>(ALITH),
-						get_collator_keys_from_seed("Alice"),
-					),
-					// Bind the `Bob` to `Balthar` to make `--bob` available for testnet.
-					(
-						array_bytes::hex_n_into_unchecked::<_, _, 20>(BALTATHAR),
-						get_collator_keys_from_seed("Bob"),
-					),
-					// Bind the `Charlie` to `CHARLETH` to make `--charlie` available for testnet.
-					(
-						array_bytes::hex_n_into_unchecked::<_, _, 20>(CHARLETH),
-						get_collator_keys_from_seed("Charlie"),
-					),
-				],
-				vec![
-					array_bytes::hex_n_into_unchecked::<_, _, 20>(ALITH),
-					array_bytes::hex_n_into_unchecked::<_, _, 20>(BALTATHAR),
-					array_bytes::hex_n_into_unchecked::<_, _, 20>(CHARLETH),
-					array_bytes::hex_n_into_unchecked::<_, _, 20>(DOROTHY),
-					array_bytes::hex_n_into_unchecked::<_, _, 20>(ETHAN),
-					array_bytes::hex_n_into_unchecked::<_, _, 20>(FAITH),
-				],
-				2105.into(),
-			)
-		},
-		Vec::new(),
-		None,
-		Some(PROTOCOL_ID),
-		None,
-		Some(properties()),
-		Extensions {
-			relay_chain: "rococo-local".into(), // You MUST set this to the correct network!
-			para_id: 2105,
-		},
-	)
-}
-
-pub fn genesis_config() -> ChainSpec {
-	let collators = [
-		(
-			"0x196f03b77a1acd0db080006b04d2f3a991ebbe68",
-			"0xa05255010ee986b9684a444d10a74aa0ecbe781f5002e871665add894752cc7e",
-		),
-		(
-			"0x4D3D5958B948e8d749FaB0236b179fCC55d9aAc0",
-			"0xf8f82edfc6899552e5a32aa381e53723d2c39594638cb8f7e2572fef74b05255",
-		),
-		(
-			"0x7aE2a0914db8bFBdad538b0eAc3Fa473A0e07843",
-			"0xdaf5c4506b82f617245150216a73c0eb4f2603848c02413db66f991846777845",
-		),
-		(
-			"0x9F33a4809aA708d7a399fedBa514e0A0d15EfA85",
-			"0xdcff1219121687391353b17e798b10e87f6e578b2a01e032375f2f14a0712b57",
-		),
-		(
-			"0x0a1287977578F888bdc1c7627781AF1cc000e6ab",
-			"0x28a8af71db9703e6b8960d1dcb742deca13c574f81f781be5dbde84ec8d66d45",
-		),
-		(
-			"0xEB7e82A67CDFA3E742e0f3315Fd4EEd7B05730CC",
-			"0xfee21e4e4865380734882253d27612da0e4413c93e5c817e38b8c5e034de7270",
-		),
-	];
-
-	ChainSpec::from_genesis(
-		"Crab2",
-		"crab2",
-		ChainType::Live,
-		move || {
-			RuntimeGenesisConfig {
-				// System stuff.
-				system: SystemConfig { code: WASM_BINARY.unwrap().to_vec(), ..Default::default() },
-				parachain_system: Default::default(),
-				parachain_info: ParachainInfoConfig { parachain_id: 2105.into(), ..Default::default() },
-
-				// Monetary stuff.
-				balances: BalancesConfig {
-					balances: collators
-						.iter()
-						.map(|(k, _)| (array_bytes::hex_n_into_unchecked::<_, _, 20>(k), 10_000 * UNIT))
-						.collect(),
-				},
-				transaction_payment: Default::default(),
-				assets: AssetsConfig {
-					assets: vec![(AssetIds::CKton as _, ROOT, true, 1)],
-					metadata: vec![(
-						AssetIds::CKton as _,
-						b"Crab Commitment Token".to_vec(),
-						b"CKTON".to_vec(),
-						18,
-					)],
-					..Default::default()
-				},
-				vesting: Default::default(),
-
-				// Consensus stuff.
-				darwinia_staking: DarwiniaStakingConfig {
-					now: SystemTime::now().duration_since(UNIX_EPOCH).unwrap().as_millis(),
-					elapsed_time: 0,
-					rate_limit: 20_000_000 * UNIT,
-					collator_count: 6,
-					collators: collators
-						.iter()
-						.map(|(k, _)| (array_bytes::hex_n_into_unchecked::<_, _, 20>(k), 1_000 * UNIT))
-						.collect(),
-				},
-				session: SessionConfig {
-					keys: collators
-						.iter()
-						.map(|(k, a)| {
-							(
-								array_bytes::hex_n_into_unchecked::<_, _, 20>(k),
-								array_bytes::hex_n_into_unchecked::<_, _, 20>(k),
-								session_keys(array_bytes::hex2array_unchecked(a).unchecked_into()),
-							)
-						})
-						.collect(),
-				},
-				aura: Default::default(),
-				aura_ext: Default::default(),
-
-				// Governance stuff.
-				technical_committee: Default::default(),
-				treasury: Default::default(),
-
-				// Utility stuff.
-				tx_pause: Default::default(),
-
-				// XCM stuff.
-				polkadot_xcm: PolkadotXcmConfig { safe_xcm_version: Some(SAFE_XCM_VERSION), ..Default::default() },
-
-				// EVM stuff.
-				ethereum: Default::default(),
-				evm: EVMConfig {
-					accounts: {
-						BTreeMap::from_iter(
-							CrabPrecompiles::<Runtime>::used_addresses().iter().map(|p| {
-								(
-									p.to_owned(),
-									GenesisAccount {
-										nonce: Default::default(),
-										balance: Default::default(),
-										storage: Default::default(),
-										code: REVERT_BYTECODE.to_vec(),
-									},
-								)
-							}),
-						)
-					},
-					..Default::default()
-				},
-			}
-		},
-		vec![
-			"/dns/g1.crab2.darwinia.network/tcp/30333/ws/p2p/12D3KooWEDiHG6pjt53HqnfYepnLzp9rFTh8MJrBX7AZeGShBMM4".parse().unwrap()
-		],
-		TelemetryEndpoints::new(vec![(TELEMETRY_URL.into(), 0)]).ok(),
-		Some(PROTOCOL_ID),
-		None,
-		Some(properties()),
-		Extensions {
-			relay_chain: "kusama".into(), // You MUST set this to the correct network!
-			para_id: 2105,
-		},
-	)
-}
-
-pub fn config() -> ChainSpec {
-	load_config("crab2.json", 0)
-}
-
-fn testnet_genesis(
-	collators: Vec<(AccountId, AuraId)>,
-	endowed_accounts: Vec<AccountId>,
-	id: ParaId,
-) -> RuntimeGenesisConfig {
-	RuntimeGenesisConfig {
+	let (collators, endowed_accounts) = dev_accounts::<AccountId>(session_keys);
+	let genesis_config_patch = serde_json::json!({
 		// System stuff.
-		system: SystemConfig { code: WASM_BINARY.unwrap().to_vec(), ..Default::default() },
-		parachain_system: Default::default(),
-		parachain_info: ParachainInfoConfig { parachain_id: id, ..Default::default() },
+		"parachainInfo": { "parachainId": PARA_ID },
 
 		// Monetary stuff.
-		balances: BalancesConfig {
-			balances: endowed_accounts.iter().cloned().map(|k| (k, 100_000_000 * UNIT)).collect(),
+		"balances": {
+			"balances": endowed_accounts.iter().map(|a| (a, 100_000_000 * UNIT)).collect::<Vec<_>>()
 		},
-		transaction_payment: Default::default(),
-		assets: AssetsConfig {
-			assets: vec![(AssetIds::CKton as _, ROOT, true, 1)],
-			metadata: vec![(
-				AssetIds::CKton as _,
-				b"Crab Commitment Token".to_vec(),
-				b"CKTON".to_vec(),
-				18,
-			)],
-			..Default::default()
+		"assets": {
+			"assets": [(AssetIds::CKton as u32, ROOT, true, 1)],
+			"metadata": [(
+				AssetIds::CKton as u32,
+				b"Crab Commitment Token",
+				b"CKTON",
+				18
+			)]
 		},
-		vesting: Default::default(),
 
 		// Consensus stuff.
-		darwinia_staking: DarwiniaStakingConfig {
-			now: SystemTime::now().duration_since(UNIX_EPOCH).unwrap().as_millis(),
-			elapsed_time: 0,
-			rate_limit: 20_000_000 * UNIT,
-			collator_count: collators.len() as _,
-			collators: collators.iter().map(|(a, _)| (a.to_owned(), UNIT)).collect(),
+		"darwiniaStaking": {
+			"now": SystemTime::now().duration_since(UNIX_EPOCH).unwrap().as_millis(),
+			"elapsedTime": 0,
+			"rateLimit": 20_000_000 * UNIT,
+			"collatorCount": collators.len(),
+			"collators": collators.iter().map(|(a, _)| (a, UNIT)).collect::<Vec<_>>()
 		},
-		session: SessionConfig {
-			keys: collators
-				.into_iter()
-				.map(|(acc, aura)| {
-					(
-						acc,                // account id
-						acc,                // validator id
-						session_keys(aura), // session keys
-					)
-				})
-				.collect(),
+		"session": {
+			"keys": collators.into_iter().map(|(a, sks)| (a, a, sks)).collect::<Vec<_>>()
 		},
-		aura: Default::default(),
-		aura_ext: Default::default(),
-
-		// Governance stuff.
-		technical_committee: Default::default(),
-		treasury: Default::default(),
-
-		// Utility stuff.
-		tx_pause: Default::default(),
 
 		// XCM stuff.
-		polkadot_xcm: PolkadotXcmConfig {
-			safe_xcm_version: Some(SAFE_XCM_VERSION),
-			..Default::default()
-		},
+		"polkadotXcm": { "safeXcmVersion": Some(SAFE_XCM_VERSION) },
 
 		// EVM stuff.
-		ethereum: Default::default(),
-		evm: EVMConfig {
-			accounts: {
+		"evm": {
+			"accounts": {
 				BTreeMap::from_iter(
-					CrabPrecompiles::<Runtime>::used_addresses()
+					<CrabPrecompiles<Runtime>>::used_addresses()
 						.iter()
 						.map(|p| {
 							(
@@ -367,8 +106,178 @@ fn testnet_genesis(
 							),
 						]),
 				)
-			},
-			..Default::default()
+			}
+		}
+	});
+
+	ChainSpec::builder(
+		WASM_BINARY.unwrap().to_vec(),
+		Extensions {
+			relay_chain: "rococo-local".into(), // You MUST set this to the correct network!
+			para_id: PARA_ID,
+		},
+	)
+	.with_name("Crab2 D")
+	.with_id("crab2-d")
+	.with_chain_type(ChainType::Live)
+	.with_protocol_id(PROTOCOL_ID)
+	.with_properties(properties())
+	.with_genesis_config_patch(genesis_config_patch)
+	.build()
+}
+
+pub fn genesis_config() -> ChainSpec {
+	let collators = [
+		(
+			array_bytes::hex_n_into_unchecked::<_, AccountId, 20>(
+				"0x196f03b77a1acd0db080006b04d2f3a991ebbe68",
+			),
+			session_keys(
+				array_bytes::hex2array_unchecked(
+					"0xa05255010ee986b9684a444d10a74aa0ecbe781f5002e871665add894752cc7e",
+				)
+				.unchecked_into(),
+			),
+		),
+		(
+			array_bytes::hex_n_into_unchecked::<_, AccountId, 20>(
+				"0x4D3D5958B948e8d749FaB0236b179fCC55d9aAc0",
+			),
+			session_keys(
+				array_bytes::hex2array_unchecked(
+					"0xf8f82edfc6899552e5a32aa381e53723d2c39594638cb8f7e2572fef74b05255",
+				)
+				.unchecked_into(),
+			),
+		),
+		(
+			array_bytes::hex_n_into_unchecked::<_, AccountId, 20>(
+				"0x7aE2a0914db8bFBdad538b0eAc3Fa473A0e07843",
+			),
+			session_keys(
+				array_bytes::hex2array_unchecked(
+					"0xdaf5c4506b82f617245150216a73c0eb4f2603848c02413db66f991846777845",
+				)
+				.unchecked_into(),
+			),
+		),
+		(
+			array_bytes::hex_n_into_unchecked::<_, AccountId, 20>(
+				"0x9F33a4809aA708d7a399fedBa514e0A0d15EfA85",
+			),
+			session_keys(
+				array_bytes::hex2array_unchecked(
+					"0xdcff1219121687391353b17e798b10e87f6e578b2a01e032375f2f14a0712b57",
+				)
+				.unchecked_into(),
+			),
+		),
+		(
+			array_bytes::hex_n_into_unchecked::<_, AccountId, 20>(
+				"0x0a1287977578F888bdc1c7627781AF1cc000e6ab",
+			),
+			session_keys(
+				array_bytes::hex2array_unchecked(
+					"0x28a8af71db9703e6b8960d1dcb742deca13c574f81f781be5dbde84ec8d66d45",
+				)
+				.unchecked_into(),
+			),
+		),
+		(
+			array_bytes::hex_n_into_unchecked::<_, AccountId, 20>(
+				"0xEB7e82A67CDFA3E742e0f3315Fd4EEd7B05730CC",
+			),
+			session_keys(
+				array_bytes::hex2array_unchecked(
+					"0xfee21e4e4865380734882253d27612da0e4413c93e5c817e38b8c5e034de7270",
+				)
+				.unchecked_into(),
+			),
+		),
+	];
+	let genesis_config_patch = serde_json::json!({
+		// System stuff.
+		"parachainInfo": { "parachainId": PARA_ID },
+
+		// Monetary stuff.
+		"balances": {
+			"balances": collators.iter().map(|a| (a, 10_000 * UNIT)).collect::<Vec<_>>()
+		},
+		"assets": {
+			"assets": [(AssetIds::CKton as u32, ROOT, true, 1)],
+			"metadata": [(
+				AssetIds::CKton as u32,
+				b"Crab Commitment Token",
+				b"CKTON",
+				18
+			)]
+		},
+
+		// Consensus stuff.
+		"darwiniaStaking": {
+			"now": SystemTime::now().duration_since(UNIX_EPOCH).unwrap().as_millis(),
+			"elapsedTime": 0,
+			"rateLimit": 20_000_000 * UNIT,
+			"collatorCount": 6,
+			"collators": collators.iter().map(|(a, _)| (a, 1_000 * UNIT)).collect::<Vec<_>>()
 		},
-	}
+		session: {
+			"keys": collators.iter().map(|(a, sks)| (a, a, sks)).collect::<Vec<_>>()
+		},
+
+		// XCM stuff.
+		"polkadotXcm": { "safeXcmVersion": Some(SAFE_XCM_VERSION) },
+
+		// EVM stuff.
+		"evm": {
+			"accounts": {
+				BTreeMap::from_iter(
+					<CrabPrecompiles<Runtime>>::used_addresses().iter().map(|p| {
+						(
+							p,
+							GenesisAccount {
+								nonce: Default::default(),
+								balance: Default::default(),
+								storage: Default::default(),
+								code: REVERT_BYTECODE.to_vec(),
+							},
+						)
+					}),
+				)
+			}
+		}
+	});
+
+	ChainSpec::builder(WASM_BINARY.unwrap().to_vec(), Extensions {
+		relay_chain: "kusama".into(), // You MUST set this to the correct network!
+		para_id: PARA_ID,
+	})
+	.with_name("Crab2")
+	.with_id("crab2")
+	.with_chain_type(ChainType::Live)
+	.with_protocol_id(PROTOCOL_ID)
+	.with_properties(properties())
+	.with_genesis_config_patch(genesis_config_patch)
+	.with_boot_nodes(vec![
+		"/dns/g1.crab2.darwinia.network/tcp/30333/ws/p2p/12D3KooWEDiHG6pjt53HqnfYepnLzp9rFTh8MJrBX7AZeGShBMM4".parse().unwrap()
+	])
+	.with_telemetry_endpoints(
+		TelemetryEndpoints::new(vec![(TELEMETRY_URL.into(), 0)]).unwrap()
+	)
+	.build()
+}
+
+pub fn config() -> ChainSpec {
+	load_config("crab2.json", 0)
+}
+
+fn properties() -> Properties {
+	super::properties("CRAB")
+}
+
+// Generate the session keys from individual elements.
+//
+// The input must be a tuple of individual keys (a single arg for now since we have just one key).
+fn session_keys(keys: AuraId) -> SessionKeys {
+	SessionKeys { aura: keys }
 }
diff --git a/node/src/chain_spec/darwinia.rs b/node/src/chain_spec/darwinia.rs
index 37f068214..9eed32934 100644
--- a/node/src/chain_spec/darwinia.rs
+++ b/node/src/chain_spec/darwinia.rs
@@ -37,311 +37,48 @@ use sc_service::{ChainType, GenericChainSpec};
 use sc_telemetry::TelemetryEndpoints;
 use sp_core::{crypto::UncheckedInto, H160};
 
-/// Specialized `ChainSpec` for the normal parachain runtime.
-pub type ChainSpec = GenericChainSpec<RuntimeGenesisConfig, Extensions>;
-
-fn properties() -> Properties {
-	super::properties("RING")
-}
-
-// Generate the session keys from individual elements.
-//
-// The input must be a tuple of individual keys (a single arg for now since we have just one key).
-fn session_keys(keys: AuraId) -> SessionKeys {
-	SessionKeys { aura: keys }
-}
+const PARA_ID: u32 = 2046;
 
 pub fn development_config() -> ChainSpec {
-	ChainSpec::from_genesis(
-		// Fulfill Polkadot.JS metadata upgrade requirements.
-		"Darwinia2 D",
-		"darwinia2-d",
-		ChainType::Live,
-		move || {
-			testnet_genesis(
-				vec![
-					// Bind the `Alice` to `Alith` to make `--alice` available for testnet.
-					(
-						array_bytes::hex_n_into_unchecked::<_, _, 20>(ALITH),
-						get_collator_keys_from_seed("Alice"),
-					),
-				],
-				vec![
-					array_bytes::hex_n_into_unchecked::<_, _, 20>(ALITH),
-					array_bytes::hex_n_into_unchecked::<_, _, 20>(BALTATHAR),
-					array_bytes::hex_n_into_unchecked::<_, _, 20>(CHARLETH),
-					array_bytes::hex_n_into_unchecked::<_, _, 20>(DOROTHY),
-					array_bytes::hex_n_into_unchecked::<_, _, 20>(ETHAN),
-					array_bytes::hex_n_into_unchecked::<_, _, 20>(FAITH),
-				],
-				2046.into(),
-			)
-		},
-		Vec::new(),
-		None,
-		Some(PROTOCOL_ID),
-		None,
-		Some(properties()),
-		Extensions {
-			relay_chain: "rococo-local".into(), // You MUST set this to the correct network!
-			para_id: 2046,
-		},
-	)
-}
-
-pub fn local_config() -> ChainSpec {
-	ChainSpec::from_genesis(
-		// Fulfill Polkadot.JS metadata upgrade requirements.
-		"Darwinia2 L",
-		"darwinia2-l",
-		ChainType::Live,
-		move || {
-			testnet_genesis(
-				vec![
-					// Bind the `Alice` to `Alith` to make `--alice` available for testnet.
-					(
-						array_bytes::hex_n_into_unchecked::<_, _, 20>(ALITH),
-						get_collator_keys_from_seed("Alice"),
-					),
-					// Bind the `Bob` to `Balthar` to make `--bob` available for testnet.
-					(
-						array_bytes::hex_n_into_unchecked::<_, _, 20>(BALTATHAR),
-						get_collator_keys_from_seed("Bob"),
-					),
-					// Bind the `Charlie` to `CHARLETH` to make `--charlie` available for testnet.
-					(
-						array_bytes::hex_n_into_unchecked::<_, _, 20>(CHARLETH),
-						get_collator_keys_from_seed("Charlie"),
-					),
-				],
-				vec![
-					array_bytes::hex_n_into_unchecked::<_, _, 20>(ALITH),
-					array_bytes::hex_n_into_unchecked::<_, _, 20>(BALTATHAR),
-					array_bytes::hex_n_into_unchecked::<_, _, 20>(CHARLETH),
-					array_bytes::hex_n_into_unchecked::<_, _, 20>(DOROTHY),
-					array_bytes::hex_n_into_unchecked::<_, _, 20>(ETHAN),
-					array_bytes::hex_n_into_unchecked::<_, _, 20>(FAITH),
-				],
-				2046.into(),
-			)
-		},
-		Vec::new(),
-		None,
-		Some(PROTOCOL_ID),
-		None,
-		Some(properties()),
-		Extensions {
-			relay_chain: "rococo-local".into(), // You MUST set this to the correct network!
-			para_id: 2046,
-		},
-	)
-}
-
-pub fn genesis_config() -> ChainSpec {
-	let collators = [
-		(
-			"0x196f03b77a1acd0db080006b04d2f3a991ebbe68",
-			"0xa05255010ee986b9684a444d10a74aa0ecbe781f5002e871665add894752cc7e",
-		),
-		(
-			"0x7aE2a0914db8bFBdad538b0eAc3Fa473A0e07843",
-			"0xdaf5c4506b82f617245150216a73c0eb4f2603848c02413db66f991846777845",
-		),
-		(
-			"0x9F33a4809aA708d7a399fedBa514e0A0d15EfA85",
-			"0xdcff1219121687391353b17e798b10e87f6e578b2a01e032375f2f14a0712b57",
-		),
-		(
-			"0x0a1287977578F888bdc1c7627781AF1cc000e6ab",
-			"0x28a8af71db9703e6b8960d1dcb742deca13c574f81f781be5dbde84ec8d66d45",
-		),
-		(
-			"0xEB7e82A67CDFA3E742e0f3315Fd4EEd7B05730CC",
-			"0xfee21e4e4865380734882253d27612da0e4413c93e5c817e38b8c5e034de7270",
-		),
-	];
-
-	ChainSpec::from_genesis(
-		"Darwinia2",
-		"darwinia2",
-		ChainType::Live,
-		move || {
-			RuntimeGenesisConfig {
-				// System stuff.
-				system: SystemConfig { code: WASM_BINARY.unwrap().to_vec(), ..Default::default() },
-				parachain_system: Default::default(),
-				parachain_info: ParachainInfoConfig { parachain_id: 2046.into(), ..Default::default() },
-
-				// Monetary stuff.
-				balances: BalancesConfig {
-					balances: collators
-						.iter()
-						.map(|(k, _)| (array_bytes::hex_n_into_unchecked::<_, _, 20>(k), 10_000 * UNIT))
-						.collect(),
-				},
-				transaction_payment: Default::default(),
-				assets: AssetsConfig {
-					assets: vec![(AssetIds::Kton as _, ROOT, true, 1)],
-					metadata: vec![(
-						AssetIds::Kton as _,
-						b"Darwinia Commitment Token".to_vec(),
-						b"KTON".to_vec(),
-						18,
-					)],
-					..Default::default()
-				},
-				vesting: Default::default(),
-
-				// Consensus stuff.
-				darwinia_staking: DarwiniaStakingConfig {
-					now: SystemTime::now().duration_since(UNIX_EPOCH).unwrap().as_millis(),
-					elapsed_time: 0,
-					rate_limit: 20_000_000 * UNIT,
-					collator_count: 5,
-					collators: collators
-						.iter()
-						.map(|(k, _)| (array_bytes::hex_n_into_unchecked::<_, _, 20>(k), 1_000 * UNIT))
-						.collect(),
-				},
-				session: SessionConfig {
-					keys: collators
-						.iter()
-						.map(|(k, a)| {
-							(
-								array_bytes::hex_n_into_unchecked::<_, _, 20>(k),
-								array_bytes::hex_n_into_unchecked::<_, _, 20>(k),
-								session_keys(array_bytes::hex2array_unchecked(a).unchecked_into()),
-							)
-						})
-						.collect(),
-				},
-				aura: Default::default(),
-				aura_ext: Default::default(),
-
-				// Governance stuff.
-				democracy: Default::default(),
-				council: Default::default(),
-				technical_committee: Default::default(),
-				treasury: Default::default(),
-
-				// Utility stuff.
-				// tx_pause: Default::default(),
-
-				// XCM stuff.
-				polkadot_xcm: PolkadotXcmConfig { safe_xcm_version: Some(SAFE_XCM_VERSION), ..Default::default() },
-
-				// EVM stuff.
-				ethereum: Default::default(),
-				evm: EVMConfig {
-					accounts: {
-						BTreeMap::from_iter(
-							DarwiniaPrecompiles::<Runtime>::used_addresses().iter().map(|p| {
-								(
-									p.to_owned(),
-									GenesisAccount {
-										nonce: Default::default(),
-										balance: Default::default(),
-										storage: Default::default(),
-										code: REVERT_BYTECODE.to_vec(),
-									},
-								)
-							}),
-						)
-					},
-					..Default::default()
-				},
-			}
-		},
-		vec![
-			"/dns/g1.darwinia2.darwinia.network/tcp/30333/ws/p2p/12D3KooWM2eentxcGA3W5tnw5TYwJUjRktSMSTu4zkzEaD8k6mr4".parse().unwrap()
-		],
-		TelemetryEndpoints::new(vec![(TELEMETRY_URL.into(), 0)]).ok(),
-		Some(PROTOCOL_ID),
-		None,
-		Some(properties()),
-		Extensions {
-			relay_chain: "polkadot".into(), // You MUST set this to the correct network!
-			para_id: 2046,
-		},
-	)
-}
-
-pub fn config() -> ChainSpec {
-	load_config("darwinia2.json", 0)
-}
-
-fn testnet_genesis(
-	collators: Vec<(AccountId, AuraId)>,
-	endowed_accounts: Vec<AccountId>,
-	id: ParaId,
-) -> RuntimeGenesisConfig {
-	RuntimeGenesisConfig {
+	let (collators, endowed_accounts) = dev_accounts::<AccountId>(session_keys);
+	let genesis_config_patch = serde_json::json!({
 		// System stuff.
-		system: SystemConfig { code: WASM_BINARY.unwrap().to_vec(), ..Default::default() },
-		parachain_system: Default::default(),
-		parachain_info: ParachainInfoConfig { parachain_id: id, ..Default::default() },
+		"parachainInfo": { "parachainId": PARA_ID },
 
 		// Monetary stuff.
-		balances: BalancesConfig {
-			balances: endowed_accounts.iter().cloned().map(|k| (k, 100_000_000 * UNIT)).collect(),
+		"balances": {
+			"balances": endowed_accounts.iter().map(|a| (a, 100_000_000 * UNIT)).collect::<Vec<_>>()
 		},
-		transaction_payment: Default::default(),
-		assets: AssetsConfig {
-			assets: vec![(AssetIds::Kton as _, ROOT, true, 1)],
-			metadata: vec![(
+		"assets": {
+			"assets": [(AssetIds::Kton as _, ROOT, true, 1)],
+			"metadata": [(
 				AssetIds::Kton as _,
-				b"Darwinia Commitment Token".to_vec(),
-				b"KTON".to_vec(),
-				18,
-			)],
-			..Default::default()
+				b"Darwinia Commitment Token",
+				b"KTON",
+				18
+			)]
 		},
-		vesting: Default::default(),
 
 		// Consensus stuff.
-		darwinia_staking: DarwiniaStakingConfig {
-			now: SystemTime::now().duration_since(UNIX_EPOCH).unwrap().as_millis(),
-			elapsed_time: 0,
-			rate_limit: 20_000_000 * UNIT,
-			collator_count: collators.len() as _,
-			collators: collators.iter().map(|(a, _)| (a.to_owned(), UNIT)).collect(),
+		"darwiniaStaking": {
+			"now": SystemTime::now().duration_since(UNIX_EPOCH).unwrap().as_millis(),
+			"elapsedTime": 0,
+			"rateLimit": 20_000_000 * UNIT,
+			"collatorCount": collators.len(),
+			"collators": collators.iter().map(|(a, _)| (a, UNIT)).collect::<Vec<_>>()
 		},
-		session: SessionConfig {
-			keys: collators
-				.into_iter()
-				.map(|(acc, aura)| {
-					(
-						acc,                // account id
-						acc,                // validator id
-						session_keys(aura), // session keys
-					)
-				})
-				.collect(),
+		"session": {
+			"keys": collators.into_iter().map(|(a, sks)| (a, a, sks)).collect::<Vec<_>>()
 		},
-		aura: Default::default(),
-		aura_ext: Default::default(),
-
-		// Governance stuff.
-		democracy: Default::default(),
-		council: Default::default(),
-		technical_committee: Default::default(),
-		treasury: Default::default(),
-
-		// Utility stuff.
-		// tx_pause: Default::default(),
 
 		// XCM stuff.
-		polkadot_xcm: PolkadotXcmConfig {
-			safe_xcm_version: Some(SAFE_XCM_VERSION),
-			..Default::default()
-		},
+		"polkadotXcm": { "safeXcmVersion": Some(SAFE_XCM_VERSION) },
 
 		// EVM stuff.
-		ethereum: Default::default(),
-		evm: EVMConfig {
-			accounts: {
+		"evm": {
+			"accounts": {
 				BTreeMap::from_iter(
-					DarwiniaPrecompiles::<Runtime>::used_addresses()
+					<DarwiniaPrecompiles<Runtime>>::used_addresses()
 						.iter()
 						.map(|p| {
 							(
@@ -367,8 +104,167 @@ fn testnet_genesis(
 							),
 						]),
 				)
-			},
-			..Default::default()
+			}
+		}
+	});
+
+	ChainSpec::builder(
+		WASM_BINARY.unwrap().to_vec(),
+		Extensions {
+			relay_chain: "rococo-local".into(), // You MUST set this to the correct network!
+			para_id: PARA_ID,
+		},
+	)
+	.with_name("Darwinia2 D")
+	.with_id("darwinia2-d")
+	.with_chain_type(ChainType::Live)
+	.with_protocol_id(PROTOCOL_ID)
+	.with_properties(properties())
+	.with_genesis_config_patch(genesis_config_patch)
+	.build()
+}
+
+pub fn genesis_config() -> ChainSpec {
+	let collators = [
+		(
+			array_bytes::hex_n_into_unchecked::<_, AccountId, 20>(
+				"0x196f03b77a1acd0db080006b04d2f3a991ebbe68",
+			),
+			session_keys(
+				array_bytes::hex2array_unchecked(
+					"0xa05255010ee986b9684a444d10a74aa0ecbe781f5002e871665add894752cc7e",
+				)
+				.unchecked_into(),
+			),
+		),
+		(
+			array_bytes::hex_n_into_unchecked::<_, AccountId, 20>(
+				"0x7aE2a0914db8bFBdad538b0eAc3Fa473A0e07843",
+			),
+			session_keys(
+				array_bytes::hex2array_unchecked(
+					"0xdaf5c4506b82f617245150216a73c0eb4f2603848c02413db66f991846777845",
+				)
+				.unchecked_into(),
+			),
+		),
+		(
+			array_bytes::hex_n_into_unchecked::<_, AccountId, 20>(
+				"0x9F33a4809aA708d7a399fedBa514e0A0d15EfA85",
+			),
+			session_keys(
+				array_bytes::hex2array_unchecked(
+					"0xdcff1219121687391353b17e798b10e87f6e578b2a01e032375f2f14a0712b57",
+				)
+				.unchecked_into(),
+			),
+		),
+		(
+			array_bytes::hex_n_into_unchecked::<_, AccountId, 20>(
+				"0x0a1287977578F888bdc1c7627781AF1cc000e6ab",
+			),
+			session_keys(
+				array_bytes::hex2array_unchecked(
+					"0x28a8af71db9703e6b8960d1dcb742deca13c574f81f781be5dbde84ec8d66d45",
+				)
+				.unchecked_into(),
+			),
+		),
+		(
+			array_bytes::hex_n_into_unchecked::<_, AccountId, 20>(
+				"0xEB7e82A67CDFA3E742e0f3315Fd4EEd7B05730CC",
+			),
+			session_keys(
+				array_bytes::hex2array_unchecked(
+					"0xfee21e4e4865380734882253d27612da0e4413c93e5c817e38b8c5e034de7270",
+				)
+				.unchecked_into(),
+			),
+		),
+	];
+	let genesis_config_patch = serde_json::json!({
+		// System stuff.
+		"parachainInfo": { "parachainId": PARA_ID },
+
+		// Monetary stuff.
+		"balances": {
+			"balances": collators.iter().map(|a| (a, 10_000 * UNIT)).collect::<Vec<_>>()
 		},
-	}
+		"assets": {
+			"assets": [(AssetIds::Kton as _, ROOT, true, 1)],
+			"metadata": [(
+				AssetIds::Kton as _,
+				b"Darwinia Commitment Token",
+				b"KTON",
+				18
+			)]
+		},
+
+		// Consensus stuff.
+		"darwiniaStaking" {
+			"now": SystemTime::now().duration_since(UNIX_EPOCH).unwrap().as_millis(),
+			"elapsedTime": 0,
+			"rateLimit": 20_000_000 * UNIT,
+			"collatorCount": 5,
+			"collators": collators.iter().map(|(a, _)| (a, 1_000 * UNIT)).collect::<Vec<_>>()
+		},
+		"session": {
+			"keys": collators.iter().map(|(a, sks)| (a, a, sks)).collect::<Vec<_>>()
+		},
+
+		// XCM stuff.
+		"polkadotXcm": { "safeXcmVersion": Some(SAFE_XCM_VERSION) },
+
+		// EVM stuff.
+		"evm": {
+			"accounts": {
+				BTreeMap::from_iter(
+					<DarwiniaPrecompiles<Runtime>>::used_addresses().iter().map(|p| {
+						(
+							p,
+							GenesisAccount {
+								nonce: Default::default(),
+								balance: Default::default(),
+								storage: Default::default(),
+								code: REVERT_BYTECODE.to_vec(),
+							},
+						)
+					}),
+				)
+			}
+		}
+	});
+
+	ChainSpec::builder(WASM_BINARY.unwrap().to_vec(), Extensions {
+		relay_chain: "polkadot".into(), // You MUST set this to the correct network!
+		para_id: PARA_ID,
+	})
+	.with_name("Darwinia2")
+	.with_id("darwinia2")
+	.with_chain_type(ChainType::Live)
+	.with_protocol_id(PROTOCOL_ID)
+	.with_properties(properties())
+	.with_genesis_config_patch(genesis_config_patch)
+	.with_boot_nodes(vec![
+		"/dns/g1.darwinia2.darwinia.network/tcp/30333/ws/p2p/12D3KooWM2eentxcGA3W5tnw5TYwJUjRktSMSTu4zkzEaD8k6mr4".parse().unwrap()
+	])
+	.with_telemetry_endpoints(
+		TelemetryEndpoints::new(vec![(TELEMETRY_URL.into(), 0)]).unwrap()
+	)
+	.build()
+}
+
+pub fn config() -> ChainSpec {
+	load_config("darwinia2.json", 0)
+}
+
+fn properties() -> Properties {
+	super::properties("RING")
+}
+
+// Generate the session keys from individual elements.
+//
+// The input must be a tuple of individual keys (a single arg for now since we have just one key).
+fn session_keys(keys: AuraId) -> SessionKeys {
+	SessionKeys { aura: keys }
 }
diff --git a/node/src/chain_spec/koi.rs b/node/src/chain_spec/koi.rs
index 9d57995a6..64f6a3402 100644
--- a/node/src/chain_spec/koi.rs
+++ b/node/src/chain_spec/koi.rs
@@ -37,306 +37,59 @@ use sc_service::{ChainType, GenericChainSpec};
 use sc_telemetry::TelemetryEndpoints;
 use sp_core::{crypto::UncheckedInto, H160};
 
-/// Specialized `ChainSpec` for the normal parachain runtime.
-pub type ChainSpec = GenericChainSpec<RuntimeGenesisConfig, Extensions>;
-
-fn properties() -> Properties {
-	super::properties("KRING")
-}
-
-// Generate the session keys from individual elements.
-//
-// The input must be a tuple of individual keys (a single arg for now since we have just one key).
-fn session_keys(keys: AuraId) -> SessionKeys {
-	SessionKeys { aura: keys }
-}
+const PARA_ID: u32 = 2105;
 
 pub fn development_config() -> ChainSpec {
-	ChainSpec::from_genesis(
-		// Fulfill Polkadot.JS metadata upgrade requirements.
-		"Darwinia Koi D",
-		"darwinia-koi-d",
-		ChainType::Live,
-		move || {
-			testnet_genesis(
-				vec![
-					// Bind the `Alice` to `Alith` to make `--alice` available for testnet.
-					(
-						array_bytes::hex_n_into_unchecked::<_, _, 20>(ALITH),
-						get_collator_keys_from_seed("Alice"),
-					),
-				],
-				vec![
-					array_bytes::hex_n_into_unchecked::<_, _, 20>(ALITH),
-					array_bytes::hex_n_into_unchecked::<_, _, 20>(BALTATHAR),
-					array_bytes::hex_n_into_unchecked::<_, _, 20>(CHARLETH),
-					array_bytes::hex_n_into_unchecked::<_, _, 20>(DOROTHY),
-					array_bytes::hex_n_into_unchecked::<_, _, 20>(ETHAN),
-					array_bytes::hex_n_into_unchecked::<_, _, 20>(FAITH),
-				],
-				2105.into(),
-			)
-		},
-		Vec::new(),
-		None,
-		Some(PROTOCOL_ID),
-		None,
-		Some(properties()),
-		Extensions {
-			relay_chain: "rococo-local".into(), // You MUST set this to the correct network!
-			para_id: 2105,
-		},
-	)
-}
-
-pub fn local_config() -> ChainSpec {
-	ChainSpec::from_genesis(
-		// Fulfill Polkadot.JS metadata upgrade requirements.
-		"Darwinia Koi L",
-		"darwinia-koi-l",
-		// Fulfill Polkadot.JS metadata upgrade requirements.
-		ChainType::Live,
-		move || {
-			testnet_genesis(
-				vec![
-					// Bind the `Alice` to `Alith` to make `--alice` available for testnet.
-					(
-						array_bytes::hex_n_into_unchecked::<_, _, 20>(ALITH),
-						get_collator_keys_from_seed("Alice"),
-					),
-					// Bind the `Bob` to `Balthar` to make `--bob` available for testnet.
-					(
-						array_bytes::hex_n_into_unchecked::<_, _, 20>(BALTATHAR),
-						get_collator_keys_from_seed("Bob"),
-					),
-					// Bind the `Charlie` to `CHARLETH` to make `--charlie` available for testnet.
-					(
-						array_bytes::hex_n_into_unchecked::<_, _, 20>(CHARLETH),
-						get_collator_keys_from_seed("Charlie"),
-					),
-				],
-				vec![
-					array_bytes::hex_n_into_unchecked::<_, _, 20>(ALITH),
-					array_bytes::hex_n_into_unchecked::<_, _, 20>(BALTATHAR),
-					array_bytes::hex_n_into_unchecked::<_, _, 20>(CHARLETH),
-					array_bytes::hex_n_into_unchecked::<_, _, 20>(DOROTHY),
-					array_bytes::hex_n_into_unchecked::<_, _, 20>(ETHAN),
-					array_bytes::hex_n_into_unchecked::<_, _, 20>(FAITH),
-				],
-				2105.into(),
-			)
-		},
-		Vec::new(),
-		None,
-		Some(PROTOCOL_ID),
-		None,
-		Some(properties()),
-		Extensions {
-			relay_chain: "rococo-local".into(), // You MUST set this to the correct network!
-			para_id: 2105,
-		},
-	)
-}
-
-pub fn genesis_config() -> ChainSpec {
-	ChainSpec::from_genesis(
-		"Darwinia Koi",
-		"darwinia-koi",
-		ChainType::Live,
-		move || {
-			RuntimeGenesisConfig {
-				// System stuff.
-				system: SystemConfig { code: WASM_BINARY.unwrap().to_vec(), ..Default::default() },
-				parachain_system: Default::default(),
-				parachain_info: ParachainInfoConfig { parachain_id: 2105.into(), ..Default::default() },
-
-				// Monetary stuff.
-				balances: BalancesConfig {
-					balances: vec![
-						(array_bytes::hex_n_into_unchecked::<_, _, 20>(C1), 10_000 * UNIT),
-						(array_bytes::hex_n_into_unchecked::<_, _, 20>(C2), 10_000 * UNIT),
-						(array_bytes::hex_n_into_unchecked::<_, _, 20>(C3), 10_000 * UNIT),
-					],
-				},
-				transaction_payment: Default::default(),
-				assets: AssetsConfig {
-					assets: vec![(AssetIds::PKton as _, ROOT, true, 1)],
-					metadata: vec![(
-						AssetIds::PKton as _,
-						b"Koi Commitment Token".to_vec(),
-						b"PKTON".to_vec(),
-						18,
-					)],
-					..Default::default()
-				},
-
-				// Consensus stuff.
-				darwinia_staking: DarwiniaStakingConfig {
-					now: SystemTime::now().duration_since(UNIX_EPOCH).unwrap().as_millis(),
-					elapsed_time: 0,
-					rate_limit: 20_000_000 * UNIT,
-					collator_count: 3,
-					collators: vec![
-						(array_bytes::hex_n_into_unchecked::<_, _, 20>(C1), UNIT),
-						(array_bytes::hex_n_into_unchecked::<_, _, 20>(C2), UNIT),
-						(array_bytes::hex_n_into_unchecked::<_, _, 20>(C3), UNIT),
-					],
-				},
-				session: SessionConfig {
-					keys: vec![
-						(
-							array_bytes::hex_n_into_unchecked::<_, _, 20>(C1),
-							array_bytes::hex_n_into_unchecked::<_, _, 20>(C1),
-							session_keys(
-								array_bytes::hex2array_unchecked(C1_AURA).unchecked_into(),
-							),
-						),
-						(
-							array_bytes::hex_n_into_unchecked::<_, _, 20>(C2),
-							array_bytes::hex_n_into_unchecked::<_, _, 20>(C2),
-							session_keys(
-								array_bytes::hex2array_unchecked(C2_AURA).unchecked_into(),
-							),
-						),
-						(
-							array_bytes::hex_n_into_unchecked::<_, _, 20>(C3),
-							array_bytes::hex_n_into_unchecked::<_, _, 20>(C3),
-							session_keys(
-								array_bytes::hex2array_unchecked(C3_AURA).unchecked_into(),
-							),
-						),
-					],
-				},
-				aura: Default::default(),
-				aura_ext: Default::default(),
-
-				// Governance stuff.
-				technical_committee: Default::default(),
-				treasury: Default::default(),
-
-				// Utility stuff.
-				sudo: SudoConfig { key: Some(array_bytes::hex_n_into_unchecked::<_, _, 20>(SUDO)) },
-				tx_pause: Default::default(),
-
-				// XCM stuff.
-				polkadot_xcm: PolkadotXcmConfig { safe_xcm_version: Some(SAFE_XCM_VERSION), ..Default::default() },
-
-				// EVM stuff.
-				ethereum: Default::default(),
-				evm: EVMConfig {
-					accounts: {
-						BTreeMap::from_iter(
-							KoiPrecompiles::<Runtime>::used_addresses().iter().map(|p| {
-								(
-									p.to_owned(),
-									GenesisAccount {
-										nonce: Default::default(),
-										balance: Default::default(),
-										storage: Default::default(),
-										code: REVERT_BYTECODE.to_vec(),
-									},
-								)
-							}),
-						)
-					},
-					..Default::default()
-				},
-			}
-		},
-		vec![
-			"/dns/g1.testnets.darwinia.network/tcp/30330/p2p/12D3KooWLjJE7oNzQrEM26vUZ1uKuNYhvqjYrEATt1RdoAMTnvL9".parse().unwrap()
-		],
-		TelemetryEndpoints::new(vec![(TELEMETRY_URL.into(), 0)]).ok(),
-		Some(PROTOCOL_ID),
-		None,
-		Some(properties()),
-		Extensions {
-			relay_chain: "paseo".into(), // You MUST set this to the correct network!
-			para_id: 2105,
-		},
-	)
-}
-
-pub fn config() -> ChainSpec {
-	load_config("koi.json", 0)
-}
-
-fn testnet_genesis(
-	collators: Vec<(AccountId, AuraId)>,
-	endowed_accounts: Vec<AccountId>,
-	id: ParaId,
-) -> RuntimeGenesisConfig {
-	RuntimeGenesisConfig {
+	let (collators, endowed_accounts) = dev_accounts::<AccountId>(session_keys);
+	let genesis_config_patch = serde_json::json!({
 		// System stuff.
-		system: SystemConfig { code: WASM_BINARY.unwrap().to_vec(), ..Default::default() },
-		parachain_system: Default::default(),
-		parachain_info: ParachainInfoConfig { parachain_id: id, ..Default::default() },
+		"parachainInfo": { "parachainId": PARA_ID },
 
 		// Monetary stuff.
-		balances: BalancesConfig {
-			balances: endowed_accounts.iter().cloned().map(|k| (k, 100_000_000 * UNIT)).collect(),
+		"balances": {
+			"balances": endowed_accounts.iter().map(|a| (a, 100_000_000 * UNIT)).collect::<Vec<_>>()
 		},
-		transaction_payment: Default::default(),
-		assets: AssetsConfig {
-			assets: vec![(AssetIds::PKton as _, ROOT, true, 1)],
-			metadata: vec![(
-				AssetIds::PKton as _,
-				b"Koi Commitment Token".to_vec(),
-				b"PKTON".to_vec(),
+		"assets": {
+			"assets": [(AssetIds::PKton as _, ROOT, true, 1)],
+			"metadata": [(
+				AssetIds::PKton as u32,
+				b"Koi Commitment Token",
+				b"PKTON",
 				18,
-			)],
-			..Default::default()
+			)]
 		},
 
 		// Consensus stuff.
-		darwinia_staking: DarwiniaStakingConfig {
-			now: SystemTime::now().duration_since(UNIX_EPOCH).unwrap().as_millis(),
-			elapsed_time: 0,
-			rate_limit: 20_000_000 * UNIT,
-			collator_count: collators.len() as _,
-			collators: collators.iter().map(|(a, _)| (a.to_owned(), UNIT)).collect(),
+		"darwiniaStaking": {
+			"now": SystemTime::now().duration_since(UNIX_EPOCH).unwrap().as_millis(),
+			"elapsedTime": 0,
+			"rateLimit": 20_000_000 * UNIT,
+			"collatorCount": collators.len(),
+			"collators": collators.iter().map(|(a, _)| (a, UNIT)).collect::<Vec<_>>()
 		},
-		session: SessionConfig {
-			keys: collators
-				.into_iter()
-				.map(|(acc, aura)| {
-					(
-						acc,                // account id
-						acc,                // validator id
-						session_keys(aura), // session keys
-					)
-				})
-				.collect(),
+		"session": {
+			"keys": collators.into_iter().map(|(a, sks)| (a, a, sks)).collect::<Vec<_>>()
 		},
-		aura: Default::default(),
-		aura_ext: Default::default(),
 
 		// Governance stuff.
-		technical_committee: TechnicalCommitteeConfig {
-			members: vec![
+		"technicalCommittee": {
+			"members": [
 				array_bytes::hex_n_into_unchecked::<_, _, 20>(ALITH),
-				array_bytes::hex_n_into_unchecked::<_, _, 20>(BALTATHAR),
-			],
-			..Default::default()
+				array_bytes::hex_n_into_unchecked::<_, _, 20>(BALTATHAR)
+			]
 		},
-		treasury: Default::default(),
 
 		// Utility stuff.
-		sudo: SudoConfig { key: Some(array_bytes::hex_n_into_unchecked::<_, _, 20>(ALITH)) },
-		tx_pause: Default::default(),
+		"sudo": { "key": Some(array_bytes::hex_n_into_unchecked::<_, _, 20>(ALITH)) },
 
 		// XCM stuff.
-		polkadot_xcm: PolkadotXcmConfig {
-			safe_xcm_version: Some(SAFE_XCM_VERSION),
-			..Default::default()
-		},
+		"polkadotXcm": { "safeXcmVersion": Some(SAFE_XCM_VERSION) },
 
 		// EVM stuff.
-		ethereum: Default::default(),
-		evm: EVMConfig {
-			accounts: {
+		"evm": {
+			"accounts": {
 				BTreeMap::from_iter(
-					KoiPrecompiles::<Runtime>::used_addresses()
+					<KoiPrecompiles<Runtime>>::used_addresses()
 						.iter()
 						.map(|p| {
 							(
@@ -362,8 +115,128 @@ fn testnet_genesis(
 							),
 						]),
 				)
-			},
-			..Default::default()
+			}
+		}
+	});
+
+	ChainSpec::builder(
+		WASM_BINARY.unwrap().to_vec(),
+		Extensions {
+			relay_chain: "rococo-local".into(), // You MUST set this to the correct network!
+			para_id: PARA_ID,
+		},
+	)
+	.with_name("Darwinia Koi D")
+	.with_id("darwinia-koi-d")
+	.with_chain_type(ChainType::Live)
+	.with_protocol_id(PROTOCOL_ID)
+	.with_properties(properties())
+	.with_genesis_config_patch(genesis_config_patch)
+	.build()
+}
+
+pub fn genesis_config() -> ChainSpec {
+	let collators = [
+		(
+			array_bytes::hex_n_into_unchecked::<_, AccountId, 20>(C1),
+			session_keys(array_bytes::hex2array_unchecked(C1_AURA).unchecked_into()),
+		),
+		(
+			array_bytes::hex_n_into_unchecked::<_, AccountId, 20>(C2),
+			session_keys(array_bytes::hex2array_unchecked(C2_AURA).unchecked_into()),
+		),
+		(
+			array_bytes::hex_n_into_unchecked::<_, AccountId, 20>(C3),
+			session_keys(array_bytes::hex2array_unchecked(C3_AURA).unchecked_into()),
+		),
+	];
+	let genesis_config_patch = serde_json::json!({
+		// System stuff.
+		"parachainInfo": { "parachainId": PARA_ID },
+
+		// Monetary stuff.
+		"balances": {
+			"balances": collators.iter().map(|a| (a, 10_000 * UNIT)).collect::<Vec<_>>(),
 		},
-	}
+		"assets": {
+			"assets": [(AssetIds::PKton as _, ROOT, true, 1)],
+			"metadata": [(
+				AssetIds::PKton as u32,
+				b"Koi Commitment Token",
+				b"PKTON",
+				18,
+			)]
+		},
+
+		// Consensus stuff.
+		"darwiniaStaking": {
+			"now": SystemTime::now().duration_since(UNIX_EPOCH).unwrap().as_millis(),
+			"elapsedTime": 0,
+			"rateLimit": 20_000_000 * UNIT,
+			"collatorCount": 3,
+			"collators": collators.iter().map(|(a, _)| (a, UNIT)).collect::<Vec<_>>()
+		},
+		"session": {
+			"keys": collators.iter().map(|(a, sks)| (a, a, sks)).collect::<Vec<_>>()
+		},
+
+		// Utility stuff.
+		"sudo": { "key": Some(array_bytes::hex_n_into_unchecked::<_, _, 20>(SUDO)) },
+
+		// XCM stuff.
+		"polkadotXcm": { "safeXcmVersion": Some(SAFE_XCM_VERSION) },
+
+		// EVM stuff.
+		"evm": {
+			"accounts": {
+				BTreeMap::from_iter(
+					<KoiPrecompiles<Runtime>>::used_addresses().iter().map(|p| {
+						(
+							p,
+							GenesisAccount {
+								nonce: Default::default(),
+								balance: Default::default(),
+								storage: Default::default(),
+								code: REVERT_BYTECODE.to_vec(),
+							},
+						)
+					}),
+				)
+			}
+		}
+	});
+
+	ChainSpec::builder(
+		WASM_BINARY.unwrap().to_vec(),
+		Extensions {
+			relay_chain: "paseo".into(), // You MUST set this to the correct network!
+			para_id: PARA_ID,
+		},
+	)
+	.with_name("Darwinia Koi")
+	.with_id("darwinia-koi")
+	.with_chain_type(ChainType::Live)
+	.with_protocol_id(PROTOCOL_ID)
+	.with_properties(properties())
+	.with_genesis_config_patch(genesis_config_patch)
+	.with_boot_nodes(
+		vec!["/dns/g1.testnets.darwinia.network/tcp/30330/p2p/12D3KooWLjJE7oNzQrEM26vUZ1uKuNYhvqjYrEATt1RdoAMTnvL9".parse().unwrap()]
+	)
+	.with_telemetry_endpoints(TelemetryEndpoints::new(vec![(TELEMETRY_URL.into(), 0)]).unwrap())
+	.build()
+}
+
+pub fn config() -> ChainSpec {
+	load_config("koi.json", 0)
+}
+
+fn properties() -> Properties {
+	super::properties("KRING")
+}
+
+// Generate the session keys from individual elements.
+//
+// The input must be a tuple of individual keys (a single arg for now since we have just one key).
+fn session_keys(keys: AuraId) -> SessionKeys {
+	SessionKeys { aura: keys }
 }
diff --git a/node/src/chain_spec/mod.rs b/node/src/chain_spec/mod.rs
index 6ff1f9d3c..5111cd057 100644
--- a/node/src/chain_spec/mod.rs
+++ b/node/src/chain_spec/mod.rs
@@ -20,24 +20,12 @@
 
 #[cfg(feature = "darwinia-native")]
 pub mod darwinia;
-#[cfg(feature = "darwinia-native")]
-pub use darwinia::{self as darwinia_chain_spec, ChainSpec as DarwiniaChainSpec};
-#[cfg(not(feature = "darwinia-native"))]
-pub type DarwiniaChainSpec = DummyChainSpec;
 
 #[cfg(feature = "crab-native")]
 pub mod crab;
-#[cfg(feature = "crab-native")]
-pub use crab::{self as crab_chain_spec, ChainSpec as CrabChainSpec};
-#[cfg(not(feature = "crab-native"))]
-pub type CrabChainSpec = DummyChainSpec;
 
 #[cfg(feature = "koi-native")]
 pub mod koi;
-#[cfg(feature = "koi-native")]
-pub use koi::{self as koi_chain_spec, ChainSpec as KoiChainSpec};
-#[cfg(not(feature = "koi-native"))]
-pub type KoiChainSpec = DummyChainSpec;
 
 #[cfg(feature = "koi-native")]
 mod testnet_keys {
@@ -63,9 +51,7 @@ use sc_chain_spec::{ChainSpecExtension, ChainSpecGroup, GenericChainSpec, Proper
 use sp_consensus_aura::sr25519::AuthorityId as AuraId;
 use sp_core::{Pair, Public};
 
-// Dummy chain spec, in case when we don't have the native runtime.
-#[allow(unused)]
-pub type DummyChainSpec = sc_chain_spec::GenericChainSpec<(), Extensions>;
+pub type ChainSpec = sc_service::GenericChainSpec<(), Extensions>;
 
 const TELEMETRY_URL: &str = "wss://telemetry.polkadot.io/submit";
 
@@ -112,12 +98,37 @@ fn properties(token_symbol: &str) -> Properties {
 }
 
 fn get_collator_keys_from_seed(seed: &str) -> AuraId {
+	fn get_from_seed<TPublic: Public>(seed: &str) -> <TPublic::Pair as Pair>::Public {
+		TPublic::Pair::from_string(&format!("//{}", seed), None)
+			.expect("static values are valid; qed")
+			.public()
+	}
+
 	get_from_seed::<AuraId>(seed)
 }
-fn get_from_seed<TPublic: Public>(seed: &str) -> <TPublic::Pair as Pair>::Public {
-	TPublic::Pair::from_string(&format!("//{}", seed), None)
-		.expect("static values are valid; qed")
-		.public()
+
+fn dev_accounts<A, F, Sks>(f: F) -> ([(A, Sks); 1], [A; 6])
+where
+	A: From<[u8; 20]>,
+	F: Fn(AuraId) -> Sks,
+{
+	(
+		[
+			// Bind the `Alice` to `Alith` to make `--alice` work for development.
+			(
+				array_bytes::hex_n_into_unchecked::<_, _, 20>(ALITH),
+				f(get_collator_keys_from_seed("Alice")),
+			),
+		],
+		[
+			array_bytes::hex_n_into_unchecked::<_, _, 20>(ALITH),
+			array_bytes::hex_n_into_unchecked::<_, _, 20>(BALTATHAR),
+			array_bytes::hex_n_into_unchecked::<_, _, 20>(CHARLETH),
+			array_bytes::hex_n_into_unchecked::<_, _, 20>(DOROTHY),
+			array_bytes::hex_n_into_unchecked::<_, _, 20>(ETHAN),
+			array_bytes::hex_n_into_unchecked::<_, _, 20>(FAITH),
+		],
+	)
 }
 
 fn load_config<G, E>(name: &'static str, mut retries: u8) -> GenericChainSpec<G, E>
diff --git a/node/src/command.rs b/node/src/command.rs
index ab2eb1b10..449302933 100644
--- a/node/src/command.rs
+++ b/node/src/command.rs
@@ -33,7 +33,7 @@ use sc_cli::{
 };
 use sc_service::{
 	config::{BasePath, PrometheusConfig},
-	ChainSpec, DatabaseSource,
+	ChainSpec as ChainSpecT, DatabaseSource,
 };
 use sp_core::crypto::{self, Ss58AddressFormatRegistry};
 use sp_runtime::traits::AccountIdConversion;
@@ -71,7 +71,7 @@ impl SubstrateCli for Cli {
 		2018
 	}
 
-	fn load_spec(&self, id: &str) -> std::result::Result<Box<dyn ChainSpec>, String> {
+	fn load_spec(&self, id: &str) -> std::result::Result<Box<dyn ChainSpecT>, String> {
 		load_spec(id)
 	}
 }
@@ -107,7 +107,7 @@ impl SubstrateCli for RelayChainCli {
 		2018
 	}
 
-	fn load_spec(&self, id: &str) -> std::result::Result<Box<dyn ChainSpec>, String> {
+	fn load_spec(&self, id: &str) -> std::result::Result<Box<dyn ChainSpecT>, String> {
 		polkadot_cli::Cli::from_iter([RelayChainCli::executable_name()].iter()).load_spec(id)
 	}
 }
@@ -152,7 +152,7 @@ impl CliConfiguration<Self> for RelayChainCli {
 	fn prometheus_config(
 		&self,
 		default_listen_port: u16,
-		chain_spec: &Box<dyn ChainSpec>,
+		chain_spec: &Box<dyn ChainSpecT>,
 	) -> Result<Option<PrometheusConfig>> {
 		self.base.base.prometheus_config(default_listen_port, chain_spec)
 	}
@@ -222,7 +222,7 @@ impl CliConfiguration<Self> for RelayChainCli {
 
 	fn telemetry_endpoints(
 		&self,
-		chain_spec: &Box<dyn ChainSpec>,
+		chain_spec: &Box<dyn ChainSpecT>,
 	) -> Result<Option<sc_telemetry::TelemetryEndpoints>> {
 		self.base.base.telemetry_endpoints(chain_spec)
 	}
@@ -587,7 +587,7 @@ pub fn run() -> Result<()> {
 	}
 }
 
-fn load_spec(id: &str) -> std::result::Result<Box<dyn ChainSpec>, String> {
+fn load_spec(id: &str) -> std::result::Result<Box<dyn ChainSpecT>, String> {
 	let id = if id.is_empty() {
 		let n = get_exec_name().unwrap_or_default();
 		["darwinia", "crab", "koi"]
@@ -598,52 +598,34 @@ fn load_spec(id: &str) -> std::result::Result<Box<dyn ChainSpec>, String> {
 	} else {
 		id
 	};
-
-	Ok(match id.to_lowercase().as_str() {
+	let chain_spec = match id.to_lowercase().as_str() {
 		#[cfg(feature = "crab-native")]
 		"crab" => Box::new(crab_chain_spec::config()),
 		#[cfg(feature = "crab-native")]
 		"crab-genesis" => Box::new(crab_chain_spec::genesis_config()),
 		#[cfg(feature = "crab-native")]
 		"crab-dev" => Box::new(crab_chain_spec::development_config()),
-		#[cfg(feature = "crab-native")]
-		"crab-local" => Box::new(crab_chain_spec::local_config()),
 		#[cfg(feature = "darwinia-native")]
 		"darwinia" => Box::new(darwinia_chain_spec::config()),
 		#[cfg(feature = "darwinia-native")]
 		"darwinia-genesis" => Box::new(darwinia_chain_spec::genesis_config()),
 		#[cfg(feature = "darwinia-native")]
 		"darwinia-dev" => Box::new(darwinia_chain_spec::development_config()),
-		#[cfg(feature = "darwinia-native")]
-		"darwinia-local" => Box::new(darwinia_chain_spec::local_config()),
 		#[cfg(feature = "koi-native")]
 		"koi" => Box::new(koi_chain_spec::config()),
 		#[cfg(feature = "koi-native")]
 		"koi-genesis" => Box::new(koi_chain_spec::genesis_config()),
 		#[cfg(feature = "koi-native")]
 		"koi-dev" => Box::new(koi_chain_spec::development_config()),
-		#[cfg(feature = "koi-native")]
-		"koi-local" => Box::new(koi_chain_spec::local_config()),
 		_ => {
 			let path = PathBuf::from(id);
-			let chain_spec =
-				Box::new(DummyChainSpec::from_json_file(path.clone())?) as Box<dyn ChainSpec>;
+			let chain_spec = Box::new(ChainSpec::from_json_file(path.clone())?);
 
-			if chain_spec.is_crab() {
-				return Ok(Box::new(CrabChainSpec::from_json_file(path)?));
-			}
-
-			if chain_spec.is_darwinia() {
-				return Ok(Box::new(DarwiniaChainSpec::from_json_file(path)?));
-			}
-
-			if chain_spec.is_koi() {
-				return Ok(Box::new(KoiChainSpec::from_json_file(path)?));
-			}
-
-			panic!("No feature(crab-native, darwinia-native, koi-native) is enabled!")
+			chain_spec
 		},
-	})
+	};
+
+	Ok(chain_spec)
 }
 
 fn get_exec_name() -> Option<String> {

From 8fded348286f4bfdb9b1821865d06421e76e6c92 Mon Sep 17 00:00:00 2001
From: Xavier Lau <xavier@inv.cafe>
Date: Fri, 21 Jun 2024 19:54:38 +0800
Subject: [PATCH 16/59] Remove identity and vesting

---
 Cargo.lock                                    |   6 -
 Cargo.toml                                    |   2 -
 pallet/account-migration/Cargo.toml           |   4 -
 pallet/account-migration/src/benchmarking.rs  |  30 --
 pallet/account-migration/src/lib.rs           |  44 ---
 pallet/account-migration/src/mock.rs          |  16 -
 runtime/common/src/test.rs                    |   3 -
 runtime/crab/Cargo.toml                       |   8 -
 runtime/crab/src/lib.rs                       |   6 +-
 runtime/crab/src/pallets.rs                   |   2 -
 runtime/crab/src/pallets/evm.rs               |   1 -
 runtime/crab/src/pallets/identity.rs          |  39 --
 runtime/crab/src/pallets/proxy.rs             |  18 +-
 runtime/crab/src/pallets/tx_pause.rs          |   4 +-
 runtime/crab/src/pallets/vesting.rs           |  40 --
 runtime/crab/src/weights.rs                   |   2 -
 runtime/crab/src/weights/pallet_identity.rs   | 364 ------------------
 runtime/crab/src/weights/pallet_vesting.rs    | 244 ------------
 runtime/darwinia/Cargo.toml                   |   8 -
 runtime/darwinia/src/lib.rs                   |   6 +-
 runtime/darwinia/src/pallets.rs               |   2 -
 runtime/darwinia/src/pallets/evm.rs           |   1 -
 runtime/darwinia/src/pallets/identity.rs      |  39 --
 runtime/darwinia/src/pallets/proxy.rs         |  18 +-
 runtime/darwinia/src/pallets/tx_pause.rs      |   8 +-
 runtime/darwinia/src/pallets/vesting.rs       |  40 --
 runtime/darwinia/src/weights.rs               |   2 -
 .../darwinia/src/weights/pallet_identity.rs   | 364 ------------------
 .../darwinia/src/weights/pallet_vesting.rs    | 246 ------------
 runtime/koi/Cargo.toml                        |   4 -
 runtime/koi/src/lib.rs                        |   3 +-
 runtime/koi/src/pallets/identity.rs           |  40 --
 runtime/koi/src/pallets/proxy.rs              |   8 -
 runtime/koi/src/pallets/tx_pause.rs           |   4 +-
 runtime/koi/src/weights.rs                    |   1 -
 runtime/koi/src/weights/pallet_identity.rs    | 360 -----------------
 36 files changed, 27 insertions(+), 1960 deletions(-)
 delete mode 100644 runtime/crab/src/pallets/identity.rs
 delete mode 100644 runtime/crab/src/pallets/vesting.rs
 delete mode 100644 runtime/crab/src/weights/pallet_identity.rs
 delete mode 100644 runtime/crab/src/weights/pallet_vesting.rs
 delete mode 100644 runtime/darwinia/src/pallets/identity.rs
 delete mode 100644 runtime/darwinia/src/pallets/vesting.rs
 delete mode 100644 runtime/darwinia/src/weights/pallet_identity.rs
 delete mode 100644 runtime/darwinia/src/weights/pallet_vesting.rs
 delete mode 100644 runtime/koi/src/pallets/identity.rs
 delete mode 100644 runtime/koi/src/weights/pallet_identity.rs

diff --git a/Cargo.lock b/Cargo.lock
index f4f7276ad..1b3300a37 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1674,7 +1674,6 @@ dependencies = [
  "pallet-evm-precompile-dispatch",
  "pallet-evm-precompile-modexp",
  "pallet-evm-precompile-simple",
- "pallet-identity",
  "pallet-preimage",
  "pallet-proxy",
  "pallet-referenda",
@@ -1686,7 +1685,6 @@ dependencies = [
  "pallet-treasury",
  "pallet-tx-pause",
  "pallet-utility",
- "pallet-vesting",
  "pallet-whitelist",
  "pallet-xcm",
  "parity-scale-codec",
@@ -2726,7 +2724,6 @@ dependencies = [
  "frame-system",
  "pallet-assets",
  "pallet-balances",
- "pallet-identity",
  "pallet-timestamp",
  "parity-scale-codec",
  "scale-info",
@@ -2979,7 +2976,6 @@ dependencies = [
  "pallet-evm-precompile-dispatch",
  "pallet-evm-precompile-modexp",
  "pallet-evm-precompile-simple",
- "pallet-identity",
  "pallet-preimage",
  "pallet-proxy",
  "pallet-referenda",
@@ -2990,7 +2986,6 @@ dependencies = [
  "pallet-transaction-payment-rpc-runtime-api",
  "pallet-treasury",
  "pallet-utility",
- "pallet-vesting",
  "pallet-whitelist",
  "pallet-xcm",
  "parity-scale-codec",
@@ -6029,7 +6024,6 @@ dependencies = [
  "pallet-evm-precompile-dispatch",
  "pallet-evm-precompile-modexp",
  "pallet-evm-precompile-simple",
- "pallet-identity",
  "pallet-preimage",
  "pallet-proxy",
  "pallet-referenda",
diff --git a/Cargo.toml b/Cargo.toml
index 9bb63606e..f2ac146ea 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -135,7 +135,6 @@ pallet-balances                            = { git = "https://github.com/parityt
 pallet-collective                          = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
 pallet-conviction-voting                   = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
 pallet-democracy                           = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
-pallet-identity                            = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
 pallet-preimage                            = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
 pallet-proxy                               = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
 pallet-referenda                           = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
@@ -149,7 +148,6 @@ pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/parityt
 pallet-treasury                            = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
 pallet-tx-pause                            = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
 pallet-utility                             = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
-pallet-vesting                             = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
 pallet-whitelist                           = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
 sc-basic-authorship                        = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
 sc-chain-spec                              = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
diff --git a/pallet/account-migration/Cargo.toml b/pallet/account-migration/Cargo.toml
index 9239047ed..446ef2c67 100644
--- a/pallet/account-migration/Cargo.toml
+++ b/pallet/account-migration/Cargo.toml
@@ -22,7 +22,6 @@ frame-support   = { workspace = true }
 frame-system    = { workspace = true }
 pallet-assets   = { workspace = true }
 pallet-balances = { workspace = true }
-pallet-identity = { workspace = true }
 sp-core         = { workspace = true }
 sp-io           = { workspace = true }
 sp-runtime      = { workspace = true }
@@ -52,7 +51,6 @@ std = [
 	"frame-system/std",
 	"pallet-assets/std",
 	"pallet-balances/std",
-	"pallet-identity/std",
 	"sp-core/std",
 	"sp-io/std",
 	"sp-runtime/std",
@@ -72,7 +70,6 @@ runtime-benchmarks = [
 	"frame-system/runtime-benchmarks",
 	"pallet-assets/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
-	"pallet-identity/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
 ]
 
@@ -86,6 +83,5 @@ try-runtime = [
 	"frame-system/try-runtime",
 	"pallet-assets/try-runtime",
 	"pallet-balances/try-runtime",
-	"pallet-identity/try-runtime",
 	"sp-runtime/try-runtime",
 ]
diff --git a/pallet/account-migration/src/benchmarking.rs b/pallet/account-migration/src/benchmarking.rs
index 967879e6e..c376a5ed2 100644
--- a/pallet/account-migration/src/benchmarking.rs
+++ b/pallet/account-migration/src/benchmarking.rs
@@ -21,7 +21,6 @@ use crate::*;
 // substrate
 use frame_benchmarking::v2;
 use frame_system::RawOrigin;
-use pallet_identity::{IdentityInfo, Judgement};
 use sp_std::prelude::*;
 
 #[v2::benchmarks]
@@ -70,35 +69,6 @@ mod benchmarks {
 				extra: Default::default(),
 			},
 		);
-		<Identities<T>>::insert(
-			from,
-			Registration {
-				judgements: BoundedVec::truncate_from(vec![
-					(Default::default(), Judgement::Unknown);
-					<T as pallet_identity::Config>::MaxRegistrars::get()
-						as usize
-				]),
-				deposit: Default::default(),
-				info: IdentityInfo {
-					additional: BoundedVec::truncate_from(vec![
-						(
-							Default::default(),
-							Default::default()
-						);
-						<T as pallet_identity::Config>::MaxAdditionalFields::get()
-							as usize
-					]),
-					display: Default::default(),
-					legal: Default::default(),
-					web: Default::default(),
-					riot: Default::default(),
-					email: Default::default(),
-					pgp_fingerprint: Some(Default::default()),
-					image: Default::default(),
-					twitter: Default::default(),
-				},
-			},
-		);
 		<Deposits<T>>::insert(
 			from,
 			vec![
diff --git a/pallet/account-migration/src/lib.rs b/pallet/account-migration/src/lib.rs
index 50d5c53bb..16e7b9d2b 100644
--- a/pallet/account-migration/src/lib.rs
+++ b/pallet/account-migration/src/lib.rs
@@ -68,7 +68,6 @@ use frame_support::{
 };
 use frame_system::{pallet_prelude::*, AccountInfo};
 use pallet_balances::AccountData;
-use pallet_identity::{Judgement, Registration};
 use sp_core::{
 	ed25519::{Public as Ep, Signature as Es},
 	sr25519::{Public as Sp, Signature as Ss},
@@ -109,7 +108,6 @@ pub mod pallet {
 			Lookup = IdentityLookup<AccountId20>,
 		> + pallet_assets::Config<Balance = Balance, AssetId = AssetId>
 		+ pallet_balances::Config<Balance = Balance>
-		+ pallet_identity::Config<Currency = pallet_balances::Pallet<Self>>
 		+ darwinia_deposit::Config
 		+ darwinia_staking::Config
 	{
@@ -134,8 +132,6 @@ pub mod pallet {
 
 	#[pallet::error]
 	pub enum Error<T> {
-		/// Exceed maximum vesting count.
-		ExceedMaxVestings,
 		/// Exceed maximum deposit count.
 		ExceedMaxDeposits,
 		/// The migration destination was already taken by someone.
@@ -163,18 +159,6 @@ pub mod pallet {
 	#[pallet::getter(fn deposit_of)]
 	pub type Deposits<T: Config> = StorageMap<_, Blake2_128Concat, AccountId32, Vec<Deposit>>;
 
-	/// [`pallet_identity::IdentityOf`] data.
-	///
-	/// <https://github.com/paritytech/substrate/blob/polkadot-v0.9.30/frame/identity/src/lib.rs#L163>
-	#[pallet::storage]
-	#[pallet::getter(fn identity_of)]
-	pub type Identities<T: Config> = StorageMap<
-		_,
-		Twox64Concat,
-		AccountId32,
-		Registration<Balance, ConstU32<100>, ConstU32<100>>,
-	>;
-
 	/// [`darwinia_staking::migration::v2::OldLedger`] data.
 	#[pallet::storage]
 	#[pallet::getter(fn ledger_of)]
@@ -435,34 +419,6 @@ pub mod pallet {
 					);
 				}
 			}
-			if let Some(mut i) = <Identities<T>>::take(from) {
-				i.deposit = 0;
-				i.judgements.iter_mut().for_each(|(_, j)| {
-					if let Judgement::FeePaid(f) = j {
-						*f = 0;
-					};
-				});
-
-				migration::put_storage_value(
-					b"Identity",
-					b"IdentityOf",
-					&Twox64Concat::hash(&to.encode()),
-					i,
-				);
-			}
-			{
-				let mut rs = <pallet_identity::Pallet<T>>::registrars();
-
-				for r in rs.iter_mut().flatten() {
-					if r.account.0 == <AccountId32 as AsRef<[u8; 32]>>::as_ref(from)[..20] {
-						r.account = *to;
-
-						break;
-					}
-				}
-
-				migration::put_storage_value(b"Identity", b"Registrars", &[], rs);
-			}
 			if let Some(l) = <Ledgers<T>>::take(from) {
 				if l.staked_ring > 0 {
 					<pallet_balances::Pallet<T> as Currency<_>>::transfer(
diff --git a/pallet/account-migration/src/mock.rs b/pallet/account-migration/src/mock.rs
index 6cea9e709..cd3726560 100644
--- a/pallet/account-migration/src/mock.rs
+++ b/pallet/account-migration/src/mock.rs
@@ -175,21 +175,6 @@ impl darwinia_staking::Config for Runtime {
 #[cfg(not(feature = "runtime-benchmarks"))]
 impl darwinia_staking::DepositConfig for Runtime {}
 
-impl pallet_identity::Config for Runtime {
-	type BasicDeposit = ();
-	type Currency = Balances;
-	type FieldDeposit = ();
-	type ForceOrigin = frame_system::EnsureSigned<AccountId>;
-	type MaxAdditionalFields = ();
-	type MaxRegistrars = ();
-	type MaxSubAccounts = ();
-	type RegistrarOrigin = frame_system::EnsureSigned<AccountId>;
-	type RuntimeEvent = RuntimeEvent;
-	type Slashed = ();
-	type SubAccountDeposit = ();
-	type WeightInfo = ();
-}
-
 impl darwinia_account_migration::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type WeightInfo = ();
@@ -203,7 +188,6 @@ frame_support::construct_runtime! {
 		Assets: pallet_assets,
 		Deposit: darwinia_deposit,
 		Staking: darwinia_staking,
-		Identity: pallet_identity,
 		AccountMigration: darwinia_account_migration,
 	}
 }
diff --git a/runtime/common/src/test.rs b/runtime/common/src/test.rs
index 8e220f86b..d858ac02d 100644
--- a/runtime/common/src/test.rs
+++ b/runtime/common/src/test.rs
@@ -31,9 +31,6 @@ macro_rules! impl_account_migration_tests {
 			use frame_system::AccountInfo;
 			use pallet_assets::ExistenceReason;
 			use pallet_balances::AccountData;
-			use pallet_identity::{
-				Data, IdentityFields, IdentityInfo, RegistrarInfo, Registration,
-			};
 			use sp_core::{sr25519::Pair, Decode, Encode, Get, Pair as PairT, H160};
 			use sp_keyring::sr25519::Keyring;
 			use sp_runtime::{
diff --git a/runtime/crab/Cargo.toml b/runtime/crab/Cargo.toml
index 87d386960..ec4acc7a8 100644
--- a/runtime/crab/Cargo.toml
+++ b/runtime/crab/Cargo.toml
@@ -85,7 +85,6 @@ pallet-balances                            = { workspace = true }
 pallet-collective                          = { workspace = true }
 pallet-conviction-voting                   = { workspace = true }
 pallet-democracy                           = { workspace = true }
-pallet-identity                            = { workspace = true }
 pallet-preimage                            = { workspace = true }
 pallet-proxy                               = { workspace = true }
 pallet-referenda                           = { workspace = true }
@@ -97,7 +96,6 @@ pallet-transaction-payment-rpc-runtime-api = { workspace = true }
 pallet-treasury                            = { workspace = true }
 pallet-tx-pause                            = { workspace = true }
 pallet-utility                             = { workspace = true }
-pallet-vesting                             = { workspace = true }
 pallet-whitelist                           = { workspace = true }
 sp-api                                     = { workspace = true }
 sp-block-builder                           = { workspace = true }
@@ -200,7 +198,6 @@ std = [
 	"pallet-collective/std",
 	"pallet-conviction-voting/std",
 	"pallet-democracy/std",
-	"pallet-identity/std",
 	"pallet-preimage/std",
 	"pallet-proxy/std",
 	"pallet-referenda/std",
@@ -212,7 +209,6 @@ std = [
 	"pallet-treasury/std",
 	"pallet-tx-pause/std",
 	"pallet-utility/std",
-	"pallet-vesting/std",
 	"pallet-whitelist/std",
 	"sp-api/std",
 	"sp-block-builder/std",
@@ -297,7 +293,6 @@ runtime-benchmarks = [
 	"pallet-collective/runtime-benchmarks",
 	"pallet-conviction-voting/runtime-benchmarks",
 	"pallet-democracy/runtime-benchmarks",
-	"pallet-identity/runtime-benchmarks",
 	"pallet-preimage/runtime-benchmarks",
 	"pallet-proxy/runtime-benchmarks",
 	"pallet-referenda/runtime-benchmarks",
@@ -306,7 +301,6 @@ runtime-benchmarks = [
 	"pallet-treasury/runtime-benchmarks",
 	"pallet-tx-pause/runtime-benchmarks",
 	"pallet-utility/runtime-benchmarks",
-	"pallet-vesting/runtime-benchmarks",
 	"pallet-whitelist/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
 	# substrate optional
@@ -350,7 +344,6 @@ try-runtime = [
 	"pallet-collective/try-runtime",
 	"pallet-conviction-voting/try-runtime",
 	"pallet-democracy/try-runtime",
-	"pallet-identity/try-runtime",
 	"pallet-preimage/try-runtime",
 	"pallet-proxy/try-runtime",
 	"pallet-referenda/try-runtime",
@@ -361,7 +354,6 @@ try-runtime = [
 	"pallet-treasury/try-runtime",
 	"pallet-tx-pause/try-runtime",
 	"pallet-utility/try-runtime",
-	"pallet-vesting/try-runtime",
 	"pallet-whitelist/try-runtime",
 	"sp-runtime/try-runtime",
 	# substrate optional
diff --git a/runtime/crab/src/lib.rs b/runtime/crab/src/lib.rs
index d4ec7d59e..f6df36468 100644
--- a/runtime/crab/src/lib.rs
+++ b/runtime/crab/src/lib.rs
@@ -102,7 +102,7 @@ frame_support::construct_runtime! {
 		Balances: pallet_balances = 5,
 		TransactionPayment: pallet_transaction_payment = 6,
 		Assets: pallet_assets = 7,
-		Vesting: pallet_vesting = 8,
+		// Vesting: pallet_vesting = 8,
 		Deposit: darwinia_deposit = 9,
 		AccountMigration: darwinia_account_migration = 10,
 
@@ -131,7 +131,7 @@ frame_support::construct_runtime! {
 		// Utility stuff.
 		// Sudo: pallet_sudo = 25,
 		Utility: pallet_utility = 26,
-		Identity: pallet_identity = 27,
+		// Identity: pallet_identity = 27,
 		Scheduler: pallet_scheduler = 28,
 		Preimage: pallet_preimage = 29,
 		Proxy: pallet_proxy = 30,
@@ -171,7 +171,6 @@ frame_benchmarking::define_benchmarks! {
 	[pallet_balances, Balances]
 	[pallet_collective, TechnicalCommittee]
 	[pallet_conviction_voting, ConvictionVoting]
-	[pallet_identity, Identity]
 	[pallet_preimage, Preimage]
 	[pallet_proxy, Proxy]
 	[pallet_referenda, Referenda]
@@ -181,7 +180,6 @@ frame_benchmarking::define_benchmarks! {
 	[pallet_treasury, Treasury]
 	[pallet_tx_pause, TxPause]
 	[pallet_utility, Utility]
-	[pallet_vesting, Vesting]
 	[pallet_whitelist, Whitelist]
 }
 
diff --git a/runtime/crab/src/pallets.rs b/runtime/crab/src/pallets.rs
index 7b4336f93..ae7da0478 100644
--- a/runtime/crab/src/pallets.rs
+++ b/runtime/crab/src/pallets.rs
@@ -42,8 +42,6 @@ mod transaction_payment;
 mod assets;
 pub use assets::*;
 
-mod vesting;
-
 mod deposit;
 #[cfg(feature = "runtime-benchmarks")]
 pub use deposit::*;
diff --git a/runtime/crab/src/pallets/evm.rs b/runtime/crab/src/pallets/evm.rs
index 067d2a0dc..ca004b8b9 100644
--- a/runtime/crab/src/pallets/evm.rs
+++ b/runtime/crab/src/pallets/evm.rs
@@ -197,7 +197,6 @@ impl DispatchValidateT<AccountId, RuntimeCall> for DarwiniaDispatchValidator {
 		if matches!(
 			call,
 			RuntimeCall::Assets(..)
-				| RuntimeCall::Vesting(..)
 				| RuntimeCall::Ethereum(..)
 				| RuntimeCall::EVM(..)
 				| RuntimeCall::EthTxForwarder(..)
diff --git a/runtime/crab/src/pallets/identity.rs b/runtime/crab/src/pallets/identity.rs
deleted file mode 100644
index e269dfe03..000000000
--- a/runtime/crab/src/pallets/identity.rs
+++ /dev/null
@@ -1,39 +0,0 @@
-// This file is part of Darwinia.
-//
-// Copyright (C) Darwinia Network
-// SPDX-License-Identifier: GPL-3.0
-//
-// Darwinia is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Darwinia is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Darwinia. If not, see <https://www.gnu.org/licenses/>.
-
-// darwinia
-use crate::*;
-
-impl pallet_identity::Config for Runtime {
-	// Minimum 100 bytes/UNIT deposited (1 MILLIUNIT/byte).
-	// 258 bytes on-chain.
-	type BasicDeposit = ConstU128<{ darwinia_deposit(1, 17) }>;
-	// 66 bytes on-chain.
-	type ByteDeposit = ConstU128<{ darwinia_deposit(0, 1) }>;
-	type Currency = Balances;
-	type ForceOrigin = RootOr<GeneralAdmin>;
-	type IdentityInformation = IdentityInfo<ConstU32<100>>;
-	type MaxRegistrars = ConstU32<20>;
-	type MaxSubAccounts = ConstU32<100>;
-	type RegistrarOrigin = RootOr<GeneralAdmin>;
-	type RuntimeEvent = RuntimeEvent;
-	type Slashed = Treasury;
-	// 53 bytes on-chain.
-	type SubAccountDeposit = ConstU128<{ darwinia_deposit(1, 53) }>;
-	type WeightInfo = weights::pallet_identity::WeightInfo<Self>;
-}
diff --git a/runtime/crab/src/pallets/proxy.rs b/runtime/crab/src/pallets/proxy.rs
index 7eb9ec057..3dcc505a0 100644
--- a/runtime/crab/src/pallets/proxy.rs
+++ b/runtime/crab/src/pallets/proxy.rs
@@ -42,15 +42,15 @@ pub enum ProxyType {
 	Governance,
 	#[codec(index = 3)]
 	Staking,
-	#[codec(index = 4)]
-	IdentityJudgement,
+	// TODO: Migration
+	// #[codec(index = 4)]
+	// IdentityJudgement,
 	#[codec(index = 5)]
 	CancelProxy,
-	// TODO: Migration.
-	#[codec(index = 6)]
-	EcdsaBridge,
-	#[codec(index = 7)]
-	SubstrateBridge,
+	// #[codec(index = 6)]
+	// EcdsaBridge,
+	// #[codec(index = 7)]
+	// SubstrateBridge,
 }
 impl Default for ProxyType {
 	fn default() -> Self {
@@ -65,7 +65,6 @@ impl frame_support::traits::InstanceFilter<RuntimeCall> for ProxyType {
 				c,
 				RuntimeCall::Balances(..)
 					| RuntimeCall::Assets(..)
-					| RuntimeCall::Vesting(pallet_vesting::Call::vested_transfer { .. })
 					// Might contains transfer
 					| RuntimeCall::Utility(..)
 					| RuntimeCall::Proxy(..)
@@ -88,9 +87,6 @@ impl frame_support::traits::InstanceFilter<RuntimeCall> for ProxyType {
 						| RuntimeCall::DarwiniaStaking(..)
 				)
 			},
-			ProxyType::IdentityJudgement => {
-				matches!(c, RuntimeCall::Identity(pallet_identity::Call::provide_judgement { .. }))
-			},
 			ProxyType::CancelProxy => {
 				matches!(c, RuntimeCall::Proxy(pallet_proxy::Call::reject_announcement { .. }))
 			},
diff --git a/runtime/crab/src/pallets/tx_pause.rs b/runtime/crab/src/pallets/tx_pause.rs
index 66236c0b6..3a7c19db4 100644
--- a/runtime/crab/src/pallets/tx_pause.rs
+++ b/runtime/crab/src/pallets/tx_pause.rs
@@ -40,8 +40,8 @@ impl frame_support::traits::Contains<pallet_tx_pause::RuntimeCallNameOf<Runtime>
 		!matches!(
 			pallet,
 			b"Balances"
-				| b"Assets" | b"Vesting"
-				| b"Deposit" | b"AccountMigration"
+				| b"Assets" | b"Deposit"
+				| b"AccountMigration"
 				| b"DarwiniaStaking"
 				| b"Ethereum"
 				| b"EVM" | b"EthTxForwarder"
diff --git a/runtime/crab/src/pallets/vesting.rs b/runtime/crab/src/pallets/vesting.rs
deleted file mode 100644
index 49adc3431..000000000
--- a/runtime/crab/src/pallets/vesting.rs
+++ /dev/null
@@ -1,40 +0,0 @@
-// This file is part of Darwinia.
-//
-// Copyright (C) Darwinia Network
-// SPDX-License-Identifier: GPL-3.0
-//
-// Darwinia is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Darwinia is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Darwinia. If not, see <https://www.gnu.org/licenses/>.
-
-// darwinia
-use crate::*;
-
-frame_support::parameter_types! {
-	pub UnvestedFundsAllowedWithdrawReasons: frame_support::traits::WithdrawReasons =
-		frame_support::traits::WithdrawReasons::except(
-			frame_support::traits::WithdrawReasons::TRANSFER | frame_support::traits::WithdrawReasons::RESERVE
-		);
-}
-
-impl pallet_vesting::Config for Runtime {
-	type BlockNumberToBalance = sp_runtime::traits::ConvertInto;
-	type Currency = Balances;
-	type MinVestedTransfer = ConstU128<UNIT>;
-	type RuntimeEvent = RuntimeEvent;
-	type UnvestedFundsAllowedWithdrawReasons = UnvestedFundsAllowedWithdrawReasons;
-	type WeightInfo = weights::pallet_vesting::WeightInfo<Self>;
-
-	// `VestingInfo` encode length is 36bytes. 28 schedules gets encoded as 1009 bytes, which is the
-	// highest number of schedules that encodes less than 2^10.
-	const MAX_VESTING_SCHEDULES: u32 = 28;
-}
diff --git a/runtime/crab/src/weights.rs b/runtime/crab/src/weights.rs
index c727e6906..2a856063b 100644
--- a/runtime/crab/src/weights.rs
+++ b/runtime/crab/src/weights.rs
@@ -29,7 +29,6 @@ pub mod pallet_assets;
 pub mod pallet_balances;
 pub mod pallet_collective;
 pub mod pallet_conviction_voting;
-pub mod pallet_identity;
 pub mod pallet_preimage;
 pub mod pallet_proxy;
 pub mod pallet_referenda;
@@ -39,5 +38,4 @@ pub mod pallet_timestamp;
 pub mod pallet_treasury;
 pub mod pallet_tx_pause;
 pub mod pallet_utility;
-pub mod pallet_vesting;
 pub mod pallet_whitelist;
diff --git a/runtime/crab/src/weights/pallet_identity.rs b/runtime/crab/src/weights/pallet_identity.rs
deleted file mode 100644
index ccb5d6f62..000000000
--- a/runtime/crab/src/weights/pallet_identity.rs
+++ /dev/null
@@ -1,364 +0,0 @@
-// This file is part of Darwinia.
-//
-// Copyright (C) Darwinia Network
-// SPDX-License-Identifier: GPL-3.0
-//
-// Darwinia is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Darwinia is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Darwinia. If not, see <https://www.gnu.org/licenses/>.
-
-//! Autogenerated weights for `pallet_identity`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-04-17, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("crab-dev")`, DB CACHE: 1024
-
-// Executed Command:
-// target/release/darwinia
-// benchmark
-// pallet
-// --header
-// .maintain/license-header
-// --heap-pages
-// 4096
-// --chain
-// crab-dev
-// --output
-// runtime/crab/src/weights
-// --pallet
-// *
-// --extrinsic
-// *
-// --steps
-// 50
-// --repeat
-// 20
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `pallet_identity`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_identity::WeightInfo for WeightInfo<T> {
-	/// Storage: `Identity::Registrars` (r:1 w:1)
-	/// Proof: `Identity::Registrars` (`max_values`: Some(1), `max_size`: Some(901), added: 1396, mode: `MaxEncodedLen`)
-	/// The range of component `r` is `[1, 19]`.
-	fn add_registrar(r: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `31 + r * (45 ±0)`
-		//  Estimated: `2386`
-		// Minimum execution time: 9_000_000 picoseconds.
-		Weight::from_parts(10_558_091, 0)
-			.saturating_add(Weight::from_parts(0, 2386))
-			// Standard Error: 8_001
-			.saturating_add(Weight::from_parts(120_368, 0).saturating_mul(r.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Identity::IdentityOf` (r:1 w:1)
-	/// Proof: `Identity::IdentityOf` (`max_values`: None, `max_size`: Some(7526), added: 10001, mode: `MaxEncodedLen`)
-	/// The range of component `r` is `[1, 20]`.
-	/// The range of component `x` is `[0, 100]`.
-	fn set_identity(r: u32, x: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `429 + r * (5 ±0)`
-		//  Estimated: `10991`
-		// Minimum execution time: 28_000_000 picoseconds.
-		Weight::from_parts(30_520_339, 0)
-			.saturating_add(Weight::from_parts(0, 10991))
-			// Standard Error: 18_396
-			.saturating_add(Weight::from_parts(56_691, 0).saturating_mul(r.into()))
-			// Standard Error: 3_589
-			.saturating_add(Weight::from_parts(588_091, 0).saturating_mul(x.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Identity::IdentityOf` (r:1 w:0)
-	/// Proof: `Identity::IdentityOf` (`max_values`: None, `max_size`: Some(7526), added: 10001, mode: `MaxEncodedLen`)
-	/// Storage: `Identity::SubsOf` (r:1 w:1)
-	/// Proof: `Identity::SubsOf` (`max_values`: None, `max_size`: Some(2046), added: 4521, mode: `MaxEncodedLen`)
-	/// Storage: `Identity::SuperOf` (r:100 w:100)
-	/// Proof: `Identity::SuperOf` (`max_values`: None, `max_size`: Some(90), added: 2565, mode: `MaxEncodedLen`)
-	/// The range of component `s` is `[0, 100]`.
-	fn set_subs_new(s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `88`
-		//  Estimated: `10991 + s * (2565 ±0)`
-		// Minimum execution time: 7_000_000 picoseconds.
-		Weight::from_parts(21_394_089, 0)
-			.saturating_add(Weight::from_parts(0, 10991))
-			// Standard Error: 12_858
-			.saturating_add(Weight::from_parts(3_296_888, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(s.into())))
-			.saturating_add(T::DbWeight::get().writes(1))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s.into())))
-			.saturating_add(Weight::from_parts(0, 2565).saturating_mul(s.into()))
-	}
-	/// Storage: `Identity::IdentityOf` (r:1 w:0)
-	/// Proof: `Identity::IdentityOf` (`max_values`: None, `max_size`: Some(7526), added: 10001, mode: `MaxEncodedLen`)
-	/// Storage: `Identity::SubsOf` (r:1 w:1)
-	/// Proof: `Identity::SubsOf` (`max_values`: None, `max_size`: Some(2046), added: 4521, mode: `MaxEncodedLen`)
-	/// Storage: `Identity::SuperOf` (r:0 w:100)
-	/// Proof: `Identity::SuperOf` (`max_values`: None, `max_size`: Some(90), added: 2565, mode: `MaxEncodedLen`)
-	/// The range of component `p` is `[0, 100]`.
-	fn set_subs_old(p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `168 + p * (20 ±0)`
-		//  Estimated: `10991`
-		// Minimum execution time: 6_000_000 picoseconds.
-		Weight::from_parts(21_156_012, 0)
-			.saturating_add(Weight::from_parts(0, 10991))
-			// Standard Error: 6_982
-			.saturating_add(Weight::from_parts(1_365_468, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(p.into())))
-	}
-	/// Storage: `Identity::SubsOf` (r:1 w:1)
-	/// Proof: `Identity::SubsOf` (`max_values`: None, `max_size`: Some(2046), added: 4521, mode: `MaxEncodedLen`)
-	/// Storage: `Identity::IdentityOf` (r:1 w:1)
-	/// Proof: `Identity::IdentityOf` (`max_values`: None, `max_size`: Some(7526), added: 10001, mode: `MaxEncodedLen`)
-	/// Storage: `Identity::SuperOf` (r:0 w:100)
-	/// Proof: `Identity::SuperOf` (`max_values`: None, `max_size`: Some(90), added: 2565, mode: `MaxEncodedLen`)
-	/// The range of component `r` is `[1, 20]`.
-	/// The range of component `s` is `[0, 100]`.
-	/// The range of component `x` is `[0, 100]`.
-	fn clear_identity(r: u32, s: u32, x: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `444 + r * (5 ±0) + s * (20 ±0) + x * (66 ±0)`
-		//  Estimated: `10991`
-		// Minimum execution time: 51_000_000 picoseconds.
-		Weight::from_parts(28_194_157, 0)
-			.saturating_add(Weight::from_parts(0, 10991))
-			// Standard Error: 26_352
-			.saturating_add(Weight::from_parts(206_961, 0).saturating_mul(r.into()))
-			// Standard Error: 5_146
-			.saturating_add(Weight::from_parts(1_369_771, 0).saturating_mul(s.into()))
-			// Standard Error: 5_146
-			.saturating_add(Weight::from_parts(331_524, 0).saturating_mul(x.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s.into())))
-	}
-	/// Storage: `Identity::Registrars` (r:1 w:0)
-	/// Proof: `Identity::Registrars` (`max_values`: Some(1), `max_size`: Some(901), added: 1396, mode: `MaxEncodedLen`)
-	/// Storage: `Identity::IdentityOf` (r:1 w:1)
-	/// Proof: `Identity::IdentityOf` (`max_values`: None, `max_size`: Some(7526), added: 10001, mode: `MaxEncodedLen`)
-	/// The range of component `r` is `[1, 20]`.
-	/// The range of component `x` is `[0, 100]`.
-	fn request_judgement(r: u32, x: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `354 + r * (45 ±0) + x * (66 ±0)`
-		//  Estimated: `10991`
-		// Minimum execution time: 27_000_000 picoseconds.
-		Weight::from_parts(28_967_113, 0)
-			.saturating_add(Weight::from_parts(0, 10991))
-			// Standard Error: 21_750
-			.saturating_add(Weight::from_parts(16_364, 0).saturating_mul(r.into()))
-			// Standard Error: 4_244
-			.saturating_add(Weight::from_parts(620_990, 0).saturating_mul(x.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Identity::IdentityOf` (r:1 w:1)
-	/// Proof: `Identity::IdentityOf` (`max_values`: None, `max_size`: Some(7526), added: 10001, mode: `MaxEncodedLen`)
-	/// The range of component `r` is `[1, 20]`.
-	/// The range of component `x` is `[0, 100]`.
-	fn cancel_request(r: u32, x: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `385 + x * (66 ±0)`
-		//  Estimated: `10991`
-		// Minimum execution time: 24_000_000 picoseconds.
-		Weight::from_parts(25_152_732, 0)
-			.saturating_add(Weight::from_parts(0, 10991))
-			// Standard Error: 19_950
-			.saturating_add(Weight::from_parts(123_431, 0).saturating_mul(r.into()))
-			// Standard Error: 3_892
-			.saturating_add(Weight::from_parts(607_404, 0).saturating_mul(x.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Identity::Registrars` (r:1 w:1)
-	/// Proof: `Identity::Registrars` (`max_values`: Some(1), `max_size`: Some(901), added: 1396, mode: `MaxEncodedLen`)
-	/// The range of component `r` is `[1, 19]`.
-	fn set_fee(r: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `76 + r * (45 ±0)`
-		//  Estimated: `2386`
-		// Minimum execution time: 5_000_000 picoseconds.
-		Weight::from_parts(6_674_435, 0)
-			.saturating_add(Weight::from_parts(0, 2386))
-			// Standard Error: 5_918
-			.saturating_add(Weight::from_parts(96_592, 0).saturating_mul(r.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Identity::Registrars` (r:1 w:1)
-	/// Proof: `Identity::Registrars` (`max_values`: Some(1), `max_size`: Some(901), added: 1396, mode: `MaxEncodedLen`)
-	/// The range of component `r` is `[1, 19]`.
-	fn set_account_id(r: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `76 + r * (45 ±0)`
-		//  Estimated: `2386`
-		// Minimum execution time: 5_000_000 picoseconds.
-		Weight::from_parts(6_022_703, 0)
-			.saturating_add(Weight::from_parts(0, 2386))
-			// Standard Error: 4_920
-			.saturating_add(Weight::from_parts(80_598, 0).saturating_mul(r.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Identity::Registrars` (r:1 w:1)
-	/// Proof: `Identity::Registrars` (`max_values`: Some(1), `max_size`: Some(901), added: 1396, mode: `MaxEncodedLen`)
-	/// The range of component `r` is `[1, 19]`.
-	fn set_fields(r: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `76 + r * (45 ±0)`
-		//  Estimated: `2386`
-		// Minimum execution time: 5_000_000 picoseconds.
-		Weight::from_parts(6_018_369, 0)
-			.saturating_add(Weight::from_parts(0, 2386))
-			// Standard Error: 4_940
-			.saturating_add(Weight::from_parts(84_414, 0).saturating_mul(r.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Identity::Registrars` (r:1 w:0)
-	/// Proof: `Identity::Registrars` (`max_values`: Some(1), `max_size`: Some(901), added: 1396, mode: `MaxEncodedLen`)
-	/// Storage: `Identity::IdentityOf` (r:1 w:1)
-	/// Proof: `Identity::IdentityOf` (`max_values`: None, `max_size`: Some(7526), added: 10001, mode: `MaxEncodedLen`)
-	/// The range of component `r` is `[1, 19]`.
-	/// The range of component `x` is `[0, 100]`.
-	fn provide_judgement(r: u32, x: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `420 + r * (45 ±0) + x * (66 ±0)`
-		//  Estimated: `10991`
-		// Minimum execution time: 16_000_000 picoseconds.
-		Weight::from_parts(18_899_106, 0)
-			.saturating_add(Weight::from_parts(0, 10991))
-			// Standard Error: 22_721
-			.saturating_add(Weight::from_parts(45_975, 0).saturating_mul(r.into()))
-			// Standard Error: 4_203
-			.saturating_add(Weight::from_parts(940_546, 0).saturating_mul(x.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Identity::SubsOf` (r:1 w:1)
-	/// Proof: `Identity::SubsOf` (`max_values`: None, `max_size`: Some(2046), added: 4521, mode: `MaxEncodedLen`)
-	/// Storage: `Identity::IdentityOf` (r:1 w:1)
-	/// Proof: `Identity::IdentityOf` (`max_values`: None, `max_size`: Some(7526), added: 10001, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:2 w:2)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(116), added: 2591, mode: `MaxEncodedLen`)
-	/// Storage: `Identity::SuperOf` (r:0 w:100)
-	/// Proof: `Identity::SuperOf` (`max_values`: None, `max_size`: Some(90), added: 2565, mode: `MaxEncodedLen`)
-	/// The range of component `r` is `[1, 20]`.
-	/// The range of component `s` is `[0, 100]`.
-	/// The range of component `x` is `[0, 100]`.
-	fn kill_identity(r: u32, s: u32, x: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `674 + r * (11 ±0) + s * (20 ±0) + x * (66 ±0)`
-		//  Estimated: `10991`
-		// Minimum execution time: 70_000_000 picoseconds.
-		Weight::from_parts(41_181_601, 0)
-			.saturating_add(Weight::from_parts(0, 10991))
-			// Standard Error: 29_349
-			.saturating_add(Weight::from_parts(407_426, 0).saturating_mul(r.into()))
-			// Standard Error: 5_731
-			.saturating_add(Weight::from_parts(1_390_796, 0).saturating_mul(s.into()))
-			// Standard Error: 5_731
-			.saturating_add(Weight::from_parts(362_047, 0).saturating_mul(x.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(4))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s.into())))
-	}
-	/// Storage: `Identity::IdentityOf` (r:1 w:0)
-	/// Proof: `Identity::IdentityOf` (`max_values`: None, `max_size`: Some(7526), added: 10001, mode: `MaxEncodedLen`)
-	/// Storage: `Identity::SuperOf` (r:1 w:1)
-	/// Proof: `Identity::SuperOf` (`max_values`: None, `max_size`: Some(90), added: 2565, mode: `MaxEncodedLen`)
-	/// Storage: `Identity::SubsOf` (r:1 w:1)
-	/// Proof: `Identity::SubsOf` (`max_values`: None, `max_size`: Some(2046), added: 4521, mode: `MaxEncodedLen`)
-	/// The range of component `s` is `[0, 99]`.
-	fn add_sub(s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `535 + s * (23 ±0)`
-		//  Estimated: `10991`
-		// Minimum execution time: 24_000_000 picoseconds.
-		Weight::from_parts(30_404_710, 0)
-			.saturating_add(Weight::from_parts(0, 10991))
-			// Standard Error: 3_470
-			.saturating_add(Weight::from_parts(32_054, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `Identity::IdentityOf` (r:1 w:0)
-	/// Proof: `Identity::IdentityOf` (`max_values`: None, `max_size`: Some(7526), added: 10001, mode: `MaxEncodedLen`)
-	/// Storage: `Identity::SuperOf` (r:1 w:1)
-	/// Proof: `Identity::SuperOf` (`max_values`: None, `max_size`: Some(90), added: 2565, mode: `MaxEncodedLen`)
-	/// The range of component `s` is `[1, 100]`.
-	fn rename_sub(s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `614 + s * (4 ±0)`
-		//  Estimated: `10991`
-		// Minimum execution time: 8_000_000 picoseconds.
-		Weight::from_parts(12_022_248, 0)
-			.saturating_add(Weight::from_parts(0, 10991))
-			// Standard Error: 1_677
-			.saturating_add(Weight::from_parts(16_868, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Identity::IdentityOf` (r:1 w:0)
-	/// Proof: `Identity::IdentityOf` (`max_values`: None, `max_size`: Some(7526), added: 10001, mode: `MaxEncodedLen`)
-	/// Storage: `Identity::SuperOf` (r:1 w:1)
-	/// Proof: `Identity::SuperOf` (`max_values`: None, `max_size`: Some(90), added: 2565, mode: `MaxEncodedLen`)
-	/// Storage: `Identity::SubsOf` (r:1 w:1)
-	/// Proof: `Identity::SubsOf` (`max_values`: None, `max_size`: Some(2046), added: 4521, mode: `MaxEncodedLen`)
-	/// The range of component `s` is `[1, 100]`.
-	fn remove_sub(s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `646 + s * (24 ±0)`
-		//  Estimated: `10991`
-		// Minimum execution time: 26_000_000 picoseconds.
-		Weight::from_parts(32_236_519, 0)
-			.saturating_add(Weight::from_parts(0, 10991))
-			// Standard Error: 3_495
-			.saturating_add(Weight::from_parts(33_976, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `Identity::SuperOf` (r:1 w:1)
-	/// Proof: `Identity::SuperOf` (`max_values`: None, `max_size`: Some(90), added: 2565, mode: `MaxEncodedLen`)
-	/// Storage: `Identity::SubsOf` (r:1 w:1)
-	/// Proof: `Identity::SubsOf` (`max_values`: None, `max_size`: Some(2046), added: 4521, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:0)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(116), added: 2591, mode: `MaxEncodedLen`)
-	/// The range of component `s` is `[0, 99]`.
-	fn quit_sub(s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `658 + s * (24 ±0)`
-		//  Estimated: `5511`
-		// Minimum execution time: 18_000_000 picoseconds.
-		Weight::from_parts(22_289_553, 0)
-			.saturating_add(Weight::from_parts(0, 5511))
-			// Standard Error: 2_753
-			.saturating_add(Weight::from_parts(25_427, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-}
diff --git a/runtime/crab/src/weights/pallet_vesting.rs b/runtime/crab/src/weights/pallet_vesting.rs
deleted file mode 100644
index 49652a139..000000000
--- a/runtime/crab/src/weights/pallet_vesting.rs
+++ /dev/null
@@ -1,244 +0,0 @@
-// This file is part of Darwinia.
-//
-// Copyright (C) Darwinia Network
-// SPDX-License-Identifier: GPL-3.0
-//
-// Darwinia is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Darwinia is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Darwinia. If not, see <https://www.gnu.org/licenses/>.
-
-//! Autogenerated weights for `pallet_vesting`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-04-17, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("crab-dev")`, DB CACHE: 1024
-
-// Executed Command:
-// target/release/darwinia
-// benchmark
-// pallet
-// --header
-// .maintain/license-header
-// --heap-pages
-// 4096
-// --chain
-// crab-dev
-// --output
-// runtime/crab/src/weights
-// --pallet
-// *
-// --extrinsic
-// *
-// --steps
-// 50
-// --repeat
-// 20
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `pallet_vesting`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_vesting::WeightInfo for WeightInfo<T> {
-	/// Storage: `Vesting::Vesting` (r:1 w:1)
-	/// Proof: `Vesting::Vesting` (`max_values`: None, `max_size`: Some(1045), added: 3520, mode: `MaxEncodedLen`)
-	/// Storage: `Balances::Locks` (r:1 w:1)
-	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1287), added: 3762, mode: `MaxEncodedLen`)
-	/// Storage: `Balances::Freezes` (r:1 w:0)
-	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(37), added: 2512, mode: `MaxEncodedLen`)
-	/// The range of component `l` is `[0, 49]`.
-	/// The range of component `s` is `[1, 28]`.
-	fn vest_locked(l: u32, s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `179 + l * (25 ±0) + s * (36 ±0)`
-		//  Estimated: `4752`
-		// Minimum execution time: 25_000_000 picoseconds.
-		Weight::from_parts(29_858_170, 0)
-			.saturating_add(Weight::from_parts(0, 4752))
-			// Standard Error: 3_938
-			.saturating_add(Weight::from_parts(20_072, 0).saturating_mul(l.into()))
-			// Standard Error: 7_007
-			.saturating_add(Weight::from_parts(64_959, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `Vesting::Vesting` (r:1 w:1)
-	/// Proof: `Vesting::Vesting` (`max_values`: None, `max_size`: Some(1045), added: 3520, mode: `MaxEncodedLen`)
-	/// Storage: `Balances::Locks` (r:1 w:1)
-	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1287), added: 3762, mode: `MaxEncodedLen`)
-	/// Storage: `Balances::Freezes` (r:1 w:0)
-	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(37), added: 2512, mode: `MaxEncodedLen`)
-	/// The range of component `l` is `[0, 49]`.
-	/// The range of component `s` is `[1, 28]`.
-	fn vest_unlocked(l: u32, s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `179 + l * (25 ±0) + s * (36 ±0)`
-		//  Estimated: `4752`
-		// Minimum execution time: 28_000_000 picoseconds.
-		Weight::from_parts(32_713_297, 0)
-			.saturating_add(Weight::from_parts(0, 4752))
-			// Standard Error: 4_050
-			.saturating_add(Weight::from_parts(25_613, 0).saturating_mul(l.into()))
-			// Standard Error: 7_206
-			.saturating_add(Weight::from_parts(97_352, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `Vesting::Vesting` (r:1 w:1)
-	/// Proof: `Vesting::Vesting` (`max_values`: None, `max_size`: Some(1045), added: 3520, mode: `MaxEncodedLen`)
-	/// Storage: `Balances::Locks` (r:1 w:1)
-	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1287), added: 3762, mode: `MaxEncodedLen`)
-	/// Storage: `Balances::Freezes` (r:1 w:0)
-	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(37), added: 2512, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(116), added: 2591, mode: `MaxEncodedLen`)
-	/// The range of component `l` is `[0, 49]`.
-	/// The range of component `s` is `[1, 28]`.
-	fn vest_other_locked(l: u32, s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `341 + l * (25 ±0) + s * (36 ±0)`
-		//  Estimated: `4752`
-		// Minimum execution time: 27_000_000 picoseconds.
-		Weight::from_parts(32_259_615, 0)
-			.saturating_add(Weight::from_parts(0, 4752))
-			// Standard Error: 4_001
-			.saturating_add(Weight::from_parts(23_180, 0).saturating_mul(l.into()))
-			// Standard Error: 7_119
-			.saturating_add(Weight::from_parts(73_881, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: `Vesting::Vesting` (r:1 w:1)
-	/// Proof: `Vesting::Vesting` (`max_values`: None, `max_size`: Some(1045), added: 3520, mode: `MaxEncodedLen`)
-	/// Storage: `Balances::Locks` (r:1 w:1)
-	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1287), added: 3762, mode: `MaxEncodedLen`)
-	/// Storage: `Balances::Freezes` (r:1 w:0)
-	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(37), added: 2512, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(116), added: 2591, mode: `MaxEncodedLen`)
-	/// The range of component `l` is `[0, 49]`.
-	/// The range of component `s` is `[1, 28]`.
-	fn vest_other_unlocked(l: u32, s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `341 + l * (25 ±0) + s * (36 ±0)`
-		//  Estimated: `4752`
-		// Minimum execution time: 30_000_000 picoseconds.
-		Weight::from_parts(35_727_636, 0)
-			.saturating_add(Weight::from_parts(0, 4752))
-			// Standard Error: 4_288
-			.saturating_add(Weight::from_parts(24_749, 0).saturating_mul(l.into()))
-			// Standard Error: 7_630
-			.saturating_add(Weight::from_parts(87_325, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: `Vesting::Vesting` (r:1 w:1)
-	/// Proof: `Vesting::Vesting` (`max_values`: None, `max_size`: Some(1045), added: 3520, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(116), added: 2591, mode: `MaxEncodedLen`)
-	/// Storage: `Balances::Locks` (r:1 w:1)
-	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1287), added: 3762, mode: `MaxEncodedLen`)
-	/// Storage: `Balances::Freezes` (r:1 w:0)
-	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(37), added: 2512, mode: `MaxEncodedLen`)
-	/// The range of component `l` is `[0, 49]`.
-	/// The range of component `s` is `[0, 27]`.
-	fn vested_transfer(_l: u32, s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `307 + l * (25 ±0) + s * (36 ±0)`
-		//  Estimated: `4752`
-		// Minimum execution time: 61_000_000 picoseconds.
-		Weight::from_parts(73_315_899, 0)
-			.saturating_add(Weight::from_parts(0, 4752))
-			// Standard Error: 11_644
-			.saturating_add(Weight::from_parts(113_895, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: `Vesting::Vesting` (r:1 w:1)
-	/// Proof: `Vesting::Vesting` (`max_values`: None, `max_size`: Some(1045), added: 3520, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:2 w:2)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(116), added: 2591, mode: `MaxEncodedLen`)
-	/// Storage: `Balances::Locks` (r:1 w:1)
-	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1287), added: 3762, mode: `MaxEncodedLen`)
-	/// Storage: `Balances::Freezes` (r:1 w:0)
-	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(37), added: 2512, mode: `MaxEncodedLen`)
-	/// The range of component `l` is `[0, 49]`.
-	/// The range of component `s` is `[0, 27]`.
-	fn force_vested_transfer(l: u32, s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `469 + l * (25 ±0) + s * (36 ±0)`
-		//  Estimated: `6172`
-		// Minimum execution time: 62_000_000 picoseconds.
-		Weight::from_parts(74_941_500, 0)
-			.saturating_add(Weight::from_parts(0, 6172))
-			// Standard Error: 7_206
-			.saturating_add(Weight::from_parts(20_509, 0).saturating_mul(l.into()))
-			// Standard Error: 12_821
-			.saturating_add(Weight::from_parts(108_588, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	/// Storage: `Vesting::Vesting` (r:1 w:1)
-	/// Proof: `Vesting::Vesting` (`max_values`: None, `max_size`: Some(1045), added: 3520, mode: `MaxEncodedLen`)
-	/// Storage: `Balances::Locks` (r:1 w:1)
-	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1287), added: 3762, mode: `MaxEncodedLen`)
-	/// Storage: `Balances::Freezes` (r:1 w:0)
-	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(37), added: 2512, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(116), added: 2591, mode: `MaxEncodedLen`)
-	/// The range of component `l` is `[0, 49]`.
-	/// The range of component `s` is `[2, 28]`.
-	fn not_unlocking_merge_schedules(l: u32, s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `345 + l * (25 ±0) + s * (36 ±0)`
-		//  Estimated: `4752`
-		// Minimum execution time: 29_000_000 picoseconds.
-		Weight::from_parts(32_816_288, 0)
-			.saturating_add(Weight::from_parts(0, 4752))
-			// Standard Error: 3_914
-			.saturating_add(Weight::from_parts(24_839, 0).saturating_mul(l.into()))
-			// Standard Error: 7_229
-			.saturating_add(Weight::from_parts(98_629, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: `Vesting::Vesting` (r:1 w:1)
-	/// Proof: `Vesting::Vesting` (`max_values`: None, `max_size`: Some(1045), added: 3520, mode: `MaxEncodedLen`)
-	/// Storage: `Balances::Locks` (r:1 w:1)
-	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1287), added: 3762, mode: `MaxEncodedLen`)
-	/// Storage: `Balances::Freezes` (r:1 w:0)
-	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(37), added: 2512, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(116), added: 2591, mode: `MaxEncodedLen`)
-	/// The range of component `l` is `[0, 49]`.
-	/// The range of component `s` is `[2, 28]`.
-	fn unlocking_merge_schedules(l: u32, s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `345 + l * (25 ±0) + s * (36 ±0)`
-		//  Estimated: `4752`
-		// Minimum execution time: 31_000_000 picoseconds.
-		Weight::from_parts(36_286_704, 0)
-			.saturating_add(Weight::from_parts(0, 4752))
-			// Standard Error: 4_308
-			.saturating_add(Weight::from_parts(35_691, 0).saturating_mul(l.into()))
-			// Standard Error: 7_957
-			.saturating_add(Weight::from_parts(107_085, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-}
diff --git a/runtime/darwinia/Cargo.toml b/runtime/darwinia/Cargo.toml
index 729daaf93..e25e1c761 100644
--- a/runtime/darwinia/Cargo.toml
+++ b/runtime/darwinia/Cargo.toml
@@ -93,7 +93,6 @@ pallet-balances                            = { workspace = true }
 pallet-collective                          = { workspace = true }
 pallet-conviction-voting                   = { workspace = true }
 pallet-democracy                           = { workspace = true }
-pallet-identity                            = { workspace = true }
 pallet-preimage                            = { workspace = true }
 pallet-proxy                               = { workspace = true }
 pallet-referenda                           = { workspace = true }
@@ -105,7 +104,6 @@ pallet-transaction-payment-rpc-runtime-api = { workspace = true }
 pallet-treasury                            = { workspace = true }
 # pallet-tx-pause                            = { workspace = true }
 pallet-utility      = { workspace = true }
-pallet-vesting      = { workspace = true }
 pallet-whitelist    = { workspace = true }
 sp-api              = { workspace = true }
 sp-block-builder    = { workspace = true }
@@ -216,7 +214,6 @@ std = [
 	"pallet-collective/std",
 	"pallet-conviction-voting/std",
 	"pallet-democracy/std",
-	"pallet-identity/std",
 	"pallet-preimage/std",
 	"pallet-proxy/std",
 	"pallet-referenda/std",
@@ -228,7 +225,6 @@ std = [
 	"pallet-treasury/std",
 	# "pallet-tx-pause/std",
 	"pallet-utility/std",
-	"pallet-vesting/std",
 	"pallet-whitelist/std",
 	"sp-api/std",
 	"sp-block-builder/std",
@@ -318,7 +314,6 @@ runtime-benchmarks = [
 	"pallet-collective/runtime-benchmarks",
 	"pallet-conviction-voting/runtime-benchmarks",
 	"pallet-democracy/runtime-benchmarks",
-	"pallet-identity/runtime-benchmarks",
 	"pallet-preimage/runtime-benchmarks",
 	"pallet-proxy/runtime-benchmarks",
 	"pallet-referenda/runtime-benchmarks",
@@ -327,7 +322,6 @@ runtime-benchmarks = [
 	"pallet-treasury/runtime-benchmarks",
 	# "pallet-tx-pause/runtime-benchmarks",
 	"pallet-utility/runtime-benchmarks",
-	"pallet-vesting/runtime-benchmarks",
 	"pallet-whitelist/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
 	# substrate optional
@@ -379,7 +373,6 @@ try-runtime = [
 	"pallet-collective/try-runtime",
 	"pallet-conviction-voting/try-runtime",
 	"pallet-democracy/try-runtime",
-	"pallet-identity/try-runtime",
 	"pallet-preimage/try-runtime",
 	"pallet-proxy/try-runtime",
 	"pallet-referenda/try-runtime",
@@ -390,7 +383,6 @@ try-runtime = [
 	"pallet-treasury/try-runtime",
 	# "pallet-tx-pause/try-runtime",
 	"pallet-utility/try-runtime",
-	"pallet-vesting/try-runtime",
 	"pallet-whitelist/try-runtime",
 	"sp-runtime/try-runtime",
 	# substrate optional
diff --git a/runtime/darwinia/src/lib.rs b/runtime/darwinia/src/lib.rs
index 00b26501d..b794a472d 100644
--- a/runtime/darwinia/src/lib.rs
+++ b/runtime/darwinia/src/lib.rs
@@ -102,7 +102,7 @@ frame_support::construct_runtime! {
 		Balances: pallet_balances = 5,
 		TransactionPayment: pallet_transaction_payment = 6,
 		Assets: pallet_assets = 7,
-		Vesting: pallet_vesting = 8,
+		// Vesting: pallet_vesting = 8,
 		Deposit: darwinia_deposit = 9,
 		AccountMigration: darwinia_account_migration = 10,
 
@@ -131,7 +131,7 @@ frame_support::construct_runtime! {
 		// Utility stuff.
 		// Sudo: pallet_sudo = 25,
 		Utility: pallet_utility = 26,
-		Identity: pallet_identity = 27,
+		// Identity: pallet_identity = 27,
 		Scheduler: pallet_scheduler = 28,
 		Preimage: pallet_preimage = 29,
 		Proxy: pallet_proxy = 30,
@@ -176,7 +176,6 @@ frame_benchmarking::define_benchmarks! {
 	[pallet_collective, TechnicalCommittee]
 	[pallet_conviction_voting, ConvictionVoting]
 	[pallet_democracy, Democracy]
-	[pallet_identity, Identity]
 	[pallet_preimage, Preimage]
 	[pallet_proxy, Proxy]
 	[pallet_referenda, Referenda]
@@ -186,7 +185,6 @@ frame_benchmarking::define_benchmarks! {
 	[pallet_treasury, Treasury]
 	// [pallet_tx_pause, TxPause]
 	[pallet_utility, Utility]
-	[pallet_vesting, Vesting]
 	[pallet_whitelist, Whitelist]
 }
 
diff --git a/runtime/darwinia/src/pallets.rs b/runtime/darwinia/src/pallets.rs
index 724bf8319..0379f5a93 100644
--- a/runtime/darwinia/src/pallets.rs
+++ b/runtime/darwinia/src/pallets.rs
@@ -42,8 +42,6 @@ mod transaction_payment;
 mod assets;
 pub use assets::*;
 
-mod vesting;
-
 mod deposit;
 #[cfg(feature = "runtime-benchmarks")]
 pub use deposit::*;
diff --git a/runtime/darwinia/src/pallets/evm.rs b/runtime/darwinia/src/pallets/evm.rs
index 6bc17dfd2..9cb6bf997 100644
--- a/runtime/darwinia/src/pallets/evm.rs
+++ b/runtime/darwinia/src/pallets/evm.rs
@@ -198,7 +198,6 @@ impl DispatchValidateT<AccountId, RuntimeCall> for DarwiniaDispatchValidator {
 		if matches!(
 			call,
 			RuntimeCall::Assets(..)
-				| RuntimeCall::Vesting(..)
 				| RuntimeCall::Ethereum(..)
 				| RuntimeCall::EVM(..)
 				| RuntimeCall::EthTxForwarder(..)
diff --git a/runtime/darwinia/src/pallets/identity.rs b/runtime/darwinia/src/pallets/identity.rs
deleted file mode 100644
index 37723f90a..000000000
--- a/runtime/darwinia/src/pallets/identity.rs
+++ /dev/null
@@ -1,39 +0,0 @@
-// This file is part of Darwinia.
-//
-// Copyright (C) Darwinia Network
-// SPDX-License-Identifier: GPL-3.0
-//
-// Darwinia is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Darwinia is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Darwinia. If not, see <https://www.gnu.org/licenses/>.
-
-// darwinia
-use crate::*;
-
-impl pallet_identity::Config for Runtime {
-	// Minimum 100 bytes/UNIT deposited (1 MILLIUNIT/byte).
-	// 258 bytes on-chain.
-	type BasicDeposit = ConstU128<{ darwinia_deposit(1, 17) }>;
-	// 66 bytes on-chain.
-	type ByteDeposit = ConstU128<{ darwinia_deposit(0, 1) }>;
-	type Currency = Balances;
-	type ForceOrigin = RootOrMoreThanHalf<CouncilCollective>;
-	type IdentityInformation = IdentityInfo<ConstU32<100>>;
-	type MaxRegistrars = ConstU32<20>;
-	type MaxSubAccounts = ConstU32<100>;
-	type RegistrarOrigin = RootOrMoreThanHalf<CouncilCollective>;
-	type RuntimeEvent = RuntimeEvent;
-	type Slashed = Treasury;
-	// 53 bytes on-chain.
-	type SubAccountDeposit = ConstU128<{ darwinia_deposit(1, 53) }>;
-	type WeightInfo = weights::pallet_identity::WeightInfo<Self>;
-}
diff --git a/runtime/darwinia/src/pallets/proxy.rs b/runtime/darwinia/src/pallets/proxy.rs
index 8cd66a3d4..1fece869d 100644
--- a/runtime/darwinia/src/pallets/proxy.rs
+++ b/runtime/darwinia/src/pallets/proxy.rs
@@ -42,15 +42,15 @@ pub enum ProxyType {
 	Governance,
 	#[codec(index = 3)]
 	Staking,
-	#[codec(index = 4)]
-	IdentityJudgement,
+	// TODO: Migration.
+	// #[codec(index = 4)]
+	// IdentityJudgement,
 	#[codec(index = 5)]
 	CancelProxy,
-	// TODO: Migration.
-	#[codec(index = 6)]
-	EcdsaBridge,
-	#[codec(index = 7)]
-	SubstrateBridge,
+	// #[codec(index = 6)]
+	// EcdsaBridge,
+	// #[codec(index = 7)]
+	// SubstrateBridge,
 }
 impl Default for ProxyType {
 	fn default() -> Self {
@@ -65,7 +65,6 @@ impl frame_support::traits::InstanceFilter<RuntimeCall> for ProxyType {
 				c,
 				RuntimeCall::Balances(..)
 					| RuntimeCall::Assets(..)
-					| RuntimeCall::Vesting(pallet_vesting::Call::vested_transfer { .. })
 					// Might contains transfer
 					| RuntimeCall::Utility(..)
 					| RuntimeCall::Proxy(..)
@@ -90,9 +89,6 @@ impl frame_support::traits::InstanceFilter<RuntimeCall> for ProxyType {
 						| RuntimeCall::DarwiniaStaking(..)
 				)
 			},
-			ProxyType::IdentityJudgement => {
-				matches!(c, RuntimeCall::Identity(pallet_identity::Call::provide_judgement { .. }))
-			},
 			ProxyType::CancelProxy => {
 				matches!(c, RuntimeCall::Proxy(pallet_proxy::Call::reject_announcement { .. }))
 			},
diff --git a/runtime/darwinia/src/pallets/tx_pause.rs b/runtime/darwinia/src/pallets/tx_pause.rs
index 17f5964eb..3a7c19db4 100644
--- a/runtime/darwinia/src/pallets/tx_pause.rs
+++ b/runtime/darwinia/src/pallets/tx_pause.rs
@@ -40,11 +40,11 @@ impl frame_support::traits::Contains<pallet_tx_pause::RuntimeCallNameOf<Runtime>
 		!matches!(
 			pallet,
 			b"Balances"
-				| b"Assets" | b"Vesting"
-				| b"Deposit" | b"AccountMigration"
+				| b"Assets" | b"Deposit"
+				| b"AccountMigration"
 				| b"DarwiniaStaking"
-				| b"Ethereum" | b"EVM"
-				| b"EthTxForwarder"
+				| b"Ethereum"
+				| b"EVM" | b"EthTxForwarder"
 		)
 	}
 }
diff --git a/runtime/darwinia/src/pallets/vesting.rs b/runtime/darwinia/src/pallets/vesting.rs
deleted file mode 100644
index 49adc3431..000000000
--- a/runtime/darwinia/src/pallets/vesting.rs
+++ /dev/null
@@ -1,40 +0,0 @@
-// This file is part of Darwinia.
-//
-// Copyright (C) Darwinia Network
-// SPDX-License-Identifier: GPL-3.0
-//
-// Darwinia is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Darwinia is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Darwinia. If not, see <https://www.gnu.org/licenses/>.
-
-// darwinia
-use crate::*;
-
-frame_support::parameter_types! {
-	pub UnvestedFundsAllowedWithdrawReasons: frame_support::traits::WithdrawReasons =
-		frame_support::traits::WithdrawReasons::except(
-			frame_support::traits::WithdrawReasons::TRANSFER | frame_support::traits::WithdrawReasons::RESERVE
-		);
-}
-
-impl pallet_vesting::Config for Runtime {
-	type BlockNumberToBalance = sp_runtime::traits::ConvertInto;
-	type Currency = Balances;
-	type MinVestedTransfer = ConstU128<UNIT>;
-	type RuntimeEvent = RuntimeEvent;
-	type UnvestedFundsAllowedWithdrawReasons = UnvestedFundsAllowedWithdrawReasons;
-	type WeightInfo = weights::pallet_vesting::WeightInfo<Self>;
-
-	// `VestingInfo` encode length is 36bytes. 28 schedules gets encoded as 1009 bytes, which is the
-	// highest number of schedules that encodes less than 2^10.
-	const MAX_VESTING_SCHEDULES: u32 = 28;
-}
diff --git a/runtime/darwinia/src/weights.rs b/runtime/darwinia/src/weights.rs
index ba4944ffb..da705e8b2 100644
--- a/runtime/darwinia/src/weights.rs
+++ b/runtime/darwinia/src/weights.rs
@@ -30,7 +30,6 @@ pub mod pallet_balances;
 pub mod pallet_collective;
 pub mod pallet_conviction_voting;
 pub mod pallet_democracy;
-pub mod pallet_identity;
 pub mod pallet_preimage;
 pub mod pallet_proxy;
 pub mod pallet_referenda;
@@ -39,5 +38,4 @@ pub mod pallet_session;
 pub mod pallet_timestamp;
 pub mod pallet_treasury;
 pub mod pallet_utility;
-pub mod pallet_vesting;
 pub mod pallet_whitelist;
diff --git a/runtime/darwinia/src/weights/pallet_identity.rs b/runtime/darwinia/src/weights/pallet_identity.rs
deleted file mode 100644
index 4b9e99c3e..000000000
--- a/runtime/darwinia/src/weights/pallet_identity.rs
+++ /dev/null
@@ -1,364 +0,0 @@
-// This file is part of Darwinia.
-//
-// Copyright (C) Darwinia Network
-// SPDX-License-Identifier: GPL-3.0
-//
-// Darwinia is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Darwinia is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Darwinia. If not, see <https://www.gnu.org/licenses/>.
-
-//! Autogenerated weights for `pallet_identity`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-04-17, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("darwinia-dev")`, DB CACHE: 1024
-
-// Executed Command:
-// target/release/darwinia
-// benchmark
-// pallet
-// --header
-// .maintain/license-header
-// --heap-pages
-// 4096
-// --chain
-// darwinia-dev
-// --output
-// runtime/darwinia/src/weights
-// --pallet
-// *
-// --extrinsic
-// *
-// --steps
-// 50
-// --repeat
-// 20
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `pallet_identity`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_identity::WeightInfo for WeightInfo<T> {
-	/// Storage: `Identity::Registrars` (r:1 w:1)
-	/// Proof: `Identity::Registrars` (`max_values`: Some(1), `max_size`: Some(901), added: 1396, mode: `MaxEncodedLen`)
-	/// The range of component `r` is `[1, 19]`.
-	fn add_registrar(r: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `31 + r * (45 ±0)`
-		//  Estimated: `2386`
-		// Minimum execution time: 8_000_000 picoseconds.
-		Weight::from_parts(10_431_499, 0)
-			.saturating_add(Weight::from_parts(0, 2386))
-			// Standard Error: 8_891
-			.saturating_add(Weight::from_parts(108_876, 0).saturating_mul(r.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Identity::IdentityOf` (r:1 w:1)
-	/// Proof: `Identity::IdentityOf` (`max_values`: None, `max_size`: Some(7526), added: 10001, mode: `MaxEncodedLen`)
-	/// The range of component `r` is `[1, 20]`.
-	/// The range of component `x` is `[0, 100]`.
-	fn set_identity(r: u32, x: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `429 + r * (5 ±0)`
-		//  Estimated: `10991`
-		// Minimum execution time: 26_000_000 picoseconds.
-		Weight::from_parts(28_813_478, 0)
-			.saturating_add(Weight::from_parts(0, 10991))
-			// Standard Error: 28_191
-			.saturating_add(Weight::from_parts(162_792, 0).saturating_mul(r.into()))
-			// Standard Error: 5_500
-			.saturating_add(Weight::from_parts(576_899, 0).saturating_mul(x.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Identity::IdentityOf` (r:1 w:0)
-	/// Proof: `Identity::IdentityOf` (`max_values`: None, `max_size`: Some(7526), added: 10001, mode: `MaxEncodedLen`)
-	/// Storage: `Identity::SubsOf` (r:1 w:1)
-	/// Proof: `Identity::SubsOf` (`max_values`: None, `max_size`: Some(2046), added: 4521, mode: `MaxEncodedLen`)
-	/// Storage: `Identity::SuperOf` (r:100 w:100)
-	/// Proof: `Identity::SuperOf` (`max_values`: None, `max_size`: Some(90), added: 2565, mode: `MaxEncodedLen`)
-	/// The range of component `s` is `[0, 100]`.
-	fn set_subs_new(s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `88`
-		//  Estimated: `10991 + s * (2565 ±0)`
-		// Minimum execution time: 7_000_000 picoseconds.
-		Weight::from_parts(20_424_688, 0)
-			.saturating_add(Weight::from_parts(0, 10991))
-			// Standard Error: 22_167
-			.saturating_add(Weight::from_parts(3_246_351, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(s.into())))
-			.saturating_add(T::DbWeight::get().writes(1))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s.into())))
-			.saturating_add(Weight::from_parts(0, 2565).saturating_mul(s.into()))
-	}
-	/// Storage: `Identity::IdentityOf` (r:1 w:0)
-	/// Proof: `Identity::IdentityOf` (`max_values`: None, `max_size`: Some(7526), added: 10001, mode: `MaxEncodedLen`)
-	/// Storage: `Identity::SubsOf` (r:1 w:1)
-	/// Proof: `Identity::SubsOf` (`max_values`: None, `max_size`: Some(2046), added: 4521, mode: `MaxEncodedLen`)
-	/// Storage: `Identity::SuperOf` (r:0 w:100)
-	/// Proof: `Identity::SuperOf` (`max_values`: None, `max_size`: Some(90), added: 2565, mode: `MaxEncodedLen`)
-	/// The range of component `p` is `[0, 100]`.
-	fn set_subs_old(p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `168 + p * (20 ±0)`
-		//  Estimated: `10991`
-		// Minimum execution time: 7_000_000 picoseconds.
-		Weight::from_parts(19_308_458, 0)
-			.saturating_add(Weight::from_parts(0, 10991))
-			// Standard Error: 9_992
-			.saturating_add(Weight::from_parts(1_389_207, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(p.into())))
-	}
-	/// Storage: `Identity::SubsOf` (r:1 w:1)
-	/// Proof: `Identity::SubsOf` (`max_values`: None, `max_size`: Some(2046), added: 4521, mode: `MaxEncodedLen`)
-	/// Storage: `Identity::IdentityOf` (r:1 w:1)
-	/// Proof: `Identity::IdentityOf` (`max_values`: None, `max_size`: Some(7526), added: 10001, mode: `MaxEncodedLen`)
-	/// Storage: `Identity::SuperOf` (r:0 w:100)
-	/// Proof: `Identity::SuperOf` (`max_values`: None, `max_size`: Some(90), added: 2565, mode: `MaxEncodedLen`)
-	/// The range of component `r` is `[1, 20]`.
-	/// The range of component `s` is `[0, 100]`.
-	/// The range of component `x` is `[0, 100]`.
-	fn clear_identity(r: u32, s: u32, x: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `444 + r * (5 ±0) + s * (20 ±0) + x * (66 ±0)`
-		//  Estimated: `10991`
-		// Minimum execution time: 51_000_000 picoseconds.
-		Weight::from_parts(27_217_205, 0)
-			.saturating_add(Weight::from_parts(0, 10991))
-			// Standard Error: 57_633
-			.saturating_add(Weight::from_parts(206_318, 0).saturating_mul(r.into()))
-			// Standard Error: 11_254
-			.saturating_add(Weight::from_parts(1_368_459, 0).saturating_mul(s.into()))
-			// Standard Error: 11_254
-			.saturating_add(Weight::from_parts(333_160, 0).saturating_mul(x.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s.into())))
-	}
-	/// Storage: `Identity::Registrars` (r:1 w:0)
-	/// Proof: `Identity::Registrars` (`max_values`: Some(1), `max_size`: Some(901), added: 1396, mode: `MaxEncodedLen`)
-	/// Storage: `Identity::IdentityOf` (r:1 w:1)
-	/// Proof: `Identity::IdentityOf` (`max_values`: None, `max_size`: Some(7526), added: 10001, mode: `MaxEncodedLen`)
-	/// The range of component `r` is `[1, 20]`.
-	/// The range of component `x` is `[0, 100]`.
-	fn request_judgement(r: u32, x: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `354 + r * (45 ±0) + x * (66 ±0)`
-		//  Estimated: `10991`
-		// Minimum execution time: 27_000_000 picoseconds.
-		Weight::from_parts(29_401_315, 0)
-			.saturating_add(Weight::from_parts(0, 10991))
-			// Standard Error: 30_410
-			.saturating_add(Weight::from_parts(88_613, 0).saturating_mul(r.into()))
-			// Standard Error: 5_933
-			.saturating_add(Weight::from_parts(587_193, 0).saturating_mul(x.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Identity::IdentityOf` (r:1 w:1)
-	/// Proof: `Identity::IdentityOf` (`max_values`: None, `max_size`: Some(7526), added: 10001, mode: `MaxEncodedLen`)
-	/// The range of component `r` is `[1, 20]`.
-	/// The range of component `x` is `[0, 100]`.
-	fn cancel_request(r: u32, x: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `385 + x * (66 ±0)`
-		//  Estimated: `10991`
-		// Minimum execution time: 24_000_000 picoseconds.
-		Weight::from_parts(25_468_758, 0)
-			.saturating_add(Weight::from_parts(0, 10991))
-			// Standard Error: 30_467
-			.saturating_add(Weight::from_parts(100_376, 0).saturating_mul(r.into()))
-			// Standard Error: 5_944
-			.saturating_add(Weight::from_parts(587_340, 0).saturating_mul(x.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Identity::Registrars` (r:1 w:1)
-	/// Proof: `Identity::Registrars` (`max_values`: Some(1), `max_size`: Some(901), added: 1396, mode: `MaxEncodedLen`)
-	/// The range of component `r` is `[1, 19]`.
-	fn set_fee(r: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `76 + r * (45 ±0)`
-		//  Estimated: `2386`
-		// Minimum execution time: 5_000_000 picoseconds.
-		Weight::from_parts(6_261_555, 0)
-			.saturating_add(Weight::from_parts(0, 2386))
-			// Standard Error: 5_024
-			.saturating_add(Weight::from_parts(102_357, 0).saturating_mul(r.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Identity::Registrars` (r:1 w:1)
-	/// Proof: `Identity::Registrars` (`max_values`: Some(1), `max_size`: Some(901), added: 1396, mode: `MaxEncodedLen`)
-	/// The range of component `r` is `[1, 19]`.
-	fn set_account_id(r: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `76 + r * (45 ±0)`
-		//  Estimated: `2386`
-		// Minimum execution time: 5_000_000 picoseconds.
-		Weight::from_parts(6_522_015, 0)
-			.saturating_add(Weight::from_parts(0, 2386))
-			// Standard Error: 5_879
-			.saturating_add(Weight::from_parts(97_477, 0).saturating_mul(r.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Identity::Registrars` (r:1 w:1)
-	/// Proof: `Identity::Registrars` (`max_values`: Some(1), `max_size`: Some(901), added: 1396, mode: `MaxEncodedLen`)
-	/// The range of component `r` is `[1, 19]`.
-	fn set_fields(r: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `76 + r * (45 ±0)`
-		//  Estimated: `2386`
-		// Minimum execution time: 5_000_000 picoseconds.
-		Weight::from_parts(6_732_836, 0)
-			.saturating_add(Weight::from_parts(0, 2386))
-			// Standard Error: 6_224
-			.saturating_add(Weight::from_parts(83_945, 0).saturating_mul(r.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Identity::Registrars` (r:1 w:0)
-	/// Proof: `Identity::Registrars` (`max_values`: Some(1), `max_size`: Some(901), added: 1396, mode: `MaxEncodedLen`)
-	/// Storage: `Identity::IdentityOf` (r:1 w:1)
-	/// Proof: `Identity::IdentityOf` (`max_values`: None, `max_size`: Some(7526), added: 10001, mode: `MaxEncodedLen`)
-	/// The range of component `r` is `[1, 19]`.
-	/// The range of component `x` is `[0, 100]`.
-	fn provide_judgement(r: u32, x: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `420 + r * (45 ±0) + x * (66 ±0)`
-		//  Estimated: `10991`
-		// Minimum execution time: 17_000_000 picoseconds.
-		Weight::from_parts(19_286_728, 0)
-			.saturating_add(Weight::from_parts(0, 10991))
-			// Standard Error: 37_431
-			.saturating_add(Weight::from_parts(67_424, 0).saturating_mul(r.into()))
-			// Standard Error: 6_925
-			.saturating_add(Weight::from_parts(903_809, 0).saturating_mul(x.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Identity::SubsOf` (r:1 w:1)
-	/// Proof: `Identity::SubsOf` (`max_values`: None, `max_size`: Some(2046), added: 4521, mode: `MaxEncodedLen`)
-	/// Storage: `Identity::IdentityOf` (r:1 w:1)
-	/// Proof: `Identity::IdentityOf` (`max_values`: None, `max_size`: Some(7526), added: 10001, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:2 w:2)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(116), added: 2591, mode: `MaxEncodedLen`)
-	/// Storage: `Identity::SuperOf` (r:0 w:100)
-	/// Proof: `Identity::SuperOf` (`max_values`: None, `max_size`: Some(90), added: 2565, mode: `MaxEncodedLen`)
-	/// The range of component `r` is `[1, 20]`.
-	/// The range of component `s` is `[0, 100]`.
-	/// The range of component `x` is `[0, 100]`.
-	fn kill_identity(r: u32, s: u32, x: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `708 + r * (11 ±0) + s * (20 ±0) + x * (66 ±0)`
-		//  Estimated: `10991`
-		// Minimum execution time: 72_000_000 picoseconds.
-		Weight::from_parts(38_244_099, 0)
-			.saturating_add(Weight::from_parts(0, 10991))
-			// Standard Error: 63_698
-			.saturating_add(Weight::from_parts(457_406, 0).saturating_mul(r.into()))
-			// Standard Error: 12_439
-			.saturating_add(Weight::from_parts(1_358_142, 0).saturating_mul(s.into()))
-			// Standard Error: 12_439
-			.saturating_add(Weight::from_parts(388_211, 0).saturating_mul(x.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(4))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s.into())))
-	}
-	/// Storage: `Identity::IdentityOf` (r:1 w:0)
-	/// Proof: `Identity::IdentityOf` (`max_values`: None, `max_size`: Some(7526), added: 10001, mode: `MaxEncodedLen`)
-	/// Storage: `Identity::SuperOf` (r:1 w:1)
-	/// Proof: `Identity::SuperOf` (`max_values`: None, `max_size`: Some(90), added: 2565, mode: `MaxEncodedLen`)
-	/// Storage: `Identity::SubsOf` (r:1 w:1)
-	/// Proof: `Identity::SubsOf` (`max_values`: None, `max_size`: Some(2046), added: 4521, mode: `MaxEncodedLen`)
-	/// The range of component `s` is `[0, 99]`.
-	fn add_sub(s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `535 + s * (23 ±0)`
-		//  Estimated: `10991`
-		// Minimum execution time: 23_000_000 picoseconds.
-		Weight::from_parts(29_533_107, 0)
-			.saturating_add(Weight::from_parts(0, 10991))
-			// Standard Error: 5_076
-			.saturating_add(Weight::from_parts(50_446, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `Identity::IdentityOf` (r:1 w:0)
-	/// Proof: `Identity::IdentityOf` (`max_values`: None, `max_size`: Some(7526), added: 10001, mode: `MaxEncodedLen`)
-	/// Storage: `Identity::SuperOf` (r:1 w:1)
-	/// Proof: `Identity::SuperOf` (`max_values`: None, `max_size`: Some(90), added: 2565, mode: `MaxEncodedLen`)
-	/// The range of component `s` is `[1, 100]`.
-	fn rename_sub(s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `614 + s * (4 ±0)`
-		//  Estimated: `10991`
-		// Minimum execution time: 9_000_000 picoseconds.
-		Weight::from_parts(12_553_386, 0)
-			.saturating_add(Weight::from_parts(0, 10991))
-			// Standard Error: 2_277
-			.saturating_add(Weight::from_parts(19_324, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Identity::IdentityOf` (r:1 w:0)
-	/// Proof: `Identity::IdentityOf` (`max_values`: None, `max_size`: Some(7526), added: 10001, mode: `MaxEncodedLen`)
-	/// Storage: `Identity::SuperOf` (r:1 w:1)
-	/// Proof: `Identity::SuperOf` (`max_values`: None, `max_size`: Some(90), added: 2565, mode: `MaxEncodedLen`)
-	/// Storage: `Identity::SubsOf` (r:1 w:1)
-	/// Proof: `Identity::SubsOf` (`max_values`: None, `max_size`: Some(2046), added: 4521, mode: `MaxEncodedLen`)
-	/// The range of component `s` is `[1, 100]`.
-	fn remove_sub(s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `646 + s * (24 ±0)`
-		//  Estimated: `10991`
-		// Minimum execution time: 26_000_000 picoseconds.
-		Weight::from_parts(32_062_057, 0)
-			.saturating_add(Weight::from_parts(0, 10991))
-			// Standard Error: 4_766
-			.saturating_add(Weight::from_parts(37_343, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `Identity::SuperOf` (r:1 w:1)
-	/// Proof: `Identity::SuperOf` (`max_values`: None, `max_size`: Some(90), added: 2565, mode: `MaxEncodedLen`)
-	/// Storage: `Identity::SubsOf` (r:1 w:1)
-	/// Proof: `Identity::SubsOf` (`max_values`: None, `max_size`: Some(2046), added: 4521, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:0)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(116), added: 2591, mode: `MaxEncodedLen`)
-	/// The range of component `s` is `[0, 99]`.
-	fn quit_sub(s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `658 + s * (24 ±0)`
-		//  Estimated: `5511`
-		// Minimum execution time: 18_000_000 picoseconds.
-		Weight::from_parts(21_742_498, 0)
-			.saturating_add(Weight::from_parts(0, 5511))
-			// Standard Error: 3_785
-			.saturating_add(Weight::from_parts(33_445, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-}
diff --git a/runtime/darwinia/src/weights/pallet_vesting.rs b/runtime/darwinia/src/weights/pallet_vesting.rs
deleted file mode 100644
index 93b0d10f9..000000000
--- a/runtime/darwinia/src/weights/pallet_vesting.rs
+++ /dev/null
@@ -1,246 +0,0 @@
-// This file is part of Darwinia.
-//
-// Copyright (C) Darwinia Network
-// SPDX-License-Identifier: GPL-3.0
-//
-// Darwinia is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Darwinia is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Darwinia. If not, see <https://www.gnu.org/licenses/>.
-
-//! Autogenerated weights for `pallet_vesting`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-04-17, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("darwinia-dev")`, DB CACHE: 1024
-
-// Executed Command:
-// target/release/darwinia
-// benchmark
-// pallet
-// --header
-// .maintain/license-header
-// --heap-pages
-// 4096
-// --chain
-// darwinia-dev
-// --output
-// runtime/darwinia/src/weights
-// --pallet
-// *
-// --extrinsic
-// *
-// --steps
-// 50
-// --repeat
-// 20
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `pallet_vesting`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_vesting::WeightInfo for WeightInfo<T> {
-	/// Storage: `Vesting::Vesting` (r:1 w:1)
-	/// Proof: `Vesting::Vesting` (`max_values`: None, `max_size`: Some(1045), added: 3520, mode: `MaxEncodedLen`)
-	/// Storage: `Balances::Locks` (r:1 w:1)
-	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1287), added: 3762, mode: `MaxEncodedLen`)
-	/// Storage: `Balances::Freezes` (r:1 w:0)
-	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(37), added: 2512, mode: `MaxEncodedLen`)
-	/// The range of component `l` is `[0, 49]`.
-	/// The range of component `s` is `[1, 28]`.
-	fn vest_locked(l: u32, s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `179 + l * (25 ±0) + s * (36 ±0)`
-		//  Estimated: `4752`
-		// Minimum execution time: 27_000_000 picoseconds.
-		Weight::from_parts(31_624_345, 0)
-			.saturating_add(Weight::from_parts(0, 4752))
-			// Standard Error: 3_890
-			.saturating_add(Weight::from_parts(24_452, 0).saturating_mul(l.into()))
-			// Standard Error: 6_921
-			.saturating_add(Weight::from_parts(59_810, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `Vesting::Vesting` (r:1 w:1)
-	/// Proof: `Vesting::Vesting` (`max_values`: None, `max_size`: Some(1045), added: 3520, mode: `MaxEncodedLen`)
-	/// Storage: `Balances::Locks` (r:1 w:1)
-	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1287), added: 3762, mode: `MaxEncodedLen`)
-	/// Storage: `Balances::Freezes` (r:1 w:0)
-	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(37), added: 2512, mode: `MaxEncodedLen`)
-	/// The range of component `l` is `[0, 49]`.
-	/// The range of component `s` is `[1, 28]`.
-	fn vest_unlocked(l: u32, s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `179 + l * (25 ±0) + s * (36 ±0)`
-		//  Estimated: `4752`
-		// Minimum execution time: 29_000_000 picoseconds.
-		Weight::from_parts(35_134_578, 0)
-			.saturating_add(Weight::from_parts(0, 4752))
-			// Standard Error: 4_896
-			.saturating_add(Weight::from_parts(17_475, 0).saturating_mul(l.into()))
-			// Standard Error: 8_710
-			.saturating_add(Weight::from_parts(81_152, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `Vesting::Vesting` (r:1 w:1)
-	/// Proof: `Vesting::Vesting` (`max_values`: None, `max_size`: Some(1045), added: 3520, mode: `MaxEncodedLen`)
-	/// Storage: `Balances::Locks` (r:1 w:1)
-	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1287), added: 3762, mode: `MaxEncodedLen`)
-	/// Storage: `Balances::Freezes` (r:1 w:0)
-	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(37), added: 2512, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(116), added: 2591, mode: `MaxEncodedLen`)
-	/// The range of component `l` is `[0, 49]`.
-	/// The range of component `s` is `[1, 28]`.
-	fn vest_other_locked(l: u32, s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `341 + l * (25 ±0) + s * (36 ±0)`
-		//  Estimated: `4752`
-		// Minimum execution time: 27_000_000 picoseconds.
-		Weight::from_parts(30_572_199, 0)
-			.saturating_add(Weight::from_parts(0, 4752))
-			// Standard Error: 4_246
-			.saturating_add(Weight::from_parts(65_727, 0).saturating_mul(l.into()))
-			// Standard Error: 7_554
-			.saturating_add(Weight::from_parts(114_871, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: `Vesting::Vesting` (r:1 w:1)
-	/// Proof: `Vesting::Vesting` (`max_values`: None, `max_size`: Some(1045), added: 3520, mode: `MaxEncodedLen`)
-	/// Storage: `Balances::Locks` (r:1 w:1)
-	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1287), added: 3762, mode: `MaxEncodedLen`)
-	/// Storage: `Balances::Freezes` (r:1 w:0)
-	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(37), added: 2512, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(116), added: 2591, mode: `MaxEncodedLen`)
-	/// The range of component `l` is `[0, 49]`.
-	/// The range of component `s` is `[1, 28]`.
-	fn vest_other_unlocked(l: u32, s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `341 + l * (25 ±0) + s * (36 ±0)`
-		//  Estimated: `4752`
-		// Minimum execution time: 30_000_000 picoseconds.
-		Weight::from_parts(37_571_559, 0)
-			.saturating_add(Weight::from_parts(0, 4752))
-			// Standard Error: 4_426
-			.saturating_add(Weight::from_parts(27_134, 0).saturating_mul(l.into()))
-			// Standard Error: 7_875
-			.saturating_add(Weight::from_parts(33_297, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: `Vesting::Vesting` (r:1 w:1)
-	/// Proof: `Vesting::Vesting` (`max_values`: None, `max_size`: Some(1045), added: 3520, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(116), added: 2591, mode: `MaxEncodedLen`)
-	/// Storage: `Balances::Locks` (r:1 w:1)
-	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1287), added: 3762, mode: `MaxEncodedLen`)
-	/// Storage: `Balances::Freezes` (r:1 w:0)
-	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(37), added: 2512, mode: `MaxEncodedLen`)
-	/// The range of component `l` is `[0, 49]`.
-	/// The range of component `s` is `[0, 27]`.
-	fn vested_transfer(l: u32, s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `307 + l * (25 ±0) + s * (36 ±0)`
-		//  Estimated: `4752`
-		// Minimum execution time: 61_000_000 picoseconds.
-		Weight::from_parts(75_820_324, 0)
-			.saturating_add(Weight::from_parts(0, 4752))
-			// Standard Error: 7_432
-			.saturating_add(Weight::from_parts(16_895, 0).saturating_mul(l.into()))
-			// Standard Error: 13_223
-			.saturating_add(Weight::from_parts(69_337, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: `Vesting::Vesting` (r:1 w:1)
-	/// Proof: `Vesting::Vesting` (`max_values`: None, `max_size`: Some(1045), added: 3520, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:2 w:2)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(116), added: 2591, mode: `MaxEncodedLen`)
-	/// Storage: `Balances::Locks` (r:1 w:1)
-	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1287), added: 3762, mode: `MaxEncodedLen`)
-	/// Storage: `Balances::Freezes` (r:1 w:0)
-	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(37), added: 2512, mode: `MaxEncodedLen`)
-	/// The range of component `l` is `[0, 49]`.
-	/// The range of component `s` is `[0, 27]`.
-	fn force_vested_transfer(l: u32, s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `502 + l * (25 ±0) + s * (36 ±0)`
-		//  Estimated: `6172`
-		// Minimum execution time: 64_000_000 picoseconds.
-		Weight::from_parts(75_872_173, 0)
-			.saturating_add(Weight::from_parts(0, 6172))
-			// Standard Error: 6_619
-			.saturating_add(Weight::from_parts(39_297, 0).saturating_mul(l.into()))
-			// Standard Error: 11_777
-			.saturating_add(Weight::from_parts(90_532, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	/// Storage: `Vesting::Vesting` (r:1 w:1)
-	/// Proof: `Vesting::Vesting` (`max_values`: None, `max_size`: Some(1045), added: 3520, mode: `MaxEncodedLen`)
-	/// Storage: `Balances::Locks` (r:1 w:1)
-	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1287), added: 3762, mode: `MaxEncodedLen`)
-	/// Storage: `Balances::Freezes` (r:1 w:0)
-	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(37), added: 2512, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(116), added: 2591, mode: `MaxEncodedLen`)
-	/// The range of component `l` is `[0, 49]`.
-	/// The range of component `s` is `[2, 28]`.
-	fn not_unlocking_merge_schedules(l: u32, s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `345 + l * (25 ±0) + s * (36 ±0)`
-		//  Estimated: `4752`
-		// Minimum execution time: 29_000_000 picoseconds.
-		Weight::from_parts(33_759_261, 0)
-			.saturating_add(Weight::from_parts(0, 4752))
-			// Standard Error: 4_273
-			.saturating_add(Weight::from_parts(43_324, 0).saturating_mul(l.into()))
-			// Standard Error: 7_892
-			.saturating_add(Weight::from_parts(81_447, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: `Vesting::Vesting` (r:1 w:1)
-	/// Proof: `Vesting::Vesting` (`max_values`: None, `max_size`: Some(1045), added: 3520, mode: `MaxEncodedLen`)
-	/// Storage: `Balances::Locks` (r:1 w:1)
-	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1287), added: 3762, mode: `MaxEncodedLen`)
-	/// Storage: `Balances::Freezes` (r:1 w:0)
-	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(37), added: 2512, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(116), added: 2591, mode: `MaxEncodedLen`)
-	/// The range of component `l` is `[0, 49]`.
-	/// The range of component `s` is `[2, 28]`.
-	fn unlocking_merge_schedules(l: u32, s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `345 + l * (25 ±0) + s * (36 ±0)`
-		//  Estimated: `4752`
-		// Minimum execution time: 32_000_000 picoseconds.
-		Weight::from_parts(37_543_267, 0)
-			.saturating_add(Weight::from_parts(0, 4752))
-			// Standard Error: 4_630
-			.saturating_add(Weight::from_parts(34_466, 0).saturating_mul(l.into()))
-			// Standard Error: 8_551
-			.saturating_add(Weight::from_parts(97_228, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-}
diff --git a/runtime/koi/Cargo.toml b/runtime/koi/Cargo.toml
index 09e776173..d428e4a82 100644
--- a/runtime/koi/Cargo.toml
+++ b/runtime/koi/Cargo.toml
@@ -91,7 +91,6 @@ pallet-balances                            = { workspace = true }
 pallet-collective                          = { workspace = true }
 pallet-conviction-voting                   = { workspace = true }
 pallet-democracy                           = { workspace = true }
-pallet-identity                            = { workspace = true }
 pallet-preimage                            = { workspace = true }
 pallet-proxy                               = { workspace = true }
 pallet-referenda                           = { workspace = true }
@@ -213,7 +212,6 @@ std = [
 	"pallet-collective/std",
 	"pallet-conviction-voting/std",
 	"pallet-democracy/std",
-	"pallet-identity/std",
 	"pallet-preimage/std",
 	"pallet-proxy/std",
 	"pallet-referenda/std",
@@ -313,7 +311,6 @@ runtime-benchmarks = [
 	"pallet-collective/runtime-benchmarks",
 	"pallet-conviction-voting/runtime-benchmarks",
 	"pallet-democracy/runtime-benchmarks",
-	"pallet-identity/runtime-benchmarks",
 	"pallet-preimage/runtime-benchmarks",
 	"pallet-proxy/runtime-benchmarks",
 	"pallet-referenda/runtime-benchmarks",
@@ -373,7 +370,6 @@ try-runtime = [
 	"pallet-collective/try-runtime",
 	"pallet-conviction-voting/try-runtime",
 	"pallet-democracy/try-runtime",
-	"pallet-identity/try-runtime",
 	"pallet-preimage/try-runtime",
 	"pallet-proxy/try-runtime",
 	"pallet-referenda/try-runtime",
diff --git a/runtime/koi/src/lib.rs b/runtime/koi/src/lib.rs
index 0621e618c..8fa69e8aa 100644
--- a/runtime/koi/src/lib.rs
+++ b/runtime/koi/src/lib.rs
@@ -121,7 +121,7 @@ frame_support::construct_runtime! {
 		// Utility stuff.
 		Sudo: pallet_sudo = 19,
 		Utility: pallet_utility = 20,
-		Identity: pallet_identity = 21,
+		// Identity: pallet_identity = 21,
 		Scheduler: pallet_scheduler = 22,
 		Preimage: pallet_preimage = 23,
 		Proxy: pallet_proxy = 24,
@@ -157,7 +157,6 @@ frame_benchmarking::define_benchmarks! {
 	[pallet_balances, Balances]
 	[pallet_collective, TechnicalCommittee]
 	[pallet_conviction_voting, ConvictionVoting]
-	[pallet_identity, Identity]
 	[pallet_preimage, Preimage]
 	[pallet_proxy, Proxy]
 	[pallet_referenda, Referenda]
diff --git a/runtime/koi/src/pallets/identity.rs b/runtime/koi/src/pallets/identity.rs
deleted file mode 100644
index d6378b120..000000000
--- a/runtime/koi/src/pallets/identity.rs
+++ /dev/null
@@ -1,40 +0,0 @@
-// This file is part of Darwinia.
-//
-// Copyright (C) Darwinia Network
-// SPDX-License-Identifier: GPL-3.0
-//
-// Darwinia is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Darwinia is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Darwinia. If not, see <https://www.gnu.org/licenses/>.
-
-// darwinia
-use crate::*;
-
-impl pallet_identity::Config for Runtime {
-	//   27 | Min encoded size of `Registration`
-	// - 10 | Min encoded size of `IdentityInfo`
-	// -----|
-	//   17 | Min size without `IdentityInfo` (accounted for in byte deposit)
-	type BasicDeposit = ConstU128<{ darwinia_deposit(1, 17) }>;
-	type ByteDeposit = ConstU128<{ darwinia_deposit(0, 1) }>;
-	type Currency = Balances;
-	type ForceOrigin = RootOr<GeneralAdmin>;
-	type IdentityInformation = IdentityInfo<ConstU32<100>>;
-	type MaxRegistrars = ConstU32<20>;
-	type MaxSubAccounts = ConstU32<100>;
-	type RegistrarOrigin = RootOr<GeneralAdmin>;
-	type RuntimeEvent = RuntimeEvent;
-	type Slashed = Treasury;
-	// 53 bytes on-chain.
-	type SubAccountDeposit = ConstU128<{ darwinia_deposit(1, 53) }>;
-	type WeightInfo = weights::pallet_identity::WeightInfo<Self>;
-}
diff --git a/runtime/koi/src/pallets/proxy.rs b/runtime/koi/src/pallets/proxy.rs
index 282f2e22c..bc86e6327 100644
--- a/runtime/koi/src/pallets/proxy.rs
+++ b/runtime/koi/src/pallets/proxy.rs
@@ -42,13 +42,8 @@ pub enum ProxyType {
 	Governance,
 	#[codec(index = 3)]
 	Staking,
-	#[codec(index = 4)]
-	IdentityJudgement,
 	#[codec(index = 5)]
 	CancelProxy,
-	// TODO: Migration.
-	#[codec(index = 6)]
-	EcdsaBridge,
 }
 impl Default for ProxyType {
 	fn default() -> Self {
@@ -85,9 +80,6 @@ impl frame_support::traits::InstanceFilter<RuntimeCall> for ProxyType {
 						| RuntimeCall::DarwiniaStaking(..)
 				)
 			},
-			ProxyType::IdentityJudgement => {
-				matches!(c, RuntimeCall::Identity(pallet_identity::Call::provide_judgement { .. }))
-			},
 			ProxyType::CancelProxy => {
 				matches!(c, RuntimeCall::Proxy(pallet_proxy::Call::reject_announcement { .. }))
 			},
diff --git a/runtime/koi/src/pallets/tx_pause.rs b/runtime/koi/src/pallets/tx_pause.rs
index a1895c1f9..4ff419cf8 100644
--- a/runtime/koi/src/pallets/tx_pause.rs
+++ b/runtime/koi/src/pallets/tx_pause.rs
@@ -40,8 +40,8 @@ impl frame_support::traits::Contains<pallet_tx_pause::RuntimeCallNameOf<Runtime>
 		!matches!(
 			pallet,
 			b"Balances"
-				| b"Assets" | b"Vesting"
-				| b"Deposit" | b"DarwiniaStaking"
+				| b"Assets" | b"Deposit"
+				| b"DarwiniaStaking"
 				| b"Ethereum"
 				| b"EVM" | b"EthTxForwarder"
 		)
diff --git a/runtime/koi/src/weights.rs b/runtime/koi/src/weights.rs
index aa70513e0..6b3bf6bf4 100644
--- a/runtime/koi/src/weights.rs
+++ b/runtime/koi/src/weights.rs
@@ -28,7 +28,6 @@ pub mod pallet_assets;
 pub mod pallet_balances;
 pub mod pallet_collective;
 pub mod pallet_conviction_voting;
-pub mod pallet_identity;
 pub mod pallet_preimage;
 pub mod pallet_proxy;
 pub mod pallet_referenda;
diff --git a/runtime/koi/src/weights/pallet_identity.rs b/runtime/koi/src/weights/pallet_identity.rs
deleted file mode 100644
index c852ad93f..000000000
--- a/runtime/koi/src/weights/pallet_identity.rs
+++ /dev/null
@@ -1,360 +0,0 @@
-// This file is part of Darwinia.
-//
-// Copyright (C) Darwinia Network
-// SPDX-License-Identifier: GPL-3.0
-//
-// Darwinia is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Darwinia is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Darwinia. If not, see <https://www.gnu.org/licenses/>.
-
-//! Autogenerated weights for `pallet_identity`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-06-04, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("koi-dev")`, DB CACHE: 1024
-
-// Executed Command:
-// target/release/darwinia
-// benchmark
-// pallet
-// --header
-// .maintain/license-header
-// --heap-pages
-// 4096
-// --chain
-// koi-dev
-// --output
-// runtime/koi/src/weights
-// --pallet
-// *
-// --extrinsic
-// *
-// --steps
-// 50
-// --repeat
-// 20
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `pallet_identity`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_identity::WeightInfo for WeightInfo<T> {
-	/// Storage: `Identity::Registrars` (r:1 w:1)
-	/// Proof: `Identity::Registrars` (`max_values`: Some(1), `max_size`: Some(901), added: 1396, mode: `MaxEncodedLen`)
-	/// The range of component `r` is `[1, 19]`.
-	fn add_registrar(r: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `31 + r * (45 ±0)`
-		//  Estimated: `2386`
-		// Minimum execution time: 10_000_000 picoseconds.
-		Weight::from_parts(10_836_414, 0)
-			.saturating_add(Weight::from_parts(0, 2386))
-			// Standard Error: 3_187
-			.saturating_add(Weight::from_parts(47_855, 0).saturating_mul(r.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Identity::IdentityOf` (r:1 w:1)
-	/// Proof: `Identity::IdentityOf` (`max_values`: None, `max_size`: Some(7526), added: 10001, mode: `MaxEncodedLen`)
-	/// The range of component `r` is `[1, 20]`.
-	/// The range of component `x` is `[0, 100]`.
-	fn set_identity(_r: u32, x: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `429 + r * (5 ±0)`
-		//  Estimated: `10991`
-		// Minimum execution time: 28_000_000 picoseconds.
-		Weight::from_parts(29_229_318, 0)
-			.saturating_add(Weight::from_parts(0, 10991))
-			// Standard Error: 963
-			.saturating_add(Weight::from_parts(485_300, 0).saturating_mul(x.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Identity::IdentityOf` (r:1 w:0)
-	/// Proof: `Identity::IdentityOf` (`max_values`: None, `max_size`: Some(7526), added: 10001, mode: `MaxEncodedLen`)
-	/// Storage: `Identity::SubsOf` (r:1 w:1)
-	/// Proof: `Identity::SubsOf` (`max_values`: None, `max_size`: Some(2046), added: 4521, mode: `MaxEncodedLen`)
-	/// Storage: `Identity::SuperOf` (r:100 w:100)
-	/// Proof: `Identity::SuperOf` (`max_values`: None, `max_size`: Some(90), added: 2565, mode: `MaxEncodedLen`)
-	/// The range of component `s` is `[0, 100]`.
-	fn set_subs_new(s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `88`
-		//  Estimated: `10991 + s * (2565 ±0)`
-		// Minimum execution time: 7_000_000 picoseconds.
-		Weight::from_parts(22_136_623, 0)
-			.saturating_add(Weight::from_parts(0, 10991))
-			// Standard Error: 4_633
-			.saturating_add(Weight::from_parts(3_108_549, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(s.into())))
-			.saturating_add(T::DbWeight::get().writes(1))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s.into())))
-			.saturating_add(Weight::from_parts(0, 2565).saturating_mul(s.into()))
-	}
-	/// Storage: `Identity::IdentityOf` (r:1 w:0)
-	/// Proof: `Identity::IdentityOf` (`max_values`: None, `max_size`: Some(7526), added: 10001, mode: `MaxEncodedLen`)
-	/// Storage: `Identity::SubsOf` (r:1 w:1)
-	/// Proof: `Identity::SubsOf` (`max_values`: None, `max_size`: Some(2046), added: 4521, mode: `MaxEncodedLen`)
-	/// Storage: `Identity::SuperOf` (r:0 w:100)
-	/// Proof: `Identity::SuperOf` (`max_values`: None, `max_size`: Some(90), added: 2565, mode: `MaxEncodedLen`)
-	/// The range of component `p` is `[0, 100]`.
-	fn set_subs_old(p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `168 + p * (20 ±0)`
-		//  Estimated: `10991`
-		// Minimum execution time: 7_000_000 picoseconds.
-		Weight::from_parts(22_502_751, 0)
-			.saturating_add(Weight::from_parts(0, 10991))
-			// Standard Error: 4_370
-			.saturating_add(Weight::from_parts(1_264_160, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(p.into())))
-	}
-	/// Storage: `Identity::SubsOf` (r:1 w:1)
-	/// Proof: `Identity::SubsOf` (`max_values`: None, `max_size`: Some(2046), added: 4521, mode: `MaxEncodedLen`)
-	/// Storage: `Identity::IdentityOf` (r:1 w:1)
-	/// Proof: `Identity::IdentityOf` (`max_values`: None, `max_size`: Some(7526), added: 10001, mode: `MaxEncodedLen`)
-	/// Storage: `Identity::SuperOf` (r:0 w:100)
-	/// Proof: `Identity::SuperOf` (`max_values`: None, `max_size`: Some(90), added: 2565, mode: `MaxEncodedLen`)
-	/// The range of component `r` is `[1, 20]`.
-	/// The range of component `s` is `[0, 100]`.
-	/// The range of component `x` is `[0, 100]`.
-	fn clear_identity(r: u32, s: u32, x: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `444 + r * (5 ±0) + s * (20 ±0) + x * (66 ±0)`
-		//  Estimated: `10991`
-		// Minimum execution time: 54_000_000 picoseconds.
-		Weight::from_parts(21_790_050, 0)
-			.saturating_add(Weight::from_parts(0, 10991))
-			// Standard Error: 18_026
-			.saturating_add(Weight::from_parts(229_651, 0).saturating_mul(r.into()))
-			// Standard Error: 3_520
-			.saturating_add(Weight::from_parts(1_274_887, 0).saturating_mul(s.into()))
-			// Standard Error: 3_520
-			.saturating_add(Weight::from_parts(296_724, 0).saturating_mul(x.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s.into())))
-	}
-	/// Storage: `Identity::Registrars` (r:1 w:0)
-	/// Proof: `Identity::Registrars` (`max_values`: Some(1), `max_size`: Some(901), added: 1396, mode: `MaxEncodedLen`)
-	/// Storage: `Identity::IdentityOf` (r:1 w:1)
-	/// Proof: `Identity::IdentityOf` (`max_values`: None, `max_size`: Some(7526), added: 10001, mode: `MaxEncodedLen`)
-	/// The range of component `r` is `[1, 20]`.
-	/// The range of component `x` is `[0, 100]`.
-	fn request_judgement(r: u32, x: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `354 + r * (45 ±0) + x * (66 ±0)`
-		//  Estimated: `10991`
-		// Minimum execution time: 29_000_000 picoseconds.
-		Weight::from_parts(28_031_393, 0)
-			.saturating_add(Weight::from_parts(0, 10991))
-			// Standard Error: 4_475
-			.saturating_add(Weight::from_parts(39_810, 0).saturating_mul(r.into()))
-			// Standard Error: 873
-			.saturating_add(Weight::from_parts(503_919, 0).saturating_mul(x.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Identity::IdentityOf` (r:1 w:1)
-	/// Proof: `Identity::IdentityOf` (`max_values`: None, `max_size`: Some(7526), added: 10001, mode: `MaxEncodedLen`)
-	/// The range of component `r` is `[1, 20]`.
-	/// The range of component `x` is `[0, 100]`.
-	fn cancel_request(_r: u32, x: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `385 + x * (66 ±0)`
-		//  Estimated: `10991`
-		// Minimum execution time: 26_000_000 picoseconds.
-		Weight::from_parts(27_090_689, 0)
-			.saturating_add(Weight::from_parts(0, 10991))
-			// Standard Error: 821
-			.saturating_add(Weight::from_parts(496_195, 0).saturating_mul(x.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Identity::Registrars` (r:1 w:1)
-	/// Proof: `Identity::Registrars` (`max_values`: Some(1), `max_size`: Some(901), added: 1396, mode: `MaxEncodedLen`)
-	/// The range of component `r` is `[1, 19]`.
-	fn set_fee(r: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `76 + r * (45 ±0)`
-		//  Estimated: `2386`
-		// Minimum execution time: 6_000_000 picoseconds.
-		Weight::from_parts(6_869_532, 0)
-			.saturating_add(Weight::from_parts(0, 2386))
-			// Standard Error: 3_212
-			.saturating_add(Weight::from_parts(40_805, 0).saturating_mul(r.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Identity::Registrars` (r:1 w:1)
-	/// Proof: `Identity::Registrars` (`max_values`: Some(1), `max_size`: Some(901), added: 1396, mode: `MaxEncodedLen`)
-	/// The range of component `r` is `[1, 19]`.
-	fn set_account_id(r: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `76 + r * (45 ±0)`
-		//  Estimated: `2386`
-		// Minimum execution time: 5_000_000 picoseconds.
-		Weight::from_parts(6_154_445, 0)
-			.saturating_add(Weight::from_parts(0, 2386))
-			// Standard Error: 2_946
-			.saturating_add(Weight::from_parts(57_306, 0).saturating_mul(r.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Identity::Registrars` (r:1 w:1)
-	/// Proof: `Identity::Registrars` (`max_values`: Some(1), `max_size`: Some(901), added: 1396, mode: `MaxEncodedLen`)
-	/// The range of component `r` is `[1, 19]`.
-	fn set_fields(r: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `76 + r * (45 ±0)`
-		//  Estimated: `2386`
-		// Minimum execution time: 6_000_000 picoseconds.
-		Weight::from_parts(6_259_953, 0)
-			.saturating_add(Weight::from_parts(0, 2386))
-			// Standard Error: 3_472
-			.saturating_add(Weight::from_parts(43_072, 0).saturating_mul(r.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Identity::Registrars` (r:1 w:0)
-	/// Proof: `Identity::Registrars` (`max_values`: Some(1), `max_size`: Some(901), added: 1396, mode: `MaxEncodedLen`)
-	/// Storage: `Identity::IdentityOf` (r:1 w:1)
-	/// Proof: `Identity::IdentityOf` (`max_values`: None, `max_size`: Some(7526), added: 10001, mode: `MaxEncodedLen`)
-	/// The range of component `r` is `[1, 19]`.
-	/// The range of component `x` is `[0, 100]`.
-	fn provide_judgement(r: u32, x: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `420 + r * (45 ±0) + x * (66 ±0)`
-		//  Estimated: `10991`
-		// Minimum execution time: 18_000_000 picoseconds.
-		Weight::from_parts(16_389_688, 0)
-			.saturating_add(Weight::from_parts(0, 10991))
-			// Standard Error: 6_622
-			.saturating_add(Weight::from_parts(69_080, 0).saturating_mul(r.into()))
-			// Standard Error: 1_225
-			.saturating_add(Weight::from_parts(802_825, 0).saturating_mul(x.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Identity::SubsOf` (r:1 w:1)
-	/// Proof: `Identity::SubsOf` (`max_values`: None, `max_size`: Some(2046), added: 4521, mode: `MaxEncodedLen`)
-	/// Storage: `Identity::IdentityOf` (r:1 w:1)
-	/// Proof: `Identity::IdentityOf` (`max_values`: None, `max_size`: Some(7526), added: 10001, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:2 w:2)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(116), added: 2591, mode: `MaxEncodedLen`)
-	/// Storage: `Identity::SuperOf` (r:0 w:100)
-	/// Proof: `Identity::SuperOf` (`max_values`: None, `max_size`: Some(90), added: 2565, mode: `MaxEncodedLen`)
-	/// The range of component `r` is `[1, 20]`.
-	/// The range of component `s` is `[0, 100]`.
-	/// The range of component `x` is `[0, 100]`.
-	fn kill_identity(r: u32, s: u32, x: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `742 + r * (11 ±0) + s * (20 ±0) + x * (66 ±0)`
-		//  Estimated: `10991`
-		// Minimum execution time: 71_000_000 picoseconds.
-		Weight::from_parts(45_670_093, 0)
-			.saturating_add(Weight::from_parts(0, 10991))
-			// Standard Error: 13_670
-			.saturating_add(Weight::from_parts(169_624, 0).saturating_mul(r.into()))
-			// Standard Error: 2_669
-			.saturating_add(Weight::from_parts(1_259_231, 0).saturating_mul(s.into()))
-			// Standard Error: 2_669
-			.saturating_add(Weight::from_parts(265_371, 0).saturating_mul(x.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(4))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s.into())))
-	}
-	/// Storage: `Identity::IdentityOf` (r:1 w:0)
-	/// Proof: `Identity::IdentityOf` (`max_values`: None, `max_size`: Some(7526), added: 10001, mode: `MaxEncodedLen`)
-	/// Storage: `Identity::SuperOf` (r:1 w:1)
-	/// Proof: `Identity::SuperOf` (`max_values`: None, `max_size`: Some(90), added: 2565, mode: `MaxEncodedLen`)
-	/// Storage: `Identity::SubsOf` (r:1 w:1)
-	/// Proof: `Identity::SubsOf` (`max_values`: None, `max_size`: Some(2046), added: 4521, mode: `MaxEncodedLen`)
-	/// The range of component `s` is `[0, 99]`.
-	fn add_sub(s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `535 + s * (23 ±0)`
-		//  Estimated: `10991`
-		// Minimum execution time: 27_000_000 picoseconds.
-		Weight::from_parts(30_282_830, 0)
-			.saturating_add(Weight::from_parts(0, 10991))
-			// Standard Error: 1_077
-			.saturating_add(Weight::from_parts(4_756, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `Identity::IdentityOf` (r:1 w:0)
-	/// Proof: `Identity::IdentityOf` (`max_values`: None, `max_size`: Some(7526), added: 10001, mode: `MaxEncodedLen`)
-	/// Storage: `Identity::SuperOf` (r:1 w:1)
-	/// Proof: `Identity::SuperOf` (`max_values`: None, `max_size`: Some(90), added: 2565, mode: `MaxEncodedLen`)
-	/// The range of component `s` is `[1, 100]`.
-	fn rename_sub(s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `614 + s * (4 ±0)`
-		//  Estimated: `10991`
-		// Minimum execution time: 10_000_000 picoseconds.
-		Weight::from_parts(11_569_787, 0)
-			.saturating_add(Weight::from_parts(0, 10991))
-			// Standard Error: 606
-			.saturating_add(Weight::from_parts(9_680, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Identity::IdentityOf` (r:1 w:0)
-	/// Proof: `Identity::IdentityOf` (`max_values`: None, `max_size`: Some(7526), added: 10001, mode: `MaxEncodedLen`)
-	/// Storage: `Identity::SuperOf` (r:1 w:1)
-	/// Proof: `Identity::SuperOf` (`max_values`: None, `max_size`: Some(90), added: 2565, mode: `MaxEncodedLen`)
-	/// Storage: `Identity::SubsOf` (r:1 w:1)
-	/// Proof: `Identity::SubsOf` (`max_values`: None, `max_size`: Some(2046), added: 4521, mode: `MaxEncodedLen`)
-	/// The range of component `s` is `[1, 100]`.
-	fn remove_sub(s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `646 + s * (24 ±0)`
-		//  Estimated: `10991`
-		// Minimum execution time: 29_000_000 picoseconds.
-		Weight::from_parts(31_095_541, 0)
-			.saturating_add(Weight::from_parts(0, 10991))
-			// Standard Error: 977
-			.saturating_add(Weight::from_parts(14_603, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `Identity::SuperOf` (r:1 w:1)
-	/// Proof: `Identity::SuperOf` (`max_values`: None, `max_size`: Some(90), added: 2565, mode: `MaxEncodedLen`)
-	/// Storage: `Identity::SubsOf` (r:1 w:1)
-	/// Proof: `Identity::SubsOf` (`max_values`: None, `max_size`: Some(2046), added: 4521, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:0)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(116), added: 2591, mode: `MaxEncodedLen`)
-	/// The range of component `s` is `[0, 99]`.
-	fn quit_sub(s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `658 + s * (24 ±0)`
-		//  Estimated: `5511`
-		// Minimum execution time: 20_000_000 picoseconds.
-		Weight::from_parts(21_511_500, 0)
-			.saturating_add(Weight::from_parts(0, 5511))
-			// Standard Error: 881
-			.saturating_add(Weight::from_parts(10_414, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-}

From 0631441669b574276742042883aeef5b99214dfb Mon Sep 17 00:00:00 2001
From: Xavier Lau <xavier@inv.cafe>
Date: Mon, 24 Jun 2024 10:30:08 +0800
Subject: [PATCH 17/59] Fixes

---
 runtime/crab/src/pallets/balances.rs     | 2 +-
 runtime/darwinia/src/pallets/balances.rs | 2 +-
 runtime/koi/src/pallets/balances.rs      | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/runtime/crab/src/pallets/balances.rs b/runtime/crab/src/pallets/balances.rs
index 5dfd17cd9..31a9ffd81 100644
--- a/runtime/crab/src/pallets/balances.rs
+++ b/runtime/crab/src/pallets/balances.rs
@@ -32,6 +32,6 @@ impl pallet_balances::Config for Runtime {
 	type ReserveIdentifier = [u8; 8];
 	type RuntimeEvent = RuntimeEvent;
 	type RuntimeFreezeReason = RuntimeFreezeReason;
-	type RuntimeHoldReason = ();
+	type RuntimeHoldReason = RuntimeHoldReason;
 	type WeightInfo = weights::pallet_balances::WeightInfo<Self>;
 }
diff --git a/runtime/darwinia/src/pallets/balances.rs b/runtime/darwinia/src/pallets/balances.rs
index 5dfd17cd9..31a9ffd81 100644
--- a/runtime/darwinia/src/pallets/balances.rs
+++ b/runtime/darwinia/src/pallets/balances.rs
@@ -32,6 +32,6 @@ impl pallet_balances::Config for Runtime {
 	type ReserveIdentifier = [u8; 8];
 	type RuntimeEvent = RuntimeEvent;
 	type RuntimeFreezeReason = RuntimeFreezeReason;
-	type RuntimeHoldReason = ();
+	type RuntimeHoldReason = RuntimeHoldReason;
 	type WeightInfo = weights::pallet_balances::WeightInfo<Self>;
 }
diff --git a/runtime/koi/src/pallets/balances.rs b/runtime/koi/src/pallets/balances.rs
index 5dfd17cd9..31a9ffd81 100644
--- a/runtime/koi/src/pallets/balances.rs
+++ b/runtime/koi/src/pallets/balances.rs
@@ -32,6 +32,6 @@ impl pallet_balances::Config for Runtime {
 	type ReserveIdentifier = [u8; 8];
 	type RuntimeEvent = RuntimeEvent;
 	type RuntimeFreezeReason = RuntimeFreezeReason;
-	type RuntimeHoldReason = ();
+	type RuntimeHoldReason = RuntimeHoldReason;
 	type WeightInfo = weights::pallet_balances::WeightInfo<Self>;
 }

From 0357ab3ff6bb8fc158a00ee8d2218f3e8d49ceb6 Mon Sep 17 00:00:00 2001
From: Xavier Lau <xavier@inv.cafe>
Date: Mon, 24 Jun 2024 10:34:01 +0800
Subject: [PATCH 18/59] paritytech/polkadot-sdk#2657

---
 pallet/account-migration/src/mock.rs     | 1 -
 pallet/deposit/src/mock.rs               | 1 -
 pallet/ethtx-forwarder/src/mock.rs       | 1 -
 pallet/staking/src/mock.rs               | 1 -
 precompile/assets/src/mock.rs            | 1 -
 precompile/deposit/src/mock.rs           | 1 -
 precompile/staking/src/mock.rs           | 1 -
 precompile/state-storage/src/mock.rs     | 1 -
 runtime/crab/src/pallets/balances.rs     | 1 -
 runtime/darwinia/src/pallets/balances.rs | 1 -
 runtime/koi/src/pallets/balances.rs      | 1 -
 11 files changed, 11 deletions(-)

diff --git a/pallet/account-migration/src/mock.rs b/pallet/account-migration/src/mock.rs
index cd3726560..5c98fdb0b 100644
--- a/pallet/account-migration/src/mock.rs
+++ b/pallet/account-migration/src/mock.rs
@@ -102,7 +102,6 @@ impl pallet_balances::Config for Runtime {
 	type ExistentialDeposit = ();
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
-	type MaxHolds = ();
 	type MaxLocks = ();
 	type MaxReserves = ();
 	type ReserveIdentifier = [u8; 8];
diff --git a/pallet/deposit/src/mock.rs b/pallet/deposit/src/mock.rs
index 2d6b6dca0..823b33f34 100644
--- a/pallet/deposit/src/mock.rs
+++ b/pallet/deposit/src/mock.rs
@@ -63,7 +63,6 @@ impl pallet_balances::Config for Runtime {
 	type ExistentialDeposit = frame_support::traits::ConstU128<0>;
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
-	type MaxHolds = ();
 	type MaxLocks = ();
 	type MaxReserves = ();
 	type ReserveIdentifier = [u8; 8];
diff --git a/pallet/ethtx-forwarder/src/mock.rs b/pallet/ethtx-forwarder/src/mock.rs
index 5a8b07b58..9ae350309 100644
--- a/pallet/ethtx-forwarder/src/mock.rs
+++ b/pallet/ethtx-forwarder/src/mock.rs
@@ -66,7 +66,6 @@ impl pallet_balances::Config for Runtime {
 	type ExistentialDeposit = ();
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
-	type MaxHolds = ();
 	type MaxLocks = ();
 	type MaxReserves = ();
 	type ReserveIdentifier = [u8; 8];
diff --git a/pallet/staking/src/mock.rs b/pallet/staking/src/mock.rs
index 2891070f8..1ad7c95db 100644
--- a/pallet/staking/src/mock.rs
+++ b/pallet/staking/src/mock.rs
@@ -68,7 +68,6 @@ impl pallet_balances::Config for Runtime {
 	type ExistentialDeposit = frame_support::traits::ConstU128<0>;
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
-	type MaxHolds = ();
 	type MaxLocks = ();
 	type MaxReserves = ();
 	type ReserveIdentifier = [u8; 8];
diff --git a/precompile/assets/src/mock.rs b/precompile/assets/src/mock.rs
index 811eb1462..85eea9303 100644
--- a/precompile/assets/src/mock.rs
+++ b/precompile/assets/src/mock.rs
@@ -95,7 +95,6 @@ impl pallet_balances::Config for Runtime {
 	type ExistentialDeposit = frame_support::traits::ConstU128<0>;
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
-	type MaxHolds = ();
 	type MaxLocks = ();
 	type MaxReserves = ();
 	type ReserveIdentifier = [u8; 8];
diff --git a/precompile/deposit/src/mock.rs b/precompile/deposit/src/mock.rs
index 2ee630efd..22bc31a59 100644
--- a/precompile/deposit/src/mock.rs
+++ b/precompile/deposit/src/mock.rs
@@ -80,7 +80,6 @@ impl pallet_balances::Config for Runtime {
 	type ExistentialDeposit = frame_support::traits::ConstU128<0>;
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
-	type MaxHolds = ();
 	type MaxLocks = ();
 	type MaxReserves = ();
 	type ReserveIdentifier = [u8; 8];
diff --git a/precompile/staking/src/mock.rs b/precompile/staking/src/mock.rs
index e9855f3e0..73c8f1c4c 100644
--- a/precompile/staking/src/mock.rs
+++ b/precompile/staking/src/mock.rs
@@ -83,7 +83,6 @@ impl pallet_balances::Config for Runtime {
 	type ExistentialDeposit = frame_support::traits::ConstU128<0>;
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
-	type MaxHolds = ();
 	type MaxLocks = ();
 	type MaxReserves = ();
 	type ReserveIdentifier = [u8; 8];
diff --git a/precompile/state-storage/src/mock.rs b/precompile/state-storage/src/mock.rs
index b560f2f01..f9ca6881c 100644
--- a/precompile/state-storage/src/mock.rs
+++ b/precompile/state-storage/src/mock.rs
@@ -81,7 +81,6 @@ impl pallet_balances::Config for Runtime {
 	type ExistentialDeposit = frame_support::traits::ConstU64<0>;
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
-	type MaxHolds = ();
 	type MaxLocks = ();
 	type MaxReserves = ();
 	type ReserveIdentifier = [u8; 8];
diff --git a/runtime/crab/src/pallets/balances.rs b/runtime/crab/src/pallets/balances.rs
index 31a9ffd81..35bfd308e 100644
--- a/runtime/crab/src/pallets/balances.rs
+++ b/runtime/crab/src/pallets/balances.rs
@@ -26,7 +26,6 @@ impl pallet_balances::Config for Runtime {
 	type ExistentialDeposit = pallet_config::ExistentialDeposit;
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
-	type MaxHolds = ConstU32<1>;
 	type MaxLocks = ConstU32<50>;
 	type MaxReserves = ConstU32<50>;
 	type ReserveIdentifier = [u8; 8];
diff --git a/runtime/darwinia/src/pallets/balances.rs b/runtime/darwinia/src/pallets/balances.rs
index 31a9ffd81..35bfd308e 100644
--- a/runtime/darwinia/src/pallets/balances.rs
+++ b/runtime/darwinia/src/pallets/balances.rs
@@ -26,7 +26,6 @@ impl pallet_balances::Config for Runtime {
 	type ExistentialDeposit = pallet_config::ExistentialDeposit;
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
-	type MaxHolds = ConstU32<1>;
 	type MaxLocks = ConstU32<50>;
 	type MaxReserves = ConstU32<50>;
 	type ReserveIdentifier = [u8; 8];
diff --git a/runtime/koi/src/pallets/balances.rs b/runtime/koi/src/pallets/balances.rs
index 31a9ffd81..35bfd308e 100644
--- a/runtime/koi/src/pallets/balances.rs
+++ b/runtime/koi/src/pallets/balances.rs
@@ -26,7 +26,6 @@ impl pallet_balances::Config for Runtime {
 	type ExistentialDeposit = pallet_config::ExistentialDeposit;
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
-	type MaxHolds = ConstU32<1>;
 	type MaxLocks = ConstU32<50>;
 	type MaxReserves = ConstU32<50>;
 	type ReserveIdentifier = [u8; 8];

From afe4ba36c386d6244ec0c347f1c66ce2b4d8eb47 Mon Sep 17 00:00:00 2001
From: Xavier Lau <xavier@inv.cafe>
Date: Mon, 24 Jun 2024 10:37:12 +0800
Subject: [PATCH 19/59] paritytech/polkadot-sdk#1313

---
 Cargo.lock      | 170 +++++++++++-------------------------------------
 node/Cargo.toml |   2 +-
 2 files changed, 38 insertions(+), 134 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 1b3300a37..a6c97e41a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1134,16 +1134,6 @@ dependencies = [
  "regex-automata 0.1.10",
 ]
 
-[[package]]
-name = "bstr"
-version = "1.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "05efc5cfd9110c8416e471df0e96702d58690178e206e61b7173706673c93706"
-dependencies = [
- "memchr",
- "serde",
-]
-
 [[package]]
 name = "build-helper"
 version = "0.1.1"
@@ -2430,7 +2420,7 @@ dependencies = [
  "async-trait",
  "cumulus-primitives-core",
  "futures 0.3.30",
- "jsonrpsee-core 0.20.3",
+ "jsonrpsee-core",
  "parity-scale-codec",
  "polkadot-overseer",
  "sc-client-api",
@@ -2492,7 +2482,7 @@ dependencies = [
  "either",
  "futures 0.3.30",
  "futures-timer",
- "jsonrpsee 0.20.3",
+ "jsonrpsee",
  "parity-scale-codec",
  "pin-project",
  "polkadot-overseer",
@@ -2662,7 +2652,7 @@ dependencies = [
  "frame-benchmarking",
  "frame-benchmarking-cli",
  "futures 0.3.30",
- "jsonrpsee 0.16.3",
+ "jsonrpsee",
  "koi-runtime",
  "log",
  "moonbeam-primitives-ext",
@@ -3913,7 +3903,7 @@ dependencies = [
  "fp-storage",
  "futures 0.3.30",
  "hex",
- "jsonrpsee 0.20.3",
+ "jsonrpsee",
  "libsecp256k1",
  "log",
  "pallet-evm",
@@ -3958,7 +3948,7 @@ source = "git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c
 dependencies = [
  "ethereum",
  "ethereum-types",
- "jsonrpsee 0.20.3",
+ "jsonrpsee",
  "rlp",
  "rustc-hex",
  "serde",
@@ -4421,7 +4411,7 @@ source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot
 dependencies = [
  "futures 0.3.30",
  "indicatif",
- "jsonrpsee 0.20.3",
+ "jsonrpsee",
  "log",
  "parity-scale-codec",
  "serde",
@@ -4868,19 +4858,6 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
 
-[[package]]
-name = "globset"
-version = "0.4.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1"
-dependencies = [
- "aho-corasick",
- "bstr 1.9.1",
- "log",
- "regex-automata 0.4.7",
- "regex-syntax 0.8.4",
-]
-
 [[package]]
 name = "group"
 version = "0.13.0"
@@ -5722,28 +5699,17 @@ dependencies = [
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "jsonrpsee"
-version = "0.16.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "367a292944c07385839818bb71c8d76611138e2dedb0677d035b8da21d29c78b"
-dependencies = [
- "jsonrpsee-core 0.16.3",
- "jsonrpsee-server 0.16.3",
- "jsonrpsee-types 0.16.3",
-]
-
 [[package]]
 name = "jsonrpsee"
 version = "0.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "affdc52f7596ccb2d7645231fc6163bb314630c989b64998f3699a28b4d5d4dc"
 dependencies = [
- "jsonrpsee-core 0.20.3",
+ "jsonrpsee-core",
  "jsonrpsee-http-client",
  "jsonrpsee-proc-macros",
- "jsonrpsee-server 0.20.3",
- "jsonrpsee-types 0.20.3",
+ "jsonrpsee-server",
+ "jsonrpsee-types",
  "jsonrpsee-ws-client",
  "tokio",
  "tracing",
@@ -5757,7 +5723,7 @@ checksum = "b5b005c793122d03217da09af68ba9383363caa950b90d3436106df8cabce935"
 dependencies = [
  "futures-util",
  "http 0.2.12",
- "jsonrpsee-core 0.20.3",
+ "jsonrpsee-core",
  "pin-project",
  "rustls-native-certs",
  "soketto",
@@ -5769,32 +5735,6 @@ dependencies = [
  "url",
 ]
 
-[[package]]
-name = "jsonrpsee-core"
-version = "0.16.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b5dde66c53d6dcdc8caea1874a45632ec0fcf5b437789f1e45766a1512ce803"
-dependencies = [
- "anyhow",
- "arrayvec 0.7.4",
- "async-trait",
- "beef",
- "futures-channel",
- "futures-util",
- "globset",
- "hyper 0.14.29",
- "jsonrpsee-types 0.16.3",
- "parking_lot 0.12.3",
- "rand",
- "rustc-hash",
- "serde",
- "serde_json",
- "soketto",
- "thiserror",
- "tokio",
- "tracing",
-]
-
 [[package]]
 name = "jsonrpsee-core"
 version = "0.20.3"
@@ -5808,7 +5748,7 @@ dependencies = [
  "futures-timer",
  "futures-util",
  "hyper 0.14.29",
- "jsonrpsee-types 0.20.3",
+ "jsonrpsee-types",
  "parking_lot 0.12.3",
  "rand",
  "rustc-hash",
@@ -5829,8 +5769,8 @@ dependencies = [
  "async-trait",
  "hyper 0.14.29",
  "hyper-rustls",
- "jsonrpsee-core 0.20.3",
- "jsonrpsee-types 0.20.3",
+ "jsonrpsee-core",
+ "jsonrpsee-types",
  "serde",
  "serde_json",
  "thiserror",
@@ -5853,28 +5793,6 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "jsonrpsee-server"
-version = "0.16.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4d945a6008c9b03db3354fb3c83ee02d2faa9f2e755ec1dfb69c3551b8f4ba"
-dependencies = [
- "futures-channel",
- "futures-util",
- "http 0.2.12",
- "hyper 0.14.29",
- "jsonrpsee-core 0.16.3",
- "jsonrpsee-types 0.16.3",
- "serde",
- "serde_json",
- "soketto",
- "tokio",
- "tokio-stream",
- "tokio-util",
- "tower",
- "tracing",
-]
-
 [[package]]
 name = "jsonrpsee-server"
 version = "0.20.3"
@@ -5884,8 +5802,8 @@ dependencies = [
  "futures-util",
  "http 0.2.12",
  "hyper 0.14.29",
- "jsonrpsee-core 0.20.3",
- "jsonrpsee-types 0.20.3",
+ "jsonrpsee-core",
+ "jsonrpsee-types",
  "route-recognizer",
  "serde",
  "serde_json",
@@ -5898,20 +5816,6 @@ dependencies = [
  "tracing",
 ]
 
-[[package]]
-name = "jsonrpsee-types"
-version = "0.16.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "245ba8e5aa633dd1c1e4fae72bce06e71f42d34c14a2767c6b4d173b57bee5e5"
-dependencies = [
- "anyhow",
- "beef",
- "serde",
- "serde_json",
- "thiserror",
- "tracing",
-]
-
 [[package]]
 name = "jsonrpsee-types"
 version = "0.20.3"
@@ -5934,8 +5838,8 @@ checksum = "bca9cb3933ccae417eb6b08c3448eb1cb46e39834e5b503e395e5e5bd08546c0"
 dependencies = [
  "http 0.2.12",
  "jsonrpsee-client-transport",
- "jsonrpsee-core 0.20.3",
- "jsonrpsee-types 0.20.3",
+ "jsonrpsee-core",
+ "jsonrpsee-types",
  "url",
 ]
 
@@ -7032,7 +6936,7 @@ name = "mmr-rpc"
 version = "28.0.0"
 source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
- "jsonrpsee 0.20.3",
+ "jsonrpsee",
  "parity-scale-codec",
  "serde",
  "sp-api",
@@ -7127,7 +7031,7 @@ dependencies = [
  "ethereum-types",
  "fc-rpc-core",
  "futures 0.3.30",
- "jsonrpsee 0.20.3",
+ "jsonrpsee",
  "moonbeam-client-evm-tracing",
  "moonbeam-rpc-core-types",
  "serde",
@@ -7142,7 +7046,7 @@ source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.7.
 dependencies = [
  "ethereum-types",
  "futures 0.3.30",
- "jsonrpsee 0.20.3",
+ "jsonrpsee",
  "moonbeam-client-evm-tracing",
  "moonbeam-rpc-core-types",
  "serde",
@@ -7175,7 +7079,7 @@ dependencies = [
  "fp-rpc",
  "futures 0.3.30",
  "hex-literal 0.3.4",
- "jsonrpsee 0.20.3",
+ "jsonrpsee",
  "moonbeam-client-evm-tracing",
  "moonbeam-rpc-core-debug",
  "moonbeam-rpc-core-types",
@@ -7222,7 +7126,7 @@ dependencies = [
  "fc-storage",
  "fp-rpc",
  "futures 0.3.30",
- "jsonrpsee 0.20.3",
+ "jsonrpsee",
  "log",
  "moonbeam-client-evm-tracing",
  "moonbeam-rpc-core-trace",
@@ -9161,7 +9065,7 @@ name = "pallet-transaction-payment-rpc"
 version = "30.0.0"
 source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
- "jsonrpsee 0.20.3",
+ "jsonrpsee",
  "pallet-transaction-payment-rpc-runtime-api",
  "parity-scale-codec",
  "sp-api",
@@ -10377,7 +10281,7 @@ name = "polkadot-rpc"
 version = "7.0.0"
 source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
- "jsonrpsee 0.20.3",
+ "jsonrpsee",
  "mmr-rpc",
  "pallet-transaction-payment-rpc",
  "polkadot-primitives",
@@ -12330,7 +12234,7 @@ version = "0.34.0"
 source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "futures 0.3.30",
- "jsonrpsee 0.20.3",
+ "jsonrpsee",
  "sc-consensus-babe",
  "sc-consensus-epochs",
  "sc-rpc-api",
@@ -12388,7 +12292,7 @@ version = "13.0.0"
 source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "futures 0.3.30",
- "jsonrpsee 0.20.3",
+ "jsonrpsee",
  "log",
  "parity-scale-codec",
  "parking_lot 0.12.3",
@@ -12464,7 +12368,7 @@ source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot
 dependencies = [
  "finality-grandpa",
  "futures 0.3.30",
- "jsonrpsee 0.20.3",
+ "jsonrpsee",
  "log",
  "parity-scale-codec",
  "sc-client-api",
@@ -12836,7 +12740,7 @@ version = "29.0.0"
 source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "futures 0.3.30",
- "jsonrpsee 0.20.3",
+ "jsonrpsee",
  "log",
  "parity-scale-codec",
  "parking_lot 0.12.3",
@@ -12867,7 +12771,7 @@ name = "sc-rpc-api"
 version = "0.33.0"
 source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
- "jsonrpsee 0.20.3",
+ "jsonrpsee",
  "parity-scale-codec",
  "sc-chain-spec",
  "sc-mixnet",
@@ -12888,7 +12792,7 @@ version = "11.0.0"
 source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "http 0.2.12",
- "jsonrpsee 0.20.3",
+ "jsonrpsee",
  "log",
  "serde_json",
  "substrate-prometheus-endpoint",
@@ -12906,7 +12810,7 @@ dependencies = [
  "futures 0.3.30",
  "futures-util",
  "hex",
- "jsonrpsee 0.20.3",
+ "jsonrpsee",
  "log",
  "parity-scale-codec",
  "parking_lot 0.12.3",
@@ -12937,7 +12841,7 @@ dependencies = [
  "exit-future",
  "futures 0.3.30",
  "futures-timer",
- "jsonrpsee 0.20.3",
+ "jsonrpsee",
  "log",
  "parity-scale-codec",
  "parking_lot 0.12.3",
@@ -13019,7 +12923,7 @@ name = "sc-sync-state-rpc"
 version = "0.34.0"
 source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
- "jsonrpsee 0.20.3",
+ "jsonrpsee",
  "parity-scale-codec",
  "sc-chain-spec",
  "sc-client-api",
@@ -13544,7 +13448,7 @@ version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fa42c91313f1d05da9b26f267f931cf178d4aba455b4c4622dd7355eb80c6640"
 dependencies = [
- "bstr 0.2.17",
+ "bstr",
  "unicode-segmentation",
 ]
 
@@ -15059,7 +14963,7 @@ source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot
 dependencies = [
  "frame-system-rpc-runtime-api",
  "futures 0.3.30",
- "jsonrpsee 0.20.3",
+ "jsonrpsee",
  "log",
  "parity-scale-codec",
  "sc-rpc-api",
@@ -15089,7 +14993,7 @@ version = "0.33.0"
 source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "async-trait",
- "jsonrpsee 0.20.3",
+ "jsonrpsee",
  "log",
  "sc-rpc-api",
  "serde",
@@ -15101,7 +15005,7 @@ name = "substrate-state-trie-migration-rpc"
 version = "27.0.0"
 source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
- "jsonrpsee 0.20.3",
+ "jsonrpsee",
  "parity-scale-codec",
  "sc-client-api",
  "sc-rpc-api",
diff --git a/node/Cargo.toml b/node/Cargo.toml
index 57c46fdff..8247cfd57 100644
--- a/node/Cargo.toml
+++ b/node/Cargo.toml
@@ -15,7 +15,7 @@ array-bytes = { workspace = true }
 async-trait = { version = "0.1" }
 clap        = { version = "4.4", features = ["derive"] }
 futures     = { version = "0.3" }
-jsonrpsee   = { version = "0.16", features = ["server"] }
+jsonrpsee   = { version = "0.20", features = ["server"] }
 log         = { version = "0.4" }
 serde       = { version = "1.0", features = ["derive"] }
 serde_json  = { version = "1.0" }

From 655eaaea85eb36821c1954bd49babe0633e4939a Mon Sep 17 00:00:00 2001
From: Xavier Lau <xavier@inv.cafe>
Date: Mon, 24 Jun 2024 10:45:54 +0800
Subject: [PATCH 20/59] paritytech/polkadot-sdk#2331

---
 node/src/cli.rs     | 2 +-
 node/src/command.rs | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/node/src/cli.rs b/node/src/cli.rs
index aa20c69d4..ded282f51 100644
--- a/node/src/cli.rs
+++ b/node/src/cli.rs
@@ -51,7 +51,7 @@ pub enum Subcommand {
 	PurgeChain(cumulus_client_cli::PurgeChainCmd),
 
 	/// Export the genesis state of the parachain.
-	ExportGenesisState(cumulus_client_cli::ExportGenesisStateCommand),
+	ExportGenesisHead(cumulus_client_cli::ExportGenesisHeadCommand),
 
 	/// Export the genesis wasm of the parachain.
 	ExportGenesisWasm(cumulus_client_cli::ExportGenesisWasmCommand),
diff --git a/node/src/command.rs b/node/src/command.rs
index 449302933..fc348e3b3 100644
--- a/node/src/command.rs
+++ b/node/src/command.rs
@@ -419,7 +419,7 @@ pub fn run() -> Result<()> {
 				cmd.run(config, polkadot_config)
 			})
 		},
-		Some(Subcommand::ExportGenesisState(cmd)) =>
+		Some(Subcommand::ExportGenesisHead(cmd)) =>
 			construct_async_run!(|components, cli, cmd, config| {
 				Ok(async move { cmd.run(&*config.chain_spec, &*components.client) })
 			}),

From 1d3956fa9502fd06a874a128c0e3bb31489dfbbd Mon Sep 17 00:00:00 2001
From: Xavier Lau <xavier@inv.cafe>
Date: Mon, 24 Jun 2024 15:17:27 +0800
Subject: [PATCH 21/59] paritytech/polkadot-sdk#2409 part.1

---
 Cargo.lock                           |  1 -
 pallet/account-migration/src/mock.rs |  1 +
 pallet/deposit/Cargo.toml            |  1 -
 pallet/deposit/src/mock.rs           | 39 ++++++----------------------
 pallet/deposit/src/tests.rs          | 14 ++++++++--
 5 files changed, 21 insertions(+), 35 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index a6c97e41a..31a875d50 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2778,7 +2778,6 @@ dependencies = [
  "pallet-timestamp",
  "parity-scale-codec",
  "scale-info",
- "sp-core",
  "sp-io",
  "sp-runtime",
  "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
diff --git a/pallet/account-migration/src/mock.rs b/pallet/account-migration/src/mock.rs
index 5c98fdb0b..bf24f3b54 100644
--- a/pallet/account-migration/src/mock.rs
+++ b/pallet/account-migration/src/mock.rs
@@ -62,6 +62,7 @@ pub const VERSION: sp_version::RuntimeVersion = sp_version::RuntimeVersion {
 frame_support::parameter_types! {
 	pub const Version: sp_version::RuntimeVersion = VERSION;
 }
+#[frame_support::derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Runtime {
 	type AccountData = pallet_balances::AccountData<Balance>;
 	type AccountId = AccountId;
diff --git a/pallet/deposit/Cargo.toml b/pallet/deposit/Cargo.toml
index dca89fad2..3651815fb 100644
--- a/pallet/deposit/Cargo.toml
+++ b/pallet/deposit/Cargo.toml
@@ -29,7 +29,6 @@ sp-std             = { workspace = true, optional = true }
 # substrate
 pallet-assets   = { workspace = true, features = ["std"] }
 pallet-balances = { workspace = true, features = ["std"] }
-sp-core         = { workspace = true, features = ["std"] }
 sp-io           = { workspace = true, features = ["std"] }
 
 [features]
diff --git a/pallet/deposit/src/mock.rs b/pallet/deposit/src/mock.rs
index 823b33f34..df08fb3ae 100644
--- a/pallet/deposit/src/mock.rs
+++ b/pallet/deposit/src/mock.rs
@@ -20,55 +20,32 @@ pub use crate as darwinia_deposit;
 pub use dc_types::{AssetId, Balance, Moment, UNIT};
 
 // substrate
+use frame_support::derive_impl;
 use sp_io::TestExternalities;
 use sp_runtime::BuildStorage;
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Runtime {
 	type AccountData = pallet_balances::AccountData<Balance>;
-	type AccountId = u32;
-	type BaseCallFilter = frame_support::traits::Everything;
 	type Block = frame_system::mocking::MockBlock<Self>;
-	type BlockHashCount = ();
-	type BlockLength = ();
-	type BlockWeights = ();
-	type DbWeight = ();
-	type Hash = sp_core::H256;
-	type Hashing = sp_runtime::traits::BlakeTwo256;
-	type Lookup = sp_runtime::traits::IdentityLookup<Self::AccountId>;
-	type MaxConsumers = frame_support::traits::ConstU32<16>;
-	type Nonce = u64;
-	type OnKilledAccount = ();
-	type OnNewAccount = ();
-	type OnSetCode = ();
 	type PalletInfo = PalletInfo;
 	type RuntimeCall = RuntimeCall;
 	type RuntimeEvent = RuntimeEvent;
 	type RuntimeOrigin = RuntimeOrigin;
-	type SS58Prefix = ();
-	type SystemWeightInfo = ();
-	type Version = ();
 }
 
+#[derive_impl(pallet_timestamp::config_preludes::TestDefaultConfig as pallet_timestamp::DefaultConfig)]
 impl pallet_timestamp::Config for Runtime {
 	type MinimumPeriod = ();
 	type Moment = Moment;
-	type OnTimestampSet = ();
-	type WeightInfo = ();
 }
 
+#[derive_impl(pallet_balances::config_preludes::TestDefaultConfig as pallet_balances::DefaultConfig)]
 impl pallet_balances::Config for Runtime {
 	type AccountStore = System;
 	type Balance = Balance;
-	type DustRemoval = ();
-	type ExistentialDeposit = frame_support::traits::ConstU128<0>;
-	type FreezeIdentifier = ();
-	type MaxFreezes = ();
-	type MaxLocks = ();
-	type MaxReserves = ();
-	type ReserveIdentifier = [u8; 8];
+	type ExistentialDeposit = ();
 	type RuntimeEvent = RuntimeEvent;
-	type RuntimeHoldReason = ();
-	type WeightInfo = ();
 }
 
 #[cfg(feature = "runtime-benchmarks")]
@@ -90,11 +67,11 @@ impl pallet_assets::Config for Runtime {
 	type BenchmarkHelper = BenchmarkHelper;
 	type CallbackHandle = ();
 	type CreateOrigin = frame_support::traits::AsEnsureOriginWithArg<
-		frame_system::EnsureSignedBy<frame_support::traits::IsInVec<()>, u32>,
+		frame_system::EnsureSignedBy<frame_support::traits::IsInVec<()>, Self::AccountId>,
 	>;
 	type Currency = Balances;
 	type Extra = ();
-	type ForceOrigin = frame_system::EnsureRoot<u32>;
+	type ForceOrigin = frame_system::EnsureRoot<Self::AccountId>;
 	type Freezer = ();
 	type MetadataDepositBase = ();
 	type MetadataDepositPerByte = ();
@@ -106,7 +83,7 @@ impl pallet_assets::Config for Runtime {
 
 pub enum KtonMinting {}
 impl darwinia_deposit::SimpleAsset for KtonMinting {
-	type AccountId = u32;
+	type AccountId = <Runtime as frame_system::Config>::AccountId;
 
 	fn mint(beneficiary: &Self::AccountId, amount: Balance) -> sp_runtime::DispatchResult {
 		Assets::mint(RuntimeOrigin::signed(0), 0.into(), *beneficiary, amount)
diff --git a/pallet/deposit/src/tests.rs b/pallet/deposit/src/tests.rs
index ad1b8a9bf..7be71ed0e 100644
--- a/pallet/deposit/src/tests.rs
+++ b/pallet/deposit/src/tests.rs
@@ -30,11 +30,21 @@ use sp_runtime::TokenError;
 fn lock_should_work() {
 	new_test_ext().execute_with(|| {
 		assert_eq!(System::account(1).consumers, 0);
-		assert_eq!(Balances::free_balance(darwinia_deposit::account_id::<u32>()), 0);
+		assert_eq!(
+			Balances::free_balance(darwinia_deposit::account_id::<
+				<Runtime as frame_system::Config>::AccountId,
+			>()),
+			0
+		);
 		assert_eq!(Balances::free_balance(1), 1_000 * UNIT);
 		assert_ok!(Deposit::lock(RuntimeOrigin::signed(1), 10 * UNIT, 1));
 		assert_eq!(System::account(1).consumers, 1);
-		assert_eq!(Balances::free_balance(darwinia_deposit::account_id::<u32>()), 10 * UNIT);
+		assert_eq!(
+			Balances::free_balance(darwinia_deposit::account_id::<
+				<Runtime as frame_system::Config>::AccountId,
+			>()),
+			10 * UNIT
+		);
 		assert_eq!(Balances::free_balance(1), 990 * UNIT);
 	});
 }

From 443b7cd122960eb7b83e619505fd24dad24c033c Mon Sep 17 00:00:00 2001
From: Xavier Lau <xavier@inv.cafe>
Date: Mon, 24 Jun 2024 15:22:04 +0800
Subject: [PATCH 22/59] paritytech/polkadot-sdk#2767

---
 node/src/service/mod.rs | 36 +++++++++++++++++-------------------
 1 file changed, 17 insertions(+), 19 deletions(-)

diff --git a/node/src/service/mod.rs b/node/src/service/mod.rs
index 570b0b47a..4d78ba730 100644
--- a/node/src/service/mod.rs
+++ b/node/src/service/mod.rs
@@ -59,6 +59,22 @@ type ParachainBlockImport<RuntimeApi, Executor> =
 		Arc<FullClient<RuntimeApi, Executor>>,
 		FullBackend,
 	>;
+type Service<RuntimeApi, Executor> = sc_service::PartialComponents<
+	FullClient<RuntimeApi, Executor>,
+	FullBackend,
+	sc_consensus::LongestChain<FullBackend, Block>,
+	sc_consensus::DefaultImportQueue<Block>,
+	sc_transaction_pool::FullPool<Block, FullClient<RuntimeApi, Executor>>,
+	(
+		fc_db::Backend<Block>,
+		Option<fc_rpc_core::types::FilterPool>,
+		fc_rpc_core::types::FeeHistoryCache,
+		fc_rpc_core::types::FeeHistoryCacheLimit,
+		ParachainBlockImport<RuntimeApi, Executor>,
+		Option<sc_telemetry::Telemetry>,
+		Option<sc_telemetry::TelemetryWorkerHandle>,
+	),
+>;
 
 /// Can be called for a `Configuration` to check if it is the specific network.
 pub trait IdentifyVariant {
@@ -134,25 +150,7 @@ impl<Api> RuntimeApiCollection for Api where
 pub fn new_partial<RuntimeApi, Executor>(
 	config: &sc_service::Configuration,
 	eth_rpc_config: &crate::cli::EthRpcConfig,
-) -> Result<
-	sc_service::PartialComponents<
-		FullClient<RuntimeApi, Executor>,
-		FullBackend,
-		sc_consensus::LongestChain<FullBackend, Block>,
-		sc_consensus::DefaultImportQueue<Block>,
-		sc_transaction_pool::FullPool<Block, FullClient<RuntimeApi, Executor>>,
-		(
-			fc_db::Backend<Block>,
-			Option<fc_rpc_core::types::FilterPool>,
-			fc_rpc_core::types::FeeHistoryCache,
-			fc_rpc_core::types::FeeHistoryCacheLimit,
-			ParachainBlockImport<RuntimeApi, Executor>,
-			Option<sc_telemetry::Telemetry>,
-			Option<sc_telemetry::TelemetryWorkerHandle>,
-		),
-	>,
-	sc_service::Error,
->
+) -> Result<Service<RuntimeApi, Executor>, sc_service::Error>
 where
 	RuntimeApi: 'static
 		+ Send

From edffda783bc1d4fea56e13fa14a121f77ae41daf Mon Sep 17 00:00:00 2001
From: Xavier Lau <xavier@inv.cafe>
Date: Mon, 24 Jun 2024 15:37:36 +0800
Subject: [PATCH 23/59] paritytech/polkadot-sdk#2521

Signed-off-by: Xavier Lau <xavier@inv.cafe>
---
 node/src/command.rs           |  24 +++----
 node/src/service/executors.rs |  80 -----------------------
 node/src/service/mod.rs       | 117 ++++++++++++++--------------------
 3 files changed, 60 insertions(+), 161 deletions(-)
 delete mode 100644 node/src/service/executors.rs

diff --git a/node/src/command.rs b/node/src/command.rs
index fc348e3b3..60f2f1d37 100644
--- a/node/src/command.rs
+++ b/node/src/command.rs
@@ -240,7 +240,7 @@ pub fn run() -> Result<()> {
 		($config:expr, $cli:ident, |$partials:ident| $code:expr) => {{
 			#[cfg(feature = "crab-native")]
 			if $config.chain_spec.is_crab() {
-				let $partials = service::new_partial::<CrabRuntimeApi, CrabRuntimeExecutor>(
+				let $partials = service::new_partial::<CrabRuntimeApi>(
 					&$config,
 					&$cli.eth_args.build_eth_rpc_config(),
 				)?;
@@ -250,7 +250,7 @@ pub fn run() -> Result<()> {
 
 			#[cfg(feature = "darwinia-native")]
 			if $config.chain_spec.is_darwinia() {
-				let $partials = service::new_partial::<DarwiniaRuntimeApi, DarwiniaRuntimeExecutor>(
+				let $partials = service::new_partial::<DarwiniaRuntimeApi>(
 					&$config,
 					&$cli.eth_args.build_eth_rpc_config(),
 				)?;
@@ -260,7 +260,7 @@ pub fn run() -> Result<()> {
 
 			#[cfg(feature = "koi-native")]
 			if $config.chain_spec.is_koi() {
-				let $partials = service::new_partial::<KoiRuntimeApi, KoiRuntimeExecutor>(
+				let $partials = service::new_partial::<KoiRuntimeApi>(
 					&$config,
 					&$cli.eth_args.build_eth_rpc_config(),
 				)?;
@@ -282,7 +282,7 @@ pub fn run() -> Result<()> {
 			#[cfg(feature = "crab-native")]
 			if chain_spec.is_crab() {
 				return runner.async_run(|$config| {
-					let $components = service::new_partial::<CrabRuntimeApi, CrabRuntimeExecutor>(
+					let $components = service::new_partial::<CrabRuntimeApi>(
 						&$config,
 						&$cli.eth_args.build_eth_rpc_config()
 					)?;
@@ -295,7 +295,7 @@ pub fn run() -> Result<()> {
 			#[cfg(feature = "darwinia-native")]
 			if chain_spec.is_darwinia() {
 				return runner.async_run(|$config| {
-					let $components = service::new_partial::<DarwiniaRuntimeApi, DarwiniaRuntimeExecutor>(
+					let $components = service::new_partial::<DarwiniaRuntimeApi>(
 						&$config,
 						&$cli.eth_args.build_eth_rpc_config()
 					)?;
@@ -308,7 +308,7 @@ pub fn run() -> Result<()> {
 			#[cfg(feature = "koi-native")]
 			if chain_spec.is_koi() {
 				return runner.async_run(|$config| {
-					let $components = service::new_partial::<KoiRuntimeApi, KoiRuntimeExecutor>(
+					let $components = service::new_partial::<KoiRuntimeApi>(
 						&$config,
 						&$cli.eth_args.build_eth_rpc_config()
 					)?;
@@ -506,7 +506,7 @@ pub fn run() -> Result<()> {
 				if chain_spec.is_dev() {
 					#[cfg(feature = "crab-native")]
 					if chain_spec.is_crab() {
-						return service::start_dev_node::<CrabRuntimeApi, CrabRuntimeExecutor>(
+						return service::start_dev_node::<CrabRuntimeApi>(
 							config,
 							&eth_rpc_config,
 						)
@@ -515,7 +515,7 @@ pub fn run() -> Result<()> {
 
 					#[cfg(feature = "darwinia-native")]
 					if chain_spec.is_darwinia() {
-						return service::start_dev_node::<DarwiniaRuntimeApi, DarwiniaRuntimeExecutor>(
+						return service::start_dev_node::<DarwiniaRuntimeApi>(
 							config,
 							&eth_rpc_config,
 						)
@@ -524,7 +524,7 @@ pub fn run() -> Result<()> {
 
 					#[cfg(feature = "koi-native")]
 					if chain_spec.is_koi() {
-						return service::start_dev_node::<KoiRuntimeApi, KoiRuntimeExecutor>(
+						return service::start_dev_node::<KoiRuntimeApi>(
 							config,
 							&eth_rpc_config,
 						)
@@ -538,7 +538,7 @@ pub fn run() -> Result<()> {
 
 				#[cfg(feature = "crab-native")]
 				if chain_spec.is_crab() {
-					return service::start_parachain_node::<CrabRuntimeApi, CrabRuntimeExecutor>(
+					return service::start_parachain_node::<CrabRuntimeApi>(
 						config,
 						polkadot_config,
 						collator_options,
@@ -553,7 +553,7 @@ pub fn run() -> Result<()> {
 
 				#[cfg(feature = "darwinia-native")]
 				if chain_spec.is_darwinia() {
-					return service::start_parachain_node::<DarwiniaRuntimeApi, DarwiniaRuntimeExecutor>(
+					return service::start_parachain_node::<DarwiniaRuntimeApi>(
 						config,
 						polkadot_config,
 						collator_options,
@@ -568,7 +568,7 @@ pub fn run() -> Result<()> {
 
 				#[cfg(feature = "koi-native")]
 				if chain_spec.is_koi() {
-					return service::start_parachain_node::<KoiRuntimeApi, KoiRuntimeExecutor>(
+					return service::start_parachain_node::<KoiRuntimeApi>(
 						config,
 						polkadot_config,
 						collator_options,
diff --git a/node/src/service/executors.rs b/node/src/service/executors.rs
deleted file mode 100644
index 0da755248..000000000
--- a/node/src/service/executors.rs
+++ /dev/null
@@ -1,80 +0,0 @@
-// This file is part of Darwinia.
-//
-// Copyright (C) Darwinia Network
-// SPDX-License-Identifier: GPL-3.0
-//
-// Darwinia is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Darwinia is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Darwinia. If not, see <https://www.gnu.org/licenses/>.
-
-// substrate
-use sc_executor::{NativeExecutionDispatch, NativeVersion};
-
-#[cfg(all(feature = "runtime-benchmarks", feature = "evm-tracing"))]
-pub type HostFunctions = (
-	frame_benchmarking::benchmarking::HostFunctions,
-	moonbeam_primitives_ext::moonbeam_ext::HostFunctions,
-);
-#[cfg(all(feature = "runtime-benchmarks", not(feature = "evm-tracing")))]
-pub type HostFunctions = frame_benchmarking::benchmarking::HostFunctions;
-#[cfg(all(not(feature = "runtime-benchmarks"), feature = "evm-tracing"))]
-pub type HostFunctions = moonbeam_primitives_ext::moonbeam_ext::HostFunctions;
-#[cfg(not(any(feature = "evm-tracing", feature = "runtime-benchmarks")))]
-pub type HostFunctions = ();
-
-/// Darwinia native executor instance.
-#[cfg(feature = "darwinia-native")]
-pub struct DarwiniaRuntimeExecutor;
-#[cfg(feature = "darwinia-native")]
-impl NativeExecutionDispatch for DarwiniaRuntimeExecutor {
-	type ExtendHostFunctions = HostFunctions;
-
-	fn dispatch(method: &str, data: &[u8]) -> Option<Vec<u8>> {
-		darwinia_runtime::api::dispatch(method, data)
-	}
-
-	fn native_version() -> NativeVersion {
-		darwinia_runtime::native_version()
-	}
-}
-
-/// Crab native executor instance.
-#[cfg(feature = "crab-native")]
-pub struct CrabRuntimeExecutor;
-#[cfg(feature = "crab-native")]
-impl NativeExecutionDispatch for CrabRuntimeExecutor {
-	type ExtendHostFunctions = HostFunctions;
-
-	fn dispatch(method: &str, data: &[u8]) -> Option<Vec<u8>> {
-		crab_runtime::api::dispatch(method, data)
-	}
-
-	fn native_version() -> NativeVersion {
-		crab_runtime::native_version()
-	}
-}
-
-/// Koi native executor instance.
-#[cfg(feature = "koi-native")]
-pub struct KoiRuntimeExecutor;
-#[cfg(feature = "koi-native")]
-impl NativeExecutionDispatch for KoiRuntimeExecutor {
-	type ExtendHostFunctions = HostFunctions;
-
-	fn dispatch(method: &str, data: &[u8]) -> Option<Vec<u8>> {
-		koi_runtime::api::dispatch(method, data)
-	}
-
-	fn native_version() -> NativeVersion {
-		koi_runtime::native_version()
-	}
-}
diff --git a/node/src/service/mod.rs b/node/src/service/mod.rs
index 4d78ba730..7beea86dc 100644
--- a/node/src/service/mod.rs
+++ b/node/src/service/mod.rs
@@ -18,9 +18,6 @@
 
 //! Service and service factory implementation. Specialized wrapper over substrate service.
 
-pub mod executors;
-pub use executors::*;
-
 pub mod frontier;
 
 mod instant_finalize;
@@ -47,30 +44,44 @@ use sc_client_api::Backend;
 use sc_consensus::ImportQueue;
 use sc_network::NetworkBlock;
 
+#[cfg(all(feature = "runtime-benchmarks", feature = "evm-tracing"))]
+type HostFunctions = (
+	frame_benchmarking::benchmarking::HostFunctions,
+	moonbeam_primitives_ext::moonbeam_ext::HostFunctions,
+	sp_io::SubstrateHostFunctions,
+);
+#[cfg(all(feature = "runtime-benchmarks", not(feature = "evm-tracing")))]
+type HostFunctions =
+	(frame_benchmarking::benchmarking::HostFunctions, sp_io::SubstrateHostFunctions);
+#[cfg(all(not(feature = "runtime-benchmarks"), feature = "evm-tracing"))]
+type HostFunctions =
+	(moonbeam_primitives_ext::moonbeam_ext::HostFunctions, sp_io::SubstrateHostFunctions);
+#[cfg(not(any(feature = "evm-tracing", feature = "runtime-benchmarks")))]
+type HostFunctions = sp_io::SubstrateHostFunctions;
+
 /// Full client backend type.
 type FullBackend = sc_service::TFullBackend<Block>;
 /// Full client type.
-type FullClient<RuntimeApi, Executor> =
-	sc_service::TFullClient<Block, RuntimeApi, sc_executor::NativeElseWasmExecutor<Executor>>;
+type FullClient<RuntimeApi> =
+	sc_service::TFullClient<Block, RuntimeApi, sc_executor::WasmExecutor<HostFunctions>>;
 /// Parachain specific block import.
-type ParachainBlockImport<RuntimeApi, Executor> =
-	cumulus_client_consensus_common::ParachainBlockImport<
-		Block,
-		Arc<FullClient<RuntimeApi, Executor>>,
-		FullBackend,
-	>;
-type Service<RuntimeApi, Executor> = sc_service::PartialComponents<
-	FullClient<RuntimeApi, Executor>,
+type ParachainBlockImport<RuntimeApi> = cumulus_client_consensus_common::ParachainBlockImport<
+	Block,
+	Arc<FullClient<RuntimeApi>>,
+	FullBackend,
+>;
+type Service<RuntimeApi> = sc_service::PartialComponents<
+	FullClient<RuntimeApi>,
 	FullBackend,
 	sc_consensus::LongestChain<FullBackend, Block>,
 	sc_consensus::DefaultImportQueue<Block>,
-	sc_transaction_pool::FullPool<Block, FullClient<RuntimeApi, Executor>>,
+	sc_transaction_pool::FullPool<Block, FullClient<RuntimeApi>>,
 	(
 		fc_db::Backend<Block>,
 		Option<fc_rpc_core::types::FilterPool>,
 		fc_rpc_core::types::FeeHistoryCache,
 		fc_rpc_core::types::FeeHistoryCacheLimit,
-		ParachainBlockImport<RuntimeApi, Executor>,
+		ParachainBlockImport<RuntimeApi>,
 		Option<sc_telemetry::Telemetry>,
 		Option<sc_telemetry::TelemetryWorkerHandle>,
 	),
@@ -147,17 +158,13 @@ impl<Api> RuntimeApiCollection for Api where
 /// Use this macro if you don't actually need the full service, but just the builder in order to
 /// be able to perform chain operations.
 #[allow(clippy::type_complexity)]
-pub fn new_partial<RuntimeApi, Executor>(
+pub fn new_partial<RuntimeApi>(
 	config: &sc_service::Configuration,
 	eth_rpc_config: &crate::cli::EthRpcConfig,
-) -> Result<Service<RuntimeApi, Executor>, sc_service::Error>
+) -> Result<Service<RuntimeApi>, sc_service::Error>
 where
-	RuntimeApi: 'static
-		+ Send
-		+ Sync
-		+ sp_api::ConstructRuntimeApi<Block, FullClient<RuntimeApi, Executor>>,
+	RuntimeApi: 'static + Send + Sync + sp_api::ConstructRuntimeApi<Block, FullClient<RuntimeApi>>,
 	RuntimeApi::RuntimeApi: RuntimeApiCollection,
-	Executor: 'static + sc_executor::NativeExecutionDispatch,
 {
 	let telemetry = config
 		.telemetry_endpoints
@@ -169,19 +176,7 @@ where
 			Ok((worker, telemetry))
 		})
 		.transpose()?;
-	let heap_pages =
-		config.default_heap_pages.map_or(sc_executor::DEFAULT_HEAP_ALLOC_STRATEGY, |h| {
-			sc_executor::HeapAllocStrategy::Static { extra_pages: h as _ }
-		});
-	let wasm_executor = sc_executor::WasmExecutor::builder()
-		.with_execution_method(config.wasm_method)
-		.with_max_runtime_instances(config.max_runtime_instances)
-		.with_runtime_cache_size(config.runtime_cache_size)
-		.with_onchain_heap_alloc_strategy(heap_pages)
-		.with_offchain_heap_alloc_strategy(heap_pages)
-		.build();
-	let executor =
-		<sc_executor::NativeElseWasmExecutor<Executor>>::new_with_wasm_executor(wasm_executor);
+	let executor = sc_service::new_wasm_executor::<HostFunctions>(config);
 	let (client, backend, keystore_container, task_manager) =
 		sc_service::new_full_parts::<Block, RuntimeApi, _>(
 			config,
@@ -240,7 +235,7 @@ where
 /// This is the actual implementation that is abstract over the executor and the runtime api.
 #[allow(clippy::too_many_arguments)]
 #[sc_tracing::logging::prefix_logs_with("Parachain")]
-async fn start_node_impl<RuntimeApi, Executor, SC>(
+async fn start_node_impl<RuntimeApi, SC>(
 	parachain_config: sc_service::Configuration,
 	polkadot_config: sc_service::Configuration,
 	collator_options: cumulus_client_cli::CollatorOptions,
@@ -249,22 +244,18 @@ async fn start_node_impl<RuntimeApi, Executor, SC>(
 	start_consensus: SC,
 	hwbench: Option<sc_sysinfo::HwBench>,
 	eth_rpc_config: &crate::cli::EthRpcConfig,
-) -> sc_service::error::Result<(sc_service::TaskManager, Arc<FullClient<RuntimeApi, Executor>>)>
+) -> sc_service::error::Result<(sc_service::TaskManager, Arc<FullClient<RuntimeApi>>)>
 where
-	RuntimeApi: 'static
-		+ Send
-		+ Sync
-		+ sp_api::ConstructRuntimeApi<Block, FullClient<RuntimeApi, Executor>>,
+	RuntimeApi: 'static + Send + Sync + sp_api::ConstructRuntimeApi<Block, FullClient<RuntimeApi>>,
 	RuntimeApi::RuntimeApi: RuntimeApiCollection,
-	Executor: 'static + sc_executor::NativeExecutionDispatch,
 	SC: FnOnce(
-		Arc<FullClient<RuntimeApi, Executor>>,
-		ParachainBlockImport<RuntimeApi, Executor>,
+		Arc<FullClient<RuntimeApi>>,
+		ParachainBlockImport<RuntimeApi>,
 		Option<&substrate_prometheus_endpoint::Registry>,
 		Option<sc_telemetry::TelemetryHandle>,
 		&sc_service::TaskManager,
 		Arc<dyn cumulus_relay_chain_interface::RelayChainInterface>,
-		Arc<sc_transaction_pool::FullPool<Block, FullClient<RuntimeApi, Executor>>>,
+		Arc<sc_transaction_pool::FullPool<Block, FullClient<RuntimeApi>>>,
 		Arc<sc_network_sync::SyncingService<Block>>,
 		sp_keystore::KeystorePtr,
 		Duration,
@@ -293,7 +284,7 @@ where
 				mut telemetry,
 				telemetry_worker_handle,
 			),
-	} = new_partial::<RuntimeApi, Executor>(&parachain_config, eth_rpc_config)?;
+	} = new_partial::<RuntimeApi>(&parachain_config, eth_rpc_config)?;
 
 	let (relay_chain_interface, collator_key) =
 		cumulus_client_service::build_relay_chain_interface(
@@ -539,20 +530,16 @@ where
 }
 
 /// Build the import queue for the parachain runtime.
-pub fn build_import_queue<RuntimeApi, Executor>(
-	client: Arc<FullClient<RuntimeApi, Executor>>,
-	block_import: ParachainBlockImport<RuntimeApi, Executor>,
+pub fn build_import_queue<RuntimeApi>(
+	client: Arc<FullClient<RuntimeApi>>,
+	block_import: ParachainBlockImport<RuntimeApi>,
 	config: &sc_service::Configuration,
 	telemetry: Option<sc_telemetry::TelemetryHandle>,
 	task_manager: &sc_service::TaskManager,
 ) -> Result<sc_consensus::DefaultImportQueue<Block>, sc_service::Error>
 where
-	RuntimeApi: 'static
-		+ Send
-		+ Sync
-		+ sp_api::ConstructRuntimeApi<Block, FullClient<RuntimeApi, Executor>>,
+	RuntimeApi: 'static + Send + Sync + sp_api::ConstructRuntimeApi<Block, FullClient<RuntimeApi>>,
 	RuntimeApi::RuntimeApi: RuntimeApiCollection,
-	Executor: 'static + sc_executor::NativeExecutionDispatch,
 {
 	let slot_duration = cumulus_client_consensus_aura::slot_duration(&*client)?;
 
@@ -578,25 +565,21 @@ where
 }
 
 /// Start a parachain node.
-pub async fn start_parachain_node<RuntimeApi, Executor>(
+pub async fn start_parachain_node<RuntimeApi>(
 	parachain_config: sc_service::Configuration,
 	polkadot_config: sc_service::Configuration,
 	collator_options: cumulus_client_cli::CollatorOptions,
 	para_id: cumulus_primitives_core::ParaId,
 	hwbench: Option<sc_sysinfo::HwBench>,
 	eth_rpc_config: &crate::cli::EthRpcConfig,
-) -> sc_service::error::Result<(sc_service::TaskManager, Arc<FullClient<RuntimeApi, Executor>>)>
+) -> sc_service::error::Result<(sc_service::TaskManager, Arc<FullClient<RuntimeApi>>)>
 where
-	RuntimeApi: sp_api::ConstructRuntimeApi<Block, FullClient<RuntimeApi, Executor>>
-		+ Send
-		+ Sync
-		+ 'static,
+	RuntimeApi: sp_api::ConstructRuntimeApi<Block, FullClient<RuntimeApi>> + Send + Sync + 'static,
 	RuntimeApi::RuntimeApi: RuntimeApiCollection,
 	RuntimeApi::RuntimeApi:
 		sp_consensus_aura::AuraApi<Block, sp_consensus_aura::sr25519::AuthorityId>,
-	Executor: 'static + sc_executor::NativeExecutionDispatch,
 {
-	start_node_impl::<RuntimeApi, Executor, _>(
+	start_node_impl::<RuntimeApi, _>(
 		parachain_config,
 		polkadot_config,
 		collator_options,
@@ -673,19 +656,15 @@ where
 
 /// Start a dev node which can seal instantly.
 /// !!! WARNING: DO NOT USE ELSEWHERE
-pub fn start_dev_node<RuntimeApi, Executor>(
+pub fn start_dev_node<RuntimeApi>(
 	mut config: sc_service::Configuration,
 	eth_rpc_config: &crate::cli::EthRpcConfig,
 ) -> Result<sc_service::TaskManager, sc_service::error::Error>
 where
-	RuntimeApi: sp_api::ConstructRuntimeApi<Block, FullClient<RuntimeApi, Executor>>
-		+ Send
-		+ Sync
-		+ 'static,
+	RuntimeApi: sp_api::ConstructRuntimeApi<Block, FullClient<RuntimeApi>> + Send + Sync + 'static,
 	RuntimeApi::RuntimeApi: RuntimeApiCollection,
 	RuntimeApi::RuntimeApi:
 		sp_consensus_aura::AuraApi<Block, sp_consensus_aura::sr25519::AuthorityId>,
-	Executor: 'static + sc_executor::NativeExecutionDispatch,
 {
 	// substrate
 	use sc_client_api::HeaderBackend;
@@ -708,7 +687,7 @@ where
 				_telemetry,
 				_telemetry_worker_handle,
 			),
-	} = new_partial::<RuntimeApi, Executor>(&config, eth_rpc_config)?;
+	} = new_partial::<RuntimeApi>(&config, eth_rpc_config)?;
 	let net_config = sc_network::config::FullNetworkConfiguration::new(&config.network);
 
 	let (network, system_rpc_tx, tx_handler_controller, start_network, sync_service) =

From edab2d5fa89cb39d3f28ecabdadc704ed06a8599 Mon Sep 17 00:00:00 2001
From: Xavier Lau <xavier@inv.cafe>
Date: Mon, 24 Jun 2024 16:04:27 +0800
Subject: [PATCH 24/59] paritytech/polkadot-sdk#1222

---
 core/inflation/src/lib.rs                    | 2 +-
 core/types/src/lib.rs                        | 2 +-
 runtime/crab/src/pallets/polkadot_xcm.rs     | 1 +
 runtime/darwinia/src/pallets/polkadot_xcm.rs | 1 +
 runtime/koi/src/pallets/polkadot_xcm.rs      | 4 ++--
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/core/inflation/src/lib.rs b/core/inflation/src/lib.rs
index 9c3ee1e9e..6663b5f58 100644
--- a/core/inflation/src/lib.rs
+++ b/core/inflation/src/lib.rs
@@ -20,7 +20,7 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 #![deny(missing_docs)]
-#![deny(unused_crate_dependencies)]
+// #![deny(unused_crate_dependencies)]
 
 #[cfg(test)]
 mod test;
diff --git a/core/types/src/lib.rs b/core/types/src/lib.rs
index 5b13dbbeb..f4c178731 100644
--- a/core/types/src/lib.rs
+++ b/core/types/src/lib.rs
@@ -20,7 +20,7 @@
 
 #![no_std]
 #![deny(missing_docs)]
-#![deny(unused_crate_dependencies)]
+// #![deny(unused_crate_dependencies)]
 
 /// Balance type.
 pub type Balance = u128;
diff --git a/runtime/crab/src/pallets/polkadot_xcm.rs b/runtime/crab/src/pallets/polkadot_xcm.rs
index 7ec8bc8cb..06395cb51 100644
--- a/runtime/crab/src/pallets/polkadot_xcm.rs
+++ b/runtime/crab/src/pallets/polkadot_xcm.rs
@@ -167,6 +167,7 @@ impl xcm_executor::Config for XcmExecutorConfig {
 		DealWithFees<Runtime>,
 		ToTreasury,
 	>;
+	type TransactionalProcessor = xcm_builder::FrameTransactionalProcessor;
 	type UniversalAliases = frame_support::traits::Nothing;
 	// Teleporting is disabled.
 	type UniversalLocation = UniversalLocation;
diff --git a/runtime/darwinia/src/pallets/polkadot_xcm.rs b/runtime/darwinia/src/pallets/polkadot_xcm.rs
index a3c65da4f..6e62b8688 100644
--- a/runtime/darwinia/src/pallets/polkadot_xcm.rs
+++ b/runtime/darwinia/src/pallets/polkadot_xcm.rs
@@ -263,6 +263,7 @@ impl xcm_executor::Config for XcmExecutorConfig {
 			XcmFeesToAccount,
 		>,
 	);
+	type TransactionalProcessor = xcm_builder::FrameTransactionalProcessor;
 	type UniversalAliases = frame_support::traits::Nothing;
 	// Teleporting is disabled.
 	type UniversalLocation = UniversalLocation;
diff --git a/runtime/koi/src/pallets/polkadot_xcm.rs b/runtime/koi/src/pallets/polkadot_xcm.rs
index a88545076..20986a01c 100644
--- a/runtime/koi/src/pallets/polkadot_xcm.rs
+++ b/runtime/koi/src/pallets/polkadot_xcm.rs
@@ -18,9 +18,8 @@
 
 // darwinia
 use crate::*;
-// polkadot
-use xcm::latest::prelude::*;
 // substrate
+use xcm::latest::prelude::*;
 use frame_support::traits::Currency;
 
 /// Means for transacting assets on this chain.
@@ -263,6 +262,7 @@ impl xcm_executor::Config for XcmExecutorConfig {
 			XcmFeesToAccount,
 		>,
 	);
+	type TransactionalProcessor = xcm_builder::FrameTransactionalProcessor;
 	type UniversalAliases = frame_support::traits::Nothing;
 	// Teleporting is disabled.
 	type UniversalLocation = UniversalLocation;

From a3b44324b14db6c522c559559589426fc296bb3a Mon Sep 17 00:00:00 2001
From: Xavier Lau <xavier@inv.cafe>
Date: Mon, 24 Jun 2024 16:23:11 +0800
Subject: [PATCH 25/59] paritytech/polkadot-sdk#1234 part.1

---
 runtime/crab/src/pallets/xcmp_queue.rs     | 4 +++-
 runtime/darwinia/src/pallets/xcmp_queue.rs | 4 +++-
 runtime/koi/src/pallets/xcmp_queue.rs      | 4 +++-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/runtime/crab/src/pallets/xcmp_queue.rs b/runtime/crab/src/pallets/xcmp_queue.rs
index 41798d603..051a39e9e 100644
--- a/runtime/crab/src/pallets/xcmp_queue.rs
+++ b/runtime/crab/src/pallets/xcmp_queue.rs
@@ -24,7 +24,9 @@ impl cumulus_pallet_xcmp_queue::Config for Runtime {
 	type ControllerOrigin = Root;
 	type ControllerOriginConverter = XcmOriginToTransactDispatchOrigin;
 	type ExecuteOverweightOrigin = Root;
-	type PriceForSiblingDelivery = ();
+	type PriceForSiblingDelivery = polkadot_runtime_common::xcm_sender::NoPriceForMessageDelivery<
+		cumulus_primitives_core::ParaId,
+	>;
 	type RuntimeEvent = RuntimeEvent;
 	type VersionWrapper = ();
 	type WeightInfo = weights::cumulus_pallet_xcmp_queue::WeightInfo<Self>;
diff --git a/runtime/darwinia/src/pallets/xcmp_queue.rs b/runtime/darwinia/src/pallets/xcmp_queue.rs
index 41798d603..051a39e9e 100644
--- a/runtime/darwinia/src/pallets/xcmp_queue.rs
+++ b/runtime/darwinia/src/pallets/xcmp_queue.rs
@@ -24,7 +24,9 @@ impl cumulus_pallet_xcmp_queue::Config for Runtime {
 	type ControllerOrigin = Root;
 	type ControllerOriginConverter = XcmOriginToTransactDispatchOrigin;
 	type ExecuteOverweightOrigin = Root;
-	type PriceForSiblingDelivery = ();
+	type PriceForSiblingDelivery = polkadot_runtime_common::xcm_sender::NoPriceForMessageDelivery<
+		cumulus_primitives_core::ParaId,
+	>;
 	type RuntimeEvent = RuntimeEvent;
 	type VersionWrapper = ();
 	type WeightInfo = weights::cumulus_pallet_xcmp_queue::WeightInfo<Self>;
diff --git a/runtime/koi/src/pallets/xcmp_queue.rs b/runtime/koi/src/pallets/xcmp_queue.rs
index 086122475..f333b5c88 100644
--- a/runtime/koi/src/pallets/xcmp_queue.rs
+++ b/runtime/koi/src/pallets/xcmp_queue.rs
@@ -24,7 +24,9 @@ impl cumulus_pallet_xcmp_queue::Config for Runtime {
 	type ControllerOrigin = RootOr<GeneralAdmin>;
 	type ControllerOriginConverter = XcmOriginToTransactDispatchOrigin;
 	type ExecuteOverweightOrigin = RootOr<GeneralAdmin>;
-	type PriceForSiblingDelivery = ();
+	type PriceForSiblingDelivery = polkadot_runtime_common::xcm_sender::NoPriceForMessageDelivery<
+		cumulus_primitives_core::ParaId,
+	>;
 	type RuntimeEvent = RuntimeEvent;
 	type VersionWrapper = ();
 	type WeightInfo = weights::cumulus_pallet_xcmp_queue::WeightInfo<Self>;

From 4f9b0acdd8cc289ff62465e2fe4717673bc0f669 Mon Sep 17 00:00:00 2001
From: Xavier Lau <xavier@inv.cafe>
Date: Tue, 25 Jun 2024 10:39:50 +0800
Subject: [PATCH 26/59] Satisfy compiler

---
 core/inflation/src/lib.rs           | 1 -
 core/primitives/src/lib.rs          | 1 -
 core/types/src/lib.rs               | 1 -
 node/src/main.rs                    | 1 -
 pallet/account-migration/src/lib.rs | 1 -
 pallet/asset-limit/src/lib.rs       | 1 -
 pallet/deposit/src/lib.rs           | 1 -
 pallet/ethtx-forwarder/src/lib.rs   | 1 -
 pallet/staking/src/lib.rs           | 1 -
 pallet/staking/traits/src/lib.rs    | 1 -
 precompile/assets/src/lib.rs        | 1 -
 precompile/bls12-381/src/lib.rs     | 1 -
 precompile/deposit/src/lib.rs       | 1 -
 precompile/staking/src/lib.rs       | 1 -
 precompile/state-storage/src/lib.rs | 1 -
 15 files changed, 15 deletions(-)

diff --git a/core/inflation/src/lib.rs b/core/inflation/src/lib.rs
index 6663b5f58..90b69e751 100644
--- a/core/inflation/src/lib.rs
+++ b/core/inflation/src/lib.rs
@@ -20,7 +20,6 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 #![deny(missing_docs)]
-// #![deny(unused_crate_dependencies)]
 
 #[cfg(test)]
 mod test;
diff --git a/core/primitives/src/lib.rs b/core/primitives/src/lib.rs
index d572d40e1..e7fd1101a 100644
--- a/core/primitives/src/lib.rs
+++ b/core/primitives/src/lib.rs
@@ -26,7 +26,6 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 #![deny(missing_docs)]
-#![deny(unused_crate_dependencies)]
 
 pub use dc_types::*;
 
diff --git a/core/types/src/lib.rs b/core/types/src/lib.rs
index f4c178731..e925a5b48 100644
--- a/core/types/src/lib.rs
+++ b/core/types/src/lib.rs
@@ -20,7 +20,6 @@
 
 #![no_std]
 #![deny(missing_docs)]
-// #![deny(unused_crate_dependencies)]
 
 /// Balance type.
 pub type Balance = u128;
diff --git a/node/src/main.rs b/node/src/main.rs
index a03724254..e4e52bddc 100644
--- a/node/src/main.rs
+++ b/node/src/main.rs
@@ -19,7 +19,6 @@
 //! Darwinia node CLI.
 
 #![deny(missing_docs)]
-#![deny(unused_crate_dependencies)]
 
 mod chain_spec;
 mod cli;
diff --git a/pallet/account-migration/src/lib.rs b/pallet/account-migration/src/lib.rs
index 16e7b9d2b..a015a9b37 100644
--- a/pallet/account-migration/src/lib.rs
+++ b/pallet/account-migration/src/lib.rs
@@ -42,7 +42,6 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 #![deny(missing_docs)]
-#![deny(unused_crate_dependencies)]
 
 #[cfg(test)]
 mod mock;
diff --git a/pallet/asset-limit/src/lib.rs b/pallet/asset-limit/src/lib.rs
index 8bcabfad8..c7a581f19 100644
--- a/pallet/asset-limit/src/lib.rs
+++ b/pallet/asset-limit/src/lib.rs
@@ -23,7 +23,6 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 #![deny(missing_docs)]
-#![deny(unused_crate_dependencies)]
 
 #[frame_support::pallet]
 pub mod pallet {
diff --git a/pallet/deposit/src/lib.rs b/pallet/deposit/src/lib.rs
index ae024db84..257026b0b 100644
--- a/pallet/deposit/src/lib.rs
+++ b/pallet/deposit/src/lib.rs
@@ -25,7 +25,6 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 #![deny(missing_docs)]
-#![deny(unused_crate_dependencies)]
 
 #[cfg(test)]
 mod mock;
diff --git a/pallet/ethtx-forwarder/src/lib.rs b/pallet/ethtx-forwarder/src/lib.rs
index b13c9f0a3..3be878aca 100644
--- a/pallet/ethtx-forwarder/src/lib.rs
+++ b/pallet/ethtx-forwarder/src/lib.rs
@@ -17,7 +17,6 @@
 // along with Darwinia. If not, see <https://www.gnu.org/licenses/>.
 
 #![cfg_attr(not(feature = "std"), no_std)]
-#![deny(unused_crate_dependencies)]
 
 #[cfg(test)]
 mod mock;
diff --git a/pallet/staking/src/lib.rs b/pallet/staking/src/lib.rs
index 8c3a872a3..45d4514dd 100644
--- a/pallet/staking/src/lib.rs
+++ b/pallet/staking/src/lib.rs
@@ -29,7 +29,6 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 #![deny(missing_docs)]
-#![deny(unused_crate_dependencies)]
 
 pub mod migration;
 
diff --git a/pallet/staking/traits/src/lib.rs b/pallet/staking/traits/src/lib.rs
index 2ca6967bc..515ccb89f 100644
--- a/pallet/staking/traits/src/lib.rs
+++ b/pallet/staking/traits/src/lib.rs
@@ -20,7 +20,6 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 #![deny(missing_docs)]
-#![deny(unused_crate_dependencies)]
 
 // core
 use core::fmt::Debug;
diff --git a/precompile/assets/src/lib.rs b/precompile/assets/src/lib.rs
index d9a57ba97..5519ac598 100644
--- a/precompile/assets/src/lib.rs
+++ b/precompile/assets/src/lib.rs
@@ -17,7 +17,6 @@
 // along with Darwinia. If not, see <https://www.gnu.org/licenses/>.
 
 #![cfg_attr(not(feature = "std"), no_std)]
-#![deny(unused_crate_dependencies)]
 
 #[cfg(test)]
 mod mock;
diff --git a/precompile/bls12-381/src/lib.rs b/precompile/bls12-381/src/lib.rs
index c099120d6..0f4a477ae 100644
--- a/precompile/bls12-381/src/lib.rs
+++ b/precompile/bls12-381/src/lib.rs
@@ -17,7 +17,6 @@
 // along with Darwinia. If not, see <https://www.gnu.org/licenses/>.
 
 #![cfg_attr(not(feature = "std"), no_std)]
-#![deny(unused_crate_dependencies)]
 
 mod bls;
 use bls::{hash_to_curve_g2, PublicKey, Signature};
diff --git a/precompile/deposit/src/lib.rs b/precompile/deposit/src/lib.rs
index 2a09e0abe..c61eb4df0 100644
--- a/precompile/deposit/src/lib.rs
+++ b/precompile/deposit/src/lib.rs
@@ -17,7 +17,6 @@
 // along with Darwinia. If not, see <https://www.gnu.org/licenses/>.
 
 #![cfg_attr(not(feature = "std"), no_std)]
-#![deny(unused_crate_dependencies)]
 
 #[cfg(test)]
 mod mock;
diff --git a/precompile/staking/src/lib.rs b/precompile/staking/src/lib.rs
index 1eb4706a3..77cd3c446 100644
--- a/precompile/staking/src/lib.rs
+++ b/precompile/staking/src/lib.rs
@@ -17,7 +17,6 @@
 // along with Darwinia. If not, see <https://www.gnu.org/licenses/>.
 
 #![cfg_attr(not(feature = "std"), no_std)]
-#![deny(unused_crate_dependencies)]
 
 #[cfg(test)]
 mod mock;
diff --git a/precompile/state-storage/src/lib.rs b/precompile/state-storage/src/lib.rs
index 429638d82..3e55bdb90 100644
--- a/precompile/state-storage/src/lib.rs
+++ b/precompile/state-storage/src/lib.rs
@@ -17,7 +17,6 @@
 // along with Darwinia. If not, see <https://www.gnu.org/licenses/>.
 
 #![cfg_attr(not(feature = "std"), no_std)]
-#![deny(unused_crate_dependencies)]
 
 #[cfg(test)]
 mod mock;

From 229a03585ac7d9da492df5312ecdb1839c9a3d2d Mon Sep 17 00:00:00 2001
From: Xavier Lau <xavier@inv.cafe>
Date: Tue, 25 Jun 2024 10:40:35 +0800
Subject: [PATCH 27/59] XCM V4 part.1

---
 runtime/darwinia/src/pallets/asset_manager.rs    | 16 ++++++++--------
 runtime/darwinia/src/pallets/orml_xtokens.rs     | 16 ++++++++--------
 runtime/darwinia/src/pallets/parachain_system.rs |  3 ++-
 runtime/darwinia/src/pallets/polkadot_xcm.rs     | 10 +++++-----
 runtime/koi/src/pallets/asset_manager.rs         | 14 +++++++-------
 runtime/koi/src/pallets/orml_xtokens.rs          | 16 ++++++++--------
 runtime/koi/src/pallets/parachain_system.rs      |  3 ++-
 runtime/koi/src/pallets/polkadot_xcm.rs          | 10 +++++-----
 8 files changed, 45 insertions(+), 43 deletions(-)

diff --git a/runtime/darwinia/src/pallets/asset_manager.rs b/runtime/darwinia/src/pallets/asset_manager.rs
index a1b340f5d..09233ee36 100644
--- a/runtime/darwinia/src/pallets/asset_manager.rs
+++ b/runtime/darwinia/src/pallets/asset_manager.rs
@@ -86,15 +86,15 @@ impl pallet_asset_manager::LocalAssetIdCreator<Runtime> for LocalAssetIdCreator
 // Our AssetType. For now we only handle Xcm Assets
 #[derive(Clone, Eq, Debug, PartialEq, Ord, PartialOrd, Encode, Decode, scale_info::TypeInfo)]
 pub enum AssetType {
-	Xcm(MultiLocation),
+	Xcm(Location),
 }
 impl Default for AssetType {
 	fn default() -> Self {
-		Self::Xcm(MultiLocation::here())
+		Self::Xcm(Location::here())
 	}
 }
-impl From<MultiLocation> for AssetType {
-	fn from(location: MultiLocation) -> Self {
+impl From<Location> for AssetType {
+	fn from(location: Location) -> Self {
 		Self::Xcm(location)
 	}
 }
@@ -118,8 +118,8 @@ impl From<AssetType> for crate::AssetId {
 	}
 }
 #[allow(clippy::from_over_into)]
-impl Into<Option<MultiLocation>> for AssetType {
-	fn into(self) -> Option<MultiLocation> {
+impl Into<Option<Location>> for AssetType {
+	fn into(self) -> Option<Location> {
 		match self {
 			Self::Xcm(location) => Some(location),
 		}
@@ -130,13 +130,13 @@ frame_support::parameter_types! {
 	/// 1000 is AssetHub paraId.
 	/// 50 is pallet-assets index on AssetHub.
 	/// 1984 is the id of USDT on AssetHub(Polkadot).
-	pub UsdtLocation: MultiLocation = MultiLocation::new(
+	pub UsdtLocation: Location = Location::new(
 		1,
 		X3(Parachain(1000), PalletInstance(50), GeneralIndex(1984))
 	);
 
 	/// 23 is the id of PINK on AssetHub(Polkadot).
-	pub PinkLocation: MultiLocation = MultiLocation::new(
+	pub PinkLocation: Location = Location::new(
 		1,
 		X3(Parachain(1000), PalletInstance(50), GeneralIndex(23))
 	);
diff --git a/runtime/darwinia/src/pallets/orml_xtokens.rs b/runtime/darwinia/src/pallets/orml_xtokens.rs
index 107ac9b13..503d0fda1 100644
--- a/runtime/darwinia/src/pallets/orml_xtokens.rs
+++ b/runtime/darwinia/src/pallets/orml_xtokens.rs
@@ -32,17 +32,17 @@ pub enum CurrencyId {
 	ForeignAsset(crate::AssetId),
 }
 
-// How to convert from CurrencyId to MultiLocation
+// How to convert from CurrencyId to Location
 pub struct CurrencyIdtoMultiLocation<AssetXConverter>(core::marker::PhantomData<AssetXConverter>);
-impl<AssetXConverter> sp_runtime::traits::Convert<CurrencyId, Option<MultiLocation>>
+impl<AssetXConverter> sp_runtime::traits::Convert<CurrencyId, Option<Location>>
 	for CurrencyIdtoMultiLocation<AssetXConverter>
 where
-	AssetXConverter: sp_runtime::traits::MaybeEquivalence<MultiLocation, crate::AssetId>,
+	AssetXConverter: sp_runtime::traits::MaybeEquivalence<Location, crate::AssetId>,
 {
-	fn convert(currency: CurrencyId) -> Option<MultiLocation> {
+	fn convert(currency: CurrencyId) -> Option<Location> {
 		match currency {
 			CurrencyId::SelfReserve => {
-				let multi: MultiLocation = pallets::polkadot_xcm::AnchoringSelfReserve::get();
+				let multi: Location = pallets::polkadot_xcm::AnchoringSelfReserve::get();
 				Some(multi)
 			},
 			CurrencyId::ForeignAsset(asset) => AssetXConverter::convert_back(&asset),
@@ -55,12 +55,12 @@ frame_support::parameter_types! {
 
 	// This is how we are going to detect whether the asset is a Reserve asset
 	// This however is the chain part only
-	pub SelfLocation: MultiLocation = MultiLocation::here();
+	pub SelfLocation: Location = Location::here();
 	// We need this to be able to catch when someone is trying to execute a non-
 	// cross-chain transfer in xtokens through the absolute path way
-	pub SelfLocationAbsolute: MultiLocation = MultiLocation {
+	pub SelfLocationAbsolute: Location = Location {
 		parents:1,
-		interior: Junctions::X1(
+		interior: Junctions::Junctions::X1(
 			Parachain(ParachainInfo::parachain_id().into())
 		)
 	};
diff --git a/runtime/darwinia/src/pallets/parachain_system.rs b/runtime/darwinia/src/pallets/parachain_system.rs
index 2af82d21f..b5e9c97b9 100644
--- a/runtime/darwinia/src/pallets/parachain_system.rs
+++ b/runtime/darwinia/src/pallets/parachain_system.rs
@@ -26,7 +26,8 @@ frame_support::parameter_types! {
 
 impl cumulus_pallet_parachain_system::Config for Runtime {
 	type CheckAssociatedRelayNumber = cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases;
-	type DmpMessageHandler = DmpQueue;
+	type DmpQueue =
+		frame_support::traits::EnqueueWithOrigin<MessageQueue, pallet_config::RelayOrigin>;
 	type OnSystemEvent = ();
 	type OutboundXcmpMessageSource = XcmpQueue;
 	type ReservedDmpWeight = ReservedDmpWeight;
diff --git a/runtime/darwinia/src/pallets/polkadot_xcm.rs b/runtime/darwinia/src/pallets/polkadot_xcm.rs
index 6e62b8688..f9a1055f9 100644
--- a/runtime/darwinia/src/pallets/polkadot_xcm.rs
+++ b/runtime/darwinia/src/pallets/polkadot_xcm.rs
@@ -29,7 +29,7 @@ pub type LocalAssetTransactor = xcm_builder::CurrencyAdapter<
 	Balances,
 	// Use this currency when it is a fungible asset matching the given location or name:
 	xcm_builder::IsConcrete<AnchoringSelfReserve>,
-	// Do a simple punn to convert an AccountId32 MultiLocation into a native chain account ID:
+	// Do a simple punn to convert an AccountId32 Location into a native chain account ID:
 	LocationToAccountId,
 	// Our chain's account ID type (we can't get away without mentioning it explicitly):
 	AccountId,
@@ -55,7 +55,7 @@ pub type ForeignFungiblesTransactor = xcm_builder::FungiblesAdapter<
 			xcm_executor::traits::JustTry,
 		>,
 	),
-	// Do a simple punn to convert an AccountId20 MultiLocation into a native chain account ID:
+	// Do a simple punn to convert an AccountId20 Location into a native chain account ID:
 	LocationToAccountId,
 	// Our chain's account ID type (we can't get away without mentioning it explicitly):
 	AccountId,
@@ -75,7 +75,7 @@ frame_support::parameter_types! {
 	pub const RelayNetwork: NetworkId = NetworkId::Polkadot;
 	pub RelayChainOrigin: RuntimeOrigin = cumulus_pallet_xcm::Origin::Relay.into();
 }
-/// Type for specifying how a `MultiLocation` can be converted into an `AccountId`. This is used
+/// Type for specifying how a `Location` can be converted into an `AccountId`. This is used
 /// when determining ownership of accounts for asset transacting and when attempting to use XCM
 /// `Transact` in order to determine the dispatch Origin.
 pub type LocationToAccountId = (
@@ -141,9 +141,9 @@ pub type Barrier = xcm_builder::TrailingSetTopicAsId<
 frame_support::parameter_types! {
 	pub const MaxAssetsIntoHolding: u32 = 64;
 	pub const MaxInstructions: u32 = 100;
-	pub AnchoringSelfReserve: MultiLocation = MultiLocation::new(
+	pub AnchoringSelfReserve: Location = Location::new(
 		0,
-		X1(PalletInstance(<Balances as frame_support::traits::PalletInfoAccess>::index() as u8))
+		Junctions::X1(PalletInstance(<Balances as frame_support::traits::PalletInfoAccess>::index() as u8))
 	);
 	pub UniversalLocation: InteriorMultiLocation = Parachain(ParachainInfo::parachain_id().into()).into();
 	/// The amount of weight an XCM operation takes. This is a safe overestimate.
diff --git a/runtime/koi/src/pallets/asset_manager.rs b/runtime/koi/src/pallets/asset_manager.rs
index ec60d5015..367ee257f 100644
--- a/runtime/koi/src/pallets/asset_manager.rs
+++ b/runtime/koi/src/pallets/asset_manager.rs
@@ -86,15 +86,15 @@ impl pallet_asset_manager::LocalAssetIdCreator<Runtime> for LocalAssetIdCreator
 // Our AssetType. For now we only handle Xcm Assets
 #[derive(Clone, Eq, Debug, PartialEq, Ord, PartialOrd, Encode, Decode, scale_info::TypeInfo)]
 pub enum AssetType {
-	Xcm(MultiLocation),
+	Xcm(Location),
 }
 impl Default for AssetType {
 	fn default() -> Self {
-		Self::Xcm(MultiLocation::here())
+		Self::Xcm(Location::here())
 	}
 }
-impl From<MultiLocation> for AssetType {
-	fn from(location: MultiLocation) -> Self {
+impl From<Location> for AssetType {
+	fn from(location: Location) -> Self {
 		Self::Xcm(location)
 	}
 }
@@ -120,8 +120,8 @@ impl From<AssetType> for crate::AssetId {
 	}
 }
 #[allow(clippy::from_over_into)]
-impl Into<Option<MultiLocation>> for AssetType {
-	fn into(self) -> Option<MultiLocation> {
+impl Into<Option<Location>> for AssetType {
+	fn into(self) -> Option<Location> {
 		match self {
 			Self::Xcm(location) => Some(location),
 		}
@@ -132,7 +132,7 @@ frame_support::parameter_types! {
 	/// 1000 is AssetHub paraId.
 	/// 50 is pallet-assets index on AssetHub.
 	/// 7777 is the id of Test USDT on AssetHub(Rococo).
-	pub UsdtLocation: MultiLocation = MultiLocation::new(
+	pub UsdtLocation: Location = Location::new(
 		1,
 		X3(Parachain(1000), PalletInstance(50), GeneralIndex(7777))
 	);
diff --git a/runtime/koi/src/pallets/orml_xtokens.rs b/runtime/koi/src/pallets/orml_xtokens.rs
index 107ac9b13..503d0fda1 100644
--- a/runtime/koi/src/pallets/orml_xtokens.rs
+++ b/runtime/koi/src/pallets/orml_xtokens.rs
@@ -32,17 +32,17 @@ pub enum CurrencyId {
 	ForeignAsset(crate::AssetId),
 }
 
-// How to convert from CurrencyId to MultiLocation
+// How to convert from CurrencyId to Location
 pub struct CurrencyIdtoMultiLocation<AssetXConverter>(core::marker::PhantomData<AssetXConverter>);
-impl<AssetXConverter> sp_runtime::traits::Convert<CurrencyId, Option<MultiLocation>>
+impl<AssetXConverter> sp_runtime::traits::Convert<CurrencyId, Option<Location>>
 	for CurrencyIdtoMultiLocation<AssetXConverter>
 where
-	AssetXConverter: sp_runtime::traits::MaybeEquivalence<MultiLocation, crate::AssetId>,
+	AssetXConverter: sp_runtime::traits::MaybeEquivalence<Location, crate::AssetId>,
 {
-	fn convert(currency: CurrencyId) -> Option<MultiLocation> {
+	fn convert(currency: CurrencyId) -> Option<Location> {
 		match currency {
 			CurrencyId::SelfReserve => {
-				let multi: MultiLocation = pallets::polkadot_xcm::AnchoringSelfReserve::get();
+				let multi: Location = pallets::polkadot_xcm::AnchoringSelfReserve::get();
 				Some(multi)
 			},
 			CurrencyId::ForeignAsset(asset) => AssetXConverter::convert_back(&asset),
@@ -55,12 +55,12 @@ frame_support::parameter_types! {
 
 	// This is how we are going to detect whether the asset is a Reserve asset
 	// This however is the chain part only
-	pub SelfLocation: MultiLocation = MultiLocation::here();
+	pub SelfLocation: Location = Location::here();
 	// We need this to be able to catch when someone is trying to execute a non-
 	// cross-chain transfer in xtokens through the absolute path way
-	pub SelfLocationAbsolute: MultiLocation = MultiLocation {
+	pub SelfLocationAbsolute: Location = Location {
 		parents:1,
-		interior: Junctions::X1(
+		interior: Junctions::Junctions::X1(
 			Parachain(ParachainInfo::parachain_id().into())
 		)
 	};
diff --git a/runtime/koi/src/pallets/parachain_system.rs b/runtime/koi/src/pallets/parachain_system.rs
index 2af82d21f..b5e9c97b9 100644
--- a/runtime/koi/src/pallets/parachain_system.rs
+++ b/runtime/koi/src/pallets/parachain_system.rs
@@ -26,7 +26,8 @@ frame_support::parameter_types! {
 
 impl cumulus_pallet_parachain_system::Config for Runtime {
 	type CheckAssociatedRelayNumber = cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases;
-	type DmpMessageHandler = DmpQueue;
+	type DmpQueue =
+		frame_support::traits::EnqueueWithOrigin<MessageQueue, pallet_config::RelayOrigin>;
 	type OnSystemEvent = ();
 	type OutboundXcmpMessageSource = XcmpQueue;
 	type ReservedDmpWeight = ReservedDmpWeight;
diff --git a/runtime/koi/src/pallets/polkadot_xcm.rs b/runtime/koi/src/pallets/polkadot_xcm.rs
index 20986a01c..67862ebc0 100644
--- a/runtime/koi/src/pallets/polkadot_xcm.rs
+++ b/runtime/koi/src/pallets/polkadot_xcm.rs
@@ -28,7 +28,7 @@ pub type LocalAssetTransactor = xcm_builder::CurrencyAdapter<
 	Balances,
 	// Use this currency when it is a fungible asset matching the given location or name:
 	xcm_builder::IsConcrete<AnchoringSelfReserve>,
-	// Do a simple punn to convert an AccountId32 MultiLocation into a native chain account ID:
+	// Do a simple punn to convert an AccountId32 Location into a native chain account ID:
 	LocationToAccountId,
 	// Our chain's account ID type (we can't get away without mentioning it explicitly):
 	AccountId,
@@ -54,7 +54,7 @@ pub type ForeignFungiblesTransactor = xcm_builder::FungiblesAdapter<
 			xcm_executor::traits::JustTry,
 		>,
 	),
-	// Do a simple punn to convert an AccountId20 MultiLocation into a native chain account ID:
+	// Do a simple punn to convert an AccountId20 Location into a native chain account ID:
 	LocationToAccountId,
 	// Our chain's account ID type (we can't get away without mentioning it explicitly):
 	AccountId,
@@ -74,7 +74,7 @@ frame_support::parameter_types! {
 	pub const RelayNetwork: NetworkId = NetworkId::Rococo;
 	pub RelayChainOrigin: RuntimeOrigin = cumulus_pallet_xcm::Origin::Relay.into();
 }
-/// Type for specifying how a `MultiLocation` can be converted into an `AccountId`. This is used
+/// Type for specifying how a `Location` can be converted into an `AccountId`. This is used
 /// when determining ownership of accounts for asset transacting and when attempting to use XCM
 /// `Transact` in order to determine the dispatch Origin.
 pub type LocationToAccountId = (
@@ -140,9 +140,9 @@ pub type Barrier = xcm_builder::TrailingSetTopicAsId<
 frame_support::parameter_types! {
 	pub const MaxAssetsIntoHolding: u32 = 64;
 	pub const MaxInstructions: u32 = 100;
-	pub AnchoringSelfReserve: MultiLocation = MultiLocation::new(
+	pub AnchoringSelfReserve: Location = Location::new(
 		0,
-		X1(PalletInstance(<Balances as frame_support::traits::PalletInfoAccess>::index() as u8))
+		Junctions::X1(PalletInstance(<Balances as frame_support::traits::PalletInfoAccess>::index() as u8))
 	);
 	pub UniversalLocation: InteriorMultiLocation = Parachain(ParachainInfo::parachain_id().into()).into();
 	/// The amount of weight an XCM operation takes. This is a safe overestimate.

From 97466dcfe2844194541d08c13044601d2e8b4ea9 Mon Sep 17 00:00:00 2001
From: Xavier Lau <xavier@inv.cafe>
Date: Tue, 25 Jun 2024 16:36:26 +0800
Subject: [PATCH 28/59] paritytech/polkadot-sdk#1246

---
 Cargo.lock                                    |  23 +--
 Cargo.toml                                    |   1 +
 runtime/common/Cargo.toml                     |  54 ++++---
 runtime/common/src/lib.rs                     |   2 +-
 runtime/common/src/message_queue.rs           |  59 +++++++
 runtime/common/src/pallet_config.rs           |  12 +-
 runtime/common/src/xcm_configs.rs             |  38 ++---
 runtime/crab/Cargo.toml                       | 147 ++++++++----------
 runtime/crab/src/lib.rs                       |  15 +-
 runtime/crab/src/pallets.rs                   |   2 +
 runtime/crab/src/pallets/dmp_queue.rs         |   5 +-
 runtime/crab/src/pallets/message_queue.rs     |  46 ++++++
 runtime/crab/src/pallets/parachain_system.rs  |   3 +-
 runtime/crab/src/pallets/polkadot_xcm.rs      |   8 +-
 runtime/crab/src/pallets/xcmp_queue.rs        |  10 +-
 runtime/darwinia/Cargo.toml                   | 147 ++++++++----------
 runtime/darwinia/src/lib.rs                   |  15 +-
 runtime/darwinia/src/pallets.rs               |   2 +
 runtime/darwinia/src/pallets/dmp_queue.rs     |   5 +-
 runtime/darwinia/src/pallets/message_queue.rs |  46 ++++++
 runtime/darwinia/src/pallets/xcmp_queue.rs    |  10 +-
 runtime/koi/Cargo.toml                        | 147 ++++++++----------
 runtime/koi/src/lib.rs                        |   8 +-
 runtime/koi/src/pallets.rs                    |   2 +
 runtime/koi/src/pallets/dmp_queue.rs          |   5 +-
 runtime/koi/src/pallets/message_queue.rs      |  46 ++++++
 runtime/koi/src/pallets/xcmp_queue.rs         |  10 +-
 27 files changed, 522 insertions(+), 346 deletions(-)
 create mode 100644 runtime/common/src/message_queue.rs
 create mode 100644 runtime/crab/src/pallets/message_queue.rs
 create mode 100644 runtime/darwinia/src/pallets/message_queue.rs
 create mode 100644 runtime/koi/src/pallets/message_queue.rs

diff --git a/Cargo.lock b/Cargo.lock
index 31a875d50..98bfdc127 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1664,6 +1664,7 @@ dependencies = [
  "pallet-evm-precompile-dispatch",
  "pallet-evm-precompile-modexp",
  "pallet-evm-precompile-simple",
+ "pallet-message-queue",
  "pallet-preimage",
  "pallet-proxy",
  "pallet-referenda",
@@ -2740,6 +2741,7 @@ dependencies = [
 name = "darwinia-common-runtime"
 version = "6.6.3"
 dependencies = [
+ "cumulus-primitives-core",
  "darwinia-precompile-assets",
  "dc-primitives",
  "fp-account",
@@ -2751,6 +2753,7 @@ dependencies = [
  "pallet-balances",
  "pallet-collective",
  "pallet-evm",
+ "pallet-message-queue",
  "parity-scale-codec",
  "scale-info",
  "smallvec",
@@ -2965,6 +2968,7 @@ dependencies = [
  "pallet-evm-precompile-dispatch",
  "pallet-evm-precompile-modexp",
  "pallet-evm-precompile-simple",
+ "pallet-message-queue",
  "pallet-preimage",
  "pallet-proxy",
  "pallet-referenda",
@@ -5927,6 +5931,7 @@ dependencies = [
  "pallet-evm-precompile-dispatch",
  "pallet-evm-precompile-modexp",
  "pallet-evm-precompile-simple",
+ "pallet-message-queue",
  "pallet-preimage",
  "pallet-proxy",
  "pallet-referenda",
@@ -13961,7 +13966,7 @@ dependencies = [
 [[package]]
 name = "sp-crypto-ec-utils"
 version = "0.10.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#7b6b783cd1a3953ef5fa6e53f3965b1454e3efc8"
+source = "git+https://github.com/paritytech/polkadot-sdk#63e264446f6cabff06be72912eae902662dcb699"
 dependencies = [
  "ark-bls12-377",
  "ark-bls12-377-ext",
@@ -14023,7 +14028,7 @@ dependencies = [
 [[package]]
 name = "sp-debug-derive"
 version = "14.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#7b6b783cd1a3953ef5fa6e53f3965b1454e3efc8"
+source = "git+https://github.com/paritytech/polkadot-sdk#63e264446f6cabff06be72912eae902662dcb699"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -14044,7 +14049,7 @@ dependencies = [
 [[package]]
 name = "sp-externalities"
 version = "0.25.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#7b6b783cd1a3953ef5fa6e53f3965b1454e3efc8"
+source = "git+https://github.com/paritytech/polkadot-sdk#63e264446f6cabff06be72912eae902662dcb699"
 dependencies = [
  "environmental",
  "parity-scale-codec",
@@ -14262,7 +14267,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface"
 version = "24.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#7b6b783cd1a3953ef5fa6e53f3965b1454e3efc8"
+source = "git+https://github.com/paritytech/polkadot-sdk#63e264446f6cabff06be72912eae902662dcb699"
 dependencies = [
  "bytes",
  "impl-trait-for-tuples",
@@ -14294,7 +14299,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface-proc-macro"
 version = "17.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#7b6b783cd1a3953ef5fa6e53f3965b1454e3efc8"
+source = "git+https://github.com/paritytech/polkadot-sdk#63e264446f6cabff06be72912eae902662dcb699"
 dependencies = [
  "Inflector",
  "expander 2.0.0",
@@ -14387,7 +14392,7 @@ source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot
 [[package]]
 name = "sp-std"
 version = "14.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#7b6b783cd1a3953ef5fa6e53f3965b1454e3efc8"
+source = "git+https://github.com/paritytech/polkadot-sdk#63e264446f6cabff06be72912eae902662dcb699"
 
 [[package]]
 name = "sp-storage"
@@ -14405,7 +14410,7 @@ dependencies = [
 [[package]]
 name = "sp-storage"
 version = "19.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#7b6b783cd1a3953ef5fa6e53f3965b1454e3efc8"
+source = "git+https://github.com/paritytech/polkadot-sdk#63e264446f6cabff06be72912eae902662dcb699"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -14442,7 +14447,7 @@ dependencies = [
 [[package]]
 name = "sp-tracing"
 version = "16.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#7b6b783cd1a3953ef5fa6e53f3965b1454e3efc8"
+source = "git+https://github.com/paritytech/polkadot-sdk#63e264446f6cabff06be72912eae902662dcb699"
 dependencies = [
  "parity-scale-codec",
  "tracing",
@@ -14542,7 +14547,7 @@ dependencies = [
 [[package]]
 name = "sp-wasm-interface"
 version = "20.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#7b6b783cd1a3953ef5fa6e53f3965b1454e3efc8"
+source = "git+https://github.com/paritytech/polkadot-sdk#63e264446f6cabff06be72912eae902662dcb699"
 dependencies = [
  "impl-trait-for-tuples",
  "log",
diff --git a/Cargo.toml b/Cargo.toml
index f2ac146ea..976d58c35 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -135,6 +135,7 @@ pallet-balances                            = { git = "https://github.com/parityt
 pallet-collective                          = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
 pallet-conviction-voting                   = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
 pallet-democracy                           = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+pallet-message-queue                       = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
 pallet-preimage                            = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
 pallet-proxy                               = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
 pallet-referenda                           = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml
index c265fc5a5..f6dc377ed 100644
--- a/runtime/common/Cargo.toml
+++ b/runtime/common/Cargo.toml
@@ -21,22 +21,22 @@ dc-primitives              = { workspace = true }
 fp-account = { workspace = true }
 pallet-evm = { workspace = true }
 
-# polkadot
-xcm          = { workspace = true }
-xcm-builder  = { workspace = true }
-xcm-executor = { workspace = true }
-
-# substrate
-frame-support     = { workspace = true }
-frame-system      = { workspace = true }
-pallet-assets     = { workspace = true, optional = true }
-pallet-authorship = { workspace = true }
-pallet-balances   = { workspace = true }
-pallet-collective = { workspace = true }
-sp-core           = { workspace = true }
-sp-io             = { workspace = true }
-sp-runtime        = { workspace = true }
-sp-std            = { workspace = true }
+# polkadot-sdk
+cumulus-primitives-core = { workspace = true }
+frame-support           = { workspace = true }
+frame-system            = { workspace = true }
+pallet-assets           = { workspace = true, optional = true }
+pallet-authorship       = { workspace = true }
+pallet-balances         = { workspace = true }
+pallet-collective       = { workspace = true }
+pallet-message-queue    = { workspace = true }
+sp-core                 = { workspace = true }
+sp-io                   = { workspace = true }
+sp-runtime              = { workspace = true }
+sp-std                  = { workspace = true }
+xcm                     = { workspace = true }
+xcm-builder             = { workspace = true }
+xcm-executor            = { workspace = true }
 
 [features]
 default = ["std"]
@@ -54,27 +54,35 @@ std = [
 	"fp-account/std",
 	"pallet-evm/std",
 
-	# polkadot
-	"xcm-builder/std",
-	"xcm-executor/std",
-	"xcm/std",
-
-	# substrate
+	# polkadot-sdk
+	"cumulus-primitives-core/std",
 	"frame-support/std",
 	"frame-system/std",
 	"pallet-authorship/std",
 	"pallet-balances/std",
 	"pallet-collective/std",
+	"pallet-message-queue/std",
 	"sp-core/std",
 	"sp-io/std",
 	"sp-runtime/std",
 	"sp-std/std",
-	# substrate optional
+	"xcm-builder/std",
+	"xcm-executor/std",
+	"xcm/std",
+	# polkadot-sdk optional
 	"pallet-assets?/std",
 ]
 
 test = []
 
 runtime-benchmarks = [
+	# polkadot-sdk
+	"frame-support/runtime-benchmarks",
+	"frame-system/runtime-benchmarks",
+	"pallet-balances/runtime-benchmarks",
+	"pallet-collective/runtime-benchmarks",
+	"pallet-message-queue/runtime-benchmarks",
+	"sp-runtime/runtime-benchmarks",
+	# polkadot-sdk optional
 	"pallet-assets/runtime-benchmarks",
 ]
diff --git a/runtime/common/src/lib.rs b/runtime/common/src/lib.rs
index 2b4a13c04..bf852b1b8 100644
--- a/runtime/common/src/lib.rs
+++ b/runtime/common/src/lib.rs
@@ -17,11 +17,11 @@
 // along with Darwinia. If not, see <https://www.gnu.org/licenses/>.
 
 #![cfg_attr(not(feature = "std"), no_std)]
-#![deny(unused_crate_dependencies)]
 // TODO:
 // #![deny(missing_docs)]
 
 pub mod gov_origin;
+pub mod message_queue;
 pub mod migration_helper;
 pub mod pallet_config;
 pub mod xcm_configs;
diff --git a/runtime/common/src/message_queue.rs b/runtime/common/src/message_queue.rs
new file mode 100644
index 000000000..9a3ff1e50
--- /dev/null
+++ b/runtime/common/src/message_queue.rs
@@ -0,0 +1,59 @@
+// This file is part of Darwinia.
+//
+// Copyright (C) Darwinia Network
+// SPDX-License-Identifier: GPL-3.0
+//
+// Darwinia is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Darwinia is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Darwinia. If not, see <https://www.gnu.org/licenses/>.
+
+//! Helpers to deal with configuring the message queue in the runtime.
+
+// core
+use core::marker::PhantomData;
+// polkadot-sdk
+use cumulus_primitives_core::{AggregateMessageOrigin, ParaId};
+use frame_support::traits::{QueueFootprint, QueuePausedQuery};
+use pallet_message_queue::OnQueueChanged;
+use sp_runtime::traits::Convert;
+
+/// Narrow the scope of the `Inner` query from `AggregateMessageOrigin` to `ParaId`.
+///
+/// All non-`Sibling` variants will be ignored.
+pub struct NarrowOriginToSibling<Inner>(PhantomData<Inner>);
+impl<Inner: QueuePausedQuery<ParaId>> QueuePausedQuery<AggregateMessageOrigin>
+	for NarrowOriginToSibling<Inner>
+{
+	fn is_paused(origin: &AggregateMessageOrigin) -> bool {
+		match origin {
+			AggregateMessageOrigin::Sibling(id) => Inner::is_paused(id),
+			_ => false,
+		}
+	}
+}
+impl<Inner: OnQueueChanged<ParaId>> OnQueueChanged<AggregateMessageOrigin>
+	for NarrowOriginToSibling<Inner>
+{
+	fn on_queue_changed(origin: AggregateMessageOrigin, fp: QueueFootprint) {
+		if let AggregateMessageOrigin::Sibling(id) = origin {
+			Inner::on_queue_changed(id, fp)
+		}
+	}
+}
+
+/// Convert a sibling `ParaId` to an `AggregateMessageOrigin`.
+pub struct ParaIdToSibling;
+impl Convert<ParaId, AggregateMessageOrigin> for ParaIdToSibling {
+	fn convert(para_id: ParaId) -> AggregateMessageOrigin {
+		AggregateMessageOrigin::Sibling(para_id)
+	}
+}
diff --git a/runtime/common/src/pallet_config.rs b/runtime/common/src/pallet_config.rs
index e2efac3e8..8eda204f2 100644
--- a/runtime/common/src/pallet_config.rs
+++ b/runtime/common/src/pallet_config.rs
@@ -1,8 +1,6 @@
 // darwinia
-use crate::gov_origin::ROOT;
-use dc_primitives::{AccountId, Balance};
+use dc_primitives::*;
 // substrate
-use frame_support::{traits::LockIdentifier, PalletId};
 use sp_std::prelude::*;
 
 #[cfg(not(feature = "runtime-benchmarks"))]
@@ -11,12 +9,14 @@ pub const EXISTENTIAL_DEPOSIT: Balance = 0;
 pub const EXISTENTIAL_DEPOSIT: Balance = 1;
 
 frame_support::parameter_types! {
-	pub const TreasuryPid: PalletId = PalletId(*b"da/trsry");
+	pub const TreasuryPid: frame_support::PalletId = frame_support::PalletId(*b"da/trsry");
 
-	pub const FeeMarketLid: LockIdentifier = *b"da/feecr";
+	pub const FeeMarketLid: frame_support::traits::LockIdentifier = *b"da/feecr";
 
 	pub const ExistentialDeposit: Balance = EXISTENTIAL_DEPOSIT;
 	pub const MaxBalance: Balance = Balance::max_value();
 
-	pub  AssetCreators: Vec<AccountId> = vec![ROOT];
+	pub const RelayOrigin: cumulus_primitives_core::AggregateMessageOrigin = cumulus_primitives_core::AggregateMessageOrigin::Parent;
+
+	pub  AssetCreators: Vec<AccountId> = vec![super::gov_origin::ROOT];
 }
diff --git a/runtime/common/src/xcm_configs.rs b/runtime/common/src/xcm_configs.rs
index f0a5b8b40..0ffae01ac 100644
--- a/runtime/common/src/xcm_configs.rs
+++ b/runtime/common/src/xcm_configs.rs
@@ -22,14 +22,7 @@ use core::marker::PhantomData;
 use codec::Encode;
 // darwinia
 use dc_primitives::GWEI;
-// polkadot
-use xcm::latest::{prelude::*, Weight as XcmWeight};
-use xcm_builder::TakeRevenue;
-use xcm_executor::{
-	traits::{ConvertLocation, WeightTrader},
-	Assets,
-};
-// substrate
+// polkadot-sdk
 use frame_support::{
 	pallet_prelude::*,
 	traits::{tokens::currency::Currency as CurrencyT, ConstU128, OnUnbalanced as OnUnbalancedT},
@@ -39,28 +32,31 @@ use sp_core::Get;
 use sp_io::hashing::blake2_256;
 use sp_runtime::traits::{SaturatedConversion, Saturating, Zero};
 use sp_std::{prelude::*, result::Result};
+use xcm::latest::{prelude::*, Weight as XcmWeight};
+use xcm_builder::TakeRevenue;
+use xcm_executor::traits::{ConvertLocation, WeightTrader};
 
 /// Base balance required for the XCM unit weight.
 pub type XcmBaseWeightFee = ConstU128<GWEI>;
 
 frame_support::match_types! {
-	pub type ParentOrParentsExecutivePlurality: impl Contains<MultiLocation> = {
-		MultiLocation { parents: 1, interior: Here } |
-		MultiLocation { parents: 1, interior: X1(Plurality { id: BodyId::Executive, .. }) }
+	pub type ParentOrParentsExecutivePlurality: impl Contains<Location> = {
+		Location { parents: 1, interior: Here } |
+		Location { parents: 1, interior: Junctions::X1(Plurality { id: BodyId::Executive, .. }) }
 	};
-	pub type ParentOrSiblings: impl Contains<MultiLocation> = {
-		MultiLocation { parents: 1, interior: Here } |
-		MultiLocation { parents: 1, interior: X1(_) }
+	pub type ParentOrSiblings: impl Contains<Location> = {
+		Location { parents: 1, interior: Here } |
+		Location { parents: 1, interior: Junctions::X1(_) }
 	};
 }
 
-/// Struct that converts a given MultiLocation into a 20 bytes account id by hashing
+/// Struct that converts a given Location into a 20 bytes account id by hashing
 /// with blake2_256 and taking the first 20 bytes
 pub struct Account20Hash<AccountId>(PhantomData<AccountId>);
 impl<AccountId: From<[u8; 20]> + Into<[u8; 20]> + Clone> ConvertLocation<AccountId>
 	for Account20Hash<AccountId>
 {
-	fn convert_location(location: &MultiLocation) -> Option<AccountId> {
+	fn convert_location(location: &Location) -> Option<AccountId> {
 		let hash: [u8; 32] = ("multiloc", location).using_encoded(blake2_256);
 		let mut account_id = [0u8; 20];
 
@@ -74,7 +70,7 @@ impl<AccountId: From<[u8; 20]> + Into<[u8; 20]> + Clone> ConvertLocation<Account
 /// account. Refer to: https://github.com/paritytech/polkadot/blob/release-v0.9.30/xcm/xcm-builder/src/weight.rs#L242-L305
 pub struct LocalAssetTrader<
 	WeightToFee: WeightToFeeT<Balance = Currency::Balance>,
-	AssetId: Get<MultiLocation>,
+	AssetId: Get<Location>,
 	AccountId,
 	Currency: CurrencyT<AccountId>,
 	OnUnbalanced: OnUnbalancedT<Currency::NegativeImbalance>,
@@ -86,7 +82,7 @@ pub struct LocalAssetTrader<
 );
 impl<
 		WeightToFee: WeightToFeeT<Balance = Currency::Balance>,
-		AssetId: Get<MultiLocation>,
+		AssetId: Get<Location>,
 		AccountId,
 		Currency: CurrencyT<AccountId>,
 		OnUnbalanced: OnUnbalancedT<Currency::NegativeImbalance>,
@@ -107,7 +103,7 @@ impl<
 		{:?}", weight, payment);
 		let amount = WeightToFee::weight_to_fee(&weight);
 		let u128_amount: u128 = amount.try_into().map_err(|_| XcmError::Overflow)?;
-		let required: MultiAsset = (Concrete(AssetId::get()), u128_amount).into();
+		let required: Assets = (Concrete(AssetId::get()), u128_amount).into();
 		let unused = payment.checked_sub(required.clone()).map_err(|_| XcmError::TooExpensive)?;
 		self.0 = self.0.saturating_add(weight);
 		self.1 = self.1.saturating_add(amount);
@@ -132,7 +128,7 @@ impl<
 }
 impl<
 		WeightToFee: WeightToFeeT<Balance = Currency::Balance>,
-		AssetId: Get<MultiLocation>,
+		AssetId: Get<Location>,
 		AccountId,
 		Currency: CurrencyT<AccountId>,
 		OnUnbalanced: OnUnbalancedT<Currency::NegativeImbalance>,
@@ -145,7 +141,7 @@ impl<
 }
 
 // TODO: move to other place.
-#[derive(Clone, Default, Eq, Debug, PartialEq, Ord, PartialOrd, Encode, Decode, TypeInfo)]
+#[derive(Clone, Debug, Default, Eq, PartialEq, Ord, PartialOrd, Encode, Decode, TypeInfo)]
 pub struct AssetRegistrarMetadata {
 	pub name: Vec<u8>,
 	pub symbol: Vec<u8>,
diff --git a/runtime/crab/Cargo.toml b/runtime/crab/Cargo.toml
index ec4acc7a8..373364876 100644
--- a/runtime/crab/Cargo.toml
+++ b/runtime/crab/Cargo.toml
@@ -7,7 +7,7 @@ readme            = "README.md"
 version.workspace = true
 
 [build-dependencies]
-# substrate optional
+# polkadot-sdk optional
 substrate-wasm-builder = { workspace = true, optional = true }
 
 [dependencies]
@@ -21,18 +21,6 @@ strum             = { workspace = true, features = ["derive"] }
 # TODO: optional
 array-bytes = { workspace = true }
 
-# cumulus
-cumulus-pallet-aura-ext         = { workspace = true }
-cumulus-pallet-dmp-queue        = { workspace = true }
-cumulus-pallet-parachain-system = { workspace = true }
-cumulus-pallet-xcm              = { workspace = true }
-cumulus-pallet-xcmp-queue       = { workspace = true }
-cumulus-primitives-core         = { workspace = true }
-cumulus-primitives-utility      = { workspace = true }
-parachain-info                  = { workspace = true }
-# cumulus optional
-cumulus-pallet-session-benchmarking = { workspace = true, optional = true }
-
 # darwinia
 darwinia-account-migration        = { workspace = true }
 darwinia-common-runtime           = { workspace = true }
@@ -65,15 +53,14 @@ pallet-evm-precompile-conviction-voting = { workspace = true }
 precompile-utils                        = { workspace = true }
 xcm-primitives                          = { workspace = true }
 
-# polkadot
-pallet-xcm              = { workspace = true }
-polkadot-parachain      = { workspace = true }
-polkadot-runtime-common = { workspace = true }
-xcm                     = { workspace = true }
-xcm-builder             = { workspace = true }
-xcm-executor            = { workspace = true }
-
-# substrate
+# polkadot-sdk
+cumulus-pallet-aura-ext                    = { workspace = true }
+cumulus-pallet-dmp-queue                   = { workspace = true }
+cumulus-pallet-parachain-system            = { workspace = true }
+cumulus-pallet-xcm                         = { workspace = true }
+cumulus-pallet-xcmp-queue                  = { workspace = true }
+cumulus-primitives-core                    = { workspace = true }
+cumulus-primitives-utility                 = { workspace = true }
 frame-executive                            = { workspace = true }
 frame-support                              = { workspace = true }
 frame-system                               = { workspace = true }
@@ -85,6 +72,7 @@ pallet-balances                            = { workspace = true }
 pallet-collective                          = { workspace = true }
 pallet-conviction-voting                   = { workspace = true }
 pallet-democracy                           = { workspace = true }
+pallet-message-queue                       = { workspace = true }
 pallet-preimage                            = { workspace = true }
 pallet-proxy                               = { workspace = true }
 pallet-referenda                           = { workspace = true }
@@ -97,6 +85,10 @@ pallet-treasury                            = { workspace = true }
 pallet-tx-pause                            = { workspace = true }
 pallet-utility                             = { workspace = true }
 pallet-whitelist                           = { workspace = true }
+pallet-xcm                                 = { workspace = true }
+parachain-info                             = { workspace = true }
+polkadot-parachain                         = { workspace = true }
+polkadot-runtime-common                    = { workspace = true }
 sp-api                                     = { workspace = true }
 sp-block-builder                           = { workspace = true }
 sp-consensus-aura                          = { workspace = true }
@@ -111,19 +103,22 @@ sp-staking                                 = { workspace = true }
 sp-std                                     = { workspace = true }
 sp-transaction-pool                        = { workspace = true }
 sp-version                                 = { workspace = true }
-# substrate optional
-frame-benchmarking        = { workspace = true, optional = true }
-frame-system-benchmarking = { workspace = true, optional = true }
-frame-try-runtime         = { workspace = true, optional = true }
+xcm                                        = { workspace = true }
+xcm-builder                                = { workspace = true }
+xcm-executor                               = { workspace = true }
+# polkadot-sdk optional
+cumulus-pallet-session-benchmarking = { workspace = true, optional = true }
+frame-benchmarking                  = { workspace = true, optional = true }
+frame-system-benchmarking           = { workspace = true, optional = true }
+frame-try-runtime                   = { workspace = true, optional = true }
 
 [dev-dependencies]
 # darwinia
 darwinia-common-runtime = { workspace = true, features = ["std", "test"] }
-# polkadot
+# polkadot-sdk
 polkadot-primitives = { workspace = true, features = ["std"] }
-# substrate
-sp-io      = { workspace = true, features = ["std"] }
-sp-keyring = { workspace = true }
+sp-io               = { workspace = true, features = ["std"] }
+sp-keyring          = { workspace = true }
 
 [features]
 default = ["std"]
@@ -134,18 +129,6 @@ std = [
 	"scale-info/std",
 	"strum/std",
 
-	# cumulus
-	"cumulus-pallet-aura-ext/std",
-	"cumulus-pallet-dmp-queue/std",
-	"cumulus-pallet-parachain-system/std",
-	"cumulus-pallet-xcm/std",
-	"cumulus-pallet-xcmp-queue/std",
-	"cumulus-primitives-core/std",
-	"cumulus-primitives-utility/std",
-	"parachain-info/std",
-	# cumulus optional
-	"cumulus-pallet-session-benchmarking?/std",
-
 	# darwinia
 	"darwinia-account-migration/std",
 	"darwinia-common-runtime/std",
@@ -178,15 +161,14 @@ std = [
 	"precompile-utils/std",
 	"xcm-primitives/std",
 
-	# polkadot
-	"pallet-xcm/std",
-	"polkadot-parachain/std",
-	"polkadot-runtime-common/std",
-	"xcm-builder/std",
-	"xcm-executor/std",
-	"xcm/std",
-
-	# substrate
+	# polkadot-sdk
+	"cumulus-pallet-aura-ext/std",
+	"cumulus-pallet-dmp-queue/std",
+	"cumulus-pallet-parachain-system/std",
+	"cumulus-pallet-xcm/std",
+	"cumulus-pallet-xcmp-queue/std",
+	"cumulus-primitives-core/std",
+	"cumulus-primitives-utility/std",
 	"frame-executive/std",
 	"frame-support/std",
 	"frame-system-rpc-runtime-api/std",
@@ -198,6 +180,7 @@ std = [
 	"pallet-collective/std",
 	"pallet-conviction-voting/std",
 	"pallet-democracy/std",
+	"pallet-message-queue/std",
 	"pallet-preimage/std",
 	"pallet-proxy/std",
 	"pallet-referenda/std",
@@ -210,6 +193,10 @@ std = [
 	"pallet-tx-pause/std",
 	"pallet-utility/std",
 	"pallet-whitelist/std",
+	"pallet-xcm/std",
+	"parachain-info/std",
+	"polkadot-parachain/std",
+	"polkadot-runtime-common/std",
 	"sp-api/std",
 	"sp-block-builder/std",
 	"sp-consensus-aura/std",
@@ -224,7 +211,11 @@ std = [
 	"sp-std/std",
 	"sp-transaction-pool/std",
 	"sp-version/std",
-	# substrate optional
+	"xcm-builder/std",
+	"xcm-executor/std",
+	"xcm/std",
+	# polkadot-sdk optional
+	"cumulus-pallet-session-benchmarking?/std",
 	"frame-benchmarking?/std",
 	"frame-system-benchmarking?/std",
 	"frame-try-runtime?/std",
@@ -256,12 +247,6 @@ runtime-benchmarks = [
 	# TODO: optional
 	# "array-bytes
 
-	# cumulus
-	"cumulus-pallet-parachain-system/runtime-benchmarks",
-	"cumulus-pallet-xcmp-queue/runtime-benchmarks",
-	# cumulus optional
-	"cumulus-pallet-session-benchmarking/runtime-benchmarks",
-
 	# darwinia
 	"darwinia-account-migration/runtime-benchmarks",
 	"darwinia-common-runtime/runtime-benchmarks",
@@ -278,14 +263,9 @@ runtime-benchmarks = [
 	# moonbeam
 	"xcm-primitives/runtime-benchmarks",
 
-	# polkadot
-	"pallet-xcm/runtime-benchmarks",
-	"polkadot-parachain/runtime-benchmarks",
-	"polkadot-runtime-common/runtime-benchmarks",
-	"xcm-builder/runtime-benchmarks",
-	"xcm-executor/runtime-benchmarks",
-
-	# substrate
+	# polkadot-sdk
+	"cumulus-pallet-parachain-system/runtime-benchmarks",
+	"cumulus-pallet-xcmp-queue/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 	"pallet-assets/runtime-benchmarks",
@@ -293,6 +273,7 @@ runtime-benchmarks = [
 	"pallet-collective/runtime-benchmarks",
 	"pallet-conviction-voting/runtime-benchmarks",
 	"pallet-democracy/runtime-benchmarks",
+	"pallet-message-queue/runtime-benchmarks",
 	"pallet-preimage/runtime-benchmarks",
 	"pallet-proxy/runtime-benchmarks",
 	"pallet-referenda/runtime-benchmarks",
@@ -302,22 +283,20 @@ runtime-benchmarks = [
 	"pallet-tx-pause/runtime-benchmarks",
 	"pallet-utility/runtime-benchmarks",
 	"pallet-whitelist/runtime-benchmarks",
+	"pallet-xcm/runtime-benchmarks",
+	"polkadot-parachain/runtime-benchmarks",
+	"polkadot-runtime-common/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
-	# substrate optional
+	"xcm-builder/runtime-benchmarks",
+	"xcm-executor/runtime-benchmarks",
+	# polkadot-sdk optional
+	"cumulus-pallet-session-benchmarking/runtime-benchmarks",
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-system-benchmarking/runtime-benchmarks",
 	"sp-staking/runtime-benchmarks",
 ]
 
 try-runtime = [
-	# cumulus
-	"cumulus-pallet-aura-ext/try-runtime",
-	"cumulus-pallet-dmp-queue/try-runtime",
-	"cumulus-pallet-parachain-system/try-runtime",
-	"cumulus-pallet-xcm/try-runtime",
-	"cumulus-pallet-xcmp-queue/try-runtime",
-	"parachain-info/try-runtime",
-
 	# darwinia
 	"darwinia-account-migration/try-runtime",
 	"darwinia-deposit/try-runtime",
@@ -329,11 +308,12 @@ try-runtime = [
 	"pallet-ethereum/try-runtime",
 	"pallet-evm/try-runtime",
 
-	# polkadot
-	"pallet-xcm/try-runtime",
-	"polkadot-runtime-common/try-runtime",
-
-	# substrate
+	# polkadot-sdk
+	"cumulus-pallet-aura-ext/try-runtime",
+	"cumulus-pallet-dmp-queue/try-runtime",
+	"cumulus-pallet-parachain-system/try-runtime",
+	"cumulus-pallet-xcm/try-runtime",
+	"cumulus-pallet-xcmp-queue/try-runtime",
 	"frame-executive/try-runtime",
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
@@ -344,6 +324,7 @@ try-runtime = [
 	"pallet-collective/try-runtime",
 	"pallet-conviction-voting/try-runtime",
 	"pallet-democracy/try-runtime",
+	"pallet-message-queue/try-runtime",
 	"pallet-preimage/try-runtime",
 	"pallet-proxy/try-runtime",
 	"pallet-referenda/try-runtime",
@@ -355,8 +336,10 @@ try-runtime = [
 	"pallet-tx-pause/try-runtime",
 	"pallet-utility/try-runtime",
 	"pallet-whitelist/try-runtime",
+	"pallet-xcm/try-runtime",
+	"parachain-info/try-runtime",
+	"polkadot-runtime-common/try-runtime",
 	"sp-runtime/try-runtime",
-	# substrate optional
+	# polkadot-sdk optional
 	"frame-try-runtime/try-runtime",
-	"sp-runtime/try-runtime",
 ]
diff --git a/runtime/crab/src/lib.rs b/runtime/crab/src/lib.rs
index f6df36468..d4f142f43 100644
--- a/runtime/crab/src/lib.rs
+++ b/runtime/crab/src/lib.rs
@@ -142,35 +142,30 @@ frame_support::construct_runtime! {
 		PolkadotXcm: pallet_xcm = 33,
 		CumulusXcm: cumulus_pallet_xcm = 34,
 		DmpQueue: cumulus_pallet_dmp_queue = 35,
+		MessageQueue: pallet_message_queue = 39,
 
 		// EVM stuff.
 		Ethereum: pallet_ethereum = 36,
 		EVM: pallet_evm = 37,
 		EthTxForwarder: darwinia_ethtx_forwarder = 38,
-
-		// // Crab <> Darwinia
-		// BridgePolkadotGrandpa: pallet_bridge_grandpa::<Instance1> = 39,
-		// BridgePolkadotParachain: pallet_bridge_parachains::<Instance1> = 40,
-		// BridgeDarwiniaMessages: pallet_bridge_messages::<Instance1> = 41,
-		// BridgeDarwiniaDispatch: pallet_bridge_dispatch::<Instance1> = 42,
-		// DarwiniaFeeMarket: pallet_fee_market::<Instance1> = 43
 	}
 }
 
 #[cfg(feature = "runtime-benchmarks")]
 frame_benchmarking::define_benchmarks! {
-	// cumulus
-	[cumulus_pallet_xcmp_queue, XcmpQueue]
 	// darwinia
 	[darwinia_account_migration, AccountMigration]
 	[darwinia_deposit, Deposit]
 	[darwinia_staking, DarwiniaStaking]
-	// substrate
+	// polkadot-sdk
+	[cumulus_pallet_parachain_system, ParachainSystem]
+	[cumulus_pallet_xcmp_queue, XcmpQueue]
 	[frame_system, SystemBench::<Runtime>]
 	[pallet_assets, Assets]
 	[pallet_balances, Balances]
 	[pallet_collective, TechnicalCommittee]
 	[pallet_conviction_voting, ConvictionVoting]
+	[pallet_message_queue, MessageQueue]
 	[pallet_preimage, Preimage]
 	[pallet_proxy, Proxy]
 	[pallet_referenda, Referenda]
diff --git a/runtime/crab/src/pallets.rs b/runtime/crab/src/pallets.rs
index ae7da0478..ee1f9cccb 100644
--- a/runtime/crab/src/pallets.rs
+++ b/runtime/crab/src/pallets.rs
@@ -85,6 +85,8 @@ pub use polkadot_xcm::*;
 
 mod dmp_queue;
 
+mod message_queue;
+
 // EVM stuff.
 mod ethereum;
 
diff --git a/runtime/crab/src/pallets/dmp_queue.rs b/runtime/crab/src/pallets/dmp_queue.rs
index 8c6961191..a1464981b 100644
--- a/runtime/crab/src/pallets/dmp_queue.rs
+++ b/runtime/crab/src/pallets/dmp_queue.rs
@@ -20,7 +20,8 @@
 use crate::*;
 
 impl cumulus_pallet_dmp_queue::Config for Runtime {
-	type ExecuteOverweightOrigin = Root;
+	type DmpSink =
+		frame_support::traits::EnqueueWithOrigin<MessageQueue, pallet_config::RelayOrigin>;
 	type RuntimeEvent = RuntimeEvent;
-	type XcmExecutor = xcm_executor::XcmExecutor<XcmExecutorConfig>;
+	type WeightInfo = ();
 }
diff --git a/runtime/crab/src/pallets/message_queue.rs b/runtime/crab/src/pallets/message_queue.rs
new file mode 100644
index 000000000..58643817f
--- /dev/null
+++ b/runtime/crab/src/pallets/message_queue.rs
@@ -0,0 +1,46 @@
+// This file is part of Darwinia.
+//
+// Copyright (C) Darwinia Network
+// SPDX-License-Identifier: GPL-3.0
+//
+// Darwinia is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Darwinia is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Darwinia. If not, see <https://www.gnu.org/licenses/>.
+
+// darwinia
+use crate::*;
+
+frame_support::parameter_types! {
+	pub MessageQueueServiceWeight: frame_support::weights::Weight = sp_runtime::Perbill::from_percent(35) * RuntimeBlockWeights::get().max_block;
+}
+
+impl pallet_message_queue::Config for Runtime {
+	type HeapSize = sp_core::ConstU32<{ 64 * 1024 }>;
+	type MaxStale = sp_core::ConstU32<8>;
+	#[cfg(feature = "runtime-benchmarks")]
+	type MessageProcessor = pallet_message_queue::mock_helpers::NoopMessageProcessor<
+		cumulus_primitives_core::AggregateMessageOrigin,
+	>;
+	#[cfg(not(feature = "runtime-benchmarks"))]
+	type MessageProcessor = xcm_builder::ProcessXcmMessage<
+		AggregateMessageOrigin,
+		xcm_executor::XcmExecutor<XcmExecutorConfig>,
+		RuntimeCall,
+	>;
+	// The XCMP queue pallet is only ever able to handle the `Sibling(ParaId)` origin:
+	type QueueChangeHandler = NarrowOriginToSibling<XcmpQueue>;
+	type QueuePausedQuery = NarrowOriginToSibling<XcmpQueue>;
+	type RuntimeEvent = RuntimeEvent;
+	type ServiceWeight = MessageQueueServiceWeight;
+	type Size = u32;
+	type WeightInfo = ();
+}
diff --git a/runtime/crab/src/pallets/parachain_system.rs b/runtime/crab/src/pallets/parachain_system.rs
index 2af82d21f..b5e9c97b9 100644
--- a/runtime/crab/src/pallets/parachain_system.rs
+++ b/runtime/crab/src/pallets/parachain_system.rs
@@ -26,7 +26,8 @@ frame_support::parameter_types! {
 
 impl cumulus_pallet_parachain_system::Config for Runtime {
 	type CheckAssociatedRelayNumber = cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases;
-	type DmpMessageHandler = DmpQueue;
+	type DmpQueue =
+		frame_support::traits::EnqueueWithOrigin<MessageQueue, pallet_config::RelayOrigin>;
 	type OnSystemEvent = ();
 	type OutboundXcmpMessageSource = XcmpQueue;
 	type ReservedDmpWeight = ReservedDmpWeight;
diff --git a/runtime/crab/src/pallets/polkadot_xcm.rs b/runtime/crab/src/pallets/polkadot_xcm.rs
index 06395cb51..01e6d48ce 100644
--- a/runtime/crab/src/pallets/polkadot_xcm.rs
+++ b/runtime/crab/src/pallets/polkadot_xcm.rs
@@ -29,7 +29,7 @@ pub type LocalAssetTransactor = xcm_builder::CurrencyAdapter<
 	Balances,
 	// Use this currency when it is a fungible asset matching the given location or name:
 	xcm_builder::IsConcrete<AnchoringSelfReserve>,
-	// Do a simple punn to convert an AccountId32 MultiLocation into a native chain account ID:
+	// Do a simple punn to convert an AccountId32 Location into a native chain account ID:
 	LocationToAccountId,
 	// Our chain's account ID type (we can't get away without mentioning it explicitly):
 	AccountId,
@@ -41,7 +41,7 @@ frame_support::parameter_types! {
 	pub const RelayNetwork: NetworkId = NetworkId::Kusama;
 	pub RelayChainOrigin: RuntimeOrigin = cumulus_pallet_xcm::Origin::Relay.into();
 }
-/// Type for specifying how a `MultiLocation` can be converted into an `AccountId`. This is used
+/// Type for specifying how a `Location` can be converted into an `AccountId`. This is used
 /// when determining ownership of accounts for asset transacting and when attempting to use XCM
 /// `Transact` in order to determine the dispatch Origin.
 pub type LocationToAccountId = (
@@ -107,9 +107,9 @@ pub type Barrier = xcm_builder::TrailingSetTopicAsId<
 frame_support::parameter_types! {
 	pub const MaxAssetsIntoHolding: u32 = 64;
 	pub const MaxInstructions: u32 = 100;
-	pub AnchoringSelfReserve: MultiLocation = MultiLocation::new(
+	pub AnchoringSelfReserve: Location = Location::new(
 		0,
-		X1(PalletInstance(<Balances as frame_support::traits::PalletInfoAccess>::index() as u8))
+		Junctions::X1(PalletInstance(<Balances as frame_support::traits::PalletInfoAccess>::index() as u8))
 	);
 	pub UniversalLocation: InteriorMultiLocation = Parachain(ParachainInfo::parachain_id().into()).into();
 	/// The amount of weight an XCM operation takes. This is a safe overestimate.
diff --git a/runtime/crab/src/pallets/xcmp_queue.rs b/runtime/crab/src/pallets/xcmp_queue.rs
index 051a39e9e..4265d43fb 100644
--- a/runtime/crab/src/pallets/xcmp_queue.rs
+++ b/runtime/crab/src/pallets/xcmp_queue.rs
@@ -23,12 +23,18 @@ impl cumulus_pallet_xcmp_queue::Config for Runtime {
 	type ChannelInfo = ParachainSystem;
 	type ControllerOrigin = Root;
 	type ControllerOriginConverter = XcmOriginToTransactDispatchOrigin;
-	type ExecuteOverweightOrigin = Root;
+	type MaxInboundSuspended = sp_core::ConstU32<1_000>;
 	type PriceForSiblingDelivery = polkadot_runtime_common::xcm_sender::NoPriceForMessageDelivery<
 		cumulus_primitives_core::ParaId,
 	>;
 	type RuntimeEvent = RuntimeEvent;
 	type VersionWrapper = ();
 	type WeightInfo = weights::cumulus_pallet_xcmp_queue::WeightInfo<Self>;
-	type XcmExecutor = xcm_executor::XcmExecutor<XcmExecutorConfig>;
+	// Enqueue XCMP messages from siblings for later processing.
+	type XcmpQueue = frame_support::traits::TransformOrigin<
+		MessageQueue,
+		AggregateMessageOrigin,
+		ParaId,
+		ParaIdToSibling,
+	>;
 }
diff --git a/runtime/darwinia/Cargo.toml b/runtime/darwinia/Cargo.toml
index e25e1c761..5d4c2add0 100644
--- a/runtime/darwinia/Cargo.toml
+++ b/runtime/darwinia/Cargo.toml
@@ -7,7 +7,7 @@ readme            = "README.md"
 version.workspace = true
 
 [build-dependencies]
-# substrate optional
+# polkadot-sdk optional
 substrate-wasm-builder = { workspace = true, optional = true }
 
 [dependencies]
@@ -21,18 +21,6 @@ strum             = { workspace = true, features = ["derive"] }
 # TODO: optional
 array-bytes = { workspace = true }
 
-# cumulus
-cumulus-pallet-aura-ext         = { workspace = true }
-cumulus-pallet-dmp-queue        = { workspace = true }
-cumulus-pallet-parachain-system = { workspace = true }
-cumulus-pallet-xcm              = { workspace = true }
-cumulus-pallet-xcmp-queue       = { workspace = true }
-cumulus-primitives-core         = { workspace = true }
-cumulus-primitives-utility      = { workspace = true }
-parachain-info                  = { workspace = true }
-# cumulus optional
-cumulus-pallet-session-benchmarking = { workspace = true, optional = true }
-
 # darwinia
 darwinia-account-migration        = { workspace = true }
 darwinia-asset-limit              = { workspace = true }
@@ -73,15 +61,14 @@ xcm-primitives                          = { workspace = true }
 orml-xcm-support = { workspace = true }
 orml-xtokens     = { workspace = true }
 
-# polkadot
-pallet-xcm              = { workspace = true }
-polkadot-parachain      = { workspace = true }
-polkadot-runtime-common = { workspace = true }
-xcm                     = { workspace = true }
-xcm-builder             = { workspace = true }
-xcm-executor            = { workspace = true }
-
-# substrate
+# polkadot-sdk
+cumulus-pallet-aura-ext                    = { workspace = true }
+cumulus-pallet-dmp-queue                   = { workspace = true }
+cumulus-pallet-parachain-system            = { workspace = true }
+cumulus-pallet-xcm                         = { workspace = true }
+cumulus-pallet-xcmp-queue                  = { workspace = true }
+cumulus-primitives-core                    = { workspace = true }
+cumulus-primitives-utility                 = { workspace = true }
 frame-executive                            = { workspace = true }
 frame-support                              = { workspace = true }
 frame-system                               = { workspace = true }
@@ -93,6 +80,7 @@ pallet-balances                            = { workspace = true }
 pallet-collective                          = { workspace = true }
 pallet-conviction-voting                   = { workspace = true }
 pallet-democracy                           = { workspace = true }
+pallet-message-queue                       = { workspace = true }
 pallet-preimage                            = { workspace = true }
 pallet-proxy                               = { workspace = true }
 pallet-referenda                           = { workspace = true }
@@ -102,6 +90,13 @@ pallet-timestamp                           = { workspace = true }
 pallet-transaction-payment                 = { workspace = true }
 pallet-transaction-payment-rpc-runtime-api = { workspace = true }
 pallet-treasury                            = { workspace = true }
+pallet-xcm                                 = { workspace = true }
+parachain-info                             = { workspace = true }
+polkadot-parachain                         = { workspace = true }
+polkadot-runtime-common                    = { workspace = true }
+xcm                                        = { workspace = true }
+xcm-builder                                = { workspace = true }
+xcm-executor                               = { workspace = true }
 # pallet-tx-pause                            = { workspace = true }
 pallet-utility      = { workspace = true }
 pallet-whitelist    = { workspace = true }
@@ -119,19 +114,19 @@ sp-staking          = { workspace = true }
 sp-std              = { workspace = true }
 sp-transaction-pool = { workspace = true }
 sp-version          = { workspace = true }
-# substrate optional
-frame-benchmarking        = { workspace = true, optional = true }
-frame-system-benchmarking = { workspace = true, optional = true }
-frame-try-runtime         = { workspace = true, optional = true }
+# polkadot-sdk optional
+cumulus-pallet-session-benchmarking = { workspace = true, optional = true }
+frame-benchmarking                  = { workspace = true, optional = true }
+frame-system-benchmarking           = { workspace = true, optional = true }
+frame-try-runtime                   = { workspace = true, optional = true }
 
 [dev-dependencies]
 # darwinia
 darwinia-common-runtime = { workspace = true, features = ["std", "test"] }
-# polkadot
+# polkadot-sdk
 polkadot-primitives = { workspace = true, features = ["std"] }
-# substrate
-sp-io      = { workspace = true, features = ["std"] }
-sp-keyring = { workspace = true }
+sp-io               = { workspace = true, features = ["std"] }
+sp-keyring          = { workspace = true }
 
 [features]
 default = ["std"]
@@ -142,18 +137,6 @@ std = [
 	"scale-info/std",
 	"strum/std",
 
-	# cumulus
-	"cumulus-pallet-aura-ext/std",
-	"cumulus-pallet-dmp-queue/std",
-	"cumulus-pallet-parachain-system/std",
-	"cumulus-pallet-xcm/std",
-	"cumulus-pallet-xcmp-queue/std",
-	"cumulus-primitives-core/std",
-	"cumulus-primitives-utility/std",
-	"parachain-info/std",
-	# cumulus optional
-	"cumulus-pallet-session-benchmarking?/std",
-
 	# darwinia
 	"darwinia-account-migration/std",
 	"darwinia-asset-limit/std",
@@ -194,15 +177,14 @@ std = [
 	"orml-xcm-support/std",
 	"orml-xtokens/std",
 
-	# polkadot
-	"pallet-xcm/std",
-	"polkadot-parachain/std",
-	"polkadot-runtime-common/std",
-	"xcm-builder/std",
-	"xcm-executor/std",
-	"xcm/std",
-
-	# substrate
+	# polkadot-sdk
+	"cumulus-pallet-aura-ext/std",
+	"cumulus-pallet-dmp-queue/std",
+	"cumulus-pallet-parachain-system/std",
+	"cumulus-pallet-xcm/std",
+	"cumulus-pallet-xcmp-queue/std",
+	"cumulus-primitives-core/std",
+	"cumulus-primitives-utility/std",
 	"frame-executive/std",
 	"frame-support/std",
 	"frame-system-rpc-runtime-api/std",
@@ -214,6 +196,7 @@ std = [
 	"pallet-collective/std",
 	"pallet-conviction-voting/std",
 	"pallet-democracy/std",
+	"pallet-message-queue/std",
 	"pallet-preimage/std",
 	"pallet-proxy/std",
 	"pallet-referenda/std",
@@ -223,6 +206,13 @@ std = [
 	"pallet-transaction-payment-rpc-runtime-api/std",
 	"pallet-transaction-payment/std",
 	"pallet-treasury/std",
+	"pallet-xcm/std",
+	"parachain-info/std",
+	"polkadot-parachain/std",
+	"polkadot-runtime-common/std",
+	"xcm-builder/std",
+	"xcm-executor/std",
+	"xcm/std",
 	# "pallet-tx-pause/std",
 	"pallet-utility/std",
 	"pallet-whitelist/std",
@@ -240,7 +230,8 @@ std = [
 	"sp-std/std",
 	"sp-transaction-pool/std",
 	"sp-version/std",
-	# substrate optional
+	# polkadot-sdk optional
+	"cumulus-pallet-session-benchmarking?/std",
 	"frame-benchmarking?/std",
 	"frame-system-benchmarking?/std",
 	"frame-try-runtime?/std",
@@ -272,12 +263,6 @@ runtime-benchmarks = [
 	# TODO: optional
 	# "array-bytes",
 
-	# cumulus
-	"cumulus-pallet-parachain-system/runtime-benchmarks",
-	"cumulus-pallet-xcmp-queue/runtime-benchmarks",
-	# cumulus optional
-	"cumulus-pallet-session-benchmarking/runtime-benchmarks",
-
 	# darwinia
 	"darwinia-account-migration/runtime-benchmarks",
 	"darwinia-common-runtime/runtime-benchmarks",
@@ -299,14 +284,9 @@ runtime-benchmarks = [
 	# open-web3-stack
 	"orml-xtokens/runtime-benchmarks",
 
-	# polkadot
-	"pallet-xcm/runtime-benchmarks",
-	"polkadot-parachain/runtime-benchmarks",
-	"polkadot-runtime-common/runtime-benchmarks",
-	"xcm-builder/runtime-benchmarks",
-	"xcm-executor/runtime-benchmarks",
-
-	# substrate
+	# polkadot-sdk
+	"cumulus-pallet-parachain-system/runtime-benchmarks",
+	"cumulus-pallet-xcmp-queue/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 	"pallet-assets/runtime-benchmarks",
@@ -314,31 +294,30 @@ runtime-benchmarks = [
 	"pallet-collective/runtime-benchmarks",
 	"pallet-conviction-voting/runtime-benchmarks",
 	"pallet-democracy/runtime-benchmarks",
+	"pallet-message-queue/runtime-benchmarks",
 	"pallet-preimage/runtime-benchmarks",
 	"pallet-proxy/runtime-benchmarks",
 	"pallet-referenda/runtime-benchmarks",
 	"pallet-scheduler/runtime-benchmarks",
 	"pallet-timestamp/runtime-benchmarks",
 	"pallet-treasury/runtime-benchmarks",
+	"pallet-xcm/runtime-benchmarks",
+	"polkadot-parachain/runtime-benchmarks",
+	"polkadot-runtime-common/runtime-benchmarks",
+	"xcm-builder/runtime-benchmarks",
+	"xcm-executor/runtime-benchmarks",
 	# "pallet-tx-pause/runtime-benchmarks",
 	"pallet-utility/runtime-benchmarks",
 	"pallet-whitelist/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
-	# substrate optional
+	# polkadot-sdk optional
+	"cumulus-pallet-session-benchmarking/runtime-benchmarks",
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-system-benchmarking/runtime-benchmarks",
 	"sp-staking/runtime-benchmarks",
 ]
 
 try-runtime = [
-	# cumulus
-	"cumulus-pallet-aura-ext/try-runtime",
-	"cumulus-pallet-dmp-queue/try-runtime",
-	"cumulus-pallet-parachain-system/try-runtime",
-	"cumulus-pallet-xcm/try-runtime",
-	"cumulus-pallet-xcmp-queue/try-runtime",
-	"parachain-info/try-runtime",
-
 	# darwinia
 	"darwinia-account-migration/try-runtime",
 	"darwinia-asset-limit/try-runtime",
@@ -358,11 +337,12 @@ try-runtime = [
 	# open-web3-stack
 	"orml-xtokens/try-runtime",
 
-	# polkadot
-	"pallet-xcm/try-runtime",
-	"polkadot-runtime-common/try-runtime",
-
-	# substrate
+	# polkadot-sdk
+	"cumulus-pallet-aura-ext/try-runtime",
+	"cumulus-pallet-dmp-queue/try-runtime",
+	"cumulus-pallet-parachain-system/try-runtime",
+	"cumulus-pallet-xcm/try-runtime",
+	"cumulus-pallet-xcmp-queue/try-runtime",
 	"frame-executive/try-runtime",
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
@@ -373,6 +353,7 @@ try-runtime = [
 	"pallet-collective/try-runtime",
 	"pallet-conviction-voting/try-runtime",
 	"pallet-democracy/try-runtime",
+	"pallet-message-queue/try-runtime",
 	"pallet-preimage/try-runtime",
 	"pallet-proxy/try-runtime",
 	"pallet-referenda/try-runtime",
@@ -381,11 +362,13 @@ try-runtime = [
 	"pallet-timestamp/try-runtime",
 	"pallet-transaction-payment/try-runtime",
 	"pallet-treasury/try-runtime",
+	"pallet-xcm/try-runtime",
+	"parachain-info/try-runtime",
+	"polkadot-runtime-common/try-runtime",
 	# "pallet-tx-pause/try-runtime",
 	"pallet-utility/try-runtime",
 	"pallet-whitelist/try-runtime",
 	"sp-runtime/try-runtime",
-	# substrate optional
+	# polkadot-sdk optional
 	"frame-try-runtime/try-runtime",
-	"sp-runtime/try-runtime",
 ]
diff --git a/runtime/darwinia/src/lib.rs b/runtime/darwinia/src/lib.rs
index b794a472d..7fc726db3 100644
--- a/runtime/darwinia/src/lib.rs
+++ b/runtime/darwinia/src/lib.rs
@@ -143,6 +143,7 @@ frame_support::construct_runtime! {
 		CumulusXcm: cumulus_pallet_xcm = 34,
 		EthereumXcm: pallet_ethereum_xcm = 44,
 		DmpQueue: cumulus_pallet_dmp_queue = 35,
+		MessageQueue: pallet_message_queue = 39,
 		AssetManager: pallet_asset_manager = 45,
 		XTokens: orml_xtokens = 46,
 		AssetLimit: darwinia_asset_limit = 47,
@@ -151,31 +152,25 @@ frame_support::construct_runtime! {
 		Ethereum: pallet_ethereum = 36,
 		EVM: pallet_evm = 37,
 		EthTxForwarder: darwinia_ethtx_forwarder = 38,
-
-		// // Darwinia <> Crab
-		// BridgeKusamaGrandpa: pallet_bridge_grandpa::<Instance1> = 39,
-		// BridgeKusamaParachain: pallet_bridge_parachains::<Instance1> = 40,
-		// BridgeCrabMessages: pallet_bridge_messages::<Instance1> = 41,
-		// BridgeCrabDispatch: pallet_bridge_dispatch::<Instance1> = 42,
-		// CrabFeeMarket: pallet_fee_market::<Instance1> = 43
 	}
 }
 
 #[cfg(feature = "runtime-benchmarks")]
 frame_benchmarking::define_benchmarks! {
-	// cumulus
-	[cumulus_pallet_xcmp_queue, XcmpQueue]
 	// darwinia
 	[darwinia_account_migration, AccountMigration]
 	[darwinia_deposit, Deposit]
 	[darwinia_staking, DarwiniaStaking]
-	// substrate
+	// polkadot-sdk
+	[cumulus_pallet_parachain_system, ParachainSystem]
+	[cumulus_pallet_xcmp_queue, XcmpQueue]
 	[frame_system, SystemBench::<Runtime>]
 	[pallet_assets, Assets]
 	[pallet_balances, Balances]
 	[pallet_collective, TechnicalCommittee]
 	[pallet_conviction_voting, ConvictionVoting]
 	[pallet_democracy, Democracy]
+	[pallet_message_queue, MessageQueue]
 	[pallet_preimage, Preimage]
 	[pallet_proxy, Proxy]
 	[pallet_referenda, Referenda]
diff --git a/runtime/darwinia/src/pallets.rs b/runtime/darwinia/src/pallets.rs
index 0379f5a93..0e15482a0 100644
--- a/runtime/darwinia/src/pallets.rs
+++ b/runtime/darwinia/src/pallets.rs
@@ -87,6 +87,8 @@ mod ethereum_xcm;
 
 mod dmp_queue;
 
+mod message_queue;
+
 mod asset_manager;
 
 mod orml_xtokens;
diff --git a/runtime/darwinia/src/pallets/dmp_queue.rs b/runtime/darwinia/src/pallets/dmp_queue.rs
index 8c6961191..a1464981b 100644
--- a/runtime/darwinia/src/pallets/dmp_queue.rs
+++ b/runtime/darwinia/src/pallets/dmp_queue.rs
@@ -20,7 +20,8 @@
 use crate::*;
 
 impl cumulus_pallet_dmp_queue::Config for Runtime {
-	type ExecuteOverweightOrigin = Root;
+	type DmpSink =
+		frame_support::traits::EnqueueWithOrigin<MessageQueue, pallet_config::RelayOrigin>;
 	type RuntimeEvent = RuntimeEvent;
-	type XcmExecutor = xcm_executor::XcmExecutor<XcmExecutorConfig>;
+	type WeightInfo = ();
 }
diff --git a/runtime/darwinia/src/pallets/message_queue.rs b/runtime/darwinia/src/pallets/message_queue.rs
new file mode 100644
index 000000000..58643817f
--- /dev/null
+++ b/runtime/darwinia/src/pallets/message_queue.rs
@@ -0,0 +1,46 @@
+// This file is part of Darwinia.
+//
+// Copyright (C) Darwinia Network
+// SPDX-License-Identifier: GPL-3.0
+//
+// Darwinia is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Darwinia is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Darwinia. If not, see <https://www.gnu.org/licenses/>.
+
+// darwinia
+use crate::*;
+
+frame_support::parameter_types! {
+	pub MessageQueueServiceWeight: frame_support::weights::Weight = sp_runtime::Perbill::from_percent(35) * RuntimeBlockWeights::get().max_block;
+}
+
+impl pallet_message_queue::Config for Runtime {
+	type HeapSize = sp_core::ConstU32<{ 64 * 1024 }>;
+	type MaxStale = sp_core::ConstU32<8>;
+	#[cfg(feature = "runtime-benchmarks")]
+	type MessageProcessor = pallet_message_queue::mock_helpers::NoopMessageProcessor<
+		cumulus_primitives_core::AggregateMessageOrigin,
+	>;
+	#[cfg(not(feature = "runtime-benchmarks"))]
+	type MessageProcessor = xcm_builder::ProcessXcmMessage<
+		AggregateMessageOrigin,
+		xcm_executor::XcmExecutor<XcmExecutorConfig>,
+		RuntimeCall,
+	>;
+	// The XCMP queue pallet is only ever able to handle the `Sibling(ParaId)` origin:
+	type QueueChangeHandler = NarrowOriginToSibling<XcmpQueue>;
+	type QueuePausedQuery = NarrowOriginToSibling<XcmpQueue>;
+	type RuntimeEvent = RuntimeEvent;
+	type ServiceWeight = MessageQueueServiceWeight;
+	type Size = u32;
+	type WeightInfo = ();
+}
diff --git a/runtime/darwinia/src/pallets/xcmp_queue.rs b/runtime/darwinia/src/pallets/xcmp_queue.rs
index 051a39e9e..4265d43fb 100644
--- a/runtime/darwinia/src/pallets/xcmp_queue.rs
+++ b/runtime/darwinia/src/pallets/xcmp_queue.rs
@@ -23,12 +23,18 @@ impl cumulus_pallet_xcmp_queue::Config for Runtime {
 	type ChannelInfo = ParachainSystem;
 	type ControllerOrigin = Root;
 	type ControllerOriginConverter = XcmOriginToTransactDispatchOrigin;
-	type ExecuteOverweightOrigin = Root;
+	type MaxInboundSuspended = sp_core::ConstU32<1_000>;
 	type PriceForSiblingDelivery = polkadot_runtime_common::xcm_sender::NoPriceForMessageDelivery<
 		cumulus_primitives_core::ParaId,
 	>;
 	type RuntimeEvent = RuntimeEvent;
 	type VersionWrapper = ();
 	type WeightInfo = weights::cumulus_pallet_xcmp_queue::WeightInfo<Self>;
-	type XcmExecutor = xcm_executor::XcmExecutor<XcmExecutorConfig>;
+	// Enqueue XCMP messages from siblings for later processing.
+	type XcmpQueue = frame_support::traits::TransformOrigin<
+		MessageQueue,
+		AggregateMessageOrigin,
+		ParaId,
+		ParaIdToSibling,
+	>;
 }
diff --git a/runtime/koi/Cargo.toml b/runtime/koi/Cargo.toml
index d428e4a82..fa556cfbc 100644
--- a/runtime/koi/Cargo.toml
+++ b/runtime/koi/Cargo.toml
@@ -7,7 +7,7 @@ readme            = "README.md"
 version.workspace = true
 
 [build-dependencies]
-# substrate optional
+# polkadot-sdk optional
 substrate-wasm-builder = { workspace = true, optional = true }
 
 [dependencies]
@@ -20,18 +20,6 @@ strum             = { workspace = true, features = ["derive"] }
 # crates.io optional
 array-bytes = { workspace = true, optional = true }
 
-# cumulus
-cumulus-pallet-aura-ext         = { workspace = true }
-cumulus-pallet-dmp-queue        = { workspace = true }
-cumulus-pallet-parachain-system = { workspace = true }
-cumulus-pallet-xcm              = { workspace = true }
-cumulus-pallet-xcmp-queue       = { workspace = true }
-cumulus-primitives-core         = { workspace = true }
-cumulus-primitives-utility      = { workspace = true }
-parachain-info                  = { workspace = true }
-# cumulus optional
-cumulus-pallet-session-benchmarking = { workspace = true, optional = true }
-
 # darwinia
 darwinia-asset-limit              = { workspace = true }
 darwinia-common-runtime           = { workspace = true }
@@ -71,15 +59,14 @@ xcm-primitives                          = { workspace = true }
 orml-xcm-support = { workspace = true }
 orml-xtokens     = { workspace = true }
 
-# polkadot
-pallet-xcm              = { workspace = true }
-polkadot-parachain      = { workspace = true }
-polkadot-runtime-common = { workspace = true }
-xcm                     = { workspace = true }
-xcm-builder             = { workspace = true }
-xcm-executor            = { workspace = true }
-
-# substrate
+# polkadot-sdk
+cumulus-pallet-aura-ext                    = { workspace = true }
+cumulus-pallet-dmp-queue                   = { workspace = true }
+cumulus-pallet-parachain-system            = { workspace = true }
+cumulus-pallet-xcm                         = { workspace = true }
+cumulus-pallet-xcmp-queue                  = { workspace = true }
+cumulus-primitives-core                    = { workspace = true }
+cumulus-primitives-utility                 = { workspace = true }
 frame-executive                            = { workspace = true }
 frame-support                              = { workspace = true }
 frame-system                               = { workspace = true }
@@ -91,6 +78,7 @@ pallet-balances                            = { workspace = true }
 pallet-collective                          = { workspace = true }
 pallet-conviction-voting                   = { workspace = true }
 pallet-democracy                           = { workspace = true }
+pallet-message-queue                       = { workspace = true }
 pallet-preimage                            = { workspace = true }
 pallet-proxy                               = { workspace = true }
 pallet-referenda                           = { workspace = true }
@@ -104,6 +92,10 @@ pallet-treasury                            = { workspace = true }
 pallet-tx-pause                            = { workspace = true }
 pallet-utility                             = { workspace = true }
 pallet-whitelist                           = { workspace = true }
+pallet-xcm                                 = { workspace = true }
+parachain-info                             = { workspace = true }
+polkadot-parachain                         = { workspace = true }
+polkadot-runtime-common                    = { workspace = true }
 sp-api                                     = { workspace = true }
 sp-block-builder                           = { workspace = true }
 sp-consensus-aura                          = { workspace = true }
@@ -118,19 +110,22 @@ sp-staking                                 = { workspace = true }
 sp-std                                     = { workspace = true }
 sp-transaction-pool                        = { workspace = true }
 sp-version                                 = { workspace = true }
-# substrate optional
-frame-benchmarking        = { workspace = true, optional = true }
-frame-system-benchmarking = { workspace = true, optional = true }
-frame-try-runtime         = { workspace = true, optional = true }
+xcm                                        = { workspace = true }
+xcm-builder                                = { workspace = true }
+xcm-executor                               = { workspace = true }
+# polkadot-sdk optional
+cumulus-pallet-session-benchmarking = { workspace = true, optional = true }
+frame-benchmarking                  = { workspace = true, optional = true }
+frame-system-benchmarking           = { workspace = true, optional = true }
+frame-try-runtime                   = { workspace = true, optional = true }
 
 [dev-dependencies]
 # darwinia
 darwinia-common-runtime = { workspace = true, features = ["std", "test"] }
-# polkadot
+# polkadot-sdk
 polkadot-primitives = { workspace = true, features = ["std"] }
-# substrate
-sp-io      = { workspace = true, features = ["std"] }
-sp-keyring = { workspace = true }
+sp-io               = { workspace = true, features = ["std"] }
+sp-keyring          = { workspace = true }
 
 [features]
 default = ["std"]
@@ -141,18 +136,6 @@ std = [
 	"scale-info/std",
 	"strum/std",
 
-	# cumulus
-	"cumulus-pallet-aura-ext/std",
-	"cumulus-pallet-dmp-queue/std",
-	"cumulus-pallet-parachain-system/std",
-	"cumulus-pallet-xcm/std",
-	"cumulus-pallet-xcmp-queue/std",
-	"cumulus-primitives-core/std",
-	"cumulus-primitives-utility/std",
-	"parachain-info/std",
-	# cumulus optional
-	"cumulus-pallet-session-benchmarking?/std",
-
 	# darwinia
 	"darwinia-asset-limit/std",
 	"darwinia-common-runtime/std",
@@ -192,15 +175,14 @@ std = [
 	"orml-xcm-support/std",
 	"orml-xtokens/std",
 
-	# polkadot
-	"pallet-xcm/std",
-	"polkadot-parachain/std",
-	"polkadot-runtime-common/std",
-	"xcm-builder/std",
-	"xcm-executor/std",
-	"xcm/std",
-
-	# substrate
+	# polkadot-sdk
+	"cumulus-pallet-aura-ext/std",
+	"cumulus-pallet-dmp-queue/std",
+	"cumulus-pallet-parachain-system/std",
+	"cumulus-pallet-xcm/std",
+	"cumulus-pallet-xcmp-queue/std",
+	"cumulus-primitives-core/std",
+	"cumulus-primitives-utility/std",
 	"frame-executive/std",
 	"frame-support/std",
 	"frame-system-rpc-runtime-api/std",
@@ -212,6 +194,7 @@ std = [
 	"pallet-collective/std",
 	"pallet-conviction-voting/std",
 	"pallet-democracy/std",
+	"pallet-message-queue/std",
 	"pallet-preimage/std",
 	"pallet-proxy/std",
 	"pallet-referenda/std",
@@ -225,6 +208,10 @@ std = [
 	"pallet-tx-pause/std",
 	"pallet-utility/std",
 	"pallet-whitelist/std",
+	"pallet-xcm/std",
+	"parachain-info/std",
+	"polkadot-parachain/std",
+	"polkadot-runtime-common/std",
 	"sp-api/std",
 	"sp-block-builder/std",
 	"sp-consensus-aura/std",
@@ -239,7 +226,11 @@ std = [
 	"sp-std/std",
 	"sp-transaction-pool/std",
 	"sp-version/std",
-	# substrate optional
+	"xcm-builder/std",
+	"xcm-executor/std",
+	"xcm/std",
+	# polkadot-sdk optional
+	"cumulus-pallet-session-benchmarking?/std",
 	"frame-benchmarking?/std",
 	"frame-system-benchmarking?/std",
 	"frame-try-runtime?/std",
@@ -270,12 +261,6 @@ runtime-benchmarks = [
 	# crates.io
 	"array-bytes",
 
-	# cumulus
-	"cumulus-pallet-parachain-system/runtime-benchmarks",
-	"cumulus-pallet-xcmp-queue/runtime-benchmarks",
-	# cumulus optional
-	"cumulus-pallet-session-benchmarking/runtime-benchmarks",
-
 	# darwinia
 	"darwinia-common-runtime/runtime-benchmarks",
 	"darwinia-deposit/runtime-benchmarks",
@@ -296,14 +281,9 @@ runtime-benchmarks = [
 	# open-web3-stack
 	"orml-xtokens/runtime-benchmarks",
 
-	# polkadot
-	"pallet-xcm/runtime-benchmarks",
-	"polkadot-parachain/runtime-benchmarks",
-	"polkadot-runtime-common/runtime-benchmarks",
-	"xcm-builder/runtime-benchmarks",
-	"xcm-executor/runtime-benchmarks",
-
-	# substrate
+	# polkadot-sdk
+	"cumulus-pallet-parachain-system/runtime-benchmarks",
+	"cumulus-pallet-xcmp-queue/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 	"pallet-assets/runtime-benchmarks",
@@ -311,6 +291,7 @@ runtime-benchmarks = [
 	"pallet-collective/runtime-benchmarks",
 	"pallet-conviction-voting/runtime-benchmarks",
 	"pallet-democracy/runtime-benchmarks",
+	"pallet-message-queue/runtime-benchmarks",
 	"pallet-preimage/runtime-benchmarks",
 	"pallet-proxy/runtime-benchmarks",
 	"pallet-referenda/runtime-benchmarks",
@@ -321,22 +302,20 @@ runtime-benchmarks = [
 	"pallet-tx-pause/runtime-benchmarks",
 	"pallet-utility/runtime-benchmarks",
 	"pallet-whitelist/runtime-benchmarks",
+	"pallet-xcm/runtime-benchmarks",
+	"polkadot-parachain/runtime-benchmarks",
+	"polkadot-runtime-common/runtime-benchmarks",
 	"sp-runtime/runtime-benchmarks",
-	# substrate optional
+	"xcm-builder/runtime-benchmarks",
+	"xcm-executor/runtime-benchmarks",
+	# polkadot-sdk optional
+	"cumulus-pallet-session-benchmarking/runtime-benchmarks",
 	"frame-benchmarking/runtime-benchmarks",
 	"frame-system-benchmarking/runtime-benchmarks",
 	"sp-staking/runtime-benchmarks",
 ]
 
 try-runtime = [
-	# cumulus
-	"cumulus-pallet-aura-ext/try-runtime",
-	"cumulus-pallet-dmp-queue/try-runtime",
-	"cumulus-pallet-parachain-system/try-runtime",
-	"cumulus-pallet-xcm/try-runtime",
-	"cumulus-pallet-xcmp-queue/try-runtime",
-	"parachain-info/try-runtime",
-
 	# darwinia
 	"darwinia-asset-limit/try-runtime",
 	"darwinia-deposit/try-runtime",
@@ -355,11 +334,12 @@ try-runtime = [
 	"pallet-ethereum/try-runtime",
 	"pallet-evm/try-runtime",
 
-	# polkadot
-	"pallet-xcm/try-runtime",
-	"polkadot-runtime-common/try-runtime",
-
-	# substrate
+	# polkadot-sdk
+	"cumulus-pallet-aura-ext/try-runtime",
+	"cumulus-pallet-dmp-queue/try-runtime",
+	"cumulus-pallet-parachain-system/try-runtime",
+	"cumulus-pallet-xcm/try-runtime",
+	"cumulus-pallet-xcmp-queue/try-runtime",
 	"frame-executive/try-runtime",
 	"frame-support/try-runtime",
 	"frame-system/try-runtime",
@@ -370,6 +350,7 @@ try-runtime = [
 	"pallet-collective/try-runtime",
 	"pallet-conviction-voting/try-runtime",
 	"pallet-democracy/try-runtime",
+	"pallet-message-queue/try-runtime",
 	"pallet-preimage/try-runtime",
 	"pallet-proxy/try-runtime",
 	"pallet-referenda/try-runtime",
@@ -382,8 +363,10 @@ try-runtime = [
 	"pallet-tx-pause/try-runtime",
 	"pallet-utility/try-runtime",
 	"pallet-whitelist/try-runtime",
+	"pallet-xcm/try-runtime",
+	"parachain-info/try-runtime",
+	"polkadot-runtime-common/try-runtime",
 	"sp-runtime/try-runtime",
-	# substrate optional
+	# polkadot-sdk optional
 	"frame-try-runtime/try-runtime",
-	"sp-runtime/try-runtime",
 ]
diff --git a/runtime/koi/src/lib.rs b/runtime/koi/src/lib.rs
index 8fa69e8aa..1a9df8525 100644
--- a/runtime/koi/src/lib.rs
+++ b/runtime/koi/src/lib.rs
@@ -133,6 +133,7 @@ frame_support::construct_runtime! {
 		CumulusXcm: cumulus_pallet_xcm = 28,
 		EthereumXcm: pallet_ethereum_xcm = 29,
 		DmpQueue: cumulus_pallet_dmp_queue = 30,
+		MessageQueue: pallet_message_queue = 37,
 		AssetManager: pallet_asset_manager = 31,
 		XTokens: orml_xtokens = 32,
 		AssetLimit: darwinia_asset_limit = 33,
@@ -146,17 +147,18 @@ frame_support::construct_runtime! {
 
 #[cfg(feature = "runtime-benchmarks")]
 frame_benchmarking::define_benchmarks! {
-	// cumulus
-	[cumulus_pallet_xcmp_queue, XcmpQueue]
 	// darwinia
 	[darwinia_deposit, Deposit]
 	[darwinia_staking, DarwiniaStaking]
-	// substrate
+	// polkadot-sdk
+	[cumulus_pallet_parachain_system, ParachainSystem]
+	[cumulus_pallet_xcmp_queue, XcmpQueue]
 	[frame_system, SystemBench::<Runtime>]
 	[pallet_assets, Assets]
 	[pallet_balances, Balances]
 	[pallet_collective, TechnicalCommittee]
 	[pallet_conviction_voting, ConvictionVoting]
+	[pallet_message_queue, MessageQueue]
 	[pallet_preimage, Preimage]
 	[pallet_proxy, Proxy]
 	[pallet_referenda, Referenda]
diff --git a/runtime/koi/src/pallets.rs b/runtime/koi/src/pallets.rs
index f80b55556..b14cafa36 100644
--- a/runtime/koi/src/pallets.rs
+++ b/runtime/koi/src/pallets.rs
@@ -87,6 +87,8 @@ mod ethereum_xcm;
 
 mod dmp_queue;
 
+mod message_queue;
+
 mod asset_manager;
 
 mod orml_xtokens;
diff --git a/runtime/koi/src/pallets/dmp_queue.rs b/runtime/koi/src/pallets/dmp_queue.rs
index 5af278415..a1464981b 100644
--- a/runtime/koi/src/pallets/dmp_queue.rs
+++ b/runtime/koi/src/pallets/dmp_queue.rs
@@ -20,7 +20,8 @@
 use crate::*;
 
 impl cumulus_pallet_dmp_queue::Config for Runtime {
-	type ExecuteOverweightOrigin = RootOr<GeneralAdmin>;
+	type DmpSink =
+		frame_support::traits::EnqueueWithOrigin<MessageQueue, pallet_config::RelayOrigin>;
 	type RuntimeEvent = RuntimeEvent;
-	type XcmExecutor = xcm_executor::XcmExecutor<XcmExecutorConfig>;
+	type WeightInfo = ();
 }
diff --git a/runtime/koi/src/pallets/message_queue.rs b/runtime/koi/src/pallets/message_queue.rs
new file mode 100644
index 000000000..58643817f
--- /dev/null
+++ b/runtime/koi/src/pallets/message_queue.rs
@@ -0,0 +1,46 @@
+// This file is part of Darwinia.
+//
+// Copyright (C) Darwinia Network
+// SPDX-License-Identifier: GPL-3.0
+//
+// Darwinia is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Darwinia is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Darwinia. If not, see <https://www.gnu.org/licenses/>.
+
+// darwinia
+use crate::*;
+
+frame_support::parameter_types! {
+	pub MessageQueueServiceWeight: frame_support::weights::Weight = sp_runtime::Perbill::from_percent(35) * RuntimeBlockWeights::get().max_block;
+}
+
+impl pallet_message_queue::Config for Runtime {
+	type HeapSize = sp_core::ConstU32<{ 64 * 1024 }>;
+	type MaxStale = sp_core::ConstU32<8>;
+	#[cfg(feature = "runtime-benchmarks")]
+	type MessageProcessor = pallet_message_queue::mock_helpers::NoopMessageProcessor<
+		cumulus_primitives_core::AggregateMessageOrigin,
+	>;
+	#[cfg(not(feature = "runtime-benchmarks"))]
+	type MessageProcessor = xcm_builder::ProcessXcmMessage<
+		AggregateMessageOrigin,
+		xcm_executor::XcmExecutor<XcmExecutorConfig>,
+		RuntimeCall,
+	>;
+	// The XCMP queue pallet is only ever able to handle the `Sibling(ParaId)` origin:
+	type QueueChangeHandler = NarrowOriginToSibling<XcmpQueue>;
+	type QueuePausedQuery = NarrowOriginToSibling<XcmpQueue>;
+	type RuntimeEvent = RuntimeEvent;
+	type ServiceWeight = MessageQueueServiceWeight;
+	type Size = u32;
+	type WeightInfo = ();
+}
diff --git a/runtime/koi/src/pallets/xcmp_queue.rs b/runtime/koi/src/pallets/xcmp_queue.rs
index f333b5c88..96cffde7d 100644
--- a/runtime/koi/src/pallets/xcmp_queue.rs
+++ b/runtime/koi/src/pallets/xcmp_queue.rs
@@ -23,12 +23,18 @@ impl cumulus_pallet_xcmp_queue::Config for Runtime {
 	type ChannelInfo = ParachainSystem;
 	type ControllerOrigin = RootOr<GeneralAdmin>;
 	type ControllerOriginConverter = XcmOriginToTransactDispatchOrigin;
-	type ExecuteOverweightOrigin = RootOr<GeneralAdmin>;
+	type MaxInboundSuspended = sp_core::ConstU32<1_000>;
 	type PriceForSiblingDelivery = polkadot_runtime_common::xcm_sender::NoPriceForMessageDelivery<
 		cumulus_primitives_core::ParaId,
 	>;
 	type RuntimeEvent = RuntimeEvent;
 	type VersionWrapper = ();
 	type WeightInfo = weights::cumulus_pallet_xcmp_queue::WeightInfo<Self>;
-	type XcmExecutor = xcm_executor::XcmExecutor<XcmExecutorConfig>;
+	// Enqueue XCMP messages from siblings for later processing.
+	type XcmpQueue = frame_support::traits::TransformOrigin<
+		MessageQueue,
+		AggregateMessageOrigin,
+		ParaId,
+		ParaIdToSibling,
+	>;
 }

From 7e0251b5fbd13dd2d2618dd96711d0b2e2abd0c9 Mon Sep 17 00:00:00 2001
From: Xavier Lau <xavier@inv.cafe>
Date: Tue, 25 Jun 2024 16:37:27 +0800
Subject: [PATCH 29/59] Remove pallet-democracy part.1

---
 Cargo.lock              | 2 --
 runtime/crab/Cargo.toml | 4 ----
 runtime/koi/Cargo.toml  | 4 ----
 3 files changed, 10 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 98bfdc127..f981f796e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1655,7 +1655,6 @@ dependencies = [
  "pallet-balances",
  "pallet-collective",
  "pallet-conviction-voting",
- "pallet-democracy",
  "pallet-ethereum",
  "pallet-evm",
  "pallet-evm-precompile-blake2",
@@ -5920,7 +5919,6 @@ dependencies = [
  "pallet-balances",
  "pallet-collective",
  "pallet-conviction-voting",
- "pallet-democracy",
  "pallet-ethereum",
  "pallet-ethereum-xcm",
  "pallet-evm",
diff --git a/runtime/crab/Cargo.toml b/runtime/crab/Cargo.toml
index 373364876..5a9d5ae43 100644
--- a/runtime/crab/Cargo.toml
+++ b/runtime/crab/Cargo.toml
@@ -71,7 +71,6 @@ pallet-authorship                          = { workspace = true }
 pallet-balances                            = { workspace = true }
 pallet-collective                          = { workspace = true }
 pallet-conviction-voting                   = { workspace = true }
-pallet-democracy                           = { workspace = true }
 pallet-message-queue                       = { workspace = true }
 pallet-preimage                            = { workspace = true }
 pallet-proxy                               = { workspace = true }
@@ -179,7 +178,6 @@ std = [
 	"pallet-balances/std",
 	"pallet-collective/std",
 	"pallet-conviction-voting/std",
-	"pallet-democracy/std",
 	"pallet-message-queue/std",
 	"pallet-preimage/std",
 	"pallet-proxy/std",
@@ -272,7 +270,6 @@ runtime-benchmarks = [
 	"pallet-balances/runtime-benchmarks",
 	"pallet-collective/runtime-benchmarks",
 	"pallet-conviction-voting/runtime-benchmarks",
-	"pallet-democracy/runtime-benchmarks",
 	"pallet-message-queue/runtime-benchmarks",
 	"pallet-preimage/runtime-benchmarks",
 	"pallet-proxy/runtime-benchmarks",
@@ -323,7 +320,6 @@ try-runtime = [
 	"pallet-balances/try-runtime",
 	"pallet-collective/try-runtime",
 	"pallet-conviction-voting/try-runtime",
-	"pallet-democracy/try-runtime",
 	"pallet-message-queue/try-runtime",
 	"pallet-preimage/try-runtime",
 	"pallet-proxy/try-runtime",
diff --git a/runtime/koi/Cargo.toml b/runtime/koi/Cargo.toml
index fa556cfbc..d7c211e3d 100644
--- a/runtime/koi/Cargo.toml
+++ b/runtime/koi/Cargo.toml
@@ -77,7 +77,6 @@ pallet-authorship                          = { workspace = true }
 pallet-balances                            = { workspace = true }
 pallet-collective                          = { workspace = true }
 pallet-conviction-voting                   = { workspace = true }
-pallet-democracy                           = { workspace = true }
 pallet-message-queue                       = { workspace = true }
 pallet-preimage                            = { workspace = true }
 pallet-proxy                               = { workspace = true }
@@ -193,7 +192,6 @@ std = [
 	"pallet-balances/std",
 	"pallet-collective/std",
 	"pallet-conviction-voting/std",
-	"pallet-democracy/std",
 	"pallet-message-queue/std",
 	"pallet-preimage/std",
 	"pallet-proxy/std",
@@ -290,7 +288,6 @@ runtime-benchmarks = [
 	"pallet-balances/runtime-benchmarks",
 	"pallet-collective/runtime-benchmarks",
 	"pallet-conviction-voting/runtime-benchmarks",
-	"pallet-democracy/runtime-benchmarks",
 	"pallet-message-queue/runtime-benchmarks",
 	"pallet-preimage/runtime-benchmarks",
 	"pallet-proxy/runtime-benchmarks",
@@ -349,7 +346,6 @@ try-runtime = [
 	"pallet-balances/try-runtime",
 	"pallet-collective/try-runtime",
 	"pallet-conviction-voting/try-runtime",
-	"pallet-democracy/try-runtime",
 	"pallet-message-queue/try-runtime",
 	"pallet-preimage/try-runtime",
 	"pallet-proxy/try-runtime",

From 5aabe5224303176fd8664b3c84c6572658101840 Mon Sep 17 00:00:00 2001
From: Xavier Lau <xavier@inv.cafe>
Date: Tue, 25 Jun 2024 16:44:07 +0800
Subject: [PATCH 30/59] paritytech/polkadot-sdk#2142

---
 runtime/crab/src/lib.rs     | 5 ++++-
 runtime/darwinia/src/lib.rs | 5 ++++-
 runtime/koi/src/lib.rs      | 5 ++++-
 3 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/runtime/crab/src/lib.rs b/runtime/crab/src/lib.rs
index d4f142f43..1d426acc3 100644
--- a/runtime/crab/src/lib.rs
+++ b/runtime/crab/src/lib.rs
@@ -65,7 +65,10 @@ pub type Executive = frame_executive::Executive<
 	frame_system::ChainContext<Runtime>,
 	Runtime,
 	AllPalletsWithSystem,
-	migration::CustomOnRuntimeUpgrade,
+	(
+		migration::CustomOnRuntimeUpgrade,
+		cumulus_pallet_xcmp_queue::migration::v4::MigrationToV4<Runtime>,
+	),
 >;
 
 /// Runtime version.
diff --git a/runtime/darwinia/src/lib.rs b/runtime/darwinia/src/lib.rs
index 7fc726db3..60fdbf3f0 100644
--- a/runtime/darwinia/src/lib.rs
+++ b/runtime/darwinia/src/lib.rs
@@ -65,7 +65,10 @@ pub type Executive = frame_executive::Executive<
 	frame_system::ChainContext<Runtime>,
 	Runtime,
 	AllPalletsWithSystem,
-	migration::CustomOnRuntimeUpgrade,
+	(
+		migration::CustomOnRuntimeUpgrade,
+		cumulus_pallet_xcmp_queue::migration::v4::MigrationToV4<Runtime>,
+	),
 >;
 
 /// Runtime version.
diff --git a/runtime/koi/src/lib.rs b/runtime/koi/src/lib.rs
index 1a9df8525..331009b25 100644
--- a/runtime/koi/src/lib.rs
+++ b/runtime/koi/src/lib.rs
@@ -66,7 +66,10 @@ pub type Executive = frame_executive::Executive<
 	frame_system::ChainContext<Runtime>,
 	Runtime,
 	AllPalletsWithSystem,
-	(migration::CustomOnRuntimeUpgrade, darwinia_staking::migration::v2::MigrateToV2<Runtime>),
+	(
+		migration::CustomOnRuntimeUpgrade,
+		cumulus_pallet_xcmp_queue::migration::v4::MigrationToV4<Runtime>,
+	),
 >;
 
 /// Runtime version.

From b1d1ca6d4ef1ad6b7a0463b3e241c8051d2fb0c2 Mon Sep 17 00:00:00 2001
From: Xavier Lau <xavier@inv.cafe>
Date: Tue, 25 Jun 2024 17:20:28 +0800
Subject: [PATCH 31/59] paritytech/polkadot-sdk#2428

---
 runtime/common/src/xcm_configs.rs            | 29 +++++++++++++++-----
 runtime/crab/src/pallets/polkadot_xcm.rs     |  6 ++--
 runtime/darwinia/src/pallets/polkadot_xcm.rs |  6 ++--
 runtime/koi/src/pallets/polkadot_xcm.rs      |  8 ++----
 4 files changed, 29 insertions(+), 20 deletions(-)

diff --git a/runtime/common/src/xcm_configs.rs b/runtime/common/src/xcm_configs.rs
index 0ffae01ac..22e7b4aa4 100644
--- a/runtime/common/src/xcm_configs.rs
+++ b/runtime/common/src/xcm_configs.rs
@@ -25,7 +25,9 @@ use dc_primitives::GWEI;
 // polkadot-sdk
 use frame_support::{
 	pallet_prelude::*,
-	traits::{tokens::currency::Currency as CurrencyT, ConstU128, OnUnbalanced as OnUnbalancedT},
+	traits::{
+		tokens::currency::Currency as CurrencyT, ConstU128, Contains, OnUnbalanced as OnUnbalancedT,
+	},
 	weights::{Weight, WeightToFee as WeightToFeeT},
 };
 use sp_core::Get;
@@ -40,13 +42,11 @@ use xcm_executor::traits::{ConvertLocation, WeightTrader};
 pub type XcmBaseWeightFee = ConstU128<GWEI>;
 
 frame_support::match_types! {
-	pub type ParentOrParentsExecutivePlurality: impl Contains<Location> = {
+	pub type ParentOrParentsPlurality: impl Contains<Location> = {
 		Location { parents: 1, interior: Here } |
-		Location { parents: 1, interior: Junctions::X1(Plurality { id: BodyId::Executive, .. }) }
-	};
-	pub type ParentOrSiblings: impl Contains<Location> = {
-		Location { parents: 1, interior: Here } |
-		Location { parents: 1, interior: Junctions::X1(_) }
+		Location { parents: 1, interior: Junctions::X1(Plurality { id: BodyId::Administration, .. }) }|
+		Location { parents: 1, interior: Junctions::X1(Plurality { id: BodyId::Executive, .. }) }|
+		Location { parents: 1, interior: Junctions::X1(Plurality { id: BodyId::Technical, .. }) }
 	};
 }
 
@@ -140,6 +140,21 @@ impl<
 	}
 }
 
+/// Filter to check if a given location is the parent Relay Chain or a sibling parachain.
+///
+/// This type should only be used within the context of a parachain, since it does not verify that
+/// the parent is indeed a Relay Chain.
+pub struct ParentRelayOrSiblingParachains;
+impl Contains<Location> for ParentRelayOrSiblingParachains {
+	fn contains(location: &Location) -> bool {
+		matches!(
+			location,
+			Location { parents: 1, interior: Here }
+				| Location { parents: 1, interior: Junctions::X1(Parachain(_)) }
+		)
+	}
+}
+
 // TODO: move to other place.
 #[derive(Clone, Debug, Default, Eq, PartialEq, Ord, PartialOrd, Encode, Decode, TypeInfo)]
 pub struct AssetRegistrarMetadata {
diff --git a/runtime/crab/src/pallets/polkadot_xcm.rs b/runtime/crab/src/pallets/polkadot_xcm.rs
index 01e6d48ce..4d49d17b3 100644
--- a/runtime/crab/src/pallets/polkadot_xcm.rs
+++ b/runtime/crab/src/pallets/polkadot_xcm.rs
@@ -88,12 +88,10 @@ pub type Barrier = xcm_builder::TrailingSetTopicAsId<
 					// Parent, its pluralities (i.e. governance bodies), and the Fellows plurality
 					// get free execution.
 					xcm_builder::AllowUnpaidExecutionFrom<
-						darwinia_common_runtime::xcm_configs::ParentOrParentsExecutivePlurality,
+						darwinia_common_runtime::xcm_configs::ParentOrParentsPlurality,
 					>,
 					// Subscriptions for version tracking are OK.
-					xcm_builder::AllowSubscriptionsFrom<
-						darwinia_common_runtime::xcm_configs::ParentOrSiblings,
-					>,
+					xcm_builder::AllowSubscriptionsFrom<ParentRelayOrSiblingParachains>,
 				),
 				UniversalLocation,
 				ConstU32<8>,
diff --git a/runtime/darwinia/src/pallets/polkadot_xcm.rs b/runtime/darwinia/src/pallets/polkadot_xcm.rs
index f9a1055f9..ec6228a1c 100644
--- a/runtime/darwinia/src/pallets/polkadot_xcm.rs
+++ b/runtime/darwinia/src/pallets/polkadot_xcm.rs
@@ -122,12 +122,10 @@ pub type Barrier = xcm_builder::TrailingSetTopicAsId<
 					// Parent, its pluralities (i.e. governance bodies), and the Fellows plurality
 					// get free execution.
 					xcm_builder::AllowUnpaidExecutionFrom<
-						darwinia_common_runtime::xcm_configs::ParentOrParentsExecutivePlurality,
+						darwinia_common_runtime::xcm_configs::ParentOrParentsPlurality,
 					>,
 					// Subscriptions for version tracking are OK.
-					xcm_builder::AllowSubscriptionsFrom<
-						darwinia_common_runtime::xcm_configs::ParentOrSiblings,
-					>,
+					xcm_builder::AllowSubscriptionsFrom<ParentRelayOrSiblingParachains>,
 				),
 				UniversalLocation,
 				ConstU32<8>,
diff --git a/runtime/koi/src/pallets/polkadot_xcm.rs b/runtime/koi/src/pallets/polkadot_xcm.rs
index 67862ebc0..299935a87 100644
--- a/runtime/koi/src/pallets/polkadot_xcm.rs
+++ b/runtime/koi/src/pallets/polkadot_xcm.rs
@@ -19,8 +19,8 @@
 // darwinia
 use crate::*;
 // substrate
-use xcm::latest::prelude::*;
 use frame_support::traits::Currency;
+use xcm::latest::prelude::*;
 
 /// Means for transacting assets on this chain.
 pub type LocalAssetTransactor = xcm_builder::CurrencyAdapter<
@@ -121,12 +121,10 @@ pub type Barrier = xcm_builder::TrailingSetTopicAsId<
 					// Parent, its pluralities (i.e. governance bodies), and the Fellows plurality
 					// get free execution.
 					xcm_builder::AllowExplicitUnpaidExecutionFrom<
-						darwinia_common_runtime::xcm_configs::ParentOrParentsExecutivePlurality,
+						darwinia_common_runtime::xcm_configs::ParentOrParentsPlurality,
 					>,
 					// Subscriptions for version tracking are OK.
-					xcm_builder::AllowSubscriptionsFrom<
-						darwinia_common_runtime::xcm_configs::ParentOrSiblings,
-					>,
+					xcm_builder::AllowSubscriptionsFrom<ParentRelayOrSiblingParachains>,
 				),
 				UniversalLocation,
 				ConstU32<8>,

From 01bb32ae2476acfa9508305a2e90a177fb2e047f Mon Sep 17 00:00:00 2001
From: Xavier Lau <xavier@inv.cafe>
Date: Tue, 25 Jun 2024 17:26:45 +0800
Subject: [PATCH 32/59] paritytech/polkadot-sdk#3228

---
 runtime/crab/src/lib.rs     | 1 +
 runtime/darwinia/src/lib.rs | 1 +
 runtime/koi/src/lib.rs      | 1 +
 3 files changed, 3 insertions(+)

diff --git a/runtime/crab/src/lib.rs b/runtime/crab/src/lib.rs
index 1d426acc3..3256c6595 100644
--- a/runtime/crab/src/lib.rs
+++ b/runtime/crab/src/lib.rs
@@ -68,6 +68,7 @@ pub type Executive = frame_executive::Executive<
 	(
 		migration::CustomOnRuntimeUpgrade,
 		cumulus_pallet_xcmp_queue::migration::v4::MigrationToV4<Runtime>,
+		pallet_xcm::migration::MigrateToLatestXcmVersion<Runtime>,
 	),
 >;
 
diff --git a/runtime/darwinia/src/lib.rs b/runtime/darwinia/src/lib.rs
index 60fdbf3f0..a26d684e4 100644
--- a/runtime/darwinia/src/lib.rs
+++ b/runtime/darwinia/src/lib.rs
@@ -68,6 +68,7 @@ pub type Executive = frame_executive::Executive<
 	(
 		migration::CustomOnRuntimeUpgrade,
 		cumulus_pallet_xcmp_queue::migration::v4::MigrationToV4<Runtime>,
+		pallet_xcm::migration::MigrateToLatestXcmVersion<Runtime>,
 	),
 >;
 
diff --git a/runtime/koi/src/lib.rs b/runtime/koi/src/lib.rs
index 331009b25..9633363e9 100644
--- a/runtime/koi/src/lib.rs
+++ b/runtime/koi/src/lib.rs
@@ -69,6 +69,7 @@ pub type Executive = frame_executive::Executive<
 	(
 		migration::CustomOnRuntimeUpgrade,
 		cumulus_pallet_xcmp_queue::migration::v4::MigrationToV4<Runtime>,
+		pallet_xcm::migration::MigrateToLatestXcmVersion<Runtime>,
 	),
 >;
 

From 2f4d15d6f8509959b2f796b5a8ff3b7d55dc6d3d Mon Sep 17 00:00:00 2001
From: Xavier Lau <xavier@inv.cafe>
Date: Tue, 25 Jun 2024 18:08:29 +0800
Subject: [PATCH 33/59] XCM V4 part.2

---
 Cargo.lock                                   |   1 -
 runtime/common/Cargo.toml                    |   2 -
 runtime/common/src/xcm_configs.rs            | 110 ++------------
 runtime/crab/src/pallets.rs                  |   2 -
 runtime/crab/src/pallets/polkadot_xcm.rs     |  92 +++++-------
 runtime/darwinia/src/pallets.rs              |   2 -
 runtime/darwinia/src/pallets/polkadot_xcm.rs | 142 ++++++++-----------
 runtime/koi/src/pallets.rs                   |   2 -
 runtime/koi/src/pallets/polkadot_xcm.rs      | 142 ++++++++-----------
 9 files changed, 172 insertions(+), 323 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index f981f796e..262001a14 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2761,7 +2761,6 @@ dependencies = [
  "sp-runtime",
  "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "staging-xcm",
- "staging-xcm-builder",
  "staging-xcm-executor",
 ]
 
diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml
index f6dc377ed..139cac073 100644
--- a/runtime/common/Cargo.toml
+++ b/runtime/common/Cargo.toml
@@ -35,7 +35,6 @@ sp-io                   = { workspace = true }
 sp-runtime              = { workspace = true }
 sp-std                  = { workspace = true }
 xcm                     = { workspace = true }
-xcm-builder             = { workspace = true }
 xcm-executor            = { workspace = true }
 
 [features]
@@ -66,7 +65,6 @@ std = [
 	"sp-io/std",
 	"sp-runtime/std",
 	"sp-std/std",
-	"xcm-builder/std",
 	"xcm-executor/std",
 	"xcm/std",
 	# polkadot-sdk optional
diff --git a/runtime/common/src/xcm_configs.rs b/runtime/common/src/xcm_configs.rs
index 22e7b4aa4..31d4b3430 100644
--- a/runtime/common/src/xcm_configs.rs
+++ b/runtime/common/src/xcm_configs.rs
@@ -25,31 +25,16 @@ use dc_primitives::GWEI;
 // polkadot-sdk
 use frame_support::{
 	pallet_prelude::*,
-	traits::{
-		tokens::currency::Currency as CurrencyT, ConstU128, Contains, OnUnbalanced as OnUnbalancedT,
-	},
-	weights::{Weight, WeightToFee as WeightToFeeT},
+	traits::{ConstU128, Contains},
 };
-use sp_core::Get;
 use sp_io::hashing::blake2_256;
-use sp_runtime::traits::{SaturatedConversion, Saturating, Zero};
-use sp_std::{prelude::*, result::Result};
-use xcm::latest::{prelude::*, Weight as XcmWeight};
-use xcm_builder::TakeRevenue;
-use xcm_executor::traits::{ConvertLocation, WeightTrader};
+use sp_std::prelude::*;
+use xcm::latest::prelude::*;
+use xcm_executor::traits::ConvertLocation;
 
 /// Base balance required for the XCM unit weight.
 pub type XcmBaseWeightFee = ConstU128<GWEI>;
 
-frame_support::match_types! {
-	pub type ParentOrParentsPlurality: impl Contains<Location> = {
-		Location { parents: 1, interior: Here } |
-		Location { parents: 1, interior: Junctions::X1(Plurality { id: BodyId::Administration, .. }) }|
-		Location { parents: 1, interior: Junctions::X1(Plurality { id: BodyId::Executive, .. }) }|
-		Location { parents: 1, interior: Junctions::X1(Plurality { id: BodyId::Technical, .. }) }
-	};
-}
-
 /// Struct that converts a given Location into a 20 bytes account id by hashing
 /// with blake2_256 and taking the first 20 bytes
 pub struct Account20Hash<AccountId>(PhantomData<AccountId>);
@@ -66,77 +51,16 @@ impl<AccountId: From<[u8; 20]> + Into<[u8; 20]> + Clone> ConvertLocation<Account
 	}
 }
 
-/// Weight trader to set the right price for weight and then places any weight bought into the right
-/// account. Refer to: https://github.com/paritytech/polkadot/blob/release-v0.9.30/xcm/xcm-builder/src/weight.rs#L242-L305
-pub struct LocalAssetTrader<
-	WeightToFee: WeightToFeeT<Balance = Currency::Balance>,
-	AssetId: Get<Location>,
-	AccountId,
-	Currency: CurrencyT<AccountId>,
-	OnUnbalanced: OnUnbalancedT<Currency::NegativeImbalance>,
-	R: TakeRevenue,
->(
-	Weight,
-	Currency::Balance,
-	PhantomData<(WeightToFee, AssetId, AccountId, Currency, OnUnbalanced, R)>,
-);
-impl<
-		WeightToFee: WeightToFeeT<Balance = Currency::Balance>,
-		AssetId: Get<Location>,
-		AccountId,
-		Currency: CurrencyT<AccountId>,
-		OnUnbalanced: OnUnbalancedT<Currency::NegativeImbalance>,
-		R: TakeRevenue,
-	> WeightTrader for LocalAssetTrader<WeightToFee, AssetId, AccountId, Currency, OnUnbalanced, R>
-{
-	fn new() -> Self {
-		Self(Weight::zero(), Zero::zero(), PhantomData)
-	}
-
-	fn buy_weight(
-		&mut self,
-		weight: XcmWeight,
-		payment: Assets,
-		_context: &XcmContext,
-	) -> Result<Assets, XcmError> {
-		log::trace!(target: "xcm::weight", "LocalAssetTrader::buy_weight weight: {:?}, payment:
-		{:?}", weight, payment);
-		let amount = WeightToFee::weight_to_fee(&weight);
-		let u128_amount: u128 = amount.try_into().map_err(|_| XcmError::Overflow)?;
-		let required: Assets = (Concrete(AssetId::get()), u128_amount).into();
-		let unused = payment.checked_sub(required.clone()).map_err(|_| XcmError::TooExpensive)?;
-		self.0 = self.0.saturating_add(weight);
-		self.1 = self.1.saturating_add(amount);
-		R::take_revenue(required);
-		Ok(unused)
-	}
-
-	fn refund_weight(&mut self, weight: XcmWeight, _context: &XcmContext) -> Option<MultiAsset> {
-		log::trace!(target: "xcm::weight", "LocalAssetTrader::refund_weight weight: {:?}",
-		weight);
-		let weight = weight.min(self.0);
-		let amount = WeightToFee::weight_to_fee(&weight);
-		self.0 -= weight;
-		self.1 = self.1.saturating_sub(amount);
-		let amount: u128 = amount.saturated_into();
-		if amount > 0 {
-			Some((AssetId::get(), amount).into())
-		} else {
-			None
-		}
-	}
-}
-impl<
-		WeightToFee: WeightToFeeT<Balance = Currency::Balance>,
-		AssetId: Get<Location>,
-		AccountId,
-		Currency: CurrencyT<AccountId>,
-		OnUnbalanced: OnUnbalancedT<Currency::NegativeImbalance>,
-		R: TakeRevenue,
-	> Drop for LocalAssetTrader<WeightToFee, AssetId, AccountId, Currency, OnUnbalanced, R>
-{
-	fn drop(&mut self) {
-		OnUnbalanced::on_unbalanced(Currency::issue(self.1));
+pub struct ParentOrParentsPlurality;
+impl Contains<Location> for ParentOrParentsPlurality {
+	fn contains(location: &Location) -> bool {
+		matches!(
+			location.unpack(),
+			(1, [])
+				| (1, [Plurality { id: BodyId::Administration, .. }])
+				| (1, [Plurality { id: BodyId::Executive, .. }])
+				| (1, [Plurality { id: BodyId::Technical, .. }])
+		)
 	}
 }
 
@@ -147,11 +71,7 @@ impl<
 pub struct ParentRelayOrSiblingParachains;
 impl Contains<Location> for ParentRelayOrSiblingParachains {
 	fn contains(location: &Location) -> bool {
-		matches!(
-			location,
-			Location { parents: 1, interior: Here }
-				| Location { parents: 1, interior: Junctions::X1(Parachain(_)) }
-		)
+		matches!(location.unpack(), (1, []) | (1, [Parachain(_)]))
 	}
 }
 
diff --git a/runtime/crab/src/pallets.rs b/runtime/crab/src/pallets.rs
index ee1f9cccb..016b69359 100644
--- a/runtime/crab/src/pallets.rs
+++ b/runtime/crab/src/pallets.rs
@@ -67,8 +67,6 @@ pub use governance::*;
 // Utility stuff.
 mod utility;
 
-mod identity;
-
 mod scheduler;
 
 mod preimage;
diff --git a/runtime/crab/src/pallets/polkadot_xcm.rs b/runtime/crab/src/pallets/polkadot_xcm.rs
index 4d49d17b3..6c65a6ecf 100644
--- a/runtime/crab/src/pallets/polkadot_xcm.rs
+++ b/runtime/crab/src/pallets/polkadot_xcm.rs
@@ -23,6 +23,29 @@ use xcm::latest::prelude::*;
 // substrate
 use frame_support::traits::Currency;
 
+frame_support::parameter_types! {
+	pub const RelayNetwork: NetworkId = NetworkId::Kusama;
+	pub const MaxAssetsIntoHolding: u32 = 64;
+	pub const MaxInstructions: u32 = 100;
+	/// A temporary weight value for each XCM instruction.
+	/// NOTE: This should be removed after we account for PoV weights.
+	pub const TempFixedXcmWeight: frame_support::weights::Weight = frame_support::weights::Weight::from_parts(1_000_000_000, 0);
+	pub AnchoringSelfReserve: Location = Location::new(
+		0,
+		Junctions::X1(PalletInstance(<Balances as frame_support::traits::PalletInfoAccess>::index() as u8))
+	);
+	pub UniversalLocation: InteriorLocation = Parachain(ParachainInfo::parachain_id().into()).into();
+	/// The amount of weight an XCM operation takes. This is a safe overestimate.
+	pub BaseXcmWeight: frame_support::weights::Weight = frame_support::weights::Weight::from_parts(1_000_000_000, 1024);
+	pub RelayChainOrigin: RuntimeOrigin = cumulus_pallet_xcm::Origin::Relay.into();
+	pub SelfReserve: Location = Location {
+		parents:0,
+		interior: [
+			PalletInstance(<Balances as PalletInfoAccess>::index() as u8)
+		].into()
+	};
+}
+
 /// Means for transacting assets on this chain.
 pub type LocalAssetTransactor = xcm_builder::CurrencyAdapter<
 	// Use this currency:
@@ -36,11 +59,6 @@ pub type LocalAssetTransactor = xcm_builder::CurrencyAdapter<
 	// We don't track any teleports.
 	(),
 >;
-
-frame_support::parameter_types! {
-	pub const RelayNetwork: NetworkId = NetworkId::Kusama;
-	pub RelayChainOrigin: RuntimeOrigin = cumulus_pallet_xcm::Origin::Relay.into();
-}
 /// Type for specifying how a `Location` can be converted into an `AccountId`. This is used
 /// when determining ownership of accounts for asset transacting and when attempting to use XCM
 /// `Transact` in order to determine the dispatch Origin.
@@ -74,7 +92,6 @@ pub type XcmOriginToTransactDispatchOrigin = (
 	// Xcm origins can be represented natively under the Xcm pallet's Xcm origin.
 	pallet_xcm::XcmPassthrough<RuntimeOrigin>,
 );
-
 pub type Barrier = xcm_builder::TrailingSetTopicAsId<
 	xcm_builder::DenyThenTry<
 		xcm_builder::DenyReserveTransferToRelayChain,
@@ -101,36 +118,17 @@ pub type Barrier = xcm_builder::TrailingSetTopicAsId<
 		),
 	>,
 >;
-
-frame_support::parameter_types! {
-	pub const MaxAssetsIntoHolding: u32 = 64;
-	pub const MaxInstructions: u32 = 100;
-	pub AnchoringSelfReserve: Location = Location::new(
-		0,
-		Junctions::X1(PalletInstance(<Balances as frame_support::traits::PalletInfoAccess>::index() as u8))
-	);
-	pub UniversalLocation: InteriorMultiLocation = Parachain(ParachainInfo::parachain_id().into()).into();
-	/// The amount of weight an XCM operation takes. This is a safe overestimate.
-	pub BaseXcmWeight: frame_support::weights::Weight = frame_support::weights::Weight::from_parts(1_000_000_000, 1024);
-	/// A temporary weight value for each XCM instruction.
-	/// NOTE: This should be removed after we account for PoV weights.
-	pub const TempFixedXcmWeight: frame_support::weights::Weight = frame_support::weights::Weight::from_parts(1_000_000_000, 0);
-}
-
-pub struct ToTreasury;
-impl xcm_builder::TakeRevenue for ToTreasury {
-	fn take_revenue(revenue: MultiAsset) {
-		if let MultiAsset { id: Concrete(_location), fun: Fungible(amount) } = revenue {
-			let treasury_account = Treasury::account_id();
-			let _ = Balances::deposit_creating(&treasury_account, amount);
-
-			log::trace!(
-				target: "xcm::weight",
-				"LocalAssetTrader::to_treasury amount: {amount:?}, treasury: {treasury_account:?}"
-			);
-		}
-	}
-}
+/// No local origins on this chain are allowed to dispatch XCM sends/executions.
+pub type LocalOriginToLocation =
+	xcm_primitives::SignedToAccountId20<RuntimeOrigin, AccountId, RelayNetwork>;
+/// The means for routing XCM messages which are not for local execution into the right message
+/// queues.
+pub type XcmRouter = xcm_builder::WithUniqueTopic<(
+	// Two routers - use UMP to communicate with the relay chain:
+	cumulus_primitives_utility::ParentAsUmp<ParachainSystem, PolkadotXcm, ()>,
+	// ..and XCMP to communicate with the sibling chains.
+	XcmpQueue,
+)>;
 
 pub struct XcmExecutorConfig;
 impl xcm_executor::Config for XcmExecutorConfig {
@@ -154,16 +152,12 @@ impl xcm_executor::Config for XcmExecutorConfig {
 	type RuntimeCall = RuntimeCall;
 	type SafeCallFilter = frame_support::traits::Everything;
 	type SubscriptionService = PolkadotXcm;
-	type Trader = xcm_configs::LocalAssetTrader<
-		frame_support::weights::ConstantMultiplier<
-			Balance,
-			darwinia_common_runtime::xcm_configs::XcmBaseWeightFee,
-		>,
-		AnchoringSelfReserve,
+	type Trader = xcm_builder::UsingComponents<
+		<Runtime as pallet_transaction_payment::Config>::WeightToFee,
+		SelfReserve,
 		AccountId,
 		Balances,
 		DealWithFees<Runtime>,
-		ToTreasury,
 	>;
 	type TransactionalProcessor = xcm_builder::FrameTransactionalProcessor;
 	type UniversalAliases = frame_support::traits::Nothing;
@@ -173,18 +167,6 @@ impl xcm_executor::Config for XcmExecutorConfig {
 	type XcmSender = XcmRouter;
 }
 
-/// No local origins on this chain are allowed to dispatch XCM sends/executions.
-pub type LocalOriginToLocation =
-	xcm_primitives::SignedToAccountId20<RuntimeOrigin, AccountId, RelayNetwork>;
-/// The means for routing XCM messages which are not for local execution into the right message
-/// queues.
-pub type XcmRouter = xcm_builder::WithUniqueTopic<(
-	// Two routers - use UMP to communicate with the relay chain:
-	cumulus_primitives_utility::ParentAsUmp<ParachainSystem, PolkadotXcm, ()>,
-	// ..and XCMP to communicate with the sibling chains.
-	XcmpQueue,
-)>;
-
 impl pallet_xcm::Config for Runtime {
 	type AdminOrigin = Root;
 	// ^ Override for AdvertisedXcmVersion default
diff --git a/runtime/darwinia/src/pallets.rs b/runtime/darwinia/src/pallets.rs
index 0e15482a0..afc5931dd 100644
--- a/runtime/darwinia/src/pallets.rs
+++ b/runtime/darwinia/src/pallets.rs
@@ -67,8 +67,6 @@ pub use governance::*;
 // Utility stuff.
 mod utility;
 
-mod identity;
-
 mod scheduler;
 
 mod preimage;
diff --git a/runtime/darwinia/src/pallets/polkadot_xcm.rs b/runtime/darwinia/src/pallets/polkadot_xcm.rs
index ec6228a1c..854e25497 100644
--- a/runtime/darwinia/src/pallets/polkadot_xcm.rs
+++ b/runtime/darwinia/src/pallets/polkadot_xcm.rs
@@ -23,6 +23,31 @@ use xcm::latest::prelude::*;
 // substrate
 use frame_support::traits::Currency;
 
+frame_support::parameter_types! {
+	pub const RelayNetwork: NetworkId = NetworkId::Polkadot;
+	pub const MaxAssetsIntoHolding: u32 = 64;
+	pub const MaxInstructions: u32 = 100;
+	/// A temporary weight value for each XCM instruction.
+	/// NOTE: This should be removed after we account for PoV weights.
+	pub const TempFixedXcmWeight: frame_support::weights::Weight = frame_support::weights::Weight::from_parts(1_000_000_000, 0);
+	pub AnchoringSelfReserve: Location = Location::new(
+		0,
+		Junctions::X1(PalletInstance(<Balances as frame_support::traits::PalletInfoAccess>::index() as u8))
+	);
+	pub UniversalLocation: InteriorLocation = Parachain(ParachainInfo::parachain_id().into()).into();
+	/// The amount of weight an XCM operation takes. This is a safe overestimate.
+	pub BaseXcmWeight: frame_support::weights::Weight = frame_support::weights::Weight::from_parts(1_000_000_000, 1024);
+	/// Xcm fees will go to the treasury account
+	pub XcmFeesAccount: AccountId = Treasury::account_id();
+	pub RelayChainOrigin: RuntimeOrigin = cumulus_pallet_xcm::Origin::Relay.into();
+	pub SelfReserve: Location = Location {
+		parents:0,
+		interior: [
+			PalletInstance(<Balances as PalletInfoAccess>::index() as u8)
+		].into()
+	};
+}
+
 /// Means for transacting assets on this chain.
 pub type LocalAssetTransactor = xcm_builder::CurrencyAdapter<
 	// Use this currency:
@@ -36,7 +61,6 @@ pub type LocalAssetTransactor = xcm_builder::CurrencyAdapter<
 	// We don't track any teleports.
 	(),
 >;
-
 // The non-reserve fungible transactor type
 // It will use pallet-assets, and the Id will be matched against AsAssetType
 pub type ForeignFungiblesTransactor = xcm_builder::FungiblesAdapter<
@@ -64,17 +88,11 @@ pub type ForeignFungiblesTransactor = xcm_builder::FungiblesAdapter<
 	// We dont track any teleports
 	(),
 >;
-
 pub type AssetTransactors = (
 	// The transactor for our native asset.
 	LocalAssetTransactor,
 	ForeignFungiblesTransactor,
 );
-
-frame_support::parameter_types! {
-	pub const RelayNetwork: NetworkId = NetworkId::Polkadot;
-	pub RelayChainOrigin: RuntimeOrigin = cumulus_pallet_xcm::Origin::Relay.into();
-}
 /// Type for specifying how a `Location` can be converted into an `AccountId`. This is used
 /// when determining ownership of accounts for asset transacting and when attempting to use XCM
 /// `Transact` in order to determine the dispatch Origin.
@@ -108,7 +126,6 @@ pub type XcmOriginToTransactDispatchOrigin = (
 	// Xcm origins can be represented natively under the Xcm pallet's Xcm origin.
 	pallet_xcm::XcmPassthrough<RuntimeOrigin>,
 );
-
 pub type Barrier = xcm_builder::TrailingSetTopicAsId<
 	xcm_builder::DenyThenTry<
 		xcm_builder::DenyReserveTransferToRelayChain,
@@ -135,38 +152,38 @@ pub type Barrier = xcm_builder::TrailingSetTopicAsId<
 		),
 	>,
 >;
-
-frame_support::parameter_types! {
-	pub const MaxAssetsIntoHolding: u32 = 64;
-	pub const MaxInstructions: u32 = 100;
-	pub AnchoringSelfReserve: Location = Location::new(
-		0,
-		Junctions::X1(PalletInstance(<Balances as frame_support::traits::PalletInfoAccess>::index() as u8))
-	);
-	pub UniversalLocation: InteriorMultiLocation = Parachain(ParachainInfo::parachain_id().into()).into();
-	/// The amount of weight an XCM operation takes. This is a safe overestimate.
-	pub BaseXcmWeight: frame_support::weights::Weight = frame_support::weights::Weight::from_parts(1_000_000_000, 1024);
-	/// Xcm fees will go to the treasury account
-	pub XcmFeesAccount: AccountId = Treasury::account_id();
-	/// A temporary weight value for each XCM instruction.
-	/// NOTE: This should be removed after we account for PoV weights.
-	pub const TempFixedXcmWeight: frame_support::weights::Weight = frame_support::weights::Weight::from_parts(1_000_000_000, 0);
-}
-
-pub struct ToTreasury;
-impl xcm_builder::TakeRevenue for ToTreasury {
-	fn take_revenue(revenue: MultiAsset) {
-		if let MultiAsset { id: Concrete(_location), fun: Fungible(amount) } = revenue {
-			let treasury_account = Treasury::account_id();
-			let _ = Balances::deposit_creating(&treasury_account, amount);
-
-			log::trace!(
-				target: "xcm::weight",
-				"LocalAssetTrader::to_treasury amount: {amount:?}, treasury: {treasury_account:?}"
-			);
-		}
-	}
-}
+/// This is the struct that will handle the revenue from xcm fees
+/// We do not burn anything because we want to mimic exactly what
+/// the sovereign account has
+pub type XcmFeesToAccount = xcm_primitives::XcmFeesToAccount<
+	Assets,
+	(
+		xcm_builder::ConvertedConcreteId<
+			crate::AssetId,
+			Balance,
+			xcm_primitives::AsAssetType<
+				crate::AssetId,
+				pallets::asset_manager::AssetType,
+				AssetManager,
+			>,
+			xcm_executor::traits::JustTry,
+		>,
+	),
+	AccountId,
+	XcmFeesAccount,
+>;
+pub type XcmWeigher = xcm_builder::FixedWeightBounds<BaseXcmWeight, RuntimeCall, MaxInstructions>;
+/// No local origins on this chain are allowed to dispatch XCM sends/executions.
+pub type LocalOriginToLocation =
+	xcm_primitives::SignedToAccountId20<RuntimeOrigin, AccountId, RelayNetwork>;
+/// The means for routing XCM messages which are not for local execution into the right message
+/// queues.
+pub type XcmRouter = xcm_builder::WithUniqueTopic<(
+	// Two routers - use UMP to communicate with the relay chain:
+	cumulus_primitives_utility::ParentAsUmp<ParachainSystem, PolkadotXcm, ()>,
+	// ..and XCMP to communicate with the sibling chains.
+	XcmpQueue,
+)>;
 
 pub struct XcmCallDispatcher;
 impl xcm_executor::traits::CallDispatcher<RuntimeCall> for XcmCallDispatcher {
@@ -196,29 +213,6 @@ impl xcm_executor::traits::CallDispatcher<RuntimeCall> for XcmCallDispatcher {
 	}
 }
 
-/// This is the struct that will handle the revenue from xcm fees
-/// We do not burn anything because we want to mimic exactly what
-/// the sovereign account has
-pub type XcmFeesToAccount = xcm_primitives::XcmFeesToAccount<
-	Assets,
-	(
-		xcm_builder::ConvertedConcreteId<
-			crate::AssetId,
-			Balance,
-			xcm_primitives::AsAssetType<
-				crate::AssetId,
-				pallets::asset_manager::AssetType,
-				AssetManager,
-			>,
-			xcm_executor::traits::JustTry,
-		>,
-	),
-	AccountId,
-	XcmFeesAccount,
->;
-
-pub type XcmWeigher = xcm_builder::FixedWeightBounds<BaseXcmWeight, RuntimeCall, MaxInstructions>;
-
 pub struct XcmExecutorConfig;
 impl xcm_executor::Config for XcmExecutorConfig {
 	type Aliasers = frame_support::traits::Nothing;
@@ -244,16 +238,12 @@ impl xcm_executor::Config for XcmExecutorConfig {
 	type SafeCallFilter = frame_support::traits::Everything;
 	type SubscriptionService = PolkadotXcm;
 	type Trader = (
-		xcm_configs::LocalAssetTrader<
-			frame_support::weights::ConstantMultiplier<
-				Balance,
-				darwinia_common_runtime::xcm_configs::XcmBaseWeightFee,
-			>,
-			AnchoringSelfReserve,
+		xcm_builder::UsingComponents<
+			<Runtime as pallet_transaction_payment::Config>::WeightToFee,
+			SelfReserve,
 			AccountId,
 			Balances,
 			DealWithFees<Runtime>,
-			ToTreasury,
 		>,
 		xcm_primitives::FirstAssetTrader<
 			pallets::asset_manager::AssetType,
@@ -269,18 +259,6 @@ impl xcm_executor::Config for XcmExecutorConfig {
 	type XcmSender = XcmRouter;
 }
 
-/// No local origins on this chain are allowed to dispatch XCM sends/executions.
-pub type LocalOriginToLocation =
-	xcm_primitives::SignedToAccountId20<RuntimeOrigin, AccountId, RelayNetwork>;
-/// The means for routing XCM messages which are not for local execution into the right message
-/// queues.
-pub type XcmRouter = xcm_builder::WithUniqueTopic<(
-	// Two routers - use UMP to communicate with the relay chain:
-	cumulus_primitives_utility::ParentAsUmp<ParachainSystem, PolkadotXcm, ()>,
-	// ..and XCMP to communicate with the sibling chains.
-	XcmpQueue,
-)>;
-
 impl pallet_xcm::Config for Runtime {
 	type AdminOrigin = Root;
 	// ^ Override for AdvertisedXcmVersion default
diff --git a/runtime/koi/src/pallets.rs b/runtime/koi/src/pallets.rs
index b14cafa36..dd034f87e 100644
--- a/runtime/koi/src/pallets.rs
+++ b/runtime/koi/src/pallets.rs
@@ -67,8 +67,6 @@ mod sudo;
 
 mod utility;
 
-mod identity;
-
 mod scheduler;
 
 mod preimage;
diff --git a/runtime/koi/src/pallets/polkadot_xcm.rs b/runtime/koi/src/pallets/polkadot_xcm.rs
index 299935a87..0574882dd 100644
--- a/runtime/koi/src/pallets/polkadot_xcm.rs
+++ b/runtime/koi/src/pallets/polkadot_xcm.rs
@@ -22,6 +22,31 @@ use crate::*;
 use frame_support::traits::Currency;
 use xcm::latest::prelude::*;
 
+frame_support::parameter_types! {
+	pub const RelayNetwork: NetworkId = NetworkId::Rococo;
+	pub const MaxAssetsIntoHolding: u32 = 64;
+	pub const MaxInstructions: u32 = 100;
+	/// A temporary weight value for each XCM instruction.
+	/// NOTE: This should be removed after we account for PoV weights.
+	pub const TempFixedXcmWeight: frame_support::weights::Weight = frame_support::weights::Weight::from_parts(1_000_000_000, 0);
+	pub AnchoringSelfReserve: Location = Location::new(
+		0,
+		Junctions::X1(PalletInstance(<Balances as frame_support::traits::PalletInfoAccess>::index() as u8))
+	);
+	pub UniversalLocation: InteriorLocation = Parachain(ParachainInfo::parachain_id().into()).into();
+	/// The amount of weight an XCM operation takes. This is a safe overestimate.
+	pub BaseXcmWeight: frame_support::weights::Weight = frame_support::weights::Weight::from_parts(1_000_000_000, 1024);
+	/// Xcm fees will go to the treasury account
+	pub XcmFeesAccount: AccountId = Treasury::account_id();
+	pub RelayChainOrigin: RuntimeOrigin = cumulus_pallet_xcm::Origin::Relay.into();
+	pub SelfReserve: Location = Location {
+		parents:0,
+		interior: [
+			PalletInstance(<Balances as PalletInfoAccess>::index() as u8)
+		].into()
+	};
+}
+
 /// Means for transacting assets on this chain.
 pub type LocalAssetTransactor = xcm_builder::CurrencyAdapter<
 	// Use this currency:
@@ -35,7 +60,6 @@ pub type LocalAssetTransactor = xcm_builder::CurrencyAdapter<
 	// We don't track any teleports.
 	(),
 >;
-
 // The non-reserve fungible transactor type
 // It will use pallet-assets, and the Id will be matched against AsAssetType
 pub type ForeignFungiblesTransactor = xcm_builder::FungiblesAdapter<
@@ -63,17 +87,11 @@ pub type ForeignFungiblesTransactor = xcm_builder::FungiblesAdapter<
 	// We dont track any teleports
 	(),
 >;
-
 pub type AssetTransactors = (
 	// The transactor for our native asset.
 	LocalAssetTransactor,
 	ForeignFungiblesTransactor,
 );
-
-frame_support::parameter_types! {
-	pub const RelayNetwork: NetworkId = NetworkId::Rococo;
-	pub RelayChainOrigin: RuntimeOrigin = cumulus_pallet_xcm::Origin::Relay.into();
-}
 /// Type for specifying how a `Location` can be converted into an `AccountId`. This is used
 /// when determining ownership of accounts for asset transacting and when attempting to use XCM
 /// `Transact` in order to determine the dispatch Origin.
@@ -107,7 +125,6 @@ pub type XcmOriginToTransactDispatchOrigin = (
 	// Xcm origins can be represented natively under the Xcm pallet's Xcm origin.
 	pallet_xcm::XcmPassthrough<RuntimeOrigin>,
 );
-
 pub type Barrier = xcm_builder::TrailingSetTopicAsId<
 	xcm_builder::DenyThenTry<
 		xcm_builder::DenyReserveTransferToRelayChain,
@@ -134,38 +151,38 @@ pub type Barrier = xcm_builder::TrailingSetTopicAsId<
 		),
 	>,
 >;
-
-frame_support::parameter_types! {
-	pub const MaxAssetsIntoHolding: u32 = 64;
-	pub const MaxInstructions: u32 = 100;
-	pub AnchoringSelfReserve: Location = Location::new(
-		0,
-		Junctions::X1(PalletInstance(<Balances as frame_support::traits::PalletInfoAccess>::index() as u8))
-	);
-	pub UniversalLocation: InteriorMultiLocation = Parachain(ParachainInfo::parachain_id().into()).into();
-	/// The amount of weight an XCM operation takes. This is a safe overestimate.
-	pub BaseXcmWeight: frame_support::weights::Weight = frame_support::weights::Weight::from_parts(1_000_000_000, 1024);
-	/// Xcm fees will go to the treasury account
-	pub XcmFeesAccount: AccountId = Treasury::account_id();
-	/// A temporary weight value for each XCM instruction.
-	/// NOTE: This should be removed after we account for PoV weights.
-	pub const TempFixedXcmWeight: frame_support::weights::Weight = frame_support::weights::Weight::from_parts(1_000_000_000, 0);
-}
-
-pub struct ToTreasury;
-impl xcm_builder::TakeRevenue for ToTreasury {
-	fn take_revenue(revenue: MultiAsset) {
-		if let MultiAsset { id: Concrete(_location), fun: Fungible(amount) } = revenue {
-			let treasury_account = Treasury::account_id();
-			let _ = Balances::deposit_creating(&treasury_account, amount);
-
-			log::trace!(
-				target: "xcm::weight",
-				"LocalAssetTrader::to_treasury amount: {amount:?}, treasury: {treasury_account:?}"
-			);
-		}
-	}
-}
+/// This is the struct that will handle the revenue from xcm fees
+/// We do not burn anything because we want to mimic exactly what
+/// the sovereign account has
+pub type XcmFeesToAccount = xcm_primitives::XcmFeesToAccount<
+	Assets,
+	(
+		xcm_builder::ConvertedConcreteId<
+			crate::AssetId,
+			Balance,
+			xcm_primitives::AsAssetType<
+				crate::AssetId,
+				pallets::asset_manager::AssetType,
+				AssetManager,
+			>,
+			xcm_executor::traits::JustTry,
+		>,
+	),
+	AccountId,
+	XcmFeesAccount,
+>;
+pub type XcmWeigher = xcm_builder::FixedWeightBounds<BaseXcmWeight, RuntimeCall, MaxInstructions>;
+/// No local origins on this chain are allowed to dispatch XCM sends/executions.
+pub type LocalOriginToLocation =
+	xcm_primitives::SignedToAccountId20<RuntimeOrigin, AccountId, RelayNetwork>;
+/// The means for routing XCM messages which are not for local execution into the right message
+/// queues.
+pub type XcmRouter = xcm_builder::WithUniqueTopic<(
+	// Two routers - use UMP to communicate with the relay chain:
+	cumulus_primitives_utility::ParentAsUmp<ParachainSystem, PolkadotXcm, ()>,
+	// ..and XCMP to communicate with the sibling chains.
+	XcmpQueue,
+)>;
 
 pub struct XcmCallDispatcher;
 impl xcm_executor::traits::CallDispatcher<RuntimeCall> for XcmCallDispatcher {
@@ -195,29 +212,6 @@ impl xcm_executor::traits::CallDispatcher<RuntimeCall> for XcmCallDispatcher {
 	}
 }
 
-/// This is the struct that will handle the revenue from xcm fees
-/// We do not burn anything because we want to mimic exactly what
-/// the sovereign account has
-pub type XcmFeesToAccount = xcm_primitives::XcmFeesToAccount<
-	Assets,
-	(
-		xcm_builder::ConvertedConcreteId<
-			crate::AssetId,
-			Balance,
-			xcm_primitives::AsAssetType<
-				crate::AssetId,
-				pallets::asset_manager::AssetType,
-				AssetManager,
-			>,
-			xcm_executor::traits::JustTry,
-		>,
-	),
-	AccountId,
-	XcmFeesAccount,
->;
-
-pub type XcmWeigher = xcm_builder::FixedWeightBounds<BaseXcmWeight, RuntimeCall, MaxInstructions>;
-
 pub struct XcmExecutorConfig;
 impl xcm_executor::Config for XcmExecutorConfig {
 	type Aliasers = frame_support::traits::Nothing;
@@ -243,16 +237,12 @@ impl xcm_executor::Config for XcmExecutorConfig {
 	type SafeCallFilter = frame_support::traits::Everything;
 	type SubscriptionService = PolkadotXcm;
 	type Trader = (
-		xcm_configs::LocalAssetTrader<
-			frame_support::weights::ConstantMultiplier<
-				Balance,
-				darwinia_common_runtime::xcm_configs::XcmBaseWeightFee,
-			>,
-			AnchoringSelfReserve,
+		xcm_builder::UsingComponents<
+			<Runtime as pallet_transaction_payment::Config>::WeightToFee,
+			SelfReserve,
 			AccountId,
 			Balances,
 			DealWithFees<Runtime>,
-			ToTreasury,
 		>,
 		xcm_primitives::FirstAssetTrader<
 			pallets::asset_manager::AssetType,
@@ -268,18 +258,6 @@ impl xcm_executor::Config for XcmExecutorConfig {
 	type XcmSender = XcmRouter;
 }
 
-/// No local origins on this chain are allowed to dispatch XCM sends/executions.
-pub type LocalOriginToLocation =
-	xcm_primitives::SignedToAccountId20<RuntimeOrigin, AccountId, RelayNetwork>;
-/// The means for routing XCM messages which are not for local execution into the right message
-/// queues.
-pub type XcmRouter = xcm_builder::WithUniqueTopic<(
-	// Two routers - use UMP to communicate with the relay chain:
-	cumulus_primitives_utility::ParentAsUmp<ParachainSystem, PolkadotXcm, ()>,
-	// ..and XCMP to communicate with the sibling chains.
-	XcmpQueue,
-)>;
-
 impl pallet_xcm::Config for Runtime {
 	type AdminOrigin = RootOr<GeneralAdmin>;
 	// ^ Override for AdvertisedXcmVersion default

From 0084f6598441a1c649d963e6c0512b248b0d60bf Mon Sep 17 00:00:00 2001
From: Xavier Lau <xavier@inv.cafe>
Date: Tue, 25 Jun 2024 18:09:31 +0800
Subject: [PATCH 34/59] Bump

---
 Cargo.lock | 630 ++++++++++++++++++-----------------------------------
 1 file changed, 207 insertions(+), 423 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 262001a14..61d72b039 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -68,7 +68,7 @@ dependencies = [
  "cipher 0.4.4",
  "ctr",
  "ghash",
- "subtle 2.5.0",
+ "subtle 2.4.1",
 ]
 
 [[package]]
@@ -224,7 +224,7 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -672,7 +672,7 @@ dependencies = [
  "futures-io",
  "futures-lite 2.3.0",
  "parking",
- "polling 3.7.1",
+ "polling 3.7.2",
  "rustix 0.38.34",
  "slab",
  "tracing",
@@ -759,7 +759,7 @@ checksum = "c6fa2087f2753a7da8cc1c0dbfcf89579dd57458e36769de5ac750b4671737ca"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -804,7 +804,7 @@ checksum = "3c87f3f15e7794432337fc718554eaa4dc8f04c9677a950ffe366f20a162ae42"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -932,7 +932,7 @@ dependencies = [
  "regex",
  "rustc-hash",
  "shlex",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -962,9 +962,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"
@@ -1163,9 +1163,9 @@ checksum = "e3b5ca7a04898ad4bcd41c90c5285445ff5b791899bb1b0abdd2a2aa791211d7"
 
 [[package]]
 name = "bytemuck"
-version = "1.16.0"
+version = "1.16.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "78834c15cb5d5efe3452d58b1e8ba890dd62d21907f867f383358198e56ebca5"
+checksum = "b236fc92302c97ed75b38da1f4917b5cdda4984745740f153a5d3059e48d725e"
 
 [[package]]
 name = "byteorder"
@@ -1240,9 +1240,9 @@ checksum = "fd6c0e7b807d60291f42f33f58480c0bfafe28ed08286446f45e463728cf9c1c"
 
 [[package]]
 name = "cc"
-version = "1.0.99"
+version = "1.0.100"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96c51067fd44124faa7f870b4b1c969379ad32b2ba805aa959430ceaa384f695"
+checksum = "c891175c3fb232128f48de6590095e59198bbeb8620c310be349bfc3afd12c7b"
 dependencies = [
  "jobserver",
  "libc",
@@ -1412,7 +1412,7 @@ dependencies = [
  "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -1454,7 +1454,7 @@ 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",
 ]
@@ -1704,7 +1704,7 @@ dependencies = [
  "staging-xcm-builder",
  "staging-xcm-executor",
  "static_assertions",
- "strum 0.26.2",
+ "strum 0.26.3",
  "substrate-wasm-builder",
  "xcm-primitives",
 ]
@@ -1888,7 +1888,7 @@ checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76"
 dependencies = [
  "generic-array 0.14.7",
  "rand_core 0.6.4",
- "subtle 2.5.0",
+ "subtle 2.4.1",
  "zeroize",
 ]
 
@@ -1920,17 +1920,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab"
 dependencies = [
  "generic-array 0.14.7",
- "subtle 2.5.0",
+ "subtle 2.4.1",
 ]
 
 [[package]]
 name = "crypto-mac"
-version = "0.11.0"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25fab6889090c8133f3deb8f73ba3c65a7f456f66436fc012a1b1e272b1e103e"
+checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714"
 dependencies = [
  "generic-array 0.14.7",
- "subtle 2.5.0",
+ "subtle 2.4.1",
 ]
 
 [[package]]
@@ -2253,7 +2253,7 @@ dependencies = [
  "proc-macro-crate 3.1.0",
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -2533,24 +2533,23 @@ dependencies = [
  "byteorder",
  "digest 0.9.0",
  "rand_core 0.5.1",
- "subtle 2.5.0",
+ "subtle 2.4.1",
  "zeroize",
 ]
 
 [[package]]
 name = "curve25519-dalek"
-version = "4.1.2"
+version = "4.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0a677b8922c94e01bdbb12126b0bc852f00447528dee1782229af9c720c3f348"
+checksum = "97fb8b7c4503de7d6ae7b42ab72a5a59857b4c937ec27a3d4539dba95b5ab2be"
 dependencies = [
  "cfg-if",
  "cpufeatures",
  "curve25519-dalek-derive",
  "digest 0.10.7",
  "fiat-crypto",
- "platforms",
  "rustc_version",
- "subtle 2.5.0",
+ "subtle 2.4.1",
  "zeroize",
 ]
 
@@ -2562,7 +2561,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -2580,9 +2579,9 @@ dependencies = [
 
 [[package]]
 name = "cxx"
-version = "1.0.123"
+version = "1.0.124"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8194f089b6da4751d6c1da1ef37c17255df51f9346cdb160f8b096562ae4a85c"
+checksum = "273dcfd3acd4e1e276af13ed2a43eea7001318823e7a726a6b3ed39b4acc0b82"
 dependencies = [
  "cc",
  "cxxbridge-flags",
@@ -2592,9 +2591,9 @@ dependencies = [
 
 [[package]]
 name = "cxx-build"
-version = "1.0.123"
+version = "1.0.124"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e8df9a089caae66634d754672d5f909395f30f38af6ff19366980d8a8b57501"
+checksum = "d8b2766fbd92be34e9ed143898fce6c572dc009de39506ed6903e5a05b68914e"
 dependencies = [
  "cc",
  "codespan-reporting",
@@ -2602,24 +2601,24 @@ dependencies = [
  "proc-macro2",
  "quote",
  "scratch",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
 name = "cxxbridge-flags"
-version = "1.0.123"
+version = "1.0.124"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25290be4751803672a70b98c68b51c1e7d0a640ab5a4377f240f9d2e70054cd1"
+checksum = "839fcd5e43464614ffaa989eaf1c139ef1f0c51672a1ed08023307fa1b909ccd"
 
 [[package]]
 name = "cxxbridge-macro"
-version = "1.0.123"
+version = "1.0.124"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8cb317cb13604b4752416783bb25070381c36e844743e4146b7f8e55de7d140"
+checksum = "4b2c1c1776b986979be68bb2285da855f8d8a35851a769fca8740df7c3d07877"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -3006,7 +3005,7 @@ dependencies = [
  "staging-xcm-builder",
  "staging-xcm-executor",
  "static_assertions",
- "strum 0.26.2",
+ "strum 0.26.3",
  "substrate-wasm-builder",
  "xcm-primitives",
 ]
@@ -3163,20 +3162,20 @@ checksum = "d65d7ce8132b7c0e54497a4d9a55a1c2a0912a0d786cf894472ba818fba45762"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
 name = "derive_more"
-version = "0.99.17"
+version = "0.99.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321"
+checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce"
 dependencies = [
  "convert_case 0.4.0",
  "proc-macro2",
  "quote",
  "rustc_version",
- "syn 1.0.109",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -3212,7 +3211,7 @@ dependencies = [
  "block-buffer 0.10.4",
  "const-oid",
  "crypto-common",
- "subtle 2.5.0",
+ "subtle 2.4.1",
 ]
 
 [[package]]
@@ -3259,13 +3258,13 @@ dependencies = [
 
 [[package]]
 name = "displaydoc"
-version = "0.2.4"
+version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
+checksum = "97369cbbc041bc366949bc74d34658d6cda5621039731c6310521892a3a20ae0"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -3305,7 +3304,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "regex",
- "syn 2.0.66",
+ "syn 2.0.68",
  "termcolor",
  "toml 0.8.14",
  "walkdir",
@@ -3392,12 +3391,12 @@ version = "2.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4a3daa8e81a3963a60642bcc1f90a670680bd4a77535faa384e9d1c79d620871"
 dependencies = [
- "curve25519-dalek 4.1.2",
+ "curve25519-dalek 4.1.3",
  "ed25519",
  "rand_core 0.6.4",
  "serde",
  "sha2 0.10.8",
- "subtle 2.5.0",
+ "subtle 2.4.1",
  "zeroize",
 ]
 
@@ -3421,7 +3420,7 @@ version = "4.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7d9ce6874da5d4415896cd45ffbc4d1cfc0c4f9c079427bd870742c30f2f65a9"
 dependencies = [
- "curve25519-dalek 4.1.2",
+ "curve25519-dalek 4.1.3",
  "ed25519",
  "hashbrown 0.14.5",
  "hex",
@@ -3454,7 +3453,7 @@ dependencies = [
  "pkcs8",
  "rand_core 0.6.4",
  "sec1",
- "subtle 2.5.0",
+ "subtle 2.4.1",
  "zeroize",
 ]
 
@@ -3502,7 +3501,7 @@ checksum = "de0d48a183585823424a4ce1aa132d174a6a81bd540895822eb4c8373a8e49e8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -3513,7 +3512,7 @@ checksum = "6fd000fd6988e73bbe993ea3db9b1aa64906ab88766d654973924340c8cddb42"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -3748,15 +3747,17 @@ dependencies = [
 
 [[package]]
 name = "expander"
-version = "2.0.0"
+version = "2.2.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f86a749cf851891866c10515ef6c299b5c69661465e9c3bbe7e07a2b77fb0f7"
+checksum = "e2c470c71d91ecbd179935b24170459e926382eaaa86b590b78814e180d8a8e2"
 dependencies = [
  "blake2 0.10.6",
+ "file-guard",
  "fs-err",
+ "prettyplease 0.2.20",
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -3992,7 +3993,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449"
 dependencies = [
  "rand_core 0.6.4",
- "subtle 2.5.0",
+ "subtle 2.4.1",
 ]
 
 [[package]]
@@ -4014,6 +4015,16 @@ version = "0.2.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "28dea519a9695b9977216879a3ebfddf92f1c08c05d984f8996aecd6ecdc811d"
 
+[[package]]
+name = "file-guard"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "21ef72acf95ec3d7dbf61275be556299490a245f017cf084bd23b4f68cf9407c"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
 [[package]]
 name = "file-per-thread-logger"
 version = "0.1.6"
@@ -4340,7 +4351,7 @@ dependencies = [
  "proc-macro-crate 3.1.0",
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -4476,7 +4487,7 @@ dependencies = [
  "Inflector",
  "cfg-expr",
  "derive-syn-parse 0.1.5",
- "expander 2.0.0",
+ "expander 2.2.1",
  "frame-support-procedural-tools",
  "itertools 0.10.5",
  "macro_magic",
@@ -4484,7 +4495,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "sp-crypto-hashing",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -4496,7 +4507,7 @@ dependencies = [
  "proc-macro-crate 3.1.0",
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -4506,7 +4517,7 @@ source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -4702,7 +4713,7 @@ checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -4867,7 +4878,7 @@ checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63"
 dependencies = [
  "ff",
  "rand_core 0.6.4",
- "subtle 2.5.0",
+ "subtle 2.4.1",
 ]
 
 [[package]]
@@ -4996,6 +5007,12 @@ version = "0.3.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d231dfb89cfffdbc30e7fc41579ed6066ad03abda9e567ccafae602b97ec5024"
 
+[[package]]
+name = "hermit-abi"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fbf6a919d6cf397374f7dfeeea91d974c7c0a7221d0d0f4f20d859d329e53fcc"
+
 [[package]]
 name = "hex"
 version = "0.4.3"
@@ -5042,7 +5059,7 @@ version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b"
 dependencies = [
- "crypto-mac 0.11.0",
+ "crypto-mac 0.11.1",
  "digest 0.9.0",
 ]
 
@@ -5150,9 +5167,9 @@ checksum = "add0ab9360ddbd88cfeb3bd9574a1d85cfdfa14db10b3e21d3700dbc4328758f"
 
 [[package]]
 name = "httparse"
-version = "1.9.3"
+version = "1.9.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d0e7a4dd27b9476dc40cb050d3632d3bba3a70ddbff012285f7f8559a1e7e545"
+checksum = "0fcc0b4a115bf80b728eb8ea024ad5bd707b615bfed49e0665b6e0f86fd082d9"
 
 [[package]]
 name = "httpdate"
@@ -5285,124 +5302,6 @@ dependencies = [
  "cc",
 ]
 
-[[package]]
-name = "icu_collections"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db2fa452206ebee18c4b5c2274dbf1de17008e874b4dc4f0aea9d01ca79e4526"
-dependencies = [
- "displaydoc",
- "yoke",
- "zerofrom",
- "zerovec",
-]
-
-[[package]]
-name = "icu_locid"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "13acbb8371917fc971be86fc8057c41a64b521c184808a698c02acc242dbf637"
-dependencies = [
- "displaydoc",
- "litemap",
- "tinystr",
- "writeable",
- "zerovec",
-]
-
-[[package]]
-name = "icu_locid_transform"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01d11ac35de8e40fdeda00d9e1e9d92525f3f9d887cdd7aa81d727596788b54e"
-dependencies = [
- "displaydoc",
- "icu_locid",
- "icu_locid_transform_data",
- "icu_provider",
- "tinystr",
- "zerovec",
-]
-
-[[package]]
-name = "icu_locid_transform_data"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdc8ff3388f852bede6b579ad4e978ab004f139284d7b28715f773507b946f6e"
-
-[[package]]
-name = "icu_normalizer"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "19ce3e0da2ec68599d193c93d088142efd7f9c5d6fc9b803774855747dc6a84f"
-dependencies = [
- "displaydoc",
- "icu_collections",
- "icu_normalizer_data",
- "icu_properties",
- "icu_provider",
- "smallvec",
- "utf16_iter",
- "utf8_iter",
- "write16",
- "zerovec",
-]
-
-[[package]]
-name = "icu_normalizer_data"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8cafbf7aa791e9b22bec55a167906f9e1215fd475cd22adfcf660e03e989516"
-
-[[package]]
-name = "icu_properties"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f8ac670d7422d7f76b32e17a5db556510825b29ec9154f235977c9caba61036"
-dependencies = [
- "displaydoc",
- "icu_collections",
- "icu_locid_transform",
- "icu_properties_data",
- "icu_provider",
- "tinystr",
- "zerovec",
-]
-
-[[package]]
-name = "icu_properties_data"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67a8effbc3dd3e4ba1afa8ad918d5684b8868b3b26500753effea8d2eed19569"
-
-[[package]]
-name = "icu_provider"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6ed421c8a8ef78d3e2dbc98a973be2f3770cb42b606e3ab18d6237c4dfde68d9"
-dependencies = [
- "displaydoc",
- "icu_locid",
- "icu_provider_macros",
- "stable_deref_trait",
- "tinystr",
- "writeable",
- "yoke",
- "zerofrom",
- "zerovec",
-]
-
-[[package]]
-name = "icu_provider_macros"
-version = "1.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ec89e9337638ecdc08744df490b221a7399bf8d164eb52a665454e60e075ad6"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.66",
-]
-
 [[package]]
 name = "idna"
 version = "0.2.3"
@@ -5416,14 +5315,12 @@ dependencies = [
 
 [[package]]
 name = "idna"
-version = "1.0.0"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4716a3a0933a1d01c2f72450e89596eb51dd34ef3c211ccd875acdf1f8fe47ed"
+checksum = "634d9b1461af396cad843f47fdba5597a4f9e6ddd4bfb6ff5d85028c25cb12f6"
 dependencies = [
- "icu_normalizer",
- "icu_properties",
- "smallvec",
- "utf8_iter",
+ "unicode-bidi",
+ "unicode-normalization",
 ]
 
 [[package]]
@@ -5495,18 +5392,18 @@ dependencies = [
 
 [[package]]
 name = "include_dir"
-version = "0.7.3"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "18762faeff7122e89e0857b02f7ce6fcc0d101d5e9ad2ad7846cc01d61b7f19e"
+checksum = "923d117408f1e49d914f1a379a309cffe4f18c05cf4e3d12e613a15fc81bd0dd"
 dependencies = [
  "include_dir_macros",
 ]
 
 [[package]]
 name = "include_dir_macros"
-version = "0.7.3"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b139284b5cf57ecfa712bcc66950bb635b31aff41c188e8a4cfc758eca374a3f"
+checksum = "7cab85a7ed0bd5f0e76d93846e0147172bed2e2d3f859bcc33a8d9699cad1a75"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -5594,7 +5491,7 @@ version = "1.0.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eae7b9aee968036d54dce06cebaefd919e4472e753296daccd6d344e3e2df0c2"
 dependencies = [
- "hermit-abi",
+ "hermit-abi 0.3.9",
  "libc",
  "windows-sys 0.48.0",
 ]
@@ -5629,7 +5526,7 @@ version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f23ff5ef2b80d608d61efee834934d862cd92461afc0560dedf493e4c033738b"
 dependencies = [
- "hermit-abi",
+ "hermit-abi 0.3.9",
  "libc",
  "windows-sys 0.52.0",
 ]
@@ -5970,7 +5867,7 @@ dependencies = [
  "staging-xcm-builder",
  "staging-xcm-executor",
  "static_assertions",
- "strum 0.26.2",
+ "strum 0.26.3",
  "substrate-wasm-builder",
  "xcm-primitives",
 ]
@@ -6021,11 +5918,11 @@ 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"
 dependencies = [
- "spin 0.5.2",
+ "spin 0.9.8",
 ]
 
 [[package]]
@@ -6042,9 +5939,9 @@ checksum = "97b3888a4aecf77e811145cadf6eef5901f4782c53886191b2f693f24761847c"
 
 [[package]]
 name = "libloading"
-version = "0.8.3"
+version = "0.8.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c2a198fb6b0eada2a8df47933734e6d35d350665a33a3593d7164fa52c75c19"
+checksum = "e310b3a6b5907f99202fcdb4960ff45b93735d7c7d96b760fcff8db2dc0e103d"
 dependencies = [
  "cfg-if",
  "windows-targets 0.52.5",
@@ -6455,7 +6352,7 @@ 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",
 ]
 
@@ -6501,7 +6398,7 @@ checksum = "5be9b9bb642d8522a44d533eab56c16c738301965504753b03ad1de3425d5451"
 dependencies = [
  "crunchy",
  "digest 0.9.0",
- "subtle 2.5.0",
+ "subtle 2.4.1",
 ]
 
 [[package]]
@@ -6607,12 +6504,6 @@ dependencies = [
  "keystream",
 ]
 
-[[package]]
-name = "litemap"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "643cb0b8d4fcc284004d5fd0d67ccf61dfffadb7f75e1e71bc420f4688a3a704"
-
 [[package]]
 name = "lock_api"
 version = "0.4.12"
@@ -6691,7 +6582,7 @@ dependencies = [
  "macro_magic_core",
  "macro_magic_macros",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -6705,7 +6596,7 @@ dependencies = [
  "macro_magic_core_macros",
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -6716,7 +6607,7 @@ checksum = "9ea73aa640dc01d62a590d48c0c3521ed739d53b27f919b25c3551e233481654"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -6727,7 +6618,7 @@ checksum = "ef9d79ae96aaba821963320eb2b6e34d17df1e5a83d8a1985c29cc5be59577b3"
 dependencies = [
  "macro_magic_core",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -6870,9 +6761,9 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"
 
 [[package]]
 name = "miniz_oxide"
-version = "0.7.3"
+version = "0.7.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87dfd01fe195c66b572b37921ad8803d010623c0aca821bea2302239d155cdae"
+checksum = "b8a240ddb74feaf34a79a7add65a741f3167852fba007066dcac1ca548d89c08"
 dependencies = [
  "adler",
 ]
@@ -6899,7 +6790,7 @@ dependencies = [
  "bitflags 1.3.2",
  "blake2 0.10.6",
  "c2-chacha",
- "curve25519-dalek 4.1.2",
+ "curve25519-dalek 4.1.3",
  "either",
  "hashlink",
  "lioness",
@@ -6908,7 +6799,7 @@ dependencies = [
  "rand",
  "rand_chacha 0.3.1",
  "rand_distr",
- "subtle 2.5.0",
+ "subtle 2.4.1",
  "thiserror",
  "zeroize",
 ]
@@ -7275,7 +7166,7 @@ dependencies = [
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
  "synstructure 0.13.1",
 ]
 
@@ -7317,13 +7208,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.68",
 ]
 
 [[package]]
@@ -7441,7 +7332,7 @@ version = "0.27.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "cfg-if",
  "libc",
 ]
@@ -7586,7 +7477,7 @@ version = "1.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4161fcb6d602d4d2081af7c3a45852d875a03dd337a6bfdd6e06407b61342a43"
 dependencies = [
- "hermit-abi",
+ "hermit-abi 0.3.9",
  "libc",
 ]
 
@@ -7628,7 +7519,7 @@ dependencies = [
  "proc-macro-crate 3.1.0",
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -7691,7 +7582,7 @@ version = "0.10.64"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "95a0481286a310808298130d22dd1fef0fa571e05a8f44ec801801e84b216b1f"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "cfg-if",
  "foreign-types",
  "libc",
@@ -7708,7 +7599,7 @@ checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -7827,7 +7718,7 @@ version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1344346d5af32c95bbddea91b18a88cc83eac394192d20ef2fc4c40a74332355"
 dependencies = [
- "expander 2.0.0",
+ "expander 2.2.1",
  "indexmap 2.2.6",
  "itertools 0.11.0",
  "petgraph",
@@ -8951,7 +8842,7 @@ dependencies = [
  "proc-macro-crate 3.1.0",
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -9323,7 +9214,7 @@ checksum = "1e401f977ab385c9e4e3ab30627d6f26d00e2c73eef317493c4ec6d468726cf8"
 dependencies = [
  "cfg-if",
  "libc",
- "redox_syscall 0.5.1",
+ "redox_syscall 0.5.2",
  "smallvec",
  "windows-targets 0.52.5",
 ]
@@ -9346,7 +9237,7 @@ version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d95f5254224e617595d2cc3cc73ff0a5eaf2637519e25f03388154e9378b6ffa"
 dependencies = [
- "crypto-mac 0.11.0",
+ "crypto-mac 0.11.1",
 ]
 
 [[package]]
@@ -9410,7 +9301,7 @@ dependencies = [
  "pest_meta",
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -9451,7 +9342,7 @@ checksum = "2f38a4412a78282e09a2cf38d195ea5420d15ba0602cb375210efbc877243965"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -9499,12 +9390,6 @@ version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
 
-[[package]]
-name = "platforms"
-version = "3.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "db23d408679286588f4d4644f965003d056e3dd5abcaaa938116871d7ce2fee7"
-
 [[package]]
 name = "polkadot-approval-distribution"
 version = "7.0.0"
@@ -10599,7 +10484,7 @@ dependencies = [
  "polkavm-common",
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -10609,7 +10494,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8ba81f7b5faac81e528eb6158a6f3c9e0bb1008e0ffa19653bc8dea925ecb429"
 dependencies = [
  "polkavm-derive-impl",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -10630,13 +10515,13 @@ dependencies = [
 
 [[package]]
 name = "polling"
-version = "3.7.1"
+version = "3.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e6a007746f34ed64099e88783b0ae369eaa3da6392868ba262e2af9b8fbaea1"
+checksum = "a3ed00ed3fbf728b5816498ecd316d1716eecaced9c0c8d2c5a6740ca214985b"
 dependencies = [
  "cfg-if",
  "concurrent-queue",
- "hermit-abi",
+ "hermit-abi 0.4.0",
  "pin-project-lite 0.2.14",
  "rustix 0.38.34",
  "tracing",
@@ -10826,7 +10711,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5f12335488a2f3b0a83b14edad48dca9879ce89b2edd10e80237e4e852dd645e"
 dependencies = [
  "proc-macro2",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -10919,14 +10804,14 @@ checksum = "834da187cfe638ae8abb0203f0b33e5ccdb02a28e7199f2f47b3e2754f50edca"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.85"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22244ce15aa966053a896d1accb3a6e68469b97c7f33f284b99f0d576879fc23"
+checksum = "5e719e8df665df0d1c8fbfd238015744736151d4445ec0836b8e628aae103b77"
 dependencies = [
  "unicode-ident",
 ]
@@ -10965,7 +10850,7 @@ checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -11033,7 +10918,7 @@ dependencies = [
  "itertools 0.12.1",
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -11252,11 +11137,11 @@ dependencies = [
 
 [[package]]
 name = "redox_syscall"
-version = "0.5.1"
+version = "0.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "469052894dcb553421e483e4209ee581a45100d31b4018de03e5a7ad86374a7e"
+checksum = "c82cf8cff14456045f55ec4241383baeff27af886adb72ffb2162f99911de0fd"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
 ]
 
 [[package]]
@@ -11299,7 +11184,7 @@ checksum = "bcc303e793d3734489387d205e9b186fac9c6cfacedd98cbb2e8a5943595f3e6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -11486,7 +11371,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2"
 dependencies = [
  "hmac 0.12.1",
- "subtle 2.5.0",
+ "subtle 2.4.1",
 ]
 
 [[package]]
@@ -11801,7 +11686,7 @@ version = "0.38.34"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "70dc5ec042f7a43c4a73241207cecc9873a06d45debb38b329f8541d85c2730f"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "errno",
  "libc",
  "linux-raw-sys 0.4.14",
@@ -11915,9 +11800,9 @@ checksum = "f3cb5ba0dc43242ce17de99c180e96db90b235b8a9fdc9543c96d2209116bd9f"
 
 [[package]]
 name = "safe_arch"
-version = "0.7.1"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f398075ce1e6a179b46f51bd88d0598b92b00d3551f1a2d4ac49e771b56ac354"
+checksum = "c3460605018fdc9612bce72735cba0d27efbcd9904780d44c7e3a9948f96148a"
 dependencies = [
  "bytemuck",
 ]
@@ -12042,7 +11927,7 @@ dependencies = [
  "proc-macro-crate 3.1.0",
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -13016,7 +12901,7 @@ dependencies = [
  "proc-macro-crate 3.1.0",
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -13148,13 +13033,13 @@ dependencies = [
  "aead",
  "arrayref",
  "arrayvec 0.7.4",
- "curve25519-dalek 4.1.2",
+ "curve25519-dalek 4.1.3",
  "getrandom_or_panic",
  "merlin",
  "rand_core 0.6.4",
  "serde_bytes",
  "sha2 0.10.8",
- "subtle 2.5.0",
+ "subtle 2.4.1",
  "zeroize",
 ]
 
@@ -13190,7 +13075,7 @@ dependencies = [
  "der",
  "generic-array 0.14.7",
  "pkcs8",
- "subtle 2.5.0",
+ "subtle 2.4.1",
  "zeroize",
 ]
 
@@ -13236,7 +13121,7 @@ version = "2.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c627723fd09706bacdb5cf41499e95098555af3c3c29d014dc3c458ef6be11c0"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "core-foundation",
  "core-foundation-sys",
  "libc",
@@ -13288,9 +13173,9 @@ 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",
 ]
@@ -13303,14 +13188,14 @@ checksum = "500cbc0ebeb6f46627f50f3f5811ccf6bf00643be300b4c3eabc0ef55dc5b5ba"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.117"
+version = "1.0.118"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3"
+checksum = "d947f6b3163d8857ea16c4fa0dd4840d52f3041039a85decd46867eb1abef2e4"
 dependencies = [
  "itoa",
  "ryu",
@@ -13638,12 +13523,12 @@ dependencies = [
  "aes-gcm",
  "blake2 0.10.6",
  "chacha20poly1305",
- "curve25519-dalek 4.1.2",
+ "curve25519-dalek 4.1.3",
  "rand_core 0.6.4",
  "ring 0.17.8",
  "rustc_version",
  "sha2 0.10.8",
- "subtle 2.5.0",
+ "subtle 2.4.1",
 ]
 
 [[package]]
@@ -13711,11 +13596,11 @@ source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot
 dependencies = [
  "Inflector",
  "blake2 0.10.6",
- "expander 2.0.0",
+ "expander 2.2.1",
  "proc-macro-crate 3.1.0",
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -13963,7 +13848,7 @@ dependencies = [
 [[package]]
 name = "sp-crypto-ec-utils"
 version = "0.10.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#63e264446f6cabff06be72912eae902662dcb699"
+source = "git+https://github.com/paritytech/polkadot-sdk#909bfc2d7c00a0fed7a5fd4e5292aa3fbe2299b6"
 dependencies = [
  "ark-bls12-377",
  "ark-bls12-377-ext",
@@ -14000,7 +13885,7 @@ source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot
 dependencies = [
  "quote",
  "sp-crypto-hashing",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -14019,17 +13904,17 @@ source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
 name = "sp-debug-derive"
 version = "14.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#63e264446f6cabff06be72912eae902662dcb699"
+source = "git+https://github.com/paritytech/polkadot-sdk#909bfc2d7c00a0fed7a5fd4e5292aa3fbe2299b6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -14046,7 +13931,7 @@ dependencies = [
 [[package]]
 name = "sp-externalities"
 version = "0.25.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#63e264446f6cabff06be72912eae902662dcb699"
+source = "git+https://github.com/paritytech/polkadot-sdk#909bfc2d7c00a0fed7a5fd4e5292aa3fbe2299b6"
 dependencies = [
  "environmental",
  "parity-scale-codec",
@@ -14264,7 +14149,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface"
 version = "24.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#63e264446f6cabff06be72912eae902662dcb699"
+source = "git+https://github.com/paritytech/polkadot-sdk#909bfc2d7c00a0fed7a5fd4e5292aa3fbe2299b6"
 dependencies = [
  "bytes",
  "impl-trait-for-tuples",
@@ -14286,24 +14171,24 @@ version = "17.0.0"
 source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "Inflector",
- "expander 2.0.0",
+ "expander 2.2.1",
  "proc-macro-crate 3.1.0",
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
 name = "sp-runtime-interface-proc-macro"
 version = "17.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#63e264446f6cabff06be72912eae902662dcb699"
+source = "git+https://github.com/paritytech/polkadot-sdk#909bfc2d7c00a0fed7a5fd4e5292aa3fbe2299b6"
 dependencies = [
  "Inflector",
- "expander 2.0.0",
+ "expander 2.2.1",
  "proc-macro-crate 3.1.0",
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -14362,7 +14247,7 @@ version = "10.0.0"
 source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
  "aes-gcm",
- "curve25519-dalek 4.1.2",
+ "curve25519-dalek 4.1.3",
  "ed25519-dalek",
  "hkdf",
  "parity-scale-codec",
@@ -14389,7 +14274,7 @@ source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot
 [[package]]
 name = "sp-std"
 version = "14.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#63e264446f6cabff06be72912eae902662dcb699"
+source = "git+https://github.com/paritytech/polkadot-sdk#909bfc2d7c00a0fed7a5fd4e5292aa3fbe2299b6"
 
 [[package]]
 name = "sp-storage"
@@ -14407,7 +14292,7 @@ dependencies = [
 [[package]]
 name = "sp-storage"
 version = "19.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#63e264446f6cabff06be72912eae902662dcb699"
+source = "git+https://github.com/paritytech/polkadot-sdk#909bfc2d7c00a0fed7a5fd4e5292aa3fbe2299b6"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -14444,7 +14329,7 @@ dependencies = [
 [[package]]
 name = "sp-tracing"
 version = "16.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#63e264446f6cabff06be72912eae902662dcb699"
+source = "git+https://github.com/paritytech/polkadot-sdk#909bfc2d7c00a0fed7a5fd4e5292aa3fbe2299b6"
 dependencies = [
  "parity-scale-codec",
  "tracing",
@@ -14525,7 +14410,7 @@ dependencies = [
  "parity-scale-codec",
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -14544,7 +14429,7 @@ dependencies = [
 [[package]]
 name = "sp-wasm-interface"
 version = "20.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#63e264446f6cabff06be72912eae902662dcb699"
+source = "git+https://github.com/paritytech/polkadot-sdk#909bfc2d7c00a0fed7a5fd4e5292aa3fbe2299b6"
 dependencies = [
  "impl-trait-for-tuples",
  "log",
@@ -14861,7 +14746,7 @@ dependencies = [
  "bitflags 1.3.2",
  "byteorder",
  "keccak",
- "subtle 2.5.0",
+ "subtle 2.4.1",
  "zeroize",
 ]
 
@@ -14882,9 +14767,9 @@ dependencies = [
 
 [[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",
 ]
@@ -14912,7 +14797,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -15063,9 +14948,9 @@ checksum = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee"
 
 [[package]]
 name = "subtle"
-version = "2.5.0"
+version = "2.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "81cdd64d312baedb58e21336b31bc043b77e01cc99033ce76ef539f78e965ebc"
+checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
 
 [[package]]
 name = "subtle-ng"
@@ -15086,9 +14971,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.66"
+version = "2.0.68"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c42f3f41a2de00b01c0aaad383c5a45241efc8b2d1eda5661812fda5f3cdcff5"
+checksum = "901fa70d88b9d6c98022e23b4136f9f3e54e4662c3bc1bd1d84a42a9a0f0c1e9"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -15121,7 +15006,7 @@ checksum = "c8af7666ab7b6390ab78131fb5b0fce11d6b7a6951602017c35fa82800708971"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -15229,7 +15114,7 @@ checksum = "e4c60d69f36615a077cc7663b9cb8e42275722d23e58a7fa3d2c7f2915d09d04"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -15240,7 +15125,7 @@ checksum = "46c3384250002a6d5af4d114f2845d37b57521033f30d5c3f46c4d70e1197533"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -15342,21 +15227,11 @@ dependencies = [
  "crunchy",
 ]
 
-[[package]]
-name = "tinystr"
-version = "0.7.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9117f5d4db391c1cf6927e7bea3db74b9a1c1add8f7eda9ffd5364f40f57b82f"
-dependencies = [
- "displaydoc",
- "zerovec",
-]
-
 [[package]]
 name = "tinyvec"
-version = "1.6.0"
+version = "1.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87cc5ceb3875bb20c2890005a4e226a4651264a5c75edb2421b52861a0a0cb50"
+checksum = "c55115c6fbe2d2bef26eb09ad74bde02d8255476fc0c7b515ef09fbb35742d82"
 dependencies = [
  "tinyvec_macros",
 ]
@@ -15394,7 +15269,7 @@ checksum = "5f5ae998a069d4b5aba8ee9dad856af7d520c3699e6159b185c2acd48155d39a"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -15553,7 +15428,7 @@ version = "0.4.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "61c5bb1d698276a2443e5ecfabc1008bf15a36c12e6a7176e7bf089ea9131140"
 dependencies = [
- "bitflags 2.5.0",
+ "bitflags 2.6.0",
  "bytes",
  "futures-core",
  "futures-util",
@@ -15597,7 +15472,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -15636,11 +15511,11 @@ name = "tracing-gum-proc-macro"
 version = "5.0.0"
 source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
 dependencies = [
- "expander 2.0.0",
+ "expander 2.2.1",
  "proc-macro-crate 3.1.0",
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -15977,7 +15852,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea"
 dependencies = [
  "crypto-common",
- "subtle 2.5.0",
+ "subtle 2.4.1",
 ]
 
 [[package]]
@@ -16006,12 +15881,12 @@ checksum = "8ecb6da28b8a351d773b68d5825ac39017e680750f980f3a1a85cd8dd28a47c1"
 
 [[package]]
 name = "url"
-version = "2.5.1"
+version = "2.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7c25da092f0a868cdf09e8674cd3b7ef3a7d92a24253e663a2fb85e2496de56"
+checksum = "22784dbdf76fdde8af1aeda5622b546b422b6fc585325248a2bf9f5e41e94d6c"
 dependencies = [
  "form_urlencoded",
- "idna 1.0.0",
+ "idna 0.5.0",
  "percent-encoding",
 ]
 
@@ -16021,18 +15896,6 @@ version = "2.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "daf8dba3b7eb870caf1ddeed7bc9d2a049f3cfdfae7cb521b087cc33ae4c49da"
 
-[[package]]
-name = "utf16_iter"
-version = "1.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8232dd3cdaed5356e0f716d285e4b40b932ac434100fe9b7e0e8e935b9e6246"
-
-[[package]]
-name = "utf8_iter"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b6c140620e7ffbb22c2dee59cafe6084a59b5ffc27a8859a5f0d494b5d52b6be"
-
 [[package]]
 name = "utf8parse"
 version = "0.2.2"
@@ -16154,7 +16017,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
  "wasm-bindgen-shared",
 ]
 
@@ -16188,7 +16051,7 @@ checksum = "e94f17b526d0a461a191c78ea52bbce64071ed5c04c9ffe424dcb38f74171bb7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -17013,18 +16876,6 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
-[[package]]
-name = "write16"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1890f4022759daae28ed4fe62859b1236caebfc61ede2f63ed4e695f3f6d936"
-
-[[package]]
-name = "writeable"
-version = "0.5.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e9df38ee2d2c3c5948ea468a8406ff0db0b29ae1ffde1bcf20ef305bcc95c51"
-
 [[package]]
 name = "wyz"
 version = "0.5.1"
@@ -17051,7 +16902,7 @@ version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c7e468321c81fb07fa7f4c636c3972b9100f0346e5b6a9f2bd0603a52f7ed277"
 dependencies = [
- "curve25519-dalek 4.1.2",
+ "curve25519-dalek 4.1.3",
  "rand_core 0.6.4",
  "serde",
  "zeroize",
@@ -17112,7 +16963,7 @@ dependencies = [
  "Inflector",
  "proc-macro2",
  "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -17138,30 +16989,6 @@ dependencies = [
  "time",
 ]
 
-[[package]]
-name = "yoke"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6c5b1314b079b0930c31e3af543d8ee1757b1951ae1e1565ec704403a7240ca5"
-dependencies = [
- "serde",
- "stable_deref_trait",
- "yoke-derive",
- "zerofrom",
-]
-
-[[package]]
-name = "yoke-derive"
-version = "0.7.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "28cc31741b18cb6f1d5ff12f5b7523e3d6eb0852bbbad19d73905511d9849b95"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.66",
- "synstructure 0.13.1",
-]
-
 [[package]]
 name = "zerocopy"
 version = "0.7.34"
@@ -17179,28 +17006,7 @@ checksum = "15e934569e47891f7d9411f1a451d947a60e000ab3bd24fbb970f000387d1b3b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
-]
-
-[[package]]
-name = "zerofrom"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "91ec111ce797d0e0784a1116d0ddcdbea84322cd79e5d5ad173daeba4f93ab55"
-dependencies = [
- "zerofrom-derive",
-]
-
-[[package]]
-name = "zerofrom-derive"
-version = "0.1.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0ea7b4a3637ea8669cedf0f1fd5c286a17f3de97b8dd5a70a6c167a1730e63a5"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.66",
- "synstructure 0.13.1",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -17220,29 +17026,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.66",
-]
-
-[[package]]
-name = "zerovec"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bb2cc8827d6c0994478a15c53f374f46fbd41bea663d809b14744bc42e6b109c"
-dependencies = [
- "yoke",
- "zerofrom",
- "zerovec-derive",
-]
-
-[[package]]
-name = "zerovec-derive"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97cf56601ee5052b4417d90c8755c6683473c926039908196cf35d99f893ebe7"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.66",
+ "syn 2.0.68",
 ]
 
 [[package]]
@@ -17285,9 +17069,9 @@ dependencies = [
 
 [[package]]
 name = "zstd-sys"
-version = "2.0.10+zstd.1.5.6"
+version = "2.0.11+zstd.1.5.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c253a4914af5bafc8fa8c86ee400827e83cf6ec01195ec1f1ed8441bf00d65aa"
+checksum = "75652c55c0b6f3e6f12eb786fe1bc960396bf05a1eb3bf1f3691c3610ac2e6d4"
 dependencies = [
  "cc",
  "pkg-config",

From 8bdbdab53bae203814aefc151eef87c39d3c9700 Mon Sep 17 00:00:00 2001
From: Xavier Lau <xavier@inv.cafe>
Date: Tue, 25 Jun 2024 23:23:06 +0800
Subject: [PATCH 35/59] Build all runtimes

---
 Cargo.lock                                    | 166 ++++++--------
 Cargo.toml                                    |  42 ++--
 runtime/common/src/lib.rs                     |  54 ++---
 runtime/common/src/migration_helper.rs        |   2 +-
 runtime/common/src/pallet_config.rs           |   4 +-
 runtime/crab/src/lib.rs                       | 213 +++++++++++++++---
 runtime/crab/src/pallets/account_migration.rs |   3 +-
 runtime/crab/src/pallets/assets.rs            |   7 +-
 runtime/crab/src/pallets/balances.rs          |   3 +-
 runtime/crab/src/pallets/deposit.rs           |   3 +-
 runtime/crab/src/pallets/dmp_queue.rs         |   1 +
 runtime/crab/src/pallets/evm.rs               |  64 +++---
 runtime/crab/src/pallets/governance.rs        |  26 ++-
 runtime/crab/src/pallets/message_queue.rs     |   7 +-
 runtime/crab/src/pallets/parachain_system.rs  |   1 +
 runtime/crab/src/pallets/polkadot_xcm.rs      |  39 ++--
 runtime/crab/src/pallets/preimage.rs          |  19 +-
 runtime/crab/src/pallets/proxy.rs             |  14 +-
 runtime/crab/src/pallets/scheduler.rs         |   5 +-
 runtime/crab/src/pallets/session.rs           |   5 +-
 runtime/crab/src/pallets/staking.rs           |   3 +-
 runtime/crab/src/pallets/system.rs            |  39 +---
 runtime/crab/src/pallets/timestamp.rs         |   3 +-
 runtime/crab/src/pallets/tx_pause.rs          |   3 +-
 runtime/crab/src/pallets/utility.rs           |   3 +-
 runtime/crab/src/pallets/xcmp_queue.rs        |  11 +-
 runtime/darwinia/src/lib.rs                   | 213 +++++++++++++++---
 runtime/darwinia/src/pallets.rs               |   2 +
 .../darwinia/src/pallets/account_migration.rs |   3 +-
 runtime/darwinia/src/pallets/asset_manager.rs | 101 ++++-----
 runtime/darwinia/src/pallets/assets.rs        |   7 +-
 runtime/darwinia/src/pallets/balances.rs      |   3 +-
 runtime/darwinia/src/pallets/deposit.rs       |   3 +-
 runtime/darwinia/src/pallets/dmp_queue.rs     |   1 +
 runtime/darwinia/src/pallets/ethereum_xcm.rs  |   2 +-
 runtime/darwinia/src/pallets/evm.rs           |  64 +++---
 runtime/darwinia/src/pallets/governance.rs    |  31 ++-
 runtime/darwinia/src/pallets/governance/v1.rs |   9 +-
 runtime/darwinia/src/pallets/message_queue.rs |   7 +-
 runtime/darwinia/src/pallets/orml_xtokens.rs  |  38 ++--
 .../darwinia/src/pallets/parachain_system.rs  |   1 +
 runtime/darwinia/src/pallets/polkadot_xcm.rs  |  70 ++----
 runtime/darwinia/src/pallets/preimage.rs      |  19 +-
 runtime/darwinia/src/pallets/proxy.rs         |  14 +-
 runtime/darwinia/src/pallets/scheduler.rs     |   5 +-
 runtime/darwinia/src/pallets/session.rs       |   5 +-
 runtime/darwinia/src/pallets/staking.rs       |   3 +-
 runtime/darwinia/src/pallets/system.rs        |  40 +---
 runtime/darwinia/src/pallets/timestamp.rs     |   3 +-
 runtime/darwinia/src/pallets/tx_pause.rs      |   3 +-
 runtime/darwinia/src/pallets/utility.rs       |   3 +-
 runtime/darwinia/src/pallets/xcmp_queue.rs    |  11 +-
 runtime/koi/src/lib.rs                        | 213 +++++++++++++++---
 runtime/koi/src/pallets.rs                    |   2 +
 runtime/koi/src/pallets/asset_manager.rs      |  68 +++---
 runtime/koi/src/pallets/assets.rs             |   5 +-
 runtime/koi/src/pallets/balances.rs           |   3 +-
 runtime/koi/src/pallets/deposit.rs            |   3 +-
 runtime/koi/src/pallets/dmp_queue.rs          |   1 +
 runtime/koi/src/pallets/evm.rs                |  70 +++---
 runtime/koi/src/pallets/governance.rs         |  26 ++-
 runtime/koi/src/pallets/message_queue.rs      |   7 +-
 runtime/koi/src/pallets/orml_xtokens.rs       |  42 ++--
 runtime/koi/src/pallets/parachain_system.rs   |   1 +
 runtime/koi/src/pallets/polkadot_xcm.rs       |  64 ++----
 runtime/koi/src/pallets/preimage.rs           |  19 +-
 runtime/koi/src/pallets/proxy.rs              |  14 +-
 runtime/koi/src/pallets/scheduler.rs          |   3 +-
 runtime/koi/src/pallets/session.rs            |   5 +-
 runtime/koi/src/pallets/staking.rs            |   3 +-
 runtime/koi/src/pallets/sudo.rs               |   3 +-
 runtime/koi/src/pallets/system.rs             |  39 +---
 runtime/koi/src/pallets/timestamp.rs          |   3 +-
 runtime/koi/src/pallets/tx_pause.rs           |   3 +-
 runtime/koi/src/pallets/utility.rs            |   3 +-
 runtime/koi/src/pallets/xcmp_queue.rs         |   9 +-
 76 files changed, 1196 insertions(+), 814 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 61d72b039..4759d0347 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -1636,7 +1636,7 @@ dependencies = [
  "darwinia-precompile-state-storage",
  "darwinia-staking",
  "dc-primitives",
- "fp-evm 3.0.0-dev (git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730)",
+ "fp-evm",
  "fp-rpc",
  "fp-self-contained",
  "frame-benchmarking",
@@ -2646,7 +2646,7 @@ dependencies = [
  "fc-rpc",
  "fc-rpc-core",
  "fc-storage",
- "fp-evm 3.0.0-dev (git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730)",
+ "fp-evm",
  "fp-rpc",
  "frame-benchmarking",
  "frame-benchmarking-cli",
@@ -2790,7 +2790,7 @@ dependencies = [
  "array-bytes 6.2.3",
  "ethereum",
  "fp-ethereum",
- "fp-evm 3.0.0-dev (git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730)",
+ "fp-evm",
  "fp-self-contained",
  "frame-support",
  "frame-system",
@@ -2812,7 +2812,7 @@ dependencies = [
 name = "darwinia-precompile-assets"
 version = "6.6.3"
 dependencies = [
- "fp-evm 3.0.0-dev (git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730)",
+ "fp-evm",
  "frame-support",
  "frame-system",
  "pallet-assets",
@@ -2838,7 +2838,7 @@ dependencies = [
  "ark-ff",
  "ark-serialize",
  "ark-std",
- "fp-evm 3.0.0-dev (git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730)",
+ "fp-evm",
  "frame-support",
  "pallet-evm",
  "precompile-utils 0.1.0",
@@ -2852,7 +2852,7 @@ name = "darwinia-precompile-deposit"
 version = "6.6.3"
 dependencies = [
  "darwinia-deposit",
- "fp-evm 3.0.0-dev (git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730)",
+ "fp-evm",
  "frame-support",
  "frame-system",
  "pallet-balances",
@@ -2873,7 +2873,7 @@ version = "6.6.3"
 dependencies = [
  "darwinia-deposit",
  "darwinia-staking",
- "fp-evm 3.0.0-dev (git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730)",
+ "fp-evm",
  "frame-support",
  "frame-system",
  "pallet-balances",
@@ -2892,7 +2892,7 @@ dependencies = [
 name = "darwinia-precompile-state-storage"
 version = "6.6.3"
 dependencies = [
- "fp-evm 3.0.0-dev (git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730)",
+ "fp-evm",
  "frame-support",
  "frame-system",
  "pallet-balances",
@@ -2933,7 +2933,7 @@ dependencies = [
  "darwinia-staking",
  "dc-inflation",
  "dc-primitives",
- "fp-evm 3.0.0-dev (git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730)",
+ "fp-evm",
  "fp-rpc",
  "fp-self-contained",
  "frame-benchmarking",
@@ -3712,7 +3712,7 @@ dependencies = [
 [[package]]
 name = "evm-tracing-events"
 version = "0.1.0"
-source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.7.2#0950345857f05a6997b5edcc2b6f7340cb7f0d5c"
+source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.7.2#458974e73022382d3a4ca5ca10fee61ef25a471b"
 dependencies = [
  "environmental",
  "ethereum",
@@ -3809,7 +3809,7 @@ dependencies = [
 [[package]]
 name = "fc-api"
 version = "1.0.0-dev"
-source = "git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730#f017a18123eb0802ca1c68c0f707f63aacbbb730"
+source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.7.2#24461108ff2125d8185d1a8129f5deddf26c9210"
 dependencies = [
  "async-trait",
  "fp-storage",
@@ -3821,7 +3821,7 @@ dependencies = [
 [[package]]
 name = "fc-consensus"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730#f017a18123eb0802ca1c68c0f707f63aacbbb730"
+source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.7.2#24461108ff2125d8185d1a8129f5deddf26c9210"
 dependencies = [
  "async-trait",
  "fp-consensus",
@@ -3837,7 +3837,7 @@ dependencies = [
 [[package]]
 name = "fc-db"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730#f017a18123eb0802ca1c68c0f707f63aacbbb730"
+source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.7.2#24461108ff2125d8185d1a8129f5deddf26c9210"
 dependencies = [
  "async-trait",
  "ethereum",
@@ -3868,7 +3868,7 @@ dependencies = [
 [[package]]
 name = "fc-mapping-sync"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730#f017a18123eb0802ca1c68c0f707f63aacbbb730"
+source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.7.2#24461108ff2125d8185d1a8129f5deddf26c9210"
 dependencies = [
  "fc-db",
  "fc-storage",
@@ -3891,7 +3891,7 @@ dependencies = [
 [[package]]
 name = "fc-rpc"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730#f017a18123eb0802ca1c68c0f707f63aacbbb730"
+source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.7.2#24461108ff2125d8185d1a8129f5deddf26c9210"
 dependencies = [
  "ethereum",
  "ethereum-types",
@@ -3900,7 +3900,7 @@ dependencies = [
  "fc-mapping-sync",
  "fc-rpc-core",
  "fc-storage",
- "fp-evm 3.0.0-dev (git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730)",
+ "fp-evm",
  "fp-rpc",
  "fp-storage",
  "futures 0.3.30",
@@ -3946,7 +3946,7 @@ dependencies = [
 [[package]]
 name = "fc-rpc-core"
 version = "1.1.0-dev"
-source = "git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730#f017a18123eb0802ca1c68c0f707f63aacbbb730"
+source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.7.2#24461108ff2125d8185d1a8129f5deddf26c9210"
 dependencies = [
  "ethereum",
  "ethereum-types",
@@ -3961,7 +3961,7 @@ dependencies = [
 [[package]]
 name = "fc-storage"
 version = "1.0.0-dev"
-source = "git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730#f017a18123eb0802ca1c68c0f707f63aacbbb730"
+source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.7.2#24461108ff2125d8185d1a8129f5deddf26c9210"
 dependencies = [
  "ethereum",
  "ethereum-types",
@@ -4153,7 +4153,7 @@ dependencies = [
 [[package]]
 name = "fp-account"
 version = "1.0.0-dev"
-source = "git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730#f017a18123eb0802ca1c68c0f707f63aacbbb730"
+source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.7.2#24461108ff2125d8185d1a8129f5deddf26c9210"
 dependencies = [
  "hex",
  "impl-serde",
@@ -4172,7 +4172,7 @@ dependencies = [
 [[package]]
 name = "fp-consensus"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730#f017a18123eb0802ca1c68c0f707f63aacbbb730"
+source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.7.2#24461108ff2125d8185d1a8129f5deddf26c9210"
 dependencies = [
  "ethereum",
  "parity-scale-codec",
@@ -4184,11 +4184,11 @@ dependencies = [
 [[package]]
 name = "fp-ethereum"
 version = "1.0.0-dev"
-source = "git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730#f017a18123eb0802ca1c68c0f707f63aacbbb730"
+source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.7.2#24461108ff2125d8185d1a8129f5deddf26c9210"
 dependencies = [
  "ethereum",
  "ethereum-types",
- "fp-evm 3.0.0-dev (git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730)",
+ "fp-evm",
  "frame-support",
  "parity-scale-codec",
  "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
@@ -4197,23 +4197,7 @@ dependencies = [
 [[package]]
 name = "fp-evm"
 version = "3.0.0-dev"
-source = "git+https://github.com/darwinia-network/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730#f017a18123eb0802ca1c68c0f707f63aacbbb730"
-dependencies = [
- "evm",
- "frame-support",
- "num_enum 0.7.2",
- "parity-scale-codec",
- "scale-info",
- "serde",
- "sp-core",
- "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
-]
-
-[[package]]
-name = "fp-evm"
-version = "3.0.0-dev"
-source = "git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730#f017a18123eb0802ca1c68c0f707f63aacbbb730"
+source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.7.2#24461108ff2125d8185d1a8129f5deddf26c9210"
 dependencies = [
  "evm",
  "frame-support",
@@ -4229,11 +4213,11 @@ dependencies = [
 [[package]]
 name = "fp-rpc"
 version = "3.0.0-dev"
-source = "git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730#f017a18123eb0802ca1c68c0f707f63aacbbb730"
+source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.7.2#24461108ff2125d8185d1a8129f5deddf26c9210"
 dependencies = [
  "ethereum",
  "ethereum-types",
- "fp-evm 3.0.0-dev (git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730)",
+ "fp-evm",
  "parity-scale-codec",
  "scale-info",
  "sp-api",
@@ -4246,7 +4230,7 @@ dependencies = [
 [[package]]
 name = "fp-self-contained"
 version = "1.0.0-dev"
-source = "git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730#f017a18123eb0802ca1c68c0f707f63aacbbb730"
+source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.7.2#24461108ff2125d8185d1a8129f5deddf26c9210"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
@@ -4258,7 +4242,7 @@ dependencies = [
 [[package]]
 name = "fp-storage"
 version = "2.0.0"
-source = "git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730#f017a18123eb0802ca1c68c0f707f63aacbbb730"
+source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.7.2#24461108ff2125d8185d1a8129f5deddf26c9210"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -5793,7 +5777,7 @@ dependencies = [
  "darwinia-precompile-state-storage",
  "darwinia-staking",
  "dc-primitives",
- "fp-evm 3.0.0-dev (git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730)",
+ "fp-evm",
  "fp-rpc",
  "fp-self-contained",
  "frame-benchmarking",
@@ -6868,7 +6852,7 @@ dependencies = [
 [[package]]
 name = "moonbeam-client-evm-tracing"
 version = "0.1.0"
-source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.7.2#0950345857f05a6997b5edcc2b6f7340cb7f0d5c"
+source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.7.2#458974e73022382d3a4ca5ca10fee61ef25a471b"
 dependencies = [
  "ethereum-types",
  "evm-tracing-events",
@@ -6884,14 +6868,14 @@ dependencies = [
 [[package]]
 name = "moonbeam-evm-tracer"
 version = "0.1.0"
-source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.7.2#0950345857f05a6997b5edcc2b6f7340cb7f0d5c"
+source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.7.2#458974e73022382d3a4ca5ca10fee61ef25a471b"
 dependencies = [
  "ethereum-types",
  "evm",
  "evm-gasometer",
  "evm-runtime",
  "evm-tracing-events",
- "fp-evm 3.0.0-dev (git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730)",
+ "fp-evm",
  "moonbeam-primitives-ext",
  "pallet-evm",
  "parity-scale-codec",
@@ -6904,7 +6888,7 @@ dependencies = [
 [[package]]
 name = "moonbeam-primitives-ext"
 version = "0.1.0"
-source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.7.2#0950345857f05a6997b5edcc2b6f7340cb7f0d5c"
+source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.7.2#458974e73022382d3a4ca5ca10fee61ef25a471b"
 dependencies = [
  "ethereum-types",
  "evm-tracing-events",
@@ -6917,7 +6901,7 @@ dependencies = [
 [[package]]
 name = "moonbeam-rpc-core-debug"
 version = "0.1.0"
-source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.7.2#0950345857f05a6997b5edcc2b6f7340cb7f0d5c"
+source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.7.2#458974e73022382d3a4ca5ca10fee61ef25a471b"
 dependencies = [
  "ethereum",
  "ethereum-types",
@@ -6934,7 +6918,7 @@ dependencies = [
 [[package]]
 name = "moonbeam-rpc-core-trace"
 version = "0.6.0"
-source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.7.2#0950345857f05a6997b5edcc2b6f7340cb7f0d5c"
+source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.7.2#458974e73022382d3a4ca5ca10fee61ef25a471b"
 dependencies = [
  "ethereum-types",
  "futures 0.3.30",
@@ -6948,7 +6932,7 @@ dependencies = [
 [[package]]
 name = "moonbeam-rpc-core-types"
 version = "0.1.0"
-source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.7.2#0950345857f05a6997b5edcc2b6f7340cb7f0d5c"
+source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.7.2#458974e73022382d3a4ca5ca10fee61ef25a471b"
 dependencies = [
  "ethereum-types",
  "serde",
@@ -6958,7 +6942,7 @@ dependencies = [
 [[package]]
 name = "moonbeam-rpc-debug"
 version = "0.1.0"
-source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.7.2#0950345857f05a6997b5edcc2b6f7340cb7f0d5c"
+source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.7.2#458974e73022382d3a4ca5ca10fee61ef25a471b"
 dependencies = [
  "ethereum",
  "ethereum-types",
@@ -6990,7 +6974,7 @@ dependencies = [
 [[package]]
 name = "moonbeam-rpc-primitives-debug"
 version = "0.1.0"
-source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.7.2#0950345857f05a6997b5edcc2b6f7340cb7f0d5c"
+source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.7.2#458974e73022382d3a4ca5ca10fee61ef25a471b"
 dependencies = [
  "environmental",
  "ethereum",
@@ -7008,7 +6992,7 @@ dependencies = [
 [[package]]
 name = "moonbeam-rpc-trace"
 version = "0.6.0"
-source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.7.2#0950345857f05a6997b5edcc2b6f7340cb7f0d5c"
+source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.7.2#458974e73022382d3a4ca5ca10fee61ef25a471b"
 dependencies = [
  "ethereum",
  "ethereum-types",
@@ -7843,7 +7827,7 @@ dependencies = [
 [[package]]
 name = "pallet-asset-manager"
 version = "0.1.0"
-source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.7.2#0950345857f05a6997b5edcc2b6f7340cb7f0d5c"
+source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.7.2#458974e73022382d3a4ca5ca10fee61ef25a471b"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8209,14 +8193,14 @@ dependencies = [
 [[package]]
 name = "pallet-ethereum"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730#f017a18123eb0802ca1c68c0f707f63aacbbb730"
+source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.7.2#24461108ff2125d8185d1a8129f5deddf26c9210"
 dependencies = [
  "ethereum",
  "ethereum-types",
  "evm",
  "fp-consensus",
  "fp-ethereum",
- "fp-evm 3.0.0-dev (git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730)",
+ "fp-evm",
  "fp-rpc",
  "fp-storage",
  "frame-support",
@@ -8232,12 +8216,12 @@ dependencies = [
 [[package]]
 name = "pallet-ethereum-xcm"
 version = "1.0.0-dev"
-source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.7.2#0950345857f05a6997b5edcc2b6f7340cb7f0d5c"
+source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.7.2#458974e73022382d3a4ca5ca10fee61ef25a471b"
 dependencies = [
  "ethereum",
  "ethereum-types",
  "fp-ethereum",
- "fp-evm 3.0.0-dev (git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730)",
+ "fp-evm",
  "fp-rpc",
  "fp-self-contained",
  "frame-benchmarking",
@@ -8258,12 +8242,12 @@ dependencies = [
 [[package]]
 name = "pallet-evm"
 version = "6.0.0-dev"
-source = "git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730#f017a18123eb0802ca1c68c0f707f63aacbbb730"
+source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.7.2#24461108ff2125d8185d1a8129f5deddf26c9210"
 dependencies = [
  "environmental",
  "evm",
  "fp-account",
- "fp-evm 3.0.0-dev (git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730)",
+ "fp-evm",
  "frame-benchmarking",
  "frame-support",
  "frame-system",
@@ -8284,29 +8268,29 @@ dependencies = [
 [[package]]
 name = "pallet-evm-precompile-blake2"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730#f017a18123eb0802ca1c68c0f707f63aacbbb730"
+source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.7.2#24461108ff2125d8185d1a8129f5deddf26c9210"
 dependencies = [
- "fp-evm 3.0.0-dev (git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730)",
+ "fp-evm",
 ]
 
 [[package]]
 name = "pallet-evm-precompile-bls12381"
 version = "1.0.0-dev"
-source = "git+https://github.com/darwinia-network/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730#f017a18123eb0802ca1c68c0f707f63aacbbb730"
+source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.7.2#24461108ff2125d8185d1a8129f5deddf26c9210"
 dependencies = [
  "ark-bls12-381",
  "ark-ec",
  "ark-ff",
  "ark-std",
- "fp-evm 3.0.0-dev (git+https://github.com/darwinia-network/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730)",
+ "fp-evm",
 ]
 
 [[package]]
 name = "pallet-evm-precompile-bn128"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730#f017a18123eb0802ca1c68c0f707f63aacbbb730"
+source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.7.2#24461108ff2125d8185d1a8129f5deddf26c9210"
 dependencies = [
- "fp-evm 3.0.0-dev (git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730)",
+ "fp-evm",
  "sp-core",
  "substrate-bn",
 ]
@@ -8314,9 +8298,9 @@ dependencies = [
 [[package]]
 name = "pallet-evm-precompile-conviction-voting"
 version = "0.1.0"
-source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.7.2#0950345857f05a6997b5edcc2b6f7340cb7f0d5c"
+source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.7.2#458974e73022382d3a4ca5ca10fee61ef25a471b"
 dependencies = [
- "fp-evm 3.0.0-dev (git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730)",
+ "fp-evm",
  "frame-support",
  "frame-system",
  "log",
@@ -8334,9 +8318,9 @@ dependencies = [
 [[package]]
 name = "pallet-evm-precompile-dispatch"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730#f017a18123eb0802ca1c68c0f707f63aacbbb730"
+source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.7.2#24461108ff2125d8185d1a8129f5deddf26c9210"
 dependencies = [
- "fp-evm 3.0.0-dev (git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730)",
+ "fp-evm",
  "frame-support",
  "pallet-evm",
  "parity-scale-codec",
@@ -8346,18 +8330,18 @@ dependencies = [
 [[package]]
 name = "pallet-evm-precompile-modexp"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730#f017a18123eb0802ca1c68c0f707f63aacbbb730"
+source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.7.2#24461108ff2125d8185d1a8129f5deddf26c9210"
 dependencies = [
- "fp-evm 3.0.0-dev (git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730)",
+ "fp-evm",
  "num",
 ]
 
 [[package]]
 name = "pallet-evm-precompile-simple"
 version = "2.0.0-dev"
-source = "git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730#f017a18123eb0802ca1c68c0f707f63aacbbb730"
+source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.7.2#24461108ff2125d8185d1a8129f5deddf26c9210"
 dependencies = [
- "fp-evm 3.0.0-dev (git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730)",
+ "fp-evm",
  "ripemd",
  "sp-io",
 ]
@@ -10572,12 +10556,12 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
 [[package]]
 name = "precompile-utils"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730#f017a18123eb0802ca1c68c0f707f63aacbbb730"
+source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.7.2#24461108ff2125d8185d1a8129f5deddf26c9210"
 dependencies = [
  "derive_more",
  "environmental",
  "evm",
- "fp-evm 3.0.0-dev (git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730)",
+ "fp-evm",
  "frame-support",
  "frame-system",
  "hex",
@@ -10602,12 +10586,12 @@ dependencies = [
 [[package]]
 name = "precompile-utils"
 version = "0.1.1"
-source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.7.2#0950345857f05a6997b5edcc2b6f7340cb7f0d5c"
+source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.7.2#458974e73022382d3a4ca5ca10fee61ef25a471b"
 dependencies = [
  "affix",
  "environmental",
  "evm",
- "fp-evm 3.0.0-dev (git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730)",
+ "fp-evm",
  "frame-support",
  "frame-system",
  "hex",
@@ -10629,7 +10613,7 @@ dependencies = [
 [[package]]
 name = "precompile-utils-macro"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/frontier?rev=f017a18123eb0802ca1c68c0f707f63aacbbb730#f017a18123eb0802ca1c68c0f707f63aacbbb730"
+source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.7.2#24461108ff2125d8185d1a8129f5deddf26c9210"
 dependencies = [
  "case",
  "num_enum 0.7.2",
@@ -10643,7 +10627,7 @@ dependencies = [
 [[package]]
 name = "precompile-utils-macro"
 version = "0.1.1"
-source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.7.2#0950345857f05a6997b5edcc2b6f7340cb7f0d5c"
+source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.7.2#458974e73022382d3a4ca5ca10fee61ef25a471b"
 dependencies = [
  "case",
  "num_enum 0.5.11",
@@ -13848,7 +13832,7 @@ dependencies = [
 [[package]]
 name = "sp-crypto-ec-utils"
 version = "0.10.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#909bfc2d7c00a0fed7a5fd4e5292aa3fbe2299b6"
+source = "git+https://github.com/paritytech/polkadot-sdk#414a8fc2eda3bb72e30cefdba628cf6c361cd6e1"
 dependencies = [
  "ark-bls12-377",
  "ark-bls12-377-ext",
@@ -13910,7 +13894,7 @@ dependencies = [
 [[package]]
 name = "sp-debug-derive"
 version = "14.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#909bfc2d7c00a0fed7a5fd4e5292aa3fbe2299b6"
+source = "git+https://github.com/paritytech/polkadot-sdk#414a8fc2eda3bb72e30cefdba628cf6c361cd6e1"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -13931,7 +13915,7 @@ dependencies = [
 [[package]]
 name = "sp-externalities"
 version = "0.25.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#909bfc2d7c00a0fed7a5fd4e5292aa3fbe2299b6"
+source = "git+https://github.com/paritytech/polkadot-sdk#414a8fc2eda3bb72e30cefdba628cf6c361cd6e1"
 dependencies = [
  "environmental",
  "parity-scale-codec",
@@ -14149,7 +14133,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface"
 version = "24.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#909bfc2d7c00a0fed7a5fd4e5292aa3fbe2299b6"
+source = "git+https://github.com/paritytech/polkadot-sdk#414a8fc2eda3bb72e30cefdba628cf6c361cd6e1"
 dependencies = [
  "bytes",
  "impl-trait-for-tuples",
@@ -14181,7 +14165,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface-proc-macro"
 version = "17.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#909bfc2d7c00a0fed7a5fd4e5292aa3fbe2299b6"
+source = "git+https://github.com/paritytech/polkadot-sdk#414a8fc2eda3bb72e30cefdba628cf6c361cd6e1"
 dependencies = [
  "Inflector",
  "expander 2.2.1",
@@ -14274,7 +14258,7 @@ source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot
 [[package]]
 name = "sp-std"
 version = "14.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#909bfc2d7c00a0fed7a5fd4e5292aa3fbe2299b6"
+source = "git+https://github.com/paritytech/polkadot-sdk#414a8fc2eda3bb72e30cefdba628cf6c361cd6e1"
 
 [[package]]
 name = "sp-storage"
@@ -14292,7 +14276,7 @@ dependencies = [
 [[package]]
 name = "sp-storage"
 version = "19.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#909bfc2d7c00a0fed7a5fd4e5292aa3fbe2299b6"
+source = "git+https://github.com/paritytech/polkadot-sdk#414a8fc2eda3bb72e30cefdba628cf6c361cd6e1"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -14329,7 +14313,7 @@ dependencies = [
 [[package]]
 name = "sp-tracing"
 version = "16.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#909bfc2d7c00a0fed7a5fd4e5292aa3fbe2299b6"
+source = "git+https://github.com/paritytech/polkadot-sdk#414a8fc2eda3bb72e30cefdba628cf6c361cd6e1"
 dependencies = [
  "parity-scale-codec",
  "tracing",
@@ -14429,7 +14413,7 @@ dependencies = [
 [[package]]
 name = "sp-wasm-interface"
 version = "20.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#909bfc2d7c00a0fed7a5fd4e5292aa3fbe2299b6"
+source = "git+https://github.com/paritytech/polkadot-sdk#414a8fc2eda3bb72e30cefdba628cf6c361cd6e1"
 dependencies = [
  "impl-trait-for-tuples",
  "log",
@@ -16929,7 +16913,7 @@ dependencies = [
 [[package]]
 name = "xcm-primitives"
 version = "0.1.1"
-source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.7.2#0950345857f05a6997b5edcc2b6f7340cb7f0d5c"
+source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.7.2#458974e73022382d3a4ca5ca10fee61ef25a471b"
 dependencies = [
  "cumulus-primitives-core",
  "ethereum",
diff --git a/Cargo.toml b/Cargo.toml
index 976d58c35..4721aa9d5 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -72,27 +72,27 @@ dc-types                          = { path = "core/types" }
 koi-runtime                       = { path = "runtime/koi" }
 
 # frontier
-fc-api                         = { git = "https://github.com/paritytech/frontier", rev = "f017a18123eb0802ca1c68c0f707f63aacbbb730" }
-fc-consensus                   = { git = "https://github.com/paritytech/frontier", rev = "f017a18123eb0802ca1c68c0f707f63aacbbb730" }
-fc-db                          = { git = "https://github.com/paritytech/frontier", rev = "f017a18123eb0802ca1c68c0f707f63aacbbb730" }
-fc-mapping-sync                = { git = "https://github.com/paritytech/frontier", rev = "f017a18123eb0802ca1c68c0f707f63aacbbb730", features = ["sql"] }
-fc-rpc                         = { git = "https://github.com/paritytech/frontier", rev = "f017a18123eb0802ca1c68c0f707f63aacbbb730", features = ["rpc-binary-search-estimate", "txpool"] }
-fc-rpc-core                    = { git = "https://github.com/paritytech/frontier", rev = "f017a18123eb0802ca1c68c0f707f63aacbbb730" }
-fc-storage                     = { git = "https://github.com/paritytech/frontier", rev = "f017a18123eb0802ca1c68c0f707f63aacbbb730" }
-fp-account                     = { git = "https://github.com/paritytech/frontier", rev = "f017a18123eb0802ca1c68c0f707f63aacbbb730", default-features = false, features = ["serde"] }
-fp-ethereum                    = { git = "https://github.com/paritytech/frontier", rev = "f017a18123eb0802ca1c68c0f707f63aacbbb730", default-features = false }
-fp-evm                         = { git = "https://github.com/paritytech/frontier", rev = "f017a18123eb0802ca1c68c0f707f63aacbbb730", default-features = false }
-fp-rpc                         = { git = "https://github.com/paritytech/frontier", rev = "f017a18123eb0802ca1c68c0f707f63aacbbb730", default-features = false }
-fp-self-contained              = { git = "https://github.com/paritytech/frontier", rev = "f017a18123eb0802ca1c68c0f707f63aacbbb730", default-features = false, features = ["serde"] }
-pallet-ethereum                = { git = "https://github.com/paritytech/frontier", rev = "f017a18123eb0802ca1c68c0f707f63aacbbb730", default-features = false, features = ["forbid-evm-reentrancy"] }
-pallet-evm                     = { git = "https://github.com/paritytech/frontier", rev = "f017a18123eb0802ca1c68c0f707f63aacbbb730", default-features = false, features = ["forbid-evm-reentrancy"] }
-pallet-evm-precompile-blake2   = { git = "https://github.com/paritytech/frontier", rev = "f017a18123eb0802ca1c68c0f707f63aacbbb730", default-features = false }
-pallet-evm-precompile-bls12381 = { git = "https://github.com/darwinia-network/frontier", rev = "f017a18123eb0802ca1c68c0f707f63aacbbb730", default-features = false }
-pallet-evm-precompile-bn128    = { git = "https://github.com/paritytech/frontier", rev = "f017a18123eb0802ca1c68c0f707f63aacbbb730", default-features = false }
-pallet-evm-precompile-dispatch = { git = "https://github.com/paritytech/frontier", rev = "f017a18123eb0802ca1c68c0f707f63aacbbb730", default-features = false }
-pallet-evm-precompile-modexp   = { git = "https://github.com/paritytech/frontier", rev = "f017a18123eb0802ca1c68c0f707f63aacbbb730", default-features = false }
-pallet-evm-precompile-simple   = { git = "https://github.com/paritytech/frontier", rev = "f017a18123eb0802ca1c68c0f707f63aacbbb730", default-features = false }
-precompile-utils               = { git = "https://github.com/paritytech/frontier", rev = "f017a18123eb0802ca1c68c0f707f63aacbbb730", default-features = false }
+fc-api                         = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v1.7.2" }
+fc-consensus                   = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v1.7.2" }
+fc-db                          = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v1.7.2" }
+fc-mapping-sync                = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v1.7.2", features = ["sql"] }
+fc-rpc                         = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v1.7.2", features = ["rpc-binary-search-estimate", "txpool"] }
+fc-rpc-core                    = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v1.7.2" }
+fc-storage                     = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v1.7.2" }
+fp-account                     = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v1.7.2", default-features = false, features = ["serde"] }
+fp-ethereum                    = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v1.7.2", default-features = false }
+fp-evm                         = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v1.7.2", default-features = false }
+fp-rpc                         = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v1.7.2", default-features = false }
+fp-self-contained              = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v1.7.2", default-features = false, features = ["serde"] }
+pallet-ethereum                = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v1.7.2", default-features = false, features = ["forbid-evm-reentrancy"] }
+pallet-evm                     = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v1.7.2", default-features = false, features = ["forbid-evm-reentrancy"] }
+pallet-evm-precompile-blake2   = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v1.7.2", default-features = false }
+pallet-evm-precompile-bls12381 = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v1.7.2", default-features = false }
+pallet-evm-precompile-bn128    = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v1.7.2", default-features = false }
+pallet-evm-precompile-dispatch = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v1.7.2", default-features = false }
+pallet-evm-precompile-modexp   = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v1.7.2", default-features = false }
+pallet-evm-precompile-simple   = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v1.7.2", default-features = false }
+precompile-utils               = { git = "https://github.com/darwinia-network/frontier", branch = "polkadot-v1.7.2", default-features = false }
 
 # moonbeam
 moonbeam-evm-tracer                     = { git = "https://github.com/darwinia-network/moonbeam", branch = "polkadot-v1.7.2", default-features = false }
diff --git a/runtime/common/src/lib.rs b/runtime/common/src/lib.rs
index bf852b1b8..cd53f931b 100644
--- a/runtime/common/src/lib.rs
+++ b/runtime/common/src/lib.rs
@@ -31,14 +31,9 @@ pub mod test;
 
 // darwinia
 use dc_primitives::*;
-// substrate
-use frame_support::{
-	sp_runtime::Perbill,
-	weights::{
-		constants::ExtrinsicBaseWeight, FeePolynomial, Weight, WeightToFee as WeightToFeeT,
-		WeightToFeeCoefficient, WeightToFeeCoefficients, WeightToFeePolynomial,
-	},
-};
+// polkadot-sdk
+use frame_support::weights::WeightToFeePolynomial;
+use sp_core::{H160, U256};
 
 #[macro_export]
 macro_rules! fast_runtime_or_not {
@@ -54,7 +49,7 @@ macro_rules! fast_runtime_or_not {
 macro_rules! impl_self_contained_call {
 	() => {
 		impl fp_self_contained::SelfContainedCall for RuntimeCall {
-			type SignedInfo = sp_core::H160;
+			type SignedInfo = H160;
 
 			fn is_self_contained(&self) -> bool {
 				match self {
@@ -156,12 +151,14 @@ pub const fn permill(x: i32) -> sp_runtime::FixedI64 {
 ///   - Setting it to `0` will essentially disable the weight fee.
 ///   - Setting it to `1` will cause the literal `#[weight = x]` values to be charged.
 pub struct WeightToFee;
-impl WeightToFeeT for WeightToFee {
+impl frame_support::weights::WeightToFee for WeightToFee {
 	type Balance = Balance;
 
-	fn weight_to_fee(weight: &Weight) -> Self::Balance {
-		let time_poly: FeePolynomial<Balance> = RefTimeToFee::polynomial().into();
-		let proof_poly: FeePolynomial<Balance> = ProofSizeToFee::polynomial().into();
+	fn weight_to_fee(weight: &frame_support::weights::Weight) -> Self::Balance {
+		let time_poly: frame_support::weights::FeePolynomial<Balance> =
+			RefTimeToFee::polynomial().into();
+		let proof_poly: frame_support::weights::FeePolynomial<Balance> =
+			ProofSizeToFee::polynomial().into();
 
 		// Take the maximum instead of the sum to charge by the more scarce resource.
 		time_poly.eval(weight.ref_time()).max(proof_poly.eval(weight.proof_size()))
@@ -170,18 +167,21 @@ impl WeightToFeeT for WeightToFee {
 
 /// Maps the reference time component of `Weight` to a fee.
 pub struct RefTimeToFee;
-impl WeightToFeePolynomial for RefTimeToFee {
+impl frame_support::weights::WeightToFeePolynomial for RefTimeToFee {
 	type Balance = Balance;
 
-	fn polynomial() -> WeightToFeeCoefficients<Self::Balance> {
+	fn polynomial() -> frame_support::weights::WeightToFeeCoefficients<Self::Balance> {
 		// Map base extrinsic weight to 1/200 UNIT.
 		let p = UNIT;
-		let q = 200 * Balance::from(ExtrinsicBaseWeight::get().ref_time());
+		let q = 200
+			* Balance::from(
+				frame_support::weights::constants::ExtrinsicBaseWeight::get().ref_time(),
+			);
 
-		smallvec::smallvec![WeightToFeeCoefficient {
+		smallvec::smallvec![frame_support::weights::WeightToFeeCoefficient {
 			degree: 1,
 			negative: false,
-			coeff_frac: Perbill::from_rational(p % q, q),
+			coeff_frac: sp_runtime::Perbill::from_rational(p % q, q),
 			coeff_integer: p / q,
 		}]
 	}
@@ -189,18 +189,18 @@ impl WeightToFeePolynomial for RefTimeToFee {
 
 /// Maps the proof size component of `Weight` to a fee.
 pub struct ProofSizeToFee;
-impl WeightToFeePolynomial for ProofSizeToFee {
+impl frame_support::weights::WeightToFeePolynomial for ProofSizeToFee {
 	type Balance = Balance;
 
-	fn polynomial() -> WeightToFeeCoefficients<Self::Balance> {
+	fn polynomial() -> frame_support::weights::WeightToFeeCoefficients<Self::Balance> {
 		// Map 10kb proof to 1 UNIT.
 		let p = UNIT;
 		let q = 10_000;
 
-		smallvec::smallvec![WeightToFeeCoefficient {
+		smallvec::smallvec![frame_support::weights::WeightToFeeCoefficient {
 			degree: 1,
 			negative: false,
-			coeff_frac: Perbill::from_rational(p % q, q),
+			coeff_frac: sp_runtime::Perbill::from_rational(p % q, q),
 			coeff_integer: p / q,
 		}]
 	}
@@ -237,11 +237,11 @@ where
 }
 
 pub struct FindAuthor<Inner>(core::marker::PhantomData<Inner>);
-impl<Inner> frame_support::traits::FindAuthor<sp_core::H160> for FindAuthor<Inner>
+impl<Inner> frame_support::traits::FindAuthor<H160> for FindAuthor<Inner>
 where
 	Inner: frame_support::traits::FindAuthor<AccountId>,
 {
-	fn find_author<'a, I>(digests: I) -> Option<sp_core::H160>
+	fn find_author<'a, I>(digests: I) -> Option<H160>
 	where
 		I: 'a + IntoIterator<Item = (frame_support::ConsensusEngineId, &'a [u8])>,
 	{
@@ -251,15 +251,15 @@ where
 
 pub struct FixedGasPrice;
 impl pallet_evm::FeeCalculator for FixedGasPrice {
-	fn min_gas_price() -> (sp_core::U256, frame_support::weights::Weight) {
-		(sp_core::U256::from(GWEI), frame_support::weights::Weight::zero())
+	fn min_gas_price() -> (U256, frame_support::weights::Weight) {
+		(U256::from(GWEI), frame_support::weights::Weight::zero())
 	}
 }
 
 pub struct AssetIdConverter;
 impl darwinia_precompile_assets::AccountToAssetId<AccountId, AssetId> for AssetIdConverter {
 	fn account_to_asset_id(account_id: AccountId) -> AssetId {
-		let addr: sp_core::H160 = account_id.into();
+		let addr: H160 = account_id.into();
 		addr.to_low_u64_be()
 	}
 }
diff --git a/runtime/common/src/migration_helper.rs b/runtime/common/src/migration_helper.rs
index 3a38f7093..b4170145e 100644
--- a/runtime/common/src/migration_helper.rs
+++ b/runtime/common/src/migration_helper.rs
@@ -1,4 +1,4 @@
-// substrate
+// polkadot-sdk
 pub use frame_support::migration;
 
 /// Pallet migration helper.
diff --git a/runtime/common/src/pallet_config.rs b/runtime/common/src/pallet_config.rs
index 8eda204f2..c3280b78d 100644
--- a/runtime/common/src/pallet_config.rs
+++ b/runtime/common/src/pallet_config.rs
@@ -1,6 +1,7 @@
 // darwinia
 use dc_primitives::*;
 // substrate
+use sp_runtime::traits::AccountIdConversion;
 use sp_std::prelude::*;
 
 #[cfg(not(feature = "runtime-benchmarks"))]
@@ -11,12 +12,11 @@ pub const EXISTENTIAL_DEPOSIT: Balance = 1;
 frame_support::parameter_types! {
 	pub const TreasuryPid: frame_support::PalletId = frame_support::PalletId(*b"da/trsry");
 
-	pub const FeeMarketLid: frame_support::traits::LockIdentifier = *b"da/feecr";
-
 	pub const ExistentialDeposit: Balance = EXISTENTIAL_DEPOSIT;
 	pub const MaxBalance: Balance = Balance::max_value();
 
 	pub const RelayOrigin: cumulus_primitives_core::AggregateMessageOrigin = cumulus_primitives_core::AggregateMessageOrigin::Parent;
 
 	pub  AssetCreators: Vec<AccountId> = vec![super::gov_origin::ROOT];
+	pub TreasuryAccount: AccountId = TreasuryPid::get().into_account_truncating();
 }
diff --git a/runtime/crab/src/lib.rs b/runtime/crab/src/lib.rs
index 3256c6595..3c68857ee 100644
--- a/runtime/crab/src/lib.rs
+++ b/runtime/crab/src/lib.rs
@@ -28,12 +28,18 @@ mod pallets;
 pub use pallets::*;
 
 mod migration;
-pub mod weights;
+
+// pub mod weights;
 
 pub use darwinia_common_runtime::*;
 pub use dc_primitives::*;
 
-// substrate
+// crates.io
+use codec::{Decode, Encode, MaxEncodedLen};
+use scale_info::TypeInfo;
+// polkadot-sdk
+use sp_core::{H160, H256, U256};
+use sp_runtime::RuntimeDebug;
 use sp_std::prelude::*;
 
 /// Block type as expected by this runtime.
@@ -324,11 +330,11 @@ sp_api::impl_runtime_apis! {
 
 	impl sp_genesis_builder::GenesisBuilder<Block> for Runtime {
 		fn create_default_config() -> Vec<u8> {
-			sp_genesis_builder::create_default_config::<RuntimeGenesisConfig>()
+			frame_support::genesis_builder_helper::create_default_config::<RuntimeGenesisConfig>()
 		}
 
 		fn build_config(config: Vec<u8>) -> sp_genesis_builder::Result {
-			sp_genesis_builder::build_config::<RuntimeGenesisConfig>(config)
+			frame_support::genesis_builder_helper::build_config::<RuntimeGenesisConfig>(config)
 		}
 	}
 
@@ -343,13 +349,13 @@ sp_api::impl_runtime_apis! {
 			<<Runtime as pallet_evm::Config>::ChainId as sp_core::Get<u64>>::get()
 		}
 
-		fn account_basic(address: sp_core::H160) -> pallet_evm::Account {
+		fn account_basic(address: H160) -> pallet_evm::Account {
 			let (account, _) = EVM::account_basic(&address);
 
 			account
 		}
 
-		fn gas_price() -> sp_core::U256 {
+		fn gas_price() -> U256 {
 			// frontier
 			use pallet_evm::FeeCalculator;
 
@@ -358,33 +364,33 @@ sp_api::impl_runtime_apis! {
 			gas_price
 		}
 
-		fn account_code_at(address: sp_core::H160) -> Vec<u8> {
+		fn account_code_at(address: H160) -> Vec<u8> {
 			pallet_evm::AccountCodes::<Runtime>::get(address)
 		}
 
-		fn author() -> sp_core::H160 {
+		fn author() -> H160 {
 			<pallet_evm::Pallet<Runtime>>::find_author()
 		}
 
-		fn storage_at(address: sp_core::H160, index: sp_core::U256) -> sp_core::H256 {
+		fn storage_at(address: H160, index: U256) -> H256 {
 			let mut tmp = [0u8; 32];
 
 			index.to_big_endian(&mut tmp);
 
-			pallet_evm::AccountStorages::<Runtime>::get(address, sp_core::H256::from_slice(&tmp[..]))
+			pallet_evm::AccountStorages::<Runtime>::get(address, H256::from_slice(&tmp[..]))
 		}
 
 		fn call(
-			from: sp_core::H160,
-			to: sp_core::H160,
+			from: H160,
+			to: H160,
 			data: Vec<u8>,
-			value: sp_core::U256,
-			gas_limit: sp_core::U256,
-			max_fee_per_gas: Option<sp_core::U256>,
-			max_priority_fee_per_gas: Option<sp_core::U256>,
-			nonce: Option<sp_core::U256>,
+			value: U256,
+			gas_limit: U256,
+			max_fee_per_gas: Option<U256>,
+			max_priority_fee_per_gas: Option<U256>,
+			nonce: Option<U256>,
 			estimate: bool,
-			access_list: Option<Vec<(sp_core::H160, Vec<sp_core::H256>)>>,
+			access_list: Option<Vec<(H160, Vec<H256>)>>,
 		) -> Result<pallet_evm::CallInfo, sp_runtime::DispatchError> {
 			// frontier
 			use pallet_evm::Runner;
@@ -434,15 +440,15 @@ sp_api::impl_runtime_apis! {
 		}
 
 		fn create(
-			from: sp_core::H160,
+			from: H160,
 			data: Vec<u8>,
-			value: sp_core::U256,
-			gas_limit: sp_core::U256,
-			max_fee_per_gas: Option<sp_core::U256>,
-			max_priority_fee_per_gas: Option<sp_core::U256>,
-			nonce: Option<sp_core::U256>,
+			value: U256,
+			gas_limit: U256,
+			max_fee_per_gas: Option<U256>,
+			max_priority_fee_per_gas: Option<U256>,
+			nonce: Option<U256>,
 			estimate: bool,
-			access_list: Option<Vec<(sp_core::H160, Vec<sp_core::H256>)>>,
+			access_list: Option<Vec<(H160, Vec<H256>)>>,
 		) -> Result<pallet_evm::CreateInfo, sp_runtime::DispatchError> {
 			// frontier
 			use pallet_evm::Runner;
@@ -562,6 +568,7 @@ sp_api::impl_runtime_apis! {
 		fn trace_transaction(
 			_extrinsics: Vec<<Block as sp_runtime::traits::Block>::Extrinsic>,
 			_traced_transaction: &pallet_ethereum::Transaction,
+			_header: &<Block as sp_runtime::traits::Block>::Header,
 		) -> Result<
 			(),
 			sp_runtime::DispatchError,
@@ -569,7 +576,25 @@ sp_api::impl_runtime_apis! {
 			#[cfg(feature = "evm-tracing")]
 			{
 				use moonbeam_evm_tracer::tracer::EvmTracer;
-				use pallet_ethereum::Call::transact;
+				use xcm_primitives::{
+					ETHEREUM_XCM_TRACING_STORAGE_KEY,
+					EthereumXcmTracingStatus
+				};
+				use frame_support::storage::unhashed;
+				use frame_system::pallet_prelude::BlockNumberFor;
+
+				// Tell the CallDispatcher we are tracing a specific Transaction.
+				unhashed::put::<EthereumXcmTracingStatus>(
+					ETHEREUM_XCM_TRACING_STORAGE_KEY,
+					&EthereumXcmTracingStatus::Transaction(traced_transaction.hash()),
+				);
+
+				// Initialize block: calls the "on_initialize" hook on every pallet
+				// in AllPalletsWithSystem.
+				// After pallet message queue was introduced, this must be done only after
+				// enabling XCM tracing by setting ETHEREUM_XCM_TRACING_STORAGE_KEY
+				// in the storage
+				Executive::initialize_block(_header);
 
 				// Apply the a subset of extrinsics: all the substrate-specific or ethereum
 				// transactions that preceded the requested transaction.
@@ -585,10 +610,32 @@ sp_api::impl_runtime_apis! {
 						}
 						_ => Executive::apply_extrinsic(ext),
 					};
+					if let Some(EthereumXcmTracingStatus::TransactionExited) = unhashed::get(
+						ETHEREUM_XCM_TRACING_STORAGE_KEY
+					) {
+						return Ok(());
+					}
+				}
+
+				if let Some(EthereumXcmTracingStatus::Transaction(_)) = unhashed::get(
+					ETHEREUM_XCM_TRACING_STORAGE_KEY
+				) {
+					// If the transaction was not found, it might be
+					// an eth-xcm transaction that was executed at on_idle
+					replay_on_idle();
+				}
+
+				if let Some(EthereumXcmTracingStatus::TransactionExited) = unhashed::get(
+					ETHEREUM_XCM_TRACING_STORAGE_KEY
+				) {
+					// The transaction was found
+					Ok(())
+				} else {
+					// The transaction was not-found
+					Err(sp_runtime::DispatchError::Other(
+						"Failed to find Ethereum transaction among the extrinsics.",
+					))
 				}
-				Err(sp_runtime::DispatchError::Other(
-					"Failed to find Ethereum transaction among the extrinsics.",
-				))
 			}
 			#[cfg(not(feature = "evm-tracing"))]
 			Err(sp_runtime::DispatchError::Other(
@@ -598,7 +645,8 @@ sp_api::impl_runtime_apis! {
 
 		fn trace_block(
 			_extrinsics: Vec<<Block as sp_runtime::traits::Block>::Extrinsic>,
-			_known_transactions: Vec<sp_core::H256>,
+			_known_transactions: Vec<H256>,
+			_header: &<Block as sp_runtime::traits::Block>::Header,
 		) -> Result<
 			(),
 			sp_runtime::DispatchError,
@@ -606,11 +654,25 @@ sp_api::impl_runtime_apis! {
 			#[cfg(feature = "evm-tracing")]
 			{
 				use moonbeam_evm_tracer::tracer::EvmTracer;
-				use pallet_ethereum::Call::transact;
+				use frame_system::pallet_prelude::BlockNumberFor;
+				use xcm_primitives::EthereumXcmTracingStatus;
+
+				// Tell the CallDispatcher we are tracing a full Block.
+				frame_support::storage::unhashed::put::<EthereumXcmTracingStatus>(
+					xcm_primitives::ETHEREUM_XCM_TRACING_STORAGE_KEY,
+					&EthereumXcmTracingStatus::Block,
+				);
 
 				let mut config = <Runtime as pallet_evm::Config>::config().clone();
 				config.estimate = true;
 
+				// Initialize block: calls the "on_initialize" hook on every pallet
+				// in AllPalletsWithSystem.
+				// After pallet message queue was introduced, this must be done only after
+				// enabling XCM tracing by setting ETHEREUM_XCM_TRACING_STORAGE_KEY
+				// in the storage
+				Executive::initialize_block(_header);
+
 				// Apply all extrinsics. Ethereum extrinsics are traced.
 				for ext in _extrinsics.into_iter() {
 					match &ext.0.function {
@@ -629,6 +691,95 @@ sp_api::impl_runtime_apis! {
 					};
 				}
 
+				// Replay on_idle
+				// Some XCM messages with eth-xcm transaction might be executed at on_idle
+				replay_on_idle();
+
+				Ok(())
+			}
+			#[cfg(not(feature = "evm-tracing"))]
+			Err(sp_runtime::DispatchError::Other(
+				"Missing `evm-tracing` compile time feature flag.",
+			))
+		}
+
+		fn trace_call(
+			_header: &<Block as sp_runtime::traits::Block>::Header,
+			_from: H160,
+			_to: H160,
+			_data: Vec<u8>,
+			_value: U256,
+			_gas_limit: U256,
+			_max_fee_per_gas: Option<U256>,
+			_max_priority_fee_per_gas: Option<U256>,
+			_nonce: Option<U256>,
+			_access_list: Option<Vec<(H160, Vec<H256>)>>,
+		) -> Result<(), sp_runtime::DispatchError> {
+			#[cfg(feature = "evm-tracing")]
+			{
+				use moonbeam_evm_tracer::tracer::EvmTracer;
+
+				// Initialize block: calls the "on_initialize" hook on every pallet
+				// in AllPalletsWithSystem.
+				Executive::initialize_block(_header);
+
+				EvmTracer::new().trace(|| {
+					let is_transactional = false;
+					let validate = true;
+					let without_base_extrinsic_weight = true;
+
+
+					// Estimated encoded transaction size must be based on the heaviest transaction
+					// type (EIP1559Transaction) to be compatible with all transaction types.
+					let mut estimated_transaction_len = _data.len() +
+					// pallet ethereum index: 1
+					// transact call index: 1
+					// Transaction enum variant: 1
+					// chain_id 8 bytes
+					// nonce: 32
+					// max_priority_fee_per_gas: 32
+					// max_fee_per_gas: 32
+					// gas_limit: 32
+					// action: 21 (enum varianrt + call address)
+					// value: 32
+					// access_list: 1 (empty vec size)
+					// 65 bytes signature
+					258;
+
+					if _access_list.is_some() {
+						estimated_transaction_len += _access_list.encoded_size();
+					}
+
+					let gas_limit = _gas_limit.min(u64::MAX.into()).low_u64();
+
+					let (weight_limit, proof_size_base_cost) =
+						match <Runtime as pallet_evm::Config>::GasWeightMapping::gas_to_weight(
+							gas_limit,
+							without_base_extrinsic_weight
+						) {
+							weight_limit if weight_limit.proof_size() > 0 => {
+								(Some(weight_limit), Some(estimated_transaction_len as u64))
+							}
+							_ => (None, None),
+						};
+
+					let _ = <Runtime as pallet_evm::Config>::Runner::call(
+						_from,
+						_to,
+						_data,
+						_value,
+						gas_limit,
+						_max_fee_per_gas,
+						_max_priority_fee_per_gas,
+						_nonce,
+						_access_list.unwrap_or_default(),
+						_is_transactional,
+						validate,
+						weight_limit,
+						proof_size_base_cost,
+						<Runtime as pallet_evm::Config>::config(),
+					);
+				});
 				Ok(())
 			}
 			#[cfg(not(feature = "evm-tracing"))]
diff --git a/runtime/crab/src/pallets/account_migration.rs b/runtime/crab/src/pallets/account_migration.rs
index a13c1a789..a0892fd39 100644
--- a/runtime/crab/src/pallets/account_migration.rs
+++ b/runtime/crab/src/pallets/account_migration.rs
@@ -21,5 +21,6 @@ use crate::*;
 
 impl darwinia_account_migration::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
-	type WeightInfo = weights::darwinia_account_migration::WeightInfo<Self>;
+	// type WeightInfo = weights::darwinia_account_migration::WeightInfo<Self>;
+	type WeightInfo = ();
 }
diff --git a/runtime/crab/src/pallets/assets.rs b/runtime/crab/src/pallets/assets.rs
index 45b5494a8..4ef9e463b 100644
--- a/runtime/crab/src/pallets/assets.rs
+++ b/runtime/crab/src/pallets/assets.rs
@@ -40,17 +40,18 @@ impl pallet_assets::Config for Runtime {
 	type CreateOrigin = frame_support::traits::AsEnsureOriginWithArg<
 		frame_system::EnsureSignedBy<
 			frame_support::traits::IsInVec<pallet_config::AssetCreators>,
-			AccountId,
+			Self::AccountId,
 		>,
 	>;
 	type Currency = Balances;
 	type Extra = ();
-	type ForceOrigin = Root;
+	type ForceOrigin = RootOr<GeneralAdmin>;
 	type Freezer = ();
 	type MetadataDepositBase = ConstU128<0>;
 	type MetadataDepositPerByte = ConstU128<0>;
 	type RemoveItemsLimit = ConstU32<1_000>;
 	type RuntimeEvent = RuntimeEvent;
 	type StringLimit = ConstU32<50>;
-	type WeightInfo = weights::pallet_assets::WeightInfo<Self>;
+	// type WeightInfo = weights::pallet_assets::WeightInfo<Self>;
+	type WeightInfo = ();
 }
diff --git a/runtime/crab/src/pallets/balances.rs b/runtime/crab/src/pallets/balances.rs
index 35bfd308e..91274a7f0 100644
--- a/runtime/crab/src/pallets/balances.rs
+++ b/runtime/crab/src/pallets/balances.rs
@@ -32,5 +32,6 @@ impl pallet_balances::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type RuntimeFreezeReason = RuntimeFreezeReason;
 	type RuntimeHoldReason = RuntimeHoldReason;
-	type WeightInfo = weights::pallet_balances::WeightInfo<Self>;
+	// type WeightInfo = weights::pallet_balances::WeightInfo<Self>;
+	type WeightInfo = ();
 }
diff --git a/runtime/crab/src/pallets/deposit.rs b/runtime/crab/src/pallets/deposit.rs
index bdfdbd804..8aa69a5ee 100644
--- a/runtime/crab/src/pallets/deposit.rs
+++ b/runtime/crab/src/pallets/deposit.rs
@@ -49,5 +49,6 @@ impl darwinia_deposit::Config for Runtime {
 	type MinLockingAmount = ConstU128<UNIT>;
 	type Ring = Balances;
 	type RuntimeEvent = RuntimeEvent;
-	type WeightInfo = weights::darwinia_deposit::WeightInfo<Self>;
+	// type WeightInfo = weights::darwinia_deposit::WeightInfo<Self>;
+	type WeightInfo = ();
 }
diff --git a/runtime/crab/src/pallets/dmp_queue.rs b/runtime/crab/src/pallets/dmp_queue.rs
index a1464981b..0db751ffd 100644
--- a/runtime/crab/src/pallets/dmp_queue.rs
+++ b/runtime/crab/src/pallets/dmp_queue.rs
@@ -23,5 +23,6 @@ impl cumulus_pallet_dmp_queue::Config for Runtime {
 	type DmpSink =
 		frame_support::traits::EnqueueWithOrigin<MessageQueue, pallet_config::RelayOrigin>;
 	type RuntimeEvent = RuntimeEvent;
+	// type WeightInfo = ();
 	type WeightInfo = ();
 }
diff --git a/runtime/crab/src/pallets/evm.rs b/runtime/crab/src/pallets/evm.rs
index ca004b8b9..746be8573 100644
--- a/runtime/crab/src/pallets/evm.rs
+++ b/runtime/crab/src/pallets/evm.rs
@@ -27,7 +27,7 @@ use pallet_evm_precompile_dispatch::DispatchValidateT;
 
 const BLOCK_GAS_LIMIT: u64 = 20_000_000;
 frame_support::parameter_types! {
-	pub BlockGasLimit: sp_core::U256 = sp_core::U256::from(BLOCK_GAS_LIMIT);
+	pub BlockGasLimit: U256 = U256::from(BLOCK_GAS_LIMIT);
 	// Restrict the POV size of the Ethereum transactions in the same way as weight limit.
 	pub BlockPovSizeLimit: u64 = NORMAL_DISPATCH_RATIO * MAX_POV_SIZE as u64;
 	pub PrecompilesValue: CrabPrecompiles<Runtime> = CrabPrecompiles::<_>::new();
@@ -49,7 +49,7 @@ where
 		Self(Default::default())
 	}
 
-	pub fn used_addresses() -> [sp_core::H160; 16] {
+	pub fn used_addresses() -> [H160; 16] {
 		[
 			addr(0x01),
 			addr(0x02),
@@ -131,7 +131,7 @@ where
 		}
 	}
 
-	fn is_precompile(&self, address: sp_core::H160, _gas: u64) -> IsPrecompileResult {
+	fn is_precompile(&self, address: H160, _gas: u64) -> IsPrecompileResult {
 		IsPrecompileResult::Answer {
 			is_precompile: Self::used_addresses().contains(&address),
 			extra_cost: 0,
@@ -141,7 +141,7 @@ where
 
 pub struct TransactionPaymentGasPrice;
 impl pallet_evm::FeeCalculator for TransactionPaymentGasPrice {
-	fn min_gas_price() -> (sp_core::U256, frame_support::weights::Weight) {
+	fn min_gas_price() -> (U256, frame_support::weights::Weight) {
 		// substrate
 		use frame_support::weights::WeightToFee;
 		use sp_runtime::FixedPointNumber;
@@ -158,33 +158,6 @@ impl pallet_evm::FeeCalculator for TransactionPaymentGasPrice {
 	}
 }
 
-impl pallet_evm::Config for Runtime {
-	type AddressMapping = pallet_evm::IdentityAddressMapping;
-	type BlockGasLimit = BlockGasLimit;
-	type BlockHashMapping = pallet_ethereum::EthereumBlockHashMapping<Self>;
-	type CallOrigin = pallet_evm::EnsureAddressRoot<AccountId>;
-	type ChainId = ConstU64<44>;
-	type Currency = Balances;
-	type FeeCalculator = TransactionPaymentGasPrice;
-	type FindAuthor = FindAuthor<pallet_session::FindAccountFromAuthorIndex<Self, Aura>>;
-	type GasLimitPovSizeRatio = GasLimitPovSizeRatio;
-	type GasWeightMapping = pallet_evm::FixedGasWeightMapping<Self>;
-	type OnChargeTransaction = pallet_evm::EVMFungibleAdapter<Balances, ()>;
-	type OnCreate = ();
-	type PrecompilesType = CrabPrecompiles<Self>;
-	type PrecompilesValue = PrecompilesValue;
-	type Runner = pallet_evm::runner::stack::Runner<Self>;
-	type RuntimeEvent = RuntimeEvent;
-	type Timestamp = Timestamp;
-	type WeightInfo = ();
-	type WeightPerGas = WeightPerGas;
-	type WithdrawOrigin = pallet_evm::EnsureAddressNever<AccountId>;
-}
-
-fn addr(a: u64) -> sp_core::H160 {
-	sp_core::H160::from_low_u64_be(a)
-}
-
 /// Validation rule for dispatch precompile
 pub struct DarwiniaDispatchValidator;
 impl DispatchValidateT<AccountId, RuntimeCall> for DarwiniaDispatchValidator {
@@ -215,3 +188,32 @@ impl DispatchValidateT<AccountId, RuntimeCall> for DarwiniaDispatchValidator {
 		}
 	}
 }
+
+fn addr(a: u64) -> H160 {
+	H160::from_low_u64_be(a)
+}
+
+impl pallet_evm::Config for Runtime {
+	type AddressMapping = pallet_evm::IdentityAddressMapping;
+	type BlockGasLimit = BlockGasLimit;
+	type BlockHashMapping = pallet_ethereum::EthereumBlockHashMapping<Self>;
+	type CallOrigin = pallet_evm::EnsureAddressRoot<Self::AccountId>;
+	type ChainId = ConstU64<44>;
+	type Currency = Balances;
+	type FeeCalculator = TransactionPaymentGasPrice;
+	type FindAuthor = FindAuthor<pallet_session::FindAccountFromAuthorIndex<Self, Aura>>;
+	type GasLimitPovSizeRatio = GasLimitPovSizeRatio;
+	type GasWeightMapping = pallet_evm::FixedGasWeightMapping<Self>;
+	type OnChargeTransaction = pallet_evm::EVMFungibleAdapter<Balances, ()>;
+	type OnCreate = ();
+	type PrecompilesType = CrabPrecompiles<Self>;
+	type PrecompilesValue = PrecompilesValue;
+	type Runner = pallet_evm::runner::stack::Runner<Self>;
+	type RuntimeEvent = RuntimeEvent;
+	type SuicideQuickClearLimit = ();
+	type Timestamp = Timestamp;
+	// type WeightInfo = ();
+	type WeightInfo = ();
+	type WeightPerGas = WeightPerGas;
+	type WithdrawOrigin = pallet_evm::EnsureAddressNever<Self::AccountId>;
+}
diff --git a/runtime/crab/src/pallets/governance.rs b/runtime/crab/src/pallets/governance.rs
index 658e2b216..989819fa2 100644
--- a/runtime/crab/src/pallets/governance.rs
+++ b/runtime/crab/src/pallets/governance.rs
@@ -48,7 +48,8 @@ impl pallet_collective::Config<TechnicalCollective> for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type RuntimeOrigin = RuntimeOrigin;
 	type SetMembersOrigin = RootOr<GeneralAdmin>;
-	type WeightInfo = weights::pallet_collective::WeightInfo<Self>;
+	// type WeightInfo = weights::pallet_collective::WeightInfo<Self>;
+	type WeightInfo = ();
 }
 
 impl pallet_conviction_voting::Config for Runtime {
@@ -58,7 +59,8 @@ impl pallet_conviction_voting::Config for Runtime {
 	type Polls = Referenda;
 	type RuntimeEvent = RuntimeEvent;
 	type VoteLockingPeriod = ConstU32<{ DAYS }>;
-	type WeightInfo = weights::pallet_conviction_voting::WeightInfo<Self>;
+	// type WeightInfo = weights::pallet_conviction_voting::WeightInfo<Self>;
+	type WeightInfo = ();
 }
 
 pallet_referenda::impl_tracksinfo_get!(TracksInfo, Balance, BlockNumber);
@@ -75,12 +77,13 @@ impl pallet_referenda::Config for Runtime {
 	type Scheduler = Scheduler;
 	type Slash = Treasury;
 	type SubmissionDeposit = ConstU128<{ DARWINIA_PROPOSAL_REQUIREMENT }>;
-	type SubmitOrigin = frame_system::EnsureSigned<AccountId>;
+	type SubmitOrigin = frame_system::EnsureSigned<Self::AccountId>;
 	type Tally = pallet_conviction_voting::TallyOf<Self>;
 	type Tracks = TracksInfo;
 	type UndecidingTimeout = ConstU32<{ 14 * DAYS }>;
 	type Votes = pallet_conviction_voting::VotesOf<Self>;
-	type WeightInfo = weights::pallet_referenda::WeightInfo<Self>;
+	// type WeightInfo = weights::pallet_referenda::WeightInfo<Self>;
+	type WeightInfo = ();
 }
 
 impl custom_origins::Config for Runtime {}
@@ -92,7 +95,8 @@ impl pallet_whitelist::Config for Runtime {
 	type Preimages = Preimage;
 	type RuntimeCall = RuntimeCall;
 	type RuntimeEvent = RuntimeEvent;
-	type WeightInfo = weights::pallet_whitelist::WeightInfo<Self>;
+	// type WeightInfo = weights::pallet_whitelist::WeightInfo<Self>;
+	type WeightInfo = ();
 	type WhitelistOrigin = RootOrAtLeastFourFifth<TechnicalCollective>;
 }
 
@@ -102,12 +106,19 @@ frame_support::parameter_types! {
 
 impl pallet_treasury::Config for Runtime {
 	type ApproveOrigin = RootOr<GeneralAdmin>;
+	type AssetKind = ();
+	type BalanceConverter = frame_support::traits::tokens::UnityAssetBalanceConversion;
+	type Beneficiary = Self::AccountId;
+	type BeneficiaryLookup = Self::Lookup;
 	type Burn = ();
 	type BurnDestination = ();
 	type Currency = Balances;
 	type MaxApprovals = ConstU32<100>;
 	type OnSlash = Treasury;
 	type PalletId = pallet_config::TreasuryPid;
+	type Paymaster =
+		frame_support::traits::tokens::PayFromAccount<Balances, pallet_config::TreasuryAccount>;
+	type PayoutPeriod = ConstU32<{ 14 * DAYS }>;
 	type ProposalBond = ProposalBond;
 	type ProposalBondMaximum = ();
 	type ProposalBondMinimum = ConstU128<DARWINIA_PROPOSAL_REQUIREMENT>;
@@ -115,9 +126,10 @@ impl pallet_treasury::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type SpendFunds = ();
 	type SpendOrigin = EitherOf<
-		frame_system::EnsureRootWithSuccess<AccountId, pallet_config::MaxBalance>,
+		frame_system::EnsureRootWithSuccess<Self::AccountId, pallet_config::MaxBalance>,
 		Spender,
 	>;
 	type SpendPeriod = ConstU32<{ 14 * DAYS }>;
-	type WeightInfo = weights::pallet_treasury::WeightInfo<Self>;
+	// type WeightInfo = weights::pallet_treasury::WeightInfo<Self>;
+	type WeightInfo = ();
 }
diff --git a/runtime/crab/src/pallets/message_queue.rs b/runtime/crab/src/pallets/message_queue.rs
index 58643817f..f54e011fe 100644
--- a/runtime/crab/src/pallets/message_queue.rs
+++ b/runtime/crab/src/pallets/message_queue.rs
@@ -32,15 +32,16 @@ impl pallet_message_queue::Config for Runtime {
 	>;
 	#[cfg(not(feature = "runtime-benchmarks"))]
 	type MessageProcessor = xcm_builder::ProcessXcmMessage<
-		AggregateMessageOrigin,
+		cumulus_primitives_core::AggregateMessageOrigin,
 		xcm_executor::XcmExecutor<XcmExecutorConfig>,
 		RuntimeCall,
 	>;
 	// The XCMP queue pallet is only ever able to handle the `Sibling(ParaId)` origin:
-	type QueueChangeHandler = NarrowOriginToSibling<XcmpQueue>;
-	type QueuePausedQuery = NarrowOriginToSibling<XcmpQueue>;
+	type QueueChangeHandler = message_queue::NarrowOriginToSibling<XcmpQueue>;
+	type QueuePausedQuery = message_queue::NarrowOriginToSibling<XcmpQueue>;
 	type RuntimeEvent = RuntimeEvent;
 	type ServiceWeight = MessageQueueServiceWeight;
 	type Size = u32;
+	// type WeightInfo = ();
 	type WeightInfo = ();
 }
diff --git a/runtime/crab/src/pallets/parachain_system.rs b/runtime/crab/src/pallets/parachain_system.rs
index b5e9c97b9..340fdf352 100644
--- a/runtime/crab/src/pallets/parachain_system.rs
+++ b/runtime/crab/src/pallets/parachain_system.rs
@@ -34,5 +34,6 @@ impl cumulus_pallet_parachain_system::Config for Runtime {
 	type ReservedXcmpWeight = ReservedXcmpWeight;
 	type RuntimeEvent = RuntimeEvent;
 	type SelfParaId = parachain_info::Pallet<Self>;
+	type WeightInfo = ();
 	type XcmpMessageHandler = XcmpQueue;
 }
diff --git a/runtime/crab/src/pallets/polkadot_xcm.rs b/runtime/crab/src/pallets/polkadot_xcm.rs
index 6c65a6ecf..aeb848eef 100644
--- a/runtime/crab/src/pallets/polkadot_xcm.rs
+++ b/runtime/crab/src/pallets/polkadot_xcm.rs
@@ -18,10 +18,8 @@
 
 // darwinia
 use crate::*;
-// polkadot
+// polkadot-sdk
 use xcm::latest::prelude::*;
-// substrate
-use frame_support::traits::Currency;
 
 frame_support::parameter_types! {
 	pub const RelayNetwork: NetworkId = NetworkId::Kusama;
@@ -30,33 +28,28 @@ frame_support::parameter_types! {
 	/// A temporary weight value for each XCM instruction.
 	/// NOTE: This should be removed after we account for PoV weights.
 	pub const TempFixedXcmWeight: frame_support::weights::Weight = frame_support::weights::Weight::from_parts(1_000_000_000, 0);
-	pub AnchoringSelfReserve: Location = Location::new(
+	pub SelfReserve: Location = Location::new(
 		0,
-		Junctions::X1(PalletInstance(<Balances as frame_support::traits::PalletInfoAccess>::index() as u8))
+		[PalletInstance(<Balances as frame_support::traits::PalletInfoAccess>::index() as u8)]
 	);
 	pub UniversalLocation: InteriorLocation = Parachain(ParachainInfo::parachain_id().into()).into();
 	/// The amount of weight an XCM operation takes. This is a safe overestimate.
 	pub BaseXcmWeight: frame_support::weights::Weight = frame_support::weights::Weight::from_parts(1_000_000_000, 1024);
 	pub RelayChainOrigin: RuntimeOrigin = cumulus_pallet_xcm::Origin::Relay.into();
-	pub SelfReserve: Location = Location {
-		parents:0,
-		interior: [
-			PalletInstance(<Balances as PalletInfoAccess>::index() as u8)
-		].into()
-	};
 }
 
-/// Means for transacting assets on this chain.
-pub type LocalAssetTransactor = xcm_builder::CurrencyAdapter<
+/// The transactor for our own chain currency.
+pub type LocalAssetTransactor = xcm_builder::FungibleAdapter<
 	// Use this currency:
 	Balances,
-	// Use this currency when it is a fungible asset matching the given location or name:
-	xcm_builder::IsConcrete<AnchoringSelfReserve>,
-	// Do a simple punn to convert an AccountId32 Location into a native chain account ID:
+	// Use this currency when it is a fungible asset matching any of the locations in
+	// SelfReserveRepresentations
+	xcm_builder::IsConcrete<SelfReserve>,
+	// We can convert the MultiLocations with our converter above:
 	LocationToAccountId,
 	// Our chain's account ID type (we can't get away without mentioning it explicitly):
 	AccountId,
-	// We don't track any teleports.
+	// We dont allow teleport
 	(),
 >;
 /// Type for specifying how a `Location` can be converted into an `AccountId`. This is used
@@ -70,7 +63,7 @@ pub type LocationToAccountId = (
 	// Straight up local `AccountId20` origins just alias directly to `AccountId`.
 	xcm_builder::AccountKey20Aliases<RelayNetwork, AccountId>,
 	// The rest of locations are converted via hashing it.
-	darwinia_common_runtime::xcm_configs::Account20Hash<AccountId>,
+	xcm_configs::Account20Hash<AccountId>,
 );
 /// This is the type we use to convert an (incoming) XCM origin into a local `Origin` instance,
 /// ready for dispatching a transaction with Xcm's `Transact`. There is an `OriginKind` which can
@@ -104,11 +97,11 @@ pub type Barrier = xcm_builder::TrailingSetTopicAsId<
 					xcm_builder::AllowTopLevelPaidExecutionFrom<frame_support::traits::Everything>,
 					// Parent, its pluralities (i.e. governance bodies), and the Fellows plurality
 					// get free execution.
-					xcm_builder::AllowUnpaidExecutionFrom<
-						darwinia_common_runtime::xcm_configs::ParentOrParentsPlurality,
-					>,
+					xcm_builder::AllowUnpaidExecutionFrom<xcm_configs::ParentOrParentsPlurality>,
 					// Subscriptions for version tracking are OK.
-					xcm_builder::AllowSubscriptionsFrom<ParentRelayOrSiblingParachains>,
+					xcm_builder::AllowSubscriptionsFrom<
+						xcm_configs::ParentRelayOrSiblingParachains,
+					>,
 				),
 				UniversalLocation,
 				ConstU32<8>,
@@ -168,7 +161,7 @@ impl xcm_executor::Config for XcmExecutorConfig {
 }
 
 impl pallet_xcm::Config for Runtime {
-	type AdminOrigin = Root;
+	type AdminOrigin = RootOr<GeneralAdmin>;
 	// ^ Override for AdvertisedXcmVersion default
 	type AdvertisedXcmVersion = pallet_xcm::CurrentXcmVersion;
 	type Currency = Balances;
diff --git a/runtime/crab/src/pallets/preimage.rs b/runtime/crab/src/pallets/preimage.rs
index b23165866..9863af883 100644
--- a/runtime/crab/src/pallets/preimage.rs
+++ b/runtime/crab/src/pallets/preimage.rs
@@ -20,20 +20,25 @@
 use crate::*;
 
 frame_support::parameter_types! {
-	pub const PreimageBaseDeposit: Balance = deposit(2, 64);
-	pub const PreimageByteDeposit: Balance = deposit(0, 1);
+	pub const PreimageBaseDeposit: Balance = darwinia_deposit(2, 64);
+	pub const PreimageByteDeposit: Balance = darwinia_deposit(0, 1);
 	pub const PreimageHoldReason: RuntimeHoldReason = RuntimeHoldReason::Preimage(pallet_preimage::HoldReason::Preimage);
 }
 
 impl pallet_preimage::Config for Runtime {
-	type Consideration = HoldConsideration<
-		AccountId,
+	type Consideration = frame_support::traits::fungible::HoldConsideration<
+		Self::AccountId,
 		Balances,
 		PreimageHoldReason,
-		LinearStoragePrice<PreimageBaseDeposit, PreimageByteDeposit, Balance>,
+		frame_support::traits::LinearStoragePrice<
+			PreimageBaseDeposit,
+			PreimageByteDeposit,
+			Balance,
+		>,
 	>;
 	type Currency = Balances;
-	type ManagerOrigin = Root;
+	type ManagerOrigin = RootOr<GeneralAdmin>;
 	type RuntimeEvent = RuntimeEvent;
-	type WeightInfo = weights::pallet_preimage::WeightInfo<Self>;
+	// type WeightInfo = weights::pallet_preimage::WeightInfo<Self>;
+	type WeightInfo = ();
 }
diff --git a/runtime/crab/src/pallets/proxy.rs b/runtime/crab/src/pallets/proxy.rs
index 3dcc505a0..d062f943a 100644
--- a/runtime/crab/src/pallets/proxy.rs
+++ b/runtime/crab/src/pallets/proxy.rs
@@ -27,11 +27,11 @@ use crate::*;
 	PartialEq,
 	Ord,
 	PartialOrd,
-	codec::Encode,
-	codec::Decode,
-	codec::MaxEncodedLen,
-	scale_info::TypeInfo,
-	sp_runtime::RuntimeDebug,
+	Encode,
+	Decode,
+	MaxEncodedLen,
+	TypeInfo,
+	RuntimeDebug,
 )]
 pub enum ProxyType {
 	#[codec(index = 0)]
@@ -90,7 +90,6 @@ impl frame_support::traits::InstanceFilter<RuntimeCall> for ProxyType {
 			ProxyType::CancelProxy => {
 				matches!(c, RuntimeCall::Proxy(pallet_proxy::Call::reject_announcement { .. }))
 			},
-			_ => false,
 		}
 	}
 
@@ -119,5 +118,6 @@ impl pallet_proxy::Config for Runtime {
 	type ProxyType = ProxyType;
 	type RuntimeCall = RuntimeCall;
 	type RuntimeEvent = RuntimeEvent;
-	type WeightInfo = weights::pallet_proxy::WeightInfo<Self>;
+	// type WeightInfo = weights::pallet_proxy::WeightInfo<Self>;
+	type WeightInfo = ();
 }
diff --git a/runtime/crab/src/pallets/scheduler.rs b/runtime/crab/src/pallets/scheduler.rs
index 71196774e..30bbdd8e7 100644
--- a/runtime/crab/src/pallets/scheduler.rs
+++ b/runtime/crab/src/pallets/scheduler.rs
@@ -64,6 +64,7 @@ impl pallet_scheduler::Config for Runtime {
 	type RuntimeCall = RuntimeCall;
 	type RuntimeEvent = RuntimeEvent;
 	type RuntimeOrigin = RuntimeOrigin;
-	type ScheduleOrigin = Root;
-	type WeightInfo = weights::pallet_scheduler::WeightInfo<Self>;
+	type ScheduleOrigin = RootOr<GeneralAdmin>;
+	// type WeightInfo = weights::pallet_scheduler::WeightInfo<Self>;
+	type WeightInfo = ();
 }
diff --git a/runtime/crab/src/pallets/session.rs b/runtime/crab/src/pallets/session.rs
index 5f41c2898..5629b9c1f 100644
--- a/runtime/crab/src/pallets/session.rs
+++ b/runtime/crab/src/pallets/session.rs
@@ -38,8 +38,9 @@ impl pallet_session::Config for Runtime {
 	type SessionHandler = <SessionKeys as sp_runtime::traits::OpaqueKeys>::KeyTypeIdProviders;
 	type SessionManager = DarwiniaStaking;
 	type ShouldEndSession = pallet_session::PeriodicSessions<Period, Offset>;
-	type ValidatorId = <Self as frame_system::Config>::AccountId;
+	type ValidatorId = Self::AccountId;
 	// We don't have stash and controller, thus we don't need the convert as well.
 	type ValidatorIdOf = darwinia_staking::IdentityCollator;
-	type WeightInfo = weights::pallet_session::WeightInfo<Self>;
+	// type WeightInfo = weights::pallet_session::WeightInfo<Self>;
+	type WeightInfo = ();
 }
diff --git a/runtime/crab/src/pallets/staking.rs b/runtime/crab/src/pallets/staking.rs
index 76c51f47f..659636658 100644
--- a/runtime/crab/src/pallets/staking.rs
+++ b/runtime/crab/src/pallets/staking.rs
@@ -109,7 +109,8 @@ impl darwinia_staking::Config for Runtime {
 	type Ring = RingStaking;
 	type RuntimeEvent = RuntimeEvent;
 	type ShouldEndSession = ShouldEndSession;
-	type WeightInfo = weights::darwinia_staking::WeightInfo<Self>;
+	// type WeightInfo = weights::darwinia_staking::WeightInfo<Self>;
+	type WeightInfo = ();
 }
 #[cfg(not(feature = "runtime-benchmarks"))]
 impl darwinia_staking::DepositConfig for Runtime {}
diff --git a/runtime/crab/src/pallets/system.rs b/runtime/crab/src/pallets/system.rs
index ca4b69c8c..3be5a557f 100644
--- a/runtime/crab/src/pallets/system.rs
+++ b/runtime/crab/src/pallets/system.rs
@@ -18,6 +18,8 @@
 
 // darwinia
 use crate::*;
+// polkadot-sdk
+use frame_support::derive_impl;
 
 /// We assume that ~5% of the block weight is consumed by `on_initialize` handlers. This is
 /// used to limit the maximal weight of a single extrinsic.
@@ -59,49 +61,20 @@ frame_support::parameter_types! {
 		.build_or_panic();
 }
 
+#[derive_impl(frame_system::config_preludes::ParaChainDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Runtime {
-	/// The data to be stored in an account.
 	type AccountData = pallet_balances::AccountData<Balance>;
-	/// The identifier used to distinguish between accounts.
 	type AccountId = AccountId;
-	/// The basic call filter to use in dispatchable.
 	type BaseCallFilter = TxPause;
 	type Block = Block;
-	/// Maximum number of block number to block hash mappings to keep (oldest pruned first).
-	type BlockHashCount = ConstU32<256>;
-	/// The maximum length of a block (in bytes).
 	type BlockLength = RuntimeBlockLength;
-	/// Block & extrinsics weights: base values and limits.
 	type BlockWeights = RuntimeBlockWeights;
-	/// The weight of database operations that the runtime can invoke.
 	type DbWeight = frame_support::weights::constants::RocksDbWeight;
-	/// The type for hashing blocks and tries.
-	type Hash = Hash;
-	/// The hashing algorithm used.
-	type Hashing = Hashing;
-	/// The lookup mechanism to get account ID from whatever is passed in dispatchers.
-	type Lookup = sp_runtime::traits::IdentityLookup<AccountId>;
+	type Lookup = sp_runtime::traits::IdentityLookup<Self::AccountId>;
 	type MaxConsumers = ConstU32<16>;
-	/// The index type for storing how many extrinsics an account has signed.
-	type Nonce = Nonce;
-	/// What to do if an account is fully reaped from the system.
-	type OnKilledAccount = ();
-	/// What to do if a new account is created.
-	type OnNewAccount = ();
-	/// The action to take on a Runtime Upgrade
 	type OnSetCode = cumulus_pallet_parachain_system::ParachainSetCode<Self>;
-	/// Converts a module to an index of this module in the runtime.
-	type PalletInfo = PalletInfo;
-	/// The aggregated dispatch type that is available for extrinsics.
-	type RuntimeCall = RuntimeCall;
-	/// The ubiquitous event type.
-	type RuntimeEvent = RuntimeEvent;
-	/// The ubiquitous origin type.
-	type RuntimeOrigin = RuntimeOrigin;
-	/// This is used as an identifier of the chain. 42 is the generic substrate prefix.
 	type SS58Prefix = ConstU16<42>;
-	/// Weight information for the extrinsics of this pallet.
-	type SystemWeightInfo = weights::frame_system::WeightInfo<Self>;
-	/// Runtime version.
+	// type SystemWeightInfo = weights::frame_system::WeightInfo<Self>;
+	type SystemWeightInfo = ();
 	type Version = Version;
 }
diff --git a/runtime/crab/src/pallets/timestamp.rs b/runtime/crab/src/pallets/timestamp.rs
index d6f5fb3ed..06e83fa2f 100644
--- a/runtime/crab/src/pallets/timestamp.rs
+++ b/runtime/crab/src/pallets/timestamp.rs
@@ -27,5 +27,6 @@ impl pallet_timestamp::Config for Runtime {
 	type OnTimestampSet = Aura;
 	#[cfg(feature = "runtime-benchmarks")]
 	type OnTimestampSet = ();
-	type WeightInfo = weights::pallet_timestamp::WeightInfo<Self>;
+	// type WeightInfo = weights::pallet_timestamp::WeightInfo<Self>;
+	type WeightInfo = ();
 }
diff --git a/runtime/crab/src/pallets/tx_pause.rs b/runtime/crab/src/pallets/tx_pause.rs
index 3a7c19db4..357b945b8 100644
--- a/runtime/crab/src/pallets/tx_pause.rs
+++ b/runtime/crab/src/pallets/tx_pause.rs
@@ -55,6 +55,7 @@ impl pallet_tx_pause::Config for Runtime {
 	type RuntimeCall = RuntimeCall;
 	type RuntimeEvent = RuntimeEvent;
 	type UnpauseOrigin = RootOrAtLeastTwoThird<TechnicalCollective>;
-	type WeightInfo = weights::pallet_tx_pause::WeightInfo<Runtime>;
+	// type WeightInfo = weights::pallet_tx_pause::WeightInfo<Runtime>;
+	type WeightInfo = ();
 	type WhitelistedCalls = TxPauseWhitelistedCalls;
 }
diff --git a/runtime/crab/src/pallets/utility.rs b/runtime/crab/src/pallets/utility.rs
index 59c5759a2..bad2dcc75 100644
--- a/runtime/crab/src/pallets/utility.rs
+++ b/runtime/crab/src/pallets/utility.rs
@@ -23,5 +23,6 @@ impl pallet_utility::Config for Runtime {
 	type PalletsOrigin = OriginCaller;
 	type RuntimeCall = RuntimeCall;
 	type RuntimeEvent = RuntimeEvent;
-	type WeightInfo = weights::pallet_utility::WeightInfo<Self>;
+	// type WeightInfo = weights::pallet_utility::WeightInfo<Self>;
+	type WeightInfo = ();
 }
diff --git a/runtime/crab/src/pallets/xcmp_queue.rs b/runtime/crab/src/pallets/xcmp_queue.rs
index 4265d43fb..fe37db174 100644
--- a/runtime/crab/src/pallets/xcmp_queue.rs
+++ b/runtime/crab/src/pallets/xcmp_queue.rs
@@ -21,7 +21,7 @@ use crate::*;
 
 impl cumulus_pallet_xcmp_queue::Config for Runtime {
 	type ChannelInfo = ParachainSystem;
-	type ControllerOrigin = Root;
+	type ControllerOrigin = RootOr<GeneralAdmin>;
 	type ControllerOriginConverter = XcmOriginToTransactDispatchOrigin;
 	type MaxInboundSuspended = sp_core::ConstU32<1_000>;
 	type PriceForSiblingDelivery = polkadot_runtime_common::xcm_sender::NoPriceForMessageDelivery<
@@ -29,12 +29,13 @@ impl cumulus_pallet_xcmp_queue::Config for Runtime {
 	>;
 	type RuntimeEvent = RuntimeEvent;
 	type VersionWrapper = ();
-	type WeightInfo = weights::cumulus_pallet_xcmp_queue::WeightInfo<Self>;
+	// type WeightInfo = weights::cumulus_pallet_xcmp_queue::WeightInfo<Self>;
+	type WeightInfo = ();
 	// Enqueue XCMP messages from siblings for later processing.
 	type XcmpQueue = frame_support::traits::TransformOrigin<
 		MessageQueue,
-		AggregateMessageOrigin,
-		ParaId,
-		ParaIdToSibling,
+		cumulus_primitives_core::AggregateMessageOrigin,
+		cumulus_primitives_core::ParaId,
+		message_queue::ParaIdToSibling,
 	>;
 }
diff --git a/runtime/darwinia/src/lib.rs b/runtime/darwinia/src/lib.rs
index a26d684e4..0eff5c00c 100644
--- a/runtime/darwinia/src/lib.rs
+++ b/runtime/darwinia/src/lib.rs
@@ -28,12 +28,18 @@ mod pallets;
 pub use pallets::*;
 
 mod migration;
-pub mod weights;
+
+// pub mod weights;
 
 pub use darwinia_common_runtime::*;
 pub use dc_primitives::*;
 
-// substrate
+// crates.io
+use codec::{Decode, Encode, MaxEncodedLen};
+use scale_info::TypeInfo;
+// polkadot-sdk
+use sp_core::{H160, H256, U256};
+use sp_runtime::RuntimeDebug;
 use sp_std::prelude::*;
 
 /// Block type as expected by this runtime.
@@ -329,11 +335,11 @@ sp_api::impl_runtime_apis! {
 
 	impl sp_genesis_builder::GenesisBuilder<Block> for Runtime {
 		fn create_default_config() -> Vec<u8> {
-			sp_genesis_builder::create_default_config::<RuntimeGenesisConfig>()
+			frame_support::genesis_builder_helper::create_default_config::<RuntimeGenesisConfig>()
 		}
 
 		fn build_config(config: Vec<u8>) -> sp_genesis_builder::Result {
-			sp_genesis_builder::build_config::<RuntimeGenesisConfig>(config)
+			frame_support::genesis_builder_helper::build_config::<RuntimeGenesisConfig>(config)
 		}
 	}
 
@@ -348,13 +354,13 @@ sp_api::impl_runtime_apis! {
 			<<Runtime as pallet_evm::Config>::ChainId as sp_core::Get<u64>>::get()
 		}
 
-		fn account_basic(address: sp_core::H160) -> pallet_evm::Account {
+		fn account_basic(address: H160) -> pallet_evm::Account {
 			let (account, _) = EVM::account_basic(&address);
 
 			account
 		}
 
-		fn gas_price() -> sp_core::U256 {
+		fn gas_price() -> U256 {
 			// frontier
 			use pallet_evm::FeeCalculator;
 
@@ -363,33 +369,33 @@ sp_api::impl_runtime_apis! {
 			gas_price
 		}
 
-		fn account_code_at(address: sp_core::H160) -> Vec<u8> {
+		fn account_code_at(address: H160) -> Vec<u8> {
 			pallet_evm::AccountCodes::<Runtime>::get(address)
 		}
 
-		fn author() -> sp_core::H160 {
+		fn author() -> H160 {
 			<pallet_evm::Pallet<Runtime>>::find_author()
 		}
 
-		fn storage_at(address: sp_core::H160, index: sp_core::U256) -> sp_core::H256 {
+		fn storage_at(address: H160, index: U256) -> H256 {
 			let mut tmp = [0u8; 32];
 
 			index.to_big_endian(&mut tmp);
 
-			pallet_evm::AccountStorages::<Runtime>::get(address, sp_core::H256::from_slice(&tmp[..]))
+			pallet_evm::AccountStorages::<Runtime>::get(address, H256::from_slice(&tmp[..]))
 		}
 
 		fn call(
-			from: sp_core::H160,
-			to: sp_core::H160,
+			from: H160,
+			to: H160,
 			data: Vec<u8>,
-			value: sp_core::U256,
-			gas_limit: sp_core::U256,
-			max_fee_per_gas: Option<sp_core::U256>,
-			max_priority_fee_per_gas: Option<sp_core::U256>,
-			nonce: Option<sp_core::U256>,
+			value: U256,
+			gas_limit: U256,
+			max_fee_per_gas: Option<U256>,
+			max_priority_fee_per_gas: Option<U256>,
+			nonce: Option<U256>,
 			estimate: bool,
-			access_list: Option<Vec<(sp_core::H160, Vec<sp_core::H256>)>>,
+			access_list: Option<Vec<(H160, Vec<H256>)>>,
 		) -> Result<pallet_evm::CallInfo, sp_runtime::DispatchError> {
 			// frontier
 			use pallet_evm::Runner;
@@ -439,15 +445,15 @@ sp_api::impl_runtime_apis! {
 		}
 
 		fn create(
-			from: sp_core::H160,
+			from: H160,
 			data: Vec<u8>,
-			value: sp_core::U256,
-			gas_limit: sp_core::U256,
-			max_fee_per_gas: Option<sp_core::U256>,
-			max_priority_fee_per_gas: Option<sp_core::U256>,
-			nonce: Option<sp_core::U256>,
+			value: U256,
+			gas_limit: U256,
+			max_fee_per_gas: Option<U256>,
+			max_priority_fee_per_gas: Option<U256>,
+			nonce: Option<U256>,
 			estimate: bool,
-			access_list: Option<Vec<(sp_core::H160, Vec<sp_core::H256>)>>,
+			access_list: Option<Vec<(H160, Vec<H256>)>>,
 		) -> Result<pallet_evm::CreateInfo, sp_runtime::DispatchError> {
 			// frontier
 			use pallet_evm::Runner;
@@ -568,6 +574,7 @@ sp_api::impl_runtime_apis! {
 		fn trace_transaction(
 			_extrinsics: Vec<<Block as sp_runtime::traits::Block>::Extrinsic>,
 			_traced_transaction: &pallet_ethereum::Transaction,
+			_header: &<Block as sp_runtime::traits::Block>::Header,
 		) -> Result<
 			(),
 			sp_runtime::DispatchError,
@@ -575,7 +582,25 @@ sp_api::impl_runtime_apis! {
 			#[cfg(feature = "evm-tracing")]
 			{
 				use moonbeam_evm_tracer::tracer::EvmTracer;
-				use pallet_ethereum::Call::transact;
+				use xcm_primitives::{
+					ETHEREUM_XCM_TRACING_STORAGE_KEY,
+					EthereumXcmTracingStatus
+				};
+				use frame_support::storage::unhashed;
+				use frame_system::pallet_prelude::BlockNumberFor;
+
+				// Tell the CallDispatcher we are tracing a specific Transaction.
+				unhashed::put::<EthereumXcmTracingStatus>(
+					ETHEREUM_XCM_TRACING_STORAGE_KEY,
+					&EthereumXcmTracingStatus::Transaction(traced_transaction.hash()),
+				);
+
+				// Initialize block: calls the "on_initialize" hook on every pallet
+				// in AllPalletsWithSystem.
+				// After pallet message queue was introduced, this must be done only after
+				// enabling XCM tracing by setting ETHEREUM_XCM_TRACING_STORAGE_KEY
+				// in the storage
+				Executive::initialize_block(_header);
 
 				// Apply the a subset of extrinsics: all the substrate-specific or ethereum
 				// transactions that preceded the requested transaction.
@@ -591,10 +616,32 @@ sp_api::impl_runtime_apis! {
 						}
 						_ => Executive::apply_extrinsic(ext),
 					};
+					if let Some(EthereumXcmTracingStatus::TransactionExited) = unhashed::get(
+						ETHEREUM_XCM_TRACING_STORAGE_KEY
+					) {
+						return Ok(());
+					}
+				}
+
+				if let Some(EthereumXcmTracingStatus::Transaction(_)) = unhashed::get(
+					ETHEREUM_XCM_TRACING_STORAGE_KEY
+				) {
+					// If the transaction was not found, it might be
+					// an eth-xcm transaction that was executed at on_idle
+					replay_on_idle();
+				}
+
+				if let Some(EthereumXcmTracingStatus::TransactionExited) = unhashed::get(
+					ETHEREUM_XCM_TRACING_STORAGE_KEY
+				) {
+					// The transaction was found
+					Ok(())
+				} else {
+					// The transaction was not-found
+					Err(sp_runtime::DispatchError::Other(
+						"Failed to find Ethereum transaction among the extrinsics.",
+					))
 				}
-				Err(sp_runtime::DispatchError::Other(
-					"Failed to find Ethereum transaction among the extrinsics.",
-				))
 			}
 			#[cfg(not(feature = "evm-tracing"))]
 			Err(sp_runtime::DispatchError::Other(
@@ -604,7 +651,8 @@ sp_api::impl_runtime_apis! {
 
 		fn trace_block(
 			_extrinsics: Vec<<Block as sp_runtime::traits::Block>::Extrinsic>,
-			_known_transactions: Vec<sp_core::H256>,
+			_known_transactions: Vec<H256>,
+			_header: &<Block as sp_runtime::traits::Block>::Header,
 		) -> Result<
 			(),
 			sp_runtime::DispatchError,
@@ -612,11 +660,25 @@ sp_api::impl_runtime_apis! {
 			#[cfg(feature = "evm-tracing")]
 			{
 				use moonbeam_evm_tracer::tracer::EvmTracer;
-				use pallet_ethereum::Call::transact;
+				use frame_system::pallet_prelude::BlockNumberFor;
+				use xcm_primitives::EthereumXcmTracingStatus;
+
+				// Tell the CallDispatcher we are tracing a full Block.
+				frame_support::storage::unhashed::put::<EthereumXcmTracingStatus>(
+					xcm_primitives::ETHEREUM_XCM_TRACING_STORAGE_KEY,
+					&EthereumXcmTracingStatus::Block,
+				);
 
 				let mut config = <Runtime as pallet_evm::Config>::config().clone();
 				config.estimate = true;
 
+				// Initialize block: calls the "on_initialize" hook on every pallet
+				// in AllPalletsWithSystem.
+				// After pallet message queue was introduced, this must be done only after
+				// enabling XCM tracing by setting ETHEREUM_XCM_TRACING_STORAGE_KEY
+				// in the storage
+				Executive::initialize_block(_header);
+
 				// Apply all extrinsics. Ethereum extrinsics are traced.
 				for ext in _extrinsics.into_iter() {
 					match &ext.0.function {
@@ -635,6 +697,95 @@ sp_api::impl_runtime_apis! {
 					};
 				}
 
+				// Replay on_idle
+				// Some XCM messages with eth-xcm transaction might be executed at on_idle
+				replay_on_idle();
+
+				Ok(())
+			}
+			#[cfg(not(feature = "evm-tracing"))]
+			Err(sp_runtime::DispatchError::Other(
+				"Missing `evm-tracing` compile time feature flag.",
+			))
+		}
+
+		fn trace_call(
+			_header: &<Block as sp_runtime::traits::Block>::Header,
+			_from: H160,
+			_to: H160,
+			_data: Vec<u8>,
+			_value: U256,
+			_gas_limit: U256,
+			_max_fee_per_gas: Option<U256>,
+			_max_priority_fee_per_gas: Option<U256>,
+			_nonce: Option<U256>,
+			_access_list: Option<Vec<(H160, Vec<H256>)>>,
+		) -> Result<(), sp_runtime::DispatchError> {
+			#[cfg(feature = "evm-tracing")]
+			{
+				use moonbeam_evm_tracer::tracer::EvmTracer;
+
+				// Initialize block: calls the "on_initialize" hook on every pallet
+				// in AllPalletsWithSystem.
+				Executive::initialize_block(_header);
+
+				EvmTracer::new().trace(|| {
+					let is_transactional = false;
+					let validate = true;
+					let without_base_extrinsic_weight = true;
+
+
+					// Estimated encoded transaction size must be based on the heaviest transaction
+					// type (EIP1559Transaction) to be compatible with all transaction types.
+					let mut estimated_transaction_len = _data.len() +
+					// pallet ethereum index: 1
+					// transact call index: 1
+					// Transaction enum variant: 1
+					// chain_id 8 bytes
+					// nonce: 32
+					// max_priority_fee_per_gas: 32
+					// max_fee_per_gas: 32
+					// gas_limit: 32
+					// action: 21 (enum varianrt + call address)
+					// value: 32
+					// access_list: 1 (empty vec size)
+					// 65 bytes signature
+					258;
+
+					if _access_list.is_some() {
+						estimated_transaction_len += _access_list.encoded_size();
+					}
+
+					let gas_limit = _gas_limit.min(u64::MAX.into()).low_u64();
+
+					let (weight_limit, proof_size_base_cost) =
+						match <Runtime as pallet_evm::Config>::GasWeightMapping::gas_to_weight(
+							gas_limit,
+							without_base_extrinsic_weight
+						) {
+							weight_limit if weight_limit.proof_size() > 0 => {
+								(Some(weight_limit), Some(estimated_transaction_len as u64))
+							}
+							_ => (None, None),
+						};
+
+					let _ = <Runtime as pallet_evm::Config>::Runner::call(
+						_from,
+						_to,
+						_data,
+						_value,
+						gas_limit,
+						_max_fee_per_gas,
+						_max_priority_fee_per_gas,
+						_nonce,
+						_access_list.unwrap_or_default(),
+						_is_transactional,
+						validate,
+						weight_limit,
+						proof_size_base_cost,
+						<Runtime as pallet_evm::Config>::config(),
+					);
+				});
 				Ok(())
 			}
 			#[cfg(not(feature = "evm-tracing"))]
diff --git a/runtime/darwinia/src/pallets.rs b/runtime/darwinia/src/pallets.rs
index afc5931dd..043ba2b05 100644
--- a/runtime/darwinia/src/pallets.rs
+++ b/runtime/darwinia/src/pallets.rs
@@ -88,8 +88,10 @@ mod dmp_queue;
 mod message_queue;
 
 mod asset_manager;
+pub use asset_manager::*;
 
 mod orml_xtokens;
+pub use orml_xtokens::*;
 
 mod asset_limit;
 
diff --git a/runtime/darwinia/src/pallets/account_migration.rs b/runtime/darwinia/src/pallets/account_migration.rs
index a13c1a789..a0892fd39 100644
--- a/runtime/darwinia/src/pallets/account_migration.rs
+++ b/runtime/darwinia/src/pallets/account_migration.rs
@@ -21,5 +21,6 @@ use crate::*;
 
 impl darwinia_account_migration::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
-	type WeightInfo = weights::darwinia_account_migration::WeightInfo<Self>;
+	// type WeightInfo = weights::darwinia_account_migration::WeightInfo<Self>;
+	type WeightInfo = ();
 }
diff --git a/runtime/darwinia/src/pallets/asset_manager.rs b/runtime/darwinia/src/pallets/asset_manager.rs
index 09233ee36..bd11c9749 100644
--- a/runtime/darwinia/src/pallets/asset_manager.rs
+++ b/runtime/darwinia/src/pallets/asset_manager.rs
@@ -16,20 +16,33 @@
 // You should have received a copy of the GNU General Public License
 // along with Darwinia. If not, see <https://www.gnu.org/licenses/>.
 
-// crates.io
-use codec::{Decode, Encode};
 // darwinia
-use crate::*;
-// polkadot
+use crate::{AssetId, Assets, *};
+// polkadot-sdk
 use xcm::prelude::*;
 
+frame_support::parameter_types! {
+	/// 1000 is AssetHub paraId.
+	/// 50 is pallet-assets index on AssetHub.
+	/// 1984 is the id of USDT on AssetHub(Polkadot).
+	pub UsdtLocation: xcm::v3::Location = xcm::v3::Location::new(
+		1,
+		xcm::v3::prelude::X3(xcm::v3::prelude::Parachain(1000), xcm::v3::prelude::PalletInstance(50), xcm::v3::prelude::GeneralIndex(1984))
+	);
+	/// 23 is the id of PINK on AssetHub(Polkadot).
+	pub PinkLocation: xcm::v3::Location = xcm::v3::Location::new(
+		1,
+		xcm::v3::prelude::X3(xcm::v3::prelude::Parachain(1000), xcm::v3::prelude::PalletInstance(50), xcm::v3::prelude::GeneralIndex(23))
+	);
+}
+
 // We instruct how to register the Assets
 // In this case, we tell it to create an Asset in pallet-assets
 pub struct AssetRegistrar;
 impl pallet_asset_manager::AssetRegistrar<Runtime> for AssetRegistrar {
 	#[frame_support::transactional]
 	fn create_foreign_asset(
-		asset: crate::AssetId,
+		asset: AssetId,
 		min_balance: Balance,
 		metadata: xcm_configs::AssetRegistrarMetadata,
 		is_sufficient: bool,
@@ -54,13 +67,14 @@ impl pallet_asset_manager::AssetRegistrar<Runtime> for AssetRegistrar {
 	}
 
 	#[frame_support::transactional]
-	fn destroy_foreign_asset(asset: crate::AssetId) -> sp_runtime::DispatchResult {
+	fn destroy_foreign_asset(asset: AssetId) -> sp_runtime::DispatchResult {
 		// Mark the asset as destroying
 		Assets::start_destroy(RuntimeOrigin::root(), asset.into())?;
+		
 		Ok(())
 	}
 
-	fn destroy_asset_dispatch_info_weight(asset: crate::AssetId) -> frame_support::weights::Weight {
+	fn destroy_asset_dispatch_info_weight(asset: AssetId) -> frame_support::weights::Weight {
 		// substrate
 		use frame_support::dispatch::GetDispatchInfo;
 
@@ -75,26 +89,18 @@ impl pallet_asset_manager::AssetRegistrar<Runtime> for AssetRegistrar {
 	}
 }
 
-pub struct LocalAssetIdCreator;
-impl pallet_asset_manager::LocalAssetIdCreator<Runtime> for LocalAssetIdCreator {
-	fn create_asset_id_from_metadata(_local_asset_counter: u128) -> crate::AssetId {
-		// We don't need to create local asset.
-		0
-	}
-}
-
 // Our AssetType. For now we only handle Xcm Assets
-#[derive(Clone, Eq, Debug, PartialEq, Ord, PartialOrd, Encode, Decode, scale_info::TypeInfo)]
+#[derive(Clone, Eq, Debug, PartialEq, Ord, PartialOrd, Encode, Decode, TypeInfo)]
 pub enum AssetType {
-	Xcm(Location),
+	Xcm(xcm::v3::Location),
 }
 impl Default for AssetType {
 	fn default() -> Self {
-		Self::Xcm(Location::here())
+		Self::Xcm(xcm::v3::Location::here())
 	}
 }
-impl From<Location> for AssetType {
-	fn from(location: Location) -> Self {
+impl From<xcm::v3::Location> for AssetType {
+	fn from(location: xcm::v3::Location) -> Self {
 		Self::Xcm(location)
 	}
 }
@@ -102,57 +108,48 @@ impl From<Location> for AssetType {
 // We simply hash the `AssetType` and take the lowest 128 bits.
 impl From<AssetType> for crate::AssetId {
 	fn from(asset: AssetType) -> crate::AssetId {
+		use sp_runtime::traits::Hash;
+
 		match asset {
-			AssetType::Xcm(id) if id == UsdtLocation::get() => 1027,
-			AssetType::Xcm(id) if id == PinkLocation::get() => 1028,
-			AssetType::Xcm(id) => {
-				use sp_runtime::traits::Hash;
+			AssetType::Xcm(id) =>
+				if id == UsdtLocation::get() {
+					1027
+				} else {
+					let mut result: [u8; 8] = [0_u8; 8];
+					let hash: sp_core::H256 = id.using_encoded(dc_primitives::Hashing::hash);
 
-				let mut result: [u8; 8] = [0_u8; 8];
-				let hash: sp_core::H256 = id.using_encoded(dc_primitives::Hashing::hash);
-				result.copy_from_slice(&hash.as_fixed_bytes()[0..8]);
+					result.copy_from_slice(&hash.as_fixed_bytes()[0..8]);
 
-				u64::from_le_bytes(result)
-			},
+					u64::from_le_bytes(result)
+				},
 		}
 	}
 }
 #[allow(clippy::from_over_into)]
-impl Into<Option<Location>> for AssetType {
-	fn into(self) -> Option<Location> {
+impl Into<Option<xcm::v3::Location>> for AssetType {
+	fn into(self) -> Option<xcm::v3::Location> {
 		match self {
 			Self::Xcm(location) => Some(location),
 		}
 	}
 }
+// This can be removed once we fully adopt xcm::v4 everywhere
+impl TryFrom<Location> for AssetType {
+	type Error = ();
 
-frame_support::parameter_types! {
-	/// 1000 is AssetHub paraId.
-	/// 50 is pallet-assets index on AssetHub.
-	/// 1984 is the id of USDT on AssetHub(Polkadot).
-	pub UsdtLocation: Location = Location::new(
-		1,
-		X3(Parachain(1000), PalletInstance(50), GeneralIndex(1984))
-	);
-
-	/// 23 is the id of PINK on AssetHub(Polkadot).
-	pub PinkLocation: Location = Location::new(
-		1,
-		X3(Parachain(1000), PalletInstance(50), GeneralIndex(23))
-	);
+	fn try_from(location: Location) -> Result<Self, Self::Error> {
+		Ok(Self::Xcm(location.try_into()?))
+	}
 }
 
 impl pallet_asset_manager::Config for Runtime {
-	type AssetId = crate::AssetId;
+	type AssetId = AssetId;
 	type AssetRegistrar = AssetRegistrar;
 	type AssetRegistrarMetadata = xcm_configs::AssetRegistrarMetadata;
 	type Balance = Balance;
-	type Currency = Balances;
-	type ForeignAssetModifierOrigin = Root;
+	type ForeignAssetModifierOrigin = RootOr<GeneralAdmin>;
 	type ForeignAssetType = AssetType;
-	type LocalAssetDeposit = ConstU128<0>;
-	type LocalAssetIdCreator = LocalAssetIdCreator;
-	type LocalAssetModifierOrigin = frame_system::EnsureNever<AccountId>;
 	type RuntimeEvent = RuntimeEvent;
-	type WeightInfo = pallet_asset_manager::weights::SubstrateWeight<Runtime>;
+	// type WeightInfo = pallet_asset_manager::weights::SubstrateWeight<Runtime>;
+	type WeightInfo = ();
 }
diff --git a/runtime/darwinia/src/pallets/assets.rs b/runtime/darwinia/src/pallets/assets.rs
index ee68ffdec..e2633f3a7 100644
--- a/runtime/darwinia/src/pallets/assets.rs
+++ b/runtime/darwinia/src/pallets/assets.rs
@@ -40,17 +40,18 @@ impl pallet_assets::Config for Runtime {
 	type CreateOrigin = frame_support::traits::AsEnsureOriginWithArg<
 		frame_system::EnsureSignedBy<
 			frame_support::traits::IsInVec<pallet_config::AssetCreators>,
-			AccountId,
+			Self::AccountId,
 		>,
 	>;
 	type Currency = Balances;
 	type Extra = ();
-	type ForceOrigin = Root;
+	type ForceOrigin = RootOr<GeneralAdmin>;
 	type Freezer = ();
 	type MetadataDepositBase = ConstU128<0>;
 	type MetadataDepositPerByte = ConstU128<0>;
 	type RemoveItemsLimit = ConstU32<1000>;
 	type RuntimeEvent = RuntimeEvent;
 	type StringLimit = ConstU32<50>;
-	type WeightInfo = weights::pallet_assets::WeightInfo<Self>;
+	// type WeightInfo = weights::pallet_assets::WeightInfo<Self>;
+	type WeightInfo = ();
 }
diff --git a/runtime/darwinia/src/pallets/balances.rs b/runtime/darwinia/src/pallets/balances.rs
index 35bfd308e..91274a7f0 100644
--- a/runtime/darwinia/src/pallets/balances.rs
+++ b/runtime/darwinia/src/pallets/balances.rs
@@ -32,5 +32,6 @@ impl pallet_balances::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type RuntimeFreezeReason = RuntimeFreezeReason;
 	type RuntimeHoldReason = RuntimeHoldReason;
-	type WeightInfo = weights::pallet_balances::WeightInfo<Self>;
+	// type WeightInfo = weights::pallet_balances::WeightInfo<Self>;
+	type WeightInfo = ();
 }
diff --git a/runtime/darwinia/src/pallets/deposit.rs b/runtime/darwinia/src/pallets/deposit.rs
index a4f6a672a..bcab9b52a 100644
--- a/runtime/darwinia/src/pallets/deposit.rs
+++ b/runtime/darwinia/src/pallets/deposit.rs
@@ -49,5 +49,6 @@ impl darwinia_deposit::Config for Runtime {
 	type MinLockingAmount = ConstU128<UNIT>;
 	type Ring = Balances;
 	type RuntimeEvent = RuntimeEvent;
-	type WeightInfo = weights::darwinia_deposit::WeightInfo<Self>;
+	// type WeightInfo = weights::darwinia_deposit::WeightInfo<Self>;
+	type WeightInfo = ();
 }
diff --git a/runtime/darwinia/src/pallets/dmp_queue.rs b/runtime/darwinia/src/pallets/dmp_queue.rs
index a1464981b..0db751ffd 100644
--- a/runtime/darwinia/src/pallets/dmp_queue.rs
+++ b/runtime/darwinia/src/pallets/dmp_queue.rs
@@ -23,5 +23,6 @@ impl cumulus_pallet_dmp_queue::Config for Runtime {
 	type DmpSink =
 		frame_support::traits::EnqueueWithOrigin<MessageQueue, pallet_config::RelayOrigin>;
 	type RuntimeEvent = RuntimeEvent;
+	// type WeightInfo = ();
 	type WeightInfo = ();
 }
diff --git a/runtime/darwinia/src/pallets/ethereum_xcm.rs b/runtime/darwinia/src/pallets/ethereum_xcm.rs
index e45bf754f..07454a732 100644
--- a/runtime/darwinia/src/pallets/ethereum_xcm.rs
+++ b/runtime/darwinia/src/pallets/ethereum_xcm.rs
@@ -27,7 +27,7 @@ impl xcm_primitives::EnsureProxy<AccountId> for EthereumXcmEnsureProxy {
 }
 
 impl pallet_ethereum_xcm::Config for Runtime {
-	type ControllerOrigin = Root;
+	type ControllerOrigin = RootOr<GeneralAdmin>;
 	type EnsureProxy = EthereumXcmEnsureProxy;
 	type InvalidEvmTransactionError = pallet_ethereum::InvalidTransactionWrapper;
 	type ReservedXcmpWeight =
diff --git a/runtime/darwinia/src/pallets/evm.rs b/runtime/darwinia/src/pallets/evm.rs
index 9cb6bf997..f162df632 100644
--- a/runtime/darwinia/src/pallets/evm.rs
+++ b/runtime/darwinia/src/pallets/evm.rs
@@ -27,7 +27,7 @@ use pallet_evm_precompile_dispatch::DispatchValidateT;
 
 const BLOCK_GAS_LIMIT: u64 = 20_000_000;
 frame_support::parameter_types! {
-	pub BlockGasLimit: sp_core::U256 = sp_core::U256::from(BLOCK_GAS_LIMIT);
+	pub BlockGasLimit: U256 = U256::from(BLOCK_GAS_LIMIT);
 	// Restrict the POV size of the Ethereum transactions in the same way as weight limit.
 	pub BlockPovSizeLimit: u64 = NORMAL_DISPATCH_RATIO * MAX_POV_SIZE as u64;
 	pub PrecompilesValue: DarwiniaPrecompiles<Runtime> = DarwiniaPrecompiles::<_>::new();
@@ -48,7 +48,7 @@ where
 		Self(Default::default())
 	}
 
-	pub fn used_addresses() -> [sp_core::H160; 18] {
+	pub fn used_addresses() -> [H160; 18] {
 		[
 			addr(0x01),
 			addr(0x02),
@@ -132,7 +132,7 @@ where
 		}
 	}
 
-	fn is_precompile(&self, address: sp_core::H160, _gas: u64) -> IsPrecompileResult {
+	fn is_precompile(&self, address: H160, _gas: u64) -> IsPrecompileResult {
 		IsPrecompileResult::Answer {
 			is_precompile: Self::used_addresses().contains(&address),
 			extra_cost: 0,
@@ -142,7 +142,7 @@ where
 
 pub struct TransactionPaymentGasPrice;
 impl pallet_evm::FeeCalculator for TransactionPaymentGasPrice {
-	fn min_gas_price() -> (sp_core::U256, frame_support::weights::Weight) {
+	fn min_gas_price() -> (U256, frame_support::weights::Weight) {
 		// substrate
 		use frame_support::weights::WeightToFee;
 		use sp_runtime::FixedPointNumber;
@@ -159,33 +159,6 @@ impl pallet_evm::FeeCalculator for TransactionPaymentGasPrice {
 	}
 }
 
-impl pallet_evm::Config for Runtime {
-	type AddressMapping = pallet_evm::IdentityAddressMapping;
-	type BlockGasLimit = BlockGasLimit;
-	type BlockHashMapping = pallet_ethereum::EthereumBlockHashMapping<Self>;
-	type CallOrigin = pallet_evm::EnsureAddressRoot<AccountId>;
-	type ChainId = ConstU64<46>;
-	type Currency = Balances;
-	type FeeCalculator = TransactionPaymentGasPrice;
-	type FindAuthor = FindAuthor<pallet_session::FindAccountFromAuthorIndex<Self, Aura>>;
-	type GasLimitPovSizeRatio = GasLimitPovSizeRatio;
-	type GasWeightMapping = pallet_evm::FixedGasWeightMapping<Self>;
-	type OnChargeTransaction = pallet_evm::EVMFungibleAdapter<Balances, ()>;
-	type OnCreate = ();
-	type PrecompilesType = DarwiniaPrecompiles<Self>;
-	type PrecompilesValue = PrecompilesValue;
-	type Runner = pallet_evm::runner::stack::Runner<Self>;
-	type RuntimeEvent = RuntimeEvent;
-	type Timestamp = Timestamp;
-	type WeightInfo = ();
-	type WeightPerGas = WeightPerGas;
-	type WithdrawOrigin = pallet_evm::EnsureAddressNever<AccountId>;
-}
-
-fn addr(a: u64) -> sp_core::H160 {
-	sp_core::H160::from_low_u64_be(a)
-}
-
 /// Validation rule for dispatch precompile
 pub struct DarwiniaDispatchValidator;
 impl DispatchValidateT<AccountId, RuntimeCall> for DarwiniaDispatchValidator {
@@ -216,3 +189,32 @@ impl DispatchValidateT<AccountId, RuntimeCall> for DarwiniaDispatchValidator {
 		}
 	}
 }
+
+fn addr(a: u64) -> H160 {
+	H160::from_low_u64_be(a)
+}
+
+impl pallet_evm::Config for Runtime {
+	type AddressMapping = pallet_evm::IdentityAddressMapping;
+	type BlockGasLimit = BlockGasLimit;
+	type BlockHashMapping = pallet_ethereum::EthereumBlockHashMapping<Self>;
+	type CallOrigin = pallet_evm::EnsureAddressRoot<Self::AccountId>;
+	type ChainId = ConstU64<46>;
+	type Currency = Balances;
+	type FeeCalculator = TransactionPaymentGasPrice;
+	type FindAuthor = FindAuthor<pallet_session::FindAccountFromAuthorIndex<Self, Aura>>;
+	type GasLimitPovSizeRatio = GasLimitPovSizeRatio;
+	type GasWeightMapping = pallet_evm::FixedGasWeightMapping<Self>;
+	type OnChargeTransaction = pallet_evm::EVMFungibleAdapter<Balances, ()>;
+	type OnCreate = ();
+	type PrecompilesType = DarwiniaPrecompiles<Self>;
+	type PrecompilesValue = PrecompilesValue;
+	type Runner = pallet_evm::runner::stack::Runner<Self>;
+	type RuntimeEvent = RuntimeEvent;
+	type SuicideQuickClearLimit = ();
+	type Timestamp = Timestamp;
+	// type WeightInfo = ();
+	type WeightInfo = ();
+	type WeightPerGas = WeightPerGas;
+	type WithdrawOrigin = pallet_evm::EnsureAddressNever<Self::AccountId>;
+}
diff --git a/runtime/darwinia/src/pallets/governance.rs b/runtime/darwinia/src/pallets/governance.rs
index f1648c434..8794c86a5 100644
--- a/runtime/darwinia/src/pallets/governance.rs
+++ b/runtime/darwinia/src/pallets/governance.rs
@@ -50,7 +50,8 @@ impl pallet_collective::Config<CouncilCollective> for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type RuntimeOrigin = RuntimeOrigin;
 	type SetMembersOrigin = RootOr<GeneralAdmin>;
-	type WeightInfo = weights::pallet_collective::WeightInfo<Self>;
+	// type WeightInfo = weights::pallet_collective::WeightInfo<Self>;
+	type WeightInfo = ();
 }
 impl pallet_collective::Config<TechnicalCollective> for Runtime {
 	type DefaultVote = pallet_collective::PrimeDefaultVote;
@@ -62,7 +63,8 @@ impl pallet_collective::Config<TechnicalCollective> for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type RuntimeOrigin = RuntimeOrigin;
 	type SetMembersOrigin = RootOr<GeneralAdmin>;
-	type WeightInfo = weights::pallet_collective::WeightInfo<Self>;
+	// type WeightInfo = weights::pallet_collective::WeightInfo<Self>;
+	type WeightInfo = ();
 }
 
 impl pallet_conviction_voting::Config for Runtime {
@@ -72,7 +74,8 @@ impl pallet_conviction_voting::Config for Runtime {
 	type Polls = Referenda;
 	type RuntimeEvent = RuntimeEvent;
 	type VoteLockingPeriod = ConstU32<{ DAYS }>;
-	type WeightInfo = weights::pallet_conviction_voting::WeightInfo<Self>;
+	// type WeightInfo = weights::pallet_conviction_voting::WeightInfo<Self>;
+	type WeightInfo = ();
 }
 
 pallet_referenda::impl_tracksinfo_get!(TracksInfo, Balance, BlockNumber);
@@ -89,12 +92,13 @@ impl pallet_referenda::Config for Runtime {
 	type Scheduler = Scheduler;
 	type Slash = Treasury;
 	type SubmissionDeposit = ConstU128<{ DARWINIA_PROPOSAL_REQUIREMENT }>;
-	type SubmitOrigin = frame_system::EnsureSigned<AccountId>;
+	type SubmitOrigin = frame_system::EnsureSigned<Self::AccountId>;
 	type Tally = pallet_conviction_voting::TallyOf<Self>;
 	type Tracks = TracksInfo;
 	type UndecidingTimeout = ConstU32<{ 28 * DAYS }>;
 	type Votes = pallet_conviction_voting::VotesOf<Self>;
-	type WeightInfo = weights::pallet_referenda::WeightInfo<Self>;
+	// type WeightInfo = weights::pallet_referenda::WeightInfo<Self>;
+	type WeightInfo = ();
 }
 
 impl custom_origins::Config for Runtime {}
@@ -106,7 +110,8 @@ impl pallet_whitelist::Config for Runtime {
 	type Preimages = Preimage;
 	type RuntimeCall = RuntimeCall;
 	type RuntimeEvent = RuntimeEvent;
-	type WeightInfo = weights::pallet_whitelist::WeightInfo<Self>;
+	// type WeightInfo = weights::pallet_whitelist::WeightInfo<Self>;
+	type WeightInfo = ();
 	type WhitelistOrigin = RootOrAtLeastFourFifth<TechnicalCollective>;
 }
 
@@ -116,22 +121,30 @@ frame_support::parameter_types! {
 
 impl pallet_treasury::Config for Runtime {
 	type ApproveOrigin = RootOr<GeneralAdmin>;
+	type AssetKind = ();
+	type BalanceConverter = frame_support::traits::tokens::UnityAssetBalanceConversion;
+	type Beneficiary = Self::AccountId;
+	type BeneficiaryLookup = Self::Lookup;
 	type Burn = ();
 	type BurnDestination = ();
 	type Currency = Balances;
 	type MaxApprovals = ConstU32<100>;
 	type OnSlash = Treasury;
 	type PalletId = pallet_config::TreasuryPid;
+	type Paymaster =
+		frame_support::traits::tokens::PayFromAccount<Balances, pallet_config::TreasuryAccount>;
+	type PayoutPeriod = ConstU32<{ 28 * DAYS }>;
 	type ProposalBond = ProposalBond;
 	type ProposalBondMaximum = ();
 	type ProposalBondMinimum = ConstU128<DARWINIA_PROPOSAL_REQUIREMENT>;
-	type RejectOrigin = RootOrAll<CouncilCollective>;
+	type RejectOrigin = RootOr<GeneralAdmin>;
 	type RuntimeEvent = RuntimeEvent;
 	type SpendFunds = ();
 	type SpendOrigin = EitherOf<
-		frame_system::EnsureRootWithSuccess<AccountId, pallet_config::MaxBalance>,
+		frame_system::EnsureRootWithSuccess<Self::AccountId, pallet_config::MaxBalance>,
 		Spender,
 	>;
 	type SpendPeriod = ConstU32<{ 28 * DAYS }>;
-	type WeightInfo = weights::pallet_treasury::WeightInfo<Self>;
+	// type WeightInfo = weights::pallet_treasury::WeightInfo<Self>;
+	type WeightInfo = ();
 }
diff --git a/runtime/darwinia/src/pallets/governance/v1.rs b/runtime/darwinia/src/pallets/governance/v1.rs
index b2e5aff35..e031f9367 100644
--- a/runtime/darwinia/src/pallets/governance/v1.rs
+++ b/runtime/darwinia/src/pallets/governance/v1.rs
@@ -29,7 +29,7 @@ impl pallet_democracy::Config for Runtime {
 	type Currency = Balances;
 	type EnactmentPeriod = ConstU32<ENACTMENT_PERIOD>;
 	// There are no plans to use this yet.
-	type ExternalDefaultOrigin = Root;
+	type ExternalDefaultOrigin = RootOr<GeneralAdmin>;
 	type ExternalMajorityOrigin = RootOrAtLeastHalf<CouncilCollective>;
 	type ExternalOrigin = RootOrAtLeastHalf<CouncilCollective>;
 	type FastTrackOrigin = RootOrAtLeastTwoThird<TechnicalCollective>;
@@ -47,9 +47,10 @@ impl pallet_democracy::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type Scheduler = Scheduler;
 	type Slash = Treasury;
-	type SubmitOrigin = frame_system::EnsureSigned<AccountId>;
-	type VetoOrigin = pallet_collective::EnsureMember<AccountId, TechnicalCollective>;
+	type SubmitOrigin = frame_system::EnsureSigned<Self::AccountId>;
+	type VetoOrigin = pallet_collective::EnsureMember<Self::AccountId, TechnicalCollective>;
 	type VoteLockingPeriod = ConstU32<ENACTMENT_PERIOD>;
 	type VotingPeriod = ConstU32<{ 28 * DAYS }>;
-	type WeightInfo = weights::pallet_democracy::WeightInfo<Self>;
+	// type WeightInfo = weights::pallet_democracy::WeightInfo<Self>;
+	type WeightInfo = ();
 }
diff --git a/runtime/darwinia/src/pallets/message_queue.rs b/runtime/darwinia/src/pallets/message_queue.rs
index 58643817f..f54e011fe 100644
--- a/runtime/darwinia/src/pallets/message_queue.rs
+++ b/runtime/darwinia/src/pallets/message_queue.rs
@@ -32,15 +32,16 @@ impl pallet_message_queue::Config for Runtime {
 	>;
 	#[cfg(not(feature = "runtime-benchmarks"))]
 	type MessageProcessor = xcm_builder::ProcessXcmMessage<
-		AggregateMessageOrigin,
+		cumulus_primitives_core::AggregateMessageOrigin,
 		xcm_executor::XcmExecutor<XcmExecutorConfig>,
 		RuntimeCall,
 	>;
 	// The XCMP queue pallet is only ever able to handle the `Sibling(ParaId)` origin:
-	type QueueChangeHandler = NarrowOriginToSibling<XcmpQueue>;
-	type QueuePausedQuery = NarrowOriginToSibling<XcmpQueue>;
+	type QueueChangeHandler = message_queue::NarrowOriginToSibling<XcmpQueue>;
+	type QueuePausedQuery = message_queue::NarrowOriginToSibling<XcmpQueue>;
 	type RuntimeEvent = RuntimeEvent;
 	type ServiceWeight = MessageQueueServiceWeight;
 	type Size = u32;
+	// type WeightInfo = ();
 	type WeightInfo = ();
 }
diff --git a/runtime/darwinia/src/pallets/orml_xtokens.rs b/runtime/darwinia/src/pallets/orml_xtokens.rs
index 503d0fda1..b414cc731 100644
--- a/runtime/darwinia/src/pallets/orml_xtokens.rs
+++ b/runtime/darwinia/src/pallets/orml_xtokens.rs
@@ -17,19 +17,17 @@
 // along with Darwinia. If not, see <https://www.gnu.org/licenses/>.
 
 // darwinia
-use crate::*;
+use crate::{AssetId, *};
 // polkadot
 use xcm::latest::prelude::*;
 
 // Our currencyId. We distinguish for now between SelfReserve, and Others, defined by their Id.
-#[derive(
-	Clone, Debug, PartialEq, Eq, PartialOrd, Ord, codec::Encode, codec::Decode, scale_info::TypeInfo,
-)]
+#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Encode, Decode, TypeInfo)]
 pub enum CurrencyId {
 	// Our native token
 	SelfReserve,
 	// Assets representing other chains native tokens
-	ForeignAsset(crate::AssetId),
+	ForeignAsset(AssetId),
 }
 
 // How to convert from CurrencyId to Location
@@ -37,12 +35,12 @@ pub struct CurrencyIdtoMultiLocation<AssetXConverter>(core::marker::PhantomData<
 impl<AssetXConverter> sp_runtime::traits::Convert<CurrencyId, Option<Location>>
 	for CurrencyIdtoMultiLocation<AssetXConverter>
 where
-	AssetXConverter: sp_runtime::traits::MaybeEquivalence<Location, crate::AssetId>,
+	AssetXConverter: sp_runtime::traits::MaybeEquivalence<Location, AssetId>,
 {
 	fn convert(currency: CurrencyId) -> Option<Location> {
 		match currency {
 			CurrencyId::SelfReserve => {
-				let multi: Location = pallets::polkadot_xcm::AnchoringSelfReserve::get();
+				let multi: Location = SelfReserve::get();
 				Some(multi)
 			},
 			CurrencyId::ForeignAsset(asset) => AssetXConverter::convert_back(&asset),
@@ -58,34 +56,26 @@ frame_support::parameter_types! {
 	pub SelfLocation: Location = Location::here();
 	// We need this to be able to catch when someone is trying to execute a non-
 	// cross-chain transfer in xtokens through the absolute path way
-	pub SelfLocationAbsolute: Location = Location {
-		parents:1,
-		interior: Junctions::Junctions::X1(
-			Parachain(ParachainInfo::parachain_id().into())
-		)
-	};
+	pub SelfLocationAbsolute: Location = Location::new(1, [Parachain(ParachainInfo::parachain_id().into())]);
 }
 
 impl orml_xtokens::Config for Runtime {
-	type AccountIdToMultiLocation = xcm_primitives::AccountIdToMultiLocation<AccountId>;
+	type AccountIdToLocation = xcm_primitives::AccountIdToLocation<Self::AccountId>;
 	type Balance = Balance;
 	type BaseXcmWeight = BaseXcmWeight;
 	type CurrencyId = CurrencyId;
-	type CurrencyIdConvert = CurrencyIdtoMultiLocation<
-		xcm_primitives::AsAssetType<
-			crate::AssetId,
-			pallets::asset_manager::AssetType,
-			AssetManager,
-		>,
-	>;
+	type CurrencyIdConvert =
+		CurrencyIdtoMultiLocation<xcm_primitives::AsAssetType<AssetId, AssetType, AssetManager>>;
+	type LocationsFilter = frame_support::traits::Everything;
 	type MaxAssetsForTransfer = MaxAssetsForTransfer;
 	// We don't have this case: fee_reserve != non_fee_reserve
 	type MinXcmFee = orml_xcm_support::DisabledParachainFee;
-	type MultiLocationsFilter = frame_support::traits::Everything;
+	type RateLimiter = ();
+	type RateLimiterId = ();
 	type ReserveProvider = xcm_primitives::AbsoluteAndRelativeReserve<SelfLocationAbsolute>;
 	type RuntimeEvent = RuntimeEvent;
 	type SelfLocation = SelfLocation;
 	type UniversalLocation = UniversalLocation;
-	type Weigher = pallets::polkadot_xcm::XcmWeigher;
-	type XcmExecutor = xcm_executor::XcmExecutor<pallets::polkadot_xcm::XcmExecutorConfig>;
+	type Weigher = XcmWeigher;
+	type XcmExecutor = xcm_executor::XcmExecutor<XcmExecutorConfig>;
 }
diff --git a/runtime/darwinia/src/pallets/parachain_system.rs b/runtime/darwinia/src/pallets/parachain_system.rs
index b5e9c97b9..340fdf352 100644
--- a/runtime/darwinia/src/pallets/parachain_system.rs
+++ b/runtime/darwinia/src/pallets/parachain_system.rs
@@ -34,5 +34,6 @@ impl cumulus_pallet_parachain_system::Config for Runtime {
 	type ReservedXcmpWeight = ReservedXcmpWeight;
 	type RuntimeEvent = RuntimeEvent;
 	type SelfParaId = parachain_info::Pallet<Self>;
+	type WeightInfo = ();
 	type XcmpMessageHandler = XcmpQueue;
 }
diff --git a/runtime/darwinia/src/pallets/polkadot_xcm.rs b/runtime/darwinia/src/pallets/polkadot_xcm.rs
index 854e25497..32915032d 100644
--- a/runtime/darwinia/src/pallets/polkadot_xcm.rs
+++ b/runtime/darwinia/src/pallets/polkadot_xcm.rs
@@ -17,11 +17,9 @@
 // along with Darwinia. If not, see <https://www.gnu.org/licenses/>.
 
 // darwinia
-use crate::*;
+use crate::{AssetId, Assets, *};
 // polkadot
 use xcm::latest::prelude::*;
-// substrate
-use frame_support::traits::Currency;
 
 frame_support::parameter_types! {
 	pub const RelayNetwork: NetworkId = NetworkId::Polkadot;
@@ -29,10 +27,9 @@ frame_support::parameter_types! {
 	pub const MaxInstructions: u32 = 100;
 	/// A temporary weight value for each XCM instruction.
 	/// NOTE: This should be removed after we account for PoV weights.
-	pub const TempFixedXcmWeight: frame_support::weights::Weight = frame_support::weights::Weight::from_parts(1_000_000_000, 0);
-	pub AnchoringSelfReserve: Location = Location::new(
+	pub SelfReserve: Location = Location::new(
 		0,
-		Junctions::X1(PalletInstance(<Balances as frame_support::traits::PalletInfoAccess>::index() as u8))
+		[PalletInstance(<Balances as frame_support::traits::PalletInfoAccess>::index() as u8)]
 	);
 	pub UniversalLocation: InteriorLocation = Parachain(ParachainInfo::parachain_id().into()).into();
 	/// The amount of weight an XCM operation takes. This is a safe overestimate.
@@ -40,25 +37,20 @@ frame_support::parameter_types! {
 	/// Xcm fees will go to the treasury account
 	pub XcmFeesAccount: AccountId = Treasury::account_id();
 	pub RelayChainOrigin: RuntimeOrigin = cumulus_pallet_xcm::Origin::Relay.into();
-	pub SelfReserve: Location = Location {
-		parents:0,
-		interior: [
-			PalletInstance(<Balances as PalletInfoAccess>::index() as u8)
-		].into()
-	};
 }
 
-/// Means for transacting assets on this chain.
-pub type LocalAssetTransactor = xcm_builder::CurrencyAdapter<
+/// The transactor for our own chain currency.
+pub type LocalAssetTransactor = xcm_builder::FungibleAdapter<
 	// Use this currency:
 	Balances,
-	// Use this currency when it is a fungible asset matching the given location or name:
-	xcm_builder::IsConcrete<AnchoringSelfReserve>,
-	// Do a simple punn to convert an AccountId32 Location into a native chain account ID:
+	// Use this currency when it is a fungible asset matching any of the locations in
+	// SelfReserveRepresentations
+	xcm_builder::IsConcrete<SelfReserve>,
+	// We can convert the MultiLocations with our converter above:
 	LocationToAccountId,
 	// Our chain's account ID type (we can't get away without mentioning it explicitly):
 	AccountId,
-	// We don't track any teleports.
+	// We dont allow teleport
 	(),
 >;
 // The non-reserve fungible transactor type
@@ -69,13 +61,9 @@ pub type ForeignFungiblesTransactor = xcm_builder::FungiblesAdapter<
 	// Use this currency when it is a fungible asset matching the given location or name:
 	(
 		xcm_builder::ConvertedConcreteId<
-			crate::AssetId,
+			AssetId,
 			Balance,
-			xcm_primitives::AsAssetType<
-				crate::AssetId,
-				pallets::asset_manager::AssetType,
-				AssetManager,
-			>,
+			xcm_primitives::AsAssetType<AssetId, AssetType, AssetManager>,
 			xcm_executor::traits::JustTry,
 		>,
 	),
@@ -88,11 +76,7 @@ pub type ForeignFungiblesTransactor = xcm_builder::FungiblesAdapter<
 	// We dont track any teleports
 	(),
 >;
-pub type AssetTransactors = (
-	// The transactor for our native asset.
-	LocalAssetTransactor,
-	ForeignFungiblesTransactor,
-);
+pub type AssetTransactors = (LocalAssetTransactor, ForeignFungiblesTransactor);
 /// Type for specifying how a `Location` can be converted into an `AccountId`. This is used
 /// when determining ownership of accounts for asset transacting and when attempting to use XCM
 /// `Transact` in order to determine the dispatch Origin.
@@ -104,7 +88,7 @@ pub type LocationToAccountId = (
 	// Straight up local `AccountId20` origins just alias directly to `AccountId`.
 	xcm_builder::AccountKey20Aliases<RelayNetwork, AccountId>,
 	// The rest of locations are converted via hashing it.
-	darwinia_common_runtime::xcm_configs::Account20Hash<AccountId>,
+	xcm_configs::Account20Hash<AccountId>,
 );
 /// This is the type we use to convert an (incoming) XCM origin into a local `Origin` instance,
 /// ready for dispatching a transaction with Xcm's `Transact`. There is an `OriginKind` which can
@@ -138,11 +122,11 @@ pub type Barrier = xcm_builder::TrailingSetTopicAsId<
 					xcm_builder::AllowTopLevelPaidExecutionFrom<frame_support::traits::Everything>,
 					// Parent, its pluralities (i.e. governance bodies), and the Fellows plurality
 					// get free execution.
-					xcm_builder::AllowUnpaidExecutionFrom<
-						darwinia_common_runtime::xcm_configs::ParentOrParentsPlurality,
-					>,
+					xcm_builder::AllowUnpaidExecutionFrom<xcm_configs::ParentOrParentsPlurality>,
 					// Subscriptions for version tracking are OK.
-					xcm_builder::AllowSubscriptionsFrom<ParentRelayOrSiblingParachains>,
+					xcm_builder::AllowSubscriptionsFrom<
+						xcm_configs::ParentRelayOrSiblingParachains,
+					>,
 				),
 				UniversalLocation,
 				ConstU32<8>,
@@ -159,13 +143,9 @@ pub type XcmFeesToAccount = xcm_primitives::XcmFeesToAccount<
 	Assets,
 	(
 		xcm_builder::ConvertedConcreteId<
-			crate::AssetId,
+			AssetId,
 			Balance,
-			xcm_primitives::AsAssetType<
-				crate::AssetId,
-				pallets::asset_manager::AssetType,
-				AssetManager,
-			>,
+			xcm_primitives::AsAssetType<AssetId, AssetType, AssetManager>,
 			xcm_executor::traits::JustTry,
 		>,
 	),
@@ -226,7 +206,7 @@ impl xcm_executor::Config for XcmExecutorConfig {
 	type CallDispatcher = XcmCallDispatcher;
 	type FeeManager = ();
 	type IsReserve = orml_xcm_support::MultiNativeAsset<
-		xcm_primitives::AbsoluteAndRelativeReserve<pallets::orml_xtokens::SelfLocationAbsolute>,
+		xcm_primitives::AbsoluteAndRelativeReserve<SelfLocationAbsolute>,
 	>;
 	type IsTeleporter = ();
 	type MaxAssetsIntoHolding = MaxAssetsIntoHolding;
@@ -245,11 +225,7 @@ impl xcm_executor::Config for XcmExecutorConfig {
 			Balances,
 			DealWithFees<Runtime>,
 		>,
-		xcm_primitives::FirstAssetTrader<
-			pallets::asset_manager::AssetType,
-			AssetManager,
-			XcmFeesToAccount,
-		>,
+		xcm_primitives::FirstAssetTrader<AssetType, AssetManager, XcmFeesToAccount>,
 	);
 	type TransactionalProcessor = xcm_builder::FrameTransactionalProcessor;
 	type UniversalAliases = frame_support::traits::Nothing;
@@ -260,7 +236,7 @@ impl xcm_executor::Config for XcmExecutorConfig {
 }
 
 impl pallet_xcm::Config for Runtime {
-	type AdminOrigin = Root;
+	type AdminOrigin = RootOr<GeneralAdmin>;
 	// ^ Override for AdvertisedXcmVersion default
 	type AdvertisedXcmVersion = pallet_xcm::CurrentXcmVersion;
 	type Currency = Balances;
diff --git a/runtime/darwinia/src/pallets/preimage.rs b/runtime/darwinia/src/pallets/preimage.rs
index b23165866..9863af883 100644
--- a/runtime/darwinia/src/pallets/preimage.rs
+++ b/runtime/darwinia/src/pallets/preimage.rs
@@ -20,20 +20,25 @@
 use crate::*;
 
 frame_support::parameter_types! {
-	pub const PreimageBaseDeposit: Balance = deposit(2, 64);
-	pub const PreimageByteDeposit: Balance = deposit(0, 1);
+	pub const PreimageBaseDeposit: Balance = darwinia_deposit(2, 64);
+	pub const PreimageByteDeposit: Balance = darwinia_deposit(0, 1);
 	pub const PreimageHoldReason: RuntimeHoldReason = RuntimeHoldReason::Preimage(pallet_preimage::HoldReason::Preimage);
 }
 
 impl pallet_preimage::Config for Runtime {
-	type Consideration = HoldConsideration<
-		AccountId,
+	type Consideration = frame_support::traits::fungible::HoldConsideration<
+		Self::AccountId,
 		Balances,
 		PreimageHoldReason,
-		LinearStoragePrice<PreimageBaseDeposit, PreimageByteDeposit, Balance>,
+		frame_support::traits::LinearStoragePrice<
+			PreimageBaseDeposit,
+			PreimageByteDeposit,
+			Balance,
+		>,
 	>;
 	type Currency = Balances;
-	type ManagerOrigin = Root;
+	type ManagerOrigin = RootOr<GeneralAdmin>;
 	type RuntimeEvent = RuntimeEvent;
-	type WeightInfo = weights::pallet_preimage::WeightInfo<Self>;
+	// type WeightInfo = weights::pallet_preimage::WeightInfo<Self>;
+	type WeightInfo = ();
 }
diff --git a/runtime/darwinia/src/pallets/proxy.rs b/runtime/darwinia/src/pallets/proxy.rs
index 1fece869d..b495b1688 100644
--- a/runtime/darwinia/src/pallets/proxy.rs
+++ b/runtime/darwinia/src/pallets/proxy.rs
@@ -27,11 +27,11 @@ use crate::*;
 	PartialEq,
 	Ord,
 	PartialOrd,
-	codec::Encode,
-	codec::Decode,
-	codec::MaxEncodedLen,
-	scale_info::TypeInfo,
-	sp_runtime::RuntimeDebug,
+	Encode,
+	Decode,
+	MaxEncodedLen,
+	TypeInfo,
+	RuntimeDebug,
 )]
 pub enum ProxyType {
 	#[codec(index = 0)]
@@ -92,7 +92,6 @@ impl frame_support::traits::InstanceFilter<RuntimeCall> for ProxyType {
 			ProxyType::CancelProxy => {
 				matches!(c, RuntimeCall::Proxy(pallet_proxy::Call::reject_announcement { .. }))
 			},
-			_ => false,
 		}
 	}
 
@@ -121,5 +120,6 @@ impl pallet_proxy::Config for Runtime {
 	type ProxyType = ProxyType;
 	type RuntimeCall = RuntimeCall;
 	type RuntimeEvent = RuntimeEvent;
-	type WeightInfo = weights::pallet_proxy::WeightInfo<Self>;
+	// type WeightInfo = weights::pallet_proxy::WeightInfo<Self>;
+	type WeightInfo = ();
 }
diff --git a/runtime/darwinia/src/pallets/scheduler.rs b/runtime/darwinia/src/pallets/scheduler.rs
index 25ea75567..bd7eca465 100644
--- a/runtime/darwinia/src/pallets/scheduler.rs
+++ b/runtime/darwinia/src/pallets/scheduler.rs
@@ -58,6 +58,7 @@ impl pallet_scheduler::Config for Runtime {
 	type RuntimeCall = RuntimeCall;
 	type RuntimeEvent = RuntimeEvent;
 	type RuntimeOrigin = RuntimeOrigin;
-	type ScheduleOrigin = Root;
-	type WeightInfo = weights::pallet_scheduler::WeightInfo<Self>;
+	type ScheduleOrigin = RootOr<GeneralAdmin>;
+	// type WeightInfo = weights::pallet_scheduler::WeightInfo<Self>;
+	type WeightInfo = ();
 }
diff --git a/runtime/darwinia/src/pallets/session.rs b/runtime/darwinia/src/pallets/session.rs
index 5f41c2898..5629b9c1f 100644
--- a/runtime/darwinia/src/pallets/session.rs
+++ b/runtime/darwinia/src/pallets/session.rs
@@ -38,8 +38,9 @@ impl pallet_session::Config for Runtime {
 	type SessionHandler = <SessionKeys as sp_runtime::traits::OpaqueKeys>::KeyTypeIdProviders;
 	type SessionManager = DarwiniaStaking;
 	type ShouldEndSession = pallet_session::PeriodicSessions<Period, Offset>;
-	type ValidatorId = <Self as frame_system::Config>::AccountId;
+	type ValidatorId = Self::AccountId;
 	// We don't have stash and controller, thus we don't need the convert as well.
 	type ValidatorIdOf = darwinia_staking::IdentityCollator;
-	type WeightInfo = weights::pallet_session::WeightInfo<Self>;
+	// type WeightInfo = weights::pallet_session::WeightInfo<Self>;
+	type WeightInfo = ();
 }
diff --git a/runtime/darwinia/src/pallets/staking.rs b/runtime/darwinia/src/pallets/staking.rs
index 82cceb2ed..9cfd762a6 100644
--- a/runtime/darwinia/src/pallets/staking.rs
+++ b/runtime/darwinia/src/pallets/staking.rs
@@ -120,7 +120,8 @@ impl darwinia_staking::Config for Runtime {
 	type Ring = RingStaking;
 	type RuntimeEvent = RuntimeEvent;
 	type ShouldEndSession = ShouldEndSession;
-	type WeightInfo = weights::darwinia_staking::WeightInfo<Self>;
+	// type WeightInfo = weights::darwinia_staking::WeightInfo<Self>;
+	type WeightInfo = ();
 }
 #[cfg(not(feature = "runtime-benchmarks"))]
 impl darwinia_staking::DepositConfig for Runtime {}
diff --git a/runtime/darwinia/src/pallets/system.rs b/runtime/darwinia/src/pallets/system.rs
index 486c596a8..0513bceeb 100644
--- a/runtime/darwinia/src/pallets/system.rs
+++ b/runtime/darwinia/src/pallets/system.rs
@@ -18,6 +18,8 @@
 
 // darwinia
 use crate::*;
+// polkadot-sdk
+use frame_support::derive_impl;
 
 /// We assume that ~5% of the block weight is consumed by `on_initialize` handlers. This is
 /// used to limit the maximal weight of a single extrinsic.
@@ -59,50 +61,20 @@ frame_support::parameter_types! {
 		.build_or_panic();
 }
 
+#[derive_impl(frame_system::config_preludes::ParaChainDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Runtime {
-	/// The data to be stored in an account.
 	type AccountData = pallet_balances::AccountData<Balance>;
-	/// The identifier used to distinguish between accounts.
 	type AccountId = AccountId;
-	/// The basic call filter to use in dispatchable.
 	type BaseCallFilter = frame_support::traits::Everything;
-	// type BaseCallFilter = TxPause;
 	type Block = Block;
-	/// Maximum number of block number to block hash mappings to keep (oldest pruned first).
-	type BlockHashCount = ConstU32<256>;
-	/// The maximum length of a block (in bytes).
 	type BlockLength = RuntimeBlockLength;
-	/// Block & extrinsics weights: base values and limits.
 	type BlockWeights = RuntimeBlockWeights;
-	/// The weight of database operations that the runtime can invoke.
 	type DbWeight = frame_support::weights::constants::RocksDbWeight;
-	/// The type for hashing blocks and tries.
-	type Hash = Hash;
-	/// The hashing algorithm used.
-	type Hashing = Hashing;
-	/// The lookup mechanism to get account ID from whatever is passed in dispatchers.
-	type Lookup = sp_runtime::traits::IdentityLookup<AccountId>;
+	type Lookup = sp_runtime::traits::IdentityLookup<Self::AccountId>;
 	type MaxConsumers = ConstU32<16>;
-	/// The index type for storing how many extrinsics an account has signed.
-	type Nonce = Nonce;
-	/// What to do if an account is fully reaped from the system.
-	type OnKilledAccount = ();
-	/// What to do if a new account is created.
-	type OnNewAccount = ();
-	/// The action to take on a Runtime Upgrade
 	type OnSetCode = cumulus_pallet_parachain_system::ParachainSetCode<Self>;
-	/// Converts a module to an index of this module in the runtime.
-	type PalletInfo = PalletInfo;
-	/// The aggregated dispatch type that is available for extrinsics.
-	type RuntimeCall = RuntimeCall;
-	/// The ubiquitous event type.
-	type RuntimeEvent = RuntimeEvent;
-	/// The ubiquitous origin type.
-	type RuntimeOrigin = RuntimeOrigin;
-	/// This is used as an identifier of the chain. 42 is the generic substrate prefix.
 	type SS58Prefix = ConstU16<18>;
-	/// Weight information for the extrinsics of this pallet.
-	type SystemWeightInfo = weights::frame_system::WeightInfo<Self>;
-	/// Runtime version.
+	// type SystemWeightInfo = weights::frame_system::WeightInfo<Self>;
+	type SystemWeightInfo = ();
 	type Version = Version;
 }
diff --git a/runtime/darwinia/src/pallets/timestamp.rs b/runtime/darwinia/src/pallets/timestamp.rs
index d6f5fb3ed..06e83fa2f 100644
--- a/runtime/darwinia/src/pallets/timestamp.rs
+++ b/runtime/darwinia/src/pallets/timestamp.rs
@@ -27,5 +27,6 @@ impl pallet_timestamp::Config for Runtime {
 	type OnTimestampSet = Aura;
 	#[cfg(feature = "runtime-benchmarks")]
 	type OnTimestampSet = ();
-	type WeightInfo = weights::pallet_timestamp::WeightInfo<Self>;
+	// type WeightInfo = weights::pallet_timestamp::WeightInfo<Self>;
+	type WeightInfo = ();
 }
diff --git a/runtime/darwinia/src/pallets/tx_pause.rs b/runtime/darwinia/src/pallets/tx_pause.rs
index 3a7c19db4..357b945b8 100644
--- a/runtime/darwinia/src/pallets/tx_pause.rs
+++ b/runtime/darwinia/src/pallets/tx_pause.rs
@@ -55,6 +55,7 @@ impl pallet_tx_pause::Config for Runtime {
 	type RuntimeCall = RuntimeCall;
 	type RuntimeEvent = RuntimeEvent;
 	type UnpauseOrigin = RootOrAtLeastTwoThird<TechnicalCollective>;
-	type WeightInfo = weights::pallet_tx_pause::WeightInfo<Runtime>;
+	// type WeightInfo = weights::pallet_tx_pause::WeightInfo<Runtime>;
+	type WeightInfo = ();
 	type WhitelistedCalls = TxPauseWhitelistedCalls;
 }
diff --git a/runtime/darwinia/src/pallets/utility.rs b/runtime/darwinia/src/pallets/utility.rs
index 59c5759a2..bad2dcc75 100644
--- a/runtime/darwinia/src/pallets/utility.rs
+++ b/runtime/darwinia/src/pallets/utility.rs
@@ -23,5 +23,6 @@ impl pallet_utility::Config for Runtime {
 	type PalletsOrigin = OriginCaller;
 	type RuntimeCall = RuntimeCall;
 	type RuntimeEvent = RuntimeEvent;
-	type WeightInfo = weights::pallet_utility::WeightInfo<Self>;
+	// type WeightInfo = weights::pallet_utility::WeightInfo<Self>;
+	type WeightInfo = ();
 }
diff --git a/runtime/darwinia/src/pallets/xcmp_queue.rs b/runtime/darwinia/src/pallets/xcmp_queue.rs
index 4265d43fb..fe37db174 100644
--- a/runtime/darwinia/src/pallets/xcmp_queue.rs
+++ b/runtime/darwinia/src/pallets/xcmp_queue.rs
@@ -21,7 +21,7 @@ use crate::*;
 
 impl cumulus_pallet_xcmp_queue::Config for Runtime {
 	type ChannelInfo = ParachainSystem;
-	type ControllerOrigin = Root;
+	type ControllerOrigin = RootOr<GeneralAdmin>;
 	type ControllerOriginConverter = XcmOriginToTransactDispatchOrigin;
 	type MaxInboundSuspended = sp_core::ConstU32<1_000>;
 	type PriceForSiblingDelivery = polkadot_runtime_common::xcm_sender::NoPriceForMessageDelivery<
@@ -29,12 +29,13 @@ impl cumulus_pallet_xcmp_queue::Config for Runtime {
 	>;
 	type RuntimeEvent = RuntimeEvent;
 	type VersionWrapper = ();
-	type WeightInfo = weights::cumulus_pallet_xcmp_queue::WeightInfo<Self>;
+	// type WeightInfo = weights::cumulus_pallet_xcmp_queue::WeightInfo<Self>;
+	type WeightInfo = ();
 	// Enqueue XCMP messages from siblings for later processing.
 	type XcmpQueue = frame_support::traits::TransformOrigin<
 		MessageQueue,
-		AggregateMessageOrigin,
-		ParaId,
-		ParaIdToSibling,
+		cumulus_primitives_core::AggregateMessageOrigin,
+		cumulus_primitives_core::ParaId,
+		message_queue::ParaIdToSibling,
 	>;
 }
diff --git a/runtime/koi/src/lib.rs b/runtime/koi/src/lib.rs
index 9633363e9..e6c7d6207 100644
--- a/runtime/koi/src/lib.rs
+++ b/runtime/koi/src/lib.rs
@@ -29,12 +29,17 @@ pub use pallets::*;
 
 mod migration;
 
-pub mod weights;
+// pub mod weights;
 
 pub use darwinia_common_runtime::*;
 pub use dc_primitives::*;
 
-// substrate
+// crates.io
+use codec::{Decode, Encode, MaxEncodedLen};
+use scale_info::TypeInfo;
+// polkadot-sdk
+use sp_core::{H160, H256, U256};
+use sp_runtime::RuntimeDebug;
 use sp_std::prelude::*;
 
 /// Block type as expected by this runtime.
@@ -317,11 +322,11 @@ sp_api::impl_runtime_apis! {
 
 	impl sp_genesis_builder::GenesisBuilder<Block> for Runtime {
 		fn create_default_config() -> Vec<u8> {
-			sp_genesis_builder::create_default_config::<RuntimeGenesisConfig>()
+			frame_support::genesis_builder_helper::create_default_config::<RuntimeGenesisConfig>()
 		}
 
 		fn build_config(config: Vec<u8>) -> sp_genesis_builder::Result {
-			sp_genesis_builder::build_config::<RuntimeGenesisConfig>(config)
+			frame_support::genesis_builder_helper::build_config::<RuntimeGenesisConfig>(config)
 		}
 	}
 
@@ -336,13 +341,13 @@ sp_api::impl_runtime_apis! {
 			<<Runtime as pallet_evm::Config>::ChainId as sp_core::Get<u64>>::get()
 		}
 
-		fn account_basic(address: sp_core::H160) -> pallet_evm::Account {
+		fn account_basic(address: H160) -> pallet_evm::Account {
 			let (account, _) = EVM::account_basic(&address);
 
 			account
 		}
 
-		fn gas_price() -> sp_core::U256 {
+		fn gas_price() -> U256 {
 			// frontier
 			use pallet_evm::FeeCalculator;
 
@@ -351,33 +356,33 @@ sp_api::impl_runtime_apis! {
 			gas_price
 		}
 
-		fn account_code_at(address: sp_core::H160) -> Vec<u8> {
+		fn account_code_at(address: H160) -> Vec<u8> {
 			pallet_evm::AccountCodes::<Runtime>::get(address)
 		}
 
-		fn author() -> sp_core::H160 {
+		fn author() -> H160 {
 			<pallet_evm::Pallet<Runtime>>::find_author()
 		}
 
-		fn storage_at(address: sp_core::H160, index: sp_core::U256) -> sp_core::H256 {
+		fn storage_at(address: H160, index: U256) -> H256 {
 			let mut tmp = [0u8; 32];
 
 			index.to_big_endian(&mut tmp);
 
-			pallet_evm::AccountStorages::<Runtime>::get(address, sp_core::H256::from_slice(&tmp[..]))
+			pallet_evm::AccountStorages::<Runtime>::get(address, H256::from_slice(&tmp[..]))
 		}
 
 		fn call(
-			from: sp_core::H160,
-			to: sp_core::H160,
+			from: H160,
+			to: H160,
 			data: Vec<u8>,
-			value: sp_core::U256,
-			gas_limit: sp_core::U256,
-			max_fee_per_gas: Option<sp_core::U256>,
-			max_priority_fee_per_gas: Option<sp_core::U256>,
-			nonce: Option<sp_core::U256>,
+			value: U256,
+			gas_limit: U256,
+			max_fee_per_gas: Option<U256>,
+			max_priority_fee_per_gas: Option<U256>,
+			nonce: Option<U256>,
 			estimate: bool,
-			access_list: Option<Vec<(sp_core::H160, Vec<sp_core::H256>)>>,
+			access_list: Option<Vec<(H160, Vec<H256>)>>,
 		) -> Result<pallet_evm::CallInfo, sp_runtime::DispatchError> {
 			// frontier
 			use pallet_evm::Runner;
@@ -427,15 +432,15 @@ sp_api::impl_runtime_apis! {
 		}
 
 		fn create(
-			from: sp_core::H160,
+			from: H160,
 			data: Vec<u8>,
-			value: sp_core::U256,
-			gas_limit: sp_core::U256,
-			max_fee_per_gas: Option<sp_core::U256>,
-			max_priority_fee_per_gas: Option<sp_core::U256>,
-			nonce: Option<sp_core::U256>,
+			value: U256,
+			gas_limit: U256,
+			max_fee_per_gas: Option<U256>,
+			max_priority_fee_per_gas: Option<U256>,
+			nonce: Option<U256>,
 			estimate: bool,
-			access_list: Option<Vec<(sp_core::H160, Vec<sp_core::H256>)>>,
+			access_list: Option<Vec<(H160, Vec<H256>)>>,
 		) -> Result<pallet_evm::CreateInfo, sp_runtime::DispatchError> {
 			// frontier
 			use pallet_evm::Runner;
@@ -556,6 +561,7 @@ sp_api::impl_runtime_apis! {
 		fn trace_transaction(
 			_extrinsics: Vec<<Block as sp_runtime::traits::Block>::Extrinsic>,
 			_traced_transaction: &pallet_ethereum::Transaction,
+			_header: &<Block as sp_runtime::traits::Block>::Header,
 		) -> Result<
 			(),
 			sp_runtime::DispatchError,
@@ -563,7 +569,25 @@ sp_api::impl_runtime_apis! {
 			#[cfg(feature = "evm-tracing")]
 			{
 				use moonbeam_evm_tracer::tracer::EvmTracer;
-				use pallet_ethereum::Call::transact;
+				use xcm_primitives::{
+					ETHEREUM_XCM_TRACING_STORAGE_KEY,
+					EthereumXcmTracingStatus
+				};
+				use frame_support::storage::unhashed;
+				use frame_system::pallet_prelude::BlockNumberFor;
+
+				// Tell the CallDispatcher we are tracing a specific Transaction.
+				unhashed::put::<EthereumXcmTracingStatus>(
+					ETHEREUM_XCM_TRACING_STORAGE_KEY,
+					&EthereumXcmTracingStatus::Transaction(traced_transaction.hash()),
+				);
+
+				// Initialize block: calls the "on_initialize" hook on every pallet
+				// in AllPalletsWithSystem.
+				// After pallet message queue was introduced, this must be done only after
+				// enabling XCM tracing by setting ETHEREUM_XCM_TRACING_STORAGE_KEY
+				// in the storage
+				Executive::initialize_block(_header);
 
 				// Apply the a subset of extrinsics: all the substrate-specific or ethereum
 				// transactions that preceded the requested transaction.
@@ -579,10 +603,32 @@ sp_api::impl_runtime_apis! {
 						}
 						_ => Executive::apply_extrinsic(ext),
 					};
+					if let Some(EthereumXcmTracingStatus::TransactionExited) = unhashed::get(
+						ETHEREUM_XCM_TRACING_STORAGE_KEY
+					) {
+						return Ok(());
+					}
+				}
+
+				if let Some(EthereumXcmTracingStatus::Transaction(_)) = unhashed::get(
+					ETHEREUM_XCM_TRACING_STORAGE_KEY
+				) {
+					// If the transaction was not found, it might be
+					// an eth-xcm transaction that was executed at on_idle
+					replay_on_idle();
+				}
+
+				if let Some(EthereumXcmTracingStatus::TransactionExited) = unhashed::get(
+					ETHEREUM_XCM_TRACING_STORAGE_KEY
+				) {
+					// The transaction was found
+					Ok(())
+				} else {
+					// The transaction was not-found
+					Err(sp_runtime::DispatchError::Other(
+						"Failed to find Ethereum transaction among the extrinsics.",
+					))
 				}
-				Err(sp_runtime::DispatchError::Other(
-					"Failed to find Ethereum transaction among the extrinsics.",
-				))
 			}
 			#[cfg(not(feature = "evm-tracing"))]
 			Err(sp_runtime::DispatchError::Other(
@@ -592,7 +638,8 @@ sp_api::impl_runtime_apis! {
 
 		fn trace_block(
 			_extrinsics: Vec<<Block as sp_runtime::traits::Block>::Extrinsic>,
-			_known_transactions: Vec<sp_core::H256>,
+			_known_transactions: Vec<H256>,
+			_header: &<Block as sp_runtime::traits::Block>::Header,
 		) -> Result<
 			(),
 			sp_runtime::DispatchError,
@@ -600,11 +647,25 @@ sp_api::impl_runtime_apis! {
 			#[cfg(feature = "evm-tracing")]
 			{
 				use moonbeam_evm_tracer::tracer::EvmTracer;
-				use pallet_ethereum::Call::transact;
+				use frame_system::pallet_prelude::BlockNumberFor;
+				use xcm_primitives::EthereumXcmTracingStatus;
+
+				// Tell the CallDispatcher we are tracing a full Block.
+				frame_support::storage::unhashed::put::<EthereumXcmTracingStatus>(
+					xcm_primitives::ETHEREUM_XCM_TRACING_STORAGE_KEY,
+					&EthereumXcmTracingStatus::Block,
+				);
 
 				let mut config = <Runtime as pallet_evm::Config>::config().clone();
 				config.estimate = true;
 
+				// Initialize block: calls the "on_initialize" hook on every pallet
+				// in AllPalletsWithSystem.
+				// After pallet message queue was introduced, this must be done only after
+				// enabling XCM tracing by setting ETHEREUM_XCM_TRACING_STORAGE_KEY
+				// in the storage
+				Executive::initialize_block(_header);
+
 				// Apply all extrinsics. Ethereum extrinsics are traced.
 				for ext in _extrinsics.into_iter() {
 					match &ext.0.function {
@@ -623,6 +684,95 @@ sp_api::impl_runtime_apis! {
 					};
 				}
 
+				// Replay on_idle
+				// Some XCM messages with eth-xcm transaction might be executed at on_idle
+				replay_on_idle();
+
+				Ok(())
+			}
+			#[cfg(not(feature = "evm-tracing"))]
+			Err(sp_runtime::DispatchError::Other(
+				"Missing `evm-tracing` compile time feature flag.",
+			))
+		}
+
+		fn trace_call(
+			_header: &<Block as sp_runtime::traits::Block>::Header,
+			_from: H160,
+			_to: H160,
+			_data: Vec<u8>,
+			_value: U256,
+			_gas_limit: U256,
+			_max_fee_per_gas: Option<U256>,
+			_max_priority_fee_per_gas: Option<U256>,
+			_nonce: Option<U256>,
+			_access_list: Option<Vec<(H160, Vec<H256>)>>,
+		) -> Result<(), sp_runtime::DispatchError> {
+			#[cfg(feature = "evm-tracing")]
+			{
+				use moonbeam_evm_tracer::tracer::EvmTracer;
+
+				// Initialize block: calls the "on_initialize" hook on every pallet
+				// in AllPalletsWithSystem.
+				Executive::initialize_block(_header);
+
+				EvmTracer::new().trace(|| {
+					let is_transactional = false;
+					let validate = true;
+					let without_base_extrinsic_weight = true;
+
+
+					// Estimated encoded transaction size must be based on the heaviest transaction
+					// type (EIP1559Transaction) to be compatible with all transaction types.
+					let mut estimated_transaction_len = _data.len() +
+					// pallet ethereum index: 1
+					// transact call index: 1
+					// Transaction enum variant: 1
+					// chain_id 8 bytes
+					// nonce: 32
+					// max_priority_fee_per_gas: 32
+					// max_fee_per_gas: 32
+					// gas_limit: 32
+					// action: 21 (enum varianrt + call address)
+					// value: 32
+					// access_list: 1 (empty vec size)
+					// 65 bytes signature
+					258;
+
+					if _access_list.is_some() {
+						estimated_transaction_len += _access_list.encoded_size();
+					}
+
+					let gas_limit = _gas_limit.min(u64::MAX.into()).low_u64();
+
+					let (weight_limit, proof_size_base_cost) =
+						match <Runtime as pallet_evm::Config>::GasWeightMapping::gas_to_weight(
+							gas_limit,
+							without_base_extrinsic_weight
+						) {
+							weight_limit if weight_limit.proof_size() > 0 => {
+								(Some(weight_limit), Some(estimated_transaction_len as u64))
+							}
+							_ => (None, None),
+						};
+
+					let _ = <Runtime as pallet_evm::Config>::Runner::call(
+						_from,
+						_to,
+						_data,
+						_value,
+						gas_limit,
+						_max_fee_per_gas,
+						_max_priority_fee_per_gas,
+						_nonce,
+						_access_list.unwrap_or_default(),
+						_is_transactional,
+						validate,
+						weight_limit,
+						proof_size_base_cost,
+						<Runtime as pallet_evm::Config>::config(),
+					);
+				});
 				Ok(())
 			}
 			#[cfg(not(feature = "evm-tracing"))]
@@ -632,6 +782,7 @@ sp_api::impl_runtime_apis! {
 		}
 	}
 
+
 	#[cfg(feature = "runtime-benchmarks")]
 	impl frame_benchmarking::Benchmark<Block> for Runtime {
 		fn benchmark_metadata(extra: bool) -> (
diff --git a/runtime/koi/src/pallets.rs b/runtime/koi/src/pallets.rs
index dd034f87e..d8bb291d0 100644
--- a/runtime/koi/src/pallets.rs
+++ b/runtime/koi/src/pallets.rs
@@ -88,8 +88,10 @@ mod dmp_queue;
 mod message_queue;
 
 mod asset_manager;
+pub use asset_manager::*;
 
 mod orml_xtokens;
+pub use orml_xtokens::*;
 
 mod asset_limit;
 
diff --git a/runtime/koi/src/pallets/asset_manager.rs b/runtime/koi/src/pallets/asset_manager.rs
index 367ee257f..ef44abae1 100644
--- a/runtime/koi/src/pallets/asset_manager.rs
+++ b/runtime/koi/src/pallets/asset_manager.rs
@@ -16,20 +16,28 @@
 // You should have received a copy of the GNU General Public License
 // along with Darwinia. If not, see <https://www.gnu.org/licenses/>.
 
-// crates.io
-use codec::{Decode, Encode};
 // darwinia
-use crate::*;
-// polkadot
+use crate::{AssetId, Assets, *};
+// polkadot-sdk
 use xcm::prelude::*;
 
+frame_support::parameter_types! {
+	/// 1000 is AssetHub paraId.
+	/// 50 is pallet-assets index on AssetHub.
+	/// 7777 is the id of Test USDT on AssetHub(Rococo).
+	pub UsdtLocation: xcm::v3::Location = xcm::v3::Location::new(
+		1,
+		xcm::v3::prelude::X3(xcm::v3::prelude::Parachain(1000), xcm::v3::prelude::PalletInstance(50), xcm::v3::prelude::GeneralIndex(7777))
+	);
+}
+
 // We instruct how to register the Assets
 // In this case, we tell it to create an Asset in pallet-assets
 pub struct AssetRegistrar;
 impl pallet_asset_manager::AssetRegistrar<Runtime> for AssetRegistrar {
 	#[frame_support::transactional]
 	fn create_foreign_asset(
-		asset: crate::AssetId,
+		asset: AssetId,
 		min_balance: Balance,
 		metadata: xcm_configs::AssetRegistrarMetadata,
 		is_sufficient: bool,
@@ -54,13 +62,14 @@ impl pallet_asset_manager::AssetRegistrar<Runtime> for AssetRegistrar {
 	}
 
 	#[frame_support::transactional]
-	fn destroy_foreign_asset(asset: crate::AssetId) -> sp_runtime::DispatchResult {
+	fn destroy_foreign_asset(asset: AssetId) -> sp_runtime::DispatchResult {
 		// Mark the asset as destroying
 		Assets::start_destroy(RuntimeOrigin::root(), asset.into())?;
+
 		Ok(())
 	}
 
-	fn destroy_asset_dispatch_info_weight(asset: crate::AssetId) -> frame_support::weights::Weight {
+	fn destroy_asset_dispatch_info_weight(asset: AssetId) -> frame_support::weights::Weight {
 		// substrate
 		use frame_support::dispatch::GetDispatchInfo;
 
@@ -75,26 +84,18 @@ impl pallet_asset_manager::AssetRegistrar<Runtime> for AssetRegistrar {
 	}
 }
 
-pub struct LocalAssetIdCreator;
-impl pallet_asset_manager::LocalAssetIdCreator<Runtime> for LocalAssetIdCreator {
-	fn create_asset_id_from_metadata(_local_asset_counter: u128) -> crate::AssetId {
-		// We don't need to create local asset.
-		0
-	}
-}
-
 // Our AssetType. For now we only handle Xcm Assets
-#[derive(Clone, Eq, Debug, PartialEq, Ord, PartialOrd, Encode, Decode, scale_info::TypeInfo)]
+#[derive(Clone, Eq, Debug, PartialEq, Ord, PartialOrd, Encode, Decode, TypeInfo)]
 pub enum AssetType {
-	Xcm(Location),
+	Xcm(xcm::v3::Location),
 }
 impl Default for AssetType {
 	fn default() -> Self {
-		Self::Xcm(Location::here())
+		Self::Xcm(xcm::v3::Location::here())
 	}
 }
-impl From<Location> for AssetType {
-	fn from(location: Location) -> Self {
+impl From<xcm::v3::Location> for AssetType {
+	fn from(location: xcm::v3::Location) -> Self {
 		Self::Xcm(location)
 	}
 }
@@ -120,35 +121,30 @@ impl From<AssetType> for crate::AssetId {
 	}
 }
 #[allow(clippy::from_over_into)]
-impl Into<Option<Location>> for AssetType {
-	fn into(self) -> Option<Location> {
+impl Into<Option<xcm::v3::Location>> for AssetType {
+	fn into(self) -> Option<xcm::v3::Location> {
 		match self {
 			Self::Xcm(location) => Some(location),
 		}
 	}
 }
+// This can be removed once we fully adopt xcm::v4 everywhere
+impl TryFrom<Location> for AssetType {
+	type Error = ();
 
-frame_support::parameter_types! {
-	/// 1000 is AssetHub paraId.
-	/// 50 is pallet-assets index on AssetHub.
-	/// 7777 is the id of Test USDT on AssetHub(Rococo).
-	pub UsdtLocation: Location = Location::new(
-		1,
-		X3(Parachain(1000), PalletInstance(50), GeneralIndex(7777))
-	);
+	fn try_from(location: Location) -> Result<Self, Self::Error> {
+		Ok(Self::Xcm(location.try_into()?))
+	}
 }
 
 impl pallet_asset_manager::Config for Runtime {
-	type AssetId = crate::AssetId;
+	type AssetId = AssetId;
 	type AssetRegistrar = AssetRegistrar;
 	type AssetRegistrarMetadata = xcm_configs::AssetRegistrarMetadata;
 	type Balance = Balance;
-	type Currency = Balances;
 	type ForeignAssetModifierOrigin = RootOr<GeneralAdmin>;
 	type ForeignAssetType = AssetType;
-	type LocalAssetDeposit = ConstU128<0>;
-	type LocalAssetIdCreator = LocalAssetIdCreator;
-	type LocalAssetModifierOrigin = RootOr<GeneralAdmin>;
 	type RuntimeEvent = RuntimeEvent;
-	type WeightInfo = pallet_asset_manager::weights::SubstrateWeight<Runtime>;
+	// type WeightInfo = pallet_asset_manager::weights::SubstrateWeight<Runtime>;
+	type WeightInfo = ();
 }
diff --git a/runtime/koi/src/pallets/assets.rs b/runtime/koi/src/pallets/assets.rs
index 7c9a88bca..0f97927f8 100644
--- a/runtime/koi/src/pallets/assets.rs
+++ b/runtime/koi/src/pallets/assets.rs
@@ -40,7 +40,7 @@ impl pallet_assets::Config for Runtime {
 	type CreateOrigin = frame_support::traits::AsEnsureOriginWithArg<
 		frame_system::EnsureSignedBy<
 			frame_support::traits::IsInVec<pallet_config::AssetCreators>,
-			AccountId,
+			Self::AccountId,
 		>,
 	>;
 	type Currency = Balances;
@@ -52,5 +52,6 @@ impl pallet_assets::Config for Runtime {
 	type RemoveItemsLimit = ConstU32<1000>;
 	type RuntimeEvent = RuntimeEvent;
 	type StringLimit = ConstU32<50>;
-	type WeightInfo = weights::pallet_assets::WeightInfo<Self>;
+	// type WeightInfo = weights::pallet_assets::WeightInfo<Self>;
+	type WeightInfo = ();
 }
diff --git a/runtime/koi/src/pallets/balances.rs b/runtime/koi/src/pallets/balances.rs
index 35bfd308e..91274a7f0 100644
--- a/runtime/koi/src/pallets/balances.rs
+++ b/runtime/koi/src/pallets/balances.rs
@@ -32,5 +32,6 @@ impl pallet_balances::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type RuntimeFreezeReason = RuntimeFreezeReason;
 	type RuntimeHoldReason = RuntimeHoldReason;
-	type WeightInfo = weights::pallet_balances::WeightInfo<Self>;
+	// type WeightInfo = weights::pallet_balances::WeightInfo<Self>;
+	type WeightInfo = ();
 }
diff --git a/runtime/koi/src/pallets/deposit.rs b/runtime/koi/src/pallets/deposit.rs
index 6f3f90ed0..029fa49d5 100644
--- a/runtime/koi/src/pallets/deposit.rs
+++ b/runtime/koi/src/pallets/deposit.rs
@@ -49,5 +49,6 @@ impl darwinia_deposit::Config for Runtime {
 	type MinLockingAmount = ConstU128<UNIT>;
 	type Ring = Balances;
 	type RuntimeEvent = RuntimeEvent;
-	type WeightInfo = weights::darwinia_deposit::WeightInfo<Self>;
+	// type WeightInfo = weights::darwinia_deposit::WeightInfo<Self>;
+	type WeightInfo = ();
 }
diff --git a/runtime/koi/src/pallets/dmp_queue.rs b/runtime/koi/src/pallets/dmp_queue.rs
index a1464981b..0db751ffd 100644
--- a/runtime/koi/src/pallets/dmp_queue.rs
+++ b/runtime/koi/src/pallets/dmp_queue.rs
@@ -23,5 +23,6 @@ impl cumulus_pallet_dmp_queue::Config for Runtime {
 	type DmpSink =
 		frame_support::traits::EnqueueWithOrigin<MessageQueue, pallet_config::RelayOrigin>;
 	type RuntimeEvent = RuntimeEvent;
+	// type WeightInfo = ();
 	type WeightInfo = ();
 }
diff --git a/runtime/koi/src/pallets/evm.rs b/runtime/koi/src/pallets/evm.rs
index 6a0e45f70..749ee4683 100644
--- a/runtime/koi/src/pallets/evm.rs
+++ b/runtime/koi/src/pallets/evm.rs
@@ -18,16 +18,16 @@
 
 // darwinia
 use crate::*;
-// substrate
-use cumulus_primitives_core::relay_chain::MAX_POV_SIZE;
-use frame_support::dispatch::{DispatchClass, GetDispatchInfo, Pays};
 // frontier
 use pallet_evm::{ExitError, IsPrecompileResult, Precompile};
 use pallet_evm_precompile_dispatch::DispatchValidateT;
+// polkadot-sdk
+use cumulus_primitives_core::relay_chain::MAX_POV_SIZE;
+use frame_support::dispatch::{DispatchClass, GetDispatchInfo, Pays};
 
 const BLOCK_GAS_LIMIT: u64 = 20_000_000;
 frame_support::parameter_types! {
-	pub BlockGasLimit: sp_core::U256 = sp_core::U256::from(BLOCK_GAS_LIMIT);
+	pub BlockGasLimit: U256 = U256::from(BLOCK_GAS_LIMIT);
 	// Restrict the POV size of the Ethereum transactions in the same way as weight limit.
 	pub BlockPovSizeLimit: u64 = NORMAL_DISPATCH_RATIO * MAX_POV_SIZE as u64;
 	pub PrecompilesValue: KoiPrecompiles<Runtime> = KoiPrecompiles::<_>::new();
@@ -49,7 +49,7 @@ where
 		Self(Default::default())
 	}
 
-	pub fn used_addresses() -> [sp_core::H160; 26] {
+	pub fn used_addresses() -> [H160; 26] {
 		[
 			addr(0x01),
 			addr(0x02),
@@ -150,7 +150,7 @@ where
 		}
 	}
 
-	fn is_precompile(&self, address: sp_core::H160, _gas: u64) -> IsPrecompileResult {
+	fn is_precompile(&self, address: H160, _gas: u64) -> IsPrecompileResult {
 		IsPrecompileResult::Answer {
 			is_precompile: Self::used_addresses().contains(&address),
 			extra_cost: 0,
@@ -160,7 +160,7 @@ where
 
 pub struct TransactionPaymentGasPrice;
 impl pallet_evm::FeeCalculator for TransactionPaymentGasPrice {
-	fn min_gas_price() -> (sp_core::U256, frame_support::weights::Weight) {
+	fn min_gas_price() -> (U256, frame_support::weights::Weight) {
 		// substrate
 		use frame_support::weights::WeightToFee;
 		use sp_runtime::FixedPointNumber;
@@ -177,33 +177,6 @@ impl pallet_evm::FeeCalculator for TransactionPaymentGasPrice {
 	}
 }
 
-impl pallet_evm::Config for Runtime {
-	type AddressMapping = pallet_evm::IdentityAddressMapping;
-	type BlockGasLimit = BlockGasLimit;
-	type BlockHashMapping = pallet_ethereum::EthereumBlockHashMapping<Self>;
-	type CallOrigin = pallet_evm::EnsureAddressRoot<AccountId>;
-	type ChainId = ConstU64<701>;
-	type Currency = Balances;
-	type FeeCalculator = TransactionPaymentGasPrice;
-	type FindAuthor = FindAuthor<pallet_session::FindAccountFromAuthorIndex<Self, Aura>>;
-	type GasLimitPovSizeRatio = GasLimitPovSizeRatio;
-	type GasWeightMapping = pallet_evm::FixedGasWeightMapping<Self>;
-	type OnChargeTransaction = pallet_evm::EVMFungibleAdapter<Balances, ()>;
-	type OnCreate = ();
-	type PrecompilesType = KoiPrecompiles<Self>;
-	type PrecompilesValue = PrecompilesValue;
-	type Runner = pallet_evm::runner::stack::Runner<Self>;
-	type RuntimeEvent = RuntimeEvent;
-	type Timestamp = Timestamp;
-	type WeightInfo = ();
-	type WeightPerGas = WeightPerGas;
-	type WithdrawOrigin = pallet_evm::EnsureAddressNever<AccountId>;
-}
-
-fn addr(a: u64) -> sp_core::H160 {
-	sp_core::H160::from_low_u64_be(a)
-}
-
 /// Validation rule for dispatch precompile
 pub struct DarwiniaDispatchValidator;
 impl DispatchValidateT<AccountId, RuntimeCall> for DarwiniaDispatchValidator {
@@ -234,3 +207,32 @@ impl DispatchValidateT<AccountId, RuntimeCall> for DarwiniaDispatchValidator {
 		}
 	}
 }
+
+fn addr(a: u64) -> H160 {
+	H160::from_low_u64_be(a)
+}
+
+impl pallet_evm::Config for Runtime {
+	type AddressMapping = pallet_evm::IdentityAddressMapping;
+	type BlockGasLimit = BlockGasLimit;
+	type BlockHashMapping = pallet_ethereum::EthereumBlockHashMapping<Self>;
+	type CallOrigin = pallet_evm::EnsureAddressRoot<Self::AccountId>;
+	type ChainId = ConstU64<701>;
+	type Currency = Balances;
+	type FeeCalculator = TransactionPaymentGasPrice;
+	type FindAuthor = FindAuthor<pallet_session::FindAccountFromAuthorIndex<Self, Aura>>;
+	type GasLimitPovSizeRatio = GasLimitPovSizeRatio;
+	type GasWeightMapping = pallet_evm::FixedGasWeightMapping<Self>;
+	type OnChargeTransaction = pallet_evm::EVMFungibleAdapter<Balances, ()>;
+	type OnCreate = ();
+	type PrecompilesType = KoiPrecompiles<Self>;
+	type PrecompilesValue = PrecompilesValue;
+	type Runner = pallet_evm::runner::stack::Runner<Self>;
+	type RuntimeEvent = RuntimeEvent;
+	type SuicideQuickClearLimit = ();
+	type Timestamp = Timestamp;
+	// type WeightInfo = ();
+	type WeightInfo = ();
+	type WeightPerGas = WeightPerGas;
+	type WithdrawOrigin = pallet_evm::EnsureAddressNever<Self::AccountId>;
+}
diff --git a/runtime/koi/src/pallets/governance.rs b/runtime/koi/src/pallets/governance.rs
index 7383ee5a3..11a003843 100644
--- a/runtime/koi/src/pallets/governance.rs
+++ b/runtime/koi/src/pallets/governance.rs
@@ -54,7 +54,8 @@ impl pallet_collective::Config<TechnicalCollective> for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type RuntimeOrigin = RuntimeOrigin;
 	type SetMembersOrigin = RootOr<GeneralAdmin>;
-	type WeightInfo = weights::pallet_collective::WeightInfo<Self>;
+	// type WeightInfo = weights::pallet_collective::WeightInfo<Self>;
+	type WeightInfo = ();
 }
 
 impl pallet_conviction_voting::Config for Runtime {
@@ -64,7 +65,8 @@ impl pallet_conviction_voting::Config for Runtime {
 	type Polls = Referenda;
 	type RuntimeEvent = RuntimeEvent;
 	type VoteLockingPeriod = Time2;
-	type WeightInfo = weights::pallet_conviction_voting::WeightInfo<Self>;
+	// type WeightInfo = weights::pallet_conviction_voting::WeightInfo<Self>;
+	type WeightInfo = ();
 }
 
 pallet_referenda::impl_tracksinfo_get!(TracksInfo, Balance, BlockNumber);
@@ -81,12 +83,13 @@ impl pallet_referenda::Config for Runtime {
 	type Scheduler = Scheduler;
 	type Slash = Treasury;
 	type SubmissionDeposit = ConstU128<{ DARWINIA_PROPOSAL_REQUIREMENT }>;
-	type SubmitOrigin = frame_system::EnsureSigned<AccountId>;
+	type SubmitOrigin = frame_system::EnsureSigned<Self::AccountId>;
 	type Tally = pallet_conviction_voting::TallyOf<Self>;
 	type Tracks = TracksInfo;
 	type UndecidingTimeout = Time2;
 	type Votes = pallet_conviction_voting::VotesOf<Self>;
-	type WeightInfo = weights::pallet_referenda::WeightInfo<Self>;
+	// type WeightInfo = weights::pallet_referenda::WeightInfo<Self>;
+	type WeightInfo = ();
 }
 
 impl custom_origins::Config for Runtime {}
@@ -98,7 +101,8 @@ impl pallet_whitelist::Config for Runtime {
 	type Preimages = Preimage;
 	type RuntimeCall = RuntimeCall;
 	type RuntimeEvent = RuntimeEvent;
-	type WeightInfo = weights::pallet_whitelist::WeightInfo<Self>;
+	// type WeightInfo = weights::pallet_whitelist::WeightInfo<Self>;
+	type WeightInfo = ();
 	type WhitelistOrigin = RootOrAtLeastFourFifth<TechnicalCollective>;
 }
 
@@ -108,12 +112,19 @@ frame_support::parameter_types! {
 
 impl pallet_treasury::Config for Runtime {
 	type ApproveOrigin = RootOr<GeneralAdmin>;
+	type AssetKind = ();
+	type BalanceConverter = frame_support::traits::tokens::UnityAssetBalanceConversion;
+	type Beneficiary = Self::AccountId;
+	type BeneficiaryLookup = Self::Lookup;
 	type Burn = ();
 	type BurnDestination = ();
 	type Currency = Balances;
 	type MaxApprovals = ConstU32<100>;
 	type OnSlash = Treasury;
 	type PalletId = pallet_config::TreasuryPid;
+	type Paymaster =
+		frame_support::traits::tokens::PayFromAccount<Balances, pallet_config::TreasuryAccount>;
+	type PayoutPeriod = Time1;
 	type ProposalBond = ProposalBond;
 	type ProposalBondMaximum = ();
 	type ProposalBondMinimum = ConstU128<DARWINIA_PROPOSAL_REQUIREMENT>;
@@ -121,9 +132,10 @@ impl pallet_treasury::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type SpendFunds = ();
 	type SpendOrigin = EitherOf<
-		frame_system::EnsureRootWithSuccess<AccountId, pallet_config::MaxBalance>,
+		frame_system::EnsureRootWithSuccess<Self::AccountId, pallet_config::MaxBalance>,
 		Spender,
 	>;
 	type SpendPeriod = Time1;
-	type WeightInfo = weights::pallet_treasury::WeightInfo<Self>;
+	// type WeightInfo = weights::pallet_treasury::WeightInfo<Self>;
+	type WeightInfo = ();
 }
diff --git a/runtime/koi/src/pallets/message_queue.rs b/runtime/koi/src/pallets/message_queue.rs
index 58643817f..f54e011fe 100644
--- a/runtime/koi/src/pallets/message_queue.rs
+++ b/runtime/koi/src/pallets/message_queue.rs
@@ -32,15 +32,16 @@ impl pallet_message_queue::Config for Runtime {
 	>;
 	#[cfg(not(feature = "runtime-benchmarks"))]
 	type MessageProcessor = xcm_builder::ProcessXcmMessage<
-		AggregateMessageOrigin,
+		cumulus_primitives_core::AggregateMessageOrigin,
 		xcm_executor::XcmExecutor<XcmExecutorConfig>,
 		RuntimeCall,
 	>;
 	// The XCMP queue pallet is only ever able to handle the `Sibling(ParaId)` origin:
-	type QueueChangeHandler = NarrowOriginToSibling<XcmpQueue>;
-	type QueuePausedQuery = NarrowOriginToSibling<XcmpQueue>;
+	type QueueChangeHandler = message_queue::NarrowOriginToSibling<XcmpQueue>;
+	type QueuePausedQuery = message_queue::NarrowOriginToSibling<XcmpQueue>;
 	type RuntimeEvent = RuntimeEvent;
 	type ServiceWeight = MessageQueueServiceWeight;
 	type Size = u32;
+	// type WeightInfo = ();
 	type WeightInfo = ();
 }
diff --git a/runtime/koi/src/pallets/orml_xtokens.rs b/runtime/koi/src/pallets/orml_xtokens.rs
index 503d0fda1..77c347b83 100644
--- a/runtime/koi/src/pallets/orml_xtokens.rs
+++ b/runtime/koi/src/pallets/orml_xtokens.rs
@@ -17,32 +17,30 @@
 // along with Darwinia. If not, see <https://www.gnu.org/licenses/>.
 
 // darwinia
-use crate::*;
+use crate::{AssetId, *};
 // polkadot
 use xcm::latest::prelude::*;
 
 // Our currencyId. We distinguish for now between SelfReserve, and Others, defined by their Id.
-#[derive(
-	Clone, Debug, PartialEq, Eq, PartialOrd, Ord, codec::Encode, codec::Decode, scale_info::TypeInfo,
-)]
+#[derive(Clone, Debug, PartialEq, Eq, PartialOrd, Ord, Encode, Decode, TypeInfo)]
 pub enum CurrencyId {
 	// Our native token
 	SelfReserve,
 	// Assets representing other chains native tokens
-	ForeignAsset(crate::AssetId),
+	ForeignAsset(AssetId),
 }
 
 // How to convert from CurrencyId to Location
-pub struct CurrencyIdtoMultiLocation<AssetXConverter>(core::marker::PhantomData<AssetXConverter>);
+pub struct CurrencyIdToLocation<AssetXConverter>(core::marker::PhantomData<AssetXConverter>);
 impl<AssetXConverter> sp_runtime::traits::Convert<CurrencyId, Option<Location>>
-	for CurrencyIdtoMultiLocation<AssetXConverter>
+	for CurrencyIdToLocation<AssetXConverter>
 where
-	AssetXConverter: sp_runtime::traits::MaybeEquivalence<Location, crate::AssetId>,
+	AssetXConverter: sp_runtime::traits::MaybeEquivalence<Location, AssetId>,
 {
 	fn convert(currency: CurrencyId) -> Option<Location> {
 		match currency {
 			CurrencyId::SelfReserve => {
-				let multi: Location = pallets::polkadot_xcm::AnchoringSelfReserve::get();
+				let multi: Location = SelfReserve::get();
 				Some(multi)
 			},
 			CurrencyId::ForeignAsset(asset) => AssetXConverter::convert_back(&asset),
@@ -58,34 +56,26 @@ frame_support::parameter_types! {
 	pub SelfLocation: Location = Location::here();
 	// We need this to be able to catch when someone is trying to execute a non-
 	// cross-chain transfer in xtokens through the absolute path way
-	pub SelfLocationAbsolute: Location = Location {
-		parents:1,
-		interior: Junctions::Junctions::X1(
-			Parachain(ParachainInfo::parachain_id().into())
-		)
-	};
+	pub SelfLocationAbsolute: Location = Location::new(1, [Parachain(ParachainInfo::parachain_id().into())]);
 }
 
 impl orml_xtokens::Config for Runtime {
-	type AccountIdToMultiLocation = xcm_primitives::AccountIdToMultiLocation<AccountId>;
+	type AccountIdToLocation = xcm_primitives::AccountIdToLocation<Self::AccountId>;
 	type Balance = Balance;
 	type BaseXcmWeight = BaseXcmWeight;
 	type CurrencyId = CurrencyId;
-	type CurrencyIdConvert = CurrencyIdtoMultiLocation<
-		xcm_primitives::AsAssetType<
-			crate::AssetId,
-			pallets::asset_manager::AssetType,
-			AssetManager,
-		>,
-	>;
+	type CurrencyIdConvert =
+		CurrencyIdToLocation<xcm_primitives::AsAssetType<AssetId, AssetType, AssetManager>>;
+	type LocationsFilter = frame_support::traits::Everything;
 	type MaxAssetsForTransfer = MaxAssetsForTransfer;
 	// We don't have this case: fee_reserve != non_fee_reserve
 	type MinXcmFee = orml_xcm_support::DisabledParachainFee;
-	type MultiLocationsFilter = frame_support::traits::Everything;
+	type RateLimiter = ();
+	type RateLimiterId = ();
 	type ReserveProvider = xcm_primitives::AbsoluteAndRelativeReserve<SelfLocationAbsolute>;
 	type RuntimeEvent = RuntimeEvent;
 	type SelfLocation = SelfLocation;
 	type UniversalLocation = UniversalLocation;
-	type Weigher = pallets::polkadot_xcm::XcmWeigher;
-	type XcmExecutor = xcm_executor::XcmExecutor<pallets::polkadot_xcm::XcmExecutorConfig>;
+	type Weigher = XcmWeigher;
+	type XcmExecutor = xcm_executor::XcmExecutor<XcmExecutorConfig>;
 }
diff --git a/runtime/koi/src/pallets/parachain_system.rs b/runtime/koi/src/pallets/parachain_system.rs
index b5e9c97b9..340fdf352 100644
--- a/runtime/koi/src/pallets/parachain_system.rs
+++ b/runtime/koi/src/pallets/parachain_system.rs
@@ -34,5 +34,6 @@ impl cumulus_pallet_parachain_system::Config for Runtime {
 	type ReservedXcmpWeight = ReservedXcmpWeight;
 	type RuntimeEvent = RuntimeEvent;
 	type SelfParaId = parachain_info::Pallet<Self>;
+	type WeightInfo = ();
 	type XcmpMessageHandler = XcmpQueue;
 }
diff --git a/runtime/koi/src/pallets/polkadot_xcm.rs b/runtime/koi/src/pallets/polkadot_xcm.rs
index 0574882dd..b634aa391 100644
--- a/runtime/koi/src/pallets/polkadot_xcm.rs
+++ b/runtime/koi/src/pallets/polkadot_xcm.rs
@@ -17,9 +17,8 @@
 // along with Darwinia. If not, see <https://www.gnu.org/licenses/>.
 
 // darwinia
-use crate::*;
+use crate::{AssetId, Assets, *};
 // substrate
-use frame_support::traits::Currency;
 use xcm::latest::prelude::*;
 
 frame_support::parameter_types! {
@@ -29,9 +28,9 @@ frame_support::parameter_types! {
 	/// A temporary weight value for each XCM instruction.
 	/// NOTE: This should be removed after we account for PoV weights.
 	pub const TempFixedXcmWeight: frame_support::weights::Weight = frame_support::weights::Weight::from_parts(1_000_000_000, 0);
-	pub AnchoringSelfReserve: Location = Location::new(
+	pub SelfReserve: Location = Location::new(
 		0,
-		Junctions::X1(PalletInstance(<Balances as frame_support::traits::PalletInfoAccess>::index() as u8))
+		[PalletInstance(<Balances as frame_support::traits::PalletInfoAccess>::index() as u8)]
 	);
 	pub UniversalLocation: InteriorLocation = Parachain(ParachainInfo::parachain_id().into()).into();
 	/// The amount of weight an XCM operation takes. This is a safe overestimate.
@@ -39,25 +38,20 @@ frame_support::parameter_types! {
 	/// Xcm fees will go to the treasury account
 	pub XcmFeesAccount: AccountId = Treasury::account_id();
 	pub RelayChainOrigin: RuntimeOrigin = cumulus_pallet_xcm::Origin::Relay.into();
-	pub SelfReserve: Location = Location {
-		parents:0,
-		interior: [
-			PalletInstance(<Balances as PalletInfoAccess>::index() as u8)
-		].into()
-	};
 }
 
-/// Means for transacting assets on this chain.
-pub type LocalAssetTransactor = xcm_builder::CurrencyAdapter<
+/// The transactor for our own chain currency.
+pub type LocalAssetTransactor = xcm_builder::FungibleAdapter<
 	// Use this currency:
 	Balances,
-	// Use this currency when it is a fungible asset matching the given location or name:
-	xcm_builder::IsConcrete<AnchoringSelfReserve>,
-	// Do a simple punn to convert an AccountId32 Location into a native chain account ID:
+	// Use this currency when it is a fungible asset matching any of the locations in
+	// SelfReserveRepresentations
+	xcm_builder::IsConcrete<SelfReserve>,
+	// We can convert the MultiLocations with our converter above:
 	LocationToAccountId,
 	// Our chain's account ID type (we can't get away without mentioning it explicitly):
 	AccountId,
-	// We don't track any teleports.
+	// We dont allow teleport
 	(),
 >;
 // The non-reserve fungible transactor type
@@ -68,13 +62,9 @@ pub type ForeignFungiblesTransactor = xcm_builder::FungiblesAdapter<
 	// Use this currency when it is a fungible asset matching the given location or name:
 	(
 		xcm_builder::ConvertedConcreteId<
-			crate::AssetId,
+			AssetId,
 			Balance,
-			xcm_primitives::AsAssetType<
-				crate::AssetId,
-				pallets::asset_manager::AssetType,
-				AssetManager,
-			>,
+			xcm_primitives::AsAssetType<AssetId, AssetType, AssetManager>,
 			xcm_executor::traits::JustTry,
 		>,
 	),
@@ -87,11 +77,7 @@ pub type ForeignFungiblesTransactor = xcm_builder::FungiblesAdapter<
 	// We dont track any teleports
 	(),
 >;
-pub type AssetTransactors = (
-	// The transactor for our native asset.
-	LocalAssetTransactor,
-	ForeignFungiblesTransactor,
-);
+pub type AssetTransactors = (LocalAssetTransactor, ForeignFungiblesTransactor);
 /// Type for specifying how a `Location` can be converted into an `AccountId`. This is used
 /// when determining ownership of accounts for asset transacting and when attempting to use XCM
 /// `Transact` in order to determine the dispatch Origin.
@@ -103,7 +89,7 @@ pub type LocationToAccountId = (
 	// Straight up local `AccountId20` origins just alias directly to `AccountId`.
 	xcm_builder::AccountKey20Aliases<RelayNetwork, AccountId>,
 	// The rest of locations are converted via hashing it.
-	darwinia_common_runtime::xcm_configs::Account20Hash<AccountId>,
+	xcm_configs::Account20Hash<AccountId>,
 );
 /// This is the type we use to convert an (incoming) XCM origin into a local `Origin` instance,
 /// ready for dispatching a transaction with Xcm's `Transact`. There is an `OriginKind` which can
@@ -138,10 +124,12 @@ pub type Barrier = xcm_builder::TrailingSetTopicAsId<
 					// Parent, its pluralities (i.e. governance bodies), and the Fellows plurality
 					// get free execution.
 					xcm_builder::AllowExplicitUnpaidExecutionFrom<
-						darwinia_common_runtime::xcm_configs::ParentOrParentsPlurality,
+						xcm_configs::ParentOrParentsPlurality,
 					>,
 					// Subscriptions for version tracking are OK.
-					xcm_builder::AllowSubscriptionsFrom<ParentRelayOrSiblingParachains>,
+					xcm_builder::AllowSubscriptionsFrom<
+						xcm_configs::ParentRelayOrSiblingParachains,
+					>,
 				),
 				UniversalLocation,
 				ConstU32<8>,
@@ -158,13 +146,9 @@ pub type XcmFeesToAccount = xcm_primitives::XcmFeesToAccount<
 	Assets,
 	(
 		xcm_builder::ConvertedConcreteId<
-			crate::AssetId,
+			AssetId,
 			Balance,
-			xcm_primitives::AsAssetType<
-				crate::AssetId,
-				pallets::asset_manager::AssetType,
-				AssetManager,
-			>,
+			xcm_primitives::AsAssetType<AssetId, AssetType, AssetManager>,
 			xcm_executor::traits::JustTry,
 		>,
 	),
@@ -225,7 +209,7 @@ impl xcm_executor::Config for XcmExecutorConfig {
 	type CallDispatcher = XcmCallDispatcher;
 	type FeeManager = ();
 	type IsReserve = orml_xcm_support::MultiNativeAsset<
-		xcm_primitives::AbsoluteAndRelativeReserve<pallets::orml_xtokens::SelfLocationAbsolute>,
+		xcm_primitives::AbsoluteAndRelativeReserve<SelfLocationAbsolute>,
 	>;
 	type IsTeleporter = ();
 	type MaxAssetsIntoHolding = MaxAssetsIntoHolding;
@@ -244,11 +228,7 @@ impl xcm_executor::Config for XcmExecutorConfig {
 			Balances,
 			DealWithFees<Runtime>,
 		>,
-		xcm_primitives::FirstAssetTrader<
-			pallets::asset_manager::AssetType,
-			AssetManager,
-			XcmFeesToAccount,
-		>,
+		xcm_primitives::FirstAssetTrader<AssetType, AssetManager, XcmFeesToAccount>,
 	);
 	type TransactionalProcessor = xcm_builder::FrameTransactionalProcessor;
 	type UniversalAliases = frame_support::traits::Nothing;
diff --git a/runtime/koi/src/pallets/preimage.rs b/runtime/koi/src/pallets/preimage.rs
index b23165866..9863af883 100644
--- a/runtime/koi/src/pallets/preimage.rs
+++ b/runtime/koi/src/pallets/preimage.rs
@@ -20,20 +20,25 @@
 use crate::*;
 
 frame_support::parameter_types! {
-	pub const PreimageBaseDeposit: Balance = deposit(2, 64);
-	pub const PreimageByteDeposit: Balance = deposit(0, 1);
+	pub const PreimageBaseDeposit: Balance = darwinia_deposit(2, 64);
+	pub const PreimageByteDeposit: Balance = darwinia_deposit(0, 1);
 	pub const PreimageHoldReason: RuntimeHoldReason = RuntimeHoldReason::Preimage(pallet_preimage::HoldReason::Preimage);
 }
 
 impl pallet_preimage::Config for Runtime {
-	type Consideration = HoldConsideration<
-		AccountId,
+	type Consideration = frame_support::traits::fungible::HoldConsideration<
+		Self::AccountId,
 		Balances,
 		PreimageHoldReason,
-		LinearStoragePrice<PreimageBaseDeposit, PreimageByteDeposit, Balance>,
+		frame_support::traits::LinearStoragePrice<
+			PreimageBaseDeposit,
+			PreimageByteDeposit,
+			Balance,
+		>,
 	>;
 	type Currency = Balances;
-	type ManagerOrigin = Root;
+	type ManagerOrigin = RootOr<GeneralAdmin>;
 	type RuntimeEvent = RuntimeEvent;
-	type WeightInfo = weights::pallet_preimage::WeightInfo<Self>;
+	// type WeightInfo = weights::pallet_preimage::WeightInfo<Self>;
+	type WeightInfo = ();
 }
diff --git a/runtime/koi/src/pallets/proxy.rs b/runtime/koi/src/pallets/proxy.rs
index bc86e6327..64c9a802c 100644
--- a/runtime/koi/src/pallets/proxy.rs
+++ b/runtime/koi/src/pallets/proxy.rs
@@ -27,11 +27,11 @@ use crate::*;
 	PartialEq,
 	Ord,
 	PartialOrd,
-	codec::Encode,
-	codec::Decode,
-	codec::MaxEncodedLen,
-	scale_info::TypeInfo,
-	sp_runtime::RuntimeDebug,
+	Encode,
+	Decode,
+	MaxEncodedLen,
+	TypeInfo,
+	RuntimeDebug,
 )]
 pub enum ProxyType {
 	#[codec(index = 0)]
@@ -83,7 +83,6 @@ impl frame_support::traits::InstanceFilter<RuntimeCall> for ProxyType {
 			ProxyType::CancelProxy => {
 				matches!(c, RuntimeCall::Proxy(pallet_proxy::Call::reject_announcement { .. }))
 			},
-			_ => false,
 		}
 	}
 
@@ -112,5 +111,6 @@ impl pallet_proxy::Config for Runtime {
 	type ProxyType = ProxyType;
 	type RuntimeCall = RuntimeCall;
 	type RuntimeEvent = RuntimeEvent;
-	type WeightInfo = weights::pallet_proxy::WeightInfo<Self>;
+	// type WeightInfo = weights::pallet_proxy::WeightInfo<Self>;
+	type WeightInfo = ();
 }
diff --git a/runtime/koi/src/pallets/scheduler.rs b/runtime/koi/src/pallets/scheduler.rs
index b2b4f26e5..30bbdd8e7 100644
--- a/runtime/koi/src/pallets/scheduler.rs
+++ b/runtime/koi/src/pallets/scheduler.rs
@@ -65,5 +65,6 @@ impl pallet_scheduler::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type RuntimeOrigin = RuntimeOrigin;
 	type ScheduleOrigin = RootOr<GeneralAdmin>;
-	type WeightInfo = weights::pallet_scheduler::WeightInfo<Self>;
+	// type WeightInfo = weights::pallet_scheduler::WeightInfo<Self>;
+	type WeightInfo = ();
 }
diff --git a/runtime/koi/src/pallets/session.rs b/runtime/koi/src/pallets/session.rs
index 5f41c2898..5629b9c1f 100644
--- a/runtime/koi/src/pallets/session.rs
+++ b/runtime/koi/src/pallets/session.rs
@@ -38,8 +38,9 @@ impl pallet_session::Config for Runtime {
 	type SessionHandler = <SessionKeys as sp_runtime::traits::OpaqueKeys>::KeyTypeIdProviders;
 	type SessionManager = DarwiniaStaking;
 	type ShouldEndSession = pallet_session::PeriodicSessions<Period, Offset>;
-	type ValidatorId = <Self as frame_system::Config>::AccountId;
+	type ValidatorId = Self::AccountId;
 	// We don't have stash and controller, thus we don't need the convert as well.
 	type ValidatorIdOf = darwinia_staking::IdentityCollator;
-	type WeightInfo = weights::pallet_session::WeightInfo<Self>;
+	// type WeightInfo = weights::pallet_session::WeightInfo<Self>;
+	type WeightInfo = ();
 }
diff --git a/runtime/koi/src/pallets/staking.rs b/runtime/koi/src/pallets/staking.rs
index ba52c1302..56dc90134 100644
--- a/runtime/koi/src/pallets/staking.rs
+++ b/runtime/koi/src/pallets/staking.rs
@@ -105,7 +105,8 @@ impl darwinia_staking::Config for Runtime {
 	type Ring = RingStaking;
 	type RuntimeEvent = RuntimeEvent;
 	type ShouldEndSession = ShouldEndSession;
-	type WeightInfo = weights::darwinia_staking::WeightInfo<Self>;
+	// type WeightInfo = weights::darwinia_staking::WeightInfo<Self>;
+	type WeightInfo = ();
 }
 #[cfg(not(feature = "runtime-benchmarks"))]
 impl darwinia_staking::DepositConfig for Runtime {}
diff --git a/runtime/koi/src/pallets/sudo.rs b/runtime/koi/src/pallets/sudo.rs
index a7fcb20b4..72fcbc29c 100644
--- a/runtime/koi/src/pallets/sudo.rs
+++ b/runtime/koi/src/pallets/sudo.rs
@@ -22,5 +22,6 @@ use crate::*;
 impl pallet_sudo::Config for Runtime {
 	type RuntimeCall = RuntimeCall;
 	type RuntimeEvent = RuntimeEvent;
-	type WeightInfo = pallet_sudo::weights::SubstrateWeight<Self>;
+	// type WeightInfo = pallet_sudo::weights::SubstrateWeight<Self>;
+	type WeightInfo = ();
 }
diff --git a/runtime/koi/src/pallets/system.rs b/runtime/koi/src/pallets/system.rs
index ca4b69c8c..3be5a557f 100644
--- a/runtime/koi/src/pallets/system.rs
+++ b/runtime/koi/src/pallets/system.rs
@@ -18,6 +18,8 @@
 
 // darwinia
 use crate::*;
+// polkadot-sdk
+use frame_support::derive_impl;
 
 /// We assume that ~5% of the block weight is consumed by `on_initialize` handlers. This is
 /// used to limit the maximal weight of a single extrinsic.
@@ -59,49 +61,20 @@ frame_support::parameter_types! {
 		.build_or_panic();
 }
 
+#[derive_impl(frame_system::config_preludes::ParaChainDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Runtime {
-	/// The data to be stored in an account.
 	type AccountData = pallet_balances::AccountData<Balance>;
-	/// The identifier used to distinguish between accounts.
 	type AccountId = AccountId;
-	/// The basic call filter to use in dispatchable.
 	type BaseCallFilter = TxPause;
 	type Block = Block;
-	/// Maximum number of block number to block hash mappings to keep (oldest pruned first).
-	type BlockHashCount = ConstU32<256>;
-	/// The maximum length of a block (in bytes).
 	type BlockLength = RuntimeBlockLength;
-	/// Block & extrinsics weights: base values and limits.
 	type BlockWeights = RuntimeBlockWeights;
-	/// The weight of database operations that the runtime can invoke.
 	type DbWeight = frame_support::weights::constants::RocksDbWeight;
-	/// The type for hashing blocks and tries.
-	type Hash = Hash;
-	/// The hashing algorithm used.
-	type Hashing = Hashing;
-	/// The lookup mechanism to get account ID from whatever is passed in dispatchers.
-	type Lookup = sp_runtime::traits::IdentityLookup<AccountId>;
+	type Lookup = sp_runtime::traits::IdentityLookup<Self::AccountId>;
 	type MaxConsumers = ConstU32<16>;
-	/// The index type for storing how many extrinsics an account has signed.
-	type Nonce = Nonce;
-	/// What to do if an account is fully reaped from the system.
-	type OnKilledAccount = ();
-	/// What to do if a new account is created.
-	type OnNewAccount = ();
-	/// The action to take on a Runtime Upgrade
 	type OnSetCode = cumulus_pallet_parachain_system::ParachainSetCode<Self>;
-	/// Converts a module to an index of this module in the runtime.
-	type PalletInfo = PalletInfo;
-	/// The aggregated dispatch type that is available for extrinsics.
-	type RuntimeCall = RuntimeCall;
-	/// The ubiquitous event type.
-	type RuntimeEvent = RuntimeEvent;
-	/// The ubiquitous origin type.
-	type RuntimeOrigin = RuntimeOrigin;
-	/// This is used as an identifier of the chain. 42 is the generic substrate prefix.
 	type SS58Prefix = ConstU16<42>;
-	/// Weight information for the extrinsics of this pallet.
-	type SystemWeightInfo = weights::frame_system::WeightInfo<Self>;
-	/// Runtime version.
+	// type SystemWeightInfo = weights::frame_system::WeightInfo<Self>;
+	type SystemWeightInfo = ();
 	type Version = Version;
 }
diff --git a/runtime/koi/src/pallets/timestamp.rs b/runtime/koi/src/pallets/timestamp.rs
index d6f5fb3ed..06e83fa2f 100644
--- a/runtime/koi/src/pallets/timestamp.rs
+++ b/runtime/koi/src/pallets/timestamp.rs
@@ -27,5 +27,6 @@ impl pallet_timestamp::Config for Runtime {
 	type OnTimestampSet = Aura;
 	#[cfg(feature = "runtime-benchmarks")]
 	type OnTimestampSet = ();
-	type WeightInfo = weights::pallet_timestamp::WeightInfo<Self>;
+	// type WeightInfo = weights::pallet_timestamp::WeightInfo<Self>;
+	type WeightInfo = ();
 }
diff --git a/runtime/koi/src/pallets/tx_pause.rs b/runtime/koi/src/pallets/tx_pause.rs
index 4ff419cf8..c0db67c7c 100644
--- a/runtime/koi/src/pallets/tx_pause.rs
+++ b/runtime/koi/src/pallets/tx_pause.rs
@@ -54,6 +54,7 @@ impl pallet_tx_pause::Config for Runtime {
 	type RuntimeCall = RuntimeCall;
 	type RuntimeEvent = RuntimeEvent;
 	type UnpauseOrigin = RootOrAtLeastTwoThird<TechnicalCollective>;
-	type WeightInfo = weights::pallet_tx_pause::WeightInfo<Runtime>;
+	// type WeightInfo = weights::pallet_tx_pause::WeightInfo<Runtime>;
+	type WeightInfo = ();
 	type WhitelistedCalls = TxPauseWhitelistedCalls;
 }
diff --git a/runtime/koi/src/pallets/utility.rs b/runtime/koi/src/pallets/utility.rs
index 59c5759a2..bad2dcc75 100644
--- a/runtime/koi/src/pallets/utility.rs
+++ b/runtime/koi/src/pallets/utility.rs
@@ -23,5 +23,6 @@ impl pallet_utility::Config for Runtime {
 	type PalletsOrigin = OriginCaller;
 	type RuntimeCall = RuntimeCall;
 	type RuntimeEvent = RuntimeEvent;
-	type WeightInfo = weights::pallet_utility::WeightInfo<Self>;
+	// type WeightInfo = weights::pallet_utility::WeightInfo<Self>;
+	type WeightInfo = ();
 }
diff --git a/runtime/koi/src/pallets/xcmp_queue.rs b/runtime/koi/src/pallets/xcmp_queue.rs
index 96cffde7d..fe37db174 100644
--- a/runtime/koi/src/pallets/xcmp_queue.rs
+++ b/runtime/koi/src/pallets/xcmp_queue.rs
@@ -29,12 +29,13 @@ impl cumulus_pallet_xcmp_queue::Config for Runtime {
 	>;
 	type RuntimeEvent = RuntimeEvent;
 	type VersionWrapper = ();
-	type WeightInfo = weights::cumulus_pallet_xcmp_queue::WeightInfo<Self>;
+	// type WeightInfo = weights::cumulus_pallet_xcmp_queue::WeightInfo<Self>;
+	type WeightInfo = ();
 	// Enqueue XCMP messages from siblings for later processing.
 	type XcmpQueue = frame_support::traits::TransformOrigin<
 		MessageQueue,
-		AggregateMessageOrigin,
-		ParaId,
-		ParaIdToSibling,
+		cumulus_primitives_core::AggregateMessageOrigin,
+		cumulus_primitives_core::ParaId,
+		message_queue::ParaIdToSibling,
 	>;
 }

From 322a7d64986b48860a2102e2aa6d9a4ae7dbe192 Mon Sep 17 00:00:00 2001
From: Xavier Lau <xavier@inv.cafe>
Date: Wed, 26 Jun 2024 00:10:37 +0800
Subject: [PATCH 36/59] Build node

---
 Cargo.lock                               |  20 +++--
 Cargo.toml                               |  57 ++++++------
 README.md                                |   2 +-
 node/Cargo.toml                          | 104 +++++++++++-----------
 node/src/chain_spec/crab.rs              | 108 +++++++++++------------
 node/src/chain_spec/darwinia.rs          | 106 +++++++++++-----------
 node/src/chain_spec/koi.rs               |  99 ++++++++++-----------
 node/src/chain_spec/mod.rs               |   9 +-
 node/src/cli.rs                          |   2 +-
 node/src/command.rs                      |  25 +++---
 node/src/rpc.rs                          |   3 +-
 node/src/service/frontier.rs             |   2 +-
 node/src/service/mod.rs                  |   9 +-
 runtime/koi/src/pallets/asset_manager.rs |   2 +-
 runtime/koi/src/pallets/polkadot_xcm.rs  |   1 +
 15 files changed, 265 insertions(+), 284 deletions(-)

diff --git a/Cargo.lock b/Cargo.lock
index 4759d0347..5846fa32e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2634,6 +2634,7 @@ dependencies = [
  "cumulus-client-consensus-aura",
  "cumulus-client-consensus-common",
  "cumulus-client-consensus-proposer",
+ "cumulus-client-parachain-inherent",
  "cumulus-client-service",
  "cumulus-primitives-core",
  "cumulus-primitives-parachain-inherent",
@@ -2686,6 +2687,7 @@ dependencies = [
  "sp-consensus-aura",
  "sp-core",
  "sp-inherents",
+ "sp-io",
  "sp-keystore",
  "sp-offchain",
  "sp-runtime",
@@ -13832,7 +13834,7 @@ dependencies = [
 [[package]]
 name = "sp-crypto-ec-utils"
 version = "0.10.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#414a8fc2eda3bb72e30cefdba628cf6c361cd6e1"
+source = "git+https://github.com/paritytech/polkadot-sdk#2f3a1bf8736844272a7eb165780d9f283b19d5c0"
 dependencies = [
  "ark-bls12-377",
  "ark-bls12-377-ext",
@@ -13894,7 +13896,7 @@ dependencies = [
 [[package]]
 name = "sp-debug-derive"
 version = "14.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#414a8fc2eda3bb72e30cefdba628cf6c361cd6e1"
+source = "git+https://github.com/paritytech/polkadot-sdk#2f3a1bf8736844272a7eb165780d9f283b19d5c0"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -13915,7 +13917,7 @@ dependencies = [
 [[package]]
 name = "sp-externalities"
 version = "0.25.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#414a8fc2eda3bb72e30cefdba628cf6c361cd6e1"
+source = "git+https://github.com/paritytech/polkadot-sdk#2f3a1bf8736844272a7eb165780d9f283b19d5c0"
 dependencies = [
  "environmental",
  "parity-scale-codec",
@@ -14133,7 +14135,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface"
 version = "24.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#414a8fc2eda3bb72e30cefdba628cf6c361cd6e1"
+source = "git+https://github.com/paritytech/polkadot-sdk#2f3a1bf8736844272a7eb165780d9f283b19d5c0"
 dependencies = [
  "bytes",
  "impl-trait-for-tuples",
@@ -14165,7 +14167,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface-proc-macro"
 version = "17.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#414a8fc2eda3bb72e30cefdba628cf6c361cd6e1"
+source = "git+https://github.com/paritytech/polkadot-sdk#2f3a1bf8736844272a7eb165780d9f283b19d5c0"
 dependencies = [
  "Inflector",
  "expander 2.2.1",
@@ -14258,7 +14260,7 @@ source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot
 [[package]]
 name = "sp-std"
 version = "14.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#414a8fc2eda3bb72e30cefdba628cf6c361cd6e1"
+source = "git+https://github.com/paritytech/polkadot-sdk#2f3a1bf8736844272a7eb165780d9f283b19d5c0"
 
 [[package]]
 name = "sp-storage"
@@ -14276,7 +14278,7 @@ dependencies = [
 [[package]]
 name = "sp-storage"
 version = "19.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#414a8fc2eda3bb72e30cefdba628cf6c361cd6e1"
+source = "git+https://github.com/paritytech/polkadot-sdk#2f3a1bf8736844272a7eb165780d9f283b19d5c0"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -14313,7 +14315,7 @@ dependencies = [
 [[package]]
 name = "sp-tracing"
 version = "16.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#414a8fc2eda3bb72e30cefdba628cf6c361cd6e1"
+source = "git+https://github.com/paritytech/polkadot-sdk#2f3a1bf8736844272a7eb165780d9f283b19d5c0"
 dependencies = [
  "parity-scale-codec",
  "tracing",
@@ -14413,7 +14415,7 @@ dependencies = [
 [[package]]
 name = "sp-wasm-interface"
 version = "20.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk#414a8fc2eda3bb72e30cefdba628cf6c361cd6e1"
+source = "git+https://github.com/paritytech/polkadot-sdk#2f3a1bf8736844272a7eb165780d9f283b19d5c0"
 dependencies = [
  "impl-trait-for-tuples",
  "log",
diff --git a/Cargo.toml b/Cargo.toml
index 4721aa9d5..c812c1b3f 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -32,25 +32,6 @@ sha3              = { version = "0.10" }
 static_assertions = { version = "1.1" }
 strum             = { version = "0.26", default-features = false }
 
-# cumulus
-cumulus-client-cli                    = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
-cumulus-client-collator               = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
-cumulus-client-consensus-aura         = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
-cumulus-client-consensus-common       = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
-cumulus-client-consensus-proposer     = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
-cumulus-client-service                = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
-cumulus-pallet-aura-ext               = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
-cumulus-pallet-dmp-queue              = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
-cumulus-pallet-parachain-system       = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
-cumulus-pallet-session-benchmarking   = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
-cumulus-pallet-xcm                    = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
-cumulus-pallet-xcmp-queue             = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
-cumulus-primitives-core               = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
-cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
-cumulus-primitives-utility            = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
-cumulus-relay-chain-interface         = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
-parachain-info                        = { package = "staging-parachain-info", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
-
 # darwinia
 crab-runtime                      = { path = "runtime/crab" }
 darwinia-account-migration        = { path = "pallet/account-migration", default-features = false }
@@ -109,17 +90,24 @@ xcm-primitives                          = { git = "https://github.com/darwinia-n
 orml-xcm-support = { git = "https://github.com/darwinia-network/open-runtime-module-library", branch = "polkadot-v1.7.2", default-features = false }
 orml-xtokens     = { git = "https://github.com/darwinia-network/open-runtime-module-library", branch = "polkadot-v1.7.2", default-features = false }
 
-# polkadot
-pallet-xcm              = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
-polkadot-cli            = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
-polkadot-parachain      = { package = "polkadot-parachain-primitives", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
-polkadot-primitives     = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
-polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
-xcm                     = { package = "staging-xcm", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
-xcm-builder             = { package = "staging-xcm-builder", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
-xcm-executor            = { package = "staging-xcm-executor", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
-
-# substrate
+# polkadot-sdk
+cumulus-client-cli                         = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+cumulus-client-collator                    = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+cumulus-client-consensus-aura              = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+cumulus-client-consensus-common            = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+cumulus-client-consensus-proposer          = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+cumulus-client-parachain-inherent          = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+cumulus-client-service                     = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+cumulus-pallet-aura-ext                    = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+cumulus-pallet-dmp-queue                   = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+cumulus-pallet-parachain-system            = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+cumulus-pallet-session-benchmarking        = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+cumulus-pallet-xcm                         = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+cumulus-pallet-xcmp-queue                  = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+cumulus-primitives-core                    = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+cumulus-primitives-parachain-inherent      = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+cumulus-primitives-utility                 = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+cumulus-relay-chain-interface              = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
 frame-benchmarking                         = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
 frame-benchmarking-cli                     = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
 frame-executive                            = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
@@ -150,6 +138,12 @@ pallet-treasury                            = { git = "https://github.com/parityt
 pallet-tx-pause                            = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
 pallet-utility                             = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
 pallet-whitelist                           = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+pallet-xcm                                 = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+parachain-info                             = { package = "staging-parachain-info", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+polkadot-cli                               = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+polkadot-parachain                         = { package = "polkadot-parachain-primitives", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+polkadot-primitives                        = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+polkadot-runtime-common                    = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
 sc-basic-authorship                        = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
 sc-chain-spec                              = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
 sc-cli                                     = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
@@ -194,6 +188,9 @@ substrate-frame-rpc-system                 = { git = "https://github.com/parityt
 substrate-prometheus-endpoint              = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
 substrate-test-utils                       = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
 substrate-wasm-builder                     = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+xcm                                        = { package = "staging-xcm", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+xcm-builder                                = { package = "staging-xcm-builder", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+xcm-executor                               = { package = "staging-xcm-executor", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
 
 [profile.release]
 panic = "unwind"
diff --git a/README.md b/README.md
index 4fed26e58..5a6f35cf5 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@ This repo contains the following networks:
 
 * the **[Darwinia Main Network](https://docs.darwinia.network/evm/chains/darwinia/)**, the parachain on the Polkadot.
 * the **[Crab Main Network](https://docs.darwinia.network/evm/chains/crab/)**, the parachain on the Kusama.
-* the **[Koi Test Network](https://docs.darwinia.network/evm/chains/koi/)**, the official testnet for production networks, the parachain on the Rococo.
+* the **[Koi Test Network](https://docs.darwinia.network/evm/chains/koi/)**, the official testnet for production networks, the parachain on the Paseo.
 
 ## Other Projects
 
diff --git a/node/Cargo.toml b/node/Cargo.toml
index 8247cfd57..186736a80 100644
--- a/node/Cargo.toml
+++ b/node/Cargo.toml
@@ -16,23 +16,12 @@ async-trait = { version = "0.1" }
 clap        = { version = "4.4", features = ["derive"] }
 futures     = { version = "0.3" }
 jsonrpsee   = { version = "0.20", features = ["server"] }
-log         = { version = "0.4" }
+log         = { workspace = true }
 serde       = { version = "1.0", features = ["derive"] }
-serde_json  = { version = "1.0" }
+serde_json  = { version = "1.0", features = ["arbitrary_precision"] }
 tokio       = { version = "1.33" }
 trauma      = { version = "2.2" }
 
-# cumulus
-cumulus-client-cli                    = { workspace = true }
-cumulus-client-collator               = { workspace = true }
-cumulus-client-consensus-aura         = { workspace = true }
-cumulus-client-consensus-common       = { workspace = true }
-cumulus-client-consensus-proposer     = { workspace = true }
-cumulus-client-service                = { workspace = true }
-cumulus-primitives-core               = { workspace = true, features = ["std"] }
-cumulus-primitives-parachain-inherent = { workspace = true, features = ["std"] }
-cumulus-relay-chain-interface         = { workspace = true }
-
 # darwinia
 crab-runtime     = { workspace = true, optional = true }
 darwinia-runtime = { workspace = true, optional = true }
@@ -55,46 +44,55 @@ moonbeam-rpc-debug            = { workspace = true }
 moonbeam-rpc-primitives-debug = { workspace = true, features = ["std"] }
 moonbeam-rpc-trace            = { workspace = true }
 
-# polkadot
-polkadot-cli        = { workspace = true }
-polkadot-primitives = { workspace = true, features = ["std"] }
-xcm                 = { workspace = true, features = ["std"] }
-
-# substrate
-frame-benchmarking             = { workspace = true, optional = true, features = ["std"] }
-frame-benchmarking-cli         = { workspace = true }
-pallet-transaction-payment-rpc = { workspace = true }
-sc-basic-authorship            = { workspace = true }
-sc-chain-spec                  = { workspace = true }
-sc-cli                         = { workspace = true }
-sc-client-api                  = { workspace = true }
-sc-consensus                   = { workspace = true }
-sc-consensus-aura              = { workspace = true }
-sc-executor                    = { workspace = true }
-sc-network                     = { workspace = true }
-sc-network-sync                = { workspace = true }
-sc-offchain                    = { workspace = true }
-sc-rpc                         = { workspace = true }
-sc-service                     = { workspace = true }
-sc-sysinfo                     = { workspace = true }
-sc-telemetry                   = { workspace = true }
-sc-tracing                     = { workspace = true }
-sc-transaction-pool            = { workspace = true }
-sc-transaction-pool-api        = { workspace = true }
-sp-api                         = { workspace = true, features = ["std"] }
-sp-block-builder               = { workspace = true, features = ["std"] }
-sp-blockchain                  = { workspace = true }
-sp-consensus-aura              = { workspace = true, features = ["std"] }
-sp-core                        = { workspace = true, features = ["std"] }
-sp-inherents                   = { workspace = true, features = ["std"] }
-sp-keystore                    = { workspace = true }
-sp-offchain                    = { workspace = true, features = ["std"] }
-sp-runtime                     = { workspace = true, features = ["std"] }
-sp-session                     = { workspace = true, features = ["std"] }
-sp-timestamp                   = { workspace = true, features = ["std"] }
-sp-transaction-pool            = { workspace = true, features = ["std"] }
-substrate-frame-rpc-system     = { workspace = true }
-substrate-prometheus-endpoint  = { workspace = true }
+# polkadot-sdk
+cumulus-client-cli                    = { workspace = true }
+cumulus-client-collator               = { workspace = true }
+cumulus-client-consensus-aura         = { workspace = true }
+cumulus-client-consensus-common       = { workspace = true }
+cumulus-client-consensus-proposer     = { workspace = true }
+cumulus-client-parachain-inherent     = { workspace = true }
+cumulus-client-service                = { workspace = true }
+cumulus-primitives-core               = { workspace = true, features = ["std"] }
+cumulus-primitives-parachain-inherent = { workspace = true, features = ["std"] }
+cumulus-relay-chain-interface         = { workspace = true }
+frame-benchmarking                    = { workspace = true, optional = true, features = ["std"] }
+frame-benchmarking-cli                = { workspace = true }
+pallet-transaction-payment-rpc        = { workspace = true }
+polkadot-cli                          = { workspace = true }
+polkadot-primitives                   = { workspace = true, features = ["std"] }
+sc-basic-authorship                   = { workspace = true }
+sc-chain-spec                         = { workspace = true }
+sc-cli                                = { workspace = true }
+sc-client-api                         = { workspace = true }
+sc-consensus                          = { workspace = true }
+sc-consensus-aura                     = { workspace = true }
+sc-executor                           = { workspace = true }
+sc-network                            = { workspace = true }
+sc-network-sync                       = { workspace = true }
+sc-offchain                           = { workspace = true }
+sc-rpc                                = { workspace = true }
+sc-service                            = { workspace = true }
+sc-sysinfo                            = { workspace = true }
+sc-telemetry                          = { workspace = true }
+sc-tracing                            = { workspace = true }
+sc-transaction-pool                   = { workspace = true }
+sc-transaction-pool-api               = { workspace = true }
+sp-api                                = { workspace = true, features = ["std"] }
+sp-block-builder                      = { workspace = true, features = ["std"] }
+sp-blockchain                         = { workspace = true }
+sp-consensus-aura                     = { workspace = true, features = ["std"] }
+sp-core                               = { workspace = true, features = ["std"] }
+sp-inherents                          = { workspace = true, features = ["std"] }
+sp-io                                 = { workspace = true, features = ["std"] }
+sp-keystore                           = { workspace = true }
+sp-offchain                           = { workspace = true, features = ["std"] }
+sp-runtime                            = { workspace = true, features = ["std"] }
+sp-session                            = { workspace = true, features = ["std"] }
+sp-timestamp                          = { workspace = true, features = ["std"] }
+sp-transaction-pool                   = { workspace = true, features = ["std"] }
+substrate-frame-rpc-system            = { workspace = true }
+substrate-prometheus-endpoint         = { workspace = true }
+xcm                                   = { workspace = true, features = ["std"] }
 
 [features]
 default = [
diff --git a/node/src/chain_spec/crab.rs b/node/src/chain_spec/crab.rs
index 92520db34..d834ab37f 100644
--- a/node/src/chain_spec/crab.rs
+++ b/node/src/chain_spec/crab.rs
@@ -24,25 +24,21 @@ use std::{
 	str::FromStr,
 	time::{SystemTime, UNIX_EPOCH},
 };
-// cumulus
-use cumulus_primitives_core::ParaId;
 // darwinia
 use super::*;
 use crab_runtime::*;
 // frontier
 use fp_evm::GenesisAccount;
-// substrate
+// polkadot-sdk
 use sc_chain_spec::Properties;
-use sc_service::{ChainType, GenericChainSpec};
+use sc_service::ChainType;
 use sc_telemetry::TelemetryEndpoints;
 use sp_core::{crypto::UncheckedInto, H160};
 
 const PARA_ID: u32 = 2105;
 
-// FIXME: https://github.com/paritytech/polkadot-sdk/issues/4853.
-
 pub fn development_config() -> ChainSpec {
-	let (collators, endowed_accounts) = dev_accounts::<AccountId>(session_keys);
+	let (collators, endowed_accounts) = dev_accounts(session_keys);
 	let genesis_config_patch = serde_json::json!({
 		// System stuff.
 		"parachainInfo": { "parachainId": PARA_ID },
@@ -52,9 +48,9 @@ pub fn development_config() -> ChainSpec {
 			"balances": endowed_accounts.iter().map(|a| (a, 100_000_000 * UNIT)).collect::<Vec<_>>()
 		},
 		"assets": {
-			"assets": [(AssetIds::CKton as u32, ROOT, true, 1)],
+			"assets": [(AssetIds::CKton as AssetId, ROOT, true, 1)],
 			"metadata": [(
-				AssetIds::CKton as u32,
+				AssetIds::CKton as AssetId,
 				b"Crab Commitment Token",
 				b"CKTON",
 				18
@@ -78,40 +74,38 @@ pub fn development_config() -> ChainSpec {
 
 		// EVM stuff.
 		"evm": {
-			"accounts": {
-				BTreeMap::from_iter(
-					<CrabPrecompiles<Runtime>>::used_addresses()
-						.iter()
-						.map(|p| {
-							(
-								p.to_owned(),
-								GenesisAccount {
-									nonce: Default::default(),
-									balance: Default::default(),
-									storage: Default::default(),
-									code: REVERT_BYTECODE.to_vec(),
-								},
-							)
-						})
-						.chain([
-							// Benchmarking account.
-							(
-								H160::from_str("1000000000000000000000000000000000000001").unwrap(),
-								GenesisAccount {
-									nonce: 1.into(),
-									balance: (10_000_000 * UNIT).into(),
-									storage: Default::default(),
-									code: vec![0x00],
-								},
-							),
-						]),
-				)
-			}
+			"accounts": BTreeMap::from_iter(
+				<CrabPrecompiles<Runtime>>::used_addresses()
+					.iter()
+					.map(|p| {
+						(
+							p.to_owned(),
+							GenesisAccount {
+								nonce: Default::default(),
+								balance: Default::default(),
+								storage: Default::default(),
+								code: REVERT_BYTECODE.to_vec(),
+							},
+						)
+					})
+					.chain([
+						// Benchmarking account.
+						(
+							H160::from_str("1000000000000000000000000000000000000001").unwrap(),
+							GenesisAccount {
+								nonce: 1.into(),
+								balance: (10_000_000 * UNIT).into(),
+								storage: Default::default(),
+								code: vec![0x00],
+							},
+						),
+					]),
+			)
 		}
 	});
 
 	ChainSpec::builder(
-		WASM_BINARY.unwrap().to_vec(),
+		WASM_BINARY.unwrap(),
 		Extensions {
 			relay_chain: "rococo-local".into(), // You MUST set this to the correct network!
 			para_id: PARA_ID,
@@ -204,9 +198,9 @@ pub fn genesis_config() -> ChainSpec {
 			"balances": collators.iter().map(|a| (a, 10_000 * UNIT)).collect::<Vec<_>>()
 		},
 		"assets": {
-			"assets": [(AssetIds::CKton as u32, ROOT, true, 1)],
+			"assets": [(AssetIds::CKton as AssetId, ROOT, true, 1)],
 			"metadata": [(
-				AssetIds::CKton as u32,
+				AssetIds::CKton as AssetId,
 				b"Crab Commitment Token",
 				b"CKTON",
 				18
@@ -221,7 +215,7 @@ pub fn genesis_config() -> ChainSpec {
 			"collatorCount": 6,
 			"collators": collators.iter().map(|(a, _)| (a, 1_000 * UNIT)).collect::<Vec<_>>()
 		},
-		session: {
+		"session": {
 			"keys": collators.iter().map(|(a, sks)| (a, a, sks)).collect::<Vec<_>>()
 		},
 
@@ -230,25 +224,23 @@ pub fn genesis_config() -> ChainSpec {
 
 		// EVM stuff.
 		"evm": {
-			"accounts": {
-				BTreeMap::from_iter(
-					<CrabPrecompiles<Runtime>>::used_addresses().iter().map(|p| {
-						(
-							p,
-							GenesisAccount {
-								nonce: Default::default(),
-								balance: Default::default(),
-								storage: Default::default(),
-								code: REVERT_BYTECODE.to_vec(),
-							},
-						)
-					}),
-				)
-			}
+			"accounts": BTreeMap::from_iter(
+				<CrabPrecompiles<Runtime>>::used_addresses().iter().map(|p| {
+					(
+						p,
+						GenesisAccount {
+							nonce: Default::default(),
+							balance: Default::default(),
+							storage: Default::default(),
+							code: REVERT_BYTECODE.to_vec()
+						}
+					)
+				})
+			)
 		}
 	});
 
-	ChainSpec::builder(WASM_BINARY.unwrap().to_vec(), Extensions {
+	ChainSpec::builder(WASM_BINARY.unwrap(), Extensions {
 		relay_chain: "kusama".into(), // You MUST set this to the correct network!
 		para_id: PARA_ID,
 	})
diff --git a/node/src/chain_spec/darwinia.rs b/node/src/chain_spec/darwinia.rs
index 9eed32934..7ee99546e 100644
--- a/node/src/chain_spec/darwinia.rs
+++ b/node/src/chain_spec/darwinia.rs
@@ -24,23 +24,21 @@ use std::{
 	str::FromStr,
 	time::{SystemTime, UNIX_EPOCH},
 };
-// cumulus
-use cumulus_primitives_core::ParaId;
 // darwinia
 use super::*;
 use darwinia_runtime::*;
 // frontier
 use fp_evm::GenesisAccount;
-// substrate
+// polkadot-sdk
 use sc_chain_spec::Properties;
-use sc_service::{ChainType, GenericChainSpec};
+use sc_service::ChainType;
 use sc_telemetry::TelemetryEndpoints;
 use sp_core::{crypto::UncheckedInto, H160};
 
 const PARA_ID: u32 = 2046;
 
 pub fn development_config() -> ChainSpec {
-	let (collators, endowed_accounts) = dev_accounts::<AccountId>(session_keys);
+	let (collators, endowed_accounts) = dev_accounts(session_keys);
 	let genesis_config_patch = serde_json::json!({
 		// System stuff.
 		"parachainInfo": { "parachainId": PARA_ID },
@@ -50,9 +48,9 @@ pub fn development_config() -> ChainSpec {
 			"balances": endowed_accounts.iter().map(|a| (a, 100_000_000 * UNIT)).collect::<Vec<_>>()
 		},
 		"assets": {
-			"assets": [(AssetIds::Kton as _, ROOT, true, 1)],
+			"assets": [(AssetIds::Kton as AssetId, ROOT, true, 1)],
 			"metadata": [(
-				AssetIds::Kton as _,
+				AssetIds::Kton as AssetId,
 				b"Darwinia Commitment Token",
 				b"KTON",
 				18
@@ -76,40 +74,38 @@ pub fn development_config() -> ChainSpec {
 
 		// EVM stuff.
 		"evm": {
-			"accounts": {
-				BTreeMap::from_iter(
-					<DarwiniaPrecompiles<Runtime>>::used_addresses()
-						.iter()
-						.map(|p| {
-							(
-								p.to_owned(),
-								GenesisAccount {
-									nonce: Default::default(),
-									balance: Default::default(),
-									storage: Default::default(),
-									code: REVERT_BYTECODE.to_vec(),
-								},
-							)
-						})
-						.chain([
-							// Benchmarking account.
-							(
-								H160::from_str("1000000000000000000000000000000000000001").unwrap(),
-								GenesisAccount {
-									nonce: 1.into(),
-									balance: (10_000_000 * UNIT).into(),
-									storage: Default::default(),
-									code: vec![0x00],
-								},
-							),
-						]),
-				)
-			}
+			"accounts": BTreeMap::from_iter(
+				<DarwiniaPrecompiles<Runtime>>::used_addresses()
+					.iter()
+					.map(|p| {
+						(
+							p.to_owned(),
+							GenesisAccount {
+								nonce: Default::default(),
+								balance: Default::default(),
+								storage: Default::default(),
+								code: REVERT_BYTECODE.to_vec(),
+							},
+						)
+					})
+					.chain([
+						// Benchmarking account.
+						(
+							H160::from_str("1000000000000000000000000000000000000001").unwrap(),
+							GenesisAccount {
+								nonce: 1.into(),
+								balance: (10_000_000 * UNIT).into(),
+								storage: Default::default(),
+								code: vec![0x00],
+							},
+						),
+					]),
+			)
 		}
 	});
 
 	ChainSpec::builder(
-		WASM_BINARY.unwrap().to_vec(),
+		WASM_BINARY.unwrap(),
 		Extensions {
 			relay_chain: "rococo-local".into(), // You MUST set this to the correct network!
 			para_id: PARA_ID,
@@ -191,9 +187,9 @@ pub fn genesis_config() -> ChainSpec {
 			"balances": collators.iter().map(|a| (a, 10_000 * UNIT)).collect::<Vec<_>>()
 		},
 		"assets": {
-			"assets": [(AssetIds::Kton as _, ROOT, true, 1)],
+			"assets": [(AssetIds::Kton as AssetId, ROOT, true, 1)],
 			"metadata": [(
-				AssetIds::Kton as _,
+				AssetIds::Kton as AssetId,
 				b"Darwinia Commitment Token",
 				b"KTON",
 				18
@@ -201,7 +197,7 @@ pub fn genesis_config() -> ChainSpec {
 		},
 
 		// Consensus stuff.
-		"darwiniaStaking" {
+		"darwiniaStaking": {
 			"now": SystemTime::now().duration_since(UNIX_EPOCH).unwrap().as_millis(),
 			"elapsedTime": 0,
 			"rateLimit": 20_000_000 * UNIT,
@@ -217,25 +213,23 @@ pub fn genesis_config() -> ChainSpec {
 
 		// EVM stuff.
 		"evm": {
-			"accounts": {
-				BTreeMap::from_iter(
-					<DarwiniaPrecompiles<Runtime>>::used_addresses().iter().map(|p| {
-						(
-							p,
-							GenesisAccount {
-								nonce: Default::default(),
-								balance: Default::default(),
-								storage: Default::default(),
-								code: REVERT_BYTECODE.to_vec(),
-							},
-						)
-					}),
-				)
-			}
+			"accounts": BTreeMap::from_iter(
+				<DarwiniaPrecompiles<Runtime>>::used_addresses().iter().map(|p| {
+					(
+						p,
+						GenesisAccount {
+							nonce: Default::default(),
+							balance: Default::default(),
+							storage: Default::default(),
+							code: REVERT_BYTECODE.to_vec(),
+						},
+					)
+				}),
+			)
 		}
 	});
 
-	ChainSpec::builder(WASM_BINARY.unwrap().to_vec(), Extensions {
+	ChainSpec::builder(WASM_BINARY.unwrap(), Extensions {
 		relay_chain: "polkadot".into(), // You MUST set this to the correct network!
 		para_id: PARA_ID,
 	})
diff --git a/node/src/chain_spec/koi.rs b/node/src/chain_spec/koi.rs
index 64f6a3402..f4b2cf93f 100644
--- a/node/src/chain_spec/koi.rs
+++ b/node/src/chain_spec/koi.rs
@@ -40,7 +40,7 @@ use sp_core::{crypto::UncheckedInto, H160};
 const PARA_ID: u32 = 2105;
 
 pub fn development_config() -> ChainSpec {
-	let (collators, endowed_accounts) = dev_accounts::<AccountId>(session_keys);
+	let (collators, endowed_accounts) = dev_accounts(session_keys);
 	let genesis_config_patch = serde_json::json!({
 		// System stuff.
 		"parachainInfo": { "parachainId": PARA_ID },
@@ -50,9 +50,9 @@ pub fn development_config() -> ChainSpec {
 			"balances": endowed_accounts.iter().map(|a| (a, 100_000_000 * UNIT)).collect::<Vec<_>>()
 		},
 		"assets": {
-			"assets": [(AssetIds::PKton as _, ROOT, true, 1)],
+			"assets": [(AssetIds::KKton as AssetId, ROOT, true, 1)],
 			"metadata": [(
-				AssetIds::PKton as u32,
+				AssetIds::KKton as AssetId,
 				b"Koi Commitment Token",
 				b"PKTON",
 				18,
@@ -87,40 +87,38 @@ pub fn development_config() -> ChainSpec {
 
 		// EVM stuff.
 		"evm": {
-			"accounts": {
-				BTreeMap::from_iter(
-					<KoiPrecompiles<Runtime>>::used_addresses()
-						.iter()
-						.map(|p| {
-							(
-								p.to_owned(),
-								GenesisAccount {
-									nonce: Default::default(),
-									balance: Default::default(),
-									storage: Default::default(),
-									code: REVERT_BYTECODE.to_vec(),
-								},
-							)
-						})
-						.chain([
-							// Benchmarking account.
-							(
-								H160::from_str("1000000000000000000000000000000000000001").unwrap(),
-								GenesisAccount {
-									nonce: 1.into(),
-									balance: (10_000_000 * UNIT).into(),
-									storage: Default::default(),
-									code: vec![0x00],
-								},
-							),
-						]),
-				)
-			}
+			"accounts": BTreeMap::from_iter(
+				<KoiPrecompiles<Runtime>>::used_addresses()
+					.iter()
+					.map(|p| {
+						(
+							p.to_owned(),
+							GenesisAccount {
+								nonce: Default::default(),
+								balance: Default::default(),
+								storage: Default::default(),
+								code: REVERT_BYTECODE.to_vec(),
+							},
+						)
+					})
+					.chain([
+						// Benchmarking account.
+						(
+							H160::from_str("1000000000000000000000000000000000000001").unwrap(),
+							GenesisAccount {
+								nonce: 1.into(),
+								balance: (10_000_000 * UNIT).into(),
+								storage: Default::default(),
+								code: vec![0x00],
+							},
+						),
+					]),
+			)
 		}
 	});
 
 	ChainSpec::builder(
-		WASM_BINARY.unwrap().to_vec(),
+		WASM_BINARY.unwrap(),
 		Extensions {
 			relay_chain: "rococo-local".into(), // You MUST set this to the correct network!
 			para_id: PARA_ID,
@@ -159,9 +157,10 @@ pub fn genesis_config() -> ChainSpec {
 			"balances": collators.iter().map(|a| (a, 10_000 * UNIT)).collect::<Vec<_>>(),
 		},
 		"assets": {
-			"assets": [(AssetIds::PKton as _, ROOT, true, 1)],
+			// TODO: migration.
+			"assets": [(AssetIds::KKton as AssetId, ROOT, true, 1)],
 			"metadata": [(
-				AssetIds::PKton as u32,
+				AssetIds::KKton as AssetId,
 				b"Koi Commitment Token",
 				b"PKTON",
 				18,
@@ -188,26 +187,24 @@ pub fn genesis_config() -> ChainSpec {
 
 		// EVM stuff.
 		"evm": {
-			"accounts": {
-				BTreeMap::from_iter(
-					<KoiPrecompiles<Runtime>>::used_addresses().iter().map(|p| {
-						(
-							p,
-							GenesisAccount {
-								nonce: Default::default(),
-								balance: Default::default(),
-								storage: Default::default(),
-								code: REVERT_BYTECODE.to_vec(),
-							},
-						)
-					}),
-				)
-			}
+			"accounts": BTreeMap::from_iter(
+				<KoiPrecompiles<Runtime>>::used_addresses().iter().map(|p| {
+					(
+						p,
+						GenesisAccount {
+							nonce: Default::default(),
+							balance: Default::default(),
+							storage: Default::default(),
+							code: REVERT_BYTECODE.to_vec(),
+						},
+					)
+				}),
+			)
 		}
 	});
 
 	ChainSpec::builder(
-		WASM_BINARY.unwrap().to_vec(),
+		WASM_BINARY.unwrap(),
 		Extensions {
 			relay_chain: "paseo".into(), // You MUST set this to the correct network!
 			para_id: PARA_ID,
diff --git a/node/src/chain_spec/mod.rs b/node/src/chain_spec/mod.rs
index 5111cd057..65384c411 100644
--- a/node/src/chain_spec/mod.rs
+++ b/node/src/chain_spec/mod.rs
@@ -46,7 +46,9 @@ use std::{env, fs, thread};
 use serde::{de::DeserializeOwned, Deserialize, Serialize};
 use tokio::runtime::Runtime as TokioRuntime;
 use trauma::{download::Download, downloader::DownloaderBuilder};
-// substrate
+// darwinia
+use dc_primitives::AccountId;
+// polkadot-sdk
 use sc_chain_spec::{ChainSpecExtension, ChainSpecGroup, GenericChainSpec, Properties};
 use sp_consensus_aura::sr25519::AuthorityId as AuraId;
 use sp_core::{Pair, Public};
@@ -107,9 +109,8 @@ fn get_collator_keys_from_seed(seed: &str) -> AuraId {
 	get_from_seed::<AuraId>(seed)
 }
 
-fn dev_accounts<A, F, Sks>(f: F) -> ([(A, Sks); 1], [A; 6])
+fn dev_accounts<F, Sks>(f: F) -> ([(AccountId, Sks); 1], [AccountId; 6])
 where
-	A: From<[u8; 20]>,
 	F: Fn(AuraId) -> Sks,
 {
 	(
@@ -131,7 +132,7 @@ where
 	)
 }
 
-fn load_config<G, E>(name: &'static str, mut retries: u8) -> GenericChainSpec<G, E>
+fn load_config<E>(name: &'static str, mut retries: u8) -> GenericChainSpec<(), E>
 where
 	E: DeserializeOwned,
 {
diff --git a/node/src/cli.rs b/node/src/cli.rs
index ded282f51..c7705e31b 100644
--- a/node/src/cli.rs
+++ b/node/src/cli.rs
@@ -24,7 +24,7 @@
 ///
 /// The worker binaries associated to the node binary should ensure that they are using the same
 /// version as the main node that started them.
-pub const NODE_VERSION: &'static str = "6.6.3";
+pub const NODE_VERSION: &str = "6.6.3";
 
 /// Sub-commands supported by the collator.
 #[derive(Debug, clap::Subcommand)]
diff --git a/node/src/command.rs b/node/src/command.rs
index 60f2f1d37..ba54b7548 100644
--- a/node/src/command.rs
+++ b/node/src/command.rs
@@ -421,7 +421,7 @@ pub fn run() -> Result<()> {
 		},
 		Some(Subcommand::ExportGenesisHead(cmd)) =>
 			construct_async_run!(|components, cli, cmd, config| {
-				Ok(async move { cmd.run(&*config.chain_spec, &*components.client) })
+				Ok(async move { cmd.run(components.client.clone()) })
 			}),
 		Some(Subcommand::ExportGenesisWasm(cmd)) => {
 			let runner = cli.create_runner(cmd)?;
@@ -600,28 +600,25 @@ fn load_spec(id: &str) -> std::result::Result<Box<dyn ChainSpecT>, String> {
 	};
 	let chain_spec = match id.to_lowercase().as_str() {
 		#[cfg(feature = "crab-native")]
-		"crab" => Box::new(crab_chain_spec::config()),
+		"crab" => Box::new(crab::config()),
 		#[cfg(feature = "crab-native")]
-		"crab-genesis" => Box::new(crab_chain_spec::genesis_config()),
+		"crab-genesis" => Box::new(crab::genesis_config()),
 		#[cfg(feature = "crab-native")]
-		"crab-dev" => Box::new(crab_chain_spec::development_config()),
+		"crab-dev" => Box::new(crab::development_config()),
 		#[cfg(feature = "darwinia-native")]
-		"darwinia" => Box::new(darwinia_chain_spec::config()),
+		"darwinia" => Box::new(darwinia::config()),
 		#[cfg(feature = "darwinia-native")]
-		"darwinia-genesis" => Box::new(darwinia_chain_spec::genesis_config()),
+		"darwinia-genesis" => Box::new(darwinia::genesis_config()),
 		#[cfg(feature = "darwinia-native")]
-		"darwinia-dev" => Box::new(darwinia_chain_spec::development_config()),
+		"darwinia-dev" => Box::new(darwinia::development_config()),
 		#[cfg(feature = "koi-native")]
-		"koi" => Box::new(koi_chain_spec::config()),
+		"koi" => Box::new(koi::config()),
 		#[cfg(feature = "koi-native")]
-		"koi-genesis" => Box::new(koi_chain_spec::genesis_config()),
+		"koi-genesis" => Box::new(koi::genesis_config()),
 		#[cfg(feature = "koi-native")]
-		"koi-dev" => Box::new(koi_chain_spec::development_config()),
+		"koi-dev" => Box::new(koi::development_config()),
 		_ => {
-			let path = PathBuf::from(id);
-			let chain_spec = Box::new(ChainSpec::from_json_file(path.clone())?);
-
-			chain_spec
+			Box::new(ChainSpec::from_json_file(PathBuf::from(id))?)
 		},
 	};
 
diff --git a/node/src/rpc.rs b/node/src/rpc.rs
index 5f306b8a2..46617ea21 100644
--- a/node/src/rpc.rs
+++ b/node/src/rpc.rs
@@ -21,8 +21,6 @@
 //! used by Substrate nodes. This file extends those RPC definitions with
 //! capabilities that are specific to this project's runtime configuration.
 
-pub use sc_rpc::{DenyUnsafe, SubscriptionTaskExecutor};
-
 // std
 use std::{collections::BTreeMap, sync::Arc};
 // darwinia
@@ -105,6 +103,7 @@ where
 	C: 'static
 		+ Send
 		+ Sync
+		+ sc_client_api::AuxStore
 		+ sc_client_api::backend::StorageProvider<Block, BE>
 		+ sc_client_api::BlockchainEvents<Block>
 		+ sc_client_api::UsageProvider<Block>
diff --git a/node/src/service/frontier.rs b/node/src/service/frontier.rs
index faebd04e2..3f772ff93 100644
--- a/node/src/service/frontier.rs
+++ b/node/src/service/frontier.rs
@@ -75,7 +75,7 @@ where
 		+ fp_rpc::EthereumRuntimeRPCApi<B>
 		+ moonbeam_rpc_primitives_debug::DebugRuntimeApi<B>,
 	B: 'static + Send + Sync + sp_runtime::traits::Block<Hash = Hash>,
-	B::Header: sp_api::HeaderT<Number = BlockNumber>,
+	B::Header: sp_runtime::traits::Header<Number = BlockNumber>,
 	BE: 'static + sc_client_api::backend::Backend<B>,
 	BE::State: sc_client_api::backend::StateBackend<Hashing>,
 {
diff --git a/node/src/service/mod.rs b/node/src/service/mod.rs
index 7beea86dc..b78a6d399 100644
--- a/node/src/service/mod.rs
+++ b/node/src/service/mod.rs
@@ -461,7 +461,9 @@ where
 		// Here you can check whether the hardware meets your chains' requirements. Putting a link
 		// in there and swapping out the requirements for your own are probably a good idea. The
 		// requirements for a para-chain are dictated by its relay-chain.
-		if let Err(e) = SUBSTRATE_REFERENCE_HARDWARE.check_hardware(&hwbench) {
+		if let Err(e) =
+			frame_benchmarking_cli::SUBSTRATE_REFERENCE_HARDWARE.check_hardware(&hwbench)
+		{
 			log::warn!(
 				"⚠️  The hardware does not meet the minimal requirements {e} for role 'Authority'.",
 			);
@@ -773,13 +775,13 @@ where
 					);
 
 					let mocked_parachain =
-						cumulus_primitives_parachain_inherent::MockValidationDataInherentDataProvider {
+						cumulus_client_parachain_inherent::MockValidationDataInherentDataProvider {
 							current_para_block,
 							relay_offset: 1000,
 							relay_blocks_per_para_block: 2,
 							para_blocks_per_relay_epoch: 0,
 							relay_randomness_config: (),
-							xcm_config: cumulus_primitives_parachain_inherent::MockXcmConfig::new(
+							xcm_config: cumulus_client_parachain_inherent::MockXcmConfig::new(
 								&*client_for_xcm,
 								block,
 								Default::default(),
@@ -787,6 +789,7 @@ where
 							),
 							raw_downward_messages: Vec::new(),
 							raw_horizontal_messages: Vec::new(),
+							additional_key_values: None,
 						};
 
 					Ok((slot, timestamp, mocked_parachain))
diff --git a/runtime/koi/src/pallets/asset_manager.rs b/runtime/koi/src/pallets/asset_manager.rs
index ef44abae1..b94c2dba9 100644
--- a/runtime/koi/src/pallets/asset_manager.rs
+++ b/runtime/koi/src/pallets/asset_manager.rs
@@ -24,7 +24,7 @@ use xcm::prelude::*;
 frame_support::parameter_types! {
 	/// 1000 is AssetHub paraId.
 	/// 50 is pallet-assets index on AssetHub.
-	/// 7777 is the id of Test USDT on AssetHub(Rococo).
+	/// 7777 is the id of Test USDT on AssetHub(Paseo).
 	pub UsdtLocation: xcm::v3::Location = xcm::v3::Location::new(
 		1,
 		xcm::v3::prelude::X3(xcm::v3::prelude::Parachain(1000), xcm::v3::prelude::PalletInstance(50), xcm::v3::prelude::GeneralIndex(7777))
diff --git a/runtime/koi/src/pallets/polkadot_xcm.rs b/runtime/koi/src/pallets/polkadot_xcm.rs
index b634aa391..98dd87838 100644
--- a/runtime/koi/src/pallets/polkadot_xcm.rs
+++ b/runtime/koi/src/pallets/polkadot_xcm.rs
@@ -22,6 +22,7 @@ use crate::{AssetId, Assets, *};
 use xcm::latest::prelude::*;
 
 frame_support::parameter_types! {
+	// TODO: Paseo.
 	pub const RelayNetwork: NetworkId = NetworkId::Rococo;
 	pub const MaxAssetsIntoHolding: u32 = 64;
 	pub const MaxInstructions: u32 = 100;

From e4ba8ade089b7ee166461a237753a2c974857dcf Mon Sep 17 00:00:00 2001
From: Xavier Lau <xavier@inv.cafe>
Date: Wed, 26 Jun 2024 09:50:49 +0800
Subject: [PATCH 37/59] Remove pallet-democracy

Signed-off-by: Xavier Lau <xavier@inv.cafe>
---
 Cargo.lock                                    |   1 -
 Cargo.toml                                    |   1 -
 runtime/darwinia/Cargo.toml                   |   4 -
 runtime/darwinia/src/lib.rs                   |   3 +-
 runtime/darwinia/src/pallets/governance.rs    |   2 -
 runtime/darwinia/src/pallets/governance/v1.rs |  56 --
 runtime/darwinia/src/pallets/proxy.rs         |   1 -
 runtime/darwinia/src/weights.rs               |   1 -
 .../darwinia/src/weights/pallet_democracy.rs  | 533 ------------------
 9 files changed, 1 insertion(+), 601 deletions(-)
 delete mode 100644 runtime/darwinia/src/pallets/governance/v1.rs
 delete mode 100644 runtime/darwinia/src/weights/pallet_democracy.rs

diff --git a/Cargo.lock b/Cargo.lock
index bd4f13db5..3785c234e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2937,7 +2937,6 @@ dependencies = [
  "pallet-balances",
  "pallet-collective",
  "pallet-conviction-voting",
- "pallet-democracy",
  "pallet-ethereum",
  "pallet-ethereum-xcm",
  "pallet-evm",
diff --git a/Cargo.toml b/Cargo.toml
index 3dfe192ba..44de3f3ec 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -121,7 +121,6 @@ pallet-authorship                          = { git = "https://github.com/parityt
 pallet-balances                            = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false, features = ["insecure_zero_ed"] }
 pallet-collective                          = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
 pallet-conviction-voting                   = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
-pallet-democracy                           = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
 pallet-message-queue                       = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
 pallet-preimage                            = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
 pallet-proxy                               = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
diff --git a/runtime/darwinia/Cargo.toml b/runtime/darwinia/Cargo.toml
index 4dd3fc8a3..d40621227 100644
--- a/runtime/darwinia/Cargo.toml
+++ b/runtime/darwinia/Cargo.toml
@@ -78,7 +78,6 @@ pallet-authorship                          = { workspace = true }
 pallet-balances                            = { workspace = true }
 pallet-collective                          = { workspace = true }
 pallet-conviction-voting                   = { workspace = true }
-pallet-democracy                           = { workspace = true }
 pallet-message-queue                       = { workspace = true }
 pallet-preimage                            = { workspace = true }
 pallet-proxy                               = { workspace = true }
@@ -193,7 +192,6 @@ std = [
 	"pallet-balances/std",
 	"pallet-collective/std",
 	"pallet-conviction-voting/std",
-	"pallet-democracy/std",
 	"pallet-message-queue/std",
 	"pallet-preimage/std",
 	"pallet-proxy/std",
@@ -291,7 +289,6 @@ runtime-benchmarks = [
 	"pallet-balances/runtime-benchmarks",
 	"pallet-collective/runtime-benchmarks",
 	"pallet-conviction-voting/runtime-benchmarks",
-	"pallet-democracy/runtime-benchmarks",
 	"pallet-message-queue/runtime-benchmarks",
 	"pallet-preimage/runtime-benchmarks",
 	"pallet-proxy/runtime-benchmarks",
@@ -350,7 +347,6 @@ try-runtime = [
 	"pallet-balances/try-runtime",
 	"pallet-collective/try-runtime",
 	"pallet-conviction-voting/try-runtime",
-	"pallet-democracy/try-runtime",
 	"pallet-message-queue/try-runtime",
 	"pallet-preimage/try-runtime",
 	"pallet-proxy/try-runtime",
diff --git a/runtime/darwinia/src/lib.rs b/runtime/darwinia/src/lib.rs
index 0eff5c00c..492e9eb96 100644
--- a/runtime/darwinia/src/lib.rs
+++ b/runtime/darwinia/src/lib.rs
@@ -132,7 +132,7 @@ frame_support::construct_runtime! {
 		TechnicalCommittee: pallet_collective::<Instance2> = 20,
 		Treasury: pallet_treasury = 23,
 		// Tips: pallet_tips = 24,
-		Democracy: pallet_democracy = 18,
+		// Democracy: pallet_democracy = 18,
 		ConvictionVoting: pallet_conviction_voting = 48,
 		Referenda: pallet_referenda = 49,
 		Origins: custom_origins = 50,
@@ -179,7 +179,6 @@ frame_benchmarking::define_benchmarks! {
 	[pallet_balances, Balances]
 	[pallet_collective, TechnicalCommittee]
 	[pallet_conviction_voting, ConvictionVoting]
-	[pallet_democracy, Democracy]
 	[pallet_message_queue, MessageQueue]
 	[pallet_preimage, Preimage]
 	[pallet_proxy, Proxy]
diff --git a/runtime/darwinia/src/pallets/governance.rs b/runtime/darwinia/src/pallets/governance.rs
index 8794c86a5..978b1fa11 100644
--- a/runtime/darwinia/src/pallets/governance.rs
+++ b/runtime/darwinia/src/pallets/governance.rs
@@ -23,8 +23,6 @@ pub use origin::{custom_origins, GeneralAdmin};
 mod track;
 use track::*;
 
-mod v1;
-
 pub use pallet_collective::{Instance1 as CouncilCollective, Instance2 as TechnicalCollective};
 
 pub(super) use crate::*;
diff --git a/runtime/darwinia/src/pallets/governance/v1.rs b/runtime/darwinia/src/pallets/governance/v1.rs
deleted file mode 100644
index e031f9367..000000000
--- a/runtime/darwinia/src/pallets/governance/v1.rs
+++ /dev/null
@@ -1,56 +0,0 @@
-// This file is part of Darwinia.
-//
-// Copyright (C) Darwinia Network
-// SPDX-License-Identifier: GPL-3.0
-//
-// Darwinia is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Darwinia is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Darwinia. If not, see <https://www.gnu.org/licenses/>.
-
-// darwinia
-use super::*;
-
-const ENACTMENT_PERIOD: u32 = 28 * DAYS;
-
-impl pallet_democracy::Config for Runtime {
-	type BlacklistOrigin = RootOrAtLeastTwoThird<TechnicalCollective>;
-	type CancelProposalOrigin = RootOrAtLeastTwoThird<TechnicalCollective>;
-	type CancellationOrigin = RootOrAtLeastTwoThird<TechnicalCollective>;
-	type CooloffPeriod = ConstU32<{ 7 * DAYS }>;
-	type Currency = Balances;
-	type EnactmentPeriod = ConstU32<ENACTMENT_PERIOD>;
-	// There are no plans to use this yet.
-	type ExternalDefaultOrigin = RootOr<GeneralAdmin>;
-	type ExternalMajorityOrigin = RootOrAtLeastHalf<CouncilCollective>;
-	type ExternalOrigin = RootOrAtLeastHalf<CouncilCollective>;
-	type FastTrackOrigin = RootOrAtLeastTwoThird<TechnicalCollective>;
-	type FastTrackVotingPeriod = ConstU32<{ 3 * HOURS }>;
-	type InstantAllowed = ConstBool<true>;
-	type InstantOrigin = RootOrAll<TechnicalCollective>;
-	type LaunchPeriod = ConstU32<{ 28 * DAYS }>;
-	type MaxBlacklisted = ConstU32<100>;
-	type MaxDeposits = ConstU32<100>;
-	type MaxProposals = ConstU32<100>;
-	type MaxVotes = ConstU32<100>;
-	type MinimumDeposit = ConstU128<DARWINIA_PROPOSAL_REQUIREMENT>;
-	type PalletsOrigin = OriginCaller;
-	type Preimages = Preimage;
-	type RuntimeEvent = RuntimeEvent;
-	type Scheduler = Scheduler;
-	type Slash = Treasury;
-	type SubmitOrigin = frame_system::EnsureSigned<Self::AccountId>;
-	type VetoOrigin = pallet_collective::EnsureMember<Self::AccountId, TechnicalCollective>;
-	type VoteLockingPeriod = ConstU32<ENACTMENT_PERIOD>;
-	type VotingPeriod = ConstU32<{ 28 * DAYS }>;
-	// type WeightInfo = weights::pallet_democracy::WeightInfo<Self>;
-	type WeightInfo = ();
-}
diff --git a/runtime/darwinia/src/pallets/proxy.rs b/runtime/darwinia/src/pallets/proxy.rs
index b495b1688..043e45686 100644
--- a/runtime/darwinia/src/pallets/proxy.rs
+++ b/runtime/darwinia/src/pallets/proxy.rs
@@ -75,7 +75,6 @@ impl frame_support::traits::InstanceFilter<RuntimeCall> for ProxyType {
 				c,
 				RuntimeCall::ConvictionVoting(..)
 					| RuntimeCall::Council(..)
-					| RuntimeCall::Democracy(..)
 					| RuntimeCall::Referenda(..)
 					| RuntimeCall::TechnicalCommittee(..)
 					| RuntimeCall::Treasury(..)
diff --git a/runtime/darwinia/src/weights.rs b/runtime/darwinia/src/weights.rs
index da705e8b2..56c95fd37 100644
--- a/runtime/darwinia/src/weights.rs
+++ b/runtime/darwinia/src/weights.rs
@@ -29,7 +29,6 @@ pub mod pallet_assets;
 pub mod pallet_balances;
 pub mod pallet_collective;
 pub mod pallet_conviction_voting;
-pub mod pallet_democracy;
 pub mod pallet_preimage;
 pub mod pallet_proxy;
 pub mod pallet_referenda;
diff --git a/runtime/darwinia/src/weights/pallet_democracy.rs b/runtime/darwinia/src/weights/pallet_democracy.rs
deleted file mode 100644
index b70759f84..000000000
--- a/runtime/darwinia/src/weights/pallet_democracy.rs
+++ /dev/null
@@ -1,533 +0,0 @@
-// This file is part of Darwinia.
-//
-// Copyright (C) Darwinia Network
-// SPDX-License-Identifier: GPL-3.0
-//
-// Darwinia is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Darwinia is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Darwinia. If not, see <https://www.gnu.org/licenses/>.
-
-//! Autogenerated weights for `pallet_democracy`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-04-17, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("darwinia-dev")`, DB CACHE: 1024
-
-// Executed Command:
-// target/release/darwinia
-// benchmark
-// pallet
-// --header
-// .maintain/license-header
-// --heap-pages
-// 4096
-// --chain
-// darwinia-dev
-// --output
-// runtime/darwinia/src/weights
-// --pallet
-// *
-// --extrinsic
-// *
-// --steps
-// 50
-// --repeat
-// 20
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `pallet_democracy`.
-pub struct WeightInfo<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_democracy::WeightInfo for WeightInfo<T> {
-	/// Storage: `Democracy::PublicPropCount` (r:1 w:1)
-	/// Proof: `Democracy::PublicPropCount` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	/// Storage: `Democracy::PublicProps` (r:1 w:1)
-	/// Proof: `Democracy::PublicProps` (`max_values`: Some(1), `max_size`: Some(15502), added: 15997, mode: `MaxEncodedLen`)
-	/// Storage: `Democracy::Blacklist` (r:1 w:0)
-	/// Proof: `Democracy::Blacklist` (`max_values`: None, `max_size`: Some(2038), added: 4513, mode: `MaxEncodedLen`)
-	/// Storage: `Democracy::DepositOf` (r:0 w:1)
-	/// Proof: `Democracy::DepositOf` (`max_values`: None, `max_size`: Some(2030), added: 4505, mode: `MaxEncodedLen`)
-	fn propose() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `3810`
-		//  Estimated: `16987`
-		// Minimum execution time: 31_000_000 picoseconds.
-		Weight::from_parts(37_000_000, 0)
-			.saturating_add(Weight::from_parts(0, 16987))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: `Democracy::DepositOf` (r:1 w:1)
-	/// Proof: `Democracy::DepositOf` (`max_values`: None, `max_size`: Some(2030), added: 4505, mode: `MaxEncodedLen`)
-	fn second() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `2559`
-		//  Estimated: `5495`
-		// Minimum execution time: 29_000_000 picoseconds.
-		Weight::from_parts(35_000_000, 0)
-			.saturating_add(Weight::from_parts(0, 5495))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Democracy::ReferendumInfoOf` (r:1 w:1)
-	/// Proof: `Democracy::ReferendumInfoOf` (`max_values`: None, `max_size`: Some(201), added: 2676, mode: `MaxEncodedLen`)
-	/// Storage: `Democracy::VotingOf` (r:1 w:1)
-	/// Proof: `Democracy::VotingOf` (`max_values`: None, `max_size`: Some(3783), added: 6258, mode: `MaxEncodedLen`)
-	/// Storage: `Balances::Locks` (r:1 w:1)
-	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1287), added: 3762, mode: `MaxEncodedLen`)
-	/// Storage: `Balances::Freezes` (r:1 w:0)
-	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(37), added: 2512, mode: `MaxEncodedLen`)
-	fn vote_new() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `3406`
-		//  Estimated: `7248`
-		// Minimum execution time: 37_000_000 picoseconds.
-		Weight::from_parts(48_000_000, 0)
-			.saturating_add(Weight::from_parts(0, 7248))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: `Democracy::ReferendumInfoOf` (r:1 w:1)
-	/// Proof: `Democracy::ReferendumInfoOf` (`max_values`: None, `max_size`: Some(201), added: 2676, mode: `MaxEncodedLen`)
-	/// Storage: `Democracy::VotingOf` (r:1 w:1)
-	/// Proof: `Democracy::VotingOf` (`max_values`: None, `max_size`: Some(3783), added: 6258, mode: `MaxEncodedLen`)
-	/// Storage: `Balances::Locks` (r:1 w:1)
-	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1287), added: 3762, mode: `MaxEncodedLen`)
-	/// Storage: `Balances::Freezes` (r:1 w:0)
-	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(37), added: 2512, mode: `MaxEncodedLen`)
-	fn vote_existing() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `3428`
-		//  Estimated: `7248`
-		// Minimum execution time: 40_000_000 picoseconds.
-		Weight::from_parts(52_000_000, 0)
-			.saturating_add(Weight::from_parts(0, 7248))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: `Democracy::ReferendumInfoOf` (r:1 w:1)
-	/// Proof: `Democracy::ReferendumInfoOf` (`max_values`: None, `max_size`: Some(201), added: 2676, mode: `MaxEncodedLen`)
-	/// Storage: `Democracy::Cancellations` (r:1 w:1)
-	/// Proof: `Democracy::Cancellations` (`max_values`: None, `max_size`: Some(33), added: 2508, mode: `MaxEncodedLen`)
-	/// Storage: `Democracy::MetadataOf` (r:1 w:1)
-	/// Proof: `Democracy::MetadataOf` (`max_values`: None, `max_size`: Some(53), added: 2528, mode: `MaxEncodedLen`)
-	fn emergency_cancel() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `299`
-		//  Estimated: `3666`
-		// Minimum execution time: 19_000_000 picoseconds.
-		Weight::from_parts(21_000_000, 0)
-			.saturating_add(Weight::from_parts(0, 3666))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: `Democracy::PublicProps` (r:1 w:1)
-	/// Proof: `Democracy::PublicProps` (`max_values`: Some(1), `max_size`: Some(15502), added: 15997, mode: `MaxEncodedLen`)
-	/// Storage: `Democracy::DepositOf` (r:1 w:1)
-	/// Proof: `Democracy::DepositOf` (`max_values`: None, `max_size`: Some(2030), added: 4505, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:2 w:2)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(116), added: 2591, mode: `MaxEncodedLen`)
-	/// Storage: `Democracy::MetadataOf` (r:3 w:1)
-	/// Proof: `Democracy::MetadataOf` (`max_values`: None, `max_size`: Some(53), added: 2528, mode: `MaxEncodedLen`)
-	/// Storage: `Democracy::NextExternal` (r:1 w:1)
-	/// Proof: `Democracy::NextExternal` (`max_values`: Some(1), `max_size`: Some(132), added: 627, mode: `MaxEncodedLen`)
-	/// Storage: `Democracy::ReferendumInfoOf` (r:1 w:1)
-	/// Proof: `Democracy::ReferendumInfoOf` (`max_values`: None, `max_size`: Some(201), added: 2676, mode: `MaxEncodedLen`)
-	/// Storage: `Democracy::Blacklist` (r:0 w:1)
-	/// Proof: `Democracy::Blacklist` (`max_values`: None, `max_size`: Some(2038), added: 4513, mode: `MaxEncodedLen`)
-	fn blacklist() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `4953`
-		//  Estimated: `16987`
-		// Minimum execution time: 86_000_000 picoseconds.
-		Weight::from_parts(105_000_000, 0)
-			.saturating_add(Weight::from_parts(0, 16987))
-			.saturating_add(T::DbWeight::get().reads(9))
-			.saturating_add(T::DbWeight::get().writes(8))
-	}
-	/// Storage: `Democracy::NextExternal` (r:1 w:1)
-	/// Proof: `Democracy::NextExternal` (`max_values`: Some(1), `max_size`: Some(132), added: 627, mode: `MaxEncodedLen`)
-	/// Storage: `Democracy::Blacklist` (r:1 w:0)
-	/// Proof: `Democracy::Blacklist` (`max_values`: None, `max_size`: Some(2038), added: 4513, mode: `MaxEncodedLen`)
-	fn external_propose() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `2161`
-		//  Estimated: `5503`
-		// Minimum execution time: 10_000_000 picoseconds.
-		Weight::from_parts(13_000_000, 0)
-			.saturating_add(Weight::from_parts(0, 5503))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Democracy::NextExternal` (r:0 w:1)
-	/// Proof: `Democracy::NextExternal` (`max_values`: Some(1), `max_size`: Some(132), added: 627, mode: `MaxEncodedLen`)
-	fn external_propose_majority() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 3_000_000 picoseconds.
-		Weight::from_parts(3_000_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Democracy::NextExternal` (r:0 w:1)
-	/// Proof: `Democracy::NextExternal` (`max_values`: Some(1), `max_size`: Some(132), added: 627, mode: `MaxEncodedLen`)
-	fn external_propose_default() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_000_000 picoseconds.
-		Weight::from_parts(3_000_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Democracy::NextExternal` (r:1 w:1)
-	/// Proof: `Democracy::NextExternal` (`max_values`: Some(1), `max_size`: Some(132), added: 627, mode: `MaxEncodedLen`)
-	/// Storage: `Democracy::ReferendumCount` (r:1 w:1)
-	/// Proof: `Democracy::ReferendumCount` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	/// Storage: `Democracy::MetadataOf` (r:1 w:2)
-	/// Proof: `Democracy::MetadataOf` (`max_values`: None, `max_size`: Some(53), added: 2528, mode: `MaxEncodedLen`)
-	/// Storage: `Democracy::ReferendumInfoOf` (r:0 w:1)
-	/// Proof: `Democracy::ReferendumInfoOf` (`max_values`: None, `max_size`: Some(201), added: 2676, mode: `MaxEncodedLen`)
-	fn fast_track() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `219`
-		//  Estimated: `3518`
-		// Minimum execution time: 22_000_000 picoseconds.
-		Weight::from_parts(27_000_000, 0)
-			.saturating_add(Weight::from_parts(0, 3518))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(5))
-	}
-	/// Storage: `Democracy::NextExternal` (r:1 w:1)
-	/// Proof: `Democracy::NextExternal` (`max_values`: Some(1), `max_size`: Some(132), added: 627, mode: `MaxEncodedLen`)
-	/// Storage: `Democracy::Blacklist` (r:1 w:1)
-	/// Proof: `Democracy::Blacklist` (`max_values`: None, `max_size`: Some(2038), added: 4513, mode: `MaxEncodedLen`)
-	/// Storage: `Democracy::MetadataOf` (r:1 w:1)
-	/// Proof: `Democracy::MetadataOf` (`max_values`: None, `max_size`: Some(53), added: 2528, mode: `MaxEncodedLen`)
-	fn veto_external() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `2264`
-		//  Estimated: `5503`
-		// Minimum execution time: 24_000_000 picoseconds.
-		Weight::from_parts(29_000_000, 0)
-			.saturating_add(Weight::from_parts(0, 5503))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: `Democracy::PublicProps` (r:1 w:1)
-	/// Proof: `Democracy::PublicProps` (`max_values`: Some(1), `max_size`: Some(15502), added: 15997, mode: `MaxEncodedLen`)
-	/// Storage: `Democracy::DepositOf` (r:1 w:1)
-	/// Proof: `Democracy::DepositOf` (`max_values`: None, `max_size`: Some(2030), added: 4505, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:2 w:2)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(116), added: 2591, mode: `MaxEncodedLen`)
-	/// Storage: `Democracy::MetadataOf` (r:1 w:1)
-	/// Proof: `Democracy::MetadataOf` (`max_values`: None, `max_size`: Some(53), added: 2528, mode: `MaxEncodedLen`)
-	fn cancel_proposal() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `4885`
-		//  Estimated: `16987`
-		// Minimum execution time: 68_000_000 picoseconds.
-		Weight::from_parts(80_000_000, 0)
-			.saturating_add(Weight::from_parts(0, 16987))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(5))
-	}
-	/// Storage: `Democracy::MetadataOf` (r:1 w:1)
-	/// Proof: `Democracy::MetadataOf` (`max_values`: None, `max_size`: Some(53), added: 2528, mode: `MaxEncodedLen`)
-	/// Storage: `Democracy::ReferendumInfoOf` (r:0 w:1)
-	/// Proof: `Democracy::ReferendumInfoOf` (`max_values`: None, `max_size`: Some(201), added: 2676, mode: `MaxEncodedLen`)
-	fn cancel_referendum() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `204`
-		//  Estimated: `3518`
-		// Minimum execution time: 15_000_000 picoseconds.
-		Weight::from_parts(15_000_000, 0)
-			.saturating_add(Weight::from_parts(0, 3518))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `Democracy::LowestUnbaked` (r:1 w:1)
-	/// Proof: `Democracy::LowestUnbaked` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	/// Storage: `Democracy::ReferendumCount` (r:1 w:0)
-	/// Proof: `Democracy::ReferendumCount` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	/// Storage: `Democracy::ReferendumInfoOf` (r:99 w:0)
-	/// Proof: `Democracy::ReferendumInfoOf` (`max_values`: None, `max_size`: Some(201), added: 2676, mode: `MaxEncodedLen`)
-	/// The range of component `r` is `[0, 99]`.
-	fn on_initialize_base(r: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `177 + r * (86 ±0)`
-		//  Estimated: `1489 + r * (2676 ±0)`
-		// Minimum execution time: 5_000_000 picoseconds.
-		Weight::from_parts(2_999_465, 0)
-			.saturating_add(Weight::from_parts(0, 1489))
-			// Standard Error: 20_073
-			.saturating_add(Weight::from_parts(2_811_802, 0).saturating_mul(r.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r.into())))
-			.saturating_add(T::DbWeight::get().writes(1))
-			.saturating_add(Weight::from_parts(0, 2676).saturating_mul(r.into()))
-	}
-	/// Storage: `Democracy::LowestUnbaked` (r:1 w:1)
-	/// Proof: `Democracy::LowestUnbaked` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	/// Storage: `Democracy::ReferendumCount` (r:1 w:0)
-	/// Proof: `Democracy::ReferendumCount` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	/// Storage: `Democracy::LastTabledWasExternal` (r:1 w:0)
-	/// Proof: `Democracy::LastTabledWasExternal` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`)
-	/// Storage: `Democracy::NextExternal` (r:1 w:0)
-	/// Proof: `Democracy::NextExternal` (`max_values`: Some(1), `max_size`: Some(132), added: 627, mode: `MaxEncodedLen`)
-	/// Storage: `Democracy::PublicProps` (r:1 w:0)
-	/// Proof: `Democracy::PublicProps` (`max_values`: Some(1), `max_size`: Some(15502), added: 15997, mode: `MaxEncodedLen`)
-	/// Storage: `Democracy::ReferendumInfoOf` (r:99 w:0)
-	/// Proof: `Democracy::ReferendumInfoOf` (`max_values`: None, `max_size`: Some(201), added: 2676, mode: `MaxEncodedLen`)
-	/// The range of component `r` is `[0, 99]`.
-	fn on_initialize_base_with_launch_period(r: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `177 + r * (86 ±0)`
-		//  Estimated: `16987 + r * (2676 ±0)`
-		// Minimum execution time: 8_000_000 picoseconds.
-		Weight::from_parts(7_257_608, 0)
-			.saturating_add(Weight::from_parts(0, 16987))
-			// Standard Error: 18_845
-			.saturating_add(Weight::from_parts(2_764_961, 0).saturating_mul(r.into()))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r.into())))
-			.saturating_add(T::DbWeight::get().writes(1))
-			.saturating_add(Weight::from_parts(0, 2676).saturating_mul(r.into()))
-	}
-	/// Storage: `Democracy::VotingOf` (r:3 w:3)
-	/// Proof: `Democracy::VotingOf` (`max_values`: None, `max_size`: Some(3783), added: 6258, mode: `MaxEncodedLen`)
-	/// Storage: `Democracy::ReferendumInfoOf` (r:99 w:99)
-	/// Proof: `Democracy::ReferendumInfoOf` (`max_values`: None, `max_size`: Some(201), added: 2676, mode: `MaxEncodedLen`)
-	/// Storage: `Balances::Locks` (r:1 w:1)
-	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1287), added: 3762, mode: `MaxEncodedLen`)
-	/// Storage: `Balances::Freezes` (r:1 w:0)
-	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(37), added: 2512, mode: `MaxEncodedLen`)
-	/// The range of component `r` is `[0, 99]`.
-	fn delegate(r: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `730 + r * (108 ±0)`
-		//  Estimated: `19764 + r * (2676 ±0)`
-		// Minimum execution time: 32_000_000 picoseconds.
-		Weight::from_parts(35_885_858, 0)
-			.saturating_add(Weight::from_parts(0, 19764))
-			// Standard Error: 29_599
-			.saturating_add(Weight::from_parts(3_620_565, 0).saturating_mul(r.into()))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r.into())))
-			.saturating_add(T::DbWeight::get().writes(4))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(r.into())))
-			.saturating_add(Weight::from_parts(0, 2676).saturating_mul(r.into()))
-	}
-	/// Storage: `Democracy::VotingOf` (r:2 w:2)
-	/// Proof: `Democracy::VotingOf` (`max_values`: None, `max_size`: Some(3783), added: 6258, mode: `MaxEncodedLen`)
-	/// Storage: `Democracy::ReferendumInfoOf` (r:99 w:99)
-	/// Proof: `Democracy::ReferendumInfoOf` (`max_values`: None, `max_size`: Some(201), added: 2676, mode: `MaxEncodedLen`)
-	/// The range of component `r` is `[0, 99]`.
-	fn undelegate(r: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `388 + r * (108 ±0)`
-		//  Estimated: `13506 + r * (2676 ±0)`
-		// Minimum execution time: 15_000_000 picoseconds.
-		Weight::from_parts(12_883_785, 0)
-			.saturating_add(Weight::from_parts(0, 13506))
-			// Standard Error: 24_209
-			.saturating_add(Weight::from_parts(3_601_024, 0).saturating_mul(r.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r.into())))
-			.saturating_add(T::DbWeight::get().writes(2))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(r.into())))
-			.saturating_add(Weight::from_parts(0, 2676).saturating_mul(r.into()))
-	}
-	/// Storage: `Democracy::PublicProps` (r:0 w:1)
-	/// Proof: `Democracy::PublicProps` (`max_values`: Some(1), `max_size`: Some(15502), added: 15997, mode: `MaxEncodedLen`)
-	fn clear_public_proposals() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 2_000_000 picoseconds.
-		Weight::from_parts(2_000_000, 0)
-			.saturating_add(Weight::from_parts(0, 0))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Democracy::VotingOf` (r:1 w:1)
-	/// Proof: `Democracy::VotingOf` (`max_values`: None, `max_size`: Some(3783), added: 6258, mode: `MaxEncodedLen`)
-	/// Storage: `Balances::Locks` (r:1 w:1)
-	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1287), added: 3762, mode: `MaxEncodedLen`)
-	/// Storage: `Balances::Freezes` (r:1 w:0)
-	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(37), added: 2512, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(116), added: 2591, mode: `MaxEncodedLen`)
-	/// The range of component `r` is `[0, 99]`.
-	fn unlock_remove(r: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `423`
-		//  Estimated: `7248`
-		// Minimum execution time: 20_000_000 picoseconds.
-		Weight::from_parts(31_483_615, 0)
-			.saturating_add(Weight::from_parts(0, 7248))
-			// Standard Error: 4_916
-			.saturating_add(Weight::from_parts(62_512, 0).saturating_mul(r.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: `Democracy::VotingOf` (r:1 w:1)
-	/// Proof: `Democracy::VotingOf` (`max_values`: None, `max_size`: Some(3783), added: 6258, mode: `MaxEncodedLen`)
-	/// Storage: `Balances::Locks` (r:1 w:1)
-	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1287), added: 3762, mode: `MaxEncodedLen`)
-	/// Storage: `Balances::Freezes` (r:1 w:0)
-	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(37), added: 2512, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(116), added: 2591, mode: `MaxEncodedLen`)
-	/// The range of component `r` is `[0, 99]`.
-	fn unlock_set(r: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `424 + r * (22 ±0)`
-		//  Estimated: `7248`
-		// Minimum execution time: 25_000_000 picoseconds.
-		Weight::from_parts(30_401_358, 0)
-			.saturating_add(Weight::from_parts(0, 7248))
-			// Standard Error: 4_644
-			.saturating_add(Weight::from_parts(78_266, 0).saturating_mul(r.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: `Democracy::ReferendumInfoOf` (r:1 w:1)
-	/// Proof: `Democracy::ReferendumInfoOf` (`max_values`: None, `max_size`: Some(201), added: 2676, mode: `MaxEncodedLen`)
-	/// Storage: `Democracy::VotingOf` (r:1 w:1)
-	/// Proof: `Democracy::VotingOf` (`max_values`: None, `max_size`: Some(3783), added: 6258, mode: `MaxEncodedLen`)
-	/// The range of component `r` is `[1, 100]`.
-	fn remove_vote(r: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `649 + r * (26 ±0)`
-		//  Estimated: `7248`
-		// Minimum execution time: 11_000_000 picoseconds.
-		Weight::from_parts(14_702_444, 0)
-			.saturating_add(Weight::from_parts(0, 7248))
-			// Standard Error: 3_184
-			.saturating_add(Weight::from_parts(79_839, 0).saturating_mul(r.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `Democracy::ReferendumInfoOf` (r:1 w:1)
-	/// Proof: `Democracy::ReferendumInfoOf` (`max_values`: None, `max_size`: Some(201), added: 2676, mode: `MaxEncodedLen`)
-	/// Storage: `Democracy::VotingOf` (r:1 w:1)
-	/// Proof: `Democracy::VotingOf` (`max_values`: None, `max_size`: Some(3783), added: 6258, mode: `MaxEncodedLen`)
-	/// The range of component `r` is `[1, 100]`.
-	fn remove_other_vote(r: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `649 + r * (26 ±0)`
-		//  Estimated: `7248`
-		// Minimum execution time: 12_000_000 picoseconds.
-		Weight::from_parts(14_931_226, 0)
-			.saturating_add(Weight::from_parts(0, 7248))
-			// Standard Error: 2_906
-			.saturating_add(Weight::from_parts(85_221, 0).saturating_mul(r.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `Democracy::NextExternal` (r:1 w:0)
-	/// Proof: `Democracy::NextExternal` (`max_values`: Some(1), `max_size`: Some(132), added: 627, mode: `MaxEncodedLen`)
-	/// Storage: `Preimage::StatusFor` (r:1 w:0)
-	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
-	/// Storage: `Democracy::MetadataOf` (r:0 w:1)
-	/// Proof: `Democracy::MetadataOf` (`max_values`: None, `max_size`: Some(53), added: 2528, mode: `MaxEncodedLen`)
-	fn set_external_metadata() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `289`
-		//  Estimated: `3544`
-		// Minimum execution time: 15_000_000 picoseconds.
-		Weight::from_parts(19_000_000, 0)
-			.saturating_add(Weight::from_parts(0, 3544))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Democracy::NextExternal` (r:1 w:0)
-	/// Proof: `Democracy::NextExternal` (`max_values`: Some(1), `max_size`: Some(132), added: 627, mode: `MaxEncodedLen`)
-	/// Storage: `Democracy::MetadataOf` (r:1 w:1)
-	/// Proof: `Democracy::MetadataOf` (`max_values`: None, `max_size`: Some(53), added: 2528, mode: `MaxEncodedLen`)
-	fn clear_external_metadata() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `219`
-		//  Estimated: `3518`
-		// Minimum execution time: 13_000_000 picoseconds.
-		Weight::from_parts(16_000_000, 0)
-			.saturating_add(Weight::from_parts(0, 3518))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Democracy::PublicProps` (r:1 w:0)
-	/// Proof: `Democracy::PublicProps` (`max_values`: Some(1), `max_size`: Some(15502), added: 15997, mode: `MaxEncodedLen`)
-	/// Storage: `Preimage::StatusFor` (r:1 w:0)
-	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
-	/// Storage: `Democracy::MetadataOf` (r:0 w:1)
-	/// Proof: `Democracy::MetadataOf` (`max_values`: None, `max_size`: Some(53), added: 2528, mode: `MaxEncodedLen`)
-	fn set_proposal_metadata() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `3621`
-		//  Estimated: `16987`
-		// Minimum execution time: 29_000_000 picoseconds.
-		Weight::from_parts(33_000_000, 0)
-			.saturating_add(Weight::from_parts(0, 16987))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Democracy::PublicProps` (r:1 w:0)
-	/// Proof: `Democracy::PublicProps` (`max_values`: Some(1), `max_size`: Some(15502), added: 15997, mode: `MaxEncodedLen`)
-	/// Storage: `Democracy::MetadataOf` (r:1 w:1)
-	/// Proof: `Democracy::MetadataOf` (`max_values`: None, `max_size`: Some(53), added: 2528, mode: `MaxEncodedLen`)
-	fn clear_proposal_metadata() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `3555`
-		//  Estimated: `16987`
-		// Minimum execution time: 28_000_000 picoseconds.
-		Weight::from_parts(36_000_000, 0)
-			.saturating_add(Weight::from_parts(0, 16987))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Preimage::StatusFor` (r:1 w:0)
-	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
-	/// Storage: `Democracy::MetadataOf` (r:0 w:1)
-	/// Proof: `Democracy::MetadataOf` (`max_values`: None, `max_size`: Some(53), added: 2528, mode: `MaxEncodedLen`)
-	fn set_referendum_metadata() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `144`
-		//  Estimated: `3544`
-		// Minimum execution time: 11_000_000 picoseconds.
-		Weight::from_parts(13_000_000, 0)
-			.saturating_add(Weight::from_parts(0, 3544))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Democracy::ReferendumInfoOf` (r:1 w:0)
-	/// Proof: `Democracy::ReferendumInfoOf` (`max_values`: None, `max_size`: Some(201), added: 2676, mode: `MaxEncodedLen`)
-	/// Storage: `Democracy::MetadataOf` (r:1 w:1)
-	/// Proof: `Democracy::MetadataOf` (`max_values`: None, `max_size`: Some(53), added: 2528, mode: `MaxEncodedLen`)
-	fn clear_referendum_metadata() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `235`
-		//  Estimated: `3666`
-		// Minimum execution time: 14_000_000 picoseconds.
-		Weight::from_parts(17_000_000, 0)
-			.saturating_add(Weight::from_parts(0, 3666))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-}

From 737c96062f0b2e9c308e17edd8c797a4e26e82a0 Mon Sep 17 00:00:00 2001
From: Xavier Lau <xavier@inv.cafe>
Date: Wed, 26 Jun 2024 09:51:36 +0800
Subject: [PATCH 38/59] Format

---
 node/src/command.rs                           | 4 +---
 runtime/darwinia/src/pallets/asset_manager.rs | 2 +-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/node/src/command.rs b/node/src/command.rs
index ba54b7548..61b698609 100644
--- a/node/src/command.rs
+++ b/node/src/command.rs
@@ -617,9 +617,7 @@ fn load_spec(id: &str) -> std::result::Result<Box<dyn ChainSpecT>, String> {
 		"koi-genesis" => Box::new(koi::genesis_config()),
 		#[cfg(feature = "koi-native")]
 		"koi-dev" => Box::new(koi::development_config()),
-		_ => {
-			Box::new(ChainSpec::from_json_file(PathBuf::from(id))?)
-		},
+		_ => Box::new(ChainSpec::from_json_file(PathBuf::from(id))?),
 	};
 
 	Ok(chain_spec)
diff --git a/runtime/darwinia/src/pallets/asset_manager.rs b/runtime/darwinia/src/pallets/asset_manager.rs
index bd11c9749..537c682c1 100644
--- a/runtime/darwinia/src/pallets/asset_manager.rs
+++ b/runtime/darwinia/src/pallets/asset_manager.rs
@@ -70,7 +70,7 @@ impl pallet_asset_manager::AssetRegistrar<Runtime> for AssetRegistrar {
 	fn destroy_foreign_asset(asset: AssetId) -> sp_runtime::DispatchResult {
 		// Mark the asset as destroying
 		Assets::start_destroy(RuntimeOrigin::root(), asset.into())?;
-		
+
 		Ok(())
 	}
 

From e8746d4518377043676d934d2edd14c6b349c2b5 Mon Sep 17 00:00:00 2001
From: Xavier Lau <xavier@inv.cafe>
Date: Wed, 26 Jun 2024 10:31:23 +0800
Subject: [PATCH 39/59] Fix pallet tests

---
 pallet/account-migration/src/mock.rs | 37 +++------------
 pallet/deposit/src/mock.rs           |  7 +--
 pallet/ethtx-forwarder/src/mock.rs   | 70 ++++++----------------------
 pallet/ethtx-forwarder/src/test.rs   |  4 +-
 pallet/staking/src/mock.rs           | 50 +++++++-------------
 5 files changed, 41 insertions(+), 127 deletions(-)

diff --git a/pallet/account-migration/src/mock.rs b/pallet/account-migration/src/mock.rs
index bf24f3b54..87aea393e 100644
--- a/pallet/account-migration/src/mock.rs
+++ b/pallet/account-migration/src/mock.rs
@@ -19,7 +19,8 @@
 pub use crate as darwinia_account_migration;
 pub use dc_primitives::*;
 
-// substrate
+// polkadot-sdk
+use frame_support::derive_impl;
 use sp_io::TestExternalities;
 use sp_runtime::BuildStorage;
 
@@ -62,53 +63,26 @@ pub const VERSION: sp_version::RuntimeVersion = sp_version::RuntimeVersion {
 frame_support::parameter_types! {
 	pub const Version: sp_version::RuntimeVersion = VERSION;
 }
-#[frame_support::derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Runtime {
 	type AccountData = pallet_balances::AccountData<Balance>;
 	type AccountId = AccountId;
-	type BaseCallFilter = frame_support::traits::Everything;
 	type Block = frame_system::mocking::MockBlock<Self>;
-	type BlockHashCount = ();
-	type BlockLength = ();
-	type BlockWeights = ();
-	type DbWeight = ();
-	type Hash = sp_core::H256;
-	type Hashing = sp_runtime::traits::BlakeTwo256;
-	type Lookup = sp_runtime::traits::IdentityLookup<Self::AccountId>;
 	type MaxConsumers = frame_support::traits::ConstU32<16>;
-	type Nonce = Nonce;
-	type OnKilledAccount = ();
-	type OnNewAccount = ();
-	type OnSetCode = ();
-	type PalletInfo = PalletInfo;
-	type RuntimeCall = RuntimeCall;
-	type RuntimeEvent = RuntimeEvent;
-	type RuntimeOrigin = RuntimeOrigin;
-	type SS58Prefix = ();
-	type SystemWeightInfo = ();
 	type Version = Version;
 }
 
+#[derive_impl(pallet_timestamp::config_preludes::TestDefaultConfig as pallet_timestamp::DefaultConfig)]
 impl pallet_timestamp::Config for Runtime {
 	type MinimumPeriod = ();
 	type Moment = Moment;
-	type OnTimestampSet = ();
-	type WeightInfo = ();
 }
 
+#[derive_impl(pallet_balances::config_preludes::TestDefaultConfig as pallet_balances::DefaultConfig)]
 impl pallet_balances::Config for Runtime {
 	type AccountStore = System;
 	type Balance = Balance;
-	type DustRemoval = ();
 	type ExistentialDeposit = ();
-	type FreezeIdentifier = ();
-	type MaxFreezes = ();
-	type MaxLocks = ();
-	type MaxReserves = ();
-	type ReserveIdentifier = [u8; 8];
-	type RuntimeEvent = RuntimeEvent;
-	type RuntimeHoldReason = ();
-	type WeightInfo = ();
 }
 
 #[cfg(feature = "runtime-benchmarks")]
@@ -119,6 +93,7 @@ impl pallet_assets::BenchmarkHelper<codec::Compact<AssetId>> for BenchmarkHelper
 		(id as u64).into()
 	}
 }
+#[derive_impl(pallet_assets::config_preludes::TestDefaultConfig as pallet_assets::DefaultConfig)]
 impl pallet_assets::Config for Runtime {
 	type ApprovalDeposit = ();
 	type AssetAccountDeposit = ();
diff --git a/pallet/deposit/src/mock.rs b/pallet/deposit/src/mock.rs
index df08fb3ae..28723c78c 100644
--- a/pallet/deposit/src/mock.rs
+++ b/pallet/deposit/src/mock.rs
@@ -19,7 +19,7 @@
 pub use crate as darwinia_deposit;
 pub use dc_types::{AssetId, Balance, Moment, UNIT};
 
-// substrate
+// polkadot-sdk
 use frame_support::derive_impl;
 use sp_io::TestExternalities;
 use sp_runtime::BuildStorage;
@@ -28,10 +28,6 @@ use sp_runtime::BuildStorage;
 impl frame_system::Config for Runtime {
 	type AccountData = pallet_balances::AccountData<Balance>;
 	type Block = frame_system::mocking::MockBlock<Self>;
-	type PalletInfo = PalletInfo;
-	type RuntimeCall = RuntimeCall;
-	type RuntimeEvent = RuntimeEvent;
-	type RuntimeOrigin = RuntimeOrigin;
 }
 
 #[derive_impl(pallet_timestamp::config_preludes::TestDefaultConfig as pallet_timestamp::DefaultConfig)]
@@ -45,7 +41,6 @@ impl pallet_balances::Config for Runtime {
 	type AccountStore = System;
 	type Balance = Balance;
 	type ExistentialDeposit = ();
-	type RuntimeEvent = RuntimeEvent;
 }
 
 #[cfg(feature = "runtime-benchmarks")]
diff --git a/pallet/ethtx-forwarder/src/mock.rs b/pallet/ethtx-forwarder/src/mock.rs
index 9ae350309..037c4b299 100644
--- a/pallet/ethtx-forwarder/src/mock.rs
+++ b/pallet/ethtx-forwarder/src/mock.rs
@@ -22,71 +22,32 @@ pub use crate as darwinia_ethtx_forwarder;
 
 // crates.io
 use sha3::Digest;
-// substrate
-use sp_core::H160;
+// polkadot-sdk
+use frame_support::derive_impl;
 use sp_runtime::BuildStorage;
 use sp_std::prelude::*;
 
+pub type AccountId = sp_core::H160;
 pub type Balance = u64;
-pub type AccountId = H160;
 
-frame_support::parameter_types! {
-	pub const BlockHashCount: u64 = 250;
-}
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Runtime {
 	type AccountData = pallet_balances::AccountData<Balance>;
 	type AccountId = AccountId;
-	type BaseCallFilter = frame_support::traits::Everything;
 	type Block = frame_system::mocking::MockBlock<Self>;
-	type BlockHashCount = ();
-	type BlockLength = ();
-	type BlockWeights = ();
-	type DbWeight = ();
-	type Hash = sp_core::H256;
-	type Hashing = sp_runtime::traits::BlakeTwo256;
 	type Lookup = sp_runtime::traits::IdentityLookup<Self::AccountId>;
 	type MaxConsumers = frame_support::traits::ConstU32<16>;
-	type Nonce = u64;
-	type OnKilledAccount = ();
-	type OnNewAccount = ();
-	type OnSetCode = ();
-	type PalletInfo = PalletInfo;
-	type RuntimeCall = RuntimeCall;
-	type RuntimeEvent = RuntimeEvent;
-	type RuntimeOrigin = RuntimeOrigin;
-	type SS58Prefix = ();
-	type SystemWeightInfo = ();
-	type Version = ();
 }
 
+#[derive_impl(pallet_balances::config_preludes::TestDefaultConfig as pallet_balances::DefaultConfig)]
 impl pallet_balances::Config for Runtime {
 	type AccountStore = System;
-	type Balance = Balance;
-	type DustRemoval = ();
-	type ExistentialDeposit = ();
-	type FreezeIdentifier = ();
-	type MaxFreezes = ();
-	type MaxLocks = ();
-	type MaxReserves = ();
-	type ReserveIdentifier = [u8; 8];
-	type RuntimeEvent = RuntimeEvent;
-	type RuntimeHoldReason = ();
-	type WeightInfo = ();
 }
 
-frame_support::parameter_types! {
-	pub const MinimumPeriod: u64 = 6000 / 2;
-}
-impl pallet_timestamp::Config for Runtime {
-	type MinimumPeriod = MinimumPeriod;
-	type Moment = u64;
-	type OnTimestampSet = ();
-	type WeightInfo = ();
-}
+#[derive_impl(pallet_timestamp::config_preludes::TestDefaultConfig as pallet_timestamp::DefaultConfig)]
+impl pallet_timestamp::Config for Runtime {}
 
 frame_support::parameter_types! {
-	pub const TransactionByteFee: u64 = 1;
-	pub const ChainId: u64 = 888;
 	pub const BlockGasLimit: sp_core::U256 = sp_core::U256::MAX;
 	pub const WeightPerGas: frame_support::weights::Weight = frame_support::weights::Weight::from_parts(20_000, 0);
 }
@@ -101,7 +62,7 @@ impl pallet_evm::Config for Runtime {
 	type BlockGasLimit = BlockGasLimit;
 	type BlockHashMapping = pallet_evm::SubstrateBlockHashMapping<Self>;
 	type CallOrigin = pallet_evm::EnsureAddressRoot<AccountId>;
-	type ChainId = ChainId;
+	type ChainId = frame_support::traits::ConstU64<888>;
 	type Currency = Balances;
 	type FeeCalculator = FixedGasPrice;
 	type FindAuthor = ();
@@ -113,6 +74,7 @@ impl pallet_evm::Config for Runtime {
 	type PrecompilesValue = ();
 	type Runner = pallet_evm::runner::stack::Runner<Self>;
 	type RuntimeEvent = RuntimeEvent;
+	type SuicideQuickClearLimit = ();
 	type Timestamp = Timestamp;
 	type WeightInfo = ();
 	type WeightPerGas = WeightPerGas;
@@ -129,7 +91,7 @@ impl pallet_ethereum::Config for Runtime {
 	type StateRoot = pallet_ethereum::IntermediateStateRoot<Self>;
 }
 
-impl crate::Config for Runtime {
+impl darwinia_ethtx_forwarder::Config for Runtime {
 	type ForwardEthOrigin = crate::EnsureRuntimeEthOrigin;
 	type ValidatedTransaction = pallet_ethereum::ValidatedTransaction<Self>;
 }
@@ -205,11 +167,10 @@ impl fp_self_contained::SelfContainedCall for RuntimeCall {
 	}
 }
 
-pub(crate) struct AccountInfo {
+pub struct AccountInfo {
 	pub address: sp_core::H160,
 }
-
-pub(crate) fn address_build(seed: u8) -> AccountInfo {
+pub fn address_build(seed: u8) -> AccountInfo {
 	let raw_private_key = [seed + 1; 32];
 	let secret_key = libsecp256k1::SecretKey::parse_slice(&raw_private_key).unwrap();
 	let raw_public_key = &libsecp256k1::PublicKey::from_secret_key(&secret_key).serialize()[1..65];
@@ -223,18 +184,17 @@ pub(crate) fn address_build(seed: u8) -> AccountInfo {
 }
 
 #[derive(Default)]
-pub(crate) struct ExtBuilder {
+pub struct ExtBuilder {
 	// endowed accounts with balances
 	balances: Vec<(AccountId, Balance)>,
 }
-
 impl ExtBuilder {
-	pub(crate) fn with_balances(mut self, balances: Vec<(AccountId, Balance)>) -> Self {
+	pub fn with_balances(mut self, balances: Vec<(AccountId, Balance)>) -> Self {
 		self.balances = balances;
 		self
 	}
 
-	pub(crate) fn build(self) -> sp_io::TestExternalities {
+	pub fn build(self) -> sp_io::TestExternalities {
 		let mut t = <frame_system::GenesisConfig<Runtime>>::default()
 			.build_storage()
 			.expect("Frame system builds valid default genesis config");
diff --git a/pallet/ethtx-forwarder/src/test.rs b/pallet/ethtx-forwarder/src/test.rs
index a948e86a0..2143cf392 100644
--- a/pallet/ethtx-forwarder/src/test.rs
+++ b/pallet/ethtx-forwarder/src/test.rs
@@ -31,9 +31,9 @@ use sp_runtime::{DispatchError, ModuleError};
 // contract MyToken is ERC20 {
 //	 constructor() public { _mint(msg.sender, 2**256 - 1); }
 // }
-pub const ERC20_CONTRACT_BYTECODE: &str = "608060405234801561001057600080fd5b50610041337fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff61004660201b60201c565b610291565b600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff1614156100e9576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252601f8152602001807f45524332303a206d696e7420746f20746865207a65726f20616464726573730081525060200191505060405180910390fd5b6101028160025461020960201b610c7c1790919060201c565b60028190555061015d816000808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205461020960201b610c7c1790919060201c565b6000808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508173ffffffffffffffffffffffffffffffffffffffff16600073ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef836040518082815260200191505060405180910390a35050565b600080828401905083811015610287576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252601b8152602001807f536166654d6174683a206164646974696f6e206f766572666c6f77000000000081525060200191505060405180910390fd5b8091505092915050565b610e3a806102a06000396000f3fe608060405234801561001057600080fd5b50600436106100885760003560e01c806370a082311161005b57806370a08231146101fd578063a457c2d714610255578063a9059cbb146102bb578063dd62ed3e1461032157610088565b8063095ea7b31461008d57806318160ddd146100f357806323b872dd146101115780633950935114610197575b600080fd5b6100d9600480360360408110156100a357600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050610399565b604051808215151515815260200191505060405180910390f35b6100fb6103b7565b6040518082815260200191505060405180910390f35b61017d6004803603606081101561012757600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803590602001909291905050506103c1565b604051808215151515815260200191505060405180910390f35b6101e3600480360360408110156101ad57600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff1690602001909291908035906020019092919050505061049a565b604051808215151515815260200191505060405180910390f35b61023f6004803603602081101561021357600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919050505061054d565b6040518082815260200191505060405180910390f35b6102a16004803603604081101561026b57600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050610595565b604051808215151515815260200191505060405180910390f35b610307600480360360408110156102d157600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050610662565b604051808215151515815260200191505060405180910390f35b6103836004803603604081101561033757600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610680565b6040518082815260200191505060405180910390f35b60006103ad6103a6610707565b848461070f565b6001905092915050565b6000600254905090565b60006103ce848484610906565b61048f846103da610707565b61048a85604051806060016040528060288152602001610d7060289139600160008b73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206000610440610707565b73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610bbc9092919063ffffffff16565b61070f565b600190509392505050565b60006105436104a7610707565b8461053e85600160006104b8610707565b73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008973ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610c7c90919063ffffffff16565b61070f565b6001905092915050565b60008060008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020549050919050565b60006106586105a2610707565b8461065385604051806060016040528060258152602001610de160259139600160006105cc610707565b73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008a73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610bbc9092919063ffffffff16565b61070f565b6001905092915050565b600061067661066f610707565b8484610906565b6001905092915050565b6000600160008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054905092915050565b600033905090565b600073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff161415610795576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401808060200182810382526024815260200180610dbd6024913960400191505060405180910390fd5b600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff16141561081b576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401808060200182810382526022815260200180610d286022913960400191505060405180910390fd5b80600160008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508173ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925836040518082815260200191505060405180910390a3505050565b600073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff16141561098c576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401808060200182810382526025815260200180610d986025913960400191505060405180910390fd5b600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff161415610a12576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401808060200182810382526023815260200180610d056023913960400191505060405180910390fd5b610a7d81604051806060016040528060268152602001610d4a602691396000808773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610bbc9092919063ffffffff16565b6000808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610b10816000808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610c7c90919063ffffffff16565b6000808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508173ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef836040518082815260200191505060405180910390a3505050565b6000838311158290610c69576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825283818151815260200191508051906020019080838360005b83811015610c2e578082015181840152602081019050610c13565b50505050905090810190601f168015610c5b5780820380516001836020036101000a031916815260200191505b509250505060405180910390fd5b5060008385039050809150509392505050565b600080828401905083811015610cfa576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252601b8152602001807f536166654d6174683a206164646974696f6e206f766572666c6f77000000000081525060200191505060405180910390fd5b809150509291505056fe45524332303a207472616e7366657220746f20746865207a65726f206164647265737345524332303a20617070726f766520746f20746865207a65726f206164647265737345524332303a207472616e7366657220616d6f756e7420657863656564732062616c616e636545524332303a207472616e7366657220616d6f756e74206578636565647320616c6c6f77616e636545524332303a207472616e736665722066726f6d20746865207a65726f206164647265737345524332303a20617070726f76652066726f6d20746865207a65726f206164647265737345524332303a2064656372656173656420616c6c6f77616e63652062656c6f77207a65726fa265627a7a72315820c7a5ffabf642bda14700b2de42f8c57b36621af020441df825de45fd2b3e1c5c64736f6c63430005100032";
+const ERC20_CONTRACT_BYTECODE: &str = "608060405234801561001057600080fd5b50610041337fffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffffff61004660201b60201c565b610291565b600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff1614156100e9576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252601f8152602001807f45524332303a206d696e7420746f20746865207a65726f20616464726573730081525060200191505060405180910390fd5b6101028160025461020960201b610c7c1790919060201c565b60028190555061015d816000808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000205461020960201b610c7c1790919060201c565b6000808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508173ffffffffffffffffffffffffffffffffffffffff16600073ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef836040518082815260200191505060405180910390a35050565b600080828401905083811015610287576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252601b8152602001807f536166654d6174683a206164646974696f6e206f766572666c6f77000000000081525060200191505060405180910390fd5b8091505092915050565b610e3a806102a06000396000f3fe608060405234801561001057600080fd5b50600436106100885760003560e01c806370a082311161005b57806370a08231146101fd578063a457c2d714610255578063a9059cbb146102bb578063dd62ed3e1461032157610088565b8063095ea7b31461008d57806318160ddd146100f357806323b872dd146101115780633950935114610197575b600080fd5b6100d9600480360360408110156100a357600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050610399565b604051808215151515815260200191505060405180910390f35b6100fb6103b7565b6040518082815260200191505060405180910390f35b61017d6004803603606081101561012757600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803590602001909291905050506103c1565b604051808215151515815260200191505060405180910390f35b6101e3600480360360408110156101ad57600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff1690602001909291908035906020019092919050505061049a565b604051808215151515815260200191505060405180910390f35b61023f6004803603602081101561021357600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919050505061054d565b6040518082815260200191505060405180910390f35b6102a16004803603604081101561026b57600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050610595565b604051808215151515815260200191505060405180910390f35b610307600480360360408110156102d157600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff16906020019092919080359060200190929190505050610662565b604051808215151515815260200191505060405180910390f35b6103836004803603604081101561033757600080fd5b81019080803573ffffffffffffffffffffffffffffffffffffffff169060200190929190803573ffffffffffffffffffffffffffffffffffffffff169060200190929190505050610680565b6040518082815260200191505060405180910390f35b60006103ad6103a6610707565b848461070f565b6001905092915050565b6000600254905090565b60006103ce848484610906565b61048f846103da610707565b61048a85604051806060016040528060288152602001610d7060289139600160008b73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff1681526020019081526020016000206000610440610707565b73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610bbc9092919063ffffffff16565b61070f565b600190509392505050565b60006105436104a7610707565b8461053e85600160006104b8610707565b73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008973ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610c7c90919063ffffffff16565b61070f565b6001905092915050565b60008060008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020549050919050565b60006106586105a2610707565b8461065385604051806060016040528060258152602001610de160259139600160006105cc610707565b73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008a73ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610bbc9092919063ffffffff16565b61070f565b6001905092915050565b600061067661066f610707565b8484610906565b6001905092915050565b6000600160008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008373ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054905092915050565b600033905090565b600073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff161415610795576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401808060200182810382526024815260200180610dbd6024913960400191505060405180910390fd5b600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff16141561081b576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401808060200182810382526022815260200180610d286022913960400191505060405180910390fd5b80600160008573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002060008473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508173ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff167f8c5be1e5ebec7d5bd14f71427d1e84f3dd0314c0f7b2291e5b200ac8c7c3b925836040518082815260200191505060405180910390a3505050565b600073ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff16141561098c576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401808060200182810382526025815260200180610d986025913960400191505060405180910390fd5b600073ffffffffffffffffffffffffffffffffffffffff168273ffffffffffffffffffffffffffffffffffffffff161415610a12576040517f08c379a0000000000000000000000000000000000000000000000000000000008152600401808060200182810382526023815260200180610d056023913960400191505060405180910390fd5b610a7d81604051806060016040528060268152602001610d4a602691396000808773ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610bbc9092919063ffffffff16565b6000808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002081905550610b10816000808573ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff16815260200190815260200160002054610c7c90919063ffffffff16565b6000808473ffffffffffffffffffffffffffffffffffffffff1673ffffffffffffffffffffffffffffffffffffffff168152602001908152602001600020819055508173ffffffffffffffffffffffffffffffffffffffff168373ffffffffffffffffffffffffffffffffffffffff167fddf252ad1be2c89b69c2b068fc378daa952ba7f163c4a11628f55a4df523b3ef836040518082815260200191505060405180910390a3505050565b6000838311158290610c69576040517f08c379a00000000000000000000000000000000000000000000000000000000081526004018080602001828103825283818151815260200191508051906020019080838360005b83811015610c2e578082015181840152602081019050610c13565b50505050905090810190601f168015610c5b5780820380516001836020036101000a031916815260200191505b509250505060405180910390fd5b5060008385039050809150509392505050565b600080828401905083811015610cfa576040517f08c379a000000000000000000000000000000000000000000000000000000000815260040180806020018281038252601b8152602001807f536166654d6174683a206164646974696f6e206f766572666c6f77000000000081525060200191505060405180910390fd5b809150509291505056fe45524332303a207472616e7366657220746f20746865207a65726f206164647265737345524332303a20617070726f766520746f20746865207a65726f206164647265737345524332303a207472616e7366657220616d6f756e7420657863656564732062616c616e636545524332303a207472616e7366657220616d6f756e74206578636565647320616c6c6f77616e636545524332303a207472616e736665722066726f6d20746865207a65726f206164647265737345524332303a20617070726f76652066726f6d20746865207a65726f206164647265737345524332303a2064656372656173656420616c6c6f77616e63652062656c6f77207a65726fa265627a7a72315820c7a5ffabf642bda14700b2de42f8c57b36621af020441df825de45fd2b3e1c5c64736f6c63430005100032";
 
-pub fn mocked_request() -> ForwardRequest {
+fn mocked_request() -> ForwardRequest {
 	ForwardRequest {
 		tx_type: TxType::default(),
 		gas_limit: U256::from(1_000_000),
diff --git a/pallet/staking/src/mock.rs b/pallet/staking/src/mock.rs
index 1ad7c95db..ab50c283c 100644
--- a/pallet/staking/src/mock.rs
+++ b/pallet/staking/src/mock.rs
@@ -21,59 +21,36 @@ pub use crate as darwinia_staking;
 // darwinia
 use dc_types::{Balance, Moment, UNIT};
 // substrate
-use frame_support::traits::{Currency, OnInitialize};
+use frame_support::{
+	derive_impl,
+	traits::{Currency, OnInitialize},
+};
 use sp_io::TestExternalities;
 use sp_runtime::{BuildStorage, RuntimeAppPublic};
 
-type BlockNumber = u64;
-type AccountId = u32;
+pub type AccountId = u32;
+pub type BlockNumber = frame_system::pallet_prelude::BlockNumberFor<Runtime>;
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Runtime {
 	type AccountData = pallet_balances::AccountData<Balance>;
 	type AccountId = AccountId;
-	type BaseCallFilter = frame_support::traits::Everything;
 	type Block = frame_system::mocking::MockBlock<Self>;
-	type BlockHashCount = ();
-	type BlockLength = ();
-	type BlockWeights = ();
-	type DbWeight = ();
-	type Hash = sp_core::H256;
-	type Hashing = sp_runtime::traits::BlakeTwo256;
 	type Lookup = sp_runtime::traits::IdentityLookup<Self::AccountId>;
 	type MaxConsumers = frame_support::traits::ConstU32<16>;
-	type Nonce = u64;
-	type OnKilledAccount = ();
-	type OnNewAccount = ();
-	type OnSetCode = ();
-	type PalletInfo = PalletInfo;
-	type RuntimeCall = RuntimeCall;
-	type RuntimeEvent = RuntimeEvent;
-	type RuntimeOrigin = RuntimeOrigin;
-	type SS58Prefix = ();
-	type SystemWeightInfo = ();
-	type Version = ();
 }
 
+#[derive_impl(pallet_timestamp::config_preludes::TestDefaultConfig as pallet_timestamp::DefaultConfig)]
 impl pallet_timestamp::Config for Runtime {
 	type MinimumPeriod = ();
 	type Moment = Moment;
-	type OnTimestampSet = ();
-	type WeightInfo = ();
 }
 
+#[derive_impl(pallet_balances::config_preludes::TestDefaultConfig as pallet_balances::DefaultConfig)]
 impl pallet_balances::Config for Runtime {
 	type AccountStore = System;
 	type Balance = Balance;
-	type DustRemoval = ();
-	type ExistentialDeposit = frame_support::traits::ConstU128<0>;
-	type FreezeIdentifier = ();
-	type MaxFreezes = ();
-	type MaxLocks = ();
-	type MaxReserves = ();
-	type ReserveIdentifier = [u8; 8];
-	type RuntimeEvent = RuntimeEvent;
-	type RuntimeHoldReason = ();
-	type WeightInfo = ();
+	type ExistentialDeposit = ();
 }
 
 pub enum KtonMinting {}
@@ -148,15 +125,22 @@ impl pallet_session::Config for Runtime {
 
 frame_support::parameter_types! {
 	pub const TreasuryPalletId: frame_support::PalletId = frame_support::PalletId(*b"da/trsry");
+	pub TreasuryAccount: AccountId = Treasury::account_id();
 }
 impl pallet_treasury::Config for Runtime {
 	type ApproveOrigin = frame_system::EnsureRoot<AccountId>;
+	type AssetKind = ();
+	type BalanceConverter = frame_support::traits::tokens::UnityAssetBalanceConversion;
+	type Beneficiary = AccountId;
+	type BeneficiaryLookup = Self::Lookup;
 	type Burn = ();
 	type BurnDestination = ();
 	type Currency = Balances;
 	type MaxApprovals = ();
 	type OnSlash = ();
 	type PalletId = TreasuryPalletId;
+	type Paymaster = frame_support::traits::tokens::PayFromAccount<Balances, TreasuryAccount>;
+	type PayoutPeriod = ();
 	type ProposalBond = ();
 	type ProposalBondMaximum = ();
 	type ProposalBondMinimum = ();

From 607c9bc6fac777efb0f86f2ff3ff112bc7a1abd2 Mon Sep 17 00:00:00 2001
From: Xavier Lau <xavier@inv.cafe>
Date: Wed, 26 Jun 2024 10:49:43 +0800
Subject: [PATCH 40/59] Fix precompile tests

---
 pallet/account-migration/src/mock.rs |  1 -
 pallet/ethtx-forwarder/src/mock.rs   |  1 -
 pallet/staking/src/mock.rs           |  1 -
 precompile/assets/src/mock.rs        | 49 ++++++------------------
 precompile/deposit/src/mock.rs       | 56 ++++++++-------------------
 precompile/staking/src/mock.rs       | 57 ++++++++--------------------
 precompile/state-storage/src/mock.rs | 55 +++++++--------------------
 7 files changed, 55 insertions(+), 165 deletions(-)

diff --git a/pallet/account-migration/src/mock.rs b/pallet/account-migration/src/mock.rs
index 87aea393e..406257d50 100644
--- a/pallet/account-migration/src/mock.rs
+++ b/pallet/account-migration/src/mock.rs
@@ -68,7 +68,6 @@ impl frame_system::Config for Runtime {
 	type AccountData = pallet_balances::AccountData<Balance>;
 	type AccountId = AccountId;
 	type Block = frame_system::mocking::MockBlock<Self>;
-	type MaxConsumers = frame_support::traits::ConstU32<16>;
 	type Version = Version;
 }
 
diff --git a/pallet/ethtx-forwarder/src/mock.rs b/pallet/ethtx-forwarder/src/mock.rs
index 037c4b299..c99c05f87 100644
--- a/pallet/ethtx-forwarder/src/mock.rs
+++ b/pallet/ethtx-forwarder/src/mock.rs
@@ -36,7 +36,6 @@ impl frame_system::Config for Runtime {
 	type AccountId = AccountId;
 	type Block = frame_system::mocking::MockBlock<Self>;
 	type Lookup = sp_runtime::traits::IdentityLookup<Self::AccountId>;
-	type MaxConsumers = frame_support::traits::ConstU32<16>;
 }
 
 #[derive_impl(pallet_balances::config_preludes::TestDefaultConfig as pallet_balances::DefaultConfig)]
diff --git a/pallet/staking/src/mock.rs b/pallet/staking/src/mock.rs
index ab50c283c..77a1737c0 100644
--- a/pallet/staking/src/mock.rs
+++ b/pallet/staking/src/mock.rs
@@ -37,7 +37,6 @@ impl frame_system::Config for Runtime {
 	type AccountId = AccountId;
 	type Block = frame_system::mocking::MockBlock<Self>;
 	type Lookup = sp_runtime::traits::IdentityLookup<Self::AccountId>;
-	type MaxConsumers = frame_support::traits::ConstU32<16>;
 }
 
 #[derive_impl(pallet_timestamp::config_preludes::TestDefaultConfig as pallet_timestamp::DefaultConfig)]
diff --git a/precompile/assets/src/mock.rs b/precompile/assets/src/mock.rs
index 85eea9303..5ec1ff324 100644
--- a/precompile/assets/src/mock.rs
+++ b/precompile/assets/src/mock.rs
@@ -23,12 +23,13 @@ use codec::{Decode, Encode, MaxEncodedLen};
 use scale_info::TypeInfo;
 // frontier
 use precompile_utils::Precompile;
-// parity
+// darwinia
+use crate::*;
+// polkadot-sdk
+use frame_support::derive_impl;
 use sp_core::H160;
 use sp_runtime::BuildStorage;
 use sp_std::prelude::*;
-// darwinia
-use crate::*;
 
 pub type Balance = u128;
 pub type AssetId = u64;
@@ -62,53 +63,24 @@ impl From<Account> for sp_core::H256 {
 	}
 }
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Runtime {
 	type AccountData = pallet_balances::AccountData<Balance>;
 	type AccountId = AccountId;
-	type BaseCallFilter = frame_support::traits::Everything;
 	type Block = frame_system::mocking::MockBlock<Self>;
-	type BlockHashCount = ();
-	type BlockLength = ();
-	type BlockWeights = ();
-	type DbWeight = ();
-	type Hash = sp_core::H256;
-	type Hashing = sp_runtime::traits::BlakeTwo256;
 	type Lookup = sp_runtime::traits::IdentityLookup<Self::AccountId>;
-	type MaxConsumers = frame_support::traits::ConstU32<16>;
-	type Nonce = u64;
-	type OnKilledAccount = ();
-	type OnNewAccount = ();
-	type OnSetCode = ();
-	type PalletInfo = PalletInfo;
-	type RuntimeCall = RuntimeCall;
-	type RuntimeEvent = RuntimeEvent;
-	type RuntimeOrigin = RuntimeOrigin;
-	type SS58Prefix = ();
-	type SystemWeightInfo = ();
-	type Version = ();
 }
 
+#[derive_impl(pallet_balances::config_preludes::TestDefaultConfig as pallet_balances::DefaultConfig)]
 impl pallet_balances::Config for Runtime {
 	type AccountStore = System;
 	type Balance = Balance;
-	type DustRemoval = ();
-	type ExistentialDeposit = frame_support::traits::ConstU128<0>;
-	type FreezeIdentifier = ();
-	type MaxFreezes = ();
-	type MaxLocks = ();
-	type MaxReserves = ();
-	type ReserveIdentifier = [u8; 8];
-	type RuntimeEvent = RuntimeEvent;
-	type RuntimeHoldReason = ();
-	type WeightInfo = ();
+	type ExistentialDeposit = ();
 }
 
-impl pallet_timestamp::Config for Runtime {
-	type MinimumPeriod = ();
-	type Moment = u64;
-	type OnTimestampSet = ();
-	type WeightInfo = ();
-}
+#[derive_impl(pallet_timestamp::config_preludes::TestDefaultConfig as pallet_timestamp::DefaultConfig)]
+impl pallet_timestamp::Config for Runtime {}
+
 pub struct TestPrecompiles<R>(PhantomData<R>);
 impl<R> TestPrecompiles<R>
 where
@@ -179,6 +151,7 @@ impl pallet_evm::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type Timestamp = Timestamp;
 	type WeightInfo = ();
+	type SuicideQuickClearLimit = ();
 	type WeightPerGas = WeightPerGas;
 	type WithdrawOrigin = pallet_evm::EnsureAddressNever<AccountId>;
 }
diff --git a/precompile/deposit/src/mock.rs b/precompile/deposit/src/mock.rs
index 22bc31a59..bf366c783 100644
--- a/precompile/deposit/src/mock.rs
+++ b/precompile/deposit/src/mock.rs
@@ -22,13 +22,15 @@ use codec::{Decode, Encode, MaxEncodedLen};
 use crate::*;
 // frontier
 use precompile_utils::Precompile;
-// substrate
-use sp_core::{H160, H256, U256};
+// polkadot-sdk
+use frame_support::derive_impl;
+use sp_core::{H160, U256};
 use sp_runtime::BuildStorage;
 
-pub(crate) type Balance = u128;
-pub(crate) type AccountId = H160;
-pub(crate) type PCall = DepositCall<Runtime>;
+pub type Balance = u128;
+type Moment = u128;
+pub type AccountId = H160;
+pub type PCall = DepositCall<Runtime>;
 
 #[derive(Clone, Encode, Decode, Debug, MaxEncodedLen, scale_info::TypeInfo)]
 pub enum Account {
@@ -47,52 +49,25 @@ impl Into<H160> for Account {
 	}
 }
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Runtime {
 	type AccountData = pallet_balances::AccountData<Balance>;
 	type AccountId = AccountId;
-	type BaseCallFilter = frame_support::traits::Everything;
 	type Block = frame_system::mocking::MockBlock<Self>;
-	type BlockHashCount = ();
-	type BlockLength = ();
-	type BlockWeights = ();
-	type DbWeight = ();
-	type Hash = H256;
-	type Hashing = sp_runtime::traits::BlakeTwo256;
 	type Lookup = sp_runtime::traits::IdentityLookup<Self::AccountId>;
-	type MaxConsumers = frame_support::traits::ConstU32<16>;
-	type Nonce = u64;
-	type OnKilledAccount = ();
-	type OnNewAccount = ();
-	type OnSetCode = ();
-	type PalletInfo = PalletInfo;
-	type RuntimeCall = RuntimeCall;
-	type RuntimeEvent = RuntimeEvent;
-	type RuntimeOrigin = RuntimeOrigin;
-	type SS58Prefix = ();
-	type SystemWeightInfo = ();
-	type Version = ();
 }
 
+#[derive_impl(pallet_balances::config_preludes::TestDefaultConfig as pallet_balances::DefaultConfig)]
 impl pallet_balances::Config for Runtime {
 	type AccountStore = System;
 	type Balance = Balance;
-	type DustRemoval = ();
-	type ExistentialDeposit = frame_support::traits::ConstU128<0>;
-	type FreezeIdentifier = ();
-	type MaxFreezes = ();
-	type MaxLocks = ();
-	type MaxReserves = ();
-	type ReserveIdentifier = [u8; 8];
-	type RuntimeEvent = RuntimeEvent;
-	type RuntimeHoldReason = ();
-	type WeightInfo = ();
+	type ExistentialDeposit = ();
 }
 
+#[derive_impl(pallet_timestamp::config_preludes::TestDefaultConfig as pallet_timestamp::DefaultConfig)]
 impl pallet_timestamp::Config for Runtime {
 	type MinimumPeriod = ();
-	type Moment = u128;
-	type OnTimestampSet = ();
-	type WeightInfo = ();
+	type Moment = Moment;
 }
 
 pub enum KtonMinting {}
@@ -177,6 +152,7 @@ impl pallet_evm::Config for Runtime {
 	type PrecompilesValue = PrecompilesValue;
 	type Runner = pallet_evm::runner::stack::Runner<Self>;
 	type RuntimeEvent = RuntimeEvent;
+	type SuicideQuickClearLimit = ();
 	type Timestamp = Timestamp;
 	type WeightInfo = ();
 	type WeightPerGas = WeightPerGas;
@@ -198,18 +174,18 @@ pub fn efflux(milli_secs: u128) {
 }
 
 #[derive(Default)]
-pub(crate) struct ExtBuilder {
+pub struct ExtBuilder {
 	// endowed accounts with balances
 	balances: Vec<(AccountId, Balance)>,
 }
 
 impl ExtBuilder {
-	pub(crate) fn with_balances(mut self, balances: Vec<(AccountId, Balance)>) -> Self {
+	pub fn with_balances(mut self, balances: Vec<(AccountId, Balance)>) -> Self {
 		self.balances = balances;
 		self
 	}
 
-	pub(crate) fn build(self) -> sp_io::TestExternalities {
+	pub fn build(self) -> sp_io::TestExternalities {
 		let mut t = <frame_system::GenesisConfig<Runtime>>::default()
 			.build_storage()
 			.expect("Frame system builds valid default genesis config");
diff --git a/precompile/staking/src/mock.rs b/precompile/staking/src/mock.rs
index 73c8f1c4c..1e8a2231d 100644
--- a/precompile/staking/src/mock.rs
+++ b/precompile/staking/src/mock.rs
@@ -23,12 +23,14 @@ use scale_info::TypeInfo;
 use precompile_utils::Precompile;
 // darwinia
 use crate::*;
-// substrate
-use sp_core::{H160, H256, U256};
+// polkadot-sdk
+use frame_support::derive_impl;
+use sp_core::{H160, U256};
 use sp_runtime::BuildStorage;
 
-pub(crate) type Balance = u128;
-pub(crate) type AccountId = H160;
+pub type Balance = u128;
+pub type AccountId = H160;
+pub type Moment = u128;
 
 #[derive(Clone, Encode, Decode, Debug, MaxEncodedLen, TypeInfo)]
 pub enum Account {
@@ -47,55 +49,25 @@ impl Into<H160> for Account {
 	}
 }
 
-frame_support::parameter_types! {
-	pub const BlockHashCount: u64 = 250;
-}
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Runtime {
 	type AccountData = pallet_balances::AccountData<Balance>;
 	type AccountId = AccountId;
-	type BaseCallFilter = frame_support::traits::Everything;
 	type Block = frame_system::mocking::MockBlock<Self>;
-	type BlockHashCount = ();
-	type BlockLength = ();
-	type BlockWeights = ();
-	type DbWeight = ();
-	type Hash = H256;
-	type Hashing = sp_runtime::traits::BlakeTwo256;
 	type Lookup = sp_runtime::traits::IdentityLookup<Self::AccountId>;
-	type MaxConsumers = frame_support::traits::ConstU32<16>;
-	type Nonce = u64;
-	type OnKilledAccount = ();
-	type OnNewAccount = ();
-	type OnSetCode = ();
-	type PalletInfo = PalletInfo;
-	type RuntimeCall = RuntimeCall;
-	type RuntimeEvent = RuntimeEvent;
-	type RuntimeOrigin = RuntimeOrigin;
-	type SS58Prefix = ();
-	type SystemWeightInfo = ();
-	type Version = ();
 }
 
+#[derive_impl(pallet_balances::config_preludes::TestDefaultConfig as pallet_balances::DefaultConfig)]
 impl pallet_balances::Config for Runtime {
 	type AccountStore = System;
 	type Balance = Balance;
-	type DustRemoval = ();
-	type ExistentialDeposit = frame_support::traits::ConstU128<0>;
-	type FreezeIdentifier = ();
-	type MaxFreezes = ();
-	type MaxLocks = ();
-	type MaxReserves = ();
-	type ReserveIdentifier = [u8; 8];
-	type RuntimeEvent = RuntimeEvent;
-	type RuntimeHoldReason = ();
-	type WeightInfo = ();
+	type ExistentialDeposit = ();
 }
 
+#[derive_impl(pallet_timestamp::config_preludes::TestDefaultConfig as pallet_timestamp::DefaultConfig)]
 impl pallet_timestamp::Config for Runtime {
 	type MinimumPeriod = ();
-	type Moment = u128;
-	type OnTimestampSet = ();
-	type WeightInfo = ();
+	type Moment = Moment;
 }
 
 pub enum KtonMinting {}
@@ -182,6 +154,7 @@ impl pallet_evm::Config for Runtime {
 	type PrecompilesValue = PrecompilesValue;
 	type Runner = pallet_evm::runner::stack::Runner<Self>;
 	type RuntimeEvent = RuntimeEvent;
+	type SuicideQuickClearLimit = ();
 	type Timestamp = Timestamp;
 	type WeightInfo = ();
 	type WeightPerGas = WeightPerGas;
@@ -255,18 +228,18 @@ frame_support::construct_runtime! {
 }
 
 #[derive(Default)]
-pub(crate) struct ExtBuilder {
+pub struct ExtBuilder {
 	// endowed accounts with balances
 	balances: Vec<(AccountId, Balance)>,
 }
 
 impl ExtBuilder {
-	pub(crate) fn with_balances(mut self, balances: Vec<(AccountId, Balance)>) -> Self {
+	pub fn with_balances(mut self, balances: Vec<(AccountId, Balance)>) -> Self {
 		self.balances = balances;
 		self
 	}
 
-	pub(crate) fn build(self) -> sp_io::TestExternalities {
+	pub fn build(self) -> sp_io::TestExternalities {
 		let mut storage =
 			<frame_system::GenesisConfig<Runtime>>::default().build_storage().unwrap();
 
diff --git a/precompile/state-storage/src/mock.rs b/precompile/state-storage/src/mock.rs
index f9ca6881c..c459f31a2 100644
--- a/precompile/state-storage/src/mock.rs
+++ b/precompile/state-storage/src/mock.rs
@@ -24,14 +24,14 @@ use crate::*;
 // frontier
 use precompile_utils::Precompile;
 // substrate
-use frame_support::StorageHasher;
+use frame_support::{derive_impl, StorageHasher};
 use sp_core::H160;
 use sp_runtime::BuildStorage;
 use sp_std::{marker::PhantomData, prelude::*};
 
-pub(crate) type Balance = u64;
-pub(crate) type AccountId = H160;
-pub(crate) type PCall = StateStorageCall<Runtime, StorageFilter>;
+pub type Balance = u64;
+pub type AccountId = H160;
+pub type PCall = StateStorageCall<Runtime, StorageFilter>;
 
 #[derive(Clone, Encode, Decode, Debug, MaxEncodedLen, TypeInfo)]
 pub enum Account {
@@ -48,53 +48,23 @@ impl Into<H160> for Account {
 	}
 }
 
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Runtime {
 	type AccountData = pallet_balances::AccountData<Balance>;
 	type AccountId = AccountId;
-	type BaseCallFilter = frame_support::traits::Everything;
 	type Block = frame_system::mocking::MockBlock<Self>;
-	type BlockHashCount = ();
-	type BlockLength = ();
-	type BlockWeights = ();
-	type DbWeight = ();
-	type Hash = sp_core::H256;
-	type Hashing = sp_runtime::traits::BlakeTwo256;
 	type Lookup = sp_runtime::traits::IdentityLookup<Self::AccountId>;
-	type MaxConsumers = frame_support::traits::ConstU32<16>;
-	type Nonce = u64;
-	type OnKilledAccount = ();
-	type OnNewAccount = ();
-	type OnSetCode = ();
-	type PalletInfo = PalletInfo;
-	type RuntimeCall = RuntimeCall;
-	type RuntimeEvent = RuntimeEvent;
-	type RuntimeOrigin = RuntimeOrigin;
-	type SS58Prefix = ();
-	type SystemWeightInfo = ();
-	type Version = ();
 }
 
+#[derive_impl(pallet_balances::config_preludes::TestDefaultConfig as pallet_balances::DefaultConfig)]
 impl pallet_balances::Config for Runtime {
 	type AccountStore = System;
 	type Balance = Balance;
-	type DustRemoval = ();
-	type ExistentialDeposit = frame_support::traits::ConstU64<0>;
-	type FreezeIdentifier = ();
-	type MaxFreezes = ();
-	type MaxLocks = ();
-	type MaxReserves = ();
-	type ReserveIdentifier = [u8; 8];
-	type RuntimeEvent = RuntimeEvent;
-	type RuntimeHoldReason = ();
-	type WeightInfo = ();
+	type ExistentialDeposit = ();
 }
 
-impl pallet_timestamp::Config for Runtime {
-	type MinimumPeriod = ();
-	type Moment = u64;
-	type OnTimestampSet = ();
-	type WeightInfo = ();
-}
+#[derive_impl(pallet_timestamp::config_preludes::TestDefaultConfig as pallet_timestamp::DefaultConfig)]
+impl pallet_timestamp::Config for Runtime {}
 
 pub struct StorageFilter;
 impl StorageFilterT for StorageFilter {
@@ -163,6 +133,7 @@ impl pallet_evm::Config for Runtime {
 	type PrecompilesValue = PrecompilesValue;
 	type Runner = pallet_evm::runner::stack::Runner<Self>;
 	type RuntimeEvent = RuntimeEvent;
+	type SuicideQuickClearLimit = ();
 	type Timestamp = Timestamp;
 	type WeightInfo = ();
 	type WeightPerGas = WeightPerGas;
@@ -179,18 +150,18 @@ frame_support::construct_runtime! {
 }
 
 #[derive(Default)]
-pub(crate) struct ExtBuilder {
+pub struct ExtBuilder {
 	// endowed accounts with balances
 	balances: Vec<(AccountId, Balance)>,
 }
 
 impl ExtBuilder {
-	pub(crate) fn with_balances(mut self, balances: Vec<(AccountId, Balance)>) -> Self {
+	pub fn with_balances(mut self, balances: Vec<(AccountId, Balance)>) -> Self {
 		self.balances = balances;
 		self
 	}
 
-	pub(crate) fn build(self) -> sp_io::TestExternalities {
+	pub fn build(self) -> sp_io::TestExternalities {
 		let mut t = <frame_system::GenesisConfig<Runtime>>::default()
 			.build_storage()
 			.expect("Frame system builds valid default genesis config");

From b22781415e237ae0b70773c8d21f7474a499b7ee Mon Sep 17 00:00:00 2001
From: Xavier Lau <xavier@inv.cafe>
Date: Wed, 26 Jun 2024 10:50:33 +0800
Subject: [PATCH 41/59] Format

---
 precompile/assets/src/mock.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/precompile/assets/src/mock.rs b/precompile/assets/src/mock.rs
index 5ec1ff324..42bb56111 100644
--- a/precompile/assets/src/mock.rs
+++ b/precompile/assets/src/mock.rs
@@ -149,9 +149,9 @@ impl pallet_evm::Config for Runtime {
 	type PrecompilesValue = PrecompilesValue;
 	type Runner = pallet_evm::runner::stack::Runner<Self>;
 	type RuntimeEvent = RuntimeEvent;
+	type SuicideQuickClearLimit = ();
 	type Timestamp = Timestamp;
 	type WeightInfo = ();
-	type SuicideQuickClearLimit = ();
 	type WeightPerGas = WeightPerGas;
 	type WithdrawOrigin = pallet_evm::EnsureAddressNever<AccountId>;
 }

From 44d97966a49e62a121a987c36234a679df6b4b18 Mon Sep 17 00:00:00 2001
From: Xavier Lau <xavier@inv.cafe>
Date: Wed, 26 Jun 2024 10:57:08 +0800
Subject: [PATCH 42/59] Fixes

---
 pallet/account-migration/src/mock.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pallet/account-migration/src/mock.rs b/pallet/account-migration/src/mock.rs
index 406257d50..ee8488106 100644
--- a/pallet/account-migration/src/mock.rs
+++ b/pallet/account-migration/src/mock.rs
@@ -68,6 +68,7 @@ impl frame_system::Config for Runtime {
 	type AccountData = pallet_balances::AccountData<Balance>;
 	type AccountId = AccountId;
 	type Block = frame_system::mocking::MockBlock<Self>;
+	type Lookup = sp_runtime::traits::IdentityLookup<Self::AccountId>;
 	type Version = Version;
 }
 
@@ -92,7 +93,6 @@ impl pallet_assets::BenchmarkHelper<codec::Compact<AssetId>> for BenchmarkHelper
 		(id as u64).into()
 	}
 }
-#[derive_impl(pallet_assets::config_preludes::TestDefaultConfig as pallet_assets::DefaultConfig)]
 impl pallet_assets::Config for Runtime {
 	type ApprovalDeposit = ();
 	type AssetAccountDeposit = ();

From aa660382d21302f1f0a91d65e29d139ea3e0b865 Mon Sep 17 00:00:00 2001
From: Xavier Lau <xavier@inv.cafe>
Date: Wed, 26 Jun 2024 16:02:09 +0800
Subject: [PATCH 43/59] Async, remove council, common pallet config

---
 Cargo.lock                                    | 1110 +++++++++--------
 Cargo.toml                                    |  216 ++--
 core/primitives/src/lib.rs                    |   15 +-
 node/Cargo.toml                               |    1 +
 node/src/command.rs                           |    3 +
 node/src/service/mod.rs                       |   67 +-
 runtime/common/Cargo.toml                     |    2 +
 runtime/common/src/lib.rs                     |    6 +-
 runtime/common/src/pallet_config.rs           |   71 +-
 .../src/{xcm_configs.rs => xcm_config.rs}     |    0
 runtime/crab/Cargo.toml                       |   11 +-
 runtime/crab/src/lib.rs                       |    9 +
 runtime/crab/src/pallets.rs                   |    4 +-
 runtime/crab/src/pallets/aura.rs              |   12 +-
 runtime/crab/src/pallets/aura_ext.rs          |   22 -
 runtime/crab/src/pallets/evm.rs               |   23 +-
 runtime/crab/src/pallets/governance.rs        |   15 +-
 runtime/crab/src/pallets/message_queue.rs     |    6 +-
 runtime/crab/src/pallets/parachain_system.rs  |   13 +-
 runtime/crab/src/pallets/polkadot_xcm.rs      |    8 +-
 runtime/crab/src/pallets/scheduler.rs         |    9 +-
 runtime/crab/src/pallets/system.rs            |   40 +-
 runtime/crab/src/pallets/timestamp.rs         |    2 +-
 runtime/darwinia/Cargo.toml                   |   11 +-
 runtime/darwinia/src/lib.rs                   |   11 +-
 runtime/darwinia/src/pallets.rs               |    4 +-
 runtime/darwinia/src/pallets/asset_manager.rs |    4 +-
 runtime/darwinia/src/pallets/aura.rs          |   12 +-
 runtime/darwinia/src/pallets/aura_ext.rs      |   22 -
 runtime/darwinia/src/pallets/evm.rs           |   23 +-
 runtime/darwinia/src/pallets/governance.rs    |   30 +-
 runtime/darwinia/src/pallets/message_queue.rs |    6 +-
 .../darwinia/src/pallets/parachain_system.rs  |   13 +-
 runtime/darwinia/src/pallets/polkadot_xcm.rs  |    8 +-
 runtime/darwinia/src/pallets/proxy.rs         |    1 -
 runtime/darwinia/src/pallets/scheduler.rs     |   19 +-
 runtime/darwinia/src/pallets/system.rs        |   40 +-
 runtime/darwinia/src/pallets/timestamp.rs     |    2 +-
 runtime/koi/Cargo.toml                        |   11 +-
 runtime/koi/src/lib.rs                        |    9 +
 runtime/koi/src/pallets.rs                    |    4 +-
 runtime/koi/src/pallets/asset_manager.rs      |    4 +-
 runtime/koi/src/pallets/aura.rs               |   12 +-
 runtime/koi/src/pallets/aura_ext.rs           |   22 -
 runtime/koi/src/pallets/evm.rs                |   19 +-
 runtime/koi/src/pallets/governance.rs         |   15 +-
 runtime/koi/src/pallets/message_queue.rs      |    6 +-
 runtime/koi/src/pallets/parachain_system.rs   |   13 +-
 runtime/koi/src/pallets/polkadot_xcm.rs       |    8 +-
 runtime/koi/src/pallets/scheduler.rs          |    9 +-
 runtime/koi/src/pallets/system.rs             |   40 +-
 runtime/koi/src/pallets/timestamp.rs          |    2 +-
 52 files changed, 935 insertions(+), 1110 deletions(-)
 rename runtime/common/src/{xcm_configs.rs => xcm_config.rs} (100%)
 delete mode 100644 runtime/crab/src/pallets/aura_ext.rs
 delete mode 100644 runtime/darwinia/src/pallets/aura_ext.rs
 delete mode 100644 runtime/koi/src/pallets/aura_ext.rs

diff --git a/Cargo.lock b/Cargo.lock
index 3785c234e..eb59dd598 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -899,7 +899,7 @@ dependencies = [
 [[package]]
 name = "binary-merkle-tree"
 version = "13.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "hash-db",
  "log",
@@ -1100,7 +1100,7 @@ dependencies = [
 [[package]]
 name = "bp-xcm-bridge-hub-router"
 version = "0.6.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -1240,9 +1240,9 @@ checksum = "fd6c0e7b807d60291f42f33f58480c0bfafe28ed08286446f45e463728cf9c1c"
 
 [[package]]
 name = "cc"
-version = "1.0.100"
+version = "1.0.101"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c891175c3fb232128f48de6590095e59198bbeb8620c310be349bfc3afd12c7b"
+checksum = "ac367972e516d45567c7eafc73d24e1c193dcf200a8d94e9db7b3d38b349572d"
 dependencies = [
  "jobserver",
  "libc",
@@ -1623,6 +1623,7 @@ dependencies = [
  "cumulus-pallet-session-benchmarking",
  "cumulus-pallet-xcm",
  "cumulus-pallet-xcmp-queue",
+ "cumulus-primitives-aura",
  "cumulus-primitives-core",
  "cumulus-primitives-utility",
  "darwinia-account-migration",
@@ -1686,7 +1687,7 @@ dependencies = [
  "sp-block-builder",
  "sp-consensus-aura",
  "sp-core",
- "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-debug-derive 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-genesis-builder",
  "sp-inherents",
  "sp-io",
@@ -1695,14 +1696,13 @@ dependencies = [
  "sp-runtime",
  "sp-session",
  "sp-staking",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-transaction-pool",
  "sp-version",
  "staging-parachain-info",
  "staging-xcm",
  "staging-xcm-builder",
  "staging-xcm-executor",
- "static_assertions",
  "strum 0.26.3",
  "substrate-wasm-builder",
  "xcm-primitives",
@@ -1944,7 +1944,7 @@ dependencies = [
 [[package]]
 name = "cumulus-client-cli"
 version = "0.7.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "clap",
  "parity-scale-codec",
@@ -1961,7 +1961,7 @@ dependencies = [
 [[package]]
 name = "cumulus-client-collator"
 version = "0.7.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "cumulus-client-consensus-common",
  "cumulus-client-network",
@@ -1984,7 +1984,7 @@ dependencies = [
 [[package]]
 name = "cumulus-client-consensus-aura"
 version = "0.7.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "async-trait",
  "cumulus-client-collator",
@@ -2026,7 +2026,7 @@ dependencies = [
 [[package]]
 name = "cumulus-client-consensus-common"
 version = "0.7.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "async-trait",
  "cumulus-client-pov-recovery",
@@ -2055,7 +2055,7 @@ dependencies = [
 [[package]]
 name = "cumulus-client-consensus-proposer"
 version = "0.7.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -2070,7 +2070,7 @@ dependencies = [
 [[package]]
 name = "cumulus-client-network"
 version = "0.7.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "async-trait",
  "cumulus-relay-chain-interface",
@@ -2093,7 +2093,7 @@ dependencies = [
 [[package]]
 name = "cumulus-client-parachain-inherent"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "async-trait",
  "cumulus-primitives-core",
@@ -2108,8 +2108,8 @@ dependencies = [
  "sp-inherents",
  "sp-runtime",
  "sp-state-machine",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
- "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-storage 19.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-trie",
  "tracing",
 ]
@@ -2117,7 +2117,7 @@ dependencies = [
 [[package]]
 name = "cumulus-client-pov-recovery"
 version = "0.7.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "async-trait",
  "cumulus-primitives-core",
@@ -2141,7 +2141,7 @@ dependencies = [
 [[package]]
 name = "cumulus-client-service"
 version = "0.7.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "cumulus-client-cli",
  "cumulus-client-collator",
@@ -2177,7 +2177,7 @@ dependencies = [
 [[package]]
 name = "cumulus-pallet-aura-ext"
 version = "0.7.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "cumulus-pallet-parachain-system",
  "frame-support",
@@ -2189,13 +2189,13 @@ dependencies = [
  "sp-application-crypto",
  "sp-consensus-aura",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "cumulus-pallet-dmp-queue"
 version = "0.7.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "cumulus-primitives-core",
  "frame-benchmarking",
@@ -2206,14 +2206,14 @@ dependencies = [
  "scale-info",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "staging-xcm",
 ]
 
 [[package]]
 name = "cumulus-pallet-parachain-system"
 version = "0.7.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "bytes",
  "cumulus-pallet-parachain-system-proc-macro",
@@ -2232,12 +2232,12 @@ dependencies = [
  "polkadot-runtime-parachains",
  "scale-info",
  "sp-core",
- "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-externalities 0.25.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-inherents",
  "sp-io",
  "sp-runtime",
  "sp-state-machine",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-trie",
  "sp-version",
  "staging-xcm",
@@ -2247,7 +2247,7 @@ dependencies = [
 [[package]]
 name = "cumulus-pallet-parachain-system-proc-macro"
 version = "0.6.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "proc-macro-crate 3.1.0",
  "proc-macro2",
@@ -2258,7 +2258,7 @@ dependencies = [
 [[package]]
 name = "cumulus-pallet-session-benchmarking"
 version = "9.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -2266,13 +2266,13 @@ dependencies = [
  "pallet-session",
  "parity-scale-codec",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "cumulus-pallet-xcm"
 version = "0.7.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "cumulus-primitives-core",
  "frame-support",
@@ -2281,14 +2281,14 @@ dependencies = [
  "scale-info",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "staging-xcm",
 ]
 
 [[package]]
 name = "cumulus-pallet-xcmp-queue"
 version = "0.7.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "bounded-collections",
  "bp-xcm-bridge-hub-router",
@@ -2305,7 +2305,7 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "staging-xcm",
  "staging-xcm-executor",
 ]
@@ -2313,7 +2313,7 @@ dependencies = [
 [[package]]
 name = "cumulus-primitives-aura"
 version = "0.7.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "parity-scale-codec",
  "polkadot-core-primitives",
@@ -2321,13 +2321,13 @@ dependencies = [
  "sp-api",
  "sp-consensus-aura",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "cumulus-primitives-core"
 version = "0.7.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "parity-scale-codec",
  "polkadot-core-primitives",
@@ -2336,7 +2336,7 @@ dependencies = [
  "scale-info",
  "sp-api",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-trie",
  "staging-xcm",
 ]
@@ -2344,7 +2344,7 @@ dependencies = [
 [[package]]
 name = "cumulus-primitives-parachain-inherent"
 version = "0.7.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "async-trait",
  "cumulus-primitives-core",
@@ -2352,24 +2352,24 @@ dependencies = [
  "scale-info",
  "sp-core",
  "sp-inherents",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-trie",
 ]
 
 [[package]]
 name = "cumulus-primitives-proof-size-hostfunction"
 version = "0.2.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
- "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
- "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-externalities 0.25.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-runtime-interface 24.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-trie",
 ]
 
 [[package]]
 name = "cumulus-primitives-utility"
 version = "0.7.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "cumulus-primitives-core",
  "frame-support",
@@ -2381,7 +2381,7 @@ dependencies = [
  "polkadot-runtime-parachains",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "staging-xcm",
  "staging-xcm-builder",
  "staging-xcm-executor",
@@ -2390,7 +2390,7 @@ dependencies = [
 [[package]]
 name = "cumulus-relay-chain-inprocess-interface"
 version = "0.7.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "async-trait",
  "cumulus-primitives-core",
@@ -2414,7 +2414,7 @@ dependencies = [
 [[package]]
 name = "cumulus-relay-chain-interface"
 version = "0.7.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "async-trait",
  "cumulus-primitives-core",
@@ -2432,7 +2432,7 @@ dependencies = [
 [[package]]
 name = "cumulus-relay-chain-minimal-node"
 version = "0.7.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "array-bytes 6.2.3",
  "async-trait",
@@ -2473,7 +2473,7 @@ dependencies = [
 [[package]]
 name = "cumulus-relay-chain-rpc-interface"
 version = "0.7.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "async-trait",
  "cumulus-primitives-core",
@@ -2500,7 +2500,7 @@ dependencies = [
  "sp-core",
  "sp-runtime",
  "sp-state-machine",
- "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-storage 19.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-version",
  "thiserror",
  "tokio",
@@ -2512,14 +2512,14 @@ dependencies = [
 [[package]]
 name = "cumulus-test-relay-sproof-builder"
 version = "0.7.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "cumulus-primitives-core",
  "parity-scale-codec",
  "polkadot-primitives",
  "sp-runtime",
  "sp-state-machine",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-trie",
 ]
 
@@ -2635,6 +2635,7 @@ dependencies = [
  "cumulus-client-consensus-proposer",
  "cumulus-client-parachain-inherent",
  "cumulus-client-service",
+ "cumulus-primitives-aura",
  "cumulus-primitives-core",
  "cumulus-primitives-parachain-inherent",
  "cumulus-relay-chain-interface",
@@ -2721,7 +2722,7 @@ dependencies = [
  "sp-io",
  "sp-keyring",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-version",
 ]
 
@@ -2744,6 +2745,7 @@ dependencies = [
  "darwinia-precompile-assets",
  "dc-primitives",
  "fp-account",
+ "fp-evm",
  "frame-support",
  "frame-system",
  "log",
@@ -2759,7 +2761,7 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "staging-xcm",
  "staging-xcm-executor",
 ]
@@ -2781,7 +2783,7 @@ dependencies = [
  "scale-info",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
@@ -2806,7 +2808,7 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
@@ -2827,7 +2829,7 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
@@ -2847,7 +2849,7 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
@@ -2868,7 +2870,7 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
@@ -2887,7 +2889,7 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
@@ -2901,6 +2903,7 @@ dependencies = [
  "cumulus-pallet-session-benchmarking",
  "cumulus-pallet-xcm",
  "cumulus-pallet-xcmp-queue",
+ "cumulus-primitives-aura",
  "cumulus-primitives-core",
  "cumulus-primitives-utility",
  "darwinia-account-migration",
@@ -2969,7 +2972,7 @@ dependencies = [
  "sp-block-builder",
  "sp-consensus-aura",
  "sp-core",
- "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-debug-derive 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-genesis-builder",
  "sp-inherents",
  "sp-io",
@@ -2978,14 +2981,13 @@ dependencies = [
  "sp-runtime",
  "sp-session",
  "sp-staking",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-transaction-pool",
  "sp-version",
  "staging-parachain-info",
  "staging-xcm",
  "staging-xcm-builder",
  "staging-xcm-executor",
- "static_assertions",
  "strum 0.26.3",
  "substrate-wasm-builder",
  "xcm-primitives",
@@ -3017,7 +3019,7 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "substrate-test-utils",
 ]
 
@@ -3412,9 +3414,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"
 dependencies = [
  "serde",
 ]
@@ -3693,7 +3695,7 @@ dependencies = [
 [[package]]
 name = "evm-tracing-events"
 version = "0.1.0"
-source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.7.2#458974e73022382d3a4ca5ca10fee61ef25a471b"
+source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.7.2#0000e6dc61d7a16cb7a3b3e9a4947c3437e1ef85"
 dependencies = [
  "environmental",
  "ethereum",
@@ -3702,7 +3704,7 @@ dependencies = [
  "evm-gasometer",
  "evm-runtime",
  "parity-scale-codec",
- "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-runtime-interface 24.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
@@ -3790,7 +3792,7 @@ dependencies = [
 [[package]]
 name = "fc-api"
 version = "1.0.0-dev"
-source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.7.2#24461108ff2125d8185d1a8129f5deddf26c9210"
+source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.7.2#f566bc6e6dff42573aa91ef54f83edf2f0f04e46"
 dependencies = [
  "async-trait",
  "fp-storage",
@@ -3802,7 +3804,7 @@ dependencies = [
 [[package]]
 name = "fc-consensus"
 version = "2.0.0-dev"
-source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.7.2#24461108ff2125d8185d1a8129f5deddf26c9210"
+source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.7.2#f566bc6e6dff42573aa91ef54f83edf2f0f04e46"
 dependencies = [
  "async-trait",
  "fp-consensus",
@@ -3818,7 +3820,7 @@ dependencies = [
 [[package]]
 name = "fc-db"
 version = "2.0.0-dev"
-source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.7.2#24461108ff2125d8185d1a8129f5deddf26c9210"
+source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.7.2#f566bc6e6dff42573aa91ef54f83edf2f0f04e46"
 dependencies = [
  "async-trait",
  "ethereum",
@@ -3841,7 +3843,7 @@ dependencies = [
  "sp-core",
  "sp-database",
  "sp-runtime",
- "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-storage 19.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sqlx",
  "tokio",
 ]
@@ -3849,7 +3851,7 @@ dependencies = [
 [[package]]
 name = "fc-mapping-sync"
 version = "2.0.0-dev"
-source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.7.2#24461108ff2125d8185d1a8129f5deddf26c9210"
+source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.7.2#f566bc6e6dff42573aa91ef54f83edf2f0f04e46"
 dependencies = [
  "fc-db",
  "fc-storage",
@@ -3872,7 +3874,7 @@ dependencies = [
 [[package]]
 name = "fc-rpc"
 version = "2.0.0-dev"
-source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.7.2#24461108ff2125d8185d1a8129f5deddf26c9210"
+source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.7.2#f566bc6e6dff42573aa91ef54f83edf2f0f04e46"
 dependencies = [
  "ethereum",
  "ethereum-types",
@@ -3912,12 +3914,12 @@ dependencies = [
  "sp-consensus",
  "sp-consensus-aura",
  "sp-core",
- "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-externalities 0.25.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-inherents",
  "sp-io",
  "sp-runtime",
  "sp-state-machine",
- "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-storage 19.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-timestamp",
  "substrate-prometheus-endpoint",
  "thiserror",
@@ -3927,7 +3929,7 @@ dependencies = [
 [[package]]
 name = "fc-rpc-core"
 version = "1.1.0-dev"
-source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.7.2#24461108ff2125d8185d1a8129f5deddf26c9210"
+source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.7.2#f566bc6e6dff42573aa91ef54f83edf2f0f04e46"
 dependencies = [
  "ethereum",
  "ethereum-types",
@@ -3942,7 +3944,7 @@ dependencies = [
 [[package]]
 name = "fc-storage"
 version = "1.0.0-dev"
-source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.7.2#24461108ff2125d8185d1a8129f5deddf26c9210"
+source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.7.2#f566bc6e6dff42573aa91ef54f83edf2f0f04e46"
 dependencies = [
  "ethereum",
  "ethereum-types",
@@ -3954,7 +3956,7 @@ dependencies = [
  "sp-blockchain",
  "sp-io",
  "sp-runtime",
- "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-storage 19.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
@@ -4117,7 +4119,7 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
 [[package]]
 name = "fork-tree"
 version = "12.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "parity-scale-codec",
 ]
@@ -4134,7 +4136,7 @@ dependencies = [
 [[package]]
 name = "fp-account"
 version = "1.0.0-dev"
-source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.7.2#24461108ff2125d8185d1a8129f5deddf26c9210"
+source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.7.2#f566bc6e6dff42573aa91ef54f83edf2f0f04e46"
 dependencies = [
  "hex",
  "impl-serde",
@@ -4146,39 +4148,39 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-runtime-interface 24.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "fp-consensus"
 version = "2.0.0-dev"
-source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.7.2#24461108ff2125d8185d1a8129f5deddf26c9210"
+source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.7.2#f566bc6e6dff42573aa91ef54f83edf2f0f04e46"
 dependencies = [
  "ethereum",
  "parity-scale-codec",
  "sp-core",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "fp-ethereum"
 version = "1.0.0-dev"
-source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.7.2#24461108ff2125d8185d1a8129f5deddf26c9210"
+source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.7.2#f566bc6e6dff42573aa91ef54f83edf2f0f04e46"
 dependencies = [
  "ethereum",
  "ethereum-types",
  "fp-evm",
  "frame-support",
  "parity-scale-codec",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "fp-evm"
 version = "3.0.0-dev"
-source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.7.2#24461108ff2125d8185d1a8129f5deddf26c9210"
+source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.7.2#f566bc6e6dff42573aa91ef54f83edf2f0f04e46"
 dependencies = [
  "evm",
  "frame-support",
@@ -4188,13 +4190,13 @@ dependencies = [
  "serde",
  "sp-core",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "fp-rpc"
 version = "3.0.0-dev"
-source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.7.2#24461108ff2125d8185d1a8129f5deddf26c9210"
+source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.7.2#f566bc6e6dff42573aa91ef54f83edf2f0f04e46"
 dependencies = [
  "ethereum",
  "ethereum-types",
@@ -4205,13 +4207,13 @@ dependencies = [
  "sp-core",
  "sp-runtime",
  "sp-state-machine",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "fp-self-contained"
 version = "1.0.0-dev"
-source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.7.2#24461108ff2125d8185d1a8129f5deddf26c9210"
+source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.7.2#f566bc6e6dff42573aa91ef54f83edf2f0f04e46"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
@@ -4223,7 +4225,7 @@ dependencies = [
 [[package]]
 name = "fp-storage"
 version = "2.0.0"
-source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.7.2#24461108ff2125d8185d1a8129f5deddf26c9210"
+source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.7.2#f566bc6e6dff42573aa91ef54f83edf2f0f04e46"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -4238,7 +4240,7 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa"
 [[package]]
 name = "frame-benchmarking"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "frame-support",
  "frame-support-procedural",
@@ -4254,16 +4256,16 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
- "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-runtime-interface 24.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-storage 19.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "static_assertions",
 ]
 
 [[package]]
 name = "frame-benchmarking-cli"
 version = "32.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "Inflector",
  "array-bytes 6.2.3",
@@ -4295,15 +4297,15 @@ dependencies = [
  "sp-blockchain",
  "sp-core",
  "sp-database",
- "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-externalities 0.25.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-inherents",
  "sp-io",
  "sp-keystore",
  "sp-runtime",
  "sp-state-machine",
- "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-storage 19.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-trie",
- "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-wasm-interface 20.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "thiserror",
  "thousands",
 ]
@@ -4311,7 +4313,7 @@ dependencies = [
 [[package]]
 name = "frame-election-provider-solution-type"
 version = "13.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "proc-macro-crate 3.1.0",
  "proc-macro2",
@@ -4322,7 +4324,7 @@ dependencies = [
 [[package]]
 name = "frame-election-provider-support"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "frame-election-provider-solution-type",
  "frame-support",
@@ -4333,13 +4335,13 @@ dependencies = [
  "sp-core",
  "sp-npos-elections",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "frame-executive"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4350,8 +4352,8 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
- "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-tracing 16.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
@@ -4369,7 +4371,7 @@ dependencies = [
 [[package]]
 name = "frame-metadata-hash-extension"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "array-bytes 6.2.3",
  "docify",
@@ -4384,7 +4386,7 @@ dependencies = [
 [[package]]
 name = "frame-remote-externalities"
 version = "0.35.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "futures 0.3.30",
  "indicatif",
@@ -4406,7 +4408,7 @@ dependencies = [
 [[package]]
 name = "frame-support"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "aquamarine",
  "array-bytes 6.2.3",
@@ -4429,7 +4431,7 @@ dependencies = [
  "sp-arithmetic",
  "sp-core",
  "sp-crypto-hashing-proc-macro",
- "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-debug-derive 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-genesis-builder",
  "sp-inherents",
  "sp-io",
@@ -4437,8 +4439,8 @@ dependencies = [
  "sp-runtime",
  "sp-staking",
  "sp-state-machine",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
- "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-tracing 16.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-weights",
  "static_assertions",
  "tt-call",
@@ -4447,7 +4449,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural"
 version = "23.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "Inflector",
  "cfg-expr",
@@ -4466,7 +4468,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools"
 version = "10.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "frame-support-procedural-tools-derive",
  "proc-macro-crate 3.1.0",
@@ -4478,7 +4480,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools-derive"
 version = "11.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4488,7 +4490,7 @@ dependencies = [
 [[package]]
 name = "frame-system"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "cfg-if",
  "docify",
@@ -4500,7 +4502,7 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-version",
  "sp-weights",
 ]
@@ -4508,7 +4510,7 @@ dependencies = [
 [[package]]
 name = "frame-system-benchmarking"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4517,13 +4519,13 @@ dependencies = [
  "scale-info",
  "sp-core",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "frame-system-rpc-runtime-api"
 version = "26.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -4532,13 +4534,13 @@ dependencies = [
 [[package]]
 name = "frame-try-runtime"
 version = "0.34.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
  "sp-api",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
@@ -5745,6 +5747,7 @@ dependencies = [
  "cumulus-pallet-session-benchmarking",
  "cumulus-pallet-xcm",
  "cumulus-pallet-xcmp-queue",
+ "cumulus-primitives-aura",
  "cumulus-primitives-core",
  "cumulus-primitives-utility",
  "darwinia-asset-limit",
@@ -5814,7 +5817,7 @@ dependencies = [
  "sp-block-builder",
  "sp-consensus-aura",
  "sp-core",
- "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-debug-derive 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-genesis-builder",
  "sp-inherents",
  "sp-io",
@@ -5823,14 +5826,13 @@ dependencies = [
  "sp-runtime",
  "sp-session",
  "sp-staking",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-transaction-pool",
  "sp-version",
  "staging-parachain-info",
  "staging-xcm",
  "staging-xcm-builder",
  "staging-xcm-executor",
- "static_assertions",
  "strum 0.26.3",
  "substrate-wasm-builder",
  "xcm-primitives",
@@ -6771,7 +6773,7 @@ dependencies = [
 [[package]]
 name = "mmr-gadget"
 version = "29.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "futures 0.3.30",
  "log",
@@ -6790,7 +6792,7 @@ dependencies = [
 [[package]]
 name = "mmr-rpc"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "jsonrpsee",
  "parity-scale-codec",
@@ -6832,7 +6834,7 @@ dependencies = [
 [[package]]
 name = "moonbeam-client-evm-tracing"
 version = "0.1.0"
-source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.7.2#458974e73022382d3a4ca5ca10fee61ef25a471b"
+source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.7.2#0000e6dc61d7a16cb7a3b3e9a4947c3437e1ef85"
 dependencies = [
  "ethereum-types",
  "evm-tracing-events",
@@ -6842,13 +6844,13 @@ dependencies = [
  "serde",
  "serde_json",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "moonbeam-evm-tracer"
 version = "0.1.0"
-source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.7.2#458974e73022382d3a4ca5ca10fee61ef25a471b"
+source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.7.2#0000e6dc61d7a16cb7a3b3e9a4947c3437e1ef85"
 dependencies = [
  "ethereum-types",
  "evm",
@@ -6862,26 +6864,26 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "moonbeam-primitives-ext"
 version = "0.1.0"
-source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.7.2#458974e73022382d3a4ca5ca10fee61ef25a471b"
+source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.7.2#0000e6dc61d7a16cb7a3b3e9a4947c3437e1ef85"
 dependencies = [
  "ethereum-types",
  "evm-tracing-events",
  "parity-scale-codec",
- "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
- "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-externalities 0.25.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-runtime-interface 24.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "moonbeam-rpc-core-debug"
 version = "0.1.0"
-source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.7.2#458974e73022382d3a4ca5ca10fee61ef25a471b"
+source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.7.2#0000e6dc61d7a16cb7a3b3e9a4947c3437e1ef85"
 dependencies = [
  "ethereum",
  "ethereum-types",
@@ -6898,7 +6900,7 @@ dependencies = [
 [[package]]
 name = "moonbeam-rpc-core-trace"
 version = "0.6.0"
-source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.7.2#458974e73022382d3a4ca5ca10fee61ef25a471b"
+source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.7.2#0000e6dc61d7a16cb7a3b3e9a4947c3437e1ef85"
 dependencies = [
  "ethereum-types",
  "futures 0.3.30",
@@ -6912,7 +6914,7 @@ dependencies = [
 [[package]]
 name = "moonbeam-rpc-core-types"
 version = "0.1.0"
-source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.7.2#458974e73022382d3a4ca5ca10fee61ef25a471b"
+source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.7.2#0000e6dc61d7a16cb7a3b3e9a4947c3437e1ef85"
 dependencies = [
  "ethereum-types",
  "serde",
@@ -6922,7 +6924,7 @@ dependencies = [
 [[package]]
 name = "moonbeam-rpc-debug"
 version = "0.1.0"
-source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.7.2#458974e73022382d3a4ca5ca10fee61ef25a471b"
+source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.7.2#0000e6dc61d7a16cb7a3b3e9a4947c3437e1ef85"
 dependencies = [
  "ethereum",
  "ethereum-types",
@@ -6954,7 +6956,7 @@ dependencies = [
 [[package]]
 name = "moonbeam-rpc-primitives-debug"
 version = "0.1.0"
-source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.7.2#458974e73022382d3a4ca5ca10fee61ef25a471b"
+source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.7.2#0000e6dc61d7a16cb7a3b3e9a4947c3437e1ef85"
 dependencies = [
  "environmental",
  "ethereum",
@@ -6966,13 +6968,13 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "moonbeam-rpc-trace"
 version = "0.6.0"
-source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.7.2#458974e73022382d3a4ca5ca10fee61ef25a471b"
+source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.7.2#0000e6dc61d7a16cb7a3b3e9a4947c3437e1ef85"
 dependencies = [
  "ethereum",
  "ethereum-types",
@@ -6998,7 +7000,7 @@ dependencies = [
  "sp-blockchain",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-transaction-pool",
  "substrate-prometheus-endpoint",
  "tokio",
@@ -7713,7 +7715,7 @@ dependencies = [
 [[package]]
 name = "orml-traits"
 version = "0.8.0"
-source = "git+https://github.com/darwinia-network/open-runtime-module-library?branch=polkadot-v1.7.2#0d647d0a86614276ab4b48a5d5cd4850e070abaa"
+source = "git+https://github.com/darwinia-network/open-runtime-module-library?branch=polkadot-v1.7.2#5cac46d74097dd5190da10d1c2b34804d2111a21"
 dependencies = [
  "frame-support",
  "impl-trait-for-tuples",
@@ -7726,14 +7728,14 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "staging-xcm",
 ]
 
 [[package]]
 name = "orml-utilities"
 version = "0.8.0"
-source = "git+https://github.com/darwinia-network/open-runtime-module-library?branch=polkadot-v1.7.2#0d647d0a86614276ab4b48a5d5cd4850e070abaa"
+source = "git+https://github.com/darwinia-network/open-runtime-module-library?branch=polkadot-v1.7.2#5cac46d74097dd5190da10d1c2b34804d2111a21"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
@@ -7742,19 +7744,19 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "orml-xcm-support"
 version = "0.8.0"
-source = "git+https://github.com/darwinia-network/open-runtime-module-library?branch=polkadot-v1.7.2#0d647d0a86614276ab4b48a5d5cd4850e070abaa"
+source = "git+https://github.com/darwinia-network/open-runtime-module-library?branch=polkadot-v1.7.2#5cac46d74097dd5190da10d1c2b34804d2111a21"
 dependencies = [
  "frame-support",
  "orml-traits",
  "parity-scale-codec",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "staging-xcm",
  "staging-xcm-executor",
 ]
@@ -7762,7 +7764,7 @@ dependencies = [
 [[package]]
 name = "orml-xtokens"
 version = "0.8.0"
-source = "git+https://github.com/darwinia-network/open-runtime-module-library?branch=polkadot-v1.7.2#0d647d0a86614276ab4b48a5d5cd4850e070abaa"
+source = "git+https://github.com/darwinia-network/open-runtime-module-library?branch=polkadot-v1.7.2#5cac46d74097dd5190da10d1c2b34804d2111a21"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -7775,7 +7777,7 @@ dependencies = [
  "serde",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "staging-xcm",
  "staging-xcm-executor",
 ]
@@ -7789,7 +7791,7 @@ checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
 [[package]]
 name = "pallet-asset-conversion"
 version = "10.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -7801,13 +7803,13 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-asset-manager"
 version = "0.1.0"
-source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.7.2#458974e73022382d3a4ca5ca10fee61ef25a471b"
+source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.7.2#0000e6dc61d7a16cb7a3b3e9a4947c3437e1ef85"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -7818,7 +7820,7 @@ dependencies = [
  "serde",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "staging-xcm",
  "xcm-primitives",
 ]
@@ -7826,7 +7828,7 @@ dependencies = [
 [[package]]
 name = "pallet-asset-rate"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -7835,13 +7837,13 @@ dependencies = [
  "scale-info",
  "sp-core",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-assets"
 version = "29.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -7851,13 +7853,13 @@ dependencies = [
  "scale-info",
  "sp-core",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-aura"
 version = "27.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -7868,13 +7870,13 @@ dependencies = [
  "sp-application-crypto",
  "sp-consensus-aura",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-authority-discovery"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -7884,13 +7886,13 @@ dependencies = [
  "sp-application-crypto",
  "sp-authority-discovery",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-authorship"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -7898,13 +7900,13 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-babe"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -7922,13 +7924,13 @@ dependencies = [
  "sp-runtime",
  "sp-session",
  "sp-staking",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-bags-list"
 version = "27.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "aquamarine",
  "docify",
@@ -7943,14 +7945,14 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
- "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-tracing 16.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-balances"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "docify",
  "frame-benchmarking",
@@ -7960,13 +7962,13 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-beefy"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -7980,13 +7982,13 @@ dependencies = [
  "sp-runtime",
  "sp-session",
  "sp-staking",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-beefy-mmr"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "array-bytes 6.2.3",
  "binary-merkle-tree",
@@ -8005,13 +8007,13 @@ dependencies = [
  "sp-io",
  "sp-runtime",
  "sp-state-machine",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-bounties"
 version = "27.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8023,13 +8025,13 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-broker"
 version = "0.6.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "bitvec",
  "frame-benchmarking",
@@ -8040,13 +8042,13 @@ dependencies = [
  "sp-arithmetic",
  "sp-core",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-child-bounties"
 version = "27.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8059,13 +8061,13 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-collective"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8076,13 +8078,13 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-conviction-voting"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "assert_matches",
  "frame-benchmarking",
@@ -8093,13 +8095,13 @@ dependencies = [
  "serde",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-democracy"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8111,13 +8113,13 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-election-provider-multi-phase"
 version = "27.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -8133,14 +8135,14 @@ dependencies = [
  "sp-io",
  "sp-npos-elections",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "strum 0.24.1",
 ]
 
 [[package]]
 name = "pallet-election-provider-support-benchmarking"
 version = "27.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -8148,13 +8150,13 @@ dependencies = [
  "parity-scale-codec",
  "sp-npos-elections",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-elections-phragmen"
 version = "29.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8167,13 +8169,13 @@ dependencies = [
  "sp-npos-elections",
  "sp-runtime",
  "sp-staking",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-ethereum"
 version = "4.0.0-dev"
-source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.7.2#24461108ff2125d8185d1a8129f5deddf26c9210"
+source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.7.2#f566bc6e6dff42573aa91ef54f83edf2f0f04e46"
 dependencies = [
  "ethereum",
  "ethereum-types",
@@ -8190,13 +8192,13 @@ dependencies = [
  "scale-info",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-ethereum-xcm"
 version = "1.0.0-dev"
-source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.7.2#458974e73022382d3a4ca5ca10fee61ef25a471b"
+source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.7.2#0000e6dc61d7a16cb7a3b3e9a4947c3437e1ef85"
 dependencies = [
  "ethereum",
  "ethereum-types",
@@ -8215,14 +8217,14 @@ dependencies = [
  "serde",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "xcm-primitives",
 ]
 
 [[package]]
 name = "pallet-evm"
 version = "6.0.0-dev"
-source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.7.2#24461108ff2125d8185d1a8129f5deddf26c9210"
+source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.7.2#f566bc6e6dff42573aa91ef54f83edf2f0f04e46"
 dependencies = [
  "environmental",
  "evm",
@@ -8242,13 +8244,13 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-evm-precompile-blake2"
 version = "2.0.0-dev"
-source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.7.2#24461108ff2125d8185d1a8129f5deddf26c9210"
+source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.7.2#f566bc6e6dff42573aa91ef54f83edf2f0f04e46"
 dependencies = [
  "fp-evm",
 ]
@@ -8256,7 +8258,7 @@ dependencies = [
 [[package]]
 name = "pallet-evm-precompile-bls12381"
 version = "1.0.0-dev"
-source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.7.2#24461108ff2125d8185d1a8129f5deddf26c9210"
+source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.7.2#f566bc6e6dff42573aa91ef54f83edf2f0f04e46"
 dependencies = [
  "ark-bls12-381",
  "ark-ec",
@@ -8268,7 +8270,7 @@ dependencies = [
 [[package]]
 name = "pallet-evm-precompile-bn128"
 version = "2.0.0-dev"
-source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.7.2#24461108ff2125d8185d1a8129f5deddf26c9210"
+source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.7.2#f566bc6e6dff42573aa91ef54f83edf2f0f04e46"
 dependencies = [
  "fp-evm",
  "sp-core",
@@ -8278,7 +8280,7 @@ dependencies = [
 [[package]]
 name = "pallet-evm-precompile-conviction-voting"
 version = "0.1.0"
-source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.7.2#458974e73022382d3a4ca5ca10fee61ef25a471b"
+source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.7.2#0000e6dc61d7a16cb7a3b3e9a4947c3437e1ef85"
 dependencies = [
  "fp-evm",
  "frame-support",
@@ -8292,13 +8294,13 @@ dependencies = [
  "rustc-hex",
  "sp-core",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-evm-precompile-dispatch"
 version = "2.0.0-dev"
-source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.7.2#24461108ff2125d8185d1a8129f5deddf26c9210"
+source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.7.2#f566bc6e6dff42573aa91ef54f83edf2f0f04e46"
 dependencies = [
  "fp-evm",
  "frame-support",
@@ -8310,7 +8312,7 @@ dependencies = [
 [[package]]
 name = "pallet-evm-precompile-modexp"
 version = "2.0.0-dev"
-source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.7.2#24461108ff2125d8185d1a8129f5deddf26c9210"
+source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.7.2#f566bc6e6dff42573aa91ef54f83edf2f0f04e46"
 dependencies = [
  "fp-evm",
  "num",
@@ -8319,7 +8321,7 @@ dependencies = [
 [[package]]
 name = "pallet-evm-precompile-simple"
 version = "2.0.0-dev"
-source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.7.2#24461108ff2125d8185d1a8129f5deddf26c9210"
+source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.7.2#f566bc6e6dff42573aa91ef54f83edf2f0f04e46"
 dependencies = [
  "fp-evm",
  "ripemd",
@@ -8329,7 +8331,7 @@ dependencies = [
 [[package]]
 name = "pallet-fast-unstake"
 version = "27.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "docify",
  "frame-benchmarking",
@@ -8342,13 +8344,13 @@ dependencies = [
  "sp-io",
  "sp-runtime",
  "sp-staking",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-grandpa"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8365,13 +8367,13 @@ dependencies = [
  "sp-runtime",
  "sp-session",
  "sp-staking",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-identity"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "enumflags2",
  "frame-benchmarking",
@@ -8382,13 +8384,13 @@ dependencies = [
  "scale-info",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-im-online"
 version = "27.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8402,13 +8404,13 @@ dependencies = [
  "sp-io",
  "sp-runtime",
  "sp-staking",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-indices"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8419,13 +8421,13 @@ dependencies = [
  "sp-io",
  "sp-keyring",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-membership"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8436,13 +8438,13 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-message-queue"
 version = "31.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "environmental",
  "frame-benchmarking",
@@ -8455,14 +8457,14 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-weights",
 ]
 
 [[package]]
 name = "pallet-mmr"
 version = "27.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8474,13 +8476,13 @@ dependencies = [
  "sp-io",
  "sp-mmr-primitives",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-multisig"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8490,13 +8492,13 @@ dependencies = [
  "scale-info",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-nis"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8506,13 +8508,13 @@ dependencies = [
  "sp-arithmetic",
  "sp-core",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-nomination-pools"
 version = "25.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -8524,14 +8526,14 @@ dependencies = [
  "sp-io",
  "sp-runtime",
  "sp-staking",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
- "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-tracing 16.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-nomination-pools-benchmarking"
 version = "26.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -8543,26 +8545,26 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-runtime",
- "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-runtime-interface 24.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-staking",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-nomination-pools-runtime-api"
 version = "23.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "pallet-nomination-pools",
  "parity-scale-codec",
  "sp-api",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-offences"
 version = "27.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -8573,13 +8575,13 @@ dependencies = [
  "serde",
  "sp-runtime",
  "sp-staking",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-offences-benchmarking"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -8597,13 +8599,13 @@ dependencies = [
  "scale-info",
  "sp-runtime",
  "sp-staking",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-preimage"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8614,13 +8616,13 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-proxy"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8629,13 +8631,13 @@ dependencies = [
  "scale-info",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-ranked-collective"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8648,13 +8650,13 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-recovery"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8663,13 +8665,13 @@ dependencies = [
  "scale-info",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-referenda"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "assert_matches",
  "frame-benchmarking",
@@ -8682,13 +8684,13 @@ dependencies = [
  "sp-arithmetic",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-root-testing"
 version = "4.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -8697,13 +8699,13 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-scheduler"
 version = "29.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "docify",
  "frame-benchmarking",
@@ -8714,14 +8716,14 @@ dependencies = [
  "scale-info",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-weights",
 ]
 
 [[package]]
 name = "pallet-session"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -8736,14 +8738,14 @@ dependencies = [
  "sp-session",
  "sp-staking",
  "sp-state-machine",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-trie",
 ]
 
 [[package]]
 name = "pallet-session-benchmarking"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8754,13 +8756,13 @@ dependencies = [
  "rand",
  "sp-runtime",
  "sp-session",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-society"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8772,13 +8774,13 @@ dependencies = [
  "sp-arithmetic",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-staking"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -8795,13 +8797,13 @@ dependencies = [
  "sp-io",
  "sp-runtime",
  "sp-staking",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-staking-reward-curve"
 version = "11.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "proc-macro-crate 3.1.0",
  "proc-macro2",
@@ -8812,7 +8814,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking-reward-fn"
 version = "19.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "log",
  "sp-arithmetic",
@@ -8821,7 +8823,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking-runtime-api"
 version = "14.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -8831,7 +8833,7 @@ dependencies = [
 [[package]]
 name = "pallet-state-trie-migration"
 version = "29.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8842,13 +8844,13 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-sudo"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "docify",
  "frame-benchmarking",
@@ -8858,13 +8860,13 @@ dependencies = [
  "scale-info",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-timestamp"
 version = "27.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "docify",
  "frame-benchmarking",
@@ -8876,15 +8878,15 @@ dependencies = [
  "sp-inherents",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
- "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-storage 19.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-timestamp",
 ]
 
 [[package]]
 name = "pallet-tips"
 version = "27.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8897,13 +8899,13 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-transaction-payment"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -8913,13 +8915,13 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-transaction-payment-rpc"
 version = "30.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "jsonrpsee",
  "pallet-transaction-payment-rpc-runtime-api",
@@ -8935,7 +8937,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc-runtime-api"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "pallet-transaction-payment",
  "parity-scale-codec",
@@ -8947,7 +8949,7 @@ dependencies = [
 [[package]]
 name = "pallet-treasury"
 version = "27.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "docify",
  "frame-benchmarking",
@@ -8960,13 +8962,13 @@ dependencies = [
  "serde",
  "sp-core",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-tx-pause"
 version = "9.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "docify",
  "frame-benchmarking",
@@ -8978,13 +8980,13 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-utility"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8994,13 +8996,13 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-vesting"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -9009,13 +9011,13 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-whitelist"
 version = "27.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -9024,13 +9026,13 @@ dependencies = [
  "scale-info",
  "sp-api",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-xcm"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "bounded-collections",
  "frame-benchmarking",
@@ -9044,7 +9046,7 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "staging-xcm",
  "staging-xcm-builder",
  "staging-xcm-executor",
@@ -9053,7 +9055,7 @@ dependencies = [
 [[package]]
 name = "pallet-xcm-benchmarks"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -9063,7 +9065,7 @@ dependencies = [
  "scale-info",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "staging-xcm",
  "staging-xcm-builder",
  "staging-xcm-executor",
@@ -9357,7 +9359,7 @@ checksum = "d231b230927b5e4ad203db57bbcbee2802f6bce620b1e4a9024a07d94e2907ec"
 [[package]]
 name = "polkadot-approval-distribution"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "bitvec",
  "futures 0.3.30",
@@ -9377,7 +9379,7 @@ dependencies = [
 [[package]]
 name = "polkadot-availability-bitfield-distribution"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "always-assert",
  "futures 0.3.30",
@@ -9393,7 +9395,7 @@ dependencies = [
 [[package]]
 name = "polkadot-availability-distribution"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "derive_more",
  "fatality",
@@ -9416,7 +9418,7 @@ dependencies = [
 [[package]]
 name = "polkadot-availability-recovery"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "async-trait",
  "fatality",
@@ -9439,7 +9441,7 @@ dependencies = [
 [[package]]
 name = "polkadot-cli"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "cfg-if",
  "clap",
@@ -9467,7 +9469,7 @@ dependencies = [
 [[package]]
 name = "polkadot-collator-protocol"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "bitvec",
  "fatality",
@@ -9489,19 +9491,19 @@ dependencies = [
 [[package]]
 name = "polkadot-core-primitives"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-core",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "polkadot-dispute-distribution"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "derive_more",
  "fatality",
@@ -9526,7 +9528,7 @@ dependencies = [
 [[package]]
 name = "polkadot-erasure-coding"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "parity-scale-codec",
  "polkadot-node-primitives",
@@ -9540,7 +9542,7 @@ dependencies = [
 [[package]]
 name = "polkadot-gossip-support"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "futures 0.3.30",
  "futures-timer",
@@ -9562,7 +9564,7 @@ dependencies = [
 [[package]]
 name = "polkadot-network-bridge"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "always-assert",
  "async-trait",
@@ -9585,7 +9587,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-collation-generation"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "futures 0.3.30",
  "parity-scale-codec",
@@ -9603,7 +9605,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-approval-voting"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "bitvec",
  "derive_more",
@@ -9636,7 +9638,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-av-store"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "bitvec",
  "futures 0.3.30",
@@ -9658,7 +9660,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-backing"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "bitvec",
  "fatality",
@@ -9678,7 +9680,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-bitfield-signing"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "futures 0.3.30",
  "polkadot-node-subsystem",
@@ -9693,7 +9695,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-candidate-validation"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "async-trait",
  "futures 0.3.30",
@@ -9714,7 +9716,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-chain-api"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "futures 0.3.30",
  "polkadot-node-metrics",
@@ -9728,7 +9730,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-chain-selection"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "futures 0.3.30",
  "futures-timer",
@@ -9745,7 +9747,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-dispute-coordinator"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "fatality",
  "futures 0.3.30",
@@ -9764,7 +9766,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-parachains-inherent"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "async-trait",
  "futures 0.3.30",
@@ -9781,7 +9783,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-prospective-parachains"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "bitvec",
  "fatality",
@@ -9798,7 +9800,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-provisioner"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "bitvec",
  "fatality",
@@ -9815,7 +9817,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-pvf"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "always-assert",
  "array-bytes 6.2.3",
@@ -9838,7 +9840,7 @@ dependencies = [
  "slotmap",
  "sp-core",
  "sp-maybe-compressed-blob",
- "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-wasm-interface 20.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "tempfile",
  "thiserror",
  "tokio",
@@ -9848,7 +9850,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-pvf-checker"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "futures 0.3.30",
  "polkadot-node-primitives",
@@ -9864,7 +9866,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-pvf-common"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "cfg-if",
  "cpu-time",
@@ -9881,9 +9883,9 @@ dependencies = [
  "seccompiler",
  "sp-core",
  "sp-crypto-hashing",
- "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-externalities 0.25.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-io",
- "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-tracing 16.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "thiserror",
  "tracing-gum",
 ]
@@ -9891,7 +9893,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-runtime-api"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "futures 0.3.30",
  "polkadot-node-metrics",
@@ -9906,7 +9908,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-jaeger"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "lazy_static",
  "log",
@@ -9924,7 +9926,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-metrics"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "bs58 0.5.1",
  "futures 0.3.30",
@@ -9943,7 +9945,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-network-protocol"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "async-channel 1.9.0",
  "async-trait",
@@ -9967,7 +9969,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-primitives"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "bitvec",
  "bounded-vec",
@@ -9990,7 +9992,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-subsystem"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "polkadot-node-jaeger",
  "polkadot-node-subsystem-types",
@@ -10000,7 +10002,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-subsystem-types"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "async-trait",
  "bitvec",
@@ -10028,7 +10030,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-subsystem-util"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -10063,7 +10065,7 @@ dependencies = [
 [[package]]
 name = "polkadot-overseer"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "async-trait",
  "futures 0.3.30",
@@ -10085,7 +10087,7 @@ dependencies = [
 [[package]]
 name = "polkadot-parachain-primitives"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "bounded-collections",
  "derive_more",
@@ -10095,14 +10097,14 @@ dependencies = [
  "serde",
  "sp-core",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-weights",
 ]
 
 [[package]]
 name = "polkadot-primitives"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "bitvec",
  "hex-literal 0.4.1",
@@ -10123,13 +10125,13 @@ dependencies = [
  "sp-keystore",
  "sp-runtime",
  "sp-staking",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "polkadot-rpc"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "jsonrpsee",
  "mmr-rpc",
@@ -10162,7 +10164,7 @@ dependencies = [
 [[package]]
 name = "polkadot-runtime-common"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "bitvec",
  "frame-benchmarking",
@@ -10204,7 +10206,7 @@ dependencies = [
  "sp-runtime",
  "sp-session",
  "sp-staking",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "staging-xcm",
  "staging-xcm-builder",
  "staging-xcm-executor",
@@ -10214,20 +10216,20 @@ dependencies = [
 [[package]]
 name = "polkadot-runtime-metrics"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "bs58 0.5.1",
  "frame-benchmarking",
  "parity-scale-codec",
  "polkadot-primitives",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
- "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-tracing 16.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "polkadot-runtime-parachains"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "bitflags 1.3.2",
  "bitvec",
@@ -10267,7 +10269,7 @@ dependencies = [
  "sp-runtime",
  "sp-session",
  "sp-staking",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "staging-xcm",
  "staging-xcm-executor",
  "static_assertions",
@@ -10276,7 +10278,7 @@ dependencies = [
 [[package]]
 name = "polkadot-service"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "async-trait",
  "frame-benchmarking",
@@ -10379,7 +10381,7 @@ dependencies = [
  "sp-runtime",
  "sp-session",
  "sp-state-machine",
- "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-storage 19.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-timestamp",
  "sp-transaction-pool",
  "sp-version",
@@ -10393,7 +10395,7 @@ dependencies = [
 [[package]]
 name = "polkadot-statement-distribution"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "arrayvec 0.7.4",
  "bitvec",
@@ -10416,7 +10418,7 @@ dependencies = [
 [[package]]
 name = "polkadot-statement-table"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "parity-scale-codec",
  "polkadot-primitives",
@@ -10536,7 +10538,7 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
 [[package]]
 name = "precompile-utils"
 version = "0.1.0"
-source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.7.2#24461108ff2125d8185d1a8129f5deddf26c9210"
+source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.7.2#f566bc6e6dff42573aa91ef54f83edf2f0f04e46"
 dependencies = [
  "derive_more",
  "environmental",
@@ -10558,7 +10560,7 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-weights",
  "staging-xcm",
 ]
@@ -10566,7 +10568,7 @@ dependencies = [
 [[package]]
 name = "precompile-utils"
 version = "0.1.1"
-source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.7.2#458974e73022382d3a4ca5ca10fee61ef25a471b"
+source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.7.2#0000e6dc61d7a16cb7a3b3e9a4947c3437e1ef85"
 dependencies = [
  "affix",
  "environmental",
@@ -10586,14 +10588,14 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-weights",
 ]
 
 [[package]]
 name = "precompile-utils-macro"
 version = "0.1.0"
-source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.7.2#24461108ff2125d8185d1a8129f5deddf26c9210"
+source = "git+https://github.com/darwinia-network/frontier?branch=polkadot-v1.7.2#f566bc6e6dff42573aa91ef54f83edf2f0f04e46"
 dependencies = [
  "case",
  "num_enum 0.7.2",
@@ -10607,7 +10609,7 @@ dependencies = [
 [[package]]
 name = "precompile-utils-macro"
 version = "0.1.1"
-source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.7.2#458974e73022382d3a4ca5ca10fee61ef25a471b"
+source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.7.2#0000e6dc61d7a16cb7a3b3e9a4947c3437e1ef85"
 dependencies = [
  "case",
  "num_enum 0.5.11",
@@ -11428,7 +11430,7 @@ dependencies = [
 [[package]]
 name = "rococo-runtime"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "binary-merkle-tree",
  "frame-benchmarking",
@@ -11511,8 +11513,8 @@ dependencies = [
  "sp-runtime",
  "sp-session",
  "sp-staking",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
- "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-storage 19.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-transaction-pool",
  "sp-version",
  "staging-xcm",
@@ -11525,7 +11527,7 @@ dependencies = [
 [[package]]
 name = "rococo-runtime-constants"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "frame-support",
  "polkadot-primitives",
@@ -11783,18 +11785,18 @@ dependencies = [
 [[package]]
 name = "sc-allocator"
 version = "23.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "log",
  "sp-core",
- "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-wasm-interface 20.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "thiserror",
 ]
 
 [[package]]
 name = "sc-authority-discovery"
 version = "0.34.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "async-trait",
  "futures 0.3.30",
@@ -11823,7 +11825,7 @@ dependencies = [
 [[package]]
 name = "sc-basic-authorship"
 version = "0.34.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "futures 0.3.30",
  "futures-timer",
@@ -11845,7 +11847,7 @@ dependencies = [
 [[package]]
 name = "sc-block-builder"
 version = "0.33.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -11860,7 +11862,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec"
 version = "27.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "array-bytes 6.2.3",
  "docify",
@@ -11886,7 +11888,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec-derive"
 version = "11.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "proc-macro-crate 3.1.0",
  "proc-macro2",
@@ -11897,7 +11899,7 @@ dependencies = [
 [[package]]
 name = "sc-cli"
 version = "0.36.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "array-bytes 6.2.3",
  "bip39",
@@ -11938,7 +11940,7 @@ dependencies = [
 [[package]]
 name = "sc-client-api"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "fnv",
  "futures 0.3.30",
@@ -11953,11 +11955,11 @@ dependencies = [
  "sp-consensus",
  "sp-core",
  "sp-database",
- "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-externalities 0.25.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-runtime",
  "sp-state-machine",
  "sp-statement-store",
- "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-storage 19.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-trie",
  "substrate-prometheus-endpoint",
 ]
@@ -11965,7 +11967,7 @@ dependencies = [
 [[package]]
 name = "sc-client-db"
 version = "0.35.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "hash-db",
  "kvdb",
@@ -11991,7 +11993,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus"
 version = "0.33.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "async-trait",
  "futures 0.3.30",
@@ -12016,7 +12018,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-aura"
 version = "0.34.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "async-trait",
  "futures 0.3.30",
@@ -12045,7 +12047,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe"
 version = "0.34.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "async-trait",
  "fork-tree",
@@ -12081,7 +12083,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe-rpc"
 version = "0.34.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "futures 0.3.30",
  "jsonrpsee",
@@ -12103,7 +12105,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-beefy"
 version = "13.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "array-bytes 6.2.3",
  "async-channel 1.9.0",
@@ -12139,7 +12141,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-beefy-rpc"
 version = "13.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "futures 0.3.30",
  "jsonrpsee",
@@ -12158,7 +12160,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-epochs"
 version = "0.33.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "fork-tree",
  "parity-scale-codec",
@@ -12171,7 +12173,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-grandpa"
 version = "0.19.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "ahash 0.8.11",
  "array-bytes 6.2.3",
@@ -12214,7 +12216,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-grandpa-rpc"
 version = "0.19.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "finality-grandpa",
  "futures 0.3.30",
@@ -12234,7 +12236,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-slots"
 version = "0.33.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "async-trait",
  "futures 0.3.30",
@@ -12257,7 +12259,7 @@ dependencies = [
 [[package]]
 name = "sc-executor"
 version = "0.32.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "parity-scale-codec",
  "parking_lot 0.12.3",
@@ -12266,24 +12268,24 @@ dependencies = [
  "schnellru",
  "sp-api",
  "sp-core",
- "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-externalities 0.25.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-io",
  "sp-panic-handler",
- "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-runtime-interface 24.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-trie",
  "sp-version",
- "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-wasm-interface 20.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "tracing",
 ]
 
 [[package]]
 name = "sc-executor-common"
 version = "0.29.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "sc-allocator",
  "sp-maybe-compressed-blob",
- "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-wasm-interface 20.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "thiserror",
  "wasm-instrument",
 ]
@@ -12291,7 +12293,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmtime"
 version = "0.29.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "anyhow",
  "cfg-if",
@@ -12301,15 +12303,15 @@ dependencies = [
  "rustix 0.36.17",
  "sc-allocator",
  "sc-executor-common",
- "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
- "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-runtime-interface 24.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-wasm-interface 20.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "wasmtime",
 ]
 
 [[package]]
 name = "sc-informant"
 version = "0.33.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "ansi_term",
  "futures 0.3.30",
@@ -12326,7 +12328,7 @@ dependencies = [
 [[package]]
 name = "sc-keystore"
 version = "25.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "array-bytes 6.2.3",
  "parking_lot 0.12.3",
@@ -12340,7 +12342,7 @@ dependencies = [
 [[package]]
 name = "sc-mixnet"
 version = "0.4.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "array-bytes 4.2.0",
  "arrayvec 0.7.4",
@@ -12369,7 +12371,7 @@ dependencies = [
 [[package]]
 name = "sc-network"
 version = "0.34.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "array-bytes 6.2.3",
  "async-channel 1.9.0",
@@ -12412,7 +12414,7 @@ dependencies = [
 [[package]]
 name = "sc-network-bitswap"
 version = "0.33.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "async-channel 1.9.0",
  "cid",
@@ -12432,7 +12434,7 @@ dependencies = [
 [[package]]
 name = "sc-network-common"
 version = "0.33.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "async-trait",
  "bitflags 1.3.2",
@@ -12449,7 +12451,7 @@ dependencies = [
 [[package]]
 name = "sc-network-gossip"
 version = "0.34.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "ahash 0.8.11",
  "futures 0.3.30",
@@ -12468,7 +12470,7 @@ dependencies = [
 [[package]]
 name = "sc-network-light"
 version = "0.33.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "array-bytes 6.2.3",
  "async-channel 1.9.0",
@@ -12489,7 +12491,7 @@ dependencies = [
 [[package]]
 name = "sc-network-sync"
 version = "0.33.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "array-bytes 6.2.3",
  "async-channel 1.9.0",
@@ -12525,7 +12527,7 @@ dependencies = [
 [[package]]
 name = "sc-network-transactions"
 version = "0.33.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "array-bytes 6.2.3",
  "futures 0.3.30",
@@ -12544,7 +12546,7 @@ dependencies = [
 [[package]]
 name = "sc-offchain"
 version = "29.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "array-bytes 6.2.3",
  "bytes",
@@ -12567,7 +12569,7 @@ dependencies = [
  "sc-utils",
  "sp-api",
  "sp-core",
- "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-externalities 0.25.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-keystore",
  "sp-offchain",
  "sp-runtime",
@@ -12578,7 +12580,7 @@ dependencies = [
 [[package]]
 name = "sc-proposer-metrics"
 version = "0.17.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "log",
  "substrate-prometheus-endpoint",
@@ -12587,7 +12589,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc"
 version = "29.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "futures 0.3.30",
  "jsonrpsee",
@@ -12619,7 +12621,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-api"
 version = "0.33.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "jsonrpsee",
  "parity-scale-codec",
@@ -12639,7 +12641,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-server"
 version = "11.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "http 0.2.12",
  "jsonrpsee",
@@ -12654,7 +12656,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-spec-v2"
 version = "0.34.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "array-bytes 6.2.3",
  "futures 0.3.30",
@@ -12684,7 +12686,7 @@ dependencies = [
 [[package]]
 name = "sc-service"
 version = "0.35.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "async-trait",
  "directories",
@@ -12725,12 +12727,12 @@ dependencies = [
  "sp-blockchain",
  "sp-consensus",
  "sp-core",
- "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-externalities 0.25.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-keystore",
  "sp-runtime",
  "sp-session",
  "sp-state-machine",
- "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-storage 19.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-transaction-pool",
  "sp-transaction-storage-proof",
  "sp-trie",
@@ -12747,7 +12749,7 @@ dependencies = [
 [[package]]
 name = "sc-state-db"
 version = "0.30.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -12758,7 +12760,7 @@ dependencies = [
 [[package]]
 name = "sc-storage-monitor"
 version = "0.16.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "clap",
  "fs4",
@@ -12771,7 +12773,7 @@ dependencies = [
 [[package]]
 name = "sc-sync-state-rpc"
 version = "0.34.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "jsonrpsee",
  "parity-scale-codec",
@@ -12790,7 +12792,7 @@ dependencies = [
 [[package]]
 name = "sc-sysinfo"
 version = "27.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "derive_more",
  "futures 0.3.30",
@@ -12805,13 +12807,13 @@ dependencies = [
  "sp-core",
  "sp-crypto-hashing",
  "sp-io",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "sc-telemetry"
 version = "15.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "chrono",
  "futures 0.3.30",
@@ -12830,7 +12832,7 @@ dependencies = [
 [[package]]
 name = "sc-tracing"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "ansi_term",
  "chrono",
@@ -12850,7 +12852,7 @@ dependencies = [
  "sp-core",
  "sp-rpc",
  "sp-runtime",
- "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-tracing 16.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "thiserror",
  "tracing",
  "tracing-log 0.1.4",
@@ -12860,7 +12862,7 @@ dependencies = [
 [[package]]
 name = "sc-tracing-proc-macro"
 version = "11.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "proc-macro-crate 3.1.0",
  "proc-macro2",
@@ -12871,7 +12873,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-pool"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "async-trait",
  "futures 0.3.30",
@@ -12889,7 +12891,7 @@ dependencies = [
  "sp-core",
  "sp-crypto-hashing",
  "sp-runtime",
- "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-tracing 16.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-transaction-pool",
  "substrate-prometheus-endpoint",
  "thiserror",
@@ -12898,7 +12900,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-pool-api"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "async-trait",
  "futures 0.3.30",
@@ -12914,7 +12916,7 @@ dependencies = [
 [[package]]
 name = "sc-utils"
 version = "14.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "async-channel 1.9.0",
  "futures 0.3.30",
@@ -13341,13 +13343,13 @@ checksum = "826167069c09b99d56f31e9ae5c99049e932a98c9dc2dac47645b08dbbf76ba7"
 [[package]]
 name = "slot-range-helper"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "enumn",
  "parity-scale-codec",
  "paste",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
@@ -13535,7 +13537,7 @@ dependencies = [
 [[package]]
 name = "sp-api"
 version = "26.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "hash-db",
  "log",
@@ -13543,11 +13545,11 @@ dependencies = [
  "scale-info",
  "sp-api-proc-macro",
  "sp-core",
- "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-externalities 0.25.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-metadata-ir",
  "sp-runtime",
  "sp-state-machine",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-trie",
  "sp-version",
  "thiserror",
@@ -13556,7 +13558,7 @@ dependencies = [
 [[package]]
 name = "sp-api-proc-macro"
 version = "15.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "Inflector",
  "blake2 0.10.6",
@@ -13570,27 +13572,27 @@ dependencies = [
 [[package]]
 name = "sp-application-crypto"
 version = "30.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
  "serde",
  "sp-core",
  "sp-io",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "sp-arithmetic"
 version = "23.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "integer-sqrt",
  "num-traits",
  "parity-scale-codec",
  "scale-info",
  "serde",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "static_assertions",
 ]
 
@@ -13615,31 +13617,31 @@ dependencies = [
 [[package]]
 name = "sp-authority-discovery"
 version = "26.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-api",
  "sp-application-crypto",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "sp-block-builder"
 version = "26.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "sp-api",
  "sp-inherents",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "sp-blockchain"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "futures 0.3.30",
  "log",
@@ -13657,7 +13659,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus"
 version = "0.32.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "async-trait",
  "futures 0.3.30",
@@ -13672,7 +13674,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-aura"
 version = "0.32.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -13682,14 +13684,14 @@ dependencies = [
  "sp-consensus-slots",
  "sp-inherents",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-timestamp",
 ]
 
 [[package]]
 name = "sp-consensus-babe"
 version = "0.32.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -13701,14 +13703,14 @@ dependencies = [
  "sp-core",
  "sp-inherents",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-timestamp",
 ]
 
 [[package]]
 name = "sp-consensus-beefy"
 version = "13.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "lazy_static",
  "parity-scale-codec",
@@ -13721,14 +13723,14 @@ dependencies = [
  "sp-io",
  "sp-mmr-primitives",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "strum 0.24.1",
 ]
 
 [[package]]
 name = "sp-consensus-grandpa"
 version = "13.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "finality-grandpa",
  "log",
@@ -13740,25 +13742,25 @@ dependencies = [
  "sp-core",
  "sp-keystore",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "sp-consensus-slots"
 version = "0.32.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
  "serde",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-timestamp",
 ]
 
 [[package]]
 name = "sp-core"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "array-bytes 6.2.3",
  "bandersnatch_vrfs",
@@ -13788,11 +13790,11 @@ dependencies = [
  "secrecy",
  "serde",
  "sp-crypto-hashing",
- "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
- "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
- "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
- "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-debug-derive 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-externalities 0.25.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-runtime-interface 24.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-storage 19.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "ss58-registry",
  "substrate-bip39",
  "thiserror",
@@ -13804,7 +13806,7 @@ dependencies = [
 [[package]]
 name = "sp-core-hashing"
 version = "15.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "sp-crypto-hashing",
 ]
@@ -13832,7 +13834,7 @@ dependencies = [
 [[package]]
 name = "sp-crypto-hashing"
 version = "0.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "blake2b_simd",
  "byteorder",
@@ -13845,7 +13847,7 @@ dependencies = [
 [[package]]
 name = "sp-crypto-hashing-proc-macro"
 version = "0.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "quote",
  "sp-crypto-hashing",
@@ -13855,7 +13857,7 @@ dependencies = [
 [[package]]
 name = "sp-database"
 version = "10.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "kvdb",
  "parking_lot 0.12.3",
@@ -13864,7 +13866,7 @@ dependencies = [
 [[package]]
 name = "sp-debug-derive"
 version = "14.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -13884,12 +13886,12 @@ dependencies = [
 [[package]]
 name = "sp-externalities"
 version = "0.25.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "environmental",
  "parity-scale-codec",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
- "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-storage 19.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
@@ -13905,32 +13907,32 @@ dependencies = [
 [[package]]
 name = "sp-genesis-builder"
 version = "0.7.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "serde_json",
  "sp-api",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "sp-inherents"
 version = "26.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "async-trait",
  "impl-trait-for-tuples",
  "parity-scale-codec",
  "scale-info",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "thiserror",
 ]
 
 [[package]]
 name = "sp-io"
 version = "30.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "bytes",
  "ed25519-dalek",
@@ -13941,12 +13943,12 @@ dependencies = [
  "secp256k1",
  "sp-core",
  "sp-crypto-hashing",
- "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-externalities 0.25.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-keystore",
- "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-runtime-interface 24.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-state-machine",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
- "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-tracing 16.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-trie",
  "tracing",
  "tracing-core",
@@ -13955,7 +13957,7 @@ dependencies = [
 [[package]]
 name = "sp-keyring"
 version = "31.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "sp-core",
  "sp-runtime",
@@ -13965,19 +13967,19 @@ dependencies = [
 [[package]]
 name = "sp-keystore"
 version = "0.34.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "parity-scale-codec",
  "parking_lot 0.12.3",
  "sp-core",
- "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-externalities 0.25.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "thiserror",
 ]
 
 [[package]]
 name = "sp-maybe-compressed-blob"
 version = "11.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "thiserror",
  "zstd 0.12.4",
@@ -13986,30 +13988,30 @@ dependencies = [
 [[package]]
 name = "sp-metadata-ir"
 version = "0.6.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "frame-metadata",
  "parity-scale-codec",
  "scale-info",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "sp-mixnet"
 version = "0.4.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-api",
  "sp-application-crypto",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "sp-mmr-primitives"
 version = "26.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "ckb-merkle-mountain-range",
  "log",
@@ -14018,16 +14020,16 @@ dependencies = [
  "serde",
  "sp-api",
  "sp-core",
- "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-debug-derive 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "thiserror",
 ]
 
 [[package]]
 name = "sp-npos-elections"
 version = "26.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -14035,13 +14037,13 @@ dependencies = [
  "sp-arithmetic",
  "sp-core",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "sp-offchain"
 version = "26.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "sp-api",
  "sp-core",
@@ -14051,7 +14053,7 @@ dependencies = [
 [[package]]
 name = "sp-panic-handler"
 version = "13.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "backtrace",
  "lazy_static",
@@ -14061,7 +14063,7 @@ dependencies = [
 [[package]]
 name = "sp-rpc"
 version = "26.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "rustc-hash",
  "serde",
@@ -14071,7 +14073,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime"
 version = "31.0.1"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "docify",
  "either",
@@ -14088,25 +14090,25 @@ dependencies = [
  "sp-arithmetic",
  "sp-core",
  "sp-io",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-weights",
 ]
 
 [[package]]
 name = "sp-runtime-interface"
 version = "24.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "bytes",
  "impl-trait-for-tuples",
  "parity-scale-codec",
  "primitive-types",
- "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
- "sp-runtime-interface-proc-macro 17.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
- "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
- "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
- "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-externalities 0.25.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-runtime-interface-proc-macro 17.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-storage 19.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-tracing 16.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-wasm-interface 20.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "static_assertions",
 ]
 
@@ -14132,7 +14134,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface-proc-macro"
 version = "17.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "Inflector",
  "expander 2.2.1",
@@ -14158,7 +14160,7 @@ dependencies = [
 [[package]]
 name = "sp-session"
 version = "27.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -14167,13 +14169,13 @@ dependencies = [
  "sp-keystore",
  "sp-runtime",
  "sp-staking",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "sp-staking"
 version = "26.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -14181,13 +14183,13 @@ dependencies = [
  "serde",
  "sp-core",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "sp-state-machine"
 version = "0.35.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "hash-db",
  "log",
@@ -14196,9 +14198,9 @@ dependencies = [
  "rand",
  "smallvec",
  "sp-core",
- "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-externalities 0.25.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-panic-handler",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-trie",
  "thiserror",
  "tracing",
@@ -14208,7 +14210,7 @@ dependencies = [
 [[package]]
 name = "sp-statement-store"
 version = "10.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "aes-gcm",
  "curve25519-dalek 4.1.3",
@@ -14222,10 +14224,10 @@ dependencies = [
  "sp-application-crypto",
  "sp-core",
  "sp-crypto-hashing",
- "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-externalities 0.25.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-runtime",
- "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-runtime-interface 24.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "thiserror",
  "x25519-dalek 2.0.1",
 ]
@@ -14233,7 +14235,7 @@ dependencies = [
 [[package]]
 name = "sp-std"
 version = "14.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 
 [[package]]
 name = "sp-std"
@@ -14243,14 +14245,14 @@ source = "git+https://github.com/paritytech/polkadot-sdk#2f3a1bf8736844272a7eb16
 [[package]]
 name = "sp-storage"
 version = "19.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
  "ref-cast",
  "serde",
- "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-debug-derive 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
@@ -14268,23 +14270,23 @@ dependencies = [
 [[package]]
 name = "sp-timestamp"
 version = "26.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
  "sp-inherents",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "thiserror",
 ]
 
 [[package]]
 name = "sp-tracing"
 version = "16.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "parity-scale-codec",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "tracing",
  "tracing-core",
  "tracing-subscriber 0.2.25",
@@ -14304,7 +14306,7 @@ dependencies = [
 [[package]]
 name = "sp-transaction-pool"
 version = "26.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "sp-api",
  "sp-runtime",
@@ -14313,7 +14315,7 @@ dependencies = [
 [[package]]
 name = "sp-transaction-storage-proof"
 version = "26.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -14321,14 +14323,14 @@ dependencies = [
  "sp-core",
  "sp-inherents",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-trie",
 ]
 
 [[package]]
 name = "sp-trie"
 version = "29.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "ahash 0.8.11",
  "hash-db",
@@ -14341,8 +14343,8 @@ dependencies = [
  "scale-info",
  "schnellru",
  "sp-core",
- "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-externalities 0.25.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "thiserror",
  "tracing",
  "trie-db",
@@ -14352,7 +14354,7 @@ dependencies = [
 [[package]]
 name = "sp-version"
 version = "29.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -14361,7 +14363,7 @@ dependencies = [
  "serde",
  "sp-crypto-hashing-proc-macro",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-version-proc-macro",
  "thiserror",
 ]
@@ -14369,7 +14371,7 @@ dependencies = [
 [[package]]
 name = "sp-version-proc-macro"
 version = "13.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "parity-scale-codec",
  "proc-macro2",
@@ -14380,13 +14382,13 @@ dependencies = [
 [[package]]
 name = "sp-wasm-interface"
 version = "20.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "anyhow",
  "impl-trait-for-tuples",
  "log",
  "parity-scale-codec",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "wasmtime",
 ]
 
@@ -14403,7 +14405,7 @@ dependencies = [
 [[package]]
 name = "sp-weights"
 version = "27.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "bounded-collections",
  "parity-scale-codec",
@@ -14411,8 +14413,8 @@ dependencies = [
  "serde",
  "smallvec",
  "sp-arithmetic",
- "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-debug-derive 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
@@ -14595,7 +14597,7 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
 [[package]]
 name = "staging-parachain-info"
 version = "0.7.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "cumulus-primitives-core",
  "frame-support",
@@ -14603,13 +14605,13 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "staging-xcm"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "array-bytes 6.2.3",
  "bounded-collections",
@@ -14627,7 +14629,7 @@ dependencies = [
 [[package]]
 name = "staging-xcm-builder"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -14640,7 +14642,7 @@ dependencies = [
  "sp-arithmetic",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-weights",
  "staging-xcm",
  "staging-xcm-executor",
@@ -14649,7 +14651,7 @@ dependencies = [
 [[package]]
 name = "staging-xcm-executor"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "environmental",
  "frame-benchmarking",
@@ -14662,7 +14664,7 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-weights",
  "staging-xcm",
 ]
@@ -14793,7 +14795,7 @@ dependencies = [
 [[package]]
 name = "substrate-build-script-utils"
 version = "11.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 
 [[package]]
 name = "substrate-fixed"
@@ -14809,7 +14811,7 @@ dependencies = [
 [[package]]
 name = "substrate-frame-rpc-system"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "frame-system-rpc-runtime-api",
  "futures 0.3.30",
@@ -14828,7 +14830,7 @@ dependencies = [
 [[package]]
 name = "substrate-prometheus-endpoint"
 version = "0.17.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "hyper 0.14.29",
  "log",
@@ -14840,7 +14842,7 @@ dependencies = [
 [[package]]
 name = "substrate-rpc-client"
 version = "0.33.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "async-trait",
  "jsonrpsee",
@@ -14853,7 +14855,7 @@ dependencies = [
 [[package]]
 name = "substrate-state-trie-migration-rpc"
 version = "27.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "jsonrpsee",
  "parity-scale-codec",
@@ -14870,7 +14872,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-utils"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "futures 0.3.30",
  "tokio",
@@ -14889,7 +14891,7 @@ dependencies = [
 [[package]]
 name = "substrate-wasm-builder"
 version = "17.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "build-helper",
  "cargo_metadata",
@@ -15462,7 +15464,7 @@ dependencies = [
 [[package]]
 name = "tracing-gum"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "coarsetime",
  "polkadot-primitives",
@@ -15473,7 +15475,7 @@ dependencies = [
 [[package]]
 name = "tracing-gum-proc-macro"
 version = "5.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "expander 2.2.1",
  "proc-macro-crate 3.1.0",
@@ -15689,7 +15691,7 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 [[package]]
 name = "try-runtime-cli"
 version = "0.38.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "async-trait",
  "clap",
@@ -15706,8 +15708,8 @@ dependencies = [
  "sp-consensus-aura",
  "sp-consensus-babe",
  "sp-core",
- "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
- "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-debug-derive 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-externalities 0.25.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-inherents",
  "sp-io",
  "sp-keystore",
@@ -16390,7 +16392,7 @@ dependencies = [
 [[package]]
 name = "westend-runtime"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "binary-merkle-tree",
  "bitvec",
@@ -16483,8 +16485,8 @@ dependencies = [
  "sp-runtime",
  "sp-session",
  "sp-staking",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
- "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-storage 19.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-transaction-pool",
  "sp-version",
  "staging-xcm",
@@ -16497,7 +16499,7 @@ dependencies = [
 [[package]]
 name = "westend-runtime-constants"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "frame-support",
  "polkadot-primitives",
@@ -16893,7 +16895,7 @@ dependencies = [
 [[package]]
 name = "xcm-primitives"
 version = "0.1.1"
-source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.7.2#458974e73022382d3a4ca5ca10fee61ef25a471b"
+source = "git+https://github.com/darwinia-network/moonbeam?branch=polkadot-v1.7.2#0000e6dc61d7a16cb7a3b3e9a4947c3437e1ef85"
 dependencies = [
  "cumulus-primitives-core",
  "ethereum",
@@ -16913,7 +16915,7 @@ dependencies = [
  "sha3",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "staging-xcm",
  "staging-xcm-builder",
  "staging-xcm-executor",
@@ -16922,7 +16924,7 @@ dependencies = [
 [[package]]
 name = "xcm-procedural"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/darwinia-network/polkadot-sdk?branch=release-polkadot-v1.7.2#581178546b4b0fb8ebf4a6cee5a51d5629419197"
 dependencies = [
  "Inflector",
  "proc-macro2",
diff --git a/Cargo.toml b/Cargo.toml
index 44de3f3ec..e571659d8 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -22,15 +22,14 @@ version    = "6.6.3"
 
 [workspace.dependencies]
 # crates.io
-array-bytes       = { version = "6.2" }
-codec             = { package = "parity-scale-codec", version = "3.6", default-features = false }
-ethereum          = { version = "0.15", default-features = false, features = ["with-codec"] }
-libsecp256k1      = { version = "0.7", default-features = false }
-log               = { version = "0.4" }
-scale-info        = { version = "2.10", default-features = false }
-sha3              = { version = "0.10" }
-static_assertions = { version = "1.1" }
-strum             = { version = "0.26", default-features = false }
+array-bytes  = { version = "6.2" }
+codec        = { package = "parity-scale-codec", version = "3.6", default-features = false }
+ethereum     = { version = "0.15", default-features = false, features = ["with-codec"] }
+libsecp256k1 = { version = "0.7", default-features = false }
+log          = { version = "0.4" }
+scale-info   = { version = "2.10", default-features = false }
+sha3         = { version = "0.10" }
+strum        = { version = "0.26", default-features = false }
 
 # darwinia
 crab-runtime                      = { path = "runtime/crab" }
@@ -90,105 +89,106 @@ orml-xcm-support = { git = "https://github.com/darwinia-network/open-runtime-mod
 orml-xtokens     = { git = "https://github.com/darwinia-network/open-runtime-module-library", branch = "polkadot-v1.7.2", default-features = false }
 
 # polkadot-sdk
-cumulus-client-cli                         = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
-cumulus-client-collator                    = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
-cumulus-client-consensus-aura              = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
-cumulus-client-consensus-common            = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
-cumulus-client-consensus-proposer          = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
-cumulus-client-parachain-inherent          = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
-cumulus-client-service                     = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
-cumulus-pallet-aura-ext                    = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
-cumulus-pallet-dmp-queue                   = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
-cumulus-pallet-parachain-system            = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
-cumulus-pallet-session-benchmarking        = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
-cumulus-pallet-xcm                         = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
-cumulus-pallet-xcmp-queue                  = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
-cumulus-primitives-core                    = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
-cumulus-primitives-parachain-inherent      = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
-cumulus-primitives-utility                 = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
-cumulus-relay-chain-interface              = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
-frame-benchmarking                         = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
-frame-benchmarking-cli                     = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
-frame-executive                            = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
-frame-support                              = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
-frame-system                               = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
-frame-system-benchmarking                  = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
-frame-system-rpc-runtime-api               = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
-frame-try-runtime                          = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
-pallet-assets                              = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
-pallet-aura                                = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
-pallet-authorship                          = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
-pallet-balances                            = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false, features = ["insecure_zero_ed"] }
-pallet-collective                          = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
-pallet-conviction-voting                   = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
-pallet-message-queue                       = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
-pallet-preimage                            = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
-pallet-proxy                               = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
-pallet-referenda                           = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
-pallet-scheduler                           = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
-pallet-session                             = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
-pallet-sudo                                = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
-pallet-timestamp                           = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
-pallet-transaction-payment                 = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
-pallet-transaction-payment-rpc             = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
-pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
-pallet-treasury                            = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
-pallet-tx-pause                            = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
-pallet-utility                             = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
-pallet-whitelist                           = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
-pallet-xcm                                 = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
-parachain-info                             = { package = "staging-parachain-info", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
-polkadot-cli                               = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
-polkadot-parachain                         = { package = "polkadot-parachain-primitives", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
-polkadot-primitives                        = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
-polkadot-runtime-common                    = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
-sc-basic-authorship                        = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
-sc-chain-spec                              = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
-sc-cli                                     = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
-sc-client-api                              = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
-sc-consensus                               = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
-sc-consensus-aura                          = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
-sc-executor                                = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
-sc-keystore                                = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
-sc-network                                 = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
-sc-network-sync                            = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
-sc-offchain                                = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
-sc-rpc                                     = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
-sc-rpc-api                                 = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
-sc-service                                 = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
-sc-sysinfo                                 = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
-sc-telemetry                               = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
-sc-tracing                                 = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
-sc-transaction-pool                        = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
-sc-transaction-pool-api                    = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
-sp-api                                     = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
-sp-arithmetic                              = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
-sp-block-builder                           = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
-sp-blockchain                              = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
-sp-consensus-aura                          = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
-sp-core                                    = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
-sp-debug-derive                            = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
-sp-genesis-builder                         = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
-sp-inherents                               = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
-sp-io                                      = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
-sp-keyring                                 = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
-sp-keystore                                = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
-sp-offchain                                = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
-sp-runtime                                 = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
-sp-session                                 = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
-sp-staking                                 = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
-sp-std                                     = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
-sp-timestamp                               = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
-sp-transaction-pool                        = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
-sp-version                                 = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
-substrate-build-script-utils               = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
-substrate-frame-rpc-system                 = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
-substrate-prometheus-endpoint              = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
-substrate-test-utils                       = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
-substrate-wasm-builder                     = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
-xcm                                        = { package = "staging-xcm", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
-xcm-builder                                = { package = "staging-xcm-builder", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
-xcm-executor                               = { package = "staging-xcm-executor", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+cumulus-client-cli                         = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+cumulus-client-collator                    = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+cumulus-client-consensus-aura              = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+cumulus-client-consensus-common            = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+cumulus-client-consensus-proposer          = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+cumulus-client-parachain-inherent          = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+cumulus-client-service                     = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+cumulus-pallet-aura-ext                    = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+cumulus-pallet-dmp-queue                   = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+cumulus-pallet-parachain-system            = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false, features = ["parameterized-consensus-hook"] }
+cumulus-pallet-session-benchmarking        = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+cumulus-pallet-xcm                         = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+cumulus-pallet-xcmp-queue                  = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+cumulus-primitives-aura                    = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+cumulus-primitives-core                    = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+cumulus-primitives-parachain-inherent      = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+cumulus-primitives-utility                 = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+cumulus-relay-chain-interface              = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+frame-benchmarking                         = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+frame-benchmarking-cli                     = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+frame-executive                            = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+frame-support                              = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+frame-system                               = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+frame-system-benchmarking                  = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+frame-system-rpc-runtime-api               = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+frame-try-runtime                          = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+pallet-assets                              = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+pallet-aura                                = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false, features = ["experimental"]}
+pallet-authorship                          = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+pallet-balances                            = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false, features = ["insecure_zero_ed"] }
+pallet-collective                          = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+pallet-conviction-voting                   = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+pallet-message-queue                       = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+pallet-preimage                            = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+pallet-proxy                               = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+pallet-referenda                           = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+pallet-scheduler                           = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+pallet-session                             = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+pallet-sudo                                = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+pallet-timestamp                           = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+pallet-transaction-payment                 = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+pallet-transaction-payment-rpc             = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+pallet-treasury                            = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+pallet-tx-pause                            = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+pallet-utility                             = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+pallet-whitelist                           = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+pallet-xcm                                 = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+parachain-info                             = { package = "staging-parachain-info", git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+polkadot-cli                               = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+polkadot-parachain                         = { package = "polkadot-parachain-primitives", git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+polkadot-primitives                        = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+polkadot-runtime-common                    = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sc-basic-authorship                        = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sc-chain-spec                              = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sc-cli                                     = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sc-client-api                              = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sc-consensus                               = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sc-consensus-aura                          = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sc-executor                                = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sc-keystore                                = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sc-network                                 = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sc-network-sync                            = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sc-offchain                                = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sc-rpc                                     = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sc-rpc-api                                 = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sc-service                                 = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sc-sysinfo                                 = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sc-telemetry                               = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sc-tracing                                 = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sc-transaction-pool                        = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sc-transaction-pool-api                    = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sp-api                                     = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sp-arithmetic                              = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sp-block-builder                           = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sp-blockchain                              = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sp-consensus-aura                          = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sp-core                                    = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sp-debug-derive                            = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sp-genesis-builder                         = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sp-inherents                               = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sp-io                                      = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sp-keyring                                 = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sp-keystore                                = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sp-offchain                                = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sp-runtime                                 = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sp-session                                 = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sp-staking                                 = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sp-std                                     = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sp-timestamp                               = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sp-transaction-pool                        = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sp-version                                 = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+substrate-build-script-utils               = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+substrate-frame-rpc-system                 = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+substrate-prometheus-endpoint              = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+substrate-test-utils                       = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+substrate-wasm-builder                     = { git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+xcm                                        = { package = "staging-xcm", git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+xcm-builder                                = { package = "staging-xcm-builder", git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+xcm-executor                               = { package = "staging-xcm-executor", git = "https://github.com/darwinia-network/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
 
 [profile.release]
 panic = "unwind"
diff --git a/core/primitives/src/lib.rs b/core/primitives/src/lib.rs
index e7fd1101a..8ddb1d6ad 100644
--- a/core/primitives/src/lib.rs
+++ b/core/primitives/src/lib.rs
@@ -59,30 +59,23 @@ pub type Header = sp_runtime::generic::Header<BlockNumber, Hashing>;
 /// Block type.
 pub type Block = sp_runtime::generic::Block<Header, sp_runtime::OpaqueExtrinsic>;
 
-/// This determines the average expected block time that we are targeting.
-/// Blocks will be produced at a minimum duration defined by `SLOT_DURATION`.
-/// `SLOT_DURATION` is picked up by `pallet_timestamp` which is in turn picked
-/// up by `pallet_aura` to implement `fn slot_duration()`.
-///
-/// Change this to adjust the block time.
-pub const MILLISECS_PER_BLOCK: u64 = 12_000;
 /// Maximum number of blocks simultaneously accepted by the Runtime, not yet included
 /// into the relay chain.
-pub const UNINCLUDED_SEGMENT_CAPACITY: u32 = 1;
+pub const UNINCLUDED_SEGMENT_CAPACITY: u32 = 3;
 /// How many parachain blocks are processed by the relay chain per parent. Limits the
 /// number of blocks authored per slot.
 pub const BLOCK_PROCESSING_VELOCITY: u32 = 1;
 /// Relay chain slot duration, in milliseconds.
-pub const RELAY_CHAIN_SLOT_DURATION_MILLIS: u32 = 6000;
+pub const RELAY_CHAIN_SLOT_DURATION_MILLIS: u32 = 6_000;
 
 // NOTE: Currently it is not possible to change the slot duration after the chain has started.
 //       Attempting to do so will brick block production.
 /// Slot duration.
-pub const SLOT_DURATION: u64 = MILLISECS_PER_BLOCK;
+pub const SLOT_DURATION: u64 = 6_000;
 
 // Time is measured by number of blocks.
 /// 10 blocks.
-pub const MINUTES: BlockNumber = 60_000 / (MILLISECS_PER_BLOCK as BlockNumber);
+pub const MINUTES: BlockNumber = 60_000 / (SLOT_DURATION as BlockNumber);
 /// 600 blocks.
 pub const HOURS: BlockNumber = MINUTES * 60;
 /// 14,400 blocks.
diff --git a/node/Cargo.toml b/node/Cargo.toml
index 186736a80..9e98a0efc 100644
--- a/node/Cargo.toml
+++ b/node/Cargo.toml
@@ -52,6 +52,7 @@ cumulus-client-consensus-common       = { workspace = true }
 cumulus-client-consensus-proposer     = { workspace = true }
 cumulus-client-parachain-inherent     = { workspace = true }
 cumulus-client-service                = { workspace = true }
+cumulus-primitives-aura               = { workspace = true, features = ["std"] }
 cumulus-primitives-core               = { workspace = true, features = ["std"] }
 cumulus-primitives-parachain-inherent = { workspace = true, features = ["std"] }
 cumulus-relay-chain-interface         = { workspace = true }
diff --git a/node/src/command.rs b/node/src/command.rs
index 61b698609..376a433d0 100644
--- a/node/src/command.rs
+++ b/node/src/command.rs
@@ -508,6 +508,7 @@ pub fn run() -> Result<()> {
 					if chain_spec.is_crab() {
 						return service::start_dev_node::<CrabRuntimeApi>(
 							config,
+							id,
 							&eth_rpc_config,
 						)
 						.map_err(Into::into);
@@ -517,6 +518,7 @@ pub fn run() -> Result<()> {
 					if chain_spec.is_darwinia() {
 						return service::start_dev_node::<DarwiniaRuntimeApi>(
 							config,
+							id,
 							&eth_rpc_config,
 						)
 						.map_err(Into::into)
@@ -526,6 +528,7 @@ pub fn run() -> Result<()> {
 					if chain_spec.is_koi() {
 						return service::start_dev_node::<KoiRuntimeApi>(
 							config,
+							id,
 							&eth_rpc_config,
 						)
 						.map_err(Into::into)
diff --git a/node/src/service/mod.rs b/node/src/service/mod.rs
index b78a6d399..1a3590020 100644
--- a/node/src/service/mod.rs
+++ b/node/src/service/mod.rs
@@ -39,10 +39,11 @@ use std::{
 use futures::FutureExt;
 // darwinia
 use dc_primitives::*;
-// substrate
-use sc_client_api::Backend;
+// polkadot-sdk
+use sc_client_api::{Backend, HeaderBackend};
 use sc_consensus::ImportQueue;
 use sc_network::NetworkBlock;
+use sp_core::Encode;
 
 #[cfg(all(feature = "runtime-benchmarks", feature = "evm-tracing"))]
 type HostFunctions = (
@@ -121,7 +122,8 @@ impl IdentifyVariant for Box<dyn sc_service::ChainSpec> {
 
 /// A set of APIs that darwinia-like runtimes must implement.
 pub trait RuntimeApiCollection:
-	cumulus_primitives_core::CollectCollationInfo<Block>
+	cumulus_primitives_aura::AuraUnincludedSegmentApi<Block>
+	+ cumulus_primitives_core::CollectCollationInfo<Block>
 	+ fp_rpc::ConvertTransactionRuntimeApi<Block>
 	+ fp_rpc::EthereumRuntimeRPCApi<Block>
 	+ moonbeam_rpc_primitives_debug::DebugRuntimeApi<Block>
@@ -137,7 +139,8 @@ pub trait RuntimeApiCollection:
 {
 }
 impl<Api> RuntimeApiCollection for Api where
-	Api: cumulus_primitives_core::CollectCollationInfo<Block>
+	Api: cumulus_primitives_aura::AuraUnincludedSegmentApi<Block>
+		+ cumulus_primitives_core::CollectCollationInfo<Block>
 		+ fp_rpc::ConvertTransactionRuntimeApi<Block>
 		+ fp_rpc::EthereumRuntimeRPCApi<Block>
 		+ moonbeam_rpc_primitives_debug::DebugRuntimeApi<Block>
@@ -250,6 +253,7 @@ where
 	RuntimeApi::RuntimeApi: RuntimeApiCollection,
 	SC: FnOnce(
 		Arc<FullClient<RuntimeApi>>,
+		Arc<FullBackend>,
 		ParachainBlockImport<RuntimeApi>,
 		Option<&substrate_prometheus_endpoint::Registry>,
 		Option<sc_telemetry::TelemetryHandle>,
@@ -285,7 +289,6 @@ where
 				telemetry_worker_handle,
 			),
 	} = new_partial::<RuntimeApi>(&parachain_config, eth_rpc_config)?;
-
 	let (relay_chain_interface, collator_key) =
 		cumulus_client_service::build_relay_chain_interface(
 			polkadot_config,
@@ -297,12 +300,10 @@ where
 		)
 		.await
 		.map_err(|e| sc_service::Error::Application(Box::new(e) as Box<_>))?;
-
 	let validator = parachain_config.role.is_authority();
 	let prometheus_registry = parachain_config.prometheus_registry().cloned();
 	let import_queue_service = import_queue.service();
 	let net_config = sc_network::config::FullNetworkConfiguration::new(&parachain_config.network);
-
 	let (network, system_rpc_tx, tx_handler_controller, start_network, sync_service) =
 		cumulus_client_service::build_network(cumulus_client_service::BuildNetworkParams {
 			parachain_config: &parachain_config,
@@ -380,7 +381,6 @@ where
 		let collator = parachain_config.role.is_authority();
 		let eth_rpc_config = eth_rpc_config.clone();
 		let sync_service = sync_service.clone();
-
 		let slot_duration = sc_consensus_aura::slot_duration(&*client)?;
 		let pending_create_inherent_data_providers = move |_, ()| async move {
 			let current = sp_timestamp::InherentDataProvider::from_system_time();
@@ -510,6 +510,7 @@ where
 	if validator {
 		start_consensus(
 			client.clone(),
+			backend.clone(),
 			block_import,
 			prometheus_registry.as_ref(),
 			telemetry.as_ref().map(|t| t.handle()),
@@ -588,6 +589,7 @@ where
 		cumulus_client_service::CollatorSybilResistance::Resistant, // Aura
 		para_id,
 		|client,
+		 backend,
 		 block_import,
 		 prometheus_registry,
 		 telemetry,
@@ -616,11 +618,17 @@ where
 				announce_block,
 				client.clone(),
 			);
-			let params = cumulus_client_consensus_aura::collators::basic::Params {
+			let params = cumulus_client_consensus_aura::collators::lookahead::Params {
 				create_inherent_data_providers: move |_, ()| async move { Ok(()) },
 				block_import,
-				para_client: client,
+				para_client: client.clone(),
+				para_backend: backend.clone(),
 				relay_client: relay_chain_interface,
+				code_hash_provider: move |block_hash| {
+					client.code_at(block_hash).ok().map(|c| {
+						cumulus_primitives_core::relay_chain::ValidationCode::from(c).hash()
+					})
+				},
 				sync_oracle,
 				keystore,
 				collator_key,
@@ -631,10 +639,10 @@ where
 				proposer,
 				collator_service,
 				// Very limited proposal time.
-				authoring_duration: Duration::from_millis(500),
-				collation_request_receiver: None,
+				authoring_duration: Duration::from_millis(1_500),
+				reinitialize: false,
 			};
-			let fut = cumulus_client_consensus_aura::collators::basic::run::<
+			let fut = cumulus_client_consensus_aura::collators::lookahead::run::<
 				Block,
 				sp_consensus_aura::sr25519::AuthorityPair,
 				_,
@@ -644,6 +652,8 @@ where
 				_,
 				_,
 				_,
+				_,
+				_,
 			>(params);
 
 			task_manager.spawn_essential_handle().spawn("aura", None, fut);
@@ -660,17 +670,15 @@ where
 /// !!! WARNING: DO NOT USE ELSEWHERE
 pub fn start_dev_node<RuntimeApi>(
 	mut config: sc_service::Configuration,
+	para_id: cumulus_primitives_core::ParaId,
 	eth_rpc_config: &crate::cli::EthRpcConfig,
 ) -> Result<sc_service::TaskManager, sc_service::error::Error>
 where
-	RuntimeApi: sp_api::ConstructRuntimeApi<Block, FullClient<RuntimeApi>> + Send + Sync + 'static,
+	RuntimeApi: 'static + Send + Sync + sp_api::ConstructRuntimeApi<Block, FullClient<RuntimeApi>>,
 	RuntimeApi::RuntimeApi: RuntimeApiCollection,
 	RuntimeApi::RuntimeApi:
 		sp_consensus_aura::AuraApi<Block, sp_consensus_aura::sr25519::AuthorityId>,
 {
-	// substrate
-	use sc_client_api::HeaderBackend;
-
 	let sc_service::PartialComponents {
 		client,
 		backend,
@@ -691,7 +699,6 @@ where
 			),
 	} = new_partial::<RuntimeApi>(&config, eth_rpc_config)?;
 	let net_config = sc_network::config::FullNetworkConfiguration::new(&config.network);
-
 	let (network, system_rpc_tx, tx_handler_controller, start_network, sync_service) =
 		sc_service::build_network(sc_service::BuildNetworkParams {
 			config: &config,
@@ -729,7 +736,8 @@ where
 	}
 
 	let force_authoring = config.force_authoring;
-	let backoff_authoring_blocks: Option<()> = None;
+	let backoff_authoring_blocks = None::<()>;
+	let slot_duration = sc_consensus_aura::slot_duration(&*client)?;
 	let proposer_factory = sc_basic_authorship::ProposerFactory::new(
 		task_manager.spawn_handle(),
 		client.clone(),
@@ -737,8 +745,6 @@ where
 		None,
 		None,
 	);
-
-	let slot_duration = sc_consensus_aura::slot_duration(&*client)?;
 	let client_for_cidp = client.clone();
 	if config.role.is_authority() {
 		let aura = sc_consensus_aura::start_aura::<
@@ -754,29 +760,31 @@ where
 			_,
 			_,
 		>(sc_consensus_aura::StartAuraParams {
-			slot_duration: sc_consensus_aura::slot_duration(&*client)?,
+			slot_duration,
 			client: client.clone(),
 			select_chain,
 			block_import: instant_finalize::InstantFinalizeBlockImport::new(client.clone()),
 			proposer_factory,
 			create_inherent_data_providers: move |block: Hash, ()| {
-				let current_para_block = client_for_cidp
-					.number(block)
-					.expect("Header lookup should succeed")
-					.expect("Header passed in as parent should be present in backend.");
+				let maybe_current_para_block = client_for_cidp.number(block);
+				let maybe_current_block_head = client_for_cidp.expect_header(block);
 				let client_for_xcm = client_for_cidp.clone();
 
 				async move {
+					let current_para_block = maybe_current_para_block?
+						.ok_or(sp_blockchain::Error::UnknownBlock(block.to_string()))?;
+					let current_para_block_head =
+						Some(polkadot_primitives::HeadData(maybe_current_block_head?.encode()));
 					let timestamp = sp_timestamp::InherentDataProvider::from_system_time();
-
 					let slot = sp_consensus_aura::inherents::InherentDataProvider::from_timestamp_and_slot_duration(
 						*timestamp,
 						slot_duration,
 					);
-
 					let mocked_parachain =
 						cumulus_client_parachain_inherent::MockValidationDataInherentDataProvider {
 							current_para_block,
+							para_id,
+							current_para_block_head,
 							relay_offset: 1000,
 							relay_blocks_per_para_block: 2,
 							para_blocks_per_relay_epoch: 0,
@@ -785,7 +793,6 @@ where
 								&*client_for_xcm,
 								block,
 								Default::default(),
-								Default::default(),
 							),
 							raw_downward_messages: Vec::new(),
 							raw_horizontal_messages: Vec::new(),
@@ -860,8 +867,6 @@ where
 		let collator = config.role.is_authority();
 		let eth_rpc_config = eth_rpc_config.clone();
 		let sync_service = sync_service.clone();
-
-		let slot_duration = sc_consensus_aura::slot_duration(&*client)?;
 		let pending_create_inherent_data_providers = move |_, ()| async move {
 			let current = sp_timestamp::InherentDataProvider::from_system_time();
 			let next_slot = current.timestamp().as_millis() + slot_duration.as_millis();
diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml
index 139cac073..dd0a7e28f 100644
--- a/runtime/common/Cargo.toml
+++ b/runtime/common/Cargo.toml
@@ -19,6 +19,7 @@ dc-primitives              = { workspace = true }
 
 # frontier
 fp-account = { workspace = true }
+fp-evm     = { workspace = true }
 pallet-evm = { workspace = true }
 
 # polkadot-sdk
@@ -51,6 +52,7 @@ std = [
 
 	# frontier
 	"fp-account/std",
+	"fp-evm/std",
 	"pallet-evm/std",
 
 	# polkadot-sdk
diff --git a/runtime/common/src/lib.rs b/runtime/common/src/lib.rs
index cd53f931b..23bac814d 100644
--- a/runtime/common/src/lib.rs
+++ b/runtime/common/src/lib.rs
@@ -24,7 +24,7 @@ pub mod gov_origin;
 pub mod message_queue;
 pub mod migration_helper;
 pub mod pallet_config;
-pub mod xcm_configs;
+pub mod xcm_config;
 
 #[cfg(feature = "test")]
 pub mod test;
@@ -171,9 +171,9 @@ impl frame_support::weights::WeightToFeePolynomial for RefTimeToFee {
 	type Balance = Balance;
 
 	fn polynomial() -> frame_support::weights::WeightToFeeCoefficients<Self::Balance> {
-		// Map base extrinsic weight to 1/200 UNIT.
+		// Map base extrinsic weight to 1/800 UNIT.
 		let p = UNIT;
-		let q = 200
+		let q = 800
 			* Balance::from(
 				frame_support::weights::constants::ExtrinsicBaseWeight::get().ref_time(),
 			);
diff --git a/runtime/common/src/pallet_config.rs b/runtime/common/src/pallet_config.rs
index c3280b78d..52d0b8098 100644
--- a/runtime/common/src/pallet_config.rs
+++ b/runtime/common/src/pallet_config.rs
@@ -1,22 +1,83 @@
 // darwinia
 use dc_primitives::*;
 // substrate
+use sp_core::U256;
 use sp_runtime::traits::AccountIdConversion;
 use sp_std::prelude::*;
 
+/// We assume that ~5% of the block weight is consumed by `on_initialize` handlers. This is
+/// used to limit the maximal weight of a single extrinsic.
+const AVERAGE_ON_INITIALIZE_RATIO: sp_runtime::Perbill = sp_runtime::Perbill::from_percent(5);
+/// We allow `Normal` extrinsics to fill up the block up to 75%, the rest can be used by
+/// `Operational` extrinsics.
+pub const NORMAL_DISPATCH_RATIO: sp_runtime::Perbill = sp_runtime::Perbill::from_percent(75);
+/// We allow for 0.5 of a second of compute with a 12 second average block time.
+const WEIGHT_MILLISECS_PER_BLOCK: u64 = 500;
+pub const MAXIMUM_BLOCK_WEIGHT: frame_support::weights::Weight =
+	frame_support::weights::Weight::from_parts(
+		frame_support::weights::constants::WEIGHT_REF_TIME_PER_SECOND.saturating_mul(2),
+		cumulus_primitives_core::relay_chain::MAX_POV_SIZE as u64,
+	);
+
 #[cfg(not(feature = "runtime-benchmarks"))]
-pub const EXISTENTIAL_DEPOSIT: Balance = 0;
+const EXISTENTIAL_DEPOSIT: Balance = 0;
 #[cfg(feature = "runtime-benchmarks")]
-pub const EXISTENTIAL_DEPOSIT: Balance = 1;
+const EXISTENTIAL_DEPOSIT: Balance = 1;
 
-frame_support::parameter_types! {
-	pub const TreasuryPid: frame_support::PalletId = frame_support::PalletId(*b"da/trsry");
+const BLOCK_GAS_LIMIT: u64 = 20_000_000;
 
+frame_support::parameter_types! {
 	pub const ExistentialDeposit: Balance = EXISTENTIAL_DEPOSIT;
 	pub const MaxBalance: Balance = Balance::max_value();
 
+	// Retry a scheduled item every 10 blocks (1 minute) until the preimage exists.
+	pub const NoPreimagePostponement: Option<u32> = Some(10);
+
+	pub const TreasuryPid: frame_support::PalletId = frame_support::PalletId(*b"da/trsry");
+
 	pub const RelayOrigin: cumulus_primitives_core::AggregateMessageOrigin = cumulus_primitives_core::AggregateMessageOrigin::Parent;
 
-	pub  AssetCreators: Vec<AccountId> = vec![super::gov_origin::ROOT];
+	pub const ReservedXcmpWeight: frame_support::weights::Weight = MAXIMUM_BLOCK_WEIGHT.saturating_div(4);
+	pub const ReservedDmpWeight: frame_support::weights::Weight = MAXIMUM_BLOCK_WEIGHT.saturating_div(4);
+
+	pub RuntimeBlockLength: frame_system::limits::BlockLength =
+		frame_system::limits::BlockLength::max_with_normal_ratio(5 * 1024 * 1024, NORMAL_DISPATCH_RATIO);
+	pub RuntimeBlockWeights: frame_system::limits::BlockWeights = frame_system::limits::BlockWeights::builder()
+		.base_block(frame_support::weights::constants::BlockExecutionWeight::get())
+		.for_class(frame_support::dispatch::DispatchClass::all(), |weights| {
+			weights.base_extrinsic = frame_support::weights::constants::ExtrinsicBaseWeight::get();
+		})
+		.for_class(frame_support::dispatch::DispatchClass::Normal, |weights| {
+			weights.max_total = Some(NORMAL_DISPATCH_RATIO * MAXIMUM_BLOCK_WEIGHT);
+		})
+		.for_class(frame_support::dispatch::DispatchClass::Operational, |weights| {
+			weights.max_total = Some(MAXIMUM_BLOCK_WEIGHT);
+			// Operational transactions have some extra reserved space, so that they
+			// are included even if block reached `MAXIMUM_BLOCK_WEIGHT`.
+			weights.reserved = Some(
+				MAXIMUM_BLOCK_WEIGHT - NORMAL_DISPATCH_RATIO * MAXIMUM_BLOCK_WEIGHT
+			);
+		})
+		.avg_block_initialization(AVERAGE_ON_INITIALIZE_RATIO)
+		.build_or_panic();
+
+	pub MaximumSchedulerWeight: frame_support::weights::Weight = sp_runtime::Perbill::from_percent(80)
+		* RuntimeBlockWeights::get().max_block;
+
+	pub AssetCreators: Vec<AccountId> = vec![super::gov_origin::ROOT];
 	pub TreasuryAccount: AccountId = TreasuryPid::get().into_account_truncating();
+
+	pub MaxProposalWeight: frame_support::weights::Weight = sp_runtime::Perbill::from_percent(50) * RuntimeBlockWeights::get().max_block;
+
+	pub MessageQueueServiceWeight: frame_support::weights::Weight = sp_runtime::Perbill::from_percent(35) * RuntimeBlockWeights::get().max_block;
+
+	pub BlockGasLimit: U256 = U256::from(BLOCK_GAS_LIMIT);
+	// Restrict the POV size of the Ethereum transactions in the same way as weight limit.
+	pub BlockPovSizeLimit: u64 = NORMAL_DISPATCH_RATIO * cumulus_primitives_core::relay_chain::MAX_POV_SIZE as u64;
+	pub WeightPerGas: frame_support::weights::Weight = frame_support::weights::Weight::from_parts(
+		fp_evm::weight_per_gas(BLOCK_GAS_LIMIT, NORMAL_DISPATCH_RATIO, WEIGHT_MILLISECS_PER_BLOCK * 4),
+		0
+	);
+	// TODO: FIX ME. https://github.com/rust-lang/rust/issues/88581
+	pub GasLimitPovSizeRatio: u64 = BLOCK_GAS_LIMIT.saturating_div(BlockPovSizeLimit::get()) + 1;
 }
diff --git a/runtime/common/src/xcm_configs.rs b/runtime/common/src/xcm_config.rs
similarity index 100%
rename from runtime/common/src/xcm_configs.rs
rename to runtime/common/src/xcm_config.rs
diff --git a/runtime/crab/Cargo.toml b/runtime/crab/Cargo.toml
index bb099dd32..a81a0b0af 100644
--- a/runtime/crab/Cargo.toml
+++ b/runtime/crab/Cargo.toml
@@ -12,11 +12,10 @@ substrate-wasm-builder = { workspace = true, optional = true }
 
 [dependencies]
 # crates.io
-codec             = { workspace = true, package = "parity-scale-codec" }
-log               = { workspace = true }
-scale-info        = { workspace = true }
-static_assertions = { workspace = true }
-strum             = { workspace = true, features = ["derive"] }
+codec      = { workspace = true, package = "parity-scale-codec" }
+log        = { workspace = true }
+scale-info = { workspace = true }
+strum      = { workspace = true, features = ["derive"] }
 # crates.io optional
 # TODO: optional
 array-bytes = { workspace = true }
@@ -58,6 +57,7 @@ cumulus-pallet-dmp-queue                   = { workspace = true }
 cumulus-pallet-parachain-system            = { workspace = true }
 cumulus-pallet-xcm                         = { workspace = true }
 cumulus-pallet-xcmp-queue                  = { workspace = true }
+cumulus-primitives-aura                    = { workspace = true }
 cumulus-primitives-core                    = { workspace = true }
 cumulus-primitives-utility                 = { workspace = true }
 frame-executive                            = { workspace = true }
@@ -164,6 +164,7 @@ std = [
 	"cumulus-pallet-parachain-system/std",
 	"cumulus-pallet-xcm/std",
 	"cumulus-pallet-xcmp-queue/std",
+	"cumulus-primitives-aura/std",
 	"cumulus-primitives-core/std",
 	"cumulus-primitives-utility/std",
 	"frame-executive/std",
diff --git a/runtime/crab/src/lib.rs b/runtime/crab/src/lib.rs
index 3c68857ee..394f6c160 100644
--- a/runtime/crab/src/lib.rs
+++ b/runtime/crab/src/lib.rs
@@ -344,6 +344,15 @@ sp_api::impl_runtime_apis! {
 		}
 	}
 
+	impl cumulus_primitives_aura::AuraUnincludedSegmentApi<Block> for Runtime {
+		fn can_build_upon(
+			included_hash: <Block as sp_runtime::traits::Block>::Hash,
+			slot: cumulus_primitives_aura::Slot,
+		) -> bool {
+			ConsensusHook::can_build_upon(included_hash, slot)
+		}
+	}
+
 	impl fp_rpc::EthereumRuntimeRPCApi<Block> for Runtime {
 		fn chain_id() -> u64 {
 			<<Runtime as pallet_evm::Config>::ChainId as sp_core::Get<u64>>::get()
diff --git a/runtime/crab/src/pallets.rs b/runtime/crab/src/pallets.rs
index 016b69359..0326da3c2 100644
--- a/runtime/crab/src/pallets.rs
+++ b/runtime/crab/src/pallets.rs
@@ -26,7 +26,6 @@ pub use shared_imports::*;
 
 // System stuffs.
 mod system;
-pub use system::*;
 
 mod parachain_system;
 
@@ -57,8 +56,7 @@ mod session;
 pub use session::*;
 
 mod aura;
-
-mod aura_ext;
+pub use aura::*;
 
 // Governance stuff.
 mod governance;
diff --git a/runtime/crab/src/pallets/aura.rs b/runtime/crab/src/pallets/aura.rs
index 7cddfe41c..c390c5c06 100644
--- a/runtime/crab/src/pallets/aura.rs
+++ b/runtime/crab/src/pallets/aura.rs
@@ -19,9 +19,19 @@
 // darwinia
 use crate::*;
 
+pub type ConsensusHook = cumulus_pallet_aura_ext::FixedVelocityConsensusHook<
+	Runtime,
+	RELAY_CHAIN_SLOT_DURATION_MILLIS,
+	BLOCK_PROCESSING_VELOCITY,
+	UNINCLUDED_SEGMENT_CAPACITY,
+>;
+
 impl pallet_aura::Config for Runtime {
-	type AllowMultipleBlocksPerSlot = ConstBool<false>;
+	type AllowMultipleBlocksPerSlot = ConstBool<true>;
 	type AuthorityId = sp_consensus_aura::sr25519::AuthorityId;
 	type DisabledValidators = ();
 	type MaxAuthorities = ConstU32<100_000>;
+	type SlotDuration = ConstU64<SLOT_DURATION>;
 }
+
+impl cumulus_pallet_aura_ext::Config for Runtime {}
diff --git a/runtime/crab/src/pallets/aura_ext.rs b/runtime/crab/src/pallets/aura_ext.rs
deleted file mode 100644
index 4f6c6044c..000000000
--- a/runtime/crab/src/pallets/aura_ext.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-// This file is part of Darwinia.
-//
-// Copyright (C) Darwinia Network
-// SPDX-License-Identifier: GPL-3.0
-//
-// Darwinia is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Darwinia is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Darwinia. If not, see <https://www.gnu.org/licenses/>.
-
-// darwinia
-use crate::*;
-
-impl cumulus_pallet_aura_ext::Config for Runtime {}
diff --git a/runtime/crab/src/pallets/evm.rs b/runtime/crab/src/pallets/evm.rs
index 33f76b7cd..3f4cf8145 100644
--- a/runtime/crab/src/pallets/evm.rs
+++ b/runtime/crab/src/pallets/evm.rs
@@ -18,25 +18,14 @@
 
 // darwinia
 use crate::*;
-// substrate
-use cumulus_primitives_core::relay_chain::MAX_POV_SIZE;
-use frame_support::dispatch::{DispatchClass, GetDispatchInfo, Pays};
 // frontier
 use pallet_evm::{ExitError, IsPrecompileResult, Precompile};
 use pallet_evm_precompile_dispatch::DispatchValidateT;
+// polkadot-sdk
+use frame_support::dispatch::{DispatchClass, GetDispatchInfo, Pays};
 
-const BLOCK_GAS_LIMIT: u64 = 20_000_000;
 frame_support::parameter_types! {
-	pub BlockGasLimit: U256 = U256::from(BLOCK_GAS_LIMIT);
-	// Restrict the POV size of the Ethereum transactions in the same way as weight limit.
-	pub BlockPovSizeLimit: u64 = NORMAL_DISPATCH_RATIO * MAX_POV_SIZE as u64;
 	pub PrecompilesValue: CrabPrecompiles<Runtime> = CrabPrecompiles::<_>::new();
-	pub WeightPerGas: frame_support::weights::Weight = frame_support::weights::Weight::from_parts(
-		fp_evm::weight_per_gas(BLOCK_GAS_LIMIT, NORMAL_DISPATCH_RATIO, WEIGHT_MILLISECS_PER_BLOCK),
-		0
-	);
-	// TODO: FIX ME. https://github.com/rust-lang/rust/issues/88581
-	pub GasLimitPovSizeRatio: u64 = BLOCK_GAS_LIMIT.saturating_div(BlockPovSizeLimit::get()) + 1;
 }
 
 pub struct CrabPrecompiles<R>(core::marker::PhantomData<R>);
@@ -148,7 +137,7 @@ impl pallet_evm::FeeCalculator for TransactionPaymentGasPrice {
 			TransactionPayment::next_fee_multiplier()
 				.saturating_mul_int::<Balance>(
 					<Runtime as pallet_transaction_payment::Config>::WeightToFee::weight_to_fee(
-						&WeightPerGas::get(),
+						&pallet_config::WeightPerGas::get(),
 					),
 				)
 				.into(),
@@ -194,14 +183,14 @@ fn addr(a: u64) -> H160 {
 
 impl pallet_evm::Config for Runtime {
 	type AddressMapping = pallet_evm::IdentityAddressMapping;
-	type BlockGasLimit = BlockGasLimit;
+	type BlockGasLimit = pallet_config::BlockGasLimit;
 	type BlockHashMapping = pallet_ethereum::EthereumBlockHashMapping<Self>;
 	type CallOrigin = pallet_evm::EnsureAddressRoot<Self::AccountId>;
 	type ChainId = ConstU64<44>;
 	type Currency = Balances;
 	type FeeCalculator = TransactionPaymentGasPrice;
 	type FindAuthor = FindAuthor<pallet_session::FindAccountFromAuthorIndex<Self, Aura>>;
-	type GasLimitPovSizeRatio = GasLimitPovSizeRatio;
+	type GasLimitPovSizeRatio = pallet_config::GasLimitPovSizeRatio;
 	type GasWeightMapping = pallet_evm::FixedGasWeightMapping<Self>;
 	type OnChargeTransaction = pallet_evm::EVMFungibleAdapter<Balances, ()>;
 	type OnCreate = ();
@@ -213,6 +202,6 @@ impl pallet_evm::Config for Runtime {
 	type Timestamp = Timestamp;
 	// type WeightInfo = ();
 	type WeightInfo = ();
-	type WeightPerGas = WeightPerGas;
+	type WeightPerGas = pallet_config::WeightPerGas;
 	type WithdrawOrigin = pallet_evm::EnsureAddressNever<Self::AccountId>;
 }
diff --git a/runtime/crab/src/pallets/governance.rs b/runtime/crab/src/pallets/governance.rs
index 989819fa2..c3b446ba9 100644
--- a/runtime/crab/src/pallets/governance.rs
+++ b/runtime/crab/src/pallets/governance.rs
@@ -27,21 +27,10 @@ pub use pallet_collective::Instance2 as TechnicalCollective;
 
 pub(super) use crate::*;
 
-pub const COLLECTIVE_DESIRED_MEMBERS: u32 = 7;
-pub const COLLECTIVE_MAX_MEMBERS: u32 = 100;
-pub const COLLECTIVE_MAX_PROPOSALS: u32 = 100;
-
-// Make sure that there are no more than `COLLECTIVE_MAX_MEMBERS` members elected via phragmen.
-static_assertions::const_assert!(COLLECTIVE_DESIRED_MEMBERS <= COLLECTIVE_MAX_MEMBERS);
-
-frame_support::parameter_types! {
-	pub MaxProposalWeight: frame_support::weights::Weight = sp_runtime::Perbill::from_percent(50) * RuntimeBlockWeights::get().max_block;
-}
-
 impl pallet_collective::Config<TechnicalCollective> for Runtime {
 	type DefaultVote = pallet_collective::PrimeDefaultVote;
-	type MaxMembers = ConstU32<COLLECTIVE_MAX_MEMBERS>;
-	type MaxProposalWeight = MaxProposalWeight;
+	type MaxMembers = ConstU32<100>;
+	type MaxProposalWeight = pallet_config::MaxProposalWeight;
 	type MaxProposals = ConstU32<100>;
 	type MotionDuration = ConstU32<{ 3 * DAYS }>;
 	type Proposal = RuntimeCall;
diff --git a/runtime/crab/src/pallets/message_queue.rs b/runtime/crab/src/pallets/message_queue.rs
index f54e011fe..fce765f47 100644
--- a/runtime/crab/src/pallets/message_queue.rs
+++ b/runtime/crab/src/pallets/message_queue.rs
@@ -19,10 +19,6 @@
 // darwinia
 use crate::*;
 
-frame_support::parameter_types! {
-	pub MessageQueueServiceWeight: frame_support::weights::Weight = sp_runtime::Perbill::from_percent(35) * RuntimeBlockWeights::get().max_block;
-}
-
 impl pallet_message_queue::Config for Runtime {
 	type HeapSize = sp_core::ConstU32<{ 64 * 1024 }>;
 	type MaxStale = sp_core::ConstU32<8>;
@@ -40,7 +36,7 @@ impl pallet_message_queue::Config for Runtime {
 	type QueueChangeHandler = message_queue::NarrowOriginToSibling<XcmpQueue>;
 	type QueuePausedQuery = message_queue::NarrowOriginToSibling<XcmpQueue>;
 	type RuntimeEvent = RuntimeEvent;
-	type ServiceWeight = MessageQueueServiceWeight;
+	type ServiceWeight = pallet_config::MessageQueueServiceWeight;
 	type Size = u32;
 	// type WeightInfo = ();
 	type WeightInfo = ();
diff --git a/runtime/crab/src/pallets/parachain_system.rs b/runtime/crab/src/pallets/parachain_system.rs
index 340fdf352..d151115c6 100644
--- a/runtime/crab/src/pallets/parachain_system.rs
+++ b/runtime/crab/src/pallets/parachain_system.rs
@@ -19,19 +19,16 @@
 // darwinia
 use crate::*;
 
-frame_support::parameter_types! {
-	pub const ReservedXcmpWeight: frame_support::weights::Weight = MAXIMUM_BLOCK_WEIGHT.saturating_div(4);
-	pub const ReservedDmpWeight: frame_support::weights::Weight = MAXIMUM_BLOCK_WEIGHT.saturating_div(4);
-}
-
 impl cumulus_pallet_parachain_system::Config for Runtime {
-	type CheckAssociatedRelayNumber = cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases;
+	type CheckAssociatedRelayNumber =
+		cumulus_pallet_parachain_system::RelayNumberMonotonicallyIncreases;
+	type ConsensusHook = ConsensusHook;
 	type DmpQueue =
 		frame_support::traits::EnqueueWithOrigin<MessageQueue, pallet_config::RelayOrigin>;
 	type OnSystemEvent = ();
 	type OutboundXcmpMessageSource = XcmpQueue;
-	type ReservedDmpWeight = ReservedDmpWeight;
-	type ReservedXcmpWeight = ReservedXcmpWeight;
+	type ReservedDmpWeight = pallet_config::ReservedDmpWeight;
+	type ReservedXcmpWeight = pallet_config::ReservedXcmpWeight;
 	type RuntimeEvent = RuntimeEvent;
 	type SelfParaId = parachain_info::Pallet<Self>;
 	type WeightInfo = ();
diff --git a/runtime/crab/src/pallets/polkadot_xcm.rs b/runtime/crab/src/pallets/polkadot_xcm.rs
index aeb848eef..4e963898e 100644
--- a/runtime/crab/src/pallets/polkadot_xcm.rs
+++ b/runtime/crab/src/pallets/polkadot_xcm.rs
@@ -63,7 +63,7 @@ pub type LocationToAccountId = (
 	// Straight up local `AccountId20` origins just alias directly to `AccountId`.
 	xcm_builder::AccountKey20Aliases<RelayNetwork, AccountId>,
 	// The rest of locations are converted via hashing it.
-	xcm_configs::Account20Hash<AccountId>,
+	xcm_config::Account20Hash<AccountId>,
 );
 /// This is the type we use to convert an (incoming) XCM origin into a local `Origin` instance,
 /// ready for dispatching a transaction with Xcm's `Transact`. There is an `OriginKind` which can
@@ -97,11 +97,9 @@ pub type Barrier = xcm_builder::TrailingSetTopicAsId<
 					xcm_builder::AllowTopLevelPaidExecutionFrom<frame_support::traits::Everything>,
 					// Parent, its pluralities (i.e. governance bodies), and the Fellows plurality
 					// get free execution.
-					xcm_builder::AllowUnpaidExecutionFrom<xcm_configs::ParentOrParentsPlurality>,
+					xcm_builder::AllowUnpaidExecutionFrom<xcm_config::ParentOrParentsPlurality>,
 					// Subscriptions for version tracking are OK.
-					xcm_builder::AllowSubscriptionsFrom<
-						xcm_configs::ParentRelayOrSiblingParachains,
-					>,
+					xcm_builder::AllowSubscriptionsFrom<xcm_config::ParentRelayOrSiblingParachains>,
 				),
 				UniversalLocation,
 				ConstU32<8>,
diff --git a/runtime/crab/src/pallets/scheduler.rs b/runtime/crab/src/pallets/scheduler.rs
index 30bbdd8e7..3ac4d4fc7 100644
--- a/runtime/crab/src/pallets/scheduler.rs
+++ b/runtime/crab/src/pallets/scheduler.rs
@@ -48,16 +48,9 @@ impl frame_support::traits::PrivilegeCmp<OriginCaller> for OriginPrivilegeCmp {
 	}
 }
 
-frame_support::parameter_types! {
-	pub MaximumSchedulerWeight: frame_support::weights::Weight = sp_runtime::Perbill::from_percent(80)
-		* RuntimeBlockWeights::get().max_block;
-	// Retry a scheduled item every 10 blocks (1 minute) until the preimage exists.
-	pub const NoPreimagePostponement: Option<u32> = Some(10);
-}
-
 impl pallet_scheduler::Config for Runtime {
 	type MaxScheduledPerBlock = ConstU32<50>;
-	type MaximumWeight = MaximumSchedulerWeight;
+	type MaximumWeight = pallet_config::MaximumSchedulerWeight;
 	type OriginPrivilegeCmp = OriginPrivilegeCmp;
 	type PalletsOrigin = OriginCaller;
 	type Preimages = Preimage;
diff --git a/runtime/crab/src/pallets/system.rs b/runtime/crab/src/pallets/system.rs
index 3be5a557f..8598fa504 100644
--- a/runtime/crab/src/pallets/system.rs
+++ b/runtime/crab/src/pallets/system.rs
@@ -21,44 +21,8 @@ use crate::*;
 // polkadot-sdk
 use frame_support::derive_impl;
 
-/// We assume that ~5% of the block weight is consumed by `on_initialize` handlers. This is
-/// used to limit the maximal weight of a single extrinsic.
-pub const AVERAGE_ON_INITIALIZE_RATIO: sp_runtime::Perbill = sp_runtime::Perbill::from_percent(5);
-
-/// We allow `Normal` extrinsics to fill up the block up to 75%, the rest can be used by
-/// `Operational` extrinsics.
-pub const NORMAL_DISPATCH_RATIO: sp_runtime::Perbill = sp_runtime::Perbill::from_percent(75);
-
-/// We allow for 0.5 of a second of compute with a 12 second average block time.
-pub const WEIGHT_MILLISECS_PER_BLOCK: u64 = 500;
-pub const MAXIMUM_BLOCK_WEIGHT: frame_support::weights::Weight =
-	frame_support::weights::Weight::from_parts(
-		frame_support::weights::constants::WEIGHT_REF_TIME_PER_MILLIS * WEIGHT_MILLISECS_PER_BLOCK,
-		cumulus_primitives_core::relay_chain::MAX_POV_SIZE as u64,
-	);
-
 frame_support::parameter_types! {
 	pub const Version: sp_version::RuntimeVersion = VERSION;
-	pub RuntimeBlockLength: frame_system::limits::BlockLength =
-		frame_system::limits::BlockLength::max_with_normal_ratio(5 * 1024 * 1024, NORMAL_DISPATCH_RATIO);
-	pub RuntimeBlockWeights: frame_system::limits::BlockWeights = frame_system::limits::BlockWeights::builder()
-		.base_block(frame_support::weights::constants::BlockExecutionWeight::get())
-		.for_class(frame_support::dispatch::DispatchClass::all(), |weights| {
-			weights.base_extrinsic = frame_support::weights::constants::ExtrinsicBaseWeight::get();
-		})
-		.for_class(frame_support::dispatch::DispatchClass::Normal, |weights| {
-			weights.max_total = Some(NORMAL_DISPATCH_RATIO * MAXIMUM_BLOCK_WEIGHT);
-		})
-		.for_class(frame_support::dispatch::DispatchClass::Operational, |weights| {
-			weights.max_total = Some(MAXIMUM_BLOCK_WEIGHT);
-			// Operational transactions have some extra reserved space, so that they
-			// are included even if block reached `MAXIMUM_BLOCK_WEIGHT`.
-			weights.reserved = Some(
-				MAXIMUM_BLOCK_WEIGHT - NORMAL_DISPATCH_RATIO * MAXIMUM_BLOCK_WEIGHT
-			);
-		})
-		.avg_block_initialization(AVERAGE_ON_INITIALIZE_RATIO)
-		.build_or_panic();
 }
 
 #[derive_impl(frame_system::config_preludes::ParaChainDefaultConfig as frame_system::DefaultConfig)]
@@ -67,8 +31,8 @@ impl frame_system::Config for Runtime {
 	type AccountId = AccountId;
 	type BaseCallFilter = TxPause;
 	type Block = Block;
-	type BlockLength = RuntimeBlockLength;
-	type BlockWeights = RuntimeBlockWeights;
+	type BlockLength = pallet_config::RuntimeBlockLength;
+	type BlockWeights = pallet_config::RuntimeBlockWeights;
 	type DbWeight = frame_support::weights::constants::RocksDbWeight;
 	type Lookup = sp_runtime::traits::IdentityLookup<Self::AccountId>;
 	type MaxConsumers = ConstU32<16>;
diff --git a/runtime/crab/src/pallets/timestamp.rs b/runtime/crab/src/pallets/timestamp.rs
index 06e83fa2f..f6bbcb561 100644
--- a/runtime/crab/src/pallets/timestamp.rs
+++ b/runtime/crab/src/pallets/timestamp.rs
@@ -20,7 +20,7 @@
 use crate::*;
 
 impl pallet_timestamp::Config for Runtime {
-	type MinimumPeriod = ConstU64<{ SLOT_DURATION / 2 }>;
+	type MinimumPeriod = ();
 	/// A timestamp: milliseconds since the unix epoch.
 	type Moment = u64;
 	#[cfg(not(feature = "runtime-benchmarks"))]
diff --git a/runtime/darwinia/Cargo.toml b/runtime/darwinia/Cargo.toml
index d40621227..75c9a1416 100644
--- a/runtime/darwinia/Cargo.toml
+++ b/runtime/darwinia/Cargo.toml
@@ -12,11 +12,10 @@ substrate-wasm-builder = { workspace = true, optional = true }
 
 [dependencies]
 # crates.io
-codec             = { workspace = true, package = "parity-scale-codec" }
-log               = { workspace = true }
-scale-info        = { workspace = true }
-static_assertions = { workspace = true }
-strum             = { workspace = true, features = ["derive"] }
+codec      = { workspace = true, package = "parity-scale-codec" }
+log        = { workspace = true }
+scale-info = { workspace = true }
+strum      = { workspace = true, features = ["derive"] }
 # crates.io optional
 # TODO: optional
 array-bytes = { workspace = true }
@@ -66,6 +65,7 @@ cumulus-pallet-dmp-queue                   = { workspace = true }
 cumulus-pallet-parachain-system            = { workspace = true }
 cumulus-pallet-xcm                         = { workspace = true }
 cumulus-pallet-xcmp-queue                  = { workspace = true }
+cumulus-primitives-aura                    = { workspace = true }
 cumulus-primitives-core                    = { workspace = true }
 cumulus-primitives-utility                 = { workspace = true }
 frame-executive                            = { workspace = true }
@@ -180,6 +180,7 @@ std = [
 	"cumulus-pallet-parachain-system/std",
 	"cumulus-pallet-xcm/std",
 	"cumulus-pallet-xcmp-queue/std",
+	"cumulus-primitives-aura/std",
 	"cumulus-primitives-core/std",
 	"cumulus-primitives-utility/std",
 	"frame-executive/std",
diff --git a/runtime/darwinia/src/lib.rs b/runtime/darwinia/src/lib.rs
index 492e9eb96..8bf8ed9ec 100644
--- a/runtime/darwinia/src/lib.rs
+++ b/runtime/darwinia/src/lib.rs
@@ -128,7 +128,7 @@ frame_support::construct_runtime! {
 		// Governance stuff.
 		// PhragmenElection: pallet_elections_phragmen = 21,
 		// TechnicalMembership: pallet_membership::<Instance1> = 22,
-		Council: pallet_collective::<Instance1> = 19,
+		// Council: pallet_collective::<Instance1> = 19,
 		TechnicalCommittee: pallet_collective::<Instance2> = 20,
 		Treasury: pallet_treasury = 23,
 		// Tips: pallet_tips = 24,
@@ -348,6 +348,15 @@ sp_api::impl_runtime_apis! {
 		}
 	}
 
+	impl cumulus_primitives_aura::AuraUnincludedSegmentApi<Block> for Runtime {
+		fn can_build_upon(
+			included_hash: <Block as sp_runtime::traits::Block>::Hash,
+			slot: cumulus_primitives_aura::Slot,
+		) -> bool {
+			ConsensusHook::can_build_upon(included_hash, slot)
+		}
+	}
+
 	impl fp_rpc::EthereumRuntimeRPCApi<Block> for Runtime {
 		fn chain_id() -> u64 {
 			<<Runtime as pallet_evm::Config>::ChainId as sp_core::Get<u64>>::get()
diff --git a/runtime/darwinia/src/pallets.rs b/runtime/darwinia/src/pallets.rs
index 043ba2b05..25df396b8 100644
--- a/runtime/darwinia/src/pallets.rs
+++ b/runtime/darwinia/src/pallets.rs
@@ -26,7 +26,6 @@ pub use shared_imports::*;
 
 // System stuffs.
 mod system;
-pub use system::*;
 
 mod parachain_system;
 
@@ -57,8 +56,7 @@ mod session;
 pub use session::*;
 
 mod aura;
-
-mod aura_ext;
+pub use aura::*;
 
 // Governance stuff.
 mod governance;
diff --git a/runtime/darwinia/src/pallets/asset_manager.rs b/runtime/darwinia/src/pallets/asset_manager.rs
index 537c682c1..be75d1172 100644
--- a/runtime/darwinia/src/pallets/asset_manager.rs
+++ b/runtime/darwinia/src/pallets/asset_manager.rs
@@ -44,7 +44,7 @@ impl pallet_asset_manager::AssetRegistrar<Runtime> for AssetRegistrar {
 	fn create_foreign_asset(
 		asset: AssetId,
 		min_balance: Balance,
-		metadata: xcm_configs::AssetRegistrarMetadata,
+		metadata: xcm_config::AssetRegistrarMetadata,
 		is_sufficient: bool,
 	) -> sp_runtime::DispatchResult {
 		Assets::force_create(
@@ -145,7 +145,7 @@ impl TryFrom<Location> for AssetType {
 impl pallet_asset_manager::Config for Runtime {
 	type AssetId = AssetId;
 	type AssetRegistrar = AssetRegistrar;
-	type AssetRegistrarMetadata = xcm_configs::AssetRegistrarMetadata;
+	type AssetRegistrarMetadata = xcm_config::AssetRegistrarMetadata;
 	type Balance = Balance;
 	type ForeignAssetModifierOrigin = RootOr<GeneralAdmin>;
 	type ForeignAssetType = AssetType;
diff --git a/runtime/darwinia/src/pallets/aura.rs b/runtime/darwinia/src/pallets/aura.rs
index 7cddfe41c..c390c5c06 100644
--- a/runtime/darwinia/src/pallets/aura.rs
+++ b/runtime/darwinia/src/pallets/aura.rs
@@ -19,9 +19,19 @@
 // darwinia
 use crate::*;
 
+pub type ConsensusHook = cumulus_pallet_aura_ext::FixedVelocityConsensusHook<
+	Runtime,
+	RELAY_CHAIN_SLOT_DURATION_MILLIS,
+	BLOCK_PROCESSING_VELOCITY,
+	UNINCLUDED_SEGMENT_CAPACITY,
+>;
+
 impl pallet_aura::Config for Runtime {
-	type AllowMultipleBlocksPerSlot = ConstBool<false>;
+	type AllowMultipleBlocksPerSlot = ConstBool<true>;
 	type AuthorityId = sp_consensus_aura::sr25519::AuthorityId;
 	type DisabledValidators = ();
 	type MaxAuthorities = ConstU32<100_000>;
+	type SlotDuration = ConstU64<SLOT_DURATION>;
 }
+
+impl cumulus_pallet_aura_ext::Config for Runtime {}
diff --git a/runtime/darwinia/src/pallets/aura_ext.rs b/runtime/darwinia/src/pallets/aura_ext.rs
deleted file mode 100644
index 4f6c6044c..000000000
--- a/runtime/darwinia/src/pallets/aura_ext.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-// This file is part of Darwinia.
-//
-// Copyright (C) Darwinia Network
-// SPDX-License-Identifier: GPL-3.0
-//
-// Darwinia is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Darwinia is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Darwinia. If not, see <https://www.gnu.org/licenses/>.
-
-// darwinia
-use crate::*;
-
-impl cumulus_pallet_aura_ext::Config for Runtime {}
diff --git a/runtime/darwinia/src/pallets/evm.rs b/runtime/darwinia/src/pallets/evm.rs
index 3742964d8..3ba6ef1ba 100644
--- a/runtime/darwinia/src/pallets/evm.rs
+++ b/runtime/darwinia/src/pallets/evm.rs
@@ -18,25 +18,14 @@
 
 // darwinia
 use crate::*;
-// substrate
-use cumulus_primitives_core::relay_chain::MAX_POV_SIZE;
-use frame_support::dispatch::{DispatchClass, GetDispatchInfo, Pays};
 // frontier
 use pallet_evm::{ExitError, IsPrecompileResult, Precompile};
 use pallet_evm_precompile_dispatch::DispatchValidateT;
+// polkadot-sdk
+use frame_support::dispatch::{DispatchClass, GetDispatchInfo, Pays};
 
-const BLOCK_GAS_LIMIT: u64 = 20_000_000;
 frame_support::parameter_types! {
-	pub BlockGasLimit: U256 = U256::from(BLOCK_GAS_LIMIT);
-	// Restrict the POV size of the Ethereum transactions in the same way as weight limit.
-	pub BlockPovSizeLimit: u64 = NORMAL_DISPATCH_RATIO * MAX_POV_SIZE as u64;
 	pub PrecompilesValue: DarwiniaPrecompiles<Runtime> = DarwiniaPrecompiles::<_>::new();
-	pub WeightPerGas: frame_support::weights::Weight = frame_support::weights::Weight::from_parts(
-		fp_evm::weight_per_gas(BLOCK_GAS_LIMIT, NORMAL_DISPATCH_RATIO, WEIGHT_MILLISECS_PER_BLOCK),
-		0
-	);
-	// TODO: FIX ME. https://github.com/rust-lang/rust/issues/88581
-	pub GasLimitPovSizeRatio: u64 = BLOCK_GAS_LIMIT.saturating_div(BlockPovSizeLimit::get()) + 1;
 }
 pub struct DarwiniaPrecompiles<R>(core::marker::PhantomData<R>);
 impl<R> DarwiniaPrecompiles<R>
@@ -149,7 +138,7 @@ impl pallet_evm::FeeCalculator for TransactionPaymentGasPrice {
 			TransactionPayment::next_fee_multiplier()
 				.saturating_mul_int::<Balance>(
 					<Runtime as pallet_transaction_payment::Config>::WeightToFee::weight_to_fee(
-						&WeightPerGas::get(),
+						&pallet_config::WeightPerGas::get(),
 					),
 				)
 				.into(),
@@ -195,14 +184,14 @@ fn addr(a: u64) -> H160 {
 
 impl pallet_evm::Config for Runtime {
 	type AddressMapping = pallet_evm::IdentityAddressMapping;
-	type BlockGasLimit = BlockGasLimit;
+	type BlockGasLimit = pallet_config::BlockGasLimit;
 	type BlockHashMapping = pallet_ethereum::EthereumBlockHashMapping<Self>;
 	type CallOrigin = pallet_evm::EnsureAddressRoot<Self::AccountId>;
 	type ChainId = ConstU64<46>;
 	type Currency = Balances;
 	type FeeCalculator = TransactionPaymentGasPrice;
 	type FindAuthor = FindAuthor<pallet_session::FindAccountFromAuthorIndex<Self, Aura>>;
-	type GasLimitPovSizeRatio = GasLimitPovSizeRatio;
+	type GasLimitPovSizeRatio = pallet_config::GasLimitPovSizeRatio;
 	type GasWeightMapping = pallet_evm::FixedGasWeightMapping<Self>;
 	type OnChargeTransaction = pallet_evm::EVMFungibleAdapter<Balances, ()>;
 	type OnCreate = ();
@@ -214,6 +203,6 @@ impl pallet_evm::Config for Runtime {
 	type Timestamp = Timestamp;
 	// type WeightInfo = ();
 	type WeightInfo = ();
-	type WeightPerGas = WeightPerGas;
+	type WeightPerGas = pallet_config::WeightPerGas;
 	type WithdrawOrigin = pallet_evm::EnsureAddressNever<Self::AccountId>;
 }
diff --git a/runtime/darwinia/src/pallets/governance.rs b/runtime/darwinia/src/pallets/governance.rs
index 978b1fa11..9d17f1dc7 100644
--- a/runtime/darwinia/src/pallets/governance.rs
+++ b/runtime/darwinia/src/pallets/governance.rs
@@ -23,38 +23,14 @@ pub use origin::{custom_origins, GeneralAdmin};
 mod track;
 use track::*;
 
-pub use pallet_collective::{Instance1 as CouncilCollective, Instance2 as TechnicalCollective};
+pub use pallet_collective::Instance2 as TechnicalCollective;
 
 pub(super) use crate::*;
 
-pub const COLLECTIVE_DESIRED_MEMBERS: u32 = 7;
-pub const COLLECTIVE_MAX_MEMBERS: u32 = 100;
-pub const COLLECTIVE_MAX_PROPOSALS: u32 = 100;
-
-// Make sure that there are no more than `COLLECTIVE_MAX_MEMBERS` members elected via phragmen.
-static_assertions::const_assert!(COLLECTIVE_DESIRED_MEMBERS <= COLLECTIVE_MAX_MEMBERS);
-
-frame_support::parameter_types! {
-	pub MaxProposalWeight: frame_support::weights::Weight = sp_runtime::Perbill::from_percent(50) * RuntimeBlockWeights::get().max_block;
-}
-
-impl pallet_collective::Config<CouncilCollective> for Runtime {
-	type DefaultVote = pallet_collective::PrimeDefaultVote;
-	type MaxMembers = ConstU32<COLLECTIVE_MAX_MEMBERS>;
-	type MaxProposalWeight = MaxProposalWeight;
-	type MaxProposals = ConstU32<100>;
-	type MotionDuration = ConstU32<{ 3 * DAYS }>;
-	type Proposal = RuntimeCall;
-	type RuntimeEvent = RuntimeEvent;
-	type RuntimeOrigin = RuntimeOrigin;
-	type SetMembersOrigin = RootOr<GeneralAdmin>;
-	// type WeightInfo = weights::pallet_collective::WeightInfo<Self>;
-	type WeightInfo = ();
-}
 impl pallet_collective::Config<TechnicalCollective> for Runtime {
 	type DefaultVote = pallet_collective::PrimeDefaultVote;
-	type MaxMembers = ConstU32<COLLECTIVE_MAX_MEMBERS>;
-	type MaxProposalWeight = MaxProposalWeight;
+	type MaxMembers = ConstU32<100>;
+	type MaxProposalWeight = pallet_config::MaxProposalWeight;
 	type MaxProposals = ConstU32<100>;
 	type MotionDuration = ConstU32<{ 3 * DAYS }>;
 	type Proposal = RuntimeCall;
diff --git a/runtime/darwinia/src/pallets/message_queue.rs b/runtime/darwinia/src/pallets/message_queue.rs
index f54e011fe..fce765f47 100644
--- a/runtime/darwinia/src/pallets/message_queue.rs
+++ b/runtime/darwinia/src/pallets/message_queue.rs
@@ -19,10 +19,6 @@
 // darwinia
 use crate::*;
 
-frame_support::parameter_types! {
-	pub MessageQueueServiceWeight: frame_support::weights::Weight = sp_runtime::Perbill::from_percent(35) * RuntimeBlockWeights::get().max_block;
-}
-
 impl pallet_message_queue::Config for Runtime {
 	type HeapSize = sp_core::ConstU32<{ 64 * 1024 }>;
 	type MaxStale = sp_core::ConstU32<8>;
@@ -40,7 +36,7 @@ impl pallet_message_queue::Config for Runtime {
 	type QueueChangeHandler = message_queue::NarrowOriginToSibling<XcmpQueue>;
 	type QueuePausedQuery = message_queue::NarrowOriginToSibling<XcmpQueue>;
 	type RuntimeEvent = RuntimeEvent;
-	type ServiceWeight = MessageQueueServiceWeight;
+	type ServiceWeight = pallet_config::MessageQueueServiceWeight;
 	type Size = u32;
 	// type WeightInfo = ();
 	type WeightInfo = ();
diff --git a/runtime/darwinia/src/pallets/parachain_system.rs b/runtime/darwinia/src/pallets/parachain_system.rs
index 340fdf352..d151115c6 100644
--- a/runtime/darwinia/src/pallets/parachain_system.rs
+++ b/runtime/darwinia/src/pallets/parachain_system.rs
@@ -19,19 +19,16 @@
 // darwinia
 use crate::*;
 
-frame_support::parameter_types! {
-	pub const ReservedXcmpWeight: frame_support::weights::Weight = MAXIMUM_BLOCK_WEIGHT.saturating_div(4);
-	pub const ReservedDmpWeight: frame_support::weights::Weight = MAXIMUM_BLOCK_WEIGHT.saturating_div(4);
-}
-
 impl cumulus_pallet_parachain_system::Config for Runtime {
-	type CheckAssociatedRelayNumber = cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases;
+	type CheckAssociatedRelayNumber =
+		cumulus_pallet_parachain_system::RelayNumberMonotonicallyIncreases;
+	type ConsensusHook = ConsensusHook;
 	type DmpQueue =
 		frame_support::traits::EnqueueWithOrigin<MessageQueue, pallet_config::RelayOrigin>;
 	type OnSystemEvent = ();
 	type OutboundXcmpMessageSource = XcmpQueue;
-	type ReservedDmpWeight = ReservedDmpWeight;
-	type ReservedXcmpWeight = ReservedXcmpWeight;
+	type ReservedDmpWeight = pallet_config::ReservedDmpWeight;
+	type ReservedXcmpWeight = pallet_config::ReservedXcmpWeight;
 	type RuntimeEvent = RuntimeEvent;
 	type SelfParaId = parachain_info::Pallet<Self>;
 	type WeightInfo = ();
diff --git a/runtime/darwinia/src/pallets/polkadot_xcm.rs b/runtime/darwinia/src/pallets/polkadot_xcm.rs
index 32915032d..ebc2f5141 100644
--- a/runtime/darwinia/src/pallets/polkadot_xcm.rs
+++ b/runtime/darwinia/src/pallets/polkadot_xcm.rs
@@ -88,7 +88,7 @@ pub type LocationToAccountId = (
 	// Straight up local `AccountId20` origins just alias directly to `AccountId`.
 	xcm_builder::AccountKey20Aliases<RelayNetwork, AccountId>,
 	// The rest of locations are converted via hashing it.
-	xcm_configs::Account20Hash<AccountId>,
+	xcm_config::Account20Hash<AccountId>,
 );
 /// This is the type we use to convert an (incoming) XCM origin into a local `Origin` instance,
 /// ready for dispatching a transaction with Xcm's `Transact`. There is an `OriginKind` which can
@@ -122,11 +122,9 @@ pub type Barrier = xcm_builder::TrailingSetTopicAsId<
 					xcm_builder::AllowTopLevelPaidExecutionFrom<frame_support::traits::Everything>,
 					// Parent, its pluralities (i.e. governance bodies), and the Fellows plurality
 					// get free execution.
-					xcm_builder::AllowUnpaidExecutionFrom<xcm_configs::ParentOrParentsPlurality>,
+					xcm_builder::AllowUnpaidExecutionFrom<xcm_config::ParentOrParentsPlurality>,
 					// Subscriptions for version tracking are OK.
-					xcm_builder::AllowSubscriptionsFrom<
-						xcm_configs::ParentRelayOrSiblingParachains,
-					>,
+					xcm_builder::AllowSubscriptionsFrom<xcm_config::ParentRelayOrSiblingParachains>,
 				),
 				UniversalLocation,
 				ConstU32<8>,
diff --git a/runtime/darwinia/src/pallets/proxy.rs b/runtime/darwinia/src/pallets/proxy.rs
index 043e45686..da0983840 100644
--- a/runtime/darwinia/src/pallets/proxy.rs
+++ b/runtime/darwinia/src/pallets/proxy.rs
@@ -74,7 +74,6 @@ impl frame_support::traits::InstanceFilter<RuntimeCall> for ProxyType {
 			ProxyType::Governance => matches!(
 				c,
 				RuntimeCall::ConvictionVoting(..)
-					| RuntimeCall::Council(..)
 					| RuntimeCall::Referenda(..)
 					| RuntimeCall::TechnicalCommittee(..)
 					| RuntimeCall::Treasury(..)
diff --git a/runtime/darwinia/src/pallets/scheduler.rs b/runtime/darwinia/src/pallets/scheduler.rs
index bd7eca465..3ac4d4fc7 100644
--- a/runtime/darwinia/src/pallets/scheduler.rs
+++ b/runtime/darwinia/src/pallets/scheduler.rs
@@ -33,8 +33,14 @@ impl frame_support::traits::PrivilegeCmp<OriginCaller> for OriginPrivilegeCmp {
 				Some(core::cmp::Ordering::Greater),
 			// Check which one has more yes votes.
 			(
-				OriginCaller::Council(pallet_collective::RawOrigin::Members(l_yes_votes, l_count)),
-				OriginCaller::Council(pallet_collective::RawOrigin::Members(r_yes_votes, r_count)),
+				OriginCaller::TechnicalCommittee(pallet_collective::RawOrigin::Members(
+					l_yes_votes,
+					l_count,
+				)),
+				OriginCaller::TechnicalCommittee(pallet_collective::RawOrigin::Members(
+					r_yes_votes,
+					r_count,
+				)),
 			) => Some((l_yes_votes * r_count).cmp(&(r_yes_votes * l_count))),
 			// For every other origin we don't care, as they are not used for `ScheduleOrigin`.
 			_ => None,
@@ -42,16 +48,9 @@ impl frame_support::traits::PrivilegeCmp<OriginCaller> for OriginPrivilegeCmp {
 	}
 }
 
-frame_support::parameter_types! {
-	pub MaximumSchedulerWeight: frame_support::weights::Weight = sp_runtime::Perbill::from_percent(80)
-		* RuntimeBlockWeights::get().max_block;
-	// Retry a scheduled item every 10 blocks (1 minute) until the preimage exists.
-	pub const NoPreimagePostponement: Option<u32> = Some(10);
-}
-
 impl pallet_scheduler::Config for Runtime {
 	type MaxScheduledPerBlock = ConstU32<50>;
-	type MaximumWeight = MaximumSchedulerWeight;
+	type MaximumWeight = pallet_config::MaximumSchedulerWeight;
 	type OriginPrivilegeCmp = OriginPrivilegeCmp;
 	type PalletsOrigin = OriginCaller;
 	type Preimages = Preimage;
diff --git a/runtime/darwinia/src/pallets/system.rs b/runtime/darwinia/src/pallets/system.rs
index 0513bceeb..7825ab56a 100644
--- a/runtime/darwinia/src/pallets/system.rs
+++ b/runtime/darwinia/src/pallets/system.rs
@@ -21,44 +21,8 @@ use crate::*;
 // polkadot-sdk
 use frame_support::derive_impl;
 
-/// We assume that ~5% of the block weight is consumed by `on_initialize` handlers. This is
-/// used to limit the maximal weight of a single extrinsic.
-pub const AVERAGE_ON_INITIALIZE_RATIO: sp_runtime::Perbill = sp_runtime::Perbill::from_percent(5);
-
-/// We allow `Normal` extrinsics to fill up the block up to 75%, the rest can be used by
-/// `Operational` extrinsics.
-pub const NORMAL_DISPATCH_RATIO: sp_runtime::Perbill = sp_runtime::Perbill::from_percent(75);
-
-/// We allow for 0.5 of a second of compute with a 12 second average block time.
-pub const WEIGHT_MILLISECS_PER_BLOCK: u64 = 500;
-pub const MAXIMUM_BLOCK_WEIGHT: frame_support::weights::Weight =
-	frame_support::weights::Weight::from_parts(
-		frame_support::weights::constants::WEIGHT_REF_TIME_PER_MILLIS * WEIGHT_MILLISECS_PER_BLOCK,
-		cumulus_primitives_core::relay_chain::MAX_POV_SIZE as u64,
-	);
-
 frame_support::parameter_types! {
 	pub const Version: sp_version::RuntimeVersion = VERSION;
-	pub RuntimeBlockLength: frame_system::limits::BlockLength =
-		frame_system::limits::BlockLength::max_with_normal_ratio(5 * 1024 * 1024, NORMAL_DISPATCH_RATIO);
-	pub RuntimeBlockWeights: frame_system::limits::BlockWeights = frame_system::limits::BlockWeights::builder()
-		.base_block(frame_support::weights::constants::BlockExecutionWeight::get())
-		.for_class(frame_support::dispatch::DispatchClass::all(), |weights| {
-			weights.base_extrinsic = frame_support::weights::constants::ExtrinsicBaseWeight::get();
-		})
-		.for_class(frame_support::dispatch::DispatchClass::Normal, |weights| {
-			weights.max_total = Some(NORMAL_DISPATCH_RATIO * MAXIMUM_BLOCK_WEIGHT);
-		})
-		.for_class(frame_support::dispatch::DispatchClass::Operational, |weights| {
-			weights.max_total = Some(MAXIMUM_BLOCK_WEIGHT);
-			// Operational transactions have some extra reserved space, so that they
-			// are included even if block reached `MAXIMUM_BLOCK_WEIGHT`.
-			weights.reserved = Some(
-				MAXIMUM_BLOCK_WEIGHT - NORMAL_DISPATCH_RATIO * MAXIMUM_BLOCK_WEIGHT
-			);
-		})
-		.avg_block_initialization(AVERAGE_ON_INITIALIZE_RATIO)
-		.build_or_panic();
 }
 
 #[derive_impl(frame_system::config_preludes::ParaChainDefaultConfig as frame_system::DefaultConfig)]
@@ -67,8 +31,8 @@ impl frame_system::Config for Runtime {
 	type AccountId = AccountId;
 	type BaseCallFilter = frame_support::traits::Everything;
 	type Block = Block;
-	type BlockLength = RuntimeBlockLength;
-	type BlockWeights = RuntimeBlockWeights;
+	type BlockLength = pallet_config::RuntimeBlockLength;
+	type BlockWeights = pallet_config::RuntimeBlockWeights;
 	type DbWeight = frame_support::weights::constants::RocksDbWeight;
 	type Lookup = sp_runtime::traits::IdentityLookup<Self::AccountId>;
 	type MaxConsumers = ConstU32<16>;
diff --git a/runtime/darwinia/src/pallets/timestamp.rs b/runtime/darwinia/src/pallets/timestamp.rs
index 06e83fa2f..f6bbcb561 100644
--- a/runtime/darwinia/src/pallets/timestamp.rs
+++ b/runtime/darwinia/src/pallets/timestamp.rs
@@ -20,7 +20,7 @@
 use crate::*;
 
 impl pallet_timestamp::Config for Runtime {
-	type MinimumPeriod = ConstU64<{ SLOT_DURATION / 2 }>;
+	type MinimumPeriod = ();
 	/// A timestamp: milliseconds since the unix epoch.
 	type Moment = u64;
 	#[cfg(not(feature = "runtime-benchmarks"))]
diff --git a/runtime/koi/Cargo.toml b/runtime/koi/Cargo.toml
index bacd4b054..1e3a27cf2 100644
--- a/runtime/koi/Cargo.toml
+++ b/runtime/koi/Cargo.toml
@@ -12,11 +12,10 @@ substrate-wasm-builder = { workspace = true, optional = true }
 
 [dependencies]
 # crates.io
-codec             = { workspace = true, package = "parity-scale-codec" }
-log               = { workspace = true }
-scale-info        = { workspace = true }
-static_assertions = { workspace = true }
-strum             = { workspace = true, features = ["derive"] }
+codec      = { workspace = true, package = "parity-scale-codec" }
+log        = { workspace = true }
+scale-info = { workspace = true }
+strum      = { workspace = true, features = ["derive"] }
 # crates.io optional
 array-bytes = { workspace = true, optional = true }
 
@@ -64,6 +63,7 @@ cumulus-pallet-dmp-queue                   = { workspace = true }
 cumulus-pallet-parachain-system            = { workspace = true }
 cumulus-pallet-xcm                         = { workspace = true }
 cumulus-pallet-xcmp-queue                  = { workspace = true }
+cumulus-primitives-aura                    = { workspace = true }
 cumulus-primitives-core                    = { workspace = true }
 cumulus-primitives-utility                 = { workspace = true }
 frame-executive                            = { workspace = true }
@@ -178,6 +178,7 @@ std = [
 	"cumulus-pallet-parachain-system/std",
 	"cumulus-pallet-xcm/std",
 	"cumulus-pallet-xcmp-queue/std",
+	"cumulus-primitives-aura/std",
 	"cumulus-primitives-core/std",
 	"cumulus-primitives-utility/std",
 	"frame-executive/std",
diff --git a/runtime/koi/src/lib.rs b/runtime/koi/src/lib.rs
index e6c7d6207..8ab46106a 100644
--- a/runtime/koi/src/lib.rs
+++ b/runtime/koi/src/lib.rs
@@ -336,6 +336,15 @@ sp_api::impl_runtime_apis! {
 		}
 	}
 
+	impl cumulus_primitives_aura::AuraUnincludedSegmentApi<Block> for Runtime {
+		fn can_build_upon(
+			included_hash: <Block as sp_runtime::traits::Block>::Hash,
+			slot: cumulus_primitives_aura::Slot,
+		) -> bool {
+			ConsensusHook::can_build_upon(included_hash, slot)
+		}
+	}
+
 	impl fp_rpc::EthereumRuntimeRPCApi<Block> for Runtime {
 		fn chain_id() -> u64 {
 			<<Runtime as pallet_evm::Config>::ChainId as sp_core::Get<u64>>::get()
diff --git a/runtime/koi/src/pallets.rs b/runtime/koi/src/pallets.rs
index d8bb291d0..1693c6093 100644
--- a/runtime/koi/src/pallets.rs
+++ b/runtime/koi/src/pallets.rs
@@ -26,7 +26,6 @@ pub use shared_imports::*;
 
 // System stuffs.
 mod system;
-pub use system::*;
 
 mod parachain_system;
 
@@ -55,8 +54,7 @@ mod session;
 pub use session::*;
 
 mod aura;
-
-mod aura_ext;
+pub use aura::*;
 
 // Governance stuff.
 mod governance;
diff --git a/runtime/koi/src/pallets/asset_manager.rs b/runtime/koi/src/pallets/asset_manager.rs
index b94c2dba9..ba25866b8 100644
--- a/runtime/koi/src/pallets/asset_manager.rs
+++ b/runtime/koi/src/pallets/asset_manager.rs
@@ -39,7 +39,7 @@ impl pallet_asset_manager::AssetRegistrar<Runtime> for AssetRegistrar {
 	fn create_foreign_asset(
 		asset: AssetId,
 		min_balance: Balance,
-		metadata: xcm_configs::AssetRegistrarMetadata,
+		metadata: xcm_config::AssetRegistrarMetadata,
 		is_sufficient: bool,
 	) -> sp_runtime::DispatchResult {
 		Assets::force_create(
@@ -140,7 +140,7 @@ impl TryFrom<Location> for AssetType {
 impl pallet_asset_manager::Config for Runtime {
 	type AssetId = AssetId;
 	type AssetRegistrar = AssetRegistrar;
-	type AssetRegistrarMetadata = xcm_configs::AssetRegistrarMetadata;
+	type AssetRegistrarMetadata = xcm_config::AssetRegistrarMetadata;
 	type Balance = Balance;
 	type ForeignAssetModifierOrigin = RootOr<GeneralAdmin>;
 	type ForeignAssetType = AssetType;
diff --git a/runtime/koi/src/pallets/aura.rs b/runtime/koi/src/pallets/aura.rs
index 7cddfe41c..c390c5c06 100644
--- a/runtime/koi/src/pallets/aura.rs
+++ b/runtime/koi/src/pallets/aura.rs
@@ -19,9 +19,19 @@
 // darwinia
 use crate::*;
 
+pub type ConsensusHook = cumulus_pallet_aura_ext::FixedVelocityConsensusHook<
+	Runtime,
+	RELAY_CHAIN_SLOT_DURATION_MILLIS,
+	BLOCK_PROCESSING_VELOCITY,
+	UNINCLUDED_SEGMENT_CAPACITY,
+>;
+
 impl pallet_aura::Config for Runtime {
-	type AllowMultipleBlocksPerSlot = ConstBool<false>;
+	type AllowMultipleBlocksPerSlot = ConstBool<true>;
 	type AuthorityId = sp_consensus_aura::sr25519::AuthorityId;
 	type DisabledValidators = ();
 	type MaxAuthorities = ConstU32<100_000>;
+	type SlotDuration = ConstU64<SLOT_DURATION>;
 }
+
+impl cumulus_pallet_aura_ext::Config for Runtime {}
diff --git a/runtime/koi/src/pallets/aura_ext.rs b/runtime/koi/src/pallets/aura_ext.rs
deleted file mode 100644
index 4f6c6044c..000000000
--- a/runtime/koi/src/pallets/aura_ext.rs
+++ /dev/null
@@ -1,22 +0,0 @@
-// This file is part of Darwinia.
-//
-// Copyright (C) Darwinia Network
-// SPDX-License-Identifier: GPL-3.0
-//
-// Darwinia is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-//
-// Darwinia is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-// GNU General Public License for more details.
-//
-// You should have received a copy of the GNU General Public License
-// along with Darwinia. If not, see <https://www.gnu.org/licenses/>.
-
-// darwinia
-use crate::*;
-
-impl cumulus_pallet_aura_ext::Config for Runtime {}
diff --git a/runtime/koi/src/pallets/evm.rs b/runtime/koi/src/pallets/evm.rs
index 1176f33d4..54a006f34 100644
--- a/runtime/koi/src/pallets/evm.rs
+++ b/runtime/koi/src/pallets/evm.rs
@@ -22,21 +22,10 @@ use crate::*;
 use pallet_evm::{ExitError, IsPrecompileResult, Precompile};
 use pallet_evm_precompile_dispatch::DispatchValidateT;
 // polkadot-sdk
-use cumulus_primitives_core::relay_chain::MAX_POV_SIZE;
 use frame_support::dispatch::{DispatchClass, GetDispatchInfo, Pays};
 
-const BLOCK_GAS_LIMIT: u64 = 20_000_000;
 frame_support::parameter_types! {
-	pub BlockGasLimit: U256 = U256::from(BLOCK_GAS_LIMIT);
-	// Restrict the POV size of the Ethereum transactions in the same way as weight limit.
-	pub BlockPovSizeLimit: u64 = NORMAL_DISPATCH_RATIO * MAX_POV_SIZE as u64;
 	pub PrecompilesValue: KoiPrecompiles<Runtime> = KoiPrecompiles::<_>::new();
-	pub WeightPerGas: frame_support::weights::Weight = frame_support::weights::Weight::from_parts(
-		fp_evm::weight_per_gas(BLOCK_GAS_LIMIT, NORMAL_DISPATCH_RATIO, WEIGHT_MILLISECS_PER_BLOCK),
-		0
-	);
-	// TODO: FIX ME. https://github.com/rust-lang/rust/issues/88581
-	pub GasLimitPovSizeRatio: u64 = BLOCK_GAS_LIMIT.saturating_div(BlockPovSizeLimit::get()) + 1;
 }
 
 pub struct KoiPrecompiles<R>(core::marker::PhantomData<R>);
@@ -167,7 +156,7 @@ impl pallet_evm::FeeCalculator for TransactionPaymentGasPrice {
 			TransactionPayment::next_fee_multiplier()
 				.saturating_mul_int::<Balance>(
 					<Runtime as pallet_transaction_payment::Config>::WeightToFee::weight_to_fee(
-						&WeightPerGas::get(),
+						&pallet_config::WeightPerGas::get(),
 					),
 				)
 				.into(),
@@ -213,14 +202,14 @@ fn addr(a: u64) -> H160 {
 
 impl pallet_evm::Config for Runtime {
 	type AddressMapping = pallet_evm::IdentityAddressMapping;
-	type BlockGasLimit = BlockGasLimit;
+	type BlockGasLimit = pallet_config::BlockGasLimit;
 	type BlockHashMapping = pallet_ethereum::EthereumBlockHashMapping<Self>;
 	type CallOrigin = pallet_evm::EnsureAddressRoot<Self::AccountId>;
 	type ChainId = ConstU64<701>;
 	type Currency = Balances;
 	type FeeCalculator = TransactionPaymentGasPrice;
 	type FindAuthor = FindAuthor<pallet_session::FindAccountFromAuthorIndex<Self, Aura>>;
-	type GasLimitPovSizeRatio = GasLimitPovSizeRatio;
+	type GasLimitPovSizeRatio = pallet_config::GasLimitPovSizeRatio;
 	type GasWeightMapping = pallet_evm::FixedGasWeightMapping<Self>;
 	type OnChargeTransaction = pallet_evm::EVMFungibleAdapter<Balances, ()>;
 	type OnCreate = ();
@@ -232,6 +221,6 @@ impl pallet_evm::Config for Runtime {
 	type Timestamp = Timestamp;
 	// type WeightInfo = ();
 	type WeightInfo = ();
-	type WeightPerGas = WeightPerGas;
+	type WeightPerGas = pallet_config::WeightPerGas;
 	type WithdrawOrigin = pallet_evm::EnsureAddressNever<Self::AccountId>;
 }
diff --git a/runtime/koi/src/pallets/governance.rs b/runtime/koi/src/pallets/governance.rs
index 11a003843..f251953fb 100644
--- a/runtime/koi/src/pallets/governance.rs
+++ b/runtime/koi/src/pallets/governance.rs
@@ -33,21 +33,10 @@ fast_runtime_or_not!(TIME_2, BlockNumber, 5 * MINUTES, 20 * MINUTES);
 type Time1 = ConstU32<TIME_1>;
 type Time2 = ConstU32<TIME_2>;
 
-pub const COLLECTIVE_DESIRED_MEMBERS: u32 = 7;
-pub const COLLECTIVE_MAX_MEMBERS: u32 = 100;
-pub const COLLECTIVE_MAX_PROPOSALS: u32 = 100;
-
-// Make sure that there are no more than `COLLECTIVE_MAX_MEMBERS` members elected via phragmen.
-static_assertions::const_assert!(COLLECTIVE_DESIRED_MEMBERS <= COLLECTIVE_MAX_MEMBERS);
-
-frame_support::parameter_types! {
-	pub MaxProposalWeight: frame_support::weights::Weight = sp_runtime::Perbill::from_percent(50) * RuntimeBlockWeights::get().max_block;
-}
-
 impl pallet_collective::Config<TechnicalCollective> for Runtime {
 	type DefaultVote = pallet_collective::PrimeDefaultVote;
-	type MaxMembers = ConstU32<COLLECTIVE_MAX_MEMBERS>;
-	type MaxProposalWeight = MaxProposalWeight;
+	type MaxMembers = ConstU32<100>;
+	type MaxProposalWeight = pallet_config::MaxProposalWeight;
 	type MaxProposals = ConstU32<100>;
 	type MotionDuration = Time1;
 	type Proposal = RuntimeCall;
diff --git a/runtime/koi/src/pallets/message_queue.rs b/runtime/koi/src/pallets/message_queue.rs
index f54e011fe..fce765f47 100644
--- a/runtime/koi/src/pallets/message_queue.rs
+++ b/runtime/koi/src/pallets/message_queue.rs
@@ -19,10 +19,6 @@
 // darwinia
 use crate::*;
 
-frame_support::parameter_types! {
-	pub MessageQueueServiceWeight: frame_support::weights::Weight = sp_runtime::Perbill::from_percent(35) * RuntimeBlockWeights::get().max_block;
-}
-
 impl pallet_message_queue::Config for Runtime {
 	type HeapSize = sp_core::ConstU32<{ 64 * 1024 }>;
 	type MaxStale = sp_core::ConstU32<8>;
@@ -40,7 +36,7 @@ impl pallet_message_queue::Config for Runtime {
 	type QueueChangeHandler = message_queue::NarrowOriginToSibling<XcmpQueue>;
 	type QueuePausedQuery = message_queue::NarrowOriginToSibling<XcmpQueue>;
 	type RuntimeEvent = RuntimeEvent;
-	type ServiceWeight = MessageQueueServiceWeight;
+	type ServiceWeight = pallet_config::MessageQueueServiceWeight;
 	type Size = u32;
 	// type WeightInfo = ();
 	type WeightInfo = ();
diff --git a/runtime/koi/src/pallets/parachain_system.rs b/runtime/koi/src/pallets/parachain_system.rs
index 340fdf352..d151115c6 100644
--- a/runtime/koi/src/pallets/parachain_system.rs
+++ b/runtime/koi/src/pallets/parachain_system.rs
@@ -19,19 +19,16 @@
 // darwinia
 use crate::*;
 
-frame_support::parameter_types! {
-	pub const ReservedXcmpWeight: frame_support::weights::Weight = MAXIMUM_BLOCK_WEIGHT.saturating_div(4);
-	pub const ReservedDmpWeight: frame_support::weights::Weight = MAXIMUM_BLOCK_WEIGHT.saturating_div(4);
-}
-
 impl cumulus_pallet_parachain_system::Config for Runtime {
-	type CheckAssociatedRelayNumber = cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases;
+	type CheckAssociatedRelayNumber =
+		cumulus_pallet_parachain_system::RelayNumberMonotonicallyIncreases;
+	type ConsensusHook = ConsensusHook;
 	type DmpQueue =
 		frame_support::traits::EnqueueWithOrigin<MessageQueue, pallet_config::RelayOrigin>;
 	type OnSystemEvent = ();
 	type OutboundXcmpMessageSource = XcmpQueue;
-	type ReservedDmpWeight = ReservedDmpWeight;
-	type ReservedXcmpWeight = ReservedXcmpWeight;
+	type ReservedDmpWeight = pallet_config::ReservedDmpWeight;
+	type ReservedXcmpWeight = pallet_config::ReservedXcmpWeight;
 	type RuntimeEvent = RuntimeEvent;
 	type SelfParaId = parachain_info::Pallet<Self>;
 	type WeightInfo = ();
diff --git a/runtime/koi/src/pallets/polkadot_xcm.rs b/runtime/koi/src/pallets/polkadot_xcm.rs
index 98dd87838..5ad993b81 100644
--- a/runtime/koi/src/pallets/polkadot_xcm.rs
+++ b/runtime/koi/src/pallets/polkadot_xcm.rs
@@ -90,7 +90,7 @@ pub type LocationToAccountId = (
 	// Straight up local `AccountId20` origins just alias directly to `AccountId`.
 	xcm_builder::AccountKey20Aliases<RelayNetwork, AccountId>,
 	// The rest of locations are converted via hashing it.
-	xcm_configs::Account20Hash<AccountId>,
+	xcm_config::Account20Hash<AccountId>,
 );
 /// This is the type we use to convert an (incoming) XCM origin into a local `Origin` instance,
 /// ready for dispatching a transaction with Xcm's `Transact`. There is an `OriginKind` which can
@@ -125,12 +125,10 @@ pub type Barrier = xcm_builder::TrailingSetTopicAsId<
 					// Parent, its pluralities (i.e. governance bodies), and the Fellows plurality
 					// get free execution.
 					xcm_builder::AllowExplicitUnpaidExecutionFrom<
-						xcm_configs::ParentOrParentsPlurality,
+						xcm_config::ParentOrParentsPlurality,
 					>,
 					// Subscriptions for version tracking are OK.
-					xcm_builder::AllowSubscriptionsFrom<
-						xcm_configs::ParentRelayOrSiblingParachains,
-					>,
+					xcm_builder::AllowSubscriptionsFrom<xcm_config::ParentRelayOrSiblingParachains>,
 				),
 				UniversalLocation,
 				ConstU32<8>,
diff --git a/runtime/koi/src/pallets/scheduler.rs b/runtime/koi/src/pallets/scheduler.rs
index 30bbdd8e7..3ac4d4fc7 100644
--- a/runtime/koi/src/pallets/scheduler.rs
+++ b/runtime/koi/src/pallets/scheduler.rs
@@ -48,16 +48,9 @@ impl frame_support::traits::PrivilegeCmp<OriginCaller> for OriginPrivilegeCmp {
 	}
 }
 
-frame_support::parameter_types! {
-	pub MaximumSchedulerWeight: frame_support::weights::Weight = sp_runtime::Perbill::from_percent(80)
-		* RuntimeBlockWeights::get().max_block;
-	// Retry a scheduled item every 10 blocks (1 minute) until the preimage exists.
-	pub const NoPreimagePostponement: Option<u32> = Some(10);
-}
-
 impl pallet_scheduler::Config for Runtime {
 	type MaxScheduledPerBlock = ConstU32<50>;
-	type MaximumWeight = MaximumSchedulerWeight;
+	type MaximumWeight = pallet_config::MaximumSchedulerWeight;
 	type OriginPrivilegeCmp = OriginPrivilegeCmp;
 	type PalletsOrigin = OriginCaller;
 	type Preimages = Preimage;
diff --git a/runtime/koi/src/pallets/system.rs b/runtime/koi/src/pallets/system.rs
index 3be5a557f..8598fa504 100644
--- a/runtime/koi/src/pallets/system.rs
+++ b/runtime/koi/src/pallets/system.rs
@@ -21,44 +21,8 @@ use crate::*;
 // polkadot-sdk
 use frame_support::derive_impl;
 
-/// We assume that ~5% of the block weight is consumed by `on_initialize` handlers. This is
-/// used to limit the maximal weight of a single extrinsic.
-pub const AVERAGE_ON_INITIALIZE_RATIO: sp_runtime::Perbill = sp_runtime::Perbill::from_percent(5);
-
-/// We allow `Normal` extrinsics to fill up the block up to 75%, the rest can be used by
-/// `Operational` extrinsics.
-pub const NORMAL_DISPATCH_RATIO: sp_runtime::Perbill = sp_runtime::Perbill::from_percent(75);
-
-/// We allow for 0.5 of a second of compute with a 12 second average block time.
-pub const WEIGHT_MILLISECS_PER_BLOCK: u64 = 500;
-pub const MAXIMUM_BLOCK_WEIGHT: frame_support::weights::Weight =
-	frame_support::weights::Weight::from_parts(
-		frame_support::weights::constants::WEIGHT_REF_TIME_PER_MILLIS * WEIGHT_MILLISECS_PER_BLOCK,
-		cumulus_primitives_core::relay_chain::MAX_POV_SIZE as u64,
-	);
-
 frame_support::parameter_types! {
 	pub const Version: sp_version::RuntimeVersion = VERSION;
-	pub RuntimeBlockLength: frame_system::limits::BlockLength =
-		frame_system::limits::BlockLength::max_with_normal_ratio(5 * 1024 * 1024, NORMAL_DISPATCH_RATIO);
-	pub RuntimeBlockWeights: frame_system::limits::BlockWeights = frame_system::limits::BlockWeights::builder()
-		.base_block(frame_support::weights::constants::BlockExecutionWeight::get())
-		.for_class(frame_support::dispatch::DispatchClass::all(), |weights| {
-			weights.base_extrinsic = frame_support::weights::constants::ExtrinsicBaseWeight::get();
-		})
-		.for_class(frame_support::dispatch::DispatchClass::Normal, |weights| {
-			weights.max_total = Some(NORMAL_DISPATCH_RATIO * MAXIMUM_BLOCK_WEIGHT);
-		})
-		.for_class(frame_support::dispatch::DispatchClass::Operational, |weights| {
-			weights.max_total = Some(MAXIMUM_BLOCK_WEIGHT);
-			// Operational transactions have some extra reserved space, so that they
-			// are included even if block reached `MAXIMUM_BLOCK_WEIGHT`.
-			weights.reserved = Some(
-				MAXIMUM_BLOCK_WEIGHT - NORMAL_DISPATCH_RATIO * MAXIMUM_BLOCK_WEIGHT
-			);
-		})
-		.avg_block_initialization(AVERAGE_ON_INITIALIZE_RATIO)
-		.build_or_panic();
 }
 
 #[derive_impl(frame_system::config_preludes::ParaChainDefaultConfig as frame_system::DefaultConfig)]
@@ -67,8 +31,8 @@ impl frame_system::Config for Runtime {
 	type AccountId = AccountId;
 	type BaseCallFilter = TxPause;
 	type Block = Block;
-	type BlockLength = RuntimeBlockLength;
-	type BlockWeights = RuntimeBlockWeights;
+	type BlockLength = pallet_config::RuntimeBlockLength;
+	type BlockWeights = pallet_config::RuntimeBlockWeights;
 	type DbWeight = frame_support::weights::constants::RocksDbWeight;
 	type Lookup = sp_runtime::traits::IdentityLookup<Self::AccountId>;
 	type MaxConsumers = ConstU32<16>;
diff --git a/runtime/koi/src/pallets/timestamp.rs b/runtime/koi/src/pallets/timestamp.rs
index 06e83fa2f..f6bbcb561 100644
--- a/runtime/koi/src/pallets/timestamp.rs
+++ b/runtime/koi/src/pallets/timestamp.rs
@@ -20,7 +20,7 @@
 use crate::*;
 
 impl pallet_timestamp::Config for Runtime {
-	type MinimumPeriod = ConstU64<{ SLOT_DURATION / 2 }>;
+	type MinimumPeriod = ();
 	/// A timestamp: milliseconds since the unix epoch.
 	type Moment = u64;
 	#[cfg(not(feature = "runtime-benchmarks"))]

From 88ba89dcfd4a779bcc8aa8bcc4c637d3af0db0a5 Mon Sep 17 00:00:00 2001
From: Bear Wang <boundless.forest@outlook.com>
Date: Wed, 26 Jun 2024 16:03:52 +0800
Subject: [PATCH 44/59] Fix `ethtx-forward` test case (#1519)

* Fix ethtx-forward tests

* Format

* Fix following the review
---
 pallet/ethtx-forwarder/src/mock.rs   | 1 +
 runtime/crab/src/pallets/tx_pause.rs | 4 ++--
 runtime/koi/src/pallets/tx_pause.rs  | 4 ++--
 3 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/pallet/ethtx-forwarder/src/mock.rs b/pallet/ethtx-forwarder/src/mock.rs
index c99c05f87..70d02a037 100644
--- a/pallet/ethtx-forwarder/src/mock.rs
+++ b/pallet/ethtx-forwarder/src/mock.rs
@@ -41,6 +41,7 @@ impl frame_system::Config for Runtime {
 #[derive_impl(pallet_balances::config_preludes::TestDefaultConfig as pallet_balances::DefaultConfig)]
 impl pallet_balances::Config for Runtime {
 	type AccountStore = System;
+	type ExistentialDeposit = ();
 }
 
 #[derive_impl(pallet_timestamp::config_preludes::TestDefaultConfig as pallet_timestamp::DefaultConfig)]
diff --git a/runtime/crab/src/pallets/tx_pause.rs b/runtime/crab/src/pallets/tx_pause.rs
index 357b945b8..56d8a1164 100644
--- a/runtime/crab/src/pallets/tx_pause.rs
+++ b/runtime/crab/src/pallets/tx_pause.rs
@@ -43,8 +43,8 @@ impl frame_support::traits::Contains<pallet_tx_pause::RuntimeCallNameOf<Runtime>
 				| b"Assets" | b"Deposit"
 				| b"AccountMigration"
 				| b"DarwiniaStaking"
-				| b"Ethereum"
-				| b"EVM" | b"EthTxForwarder"
+				| b"Ethereum" | b"EVM"
+				| b"EthTxForwarder"
 		)
 	}
 }
diff --git a/runtime/koi/src/pallets/tx_pause.rs b/runtime/koi/src/pallets/tx_pause.rs
index c0db67c7c..c57e581b4 100644
--- a/runtime/koi/src/pallets/tx_pause.rs
+++ b/runtime/koi/src/pallets/tx_pause.rs
@@ -42,8 +42,8 @@ impl frame_support::traits::Contains<pallet_tx_pause::RuntimeCallNameOf<Runtime>
 			b"Balances"
 				| b"Assets" | b"Deposit"
 				| b"DarwiniaStaking"
-				| b"Ethereum"
-				| b"EVM" | b"EthTxForwarder"
+				| b"Ethereum" | b"EVM"
+				| b"EthTxForwarder"
 		)
 	}
 }

From 66e88e27239d362138b34cb1e364ca1749e2e6d8 Mon Sep 17 00:00:00 2001
From: Xavier Lau <xavier@inv.cafe>
Date: Wed, 26 Jun 2024 16:08:09 +0800
Subject: [PATCH 45/59] Fixes

---
 runtime/koi/src/pallets/assets.rs  | 2 +-
 runtime/koi/src/pallets/deposit.rs | 4 ++--
 runtime/koi/src/pallets/staking.rs | 4 ++--
 runtime/koi/tests/mock.rs          | 2 +-
 4 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/runtime/koi/src/pallets/assets.rs b/runtime/koi/src/pallets/assets.rs
index 0f97927f8..68d322ada 100644
--- a/runtime/koi/src/pallets/assets.rs
+++ b/runtime/koi/src/pallets/assets.rs
@@ -21,7 +21,7 @@ use crate::*;
 
 /// List of the assets existed in this runtime.
 pub enum AssetIds {
-	PKton = 1026,
+	KKton = 1026,
 }
 
 impl pallet_assets::Config for Runtime {
diff --git a/runtime/koi/src/pallets/deposit.rs b/runtime/koi/src/pallets/deposit.rs
index 029fa49d5..3ad97e9b1 100644
--- a/runtime/koi/src/pallets/deposit.rs
+++ b/runtime/koi/src/pallets/deposit.rs
@@ -26,14 +26,14 @@ impl darwinia_deposit::SimpleAsset for KtonMinting {
 	fn mint(beneficiary: &Self::AccountId, amount: Balance) -> sp_runtime::DispatchResult {
 		Assets::mint(
 			RuntimeOrigin::signed(ROOT),
-			(AssetIds::PKton as AssetId).into(),
+			(AssetIds::KKton as AssetId).into(),
 			*beneficiary,
 			amount,
 		)
 	}
 
 	fn burn(who: &Self::AccountId, amount: Balance) -> sp_runtime::DispatchResult {
-		let asset_id = AssetIds::PKton as _;
+		let asset_id = AssetIds::KKton as _;
 
 		if Assets::balance(asset_id, who) < amount {
 			Err(<pallet_assets::Error<Runtime>>::BalanceLow)?;
diff --git a/runtime/koi/src/pallets/staking.rs b/runtime/koi/src/pallets/staking.rs
index 56dc90134..00926815c 100644
--- a/runtime/koi/src/pallets/staking.rs
+++ b/runtime/koi/src/pallets/staking.rs
@@ -50,7 +50,7 @@ impl darwinia_staking::Stake for KtonStaking {
 	fn stake(who: &Self::AccountId, item: Self::Item) -> sp_runtime::DispatchResult {
 		Assets::transfer(
 			RuntimeOrigin::signed(*who),
-			(AssetIds::PKton as AssetId).into(),
+			(AssetIds::KKton as AssetId).into(),
 			darwinia_staking::account_id(),
 			item,
 		)
@@ -59,7 +59,7 @@ impl darwinia_staking::Stake for KtonStaking {
 	fn unstake(who: &Self::AccountId, item: Self::Item) -> sp_runtime::DispatchResult {
 		Assets::transfer(
 			RuntimeOrigin::signed(darwinia_staking::account_id()),
-			(AssetIds::PKton as AssetId).into(),
+			(AssetIds::KKton as AssetId).into(),
 			*who,
 			item,
 		)
diff --git a/runtime/koi/tests/mock.rs b/runtime/koi/tests/mock.rs
index 2e99b24b8..51fa78bbd 100644
--- a/runtime/koi/tests/mock.rs
+++ b/runtime/koi/tests/mock.rs
@@ -22,7 +22,7 @@ pub use koi_runtime::*;
 use sp_io::TestExternalities;
 use sp_runtime::BuildStorage;
 
-pub const KTON_ID: u64 = AssetIds::PKton as _;
+pub const KTON_ID: u64 = AssetIds::KKton as _;
 
 #[derive(Clone, Default)]
 pub struct ExtBuilder {

From e12f0c10a83003bf0957a1a8e39784be1314534b Mon Sep 17 00:00:00 2001
From: Xavier Lau <xavier@inv.cafe>
Date: Wed, 26 Jun 2024 17:35:59 +0800
Subject: [PATCH 46/59] Fixes

---
 .maintain/zombienet.toml             | 32 +++++++++++++++++++++-------
 node/src/chain_spec/crab.rs          |  2 +-
 node/src/chain_spec/darwinia.rs      |  2 +-
 node/src/chain_spec/koi.rs           | 14 ++++++------
 node/src/service/mod.rs              | 16 +++++++++++---
 runtime/crab/src/pallets/tx_pause.rs |  4 ++--
 runtime/koi/src/pallets/tx_pause.rs  |  4 ++--
 7 files changed, 49 insertions(+), 25 deletions(-)

diff --git a/.maintain/zombienet.toml b/.maintain/zombienet.toml
index b87bd1f93..4677b600c 100644
--- a/.maintain/zombienet.toml
+++ b/.maintain/zombienet.toml
@@ -1,3 +1,6 @@
+[settings]
+provider = "native"
+
 [relaychain]
 chain           = "rococo-local"
 default_args    = ["--database=paritydb", "-lparachain=debug"]
@@ -11,13 +14,26 @@ name      = "bob"
 validator = true
 
 [[parachains]]
-chain = "koi-local"
+chain = "koi-genesis"
 id    = 2105
-
 [parachains.collator]
-args    = ["--database=paritydb", "--force-authoring", "-lparachain=debug"]
-command = "tmp/darwinia"
-name    = "collator01"
-
-[settings]
-provider = "native"
+args     = ["--database=paritydb", "--force-authoring", "-lparachain=debug"]
+command  = "tmp/darwinia"
+name     = "C1"
+rpc_port = 10000
+[[parachains]]
+chain = "koi-genesis"
+id    = 2105
+[parachains.collator]
+args     = ["--database=paritydb", "--force-authoring", "-lparachain=debug"]
+command  = "tmp/darwinia"
+name     = "C2"
+rpc_port = 10001
+[[parachains]]
+chain = "koi-genesis"
+id    = 2105
+[parachains.collator]
+args     = ["--database=paritydb", "--force-authoring", "-lparachain=debug"]
+command  = "tmp/darwinia"
+name     = "C3"
+rpc_port = 10002
diff --git a/node/src/chain_spec/crab.rs b/node/src/chain_spec/crab.rs
index d834ab37f..b9116bbc6 100644
--- a/node/src/chain_spec/crab.rs
+++ b/node/src/chain_spec/crab.rs
@@ -195,7 +195,7 @@ pub fn genesis_config() -> ChainSpec {
 
 		// Monetary stuff.
 		"balances": {
-			"balances": collators.iter().map(|a| (a, 10_000 * UNIT)).collect::<Vec<_>>()
+			"balances": collators.iter().map(|(a, _)| (a, 10_000 * UNIT)).collect::<Vec<_>>()
 		},
 		"assets": {
 			"assets": [(AssetIds::CKton as AssetId, ROOT, true, 1)],
diff --git a/node/src/chain_spec/darwinia.rs b/node/src/chain_spec/darwinia.rs
index 7ee99546e..d2af9552b 100644
--- a/node/src/chain_spec/darwinia.rs
+++ b/node/src/chain_spec/darwinia.rs
@@ -184,7 +184,7 @@ pub fn genesis_config() -> ChainSpec {
 
 		// Monetary stuff.
 		"balances": {
-			"balances": collators.iter().map(|a| (a, 10_000 * UNIT)).collect::<Vec<_>>()
+			"balances": collators.iter().map(|(a, _)| (a, 10_000 * UNIT)).collect::<Vec<_>>()
 		},
 		"assets": {
 			"assets": [(AssetIds::Kton as AssetId, ROOT, true, 1)],
diff --git a/node/src/chain_spec/koi.rs b/node/src/chain_spec/koi.rs
index f4b2cf93f..ca71e5897 100644
--- a/node/src/chain_spec/koi.rs
+++ b/node/src/chain_spec/koi.rs
@@ -24,8 +24,6 @@ use std::{
 	str::FromStr,
 	time::{SystemTime, UNIX_EPOCH},
 };
-// cumulus
-use cumulus_primitives_core::ParaId;
 // darwinia
 use super::*;
 use koi_runtime::*;
@@ -33,7 +31,7 @@ use koi_runtime::*;
 use fp_evm::GenesisAccount;
 // substrate
 use sc_chain_spec::Properties;
-use sc_service::{ChainType, GenericChainSpec};
+use sc_service::ChainType;
 use sc_telemetry::TelemetryEndpoints;
 use sp_core::{crypto::UncheckedInto, H160};
 
@@ -74,13 +72,13 @@ pub fn development_config() -> ChainSpec {
 		// Governance stuff.
 		"technicalCommittee": {
 			"members": [
-				array_bytes::hex_n_into_unchecked::<_, _, 20>(ALITH),
-				array_bytes::hex_n_into_unchecked::<_, _, 20>(BALTATHAR)
+				array_bytes::hex_n_into_unchecked::<_, AccountId, 20>(ALITH),
+				array_bytes::hex_n_into_unchecked::<_, AccountId, 20>(BALTATHAR)
 			]
 		},
 
 		// Utility stuff.
-		"sudo": { "key": Some(array_bytes::hex_n_into_unchecked::<_, _, 20>(ALITH)) },
+		"sudo": { "key": Some(array_bytes::hex_n_into_unchecked::<_, AccountId, 20>(ALITH)) },
 
 		// XCM stuff.
 		"polkadotXcm": { "safeXcmVersion": Some(SAFE_XCM_VERSION) },
@@ -154,7 +152,7 @@ pub fn genesis_config() -> ChainSpec {
 
 		// Monetary stuff.
 		"balances": {
-			"balances": collators.iter().map(|a| (a, 10_000 * UNIT)).collect::<Vec<_>>(),
+			"balances": collators.iter().map(|(a, _)| (a, 10_000 * UNIT)).collect::<Vec<_>>(),
 		},
 		"assets": {
 			// TODO: migration.
@@ -180,7 +178,7 @@ pub fn genesis_config() -> ChainSpec {
 		},
 
 		// Utility stuff.
-		"sudo": { "key": Some(array_bytes::hex_n_into_unchecked::<_, _, 20>(SUDO)) },
+		"sudo": { "key": Some(array_bytes::hex_n_into_unchecked::<_, AccountId, 20>(SUDO)) },
 
 		// XCM stuff.
 		"polkadotXcm": { "safeXcmVersion": Some(SAFE_XCM_VERSION) },
diff --git a/node/src/service/mod.rs b/node/src/service/mod.rs
index 1a3590020..9965f65f1 100644
--- a/node/src/service/mod.rs
+++ b/node/src/service/mod.rs
@@ -765,11 +765,21 @@ where
 			select_chain,
 			block_import: instant_finalize::InstantFinalizeBlockImport::new(client.clone()),
 			proposer_factory,
-			create_inherent_data_providers: move |block: Hash, ()| {
+			create_inherent_data_providers: move |block, ()| {
 				let maybe_current_para_block = client_for_cidp.number(block);
 				let maybe_current_block_head = client_for_cidp.expect_header(block);
 				let client_for_xcm = client_for_cidp.clone();
-
+				// TODO: hack for now.
+				let additional_key_values = Some(vec![(
+					array_bytes::hex2bytes_unchecked(
+						"1cb6f36e027abb2091cfb5110ab5087f06155b3cd9a8c9e5e9a23fd5dc13a5ed",
+					),
+					cumulus_primitives_aura::Slot::from_timestamp(
+						sp_timestamp::Timestamp::current(),
+						slot_duration,
+					)
+					.encode(),
+				)]);
 				async move {
 					let current_para_block = maybe_current_para_block?
 						.ok_or(sp_blockchain::Error::UnknownBlock(block.to_string()))?;
@@ -796,7 +806,7 @@ where
 							),
 							raw_downward_messages: Vec::new(),
 							raw_horizontal_messages: Vec::new(),
-							additional_key_values: None,
+							additional_key_values,
 						};
 
 					Ok((slot, timestamp, mocked_parachain))
diff --git a/runtime/crab/src/pallets/tx_pause.rs b/runtime/crab/src/pallets/tx_pause.rs
index 56d8a1164..357b945b8 100644
--- a/runtime/crab/src/pallets/tx_pause.rs
+++ b/runtime/crab/src/pallets/tx_pause.rs
@@ -43,8 +43,8 @@ impl frame_support::traits::Contains<pallet_tx_pause::RuntimeCallNameOf<Runtime>
 				| b"Assets" | b"Deposit"
 				| b"AccountMigration"
 				| b"DarwiniaStaking"
-				| b"Ethereum" | b"EVM"
-				| b"EthTxForwarder"
+				| b"Ethereum"
+				| b"EVM" | b"EthTxForwarder"
 		)
 	}
 }
diff --git a/runtime/koi/src/pallets/tx_pause.rs b/runtime/koi/src/pallets/tx_pause.rs
index c57e581b4..c0db67c7c 100644
--- a/runtime/koi/src/pallets/tx_pause.rs
+++ b/runtime/koi/src/pallets/tx_pause.rs
@@ -42,8 +42,8 @@ impl frame_support::traits::Contains<pallet_tx_pause::RuntimeCallNameOf<Runtime>
 			b"Balances"
 				| b"Assets" | b"Deposit"
 				| b"DarwiniaStaking"
-				| b"Ethereum" | b"EVM"
-				| b"EthTxForwarder"
+				| b"Ethereum"
+				| b"EVM" | b"EthTxForwarder"
 		)
 	}
 }

From f851e729ddb32109f01b8d6b4b502190dbc8fe9c Mon Sep 17 00:00:00 2001
From: Xavier Lau <xavier@inv.cafe>
Date: Thu, 27 Jun 2024 07:43:04 +0800
Subject: [PATCH 47/59] Use default impl

---
 pallet/account-migration/src/lib.rs |  2 +-
 pallet/deposit/src/mock.rs          | 14 ++++-------
 precompile/assets/src/mock.rs       | 37 +++++++++++++----------------
 precompile/deposit/Cargo.toml       |  2 +-
 4 files changed, 22 insertions(+), 33 deletions(-)

diff --git a/pallet/account-migration/src/lib.rs b/pallet/account-migration/src/lib.rs
index a015a9b37..0c600b7dc 100644
--- a/pallet/account-migration/src/lib.rs
+++ b/pallet/account-migration/src/lib.rs
@@ -82,7 +82,7 @@ use sp_std::prelude::*;
 pub mod pallet {
 	use super::*;
 
-	pub(crate) const KTON_ID: u64 = 1026;
+	pub(crate) const KTON_ID: AssetId = 1026;
 
 	/// The migration destination was already taken by someone.
 	pub(crate) const E_ACCOUNT_ALREADY_EXISTED: u8 = 0;
diff --git a/pallet/deposit/src/mock.rs b/pallet/deposit/src/mock.rs
index 28723c78c..ec06bcf71 100644
--- a/pallet/deposit/src/mock.rs
+++ b/pallet/deposit/src/mock.rs
@@ -17,13 +17,15 @@
 // along with Darwinia. If not, see <https://www.gnu.org/licenses/>.
 
 pub use crate as darwinia_deposit;
-pub use dc_types::{AssetId, Balance, Moment, UNIT};
+pub use dc_types::{Balance, Moment, UNIT};
 
 // polkadot-sdk
 use frame_support::derive_impl;
 use sp_io::TestExternalities;
 use sp_runtime::BuildStorage;
 
+pub type AssetId = u32;
+
 #[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Runtime {
 	type AccountData = pallet_balances::AccountData<Balance>;
@@ -43,14 +45,6 @@ impl pallet_balances::Config for Runtime {
 	type ExistentialDeposit = ();
 }
 
-#[cfg(feature = "runtime-benchmarks")]
-pub enum BenchmarkHelper {}
-#[cfg(feature = "runtime-benchmarks")]
-impl pallet_assets::BenchmarkHelper<codec::Compact<AssetId>> for BenchmarkHelper {
-	fn create_asset_id_parameter(id: u32) -> codec::Compact<AssetId> {
-		(id as u64).into()
-	}
-}
 impl pallet_assets::Config for Runtime {
 	type ApprovalDeposit = ();
 	type AssetAccountDeposit = ();
@@ -59,7 +53,7 @@ impl pallet_assets::Config for Runtime {
 	type AssetIdParameter = codec::Compact<AssetId>;
 	type Balance = Balance;
 	#[cfg(feature = "runtime-benchmarks")]
-	type BenchmarkHelper = BenchmarkHelper;
+	type BenchmarkHelper = ();
 	type CallbackHandle = ();
 	type CreateOrigin = frame_support::traits::AsEnsureOriginWithArg<
 		frame_system::EnsureSignedBy<frame_support::traits::IsInVec<()>, Self::AccountId>,
diff --git a/precompile/assets/src/mock.rs b/precompile/assets/src/mock.rs
index 42bb56111..e0b3fe077 100644
--- a/precompile/assets/src/mock.rs
+++ b/precompile/assets/src/mock.rs
@@ -32,7 +32,7 @@ use sp_runtime::BuildStorage;
 use sp_std::prelude::*;
 
 pub type Balance = u128;
-pub type AssetId = u64;
+pub type AssetId = u32;
 pub type InternalCall = ERC20AssetsCall<Runtime, AssetIdConverter>;
 pub type AccountId = H160;
 
@@ -52,7 +52,7 @@ impl Into<H160> for Account {
 			Account::Alice => H160::repeat_byte(0xAA),
 			Account::Bob => H160::repeat_byte(0xBB),
 			Account::Charlie => H160::repeat_byte(0xCC),
-			Account::Precompile => addr(TEST_ID),
+			Account::Precompile => addr_of(TEST_ID),
 		}
 	}
 }
@@ -92,7 +92,7 @@ where
 	}
 
 	pub fn used_addresses() -> [H160; 1] {
-		[addr(TEST_ID)]
+		[addr_of(TEST_ID)]
 	}
 }
 
@@ -103,7 +103,7 @@ where
 {
 	fn execute(&self, handle: &mut impl PrecompileHandle) -> Option<EvmResult<PrecompileOutput>> {
 		match handle.code_address() {
-			a if a == addr(TEST_ID) => Some(<ERC20Assets<R, AssetIdConverter>>::execute(handle)),
+			a if a == addr_of(TEST_ID) => Some(<ERC20Assets<R, AssetIdConverter>>::execute(handle)),
 			_ => None,
 		}
 	}
@@ -115,14 +115,11 @@ where
 		}
 	}
 }
-fn addr(a: u64) -> H160 {
-	H160::from_low_u64_be(a)
-}
 
 pub struct AssetIdConverter;
 impl AccountToAssetId<AccountId, AssetId> for AssetIdConverter {
 	fn account_to_asset_id(account_id: AccountId) -> AssetId {
-		account_id.to_low_u64_be()
+		account_id.to_low_u64_be() as _
 	}
 }
 
@@ -156,14 +153,6 @@ impl pallet_evm::Config for Runtime {
 	type WithdrawOrigin = pallet_evm::EnsureAddressNever<AccountId>;
 }
 
-#[cfg(feature = "runtime-benchmarks")]
-pub enum BenchmarkHelper {}
-#[cfg(feature = "runtime-benchmarks")]
-impl pallet_assets::BenchmarkHelper<codec::Compact<AssetId>> for BenchmarkHelper {
-	fn create_asset_id_parameter(id: u32) -> codec::Compact<AssetId> {
-		(id as u64).into()
-	}
-}
 impl pallet_assets::Config for Runtime {
 	type ApprovalDeposit = ();
 	type AssetAccountDeposit = ();
@@ -172,7 +161,7 @@ impl pallet_assets::Config for Runtime {
 	type AssetIdParameter = codec::Compact<AssetId>;
 	type Balance = Balance;
 	#[cfg(feature = "runtime-benchmarks")]
-	type BenchmarkHelper = BenchmarkHelper;
+	type BenchmarkHelper = ();
 	type CallbackHandle = ();
 	type CreateOrigin = frame_support::traits::AsEnsureOriginWithArg<
 		frame_system::EnsureSignedBy<frame_support::traits::IsInVec<()>, AccountId>,
@@ -200,18 +189,17 @@ frame_support::construct_runtime! {
 }
 
 #[derive(Default)]
-pub(crate) struct ExtBuilder {
+pub struct ExtBuilder {
 	// endowed accounts with balances
 	balances: Vec<(AccountId, Balance)>,
 }
-
 impl ExtBuilder {
-	pub(crate) fn with_balances(mut self, balances: Vec<(AccountId, Balance)>) -> Self {
+	pub fn with_balances(mut self, balances: Vec<(AccountId, Balance)>) -> Self {
 		self.balances = balances;
 		self
 	}
 
-	pub(crate) fn build(self) -> sp_io::TestExternalities {
+	pub fn build(self) -> sp_io::TestExternalities {
 		let mut t = <frame_system::GenesisConfig<Runtime>>::default()
 			.build_storage()
 			.expect("Frame system builds valid default genesis config");
@@ -225,3 +213,10 @@ impl ExtBuilder {
 		ext
 	}
 }
+
+fn addr_of<V>(v: V) -> H160
+where
+	V: Into<u64>,
+{
+	H160::from_low_u64_be(v.into())
+}
diff --git a/precompile/deposit/Cargo.toml b/precompile/deposit/Cargo.toml
index 35812b5db..ccdb8685e 100644
--- a/precompile/deposit/Cargo.toml
+++ b/precompile/deposit/Cargo.toml
@@ -32,7 +32,7 @@ scale-info = { workspace = true, features = ["std"] }
 # moonbeam
 precompile-utils = { workspace = true, features = ["std", "testing"] }
 
-# substrate
+# polkadot-sdk
 pallet-balances  = { workspace = true, features = ["std"] }
 pallet-timestamp = { workspace = true, features = ["std"] }
 sp-io            = { workspace = true, features = ["std"] }

From 58157bf21f12c0b8f6ec3075c4f5809a08d3e2b0 Mon Sep 17 00:00:00 2001
From: Xavier Lau <xavier@inv.cafe>
Date: Thu, 27 Jun 2024 07:56:35 +0800
Subject: [PATCH 48/59] Benchmark helper

---
 Cargo.lock                                 |  1 +
 runtime/common/Cargo.toml                  |  6 ++++-
 runtime/common/src/benchmark_helper.rs     | 28 ++++++++++++++++++++++
 runtime/common/src/lib.rs                  | 11 ++-------
 runtime/crab/src/pallets/assets.rs         | 12 +++++-----
 runtime/crab/src/pallets/governance.rs     |  2 ++
 runtime/darwinia/src/pallets/assets.rs     | 12 +++++-----
 runtime/darwinia/src/pallets/governance.rs |  2 ++
 runtime/koi/src/pallets/assets.rs          | 12 +++++-----
 runtime/koi/src/pallets/governance.rs      |  2 ++
 10 files changed, 60 insertions(+), 28 deletions(-)
 create mode 100644 runtime/common/src/benchmark_helper.rs

diff --git a/Cargo.lock b/Cargo.lock
index eb59dd598..c71bce24a 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2755,6 +2755,7 @@ dependencies = [
  "pallet-collective",
  "pallet-evm",
  "pallet-message-queue",
+ "pallet-treasury",
  "parity-scale-codec",
  "scale-info",
  "smallvec",
diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml
index dd0a7e28f..d6ef7cb37 100644
--- a/runtime/common/Cargo.toml
+++ b/runtime/common/Cargo.toml
@@ -26,7 +26,6 @@ pallet-evm = { workspace = true }
 cumulus-primitives-core = { workspace = true }
 frame-support           = { workspace = true }
 frame-system            = { workspace = true }
-pallet-assets           = { workspace = true, optional = true }
 pallet-authorship       = { workspace = true }
 pallet-balances         = { workspace = true }
 pallet-collective       = { workspace = true }
@@ -37,6 +36,9 @@ sp-runtime              = { workspace = true }
 sp-std                  = { workspace = true }
 xcm                     = { workspace = true }
 xcm-executor            = { workspace = true }
+# polkadot-sdk optional
+pallet-assets   = { workspace = true, optional = true }
+pallet-treasury = { workspace = true, optional = true }
 
 [features]
 default = ["std"]
@@ -71,6 +73,7 @@ std = [
 	"xcm/std",
 	# polkadot-sdk optional
 	"pallet-assets?/std",
+	"pallet-treasury?/std",
 ]
 
 test = []
@@ -85,4 +88,5 @@ runtime-benchmarks = [
 	"sp-runtime/runtime-benchmarks",
 	# polkadot-sdk optional
 	"pallet-assets/runtime-benchmarks",
+	"pallet-treasury/runtime-benchmarks",
 ]
diff --git a/runtime/common/src/benchmark_helper.rs b/runtime/common/src/benchmark_helper.rs
new file mode 100644
index 000000000..33391e083
--- /dev/null
+++ b/runtime/common/src/benchmark_helper.rs
@@ -0,0 +1,28 @@
+// crates.io
+use codec::Encode;
+// darwinia
+use dc_primitives::*;
+// polkadot-sdk
+use sp_core::crypto::FromEntropy;
+
+/// Helper for pallet-assets benchmarking.
+pub enum Assets {}
+impl pallet_assets::BenchmarkHelper<codec::Compact<u64>> for Assets {
+	fn create_asset_id_parameter(id: u32) -> codec::Compact<u64> {
+		u64::from(id).into()
+	}
+}
+
+pub enum Treasury {}
+impl<AssetKind> pallet_treasury::ArgumentsFactory<AssetKind, AccountId> for Treasury
+where
+	AssetKind: FromEntropy,
+{
+	fn create_asset_kind(seed: u32) -> AssetKind {
+		AssetKind::from_entropy(&mut seed.encode().as_slice()).unwrap()
+	}
+
+	fn create_beneficiary(seed: [u8; 32]) -> AccountId {
+		<[u8; 20]>::from_entropy(&mut seed.as_slice()).unwrap().into()
+	}
+}
diff --git a/runtime/common/src/lib.rs b/runtime/common/src/lib.rs
index 23bac814d..34fa51a65 100644
--- a/runtime/common/src/lib.rs
+++ b/runtime/common/src/lib.rs
@@ -20,6 +20,8 @@
 // TODO:
 // #![deny(missing_docs)]
 
+#[cfg(feature = "runtime-benchmarks")]
+pub mod benchmark_helper;
 pub mod gov_origin;
 pub mod message_queue;
 pub mod migration_helper;
@@ -263,12 +265,3 @@ impl darwinia_precompile_assets::AccountToAssetId<AccountId, AssetId> for AssetI
 		addr.to_low_u64_be()
 	}
 }
-/// Helper for pallet-assets benchmarking.
-#[cfg(feature = "runtime-benchmarks")]
-pub struct AssetsBenchmarkHelper;
-#[cfg(feature = "runtime-benchmarks")]
-impl pallet_assets::BenchmarkHelper<codec::Compact<u64>> for AssetsBenchmarkHelper {
-	fn create_asset_id_parameter(id: u32) -> codec::Compact<u64> {
-		u64::from(id).into()
-	}
-}
diff --git a/runtime/crab/src/pallets/assets.rs b/runtime/crab/src/pallets/assets.rs
index 4ef9e463b..4a69b53be 100644
--- a/runtime/crab/src/pallets/assets.rs
+++ b/runtime/crab/src/pallets/assets.rs
@@ -25,17 +25,17 @@ pub enum AssetIds {
 }
 
 impl pallet_assets::Config for Runtime {
-	type ApprovalDeposit = ConstU128<0>;
+	type ApprovalDeposit = ();
 	#[cfg(feature = "runtime-benchmarks")]
 	type AssetAccountDeposit = ConstU128<1>;
 	#[cfg(not(feature = "runtime-benchmarks"))]
-	type AssetAccountDeposit = ConstU128<0>;
-	type AssetDeposit = ConstU128<0>;
+	type AssetAccountDeposit = ();
+	type AssetDeposit = ();
 	type AssetId = AssetId;
 	type AssetIdParameter = codec::Compact<AssetId>;
 	type Balance = Balance;
 	#[cfg(feature = "runtime-benchmarks")]
-	type BenchmarkHelper = AssetsBenchmarkHelper;
+	type BenchmarkHelper = benchmark_helper::Assets;
 	type CallbackHandle = ();
 	type CreateOrigin = frame_support::traits::AsEnsureOriginWithArg<
 		frame_system::EnsureSignedBy<
@@ -47,8 +47,8 @@ impl pallet_assets::Config for Runtime {
 	type Extra = ();
 	type ForceOrigin = RootOr<GeneralAdmin>;
 	type Freezer = ();
-	type MetadataDepositBase = ConstU128<0>;
-	type MetadataDepositPerByte = ConstU128<0>;
+	type MetadataDepositBase = ();
+	type MetadataDepositPerByte = ();
 	type RemoveItemsLimit = ConstU32<1_000>;
 	type RuntimeEvent = RuntimeEvent;
 	type StringLimit = ConstU32<50>;
diff --git a/runtime/crab/src/pallets/governance.rs b/runtime/crab/src/pallets/governance.rs
index c3b446ba9..90176da80 100644
--- a/runtime/crab/src/pallets/governance.rs
+++ b/runtime/crab/src/pallets/governance.rs
@@ -97,6 +97,8 @@ impl pallet_treasury::Config for Runtime {
 	type ApproveOrigin = RootOr<GeneralAdmin>;
 	type AssetKind = ();
 	type BalanceConverter = frame_support::traits::tokens::UnityAssetBalanceConversion;
+	#[cfg(feature = "runtime-benchmarks")]
+	type BenchmarkHelper = benchmark_helper::Treasury;
 	type Beneficiary = Self::AccountId;
 	type BeneficiaryLookup = Self::Lookup;
 	type Burn = ();
diff --git a/runtime/darwinia/src/pallets/assets.rs b/runtime/darwinia/src/pallets/assets.rs
index e2633f3a7..f48800bb8 100644
--- a/runtime/darwinia/src/pallets/assets.rs
+++ b/runtime/darwinia/src/pallets/assets.rs
@@ -25,17 +25,17 @@ pub enum AssetIds {
 }
 
 impl pallet_assets::Config for Runtime {
-	type ApprovalDeposit = ConstU128<0>;
+	type ApprovalDeposit = ();
 	#[cfg(feature = "runtime-benchmarks")]
 	type AssetAccountDeposit = ConstU128<1>;
 	#[cfg(not(feature = "runtime-benchmarks"))]
-	type AssetAccountDeposit = ConstU128<0>;
-	type AssetDeposit = ConstU128<0>;
+	type AssetAccountDeposit = ();
+	type AssetDeposit = ();
 	type AssetId = AssetId;
 	type AssetIdParameter = codec::Compact<AssetId>;
 	type Balance = Balance;
 	#[cfg(feature = "runtime-benchmarks")]
-	type BenchmarkHelper = AssetsBenchmarkHelper;
+	type BenchmarkHelper = benchmark_helper::Assets;
 	type CallbackHandle = ();
 	type CreateOrigin = frame_support::traits::AsEnsureOriginWithArg<
 		frame_system::EnsureSignedBy<
@@ -47,8 +47,8 @@ impl pallet_assets::Config for Runtime {
 	type Extra = ();
 	type ForceOrigin = RootOr<GeneralAdmin>;
 	type Freezer = ();
-	type MetadataDepositBase = ConstU128<0>;
-	type MetadataDepositPerByte = ConstU128<0>;
+	type MetadataDepositBase = ();
+	type MetadataDepositPerByte = ();
 	type RemoveItemsLimit = ConstU32<1000>;
 	type RuntimeEvent = RuntimeEvent;
 	type StringLimit = ConstU32<50>;
diff --git a/runtime/darwinia/src/pallets/governance.rs b/runtime/darwinia/src/pallets/governance.rs
index 9d17f1dc7..953b31417 100644
--- a/runtime/darwinia/src/pallets/governance.rs
+++ b/runtime/darwinia/src/pallets/governance.rs
@@ -97,6 +97,8 @@ impl pallet_treasury::Config for Runtime {
 	type ApproveOrigin = RootOr<GeneralAdmin>;
 	type AssetKind = ();
 	type BalanceConverter = frame_support::traits::tokens::UnityAssetBalanceConversion;
+	#[cfg(feature = "runtime-benchmarks")]
+	type BenchmarkHelper = benchmark_helper::Treasury;
 	type Beneficiary = Self::AccountId;
 	type BeneficiaryLookup = Self::Lookup;
 	type Burn = ();
diff --git a/runtime/koi/src/pallets/assets.rs b/runtime/koi/src/pallets/assets.rs
index 68d322ada..22562f8c4 100644
--- a/runtime/koi/src/pallets/assets.rs
+++ b/runtime/koi/src/pallets/assets.rs
@@ -25,17 +25,17 @@ pub enum AssetIds {
 }
 
 impl pallet_assets::Config for Runtime {
-	type ApprovalDeposit = ConstU128<0>;
+	type ApprovalDeposit = ();
 	#[cfg(feature = "runtime-benchmarks")]
 	type AssetAccountDeposit = ConstU128<1>;
 	#[cfg(not(feature = "runtime-benchmarks"))]
-	type AssetAccountDeposit = ConstU128<0>;
-	type AssetDeposit = ConstU128<0>;
+	type AssetAccountDeposit = ();
+	type AssetDeposit = ();
 	type AssetId = AssetId;
 	type AssetIdParameter = codec::Compact<AssetId>;
 	type Balance = Balance;
 	#[cfg(feature = "runtime-benchmarks")]
-	type BenchmarkHelper = AssetsBenchmarkHelper;
+	type BenchmarkHelper = benchmark_helper::Assets;
 	type CallbackHandle = ();
 	type CreateOrigin = frame_support::traits::AsEnsureOriginWithArg<
 		frame_system::EnsureSignedBy<
@@ -47,8 +47,8 @@ impl pallet_assets::Config for Runtime {
 	type Extra = ();
 	type ForceOrigin = RootOr<GeneralAdmin>;
 	type Freezer = ();
-	type MetadataDepositBase = ConstU128<0>;
-	type MetadataDepositPerByte = ConstU128<0>;
+	type MetadataDepositBase = ();
+	type MetadataDepositPerByte = ();
 	type RemoveItemsLimit = ConstU32<1000>;
 	type RuntimeEvent = RuntimeEvent;
 	type StringLimit = ConstU32<50>;
diff --git a/runtime/koi/src/pallets/governance.rs b/runtime/koi/src/pallets/governance.rs
index f251953fb..3c4db08c9 100644
--- a/runtime/koi/src/pallets/governance.rs
+++ b/runtime/koi/src/pallets/governance.rs
@@ -103,6 +103,8 @@ impl pallet_treasury::Config for Runtime {
 	type ApproveOrigin = RootOr<GeneralAdmin>;
 	type AssetKind = ();
 	type BalanceConverter = frame_support::traits::tokens::UnityAssetBalanceConversion;
+	#[cfg(feature = "runtime-benchmarks")]
+	type BenchmarkHelper = benchmark_helper::Treasury;
 	type Beneficiary = Self::AccountId;
 	type BeneficiaryLookup = Self::Lookup;
 	type Burn = ();

From 0dc5950a9c5f3e90095a50d7e8c404a55d4a22d6 Mon Sep 17 00:00:00 2001
From: Xavier Lau <xavier@inv.cafe>
Date: Thu, 27 Jun 2024 09:01:51 +0800
Subject: [PATCH 49/59] Bench part.1

---
 runtime/crab/src/pallets/tx_pause.rs          |  44 ++--
 .../cumulus_pallet_parachain_system.rs        |  82 ++++++++
 .../src/weights/cumulus_pallet_xcmp_queue.rs  |  92 ++++++++-
 .../src/weights/darwinia_account_migration.rs |  46 ++---
 .../darwinia/src/weights/darwinia_deposit.rs  |  22 +-
 .../darwinia/src/weights/darwinia_staking.rs  |  32 +--
 runtime/darwinia/src/weights/frame_system.rs  |  77 +++++--
 runtime/darwinia/src/weights/pallet_assets.rs | 116 +++++------
 .../darwinia/src/weights/pallet_balances.rs   |  37 ++--
 .../darwinia/src/weights/pallet_collective.rs | 128 ++++++------
 .../src/weights/pallet_conviction_voting.rs   |  40 ++--
 .../src/weights/pallet_message_queue.rs       | 191 ++++++++++++++++++
 .../darwinia/src/weights/pallet_preimage.rs   | 158 ++++++++++-----
 runtime/darwinia/src/weights/pallet_proxy.rs  |  92 ++++-----
 .../darwinia/src/weights/pallet_referenda.rs  | 126 ++++++------
 .../darwinia/src/weights/pallet_scheduler.rs  |  68 ++++---
 .../darwinia/src/weights/pallet_session.rs    |  12 +-
 .../darwinia/src/weights/pallet_timestamp.rs  |  16 +-
 .../darwinia/src/weights/pallet_treasury.rs   |  90 +++++++--
 .../darwinia/src/weights/pallet_utility.rs    |  32 +--
 .../darwinia/src/weights/pallet_whitelist.rs  |  58 +++---
 .../cumulus_pallet_parachain_system.rs        |  82 ++++++++
 .../src/weights/cumulus_pallet_xcmp_queue.rs  |  94 ++++++++-
 runtime/koi/src/weights/darwinia_deposit.rs   |  16 +-
 runtime/koi/src/weights/darwinia_staking.rs   |  34 ++--
 runtime/koi/src/weights/frame_system.rs       |  79 ++++++--
 runtime/koi/src/weights/pallet_assets.rs      | 154 +++++++-------
 runtime/koi/src/weights/pallet_balances.rs    |  51 +++--
 runtime/koi/src/weights/pallet_collective.rs  | 122 +++++------
 .../src/weights/pallet_conviction_voting.rs   |  40 ++--
 .../koi/src/weights/pallet_message_queue.rs   | 191 ++++++++++++++++++
 runtime/koi/src/weights/pallet_preimage.rs    | 160 ++++++++++-----
 runtime/koi/src/weights/pallet_proxy.rs       |  92 +++++----
 runtime/koi/src/weights/pallet_referenda.rs   | 120 +++++------
 runtime/koi/src/weights/pallet_scheduler.rs   |  74 +++----
 runtime/koi/src/weights/pallet_session.rs     |   4 +-
 runtime/koi/src/weights/pallet_timestamp.rs   |   8 +-
 runtime/koi/src/weights/pallet_treasury.rs    |  94 +++++++--
 runtime/koi/src/weights/pallet_tx_pause.rs    |  12 +-
 runtime/koi/src/weights/pallet_utility.rs     |  32 +--
 runtime/koi/src/weights/pallet_whitelist.rs   |  52 +++--
 41 files changed, 2041 insertions(+), 1029 deletions(-)
 create mode 100644 runtime/darwinia/src/weights/cumulus_pallet_parachain_system.rs
 create mode 100644 runtime/darwinia/src/weights/pallet_message_queue.rs
 create mode 100644 runtime/koi/src/weights/cumulus_pallet_parachain_system.rs
 create mode 100644 runtime/koi/src/weights/pallet_message_queue.rs

diff --git a/runtime/crab/src/pallets/tx_pause.rs b/runtime/crab/src/pallets/tx_pause.rs
index 357b945b8..1049620f3 100644
--- a/runtime/crab/src/pallets/tx_pause.rs
+++ b/runtime/crab/src/pallets/tx_pause.rs
@@ -21,33 +21,33 @@ use crate::*;
 
 pub struct TxPauseWhitelistedCalls;
 // This conflicts with runtime test.
-// #[cfg(feature = "runtime-benchmarks")]
-// impl frame_support::traits::Contains<pallet_tx_pause::RuntimeCallNameOf<Runtime>>
-// 	for TxPauseWhitelistedCalls
-// {
-// 	fn contains(_: &pallet_tx_pause::RuntimeCallNameOf<Runtime>) -> bool {
-// 		false
-// 	}
-// }
-// #[cfg(not(feature = "runtime-benchmarks"))]
+#[cfg(feature = "runtime-benchmarks")]
 impl frame_support::traits::Contains<pallet_tx_pause::RuntimeCallNameOf<Runtime>>
 	for TxPauseWhitelistedCalls
 {
-	fn contains(full_name: &pallet_tx_pause::RuntimeCallNameOf<Runtime>) -> bool {
-		let pallet = full_name.0.as_slice();
-
-		// Pallets that can be paused by the tx-pause pallet.
-		!matches!(
-			pallet,
-			b"Balances"
-				| b"Assets" | b"Deposit"
-				| b"AccountMigration"
-				| b"DarwiniaStaking"
-				| b"Ethereum"
-				| b"EVM" | b"EthTxForwarder"
-		)
+	fn contains(_: &pallet_tx_pause::RuntimeCallNameOf<Runtime>) -> bool {
+		false
 	}
 }
+// #[cfg(not(feature = "runtime-benchmarks"))]
+// impl frame_support::traits::Contains<pallet_tx_pause::RuntimeCallNameOf<Runtime>>
+// 	for TxPauseWhitelistedCalls
+// {
+// 	fn contains(full_name: &pallet_tx_pause::RuntimeCallNameOf<Runtime>) -> bool {
+// 		let pallet = full_name.0.as_slice();
+
+// 		// Pallets that can be paused by the tx-pause pallet.
+// 		!matches!(
+// 			pallet,
+// 			b"Balances"
+// 				| b"Assets" | b"Deposit"
+// 				| b"AccountMigration"
+// 				| b"DarwiniaStaking"
+// 				| b"Ethereum"
+// 				| b"EVM" | b"EthTxForwarder"
+// 		)
+// 	}
+// }
 
 impl pallet_tx_pause::Config for Runtime {
 	type MaxNameLen = ConstU32<256>;
diff --git a/runtime/darwinia/src/weights/cumulus_pallet_parachain_system.rs b/runtime/darwinia/src/weights/cumulus_pallet_parachain_system.rs
new file mode 100644
index 000000000..c067e3540
--- /dev/null
+++ b/runtime/darwinia/src/weights/cumulus_pallet_parachain_system.rs
@@ -0,0 +1,82 @@
+// This file is part of Darwinia.
+//
+// Copyright (C) Darwinia Network
+// SPDX-License-Identifier: GPL-3.0
+//
+// Darwinia is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Darwinia is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Darwinia. If not, see <https://www.gnu.org/licenses/>.
+
+//! Autogenerated weights for `cumulus_pallet_parachain_system`
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-06-27, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! WORST CASE MAP SIZE: `1000000`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("darwinia-dev")`, DB CACHE: 1024
+
+// Executed Command:
+// target/release/darwinia
+// benchmark
+// pallet
+// --header
+// .maintain/license-header
+// --heap-pages
+// 4096
+// --chain
+// darwinia-dev
+// --output
+// runtime/darwinia/src/weights
+// --pallet
+// *
+// --extrinsic
+// *
+// --steps
+// 50
+// --repeat
+// 20
+
+#![cfg_attr(rustfmt, rustfmt_skip)]
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+#![allow(missing_docs)]
+
+use frame_support::{traits::Get, weights::Weight};
+use core::marker::PhantomData;
+
+/// Weight functions for `cumulus_pallet_parachain_system`.
+pub struct WeightInfo<T>(PhantomData<T>);
+impl<T: frame_system::Config> cumulus_pallet_parachain_system::WeightInfo for WeightInfo<T> {
+	/// Storage: `ParachainSystem::LastDmqMqcHead` (r:1 w:1)
+	/// Proof: `ParachainSystem::LastDmqMqcHead` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `MessageQueue::BookStateFor` (r:1 w:1)
+	/// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	/// Storage: `MessageQueue::ServiceHead` (r:1 w:1)
+	/// Proof: `MessageQueue::ServiceHead` (`max_values`: Some(1), `max_size`: Some(5), added: 500, mode: `MaxEncodedLen`)
+	/// Storage: `ParachainSystem::ProcessedDownwardMessages` (r:0 w:1)
+	/// Proof: `ParachainSystem::ProcessedDownwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `MessageQueue::Pages` (r:0 w:1000)
+	/// Proof: `MessageQueue::Pages` (`max_values`: None, `max_size`: Some(65585), added: 68060, mode: `MaxEncodedLen`)
+	/// The range of component `n` is `[0, 1000]`.
+	fn enqueue_inbound_downward_messages(n: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `82`
+		//  Estimated: `3517`
+		// Minimum execution time: 2_000_000 picoseconds.
+		Weight::from_parts(2_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 3517))
+			// Standard Error: 37_263
+			.saturating_add(Weight::from_parts(100_294_011, 0).saturating_mul(n.into()))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(4))
+			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(n.into())))
+	}
+}
diff --git a/runtime/darwinia/src/weights/cumulus_pallet_xcmp_queue.rs b/runtime/darwinia/src/weights/cumulus_pallet_xcmp_queue.rs
index 1d4bea2c1..6c21b1c52 100644
--- a/runtime/darwinia/src/weights/cumulus_pallet_xcmp_queue.rs
+++ b/runtime/darwinia/src/weights/cumulus_pallet_xcmp_queue.rs
@@ -18,8 +18,8 @@
 
 //! Autogenerated weights for `cumulus_pallet_xcmp_queue`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-04-17, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-06-27, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `Some("darwinia-dev")`, DB CACHE: 1024
 
@@ -61,22 +61,100 @@ impl<T: frame_system::Config> cumulus_pallet_xcmp_queue::WeightInfo for WeightIn
 		// Proof Size summary in bytes:
 		//  Measured:  `42`
 		//  Estimated: `1527`
-		// Minimum execution time: 4_000_000 picoseconds.
+		// Minimum execution time: 3_000_000 picoseconds.
 		Weight::from_parts(4_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 1527))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	/// Storage: `XcmpQueue::QueueConfig` (r:1 w:1)
+	/// Storage: `XcmpQueue::QueueConfig` (r:1 w:0)
 	/// Proof: `XcmpQueue::QueueConfig` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	fn set_config_with_weight() -> Weight {
+	/// Storage: `MessageQueue::BookStateFor` (r:1 w:1)
+	/// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	/// Storage: `MessageQueue::ServiceHead` (r:1 w:1)
+	/// Proof: `MessageQueue::ServiceHead` (`max_values`: Some(1), `max_size`: Some(5), added: 500, mode: `MaxEncodedLen`)
+	/// Storage: `XcmpQueue::InboundXcmpSuspended` (r:1 w:0)
+	/// Proof: `XcmpQueue::InboundXcmpSuspended` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `MessageQueue::Pages` (r:0 w:1)
+	/// Proof: `MessageQueue::Pages` (`max_values`: None, `max_size`: Some(65585), added: 68060, mode: `MaxEncodedLen`)
+	fn enqueue_xcmp_message() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `48`
+		//  Estimated: `3517`
+		// Minimum execution time: 11_000_000 picoseconds.
+		Weight::from_parts(12_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 3517))
+			.saturating_add(T::DbWeight::get().reads(4))
+			.saturating_add(T::DbWeight::get().writes(3))
+	}
+	/// Storage: `XcmpQueue::OutboundXcmpStatus` (r:1 w:1)
+	/// Proof: `XcmpQueue::OutboundXcmpStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	fn suspend_channel() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `42`
 		//  Estimated: `1527`
-		// Minimum execution time: 4_000_000 picoseconds.
-		Weight::from_parts(4_000_000, 0)
+		// Minimum execution time: 2_000_000 picoseconds.
+		Weight::from_parts(2_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 1527))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
+	/// Storage: `XcmpQueue::OutboundXcmpStatus` (r:1 w:1)
+	/// Proof: `XcmpQueue::OutboundXcmpStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	fn resume_channel() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `77`
+		//  Estimated: `1562`
+		// Minimum execution time: 3_000_000 picoseconds.
+		Weight::from_parts(3_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 1562))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	fn take_first_concatenated_xcm() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `0`
+		//  Estimated: `0`
+		// Minimum execution time: 9_000_000 picoseconds.
+		Weight::from_parts(9_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 0))
+	}
+	/// Storage: UNKNOWN KEY `0x7b3237373ffdfeb1cab4222e3b520d6b345d8e88afa015075c945637c07e8f20` (r:1 w:1)
+	/// Proof: UNKNOWN KEY `0x7b3237373ffdfeb1cab4222e3b520d6b345d8e88afa015075c945637c07e8f20` (r:1 w:1)
+	/// Storage: UNKNOWN KEY `0x7b3237373ffdfeb1cab4222e3b520d6bedc49980ba3aa32b0a189290fd036649` (r:1 w:1)
+	/// Proof: UNKNOWN KEY `0x7b3237373ffdfeb1cab4222e3b520d6bedc49980ba3aa32b0a189290fd036649` (r:1 w:1)
+	/// Storage: `MessageQueue::BookStateFor` (r:1 w:1)
+	/// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	/// Storage: `MessageQueue::ServiceHead` (r:1 w:1)
+	/// Proof: `MessageQueue::ServiceHead` (`max_values`: Some(1), `max_size`: Some(5), added: 500, mode: `MaxEncodedLen`)
+	/// Storage: `XcmpQueue::QueueConfig` (r:1 w:0)
+	/// Proof: `XcmpQueue::QueueConfig` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `XcmpQueue::InboundXcmpSuspended` (r:1 w:0)
+	/// Proof: `XcmpQueue::InboundXcmpSuspended` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `MessageQueue::Pages` (r:0 w:1)
+	/// Proof: `MessageQueue::Pages` (`max_values`: None, `max_size`: Some(65585), added: 68060, mode: `MaxEncodedLen`)
+	fn on_idle_good_msg() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `65677`
+		//  Estimated: `69142`
+		// Minimum execution time: 45_000_000 picoseconds.
+		Weight::from_parts(48_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 69142))
+			.saturating_add(T::DbWeight::get().reads(6))
+			.saturating_add(T::DbWeight::get().writes(5))
+	}
+	/// Storage: UNKNOWN KEY `0x7b3237373ffdfeb1cab4222e3b520d6b345d8e88afa015075c945637c07e8f20` (r:1 w:1)
+	/// Proof: UNKNOWN KEY `0x7b3237373ffdfeb1cab4222e3b520d6b345d8e88afa015075c945637c07e8f20` (r:1 w:1)
+	/// Storage: UNKNOWN KEY `0x7b3237373ffdfeb1cab4222e3b520d6bedc49980ba3aa32b0a189290fd036649` (r:1 w:1)
+	/// Proof: UNKNOWN KEY `0x7b3237373ffdfeb1cab4222e3b520d6bedc49980ba3aa32b0a189290fd036649` (r:1 w:1)
+	fn on_idle_large_msg() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `65676`
+		//  Estimated: `69141`
+		// Minimum execution time: 28_000_000 picoseconds.
+		Weight::from_parts(31_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 69141))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
 }
diff --git a/runtime/darwinia/src/weights/darwinia_account_migration.rs b/runtime/darwinia/src/weights/darwinia_account_migration.rs
index bf9c04466..322ec6de7 100644
--- a/runtime/darwinia/src/weights/darwinia_account_migration.rs
+++ b/runtime/darwinia/src/weights/darwinia_account_migration.rs
@@ -18,8 +18,8 @@
 
 //! Autogenerated weights for `darwinia_account_migration`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-04-17, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-06-27, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `Some("darwinia-dev")`, DB CACHE: 1024
 
@@ -61,10 +61,6 @@ impl<T: frame_system::Config> darwinia_account_migration::WeightInfo for WeightI
 	/// Proof: `AccountMigration::KtonAccounts` (`max_values`: None, `max_size`: Some(82), added: 2557, mode: `MaxEncodedLen`)
 	/// Storage: `Assets::Asset` (r:1 w:1)
 	/// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(166), added: 2641, mode: `MaxEncodedLen`)
-	/// Storage: `AccountMigration::Identities` (r:1 w:1)
-	/// Proof: `AccountMigration::Identities` (`max_values`: None, `max_size`: Some(9219), added: 11694, mode: `MaxEncodedLen`)
-	/// Storage: `Identity::Registrars` (r:1 w:1)
-	/// Proof: `Identity::Registrars` (`max_values`: Some(1), `max_size`: Some(901), added: 1396, mode: `MaxEncodedLen`)
 	/// Storage: `AccountMigration::Ledgers` (r:1 w:1)
 	/// Proof: `AccountMigration::Ledgers` (`max_values`: None, `max_size`: Some(1845), added: 4320, mode: `MaxEncodedLen`)
 	/// Storage: `System::Account` (r:2 w:3)
@@ -73,21 +69,19 @@ impl<T: frame_system::Config> darwinia_account_migration::WeightInfo for WeightI
 	/// Proof: `AccountMigration::Deposits` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `DarwiniaStaking::Ledgers` (r:0 w:1)
 	/// Proof: `DarwiniaStaking::Ledgers` (`max_values`: None, `max_size`: Some(1078), added: 3553, mode: `MaxEncodedLen`)
-	/// Storage: `Identity::IdentityOf` (r:0 w:1)
-	/// Proof: `Identity::IdentityOf` (`max_values`: None, `max_size`: Some(7526), added: 10001, mode: `MaxEncodedLen`)
 	/// Storage: `Assets::Account` (r:0 w:1)
 	/// Proof: `Assets::Account` (`max_values`: None, `max_size`: Some(114), added: 2589, mode: `MaxEncodedLen`)
 	/// Storage: `Deposit::Deposits` (r:0 w:1)
 	/// Proof: `Deposit::Deposits` (`max_values`: None, `max_size`: Some(26150), added: 28625, mode: `MaxEncodedLen`)
 	fn migrate() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `28848`
-		//  Estimated: `32313`
-		// Minimum execution time: 166_000_000 picoseconds.
-		Weight::from_parts(180_000_000, 0)
-			.saturating_add(Weight::from_parts(0, 32313))
-			.saturating_add(T::DbWeight::get().reads(9))
-			.saturating_add(T::DbWeight::get().writes(14))
+		//  Measured:  `28434`
+		//  Estimated: `31899`
+		// Minimum execution time: 118_000_000 picoseconds.
+		Weight::from_parts(120_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 31899))
+			.saturating_add(T::DbWeight::get().reads(7))
+			.saturating_add(T::DbWeight::get().writes(11))
 	}
 	/// Storage: `AccountMigration::Multisigs` (r:0 w:1)
 	/// Proof: `AccountMigration::Multisigs` (`max_values`: None, `max_size`: None, mode: `Measured`)
@@ -97,10 +91,6 @@ impl<T: frame_system::Config> darwinia_account_migration::WeightInfo for WeightI
 	/// Proof: `AccountMigration::KtonAccounts` (`max_values`: None, `max_size`: Some(82), added: 2557, mode: `MaxEncodedLen`)
 	/// Storage: `Assets::Asset` (r:1 w:1)
 	/// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(166), added: 2641, mode: `MaxEncodedLen`)
-	/// Storage: `AccountMigration::Identities` (r:1 w:1)
-	/// Proof: `AccountMigration::Identities` (`max_values`: None, `max_size`: Some(9219), added: 11694, mode: `MaxEncodedLen`)
-	/// Storage: `Identity::Registrars` (r:1 w:1)
-	/// Proof: `Identity::Registrars` (`max_values`: Some(1), `max_size`: Some(901), added: 1396, mode: `MaxEncodedLen`)
 	/// Storage: `AccountMigration::Ledgers` (r:1 w:1)
 	/// Proof: `AccountMigration::Ledgers` (`max_values`: None, `max_size`: Some(1845), added: 4320, mode: `MaxEncodedLen`)
 	/// Storage: `System::Account` (r:2 w:3)
@@ -109,8 +99,6 @@ impl<T: frame_system::Config> darwinia_account_migration::WeightInfo for WeightI
 	/// Proof: `AccountMigration::Deposits` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `DarwiniaStaking::Ledgers` (r:0 w:1)
 	/// Proof: `DarwiniaStaking::Ledgers` (`max_values`: None, `max_size`: Some(1078), added: 3553, mode: `MaxEncodedLen`)
-	/// Storage: `Identity::IdentityOf` (r:0 w:1)
-	/// Proof: `Identity::IdentityOf` (`max_values`: None, `max_size`: Some(7526), added: 10001, mode: `MaxEncodedLen`)
 	/// Storage: `Assets::Account` (r:0 w:1)
 	/// Proof: `Assets::Account` (`max_values`: None, `max_size`: Some(114), added: 2589, mode: `MaxEncodedLen`)
 	/// Storage: `Deposit::Deposits` (r:0 w:1)
@@ -121,16 +109,16 @@ impl<T: frame_system::Config> darwinia_account_migration::WeightInfo for WeightI
 	fn migrate_multisig(x: u32, _y: u32, z: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
-		//  Estimated: `2 + x * (163 ±0) + z * (163 ±0)`
-		// Minimum execution time: 8_000_000 picoseconds.
-		Weight::from_parts(27_413_696, 0)
+		//  Estimated: `2 + x * (161 ±0) + z * (161 ±0)`
+		// Minimum execution time: 7_000_000 picoseconds.
+		Weight::from_parts(19_533_534, 0)
 			.saturating_add(Weight::from_parts(0, 2))
-			// Standard Error: 15_863
-			.saturating_add(Weight::from_parts(16_257, 0).saturating_mul(x.into()))
+			// Standard Error: 10_492
+			.saturating_add(Weight::from_parts(14_924, 0).saturating_mul(x.into()))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(2))
-			.saturating_add(Weight::from_parts(0, 163).saturating_mul(x.into()))
-			.saturating_add(Weight::from_parts(0, 163).saturating_mul(z.into()))
+			.saturating_add(Weight::from_parts(0, 161).saturating_mul(x.into()))
+			.saturating_add(Weight::from_parts(0, 161).saturating_mul(z.into()))
 	}
 	/// Storage: `AccountMigration::Multisigs` (r:1 w:1)
 	/// Proof: `AccountMigration::Multisigs` (`max_values`: None, `max_size`: None, mode: `Measured`)
@@ -141,7 +129,7 @@ impl<T: frame_system::Config> darwinia_account_migration::WeightInfo for WeightI
 		//  Measured:  `3499`
 		//  Estimated: `6964`
 		// Minimum execution time: 10_000_000 picoseconds.
-		Weight::from_parts(12_000_000, 0)
+		Weight::from_parts(11_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 6964))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
diff --git a/runtime/darwinia/src/weights/darwinia_deposit.rs b/runtime/darwinia/src/weights/darwinia_deposit.rs
index b47728487..5228a0629 100644
--- a/runtime/darwinia/src/weights/darwinia_deposit.rs
+++ b/runtime/darwinia/src/weights/darwinia_deposit.rs
@@ -18,8 +18,8 @@
 
 //! Autogenerated weights for `darwinia_deposit`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-04-17, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-06-27, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `Some("darwinia-dev")`, DB CACHE: 1024
 
@@ -67,10 +67,10 @@ impl<T: frame_system::Config> darwinia_deposit::WeightInfo for WeightInfo<T> {
 	/// Proof: `Assets::Account` (`max_values`: None, `max_size`: Some(114), added: 2589, mode: `MaxEncodedLen`)
 	fn lock() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `26848`
+		//  Measured:  `26812`
 		//  Estimated: `29615`
-		// Minimum execution time: 86_000_000 picoseconds.
-		Weight::from_parts(97_000_000, 0)
+		// Minimum execution time: 77_000_000 picoseconds.
+		Weight::from_parts(85_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 29615))
 			.saturating_add(T::DbWeight::get().reads(5))
 			.saturating_add(T::DbWeight::get().writes(4))
@@ -83,10 +83,10 @@ impl<T: frame_system::Config> darwinia_deposit::WeightInfo for WeightInfo<T> {
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(116), added: 2591, mode: `MaxEncodedLen`)
 	fn claim() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `26578`
+		//  Measured:  `26541`
 		//  Estimated: `29615`
-		// Minimum execution time: 1_864_000_000 picoseconds.
-		Weight::from_parts(1_932_000_000, 0)
+		// Minimum execution time: 927_000_000 picoseconds.
+		Weight::from_parts(1_003_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 29615))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -103,10 +103,10 @@ impl<T: frame_system::Config> darwinia_deposit::WeightInfo for WeightInfo<T> {
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(116), added: 2591, mode: `MaxEncodedLen`)
 	fn claim_with_penalty() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `26899`
+		//  Measured:  `26863`
 		//  Estimated: `29615`
-		// Minimum execution time: 93_000_000 picoseconds.
-		Weight::from_parts(101_000_000, 0)
+		// Minimum execution time: 87_000_000 picoseconds.
+		Weight::from_parts(97_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 29615))
 			.saturating_add(T::DbWeight::get().reads(5))
 			.saturating_add(T::DbWeight::get().writes(4))
diff --git a/runtime/darwinia/src/weights/darwinia_staking.rs b/runtime/darwinia/src/weights/darwinia_staking.rs
index cbc1602bf..3b428e969 100644
--- a/runtime/darwinia/src/weights/darwinia_staking.rs
+++ b/runtime/darwinia/src/weights/darwinia_staking.rs
@@ -18,8 +18,8 @@
 
 //! Autogenerated weights for `darwinia_staking`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-04-17, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-06-27, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `Some("darwinia-dev")`, DB CACHE: 1024
 
@@ -70,11 +70,11 @@ impl<T: frame_system::Config> darwinia_staking::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `7088 + x * (25 ±0)`
 		//  Estimated: `29615`
-		// Minimum execution time: 50_000_000 picoseconds.
-		Weight::from_parts(885_880_268, 0)
+		// Minimum execution time: 48_000_000 picoseconds.
+		Weight::from_parts(646_150_780, 0)
 			.saturating_add(Weight::from_parts(0, 29615))
-			// Standard Error: 282_311
-			.saturating_add(Weight::from_parts(13_641_040, 0).saturating_mul(x.into()))
+			// Standard Error: 240_459
+			.saturating_add(Weight::from_parts(12_288_123, 0).saturating_mul(x.into()))
 			.saturating_add(T::DbWeight::get().reads(5))
 			.saturating_add(T::DbWeight::get().writes(4))
 	}
@@ -93,11 +93,11 @@ impl<T: frame_system::Config> darwinia_staking::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `7415 + x * (26 ±0)`
 		//  Estimated: `29615`
-		// Minimum execution time: 46_000_000 picoseconds.
-		Weight::from_parts(728_420_174, 0)
+		// Minimum execution time: 51_000_000 picoseconds.
+		Weight::from_parts(683_421_871, 0)
 			.saturating_add(Weight::from_parts(0, 29615))
-			// Standard Error: 275_834
-			.saturating_add(Weight::from_parts(13_851_087, 0).saturating_mul(x.into()))
+			// Standard Error: 245_535
+			.saturating_add(Weight::from_parts(12_549_577, 0).saturating_mul(x.into()))
 			.saturating_add(T::DbWeight::get().reads(5))
 			.saturating_add(T::DbWeight::get().writes(4))
 	}
@@ -123,8 +123,8 @@ impl<T: frame_system::Config> darwinia_staking::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `574`
 		//  Estimated: `4543`
-		// Minimum execution time: 11_000_000 picoseconds.
-		Weight::from_parts(14_000_000, 0)
+		// Minimum execution time: 12_000_000 picoseconds.
+		Weight::from_parts(12_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 4543))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -154,8 +154,8 @@ impl<T: frame_system::Config> darwinia_staking::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `2184`
 		//  Estimated: `83902`
-		// Minimum execution time: 665_000_000 picoseconds.
-		Weight::from_parts(748_000_000, 0)
+		// Minimum execution time: 520_000_000 picoseconds.
+		Weight::from_parts(537_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 83902))
 			.saturating_add(T::DbWeight::get().reads(35))
 			.saturating_add(T::DbWeight::get().writes(34))
@@ -167,7 +167,7 @@ impl<T: frame_system::Config> darwinia_staking::WeightInfo for WeightInfo<T> {
 		//  Measured:  `0`
 		//  Estimated: `0`
 		// Minimum execution time: 2_000_000 picoseconds.
-		Weight::from_parts(3_000_000, 0)
+		Weight::from_parts(2_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -178,7 +178,7 @@ impl<T: frame_system::Config> darwinia_staking::WeightInfo for WeightInfo<T> {
 		//  Measured:  `0`
 		//  Estimated: `0`
 		// Minimum execution time: 2_000_000 picoseconds.
-		Weight::from_parts(3_000_000, 0)
+		Weight::from_parts(2_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
diff --git a/runtime/darwinia/src/weights/frame_system.rs b/runtime/darwinia/src/weights/frame_system.rs
index cbbcb3e01..0b7cacf31 100644
--- a/runtime/darwinia/src/weights/frame_system.rs
+++ b/runtime/darwinia/src/weights/frame_system.rs
@@ -18,8 +18,8 @@
 
 //! Autogenerated weights for `frame_system`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-04-17, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-06-27, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `Some("darwinia-dev")`, DB CACHE: 1024
 
@@ -61,21 +61,21 @@ impl<T: frame_system::Config> frame_system::WeightInfo for WeightInfo<T> {
 		//  Measured:  `0`
 		//  Estimated: `0`
 		// Minimum execution time: 1_000_000 picoseconds.
-		Weight::from_parts(2_000_000, 0)
+		Weight::from_parts(1_295_116, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 			// Standard Error: 0
-			.saturating_add(Weight::from_parts(165, 0).saturating_mul(b.into()))
+			.saturating_add(Weight::from_parts(150, 0).saturating_mul(b.into()))
 	}
 	/// The range of component `b` is `[0, 3932160]`.
 	fn remark_with_event(b: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 6_000_000 picoseconds.
-		Weight::from_parts(7_000_000, 0)
+		// Minimum execution time: 5_000_000 picoseconds.
+		Weight::from_parts(5_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
-			// Standard Error: 1
-			.saturating_add(Weight::from_parts(1_079, 0).saturating_mul(b.into()))
+			// Standard Error: 0
+			.saturating_add(Weight::from_parts(939, 0).saturating_mul(b.into()))
 	}
 	/// Storage: `System::Digest` (r:1 w:1)
 	/// Proof: `System::Digest` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
@@ -86,7 +86,7 @@ impl<T: frame_system::Config> frame_system::WeightInfo for WeightInfo<T> {
 		//  Measured:  `0`
 		//  Estimated: `1485`
 		// Minimum execution time: 3_000_000 picoseconds.
-		Weight::from_parts(4_000_000, 0)
+		Weight::from_parts(3_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 1485))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -107,8 +107,8 @@ impl<T: frame_system::Config> frame_system::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `198`
 		//  Estimated: `1683`
-		// Minimum execution time: 77_042_000_000 picoseconds.
-		Weight::from_parts(79_912_000_000, 0)
+		// Minimum execution time: 67_266_000_000 picoseconds.
+		Weight::from_parts(70_085_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 1683))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(3))
@@ -120,11 +120,11 @@ impl<T: frame_system::Config> frame_system::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 1_000_000 picoseconds.
+		// Minimum execution time: 2_000_000 picoseconds.
 		Weight::from_parts(2_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
-			// Standard Error: 1_767
-			.saturating_add(Weight::from_parts(778_750, 0).saturating_mul(i.into()))
+			// Standard Error: 2_360
+			.saturating_add(Weight::from_parts(760_657, 0).saturating_mul(i.into()))
 			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(i.into())))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
@@ -137,8 +137,8 @@ impl<T: frame_system::Config> frame_system::WeightInfo for WeightInfo<T> {
 		// Minimum execution time: 1_000_000 picoseconds.
 		Weight::from_parts(2_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
-			// Standard Error: 1_453
-			.saturating_add(Weight::from_parts(539_043, 0).saturating_mul(i.into()))
+			// Standard Error: 840
+			.saturating_add(Weight::from_parts(536_307, 0).saturating_mul(i.into()))
 			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(i.into())))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
@@ -147,14 +147,49 @@ impl<T: frame_system::Config> frame_system::WeightInfo for WeightInfo<T> {
 	fn kill_prefix(p: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `99 + p * (69 ±0)`
-		//  Estimated: `102 + p * (70 ±0)`
+		//  Estimated: `101 + p * (70 ±0)`
 		// Minimum execution time: 3_000_000 picoseconds.
-		Weight::from_parts(3_000_000, 0)
-			.saturating_add(Weight::from_parts(0, 102))
-			// Standard Error: 2_374
-			.saturating_add(Weight::from_parts(1_018_728, 0).saturating_mul(p.into()))
+		Weight::from_parts(4_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 101))
+			// Standard Error: 1_241
+			.saturating_add(Weight::from_parts(983_046, 0).saturating_mul(p.into()))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(p.into())))
 			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(p.into())))
 			.saturating_add(Weight::from_parts(0, 70).saturating_mul(p.into()))
 	}
+	/// Storage: `System::AuthorizedUpgrade` (r:0 w:1)
+	/// Proof: `System::AuthorizedUpgrade` (`max_values`: Some(1), `max_size`: Some(33), added: 528, mode: `MaxEncodedLen`)
+	fn authorize_upgrade() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `0`
+		//  Estimated: `0`
+		// Minimum execution time: 6_000_000 picoseconds.
+		Weight::from_parts(8_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 0))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: `System::AuthorizedUpgrade` (r:1 w:1)
+	/// Proof: `System::AuthorizedUpgrade` (`max_values`: Some(1), `max_size`: Some(33), added: 528, mode: `MaxEncodedLen`)
+	/// Storage: `ParachainSystem::ValidationData` (r:1 w:0)
+	/// Proof: `ParachainSystem::ValidationData` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `ParachainSystem::UpgradeRestrictionSignal` (r:1 w:0)
+	/// Proof: `ParachainSystem::UpgradeRestrictionSignal` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `ParachainSystem::PendingValidationCode` (r:1 w:1)
+	/// Proof: `ParachainSystem::PendingValidationCode` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0)
+	/// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `ParachainSystem::NewValidationCode` (r:0 w:1)
+	/// Proof: `ParachainSystem::NewValidationCode` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `ParachainSystem::DidSetValidationCode` (r:0 w:1)
+	/// Proof: `ParachainSystem::DidSetValidationCode` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	fn apply_authorized_upgrade() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `220`
+		//  Estimated: `1705`
+		// Minimum execution time: 69_629_000_000 picoseconds.
+		Weight::from_parts(74_577_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 1705))
+			.saturating_add(T::DbWeight::get().reads(5))
+			.saturating_add(T::DbWeight::get().writes(4))
+	}
 }
diff --git a/runtime/darwinia/src/weights/pallet_assets.rs b/runtime/darwinia/src/weights/pallet_assets.rs
index d1b939164..b1c98a9d2 100644
--- a/runtime/darwinia/src/weights/pallet_assets.rs
+++ b/runtime/darwinia/src/weights/pallet_assets.rs
@@ -18,8 +18,8 @@
 
 //! Autogenerated weights for `pallet_assets`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-04-17, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-06-27, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `Some("darwinia-dev")`, DB CACHE: 1024
 
@@ -62,7 +62,7 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		//  Measured:  `157`
 		//  Estimated: `3631`
 		// Minimum execution time: 10_000_000 picoseconds.
-		Weight::from_parts(13_000_000, 0)
+		Weight::from_parts(10_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3631))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -74,7 +74,7 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		//  Measured:  `157`
 		//  Estimated: `3631`
 		// Minimum execution time: 10_000_000 picoseconds.
-		Weight::from_parts(12_000_000, 0)
+		Weight::from_parts(10_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3631))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -86,7 +86,7 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		//  Measured:  `307`
 		//  Estimated: `3631`
 		// Minimum execution time: 10_000_000 picoseconds.
-		Weight::from_parts(10_000_000, 0)
+		Weight::from_parts(11_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3631))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -102,11 +102,11 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `571 + c * (183 ±0)`
 		//  Estimated: `3631 + c * (2591 ±0)`
-		// Minimum execution time: 14_000_000 picoseconds.
-		Weight::from_parts(16_000_000, 0)
+		// Minimum execution time: 13_000_000 picoseconds.
+		Weight::from_parts(13_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3631))
-			// Standard Error: 18_772
-			.saturating_add(Weight::from_parts(12_785_767, 0).saturating_mul(c.into()))
+			// Standard Error: 10_861
+			.saturating_add(Weight::from_parts(10_816_720, 0).saturating_mul(c.into()))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(c.into())))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -125,8 +125,8 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		// Minimum execution time: 13_000_000 picoseconds.
 		Weight::from_parts(14_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3631))
-			// Standard Error: 6_419
-			.saturating_add(Weight::from_parts(4_210_978, 0).saturating_mul(a.into()))
+			// Standard Error: 4_003
+			.saturating_add(Weight::from_parts(4_025_329, 0).saturating_mul(a.into()))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(a.into())))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -141,8 +141,8 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `350`
 		//  Estimated: `3631`
-		// Minimum execution time: 12_000_000 picoseconds.
-		Weight::from_parts(14_000_000, 0)
+		// Minimum execution time: 11_000_000 picoseconds.
+		Weight::from_parts(11_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3631))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -156,7 +156,7 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		//  Measured:  `350`
 		//  Estimated: `3631`
 		// Minimum execution time: 20_000_000 picoseconds.
-		Weight::from_parts(20_000_000, 0)
+		Weight::from_parts(21_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3631))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -170,7 +170,7 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		//  Measured:  `410`
 		//  Estimated: `3631`
 		// Minimum execution time: 26_000_000 picoseconds.
-		Weight::from_parts(31_000_000, 0)
+		Weight::from_parts(26_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3631))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -185,8 +185,8 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `501`
 		//  Estimated: `6168`
-		// Minimum execution time: 35_000_000 picoseconds.
-		Weight::from_parts(44_000_000, 0)
+		// Minimum execution time: 36_000_000 picoseconds.
+		Weight::from_parts(37_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 6168))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(4))
@@ -201,8 +201,8 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `501`
 		//  Estimated: `6168`
-		// Minimum execution time: 31_000_000 picoseconds.
-		Weight::from_parts(31_000_000, 0)
+		// Minimum execution time: 33_000_000 picoseconds.
+		Weight::from_parts(34_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 6168))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(4))
@@ -217,8 +217,8 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `501`
 		//  Estimated: `6168`
-		// Minimum execution time: 35_000_000 picoseconds.
-		Weight::from_parts(36_000_000, 0)
+		// Minimum execution time: 37_000_000 picoseconds.
+		Weight::from_parts(38_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 6168))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(4))
@@ -231,8 +231,8 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `410`
 		//  Estimated: `3631`
-		// Minimum execution time: 12_000_000 picoseconds.
-		Weight::from_parts(13_000_000, 0)
+		// Minimum execution time: 14_000_000 picoseconds.
+		Weight::from_parts(14_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3631))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -245,8 +245,8 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `410`
 		//  Estimated: `3631`
-		// Minimum execution time: 13_000_000 picoseconds.
-		Weight::from_parts(16_000_000, 0)
+		// Minimum execution time: 14_000_000 picoseconds.
+		Weight::from_parts(14_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3631))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -270,7 +270,7 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		//  Measured:  `307`
 		//  Estimated: `3631`
 		// Minimum execution time: 10_000_000 picoseconds.
-		Weight::from_parts(12_000_000, 0)
+		Weight::from_parts(11_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3631))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -284,7 +284,7 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		//  Measured:  `350`
 		//  Estimated: `3631`
 		// Minimum execution time: 12_000_000 picoseconds.
-		Weight::from_parts(14_000_000, 0)
+		Weight::from_parts(12_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3631))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -296,7 +296,7 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		//  Measured:  `307`
 		//  Estimated: `3631`
 		// Minimum execution time: 10_000_000 picoseconds.
-		Weight::from_parts(14_000_000, 0)
+		Weight::from_parts(10_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3631))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -307,13 +307,17 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 	/// Proof: `Assets::Metadata` (`max_values`: None, `max_size`: Some(144), added: 2619, mode: `MaxEncodedLen`)
 	/// The range of component `n` is `[0, 50]`.
 	/// The range of component `s` is `[0, 50]`.
-	fn set_metadata(_n: u32, _s: u32, ) -> Weight {
+	fn set_metadata(n: u32, s: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `350`
 		//  Estimated: `3631`
 		// Minimum execution time: 12_000_000 picoseconds.
-		Weight::from_parts(14_883_352, 0)
+		Weight::from_parts(12_858_895, 0)
 			.saturating_add(Weight::from_parts(0, 3631))
+			// Standard Error: 848
+			.saturating_add(Weight::from_parts(1_298, 0).saturating_mul(n.into()))
+			// Standard Error: 848
+			.saturating_add(Weight::from_parts(1_897, 0).saturating_mul(s.into()))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -325,8 +329,8 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `478`
 		//  Estimated: `3631`
-		// Minimum execution time: 13_000_000 picoseconds.
-		Weight::from_parts(14_000_000, 0)
+		// Minimum execution time: 12_000_000 picoseconds.
+		Weight::from_parts(13_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3631))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -337,17 +341,13 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 	/// Proof: `Assets::Metadata` (`max_values`: None, `max_size`: Some(144), added: 2619, mode: `MaxEncodedLen`)
 	/// The range of component `n` is `[0, 50]`.
 	/// The range of component `s` is `[0, 50]`.
-	fn force_set_metadata(n: u32, s: u32, ) -> Weight {
+	fn force_set_metadata(_n: u32, _s: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `237`
 		//  Estimated: `3631`
-		// Minimum execution time: 11_000_000 picoseconds.
-		Weight::from_parts(12_623_237, 0)
+		// Minimum execution time: 10_000_000 picoseconds.
+		Weight::from_parts(11_598_205, 0)
 			.saturating_add(Weight::from_parts(0, 3631))
-			// Standard Error: 2_957
-			.saturating_add(Weight::from_parts(5_255, 0).saturating_mul(n.into()))
-			// Standard Error: 2_957
-			.saturating_add(Weight::from_parts(4_533, 0).saturating_mul(s.into()))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -360,7 +360,7 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		//  Measured:  `478`
 		//  Estimated: `3631`
 		// Minimum execution time: 13_000_000 picoseconds.
-		Weight::from_parts(15_000_000, 0)
+		Weight::from_parts(13_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3631))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -371,8 +371,8 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `307`
 		//  Estimated: `3631`
-		// Minimum execution time: 10_000_000 picoseconds.
-		Weight::from_parts(13_000_000, 0)
+		// Minimum execution time: 9_000_000 picoseconds.
+		Weight::from_parts(10_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3631))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -386,7 +386,7 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		//  Measured:  `307`
 		//  Estimated: `3631`
 		// Minimum execution time: 15_000_000 picoseconds.
-		Weight::from_parts(18_000_000, 0)
+		Weight::from_parts(16_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3631))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -403,8 +403,8 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `599`
 		//  Estimated: `6168`
-		// Minimum execution time: 41_000_000 picoseconds.
-		Weight::from_parts(48_000_000, 0)
+		// Minimum execution time: 43_000_000 picoseconds.
+		Weight::from_parts(45_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 6168))
 			.saturating_add(T::DbWeight::get().reads(5))
 			.saturating_add(T::DbWeight::get().writes(5))
@@ -417,8 +417,8 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `457`
 		//  Estimated: `3631`
-		// Minimum execution time: 16_000_000 picoseconds.
-		Weight::from_parts(20_000_000, 0)
+		// Minimum execution time: 17_000_000 picoseconds.
+		Weight::from_parts(17_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3631))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -432,7 +432,7 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		//  Measured:  `457`
 		//  Estimated: `3631`
 		// Minimum execution time: 16_000_000 picoseconds.
-		Weight::from_parts(19_000_000, 0)
+		Weight::from_parts(17_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3631))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -443,7 +443,7 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `307`
 		//  Estimated: `3631`
-		// Minimum execution time: 11_000_000 picoseconds.
+		// Minimum execution time: 10_000_000 picoseconds.
 		Weight::from_parts(12_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3631))
 			.saturating_add(T::DbWeight::get().reads(1))
@@ -459,8 +459,8 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `478`
 		//  Estimated: `3631`
-		// Minimum execution time: 28_000_000 picoseconds.
-		Weight::from_parts(29_000_000, 0)
+		// Minimum execution time: 30_000_000 picoseconds.
+		Weight::from_parts(31_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3631))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(3))
@@ -473,8 +473,8 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `350`
 		//  Estimated: `3631`
-		// Minimum execution time: 26_000_000 picoseconds.
-		Weight::from_parts(28_000_000, 0)
+		// Minimum execution time: 28_000_000 picoseconds.
+		Weight::from_parts(29_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3631))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -490,7 +490,7 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		//  Measured:  `556`
 		//  Estimated: `3631`
 		// Minimum execution time: 27_000_000 picoseconds.
-		Weight::from_parts(30_000_000, 0)
+		Weight::from_parts(29_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3631))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(3))
@@ -503,8 +503,8 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `448`
 		//  Estimated: `3631`
-		// Minimum execution time: 25_000_000 picoseconds.
-		Weight::from_parts(30_000_000, 0)
+		// Minimum execution time: 27_000_000 picoseconds.
+		Weight::from_parts(28_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3631))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -517,8 +517,8 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `410`
 		//  Estimated: `3631`
-		// Minimum execution time: 13_000_000 picoseconds.
-		Weight::from_parts(13_000_000, 0)
+		// Minimum execution time: 14_000_000 picoseconds.
+		Weight::from_parts(14_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3631))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
diff --git a/runtime/darwinia/src/weights/pallet_balances.rs b/runtime/darwinia/src/weights/pallet_balances.rs
index 5efdaf5b1..6c40404ca 100644
--- a/runtime/darwinia/src/weights/pallet_balances.rs
+++ b/runtime/darwinia/src/weights/pallet_balances.rs
@@ -18,8 +18,8 @@
 
 //! Autogenerated weights for `pallet_balances`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-04-17, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-06-27, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `Some("darwinia-dev")`, DB CACHE: 1024
 
@@ -61,8 +61,8 @@ impl<T: frame_system::Config> pallet_balances::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `39`
 		//  Estimated: `3581`
-		// Minimum execution time: 45_000_000 picoseconds.
-		Weight::from_parts(46_000_000, 0)
+		// Minimum execution time: 44_000_000 picoseconds.
+		Weight::from_parts(45_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3581))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -74,7 +74,7 @@ impl<T: frame_system::Config> pallet_balances::WeightInfo for WeightInfo<T> {
 		//  Measured:  `39`
 		//  Estimated: `3581`
 		// Minimum execution time: 37_000_000 picoseconds.
-		Weight::from_parts(41_000_000, 0)
+		Weight::from_parts(38_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3581))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -85,7 +85,7 @@ impl<T: frame_system::Config> pallet_balances::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `195`
 		//  Estimated: `3581`
-		// Minimum execution time: 13_000_000 picoseconds.
+		// Minimum execution time: 14_000_000 picoseconds.
 		Weight::from_parts(15_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3581))
 			.saturating_add(T::DbWeight::get().reads(1))
@@ -110,7 +110,7 @@ impl<T: frame_system::Config> pallet_balances::WeightInfo for WeightInfo<T> {
 		//  Measured:  `234`
 		//  Estimated: `6172`
 		// Minimum execution time: 46_000_000 picoseconds.
-		Weight::from_parts(46_000_000, 0)
+		Weight::from_parts(49_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 6172))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -133,8 +133,8 @@ impl<T: frame_system::Config> pallet_balances::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `195`
 		//  Estimated: `3581`
-		// Minimum execution time: 16_000_000 picoseconds.
-		Weight::from_parts(17_000_000, 0)
+		// Minimum execution time: 17_000_000 picoseconds.
+		Weight::from_parts(18_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3581))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -146,13 +146,24 @@ impl<T: frame_system::Config> pallet_balances::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `156 + u * (124 ±0)`
 		//  Estimated: `990 + u * (2591 ±0)`
-		// Minimum execution time: 15_000_000 picoseconds.
-		Weight::from_parts(15_000_000, 0)
+		// Minimum execution time: 16_000_000 picoseconds.
+		Weight::from_parts(16_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 990))
-			// Standard Error: 17_937
-			.saturating_add(Weight::from_parts(14_958_443, 0).saturating_mul(u.into()))
+			// Standard Error: 16_859
+			.saturating_add(Weight::from_parts(13_076_232, 0).saturating_mul(u.into()))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(u.into())))
 			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(u.into())))
 			.saturating_add(Weight::from_parts(0, 2591).saturating_mul(u.into()))
 	}
+	/// Storage: `Balances::InactiveIssuance` (r:1 w:0)
+	/// Proof: `Balances::InactiveIssuance` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	fn force_adjust_total_issuance() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `0`
+		//  Estimated: `1501`
+		// Minimum execution time: 5_000_000 picoseconds.
+		Weight::from_parts(5_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 1501))
+			.saturating_add(T::DbWeight::get().reads(1))
+	}
 }
diff --git a/runtime/darwinia/src/weights/pallet_collective.rs b/runtime/darwinia/src/weights/pallet_collective.rs
index 8c44f87e3..d96a4247d 100644
--- a/runtime/darwinia/src/weights/pallet_collective.rs
+++ b/runtime/darwinia/src/weights/pallet_collective.rs
@@ -18,8 +18,8 @@
 
 //! Autogenerated weights for `pallet_collective`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-04-17, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-06-27, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `Some("darwinia-dev")`, DB CACHE: 1024
 
@@ -69,14 +69,14 @@ impl<T: frame_system::Config> pallet_collective::WeightInfo for WeightInfo<T> {
 	fn set_members(m: u32, _n: u32, p: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0 + m * (2021 ±0) + p * (2026 ±0)`
-		//  Estimated: `12200 + m * (1231 ±14) + p * (3660 ±14)`
-		// Minimum execution time: 12_000_000 picoseconds.
-		Weight::from_parts(14_000_000, 0)
+		//  Estimated: `12200 + m * (1231 ±15) + p * (3660 ±15)`
+		// Minimum execution time: 10_000_000 picoseconds.
+		Weight::from_parts(11_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 12200))
-			// Standard Error: 42_672
-			.saturating_add(Weight::from_parts(2_524_464, 0).saturating_mul(m.into()))
-			// Standard Error: 42_672
-			.saturating_add(Weight::from_parts(5_840_852, 0).saturating_mul(p.into()))
+			// Standard Error: 59_966
+			.saturating_add(Weight::from_parts(2_724_746, 0).saturating_mul(m.into()))
+			// Standard Error: 59_966
+			.saturating_add(Weight::from_parts(5_047_021, 0).saturating_mul(p.into()))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(p.into())))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -92,13 +92,13 @@ impl<T: frame_system::Config> pallet_collective::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `69 + m * (20 ±0)`
 		//  Estimated: `1554 + m * (20 ±0)`
-		// Minimum execution time: 12_000_000 picoseconds.
-		Weight::from_parts(13_757_840, 0)
+		// Minimum execution time: 11_000_000 picoseconds.
+		Weight::from_parts(11_281_809, 0)
 			.saturating_add(Weight::from_parts(0, 1554))
-			// Standard Error: 169
-			.saturating_add(Weight::from_parts(1_147, 0).saturating_mul(b.into()))
-			// Standard Error: 1_748
-			.saturating_add(Weight::from_parts(6_500, 0).saturating_mul(m.into()))
+			// Standard Error: 40
+			.saturating_add(Weight::from_parts(1_264, 0).saturating_mul(b.into()))
+			// Standard Error: 420
+			.saturating_add(Weight::from_parts(4_440, 0).saturating_mul(m.into()))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(Weight::from_parts(0, 20).saturating_mul(m.into()))
 	}
@@ -112,13 +112,13 @@ impl<T: frame_system::Config> pallet_collective::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `69 + m * (20 ±0)`
 		//  Estimated: `3534 + m * (20 ±0)`
-		// Minimum execution time: 14_000_000 picoseconds.
-		Weight::from_parts(15_144_593, 0)
+		// Minimum execution time: 13_000_000 picoseconds.
+		Weight::from_parts(12_974_317, 0)
 			.saturating_add(Weight::from_parts(0, 3534))
-			// Standard Error: 205
-			.saturating_add(Weight::from_parts(1_252, 0).saturating_mul(b.into()))
-			// Standard Error: 2_119
-			.saturating_add(Weight::from_parts(14_175, 0).saturating_mul(m.into()))
+			// Standard Error: 44
+			.saturating_add(Weight::from_parts(1_235, 0).saturating_mul(b.into()))
+			// Standard Error: 457
+			.saturating_add(Weight::from_parts(7_401, 0).saturating_mul(m.into()))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(Weight::from_parts(0, 20).saturating_mul(m.into()))
 	}
@@ -139,15 +139,15 @@ impl<T: frame_system::Config> pallet_collective::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `357 + m * (20 ±0) + p * (36 ±0)`
 		//  Estimated: `3751 + m * (21 ±0) + p * (36 ±0)`
-		// Minimum execution time: 19_000_000 picoseconds.
-		Weight::from_parts(21_349_823, 0)
+		// Minimum execution time: 17_000_000 picoseconds.
+		Weight::from_parts(18_523_259, 0)
 			.saturating_add(Weight::from_parts(0, 3751))
-			// Standard Error: 310
-			.saturating_add(Weight::from_parts(2_594, 0).saturating_mul(b.into()))
-			// Standard Error: 3_235
-			.saturating_add(Weight::from_parts(16_099, 0).saturating_mul(m.into()))
-			// Standard Error: 3_194
-			.saturating_add(Weight::from_parts(147_951, 0).saturating_mul(p.into()))
+			// Standard Error: 69
+			.saturating_add(Weight::from_parts(948, 0).saturating_mul(b.into()))
+			// Standard Error: 727
+			.saturating_add(Weight::from_parts(7_919, 0).saturating_mul(m.into()))
+			// Standard Error: 718
+			.saturating_add(Weight::from_parts(117_169, 0).saturating_mul(p.into()))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(4))
 			.saturating_add(Weight::from_parts(0, 21).saturating_mul(m.into()))
@@ -162,11 +162,11 @@ impl<T: frame_system::Config> pallet_collective::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `832 + m * (40 ±0)`
 		//  Estimated: `4296 + m * (40 ±0)`
-		// Minimum execution time: 15_000_000 picoseconds.
-		Weight::from_parts(20_438_495, 0)
+		// Minimum execution time: 14_000_000 picoseconds.
+		Weight::from_parts(15_359_237, 0)
 			.saturating_add(Weight::from_parts(0, 4296))
-			// Standard Error: 2_884
-			.saturating_add(Weight::from_parts(2_181, 0).saturating_mul(m.into()))
+			// Standard Error: 720
+			.saturating_add(Weight::from_parts(8_818, 0).saturating_mul(m.into()))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
 			.saturating_add(Weight::from_parts(0, 40).saturating_mul(m.into()))
@@ -185,13 +185,13 @@ impl<T: frame_system::Config> pallet_collective::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `409 + m * (40 ±0) + p * (36 ±0)`
 		//  Estimated: `3854 + m * (41 ±0) + p * (36 ±0)`
-		// Minimum execution time: 21_000_000 picoseconds.
-		Weight::from_parts(24_507_602, 0)
+		// Minimum execution time: 19_000_000 picoseconds.
+		Weight::from_parts(18_928_975, 0)
 			.saturating_add(Weight::from_parts(0, 3854))
-			// Standard Error: 3_730
-			.saturating_add(Weight::from_parts(9_154, 0).saturating_mul(m.into()))
-			// Standard Error: 3_637
-			.saturating_add(Weight::from_parts(155_830, 0).saturating_mul(p.into()))
+			// Standard Error: 858
+			.saturating_add(Weight::from_parts(10_089, 0).saturating_mul(m.into()))
+			// Standard Error: 837
+			.saturating_add(Weight::from_parts(117_526, 0).saturating_mul(p.into()))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(3))
 			.saturating_add(Weight::from_parts(0, 41).saturating_mul(m.into()))
@@ -212,15 +212,15 @@ impl<T: frame_system::Config> pallet_collective::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `711 + b * (1 ±0) + m * (40 ±0) + p * (40 ±0)`
 		//  Estimated: `4028 + b * (1 ±0) + m * (42 ±0) + p * (40 ±0)`
-		// Minimum execution time: 29_000_000 picoseconds.
-		Weight::from_parts(35_276_866, 0)
+		// Minimum execution time: 27_000_000 picoseconds.
+		Weight::from_parts(28_636_530, 0)
 			.saturating_add(Weight::from_parts(0, 4028))
-			// Standard Error: 452
-			.saturating_add(Weight::from_parts(312, 0).saturating_mul(b.into()))
-			// Standard Error: 4_778
-			.saturating_add(Weight::from_parts(11_758, 0).saturating_mul(m.into()))
-			// Standard Error: 4_657
-			.saturating_add(Weight::from_parts(184_288, 0).saturating_mul(p.into()))
+			// Standard Error: 92
+			.saturating_add(Weight::from_parts(584, 0).saturating_mul(b.into()))
+			// Standard Error: 976
+			.saturating_add(Weight::from_parts(2_264, 0).saturating_mul(m.into()))
+			// Standard Error: 952
+			.saturating_add(Weight::from_parts(127_220, 0).saturating_mul(p.into()))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(3))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(b.into()))
@@ -243,13 +243,13 @@ impl<T: frame_system::Config> pallet_collective::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `429 + m * (40 ±0) + p * (36 ±0)`
 		//  Estimated: `3874 + m * (41 ±0) + p * (36 ±0)`
-		// Minimum execution time: 22_000_000 picoseconds.
-		Weight::from_parts(25_746_046, 0)
+		// Minimum execution time: 20_000_000 picoseconds.
+		Weight::from_parts(21_425_355, 0)
 			.saturating_add(Weight::from_parts(0, 3874))
-			// Standard Error: 4_105
-			.saturating_add(Weight::from_parts(18_507, 0).saturating_mul(m.into()))
-			// Standard Error: 4_003
-			.saturating_add(Weight::from_parts(166_215, 0).saturating_mul(p.into()))
+			// Standard Error: 673
+			.saturating_add(Weight::from_parts(3_424, 0).saturating_mul(m.into()))
+			// Standard Error: 656
+			.saturating_add(Weight::from_parts(116_574, 0).saturating_mul(p.into()))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(3))
 			.saturating_add(Weight::from_parts(0, 41).saturating_mul(m.into()))
@@ -272,15 +272,13 @@ impl<T: frame_system::Config> pallet_collective::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `731 + b * (1 ±0) + m * (40 ±0) + p * (40 ±0)`
 		//  Estimated: `4048 + b * (1 ±0) + m * (42 ±0) + p * (40 ±0)`
-		// Minimum execution time: 31_000_000 picoseconds.
-		Weight::from_parts(34_881_904, 0)
+		// Minimum execution time: 29_000_000 picoseconds.
+		Weight::from_parts(31_047_662, 0)
 			.saturating_add(Weight::from_parts(0, 4048))
-			// Standard Error: 459
-			.saturating_add(Weight::from_parts(1_411, 0).saturating_mul(b.into()))
-			// Standard Error: 4_853
-			.saturating_add(Weight::from_parts(15_186, 0).saturating_mul(m.into()))
-			// Standard Error: 4_730
-			.saturating_add(Weight::from_parts(219_708, 0).saturating_mul(p.into()))
+			// Standard Error: 130
+			.saturating_add(Weight::from_parts(587, 0).saturating_mul(b.into()))
+			// Standard Error: 1_349
+			.saturating_add(Weight::from_parts(138_483, 0).saturating_mul(p.into()))
 			.saturating_add(T::DbWeight::get().reads(5))
 			.saturating_add(T::DbWeight::get().writes(3))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(b.into()))
@@ -298,11 +296,11 @@ impl<T: frame_system::Config> pallet_collective::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `226 + p * (32 ±0)`
 		//  Estimated: `1711 + p * (32 ±0)`
-		// Minimum execution time: 12_000_000 picoseconds.
-		Weight::from_parts(14_572_083, 0)
+		// Minimum execution time: 11_000_000 picoseconds.
+		Weight::from_parts(11_835_833, 0)
 			.saturating_add(Weight::from_parts(0, 1711))
-			// Standard Error: 3_293
-			.saturating_add(Weight::from_parts(133_984, 0).saturating_mul(p.into()))
+			// Standard Error: 615
+			.saturating_add(Weight::from_parts(109_439, 0).saturating_mul(p.into()))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(3))
 			.saturating_add(Weight::from_parts(0, 32).saturating_mul(p.into()))
diff --git a/runtime/darwinia/src/weights/pallet_conviction_voting.rs b/runtime/darwinia/src/weights/pallet_conviction_voting.rs
index f1becd9a9..61f408759 100644
--- a/runtime/darwinia/src/weights/pallet_conviction_voting.rs
+++ b/runtime/darwinia/src/weights/pallet_conviction_voting.rs
@@ -18,8 +18,8 @@
 
 //! Autogenerated weights for `pallet_conviction_voting`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-04-17, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-06-27, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `Some("darwinia-dev")`, DB CACHE: 1024
 
@@ -71,8 +71,8 @@ impl<T: frame_system::Config> pallet_conviction_voting::WeightInfo for WeightInf
 		// Proof Size summary in bytes:
 		//  Measured:  `13458`
 		//  Estimated: `42428`
-		// Minimum execution time: 83_000_000 picoseconds.
-		Weight::from_parts(114_000_000, 0)
+		// Minimum execution time: 82_000_000 picoseconds.
+		Weight::from_parts(86_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 42428))
 			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(5))
@@ -93,8 +93,8 @@ impl<T: frame_system::Config> pallet_conviction_voting::WeightInfo for WeightInf
 		// Proof Size summary in bytes:
 		//  Measured:  `14179`
 		//  Estimated: `83866`
-		// Minimum execution time: 146_000_000 picoseconds.
-		Weight::from_parts(179_000_000, 0)
+		// Minimum execution time: 115_000_000 picoseconds.
+		Weight::from_parts(118_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 83866))
 			.saturating_add(T::DbWeight::get().reads(7))
 			.saturating_add(T::DbWeight::get().writes(6))
@@ -109,8 +109,8 @@ impl<T: frame_system::Config> pallet_conviction_voting::WeightInfo for WeightInf
 		// Proof Size summary in bytes:
 		//  Measured:  `13928`
 		//  Estimated: `83866`
-		// Minimum execution time: 127_000_000 picoseconds.
-		Weight::from_parts(150_000_000, 0)
+		// Minimum execution time: 93_000_000 picoseconds.
+		Weight::from_parts(97_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 83866))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(4))
@@ -123,8 +123,8 @@ impl<T: frame_system::Config> pallet_conviction_voting::WeightInfo for WeightInf
 		// Proof Size summary in bytes:
 		//  Measured:  `13052`
 		//  Estimated: `30694`
-		// Minimum execution time: 49_000_000 picoseconds.
-		Weight::from_parts(59_000_000, 0)
+		// Minimum execution time: 45_000_000 picoseconds.
+		Weight::from_parts(47_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 30694))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -146,11 +146,11 @@ impl<T: frame_system::Config> pallet_conviction_voting::WeightInfo for WeightInf
 		// Proof Size summary in bytes:
 		//  Measured:  `7020 + r * (447 ±0)`
 		//  Estimated: `83866 + r * (3387 ±0)`
-		// Minimum execution time: 48_000_000 picoseconds.
-		Weight::from_parts(11_535_378, 0)
+		// Minimum execution time: 41_000_000 picoseconds.
+		Weight::from_parts(99_814_644, 0)
 			.saturating_add(Weight::from_parts(0, 83866))
-			// Standard Error: 603_581
-			.saturating_add(Weight::from_parts(68_717_460, 0).saturating_mul(r.into()))
+			// Standard Error: 303_431
+			.saturating_add(Weight::from_parts(34_505_600, 0).saturating_mul(r.into()))
 			.saturating_add(T::DbWeight::get().reads(7))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r.into())))
 			.saturating_add(T::DbWeight::get().writes(6))
@@ -168,11 +168,11 @@ impl<T: frame_system::Config> pallet_conviction_voting::WeightInfo for WeightInf
 		// Proof Size summary in bytes:
 		//  Measured:  `6876 + r * (447 ±0)`
 		//  Estimated: `83866 + r * (3387 ±0)`
-		// Minimum execution time: 24_000_000 picoseconds.
-		Weight::from_parts(27_000_000, 0)
+		// Minimum execution time: 18_000_000 picoseconds.
+		Weight::from_parts(63_087_454, 0)
 			.saturating_add(Weight::from_parts(0, 83866))
-			// Standard Error: 304_107
-			.saturating_add(Weight::from_parts(68_012_144, 0).saturating_mul(r.into()))
+			// Standard Error: 340_241
+			.saturating_add(Weight::from_parts(34_766_287, 0).saturating_mul(r.into()))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r.into())))
 			.saturating_add(T::DbWeight::get().writes(4))
@@ -191,8 +191,8 @@ impl<T: frame_system::Config> pallet_conviction_voting::WeightInfo for WeightInf
 		// Proof Size summary in bytes:
 		//  Measured:  `12038`
 		//  Estimated: `30694`
-		// Minimum execution time: 70_000_000 picoseconds.
-		Weight::from_parts(92_000_000, 0)
+		// Minimum execution time: 72_000_000 picoseconds.
+		Weight::from_parts(79_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 30694))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(3))
diff --git a/runtime/darwinia/src/weights/pallet_message_queue.rs b/runtime/darwinia/src/weights/pallet_message_queue.rs
new file mode 100644
index 000000000..f40205bce
--- /dev/null
+++ b/runtime/darwinia/src/weights/pallet_message_queue.rs
@@ -0,0 +1,191 @@
+// This file is part of Darwinia.
+//
+// Copyright (C) Darwinia Network
+// SPDX-License-Identifier: GPL-3.0
+//
+// Darwinia is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Darwinia is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Darwinia. If not, see <https://www.gnu.org/licenses/>.
+
+//! Autogenerated weights for `pallet_message_queue`
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-06-27, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! WORST CASE MAP SIZE: `1000000`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("darwinia-dev")`, DB CACHE: 1024
+
+// Executed Command:
+// target/release/darwinia
+// benchmark
+// pallet
+// --header
+// .maintain/license-header
+// --heap-pages
+// 4096
+// --chain
+// darwinia-dev
+// --output
+// runtime/darwinia/src/weights
+// --pallet
+// *
+// --extrinsic
+// *
+// --steps
+// 50
+// --repeat
+// 20
+
+#![cfg_attr(rustfmt, rustfmt_skip)]
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+#![allow(missing_docs)]
+
+use frame_support::{traits::Get, weights::Weight};
+use core::marker::PhantomData;
+
+/// Weight functions for `pallet_message_queue`.
+pub struct WeightInfo<T>(PhantomData<T>);
+impl<T: frame_system::Config> pallet_message_queue::WeightInfo for WeightInfo<T> {
+	/// Storage: `MessageQueue::ServiceHead` (r:1 w:0)
+	/// Proof: `MessageQueue::ServiceHead` (`max_values`: Some(1), `max_size`: Some(5), added: 500, mode: `MaxEncodedLen`)
+	/// Storage: `MessageQueue::BookStateFor` (r:2 w:2)
+	/// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	fn ready_ring_knit() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `223`
+		//  Estimated: `6044`
+		// Minimum execution time: 11_000_000 picoseconds.
+		Weight::from_parts(11_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 6044))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	/// Storage: `MessageQueue::BookStateFor` (r:2 w:2)
+	/// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	/// Storage: `MessageQueue::ServiceHead` (r:1 w:1)
+	/// Proof: `MessageQueue::ServiceHead` (`max_values`: Some(1), `max_size`: Some(5), added: 500, mode: `MaxEncodedLen`)
+	fn ready_ring_unknit() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `218`
+		//  Estimated: `6044`
+		// Minimum execution time: 9_000_000 picoseconds.
+		Weight::from_parts(10_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 6044))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(3))
+	}
+	/// Storage: `MessageQueue::BookStateFor` (r:1 w:1)
+	/// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	fn service_queue_base() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `6`
+		//  Estimated: `3517`
+		// Minimum execution time: 3_000_000 picoseconds.
+		Weight::from_parts(4_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 3517))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: `MessageQueue::Pages` (r:1 w:1)
+	/// Proof: `MessageQueue::Pages` (`max_values`: None, `max_size`: Some(65585), added: 68060, mode: `MaxEncodedLen`)
+	fn service_page_base_completion() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `72`
+		//  Estimated: `69050`
+		// Minimum execution time: 5_000_000 picoseconds.
+		Weight::from_parts(5_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 69050))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: `MessageQueue::Pages` (r:1 w:1)
+	/// Proof: `MessageQueue::Pages` (`max_values`: None, `max_size`: Some(65585), added: 68060, mode: `MaxEncodedLen`)
+	fn service_page_base_no_completion() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `72`
+		//  Estimated: `69050`
+		// Minimum execution time: 5_000_000 picoseconds.
+		Weight::from_parts(5_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 69050))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: `MessageQueue::BookStateFor` (r:0 w:1)
+	/// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	/// Storage: `MessageQueue::Pages` (r:0 w:1)
+	/// Proof: `MessageQueue::Pages` (`max_values`: None, `max_size`: Some(65585), added: 68060, mode: `MaxEncodedLen`)
+	fn service_page_item() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `0`
+		//  Estimated: `0`
+		// Minimum execution time: 81_000_000 picoseconds.
+		Weight::from_parts(82_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 0))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	/// Storage: `MessageQueue::ServiceHead` (r:1 w:1)
+	/// Proof: `MessageQueue::ServiceHead` (`max_values`: Some(1), `max_size`: Some(5), added: 500, mode: `MaxEncodedLen`)
+	/// Storage: `MessageQueue::BookStateFor` (r:1 w:0)
+	/// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	fn bump_service_head() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `171`
+		//  Estimated: `3517`
+		// Minimum execution time: 6_000_000 picoseconds.
+		Weight::from_parts(6_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 3517))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: `MessageQueue::BookStateFor` (r:1 w:1)
+	/// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	/// Storage: `MessageQueue::Pages` (r:1 w:1)
+	/// Proof: `MessageQueue::Pages` (`max_values`: None, `max_size`: Some(65585), added: 68060, mode: `MaxEncodedLen`)
+	fn reap_page() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `65667`
+		//  Estimated: `69050`
+		// Minimum execution time: 34_000_000 picoseconds.
+		Weight::from_parts(36_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 69050))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	/// Storage: `MessageQueue::BookStateFor` (r:1 w:1)
+	/// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	/// Storage: `MessageQueue::Pages` (r:1 w:1)
+	/// Proof: `MessageQueue::Pages` (`max_values`: None, `max_size`: Some(65585), added: 68060, mode: `MaxEncodedLen`)
+	fn execute_overweight_page_removed() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `65667`
+		//  Estimated: `69050`
+		// Minimum execution time: 44_000_000 picoseconds.
+		Weight::from_parts(45_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 69050))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	/// Storage: `MessageQueue::BookStateFor` (r:1 w:1)
+	/// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	/// Storage: `MessageQueue::Pages` (r:1 w:1)
+	/// Proof: `MessageQueue::Pages` (`max_values`: None, `max_size`: Some(65585), added: 68060, mode: `MaxEncodedLen`)
+	fn execute_overweight_page_updated() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `65667`
+		//  Estimated: `69050`
+		// Minimum execution time: 52_000_000 picoseconds.
+		Weight::from_parts(57_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 69050))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+}
diff --git a/runtime/darwinia/src/weights/pallet_preimage.rs b/runtime/darwinia/src/weights/pallet_preimage.rs
index 7470c58a1..56241dc51 100644
--- a/runtime/darwinia/src/weights/pallet_preimage.rs
+++ b/runtime/darwinia/src/weights/pallet_preimage.rs
@@ -18,8 +18,8 @@
 
 //! Autogenerated weights for `pallet_preimage`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-04-17, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-06-27, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `Some("darwinia-dev")`, DB CACHE: 1024
 
@@ -55,25 +55,31 @@ use core::marker::PhantomData;
 /// Weight functions for `pallet_preimage`.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> pallet_preimage::WeightInfo for WeightInfo<T> {
-	/// Storage: `Preimage::StatusFor` (r:1 w:1)
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
 	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Holds` (r:1 w:1)
+	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(55), added: 2530, mode: `MaxEncodedLen`)
 	/// Storage: `Preimage::PreimageFor` (r:0 w:1)
 	/// Proof: `Preimage::PreimageFor` (`max_values`: None, `max_size`: Some(4194344), added: 4196819, mode: `MaxEncodedLen`)
 	/// The range of component `s` is `[0, 4194304]`.
 	fn note_preimage(s: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `208`
+		//  Measured:  `42`
 		//  Estimated: `3544`
-		// Minimum execution time: 27_000_000 picoseconds.
-		Weight::from_parts(28_000_000, 0)
+		// Minimum execution time: 47_000_000 picoseconds.
+		Weight::from_parts(48_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3544))
 			// Standard Error: 2
-			.saturating_add(Weight::from_parts(1_264, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(2))
+			.saturating_add(Weight::from_parts(1_090, 0).saturating_mul(s.into()))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(3))
 	}
-	/// Storage: `Preimage::StatusFor` (r:1 w:1)
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
 	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
 	/// Storage: `Preimage::PreimageFor` (r:0 w:1)
 	/// Proof: `Preimage::PreimageFor` (`max_values`: None, `max_size`: Some(4194344), added: 4196819, mode: `MaxEncodedLen`)
 	/// The range of component `s` is `[0, 4194304]`.
@@ -81,16 +87,18 @@ impl<T: frame_system::Config> pallet_preimage::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `106`
 		//  Estimated: `3544`
-		// Minimum execution time: 12_000_000 picoseconds.
-		Weight::from_parts(12_000_000, 0)
+		// Minimum execution time: 13_000_000 picoseconds.
+		Weight::from_parts(13_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3544))
-			// Standard Error: 2
-			.saturating_add(Weight::from_parts(1_265, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
+			// Standard Error: 1
+			.saturating_add(Weight::from_parts(1_080, 0).saturating_mul(s.into()))
+			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	/// Storage: `Preimage::StatusFor` (r:1 w:1)
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
 	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
 	/// Storage: `Preimage::PreimageFor` (r:0 w:1)
 	/// Proof: `Preimage::PreimageFor` (`max_values`: None, `max_size`: Some(4194344), added: 4196819, mode: `MaxEncodedLen`)
 	/// The range of component `s` is `[0, 4194304]`.
@@ -98,80 +106,94 @@ impl<T: frame_system::Config> pallet_preimage::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `106`
 		//  Estimated: `3544`
-		// Minimum execution time: 12_000_000 picoseconds.
-		Weight::from_parts(12_000_000, 0)
+		// Minimum execution time: 13_000_000 picoseconds.
+		Weight::from_parts(13_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3544))
-			// Standard Error: 2
-			.saturating_add(Weight::from_parts(1_245, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
+			// Standard Error: 1
+			.saturating_add(Weight::from_parts(1_045, 0).saturating_mul(s.into()))
+			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	/// Storage: `Preimage::StatusFor` (r:1 w:1)
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
 	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Holds` (r:1 w:1)
+	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(55), added: 2530, mode: `MaxEncodedLen`)
 	/// Storage: `Preimage::PreimageFor` (r:0 w:1)
 	/// Proof: `Preimage::PreimageFor` (`max_values`: None, `max_size`: Some(4194344), added: 4196819, mode: `MaxEncodedLen`)
 	fn unnote_preimage() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `342`
+		//  Measured:  `219`
 		//  Estimated: `3544`
-		// Minimum execution time: 33_000_000 picoseconds.
-		Weight::from_parts(46_000_000, 0)
+		// Minimum execution time: 44_000_000 picoseconds.
+		Weight::from_parts(45_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3544))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(2))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(3))
 	}
-	/// Storage: `Preimage::StatusFor` (r:1 w:1)
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
 	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
 	/// Storage: `Preimage::PreimageFor` (r:0 w:1)
 	/// Proof: `Preimage::PreimageFor` (`max_values`: None, `max_size`: Some(4194344), added: 4196819, mode: `MaxEncodedLen`)
 	fn unnote_no_deposit_preimage() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `144`
 		//  Estimated: `3544`
-		// Minimum execution time: 18_000_000 picoseconds.
-		Weight::from_parts(23_000_000, 0)
+		// Minimum execution time: 16_000_000 picoseconds.
+		Weight::from_parts(17_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3544))
-			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	/// Storage: `Preimage::StatusFor` (r:1 w:1)
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
 	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
 	fn request_preimage() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `176`
 		//  Estimated: `3544`
-		// Minimum execution time: 17_000_000 picoseconds.
-		Weight::from_parts(23_000_000, 0)
+		// Minimum execution time: 12_000_000 picoseconds.
+		Weight::from_parts(14_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3544))
-			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	/// Storage: `Preimage::StatusFor` (r:1 w:1)
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
 	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
 	fn request_no_deposit_preimage() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `144`
 		//  Estimated: `3544`
-		// Minimum execution time: 10_000_000 picoseconds.
-		Weight::from_parts(14_000_000, 0)
+		// Minimum execution time: 9_000_000 picoseconds.
+		Weight::from_parts(10_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3544))
-			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	/// Storage: `Preimage::StatusFor` (r:1 w:1)
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
 	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
 	fn request_unnoted_preimage() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `42`
 		//  Estimated: `3544`
-		// Minimum execution time: 10_000_000 picoseconds.
-		Weight::from_parts(13_000_000, 0)
+		// Minimum execution time: 9_000_000 picoseconds.
+		Weight::from_parts(9_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3544))
-			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	/// Storage: `Preimage::StatusFor` (r:1 w:1)
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
 	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
 	fn request_requested_preimage() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `106`
@@ -179,25 +201,29 @@ impl<T: frame_system::Config> pallet_preimage::WeightInfo for WeightInfo<T> {
 		// Minimum execution time: 8_000_000 picoseconds.
 		Weight::from_parts(9_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3544))
-			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	/// Storage: `Preimage::StatusFor` (r:1 w:1)
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
 	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
 	/// Storage: `Preimage::PreimageFor` (r:0 w:1)
 	/// Proof: `Preimage::PreimageFor` (`max_values`: None, `max_size`: Some(4194344), added: 4196819, mode: `MaxEncodedLen`)
 	fn unrequest_preimage() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `144`
 		//  Estimated: `3544`
-		// Minimum execution time: 18_000_000 picoseconds.
-		Weight::from_parts(23_000_000, 0)
+		// Minimum execution time: 13_000_000 picoseconds.
+		Weight::from_parts(15_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3544))
-			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	/// Storage: `Preimage::StatusFor` (r:1 w:1)
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
 	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
 	fn unrequest_unnoted_preimage() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `106`
@@ -205,19 +231,43 @@ impl<T: frame_system::Config> pallet_preimage::WeightInfo for WeightInfo<T> {
 		// Minimum execution time: 8_000_000 picoseconds.
 		Weight::from_parts(9_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3544))
-			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	/// Storage: `Preimage::StatusFor` (r:1 w:1)
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
 	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
 	fn unrequest_multi_referenced_preimage() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `106`
 		//  Estimated: `3544`
 		// Minimum execution time: 8_000_000 picoseconds.
-		Weight::from_parts(10_000_000, 0)
+		Weight::from_parts(9_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3544))
-			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
+	/// Storage: `Preimage::StatusFor` (r:1023 w:1023)
+	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:1023 w:1023)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(116), added: 2591, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Holds` (r:1023 w:1023)
+	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(55), added: 2530, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:0 w:1023)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
+	/// The range of component `n` is `[1, 1024]`.
+	fn ensure_updated(n: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `249 + n * (203 ±0)`
+		//  Estimated: `990 + n * (2591 ±0)`
+		// Minimum execution time: 56_000_000 picoseconds.
+		Weight::from_parts(56_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 990))
+			// Standard Error: 22_480
+			.saturating_add(Weight::from_parts(52_910_356, 0).saturating_mul(n.into()))
+			.saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(n.into())))
+			.saturating_add(T::DbWeight::get().writes((4_u64).saturating_mul(n.into())))
+			.saturating_add(Weight::from_parts(0, 2591).saturating_mul(n.into()))
+	}
 }
diff --git a/runtime/darwinia/src/weights/pallet_proxy.rs b/runtime/darwinia/src/weights/pallet_proxy.rs
index 2fc6276ba..b6e2b080b 100644
--- a/runtime/darwinia/src/weights/pallet_proxy.rs
+++ b/runtime/darwinia/src/weights/pallet_proxy.rs
@@ -18,8 +18,8 @@
 
 //! Autogenerated weights for `pallet_proxy`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-04-17, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-06-27, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `Some("darwinia-dev")`, DB CACHE: 1024
 
@@ -63,10 +63,10 @@ impl<T: frame_system::Config> pallet_proxy::WeightInfo for WeightInfo<T> {
 		//  Measured:  `149 + p * (25 ±0)`
 		//  Estimated: `4310`
 		// Minimum execution time: 11_000_000 picoseconds.
-		Weight::from_parts(13_594_197, 0)
+		Weight::from_parts(12_023_213, 0)
 			.saturating_add(Weight::from_parts(0, 4310))
-			// Standard Error: 5_538
-			.saturating_add(Weight::from_parts(55_399, 0).saturating_mul(p.into()))
+			// Standard Error: 1_162
+			.saturating_add(Weight::from_parts(2_112, 0).saturating_mul(p.into()))
 			.saturating_add(T::DbWeight::get().reads(1))
 	}
 	/// Storage: `Proxy::Proxies` (r:1 w:0)
@@ -81,13 +81,13 @@ impl<T: frame_system::Config> pallet_proxy::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `401 + a * (56 ±0) + p * (25 ±0)`
 		//  Estimated: `5302`
-		// Minimum execution time: 28_000_000 picoseconds.
-		Weight::from_parts(34_678_185, 0)
+		// Minimum execution time: 29_000_000 picoseconds.
+		Weight::from_parts(29_924_775, 0)
 			.saturating_add(Weight::from_parts(0, 5302))
-			// Standard Error: 8_347
-			.saturating_add(Weight::from_parts(149_699, 0).saturating_mul(a.into()))
-			// Standard Error: 8_624
-			.saturating_add(Weight::from_parts(36_682, 0).saturating_mul(p.into()))
+			// Standard Error: 2_717
+			.saturating_add(Weight::from_parts(119_376, 0).saturating_mul(a.into()))
+			// Standard Error: 2_808
+			.saturating_add(Weight::from_parts(16_783, 0).saturating_mul(p.into()))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
@@ -102,10 +102,10 @@ impl<T: frame_system::Config> pallet_proxy::WeightInfo for WeightInfo<T> {
 		//  Measured:  `329 + a * (56 ±0)`
 		//  Estimated: `5302`
 		// Minimum execution time: 19_000_000 picoseconds.
-		Weight::from_parts(24_262_794, 0)
+		Weight::from_parts(20_851_030, 0)
 			.saturating_add(Weight::from_parts(0, 5302))
-			// Standard Error: 7_280
-			.saturating_add(Weight::from_parts(121_831, 0).saturating_mul(a.into()))
+			// Standard Error: 2_110
+			.saturating_add(Weight::from_parts(119_938, 0).saturating_mul(a.into()))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
@@ -119,13 +119,13 @@ impl<T: frame_system::Config> pallet_proxy::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `329 + a * (56 ±0)`
 		//  Estimated: `5302`
-		// Minimum execution time: 19_000_000 picoseconds.
-		Weight::from_parts(22_544_673, 0)
+		// Minimum execution time: 20_000_000 picoseconds.
+		Weight::from_parts(20_304_126, 0)
 			.saturating_add(Weight::from_parts(0, 5302))
-			// Standard Error: 6_191
-			.saturating_add(Weight::from_parts(156_736, 0).saturating_mul(a.into()))
-			// Standard Error: 6_397
-			.saturating_add(Weight::from_parts(1_711, 0).saturating_mul(p.into()))
+			// Standard Error: 2_237
+			.saturating_add(Weight::from_parts(133_692, 0).saturating_mul(a.into()))
+			// Standard Error: 2_311
+			.saturating_add(Weight::from_parts(5_486, 0).saturating_mul(p.into()))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
@@ -141,13 +141,13 @@ impl<T: frame_system::Config> pallet_proxy::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `345 + a * (56 ±0) + p * (25 ±0)`
 		//  Estimated: `5302`
-		// Minimum execution time: 26_000_000 picoseconds.
-		Weight::from_parts(30_222_429, 0)
+		// Minimum execution time: 27_000_000 picoseconds.
+		Weight::from_parts(27_284_753, 0)
 			.saturating_add(Weight::from_parts(0, 5302))
-			// Standard Error: 6_590
-			.saturating_add(Weight::from_parts(183_633, 0).saturating_mul(a.into()))
-			// Standard Error: 6_809
-			.saturating_add(Weight::from_parts(45_836, 0).saturating_mul(p.into()))
+			// Standard Error: 2_221
+			.saturating_add(Weight::from_parts(119_893, 0).saturating_mul(a.into()))
+			// Standard Error: 2_294
+			.saturating_add(Weight::from_parts(12_747, 0).saturating_mul(p.into()))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
@@ -158,11 +158,11 @@ impl<T: frame_system::Config> pallet_proxy::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `149 + p * (25 ±0)`
 		//  Estimated: `4310`
-		// Minimum execution time: 20_000_000 picoseconds.
-		Weight::from_parts(23_672_179, 0)
+		// Minimum execution time: 21_000_000 picoseconds.
+		Weight::from_parts(21_921_957, 0)
 			.saturating_add(Weight::from_parts(0, 4310))
-			// Standard Error: 9_037
-			.saturating_add(Weight::from_parts(83_493, 0).saturating_mul(p.into()))
+			// Standard Error: 1_693
+			.saturating_add(Weight::from_parts(9_667, 0).saturating_mul(p.into()))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -173,11 +173,11 @@ impl<T: frame_system::Config> pallet_proxy::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `149 + p * (25 ±0)`
 		//  Estimated: `4310`
-		// Minimum execution time: 21_000_000 picoseconds.
-		Weight::from_parts(24_860_107, 0)
+		// Minimum execution time: 20_000_000 picoseconds.
+		Weight::from_parts(21_865_165, 0)
 			.saturating_add(Weight::from_parts(0, 4310))
-			// Standard Error: 9_403
-			.saturating_add(Weight::from_parts(41_230, 0).saturating_mul(p.into()))
+			// Standard Error: 1_852
+			.saturating_add(Weight::from_parts(7_270, 0).saturating_mul(p.into()))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -188,39 +188,39 @@ impl<T: frame_system::Config> pallet_proxy::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `149 + p * (25 ±0)`
 		//  Estimated: `4310`
-		// Minimum execution time: 18_000_000 picoseconds.
-		Weight::from_parts(21_205_617, 0)
+		// Minimum execution time: 20_000_000 picoseconds.
+		Weight::from_parts(20_898_631, 0)
 			.saturating_add(Weight::from_parts(0, 4310))
-			// Standard Error: 7_798
-			.saturating_add(Weight::from_parts(77_601, 0).saturating_mul(p.into()))
+			// Standard Error: 2_130
+			.saturating_add(Weight::from_parts(23_928, 0).saturating_mul(p.into()))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
 	/// Storage: `Proxy::Proxies` (r:1 w:1)
 	/// Proof: `Proxy::Proxies` (`max_values`: None, `max_size`: Some(845), added: 3320, mode: `MaxEncodedLen`)
 	/// The range of component `p` is `[1, 31]`.
-	fn create_pure(_p: u32, ) -> Weight {
+	fn create_pure(p: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `161`
 		//  Estimated: `4310`
-		// Minimum execution time: 21_000_000 picoseconds.
-		Weight::from_parts(26_352_808, 0)
+		// Minimum execution time: 22_000_000 picoseconds.
+		Weight::from_parts(22_881_540, 0)
 			.saturating_add(Weight::from_parts(0, 4310))
+			// Standard Error: 1_227
+			.saturating_add(Weight::from_parts(9_307, 0).saturating_mul(p.into()))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
 	/// Storage: `Proxy::Proxies` (r:1 w:1)
 	/// Proof: `Proxy::Proxies` (`max_values`: None, `max_size`: Some(845), added: 3320, mode: `MaxEncodedLen`)
 	/// The range of component `p` is `[0, 30]`.
-	fn kill_pure(p: u32, ) -> Weight {
+	fn kill_pure(_p: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `174 + p * (25 ±0)`
 		//  Estimated: `4310`
-		// Minimum execution time: 18_000_000 picoseconds.
-		Weight::from_parts(21_776_685, 0)
+		// Minimum execution time: 20_000_000 picoseconds.
+		Weight::from_parts(21_935_467, 0)
 			.saturating_add(Weight::from_parts(0, 4310))
-			// Standard Error: 9_109
-			.saturating_add(Weight::from_parts(94_580, 0).saturating_mul(p.into()))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
diff --git a/runtime/darwinia/src/weights/pallet_referenda.rs b/runtime/darwinia/src/weights/pallet_referenda.rs
index b498a8d3c..274a53a03 100644
--- a/runtime/darwinia/src/weights/pallet_referenda.rs
+++ b/runtime/darwinia/src/weights/pallet_referenda.rs
@@ -18,8 +18,8 @@
 
 //! Autogenerated weights for `pallet_referenda`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-04-17, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-06-27, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `Some("darwinia-dev")`, DB CACHE: 1024
 
@@ -65,8 +65,8 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `275`
 		//  Estimated: `42428`
-		// Minimum execution time: 32_000_000 picoseconds.
-		Weight::from_parts(37_000_000, 0)
+		// Minimum execution time: 29_000_000 picoseconds.
+		Weight::from_parts(30_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 42428))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(3))
@@ -79,8 +79,8 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `516`
 		//  Estimated: `83866`
-		// Minimum execution time: 42_000_000 picoseconds.
-		Weight::from_parts(50_000_000, 0)
+		// Minimum execution time: 37_000_000 picoseconds.
+		Weight::from_parts(39_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 83866))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(3))
@@ -95,10 +95,10 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(38963), added: 41438, mode: `MaxEncodedLen`)
 	fn place_decision_deposit_queued() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3314`
+		//  Measured:  `3309`
 		//  Estimated: `42428`
-		// Minimum execution time: 45_000_000 picoseconds.
-		Weight::from_parts(56_000_000, 0)
+		// Minimum execution time: 43_000_000 picoseconds.
+		Weight::from_parts(43_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 42428))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(3))
@@ -113,10 +113,10 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(38963), added: 41438, mode: `MaxEncodedLen`)
 	fn place_decision_deposit_not_queued() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3334`
+		//  Measured:  `3329`
 		//  Estimated: `42428`
-		// Minimum execution time: 44_000_000 picoseconds.
-		Weight::from_parts(57_000_000, 0)
+		// Minimum execution time: 42_000_000 picoseconds.
+		Weight::from_parts(43_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 42428))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(3))
@@ -131,8 +131,8 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `516`
 		//  Estimated: `83866`
-		// Minimum execution time: 50_000_000 picoseconds.
-		Weight::from_parts(59_000_000, 0)
+		// Minimum execution time: 45_000_000 picoseconds.
+		Weight::from_parts(47_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 83866))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(4))
@@ -147,8 +147,8 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `516`
 		//  Estimated: `83866`
-		// Minimum execution time: 48_000_000 picoseconds.
-		Weight::from_parts(56_000_000, 0)
+		// Minimum execution time: 44_000_000 picoseconds.
+		Weight::from_parts(47_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 83866))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(4))
@@ -159,8 +159,8 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `425`
 		//  Estimated: `4377`
-		// Minimum execution time: 26_000_000 picoseconds.
-		Weight::from_parts(32_000_000, 0)
+		// Minimum execution time: 25_000_000 picoseconds.
+		Weight::from_parts(27_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 4377))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -171,8 +171,8 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `384`
 		//  Estimated: `4377`
-		// Minimum execution time: 24_000_000 picoseconds.
-		Weight::from_parts(28_000_000, 0)
+		// Minimum execution time: 25_000_000 picoseconds.
+		Weight::from_parts(26_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 4377))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -185,8 +185,8 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `390`
 		//  Estimated: `83866`
-		// Minimum execution time: 28_000_000 picoseconds.
-		Weight::from_parts(30_000_000, 0)
+		// Minimum execution time: 25_000_000 picoseconds.
+		Weight::from_parts(26_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 83866))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(3))
@@ -203,8 +203,8 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `880`
 		//  Estimated: `83866`
-		// Minimum execution time: 96_000_000 picoseconds.
-		Weight::from_parts(106_000_000, 0)
+		// Minimum execution time: 85_000_000 picoseconds.
+		Weight::from_parts(86_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 83866))
 			.saturating_add(T::DbWeight::get().reads(5))
 			.saturating_add(T::DbWeight::get().writes(4))
@@ -218,7 +218,7 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 		//  Measured:  `207`
 		//  Estimated: `5477`
 		// Minimum execution time: 7_000_000 picoseconds.
-		Weight::from_parts(9_000_000, 0)
+		Weight::from_parts(8_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 5477))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -231,10 +231,10 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(38963), added: 41438, mode: `MaxEncodedLen`)
 	fn one_fewer_deciding_failing() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3179`
+		//  Measured:  `3195`
 		//  Estimated: `42428`
-		// Minimum execution time: 32_000_000 picoseconds.
-		Weight::from_parts(38_000_000, 0)
+		// Minimum execution time: 27_000_000 picoseconds.
+		Weight::from_parts(27_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 42428))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(3))
@@ -247,10 +247,10 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(38963), added: 41438, mode: `MaxEncodedLen`)
 	fn one_fewer_deciding_passing() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3165`
+		//  Measured:  `3209`
 		//  Estimated: `42428`
-		// Minimum execution time: 33_000_000 picoseconds.
-		Weight::from_parts(38_000_000, 0)
+		// Minimum execution time: 29_000_000 picoseconds.
+		Weight::from_parts(30_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 42428))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(3))
@@ -264,7 +264,7 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 		//  Measured:  `3020`
 		//  Estimated: `5477`
 		// Minimum execution time: 13_000_000 picoseconds.
-		Weight::from_parts(17_000_000, 0)
+		Weight::from_parts(14_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 5477))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -277,8 +277,8 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `3020`
 		//  Estimated: `5477`
-		// Minimum execution time: 15_000_000 picoseconds.
-		Weight::from_parts(18_000_000, 0)
+		// Minimum execution time: 12_000_000 picoseconds.
+		Weight::from_parts(13_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 5477))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -293,8 +293,8 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `3024`
 		//  Estimated: `5477`
-		// Minimum execution time: 17_000_000 picoseconds.
-		Weight::from_parts(21_000_000, 0)
+		// Minimum execution time: 16_000_000 picoseconds.
+		Weight::from_parts(17_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 5477))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -310,7 +310,7 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 		//  Measured:  `3044`
 		//  Estimated: `5477`
 		// Minimum execution time: 16_000_000 picoseconds.
-		Weight::from_parts(21_000_000, 0)
+		Weight::from_parts(16_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 5477))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -323,8 +323,8 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `354`
 		//  Estimated: `42428`
-		// Minimum execution time: 18_000_000 picoseconds.
-		Weight::from_parts(21_000_000, 0)
+		// Minimum execution time: 17_000_000 picoseconds.
+		Weight::from_parts(18_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 42428))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -337,8 +337,8 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `390`
 		//  Estimated: `42428`
-		// Minimum execution time: 19_000_000 picoseconds.
-		Weight::from_parts(23_000_000, 0)
+		// Minimum execution time: 17_000_000 picoseconds.
+		Weight::from_parts(17_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 42428))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -349,8 +349,8 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `299`
 		//  Estimated: `4377`
-		// Minimum execution time: 12_000_000 picoseconds.
-		Weight::from_parts(14_000_000, 0)
+		// Minimum execution time: 11_000_000 picoseconds.
+		Weight::from_parts(12_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 4377))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -365,8 +365,8 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `390`
 		//  Estimated: `42428`
-		// Minimum execution time: 24_000_000 picoseconds.
-		Weight::from_parts(24_000_000, 0)
+		// Minimum execution time: 22_000_000 picoseconds.
+		Weight::from_parts(23_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 42428))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(3))
@@ -381,8 +381,8 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `390`
 		//  Estimated: `42428`
-		// Minimum execution time: 26_000_000 picoseconds.
-		Weight::from_parts(28_000_000, 0)
+		// Minimum execution time: 24_000_000 picoseconds.
+		Weight::from_parts(25_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 42428))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(3))
@@ -395,8 +395,8 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `443`
 		//  Estimated: `42428`
-		// Minimum execution time: 22_000_000 picoseconds.
-		Weight::from_parts(27_000_000, 0)
+		// Minimum execution time: 19_000_000 picoseconds.
+		Weight::from_parts(20_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 42428))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -409,8 +409,8 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `426`
 		//  Estimated: `42428`
-		// Minimum execution time: 22_000_000 picoseconds.
-		Weight::from_parts(25_000_000, 0)
+		// Minimum execution time: 19_000_000 picoseconds.
+		Weight::from_parts(19_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 42428))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -423,8 +423,8 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `443`
 		//  Estimated: `42428`
-		// Minimum execution time: 18_000_000 picoseconds.
-		Weight::from_parts(22_000_000, 0)
+		// Minimum execution time: 17_000_000 picoseconds.
+		Weight::from_parts(18_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 42428))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -437,8 +437,8 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `447`
 		//  Estimated: `42428`
-		// Minimum execution time: 19_000_000 picoseconds.
-		Weight::from_parts(21_000_000, 0)
+		// Minimum execution time: 17_000_000 picoseconds.
+		Weight::from_parts(18_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 42428))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -453,8 +453,8 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `447`
 		//  Estimated: `83866`
-		// Minimum execution time: 31_000_000 picoseconds.
-		Weight::from_parts(37_000_000, 0)
+		// Minimum execution time: 27_000_000 picoseconds.
+		Weight::from_parts(28_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 83866))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(4))
@@ -467,8 +467,8 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `443`
 		//  Estimated: `42428`
-		// Minimum execution time: 21_000_000 picoseconds.
-		Weight::from_parts(24_000_000, 0)
+		// Minimum execution time: 19_000_000 picoseconds.
+		Weight::from_parts(20_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 42428))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -477,6 +477,8 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 	/// Proof: `Referenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(912), added: 3387, mode: `MaxEncodedLen`)
 	/// Storage: `Preimage::StatusFor` (r:1 w:0)
 	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:0)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
 	/// Storage: `Referenda::MetadataOf` (r:0 w:1)
 	/// Proof: `Referenda::MetadataOf` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
 	fn set_some_metadata() -> Weight {
@@ -484,9 +486,9 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 		//  Measured:  `443`
 		//  Estimated: `4377`
 		// Minimum execution time: 16_000_000 picoseconds.
-		Weight::from_parts(18_000_000, 0)
+		Weight::from_parts(16_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 4377))
-			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
 	/// Storage: `Referenda::ReferendumInfoFor` (r:1 w:0)
@@ -497,7 +499,7 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `376`
 		//  Estimated: `4377`
-		// Minimum execution time: 13_000_000 picoseconds.
+		// Minimum execution time: 12_000_000 picoseconds.
 		Weight::from_parts(13_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 4377))
 			.saturating_add(T::DbWeight::get().reads(2))
diff --git a/runtime/darwinia/src/weights/pallet_scheduler.rs b/runtime/darwinia/src/weights/pallet_scheduler.rs
index f052ba14c..f95c1b1ed 100644
--- a/runtime/darwinia/src/weights/pallet_scheduler.rs
+++ b/runtime/darwinia/src/weights/pallet_scheduler.rs
@@ -18,8 +18,8 @@
 
 //! Autogenerated weights for `pallet_scheduler`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-04-17, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-06-27, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `Some("darwinia-dev")`, DB CACHE: 1024
 
@@ -74,11 +74,11 @@ impl<T: frame_system::Config> pallet_scheduler::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `78 + s * (177 ±0)`
 		//  Estimated: `42428`
-		// Minimum execution time: 2_000_000 picoseconds.
-		Weight::from_parts(5_575_568, 0)
+		// Minimum execution time: 3_000_000 picoseconds.
+		Weight::from_parts(5_597_112, 0)
 			.saturating_add(Weight::from_parts(0, 42428))
-			// Standard Error: 6_004
-			.saturating_add(Weight::from_parts(762_741, 0).saturating_mul(s.into()))
+			// Standard Error: 1_626
+			.saturating_add(Weight::from_parts(378_421, 0).saturating_mul(s.into()))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -86,25 +86,27 @@ impl<T: frame_system::Config> pallet_scheduler::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 5_000_000 picoseconds.
-		Weight::from_parts(5_000_000, 0)
+		// Minimum execution time: 2_000_000 picoseconds.
+		Weight::from_parts(3_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 	}
 	/// Storage: `Preimage::PreimageFor` (r:1 w:1)
 	/// Proof: `Preimage::PreimageFor` (`max_values`: None, `max_size`: Some(4194344), added: 4196819, mode: `Measured`)
-	/// Storage: `Preimage::StatusFor` (r:1 w:1)
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
 	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
 	/// The range of component `s` is `[128, 4194304]`.
 	fn service_task_fetched(s: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `179 + s * (1 ±0)`
 		//  Estimated: `3644 + s * (1 ±0)`
-		// Minimum execution time: 16_000_000 picoseconds.
-		Weight::from_parts(17_000_000, 0)
+		// Minimum execution time: 15_000_000 picoseconds.
+		Weight::from_parts(5_444_460, 0)
 			.saturating_add(Weight::from_parts(0, 3644))
-			// Standard Error: 2
-			.saturating_add(Weight::from_parts(593, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
+			// Standard Error: 3
+			.saturating_add(Weight::from_parts(444, 0).saturating_mul(s.into()))
+			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(2))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(s.into()))
 	}
@@ -114,8 +116,8 @@ impl<T: frame_system::Config> pallet_scheduler::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 5_000_000 picoseconds.
-		Weight::from_parts(5_000_000, 0)
+		// Minimum execution time: 4_000_000 picoseconds.
+		Weight::from_parts(4_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -123,8 +125,8 @@ impl<T: frame_system::Config> pallet_scheduler::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 4_000_000 picoseconds.
-		Weight::from_parts(5_000_000, 0)
+		// Minimum execution time: 2_000_000 picoseconds.
+		Weight::from_parts(3_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 	}
 	fn execute_dispatch_signed() -> Weight {
@@ -140,7 +142,7 @@ impl<T: frame_system::Config> pallet_scheduler::WeightInfo for WeightInfo<T> {
 		//  Measured:  `0`
 		//  Estimated: `0`
 		// Minimum execution time: 2_000_000 picoseconds.
-		Weight::from_parts(3_000_000, 0)
+		Weight::from_parts(2_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 	}
 	/// Storage: `Scheduler::Agenda` (r:1 w:1)
@@ -150,11 +152,11 @@ impl<T: frame_system::Config> pallet_scheduler::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `78 + s * (177 ±0)`
 		//  Estimated: `42428`
-		// Minimum execution time: 9_000_000 picoseconds.
-		Weight::from_parts(13_002_823, 0)
+		// Minimum execution time: 8_000_000 picoseconds.
+		Weight::from_parts(10_836_235, 0)
 			.saturating_add(Weight::from_parts(0, 42428))
-			// Standard Error: 6_810
-			.saturating_add(Weight::from_parts(803_558, 0).saturating_mul(s.into()))
+			// Standard Error: 1_646
+			.saturating_add(Weight::from_parts(362_847, 0).saturating_mul(s.into()))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -167,11 +169,11 @@ impl<T: frame_system::Config> pallet_scheduler::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `78 + s * (177 ±0)`
 		//  Estimated: `42428`
-		// Minimum execution time: 14_000_000 picoseconds.
-		Weight::from_parts(14_034_612, 0)
+		// Minimum execution time: 12_000_000 picoseconds.
+		Weight::from_parts(11_572_734, 0)
 			.saturating_add(Weight::from_parts(0, 42428))
-			// Standard Error: 8_123
-			.saturating_add(Weight::from_parts(1_394_799, 0).saturating_mul(s.into()))
+			// Standard Error: 1_374
+			.saturating_add(Weight::from_parts(578_559, 0).saturating_mul(s.into()))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
@@ -185,10 +187,10 @@ impl<T: frame_system::Config> pallet_scheduler::WeightInfo for WeightInfo<T> {
 		//  Measured:  `255 + s * (185 ±0)`
 		//  Estimated: `42428`
 		// Minimum execution time: 11_000_000 picoseconds.
-		Weight::from_parts(16_772_705, 0)
+		Weight::from_parts(14_313_176, 0)
 			.saturating_add(Weight::from_parts(0, 42428))
-			// Standard Error: 6_150
-			.saturating_add(Weight::from_parts(827_726, 0).saturating_mul(s.into()))
+			// Standard Error: 2_166
+			.saturating_add(Weight::from_parts(373_829, 0).saturating_mul(s.into()))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
@@ -202,10 +204,10 @@ impl<T: frame_system::Config> pallet_scheduler::WeightInfo for WeightInfo<T> {
 		//  Measured:  `281 + s * (185 ±0)`
 		//  Estimated: `42428`
 		// Minimum execution time: 14_000_000 picoseconds.
-		Weight::from_parts(15_500_408, 0)
+		Weight::from_parts(13_578_285, 0)
 			.saturating_add(Weight::from_parts(0, 42428))
-			// Standard Error: 6_743
-			.saturating_add(Weight::from_parts(1_451_356, 0).saturating_mul(s.into()))
+			// Standard Error: 1_137
+			.saturating_add(Weight::from_parts(596_067, 0).saturating_mul(s.into()))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
diff --git a/runtime/darwinia/src/weights/pallet_session.rs b/runtime/darwinia/src/weights/pallet_session.rs
index 3cab90edd..d6a8fa96f 100644
--- a/runtime/darwinia/src/weights/pallet_session.rs
+++ b/runtime/darwinia/src/weights/pallet_session.rs
@@ -18,8 +18,8 @@
 
 //! Autogenerated weights for `pallet_session`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-04-17, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-06-27, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `Some("darwinia-dev")`, DB CACHE: 1024
 
@@ -63,8 +63,8 @@ impl<T: frame_system::Config> pallet_session::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `246`
 		//  Estimated: `3711`
-		// Minimum execution time: 13_000_000 picoseconds.
-		Weight::from_parts(16_000_000, 0)
+		// Minimum execution time: 14_000_000 picoseconds.
+		Weight::from_parts(15_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3711))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -77,8 +77,8 @@ impl<T: frame_system::Config> pallet_session::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `228`
 		//  Estimated: `3693`
-		// Minimum execution time: 9_000_000 picoseconds.
-		Weight::from_parts(11_000_000, 0)
+		// Minimum execution time: 10_000_000 picoseconds.
+		Weight::from_parts(10_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3693))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(2))
diff --git a/runtime/darwinia/src/weights/pallet_timestamp.rs b/runtime/darwinia/src/weights/pallet_timestamp.rs
index 448c9b1c8..2a5e60e17 100644
--- a/runtime/darwinia/src/weights/pallet_timestamp.rs
+++ b/runtime/darwinia/src/weights/pallet_timestamp.rs
@@ -18,8 +18,8 @@
 
 //! Autogenerated weights for `pallet_timestamp`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-04-17, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-06-27, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `Some("darwinia-dev")`, DB CACHE: 1024
 
@@ -59,20 +59,20 @@ impl<T: frame_system::Config> pallet_timestamp::WeightInfo for WeightInfo<T> {
 	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `MaxEncodedLen`)
 	fn set() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `42`
+		//  Measured:  `6`
 		//  Estimated: `1493`
-		// Minimum execution time: 5_000_000 picoseconds.
-		Weight::from_parts(5_000_000, 0)
+		// Minimum execution time: 3_000_000 picoseconds.
+		Weight::from_parts(4_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 1493))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
 	fn on_finalize() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `94`
+		//  Measured:  `57`
 		//  Estimated: `0`
-		// Minimum execution time: 3_000_000 picoseconds.
-		Weight::from_parts(4_000_000, 0)
+		// Minimum execution time: 2_000_000 picoseconds.
+		Weight::from_parts(3_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 	}
 }
diff --git a/runtime/darwinia/src/weights/pallet_treasury.rs b/runtime/darwinia/src/weights/pallet_treasury.rs
index 4a7efc718..cf11f06d2 100644
--- a/runtime/darwinia/src/weights/pallet_treasury.rs
+++ b/runtime/darwinia/src/weights/pallet_treasury.rs
@@ -18,8 +18,8 @@
 
 //! Autogenerated weights for `pallet_treasury`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-04-17, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-06-27, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `Some("darwinia-dev")`, DB CACHE: 1024
 
@@ -61,12 +61,12 @@ impl<T: frame_system::Config> pallet_treasury::WeightInfo for WeightInfo<T> {
 	/// Proof: `Treasury::Approvals` (`max_values`: Some(1), `max_size`: Some(402), added: 897, mode: `MaxEncodedLen`)
 	/// Storage: `Treasury::Proposals` (r:0 w:1)
 	/// Proof: `Treasury::Proposals` (`max_values`: None, `max_size`: Some(84), added: 2559, mode: `MaxEncodedLen`)
-	fn spend() -> Weight {
+	fn spend_local() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `109`
 		//  Estimated: `1887`
-		// Minimum execution time: 10_000_000 picoseconds.
-		Weight::from_parts(13_000_000, 0)
+		// Minimum execution time: 8_000_000 picoseconds.
+		Weight::from_parts(9_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 1887))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(3))
@@ -80,7 +80,7 @@ impl<T: frame_system::Config> pallet_treasury::WeightInfo for WeightInfo<T> {
 		//  Measured:  `275`
 		//  Estimated: `1489`
 		// Minimum execution time: 23_000_000 picoseconds.
-		Weight::from_parts(26_000_000, 0)
+		Weight::from_parts(24_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 1489))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -93,8 +93,8 @@ impl<T: frame_system::Config> pallet_treasury::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `571`
 		//  Estimated: `6172`
-		// Minimum execution time: 40_000_000 picoseconds.
-		Weight::from_parts(46_000_000, 0)
+		// Minimum execution time: 37_000_000 picoseconds.
+		Weight::from_parts(38_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 6172))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(3))
@@ -108,11 +108,11 @@ impl<T: frame_system::Config> pallet_treasury::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `537 + p * (8 ±0)`
 		//  Estimated: `3549`
-		// Minimum execution time: 7_000_000 picoseconds.
-		Weight::from_parts(10_332_420, 0)
+		// Minimum execution time: 6_000_000 picoseconds.
+		Weight::from_parts(8_680_628, 0)
 			.saturating_add(Weight::from_parts(0, 3549))
-			// Standard Error: 1_551
-			.saturating_add(Weight::from_parts(31_488, 0).saturating_mul(p.into()))
+			// Standard Error: 794
+			.saturating_add(Weight::from_parts(17_204, 0).saturating_mul(p.into()))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -123,7 +123,7 @@ impl<T: frame_system::Config> pallet_treasury::WeightInfo for WeightInfo<T> {
 		//  Measured:  `194`
 		//  Estimated: `1887`
 		// Minimum execution time: 5_000_000 picoseconds.
-		Weight::from_parts(7_000_000, 0)
+		Weight::from_parts(5_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 1887))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -136,21 +136,73 @@ impl<T: frame_system::Config> pallet_treasury::WeightInfo for WeightInfo<T> {
 	/// Proof: `Balances::InactiveIssuance` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
 	/// Storage: `Treasury::Approvals` (r:1 w:1)
 	/// Proof: `Treasury::Approvals` (`max_values`: Some(1), `max_size`: Some(402), added: 897, mode: `MaxEncodedLen`)
-	/// Storage: `Treasury::Proposals` (r:100 w:0)
+	/// Storage: `Treasury::Proposals` (r:99 w:0)
 	/// Proof: `Treasury::Proposals` (`max_values`: None, `max_size`: Some(84), added: 2559, mode: `MaxEncodedLen`)
-	/// The range of component `p` is `[0, 100]`.
+	/// The range of component `p` is `[0, 99]`.
 	fn on_initialize_proposals(p: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `328 + p * (97 ±0)`
 		//  Estimated: `3581 + p * (2559 ±0)`
-		// Minimum execution time: 26_000_000 picoseconds.
-		Weight::from_parts(24_092_063, 0)
+		// Minimum execution time: 18_000_000 picoseconds.
+		Weight::from_parts(16_684_026, 0)
 			.saturating_add(Weight::from_parts(0, 3581))
-			// Standard Error: 10_140
-			.saturating_add(Weight::from_parts(2_672_898, 0).saturating_mul(p.into()))
+			// Standard Error: 5_581
+			.saturating_add(Weight::from_parts(2_419_379, 0).saturating_mul(p.into()))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(p.into())))
 			.saturating_add(T::DbWeight::get().writes(3))
 			.saturating_add(Weight::from_parts(0, 2559).saturating_mul(p.into()))
 	}
+	/// Storage: `Treasury::SpendCount` (r:1 w:1)
+	/// Proof: `Treasury::SpendCount` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Treasury::Spends` (r:0 w:1)
+	/// Proof: `Treasury::Spends` (`max_values`: None, `max_size`: Some(57), added: 2532, mode: `MaxEncodedLen`)
+	fn spend() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `109`
+		//  Estimated: `1489`
+		// Minimum execution time: 8_000_000 picoseconds.
+		Weight::from_parts(8_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 1489))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	/// Storage: `Treasury::Spends` (r:1 w:1)
+	/// Proof: `Treasury::Spends` (`max_values`: None, `max_size`: Some(57), added: 2532, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:2 w:2)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(116), added: 2591, mode: `MaxEncodedLen`)
+	fn payout() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `416`
+		//  Estimated: `6172`
+		// Minimum execution time: 48_000_000 picoseconds.
+		Weight::from_parts(49_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 6172))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(3))
+	}
+	/// Storage: `Treasury::Spends` (r:1 w:1)
+	/// Proof: `Treasury::Spends` (`max_values`: None, `max_size`: Some(57), added: 2532, mode: `MaxEncodedLen`)
+	fn check_status() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `215`
+		//  Estimated: `3522`
+		// Minimum execution time: 10_000_000 picoseconds.
+		Weight::from_parts(11_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 3522))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: `Treasury::Spends` (r:1 w:1)
+	/// Proof: `Treasury::Spends` (`max_values`: None, `max_size`: Some(57), added: 2532, mode: `MaxEncodedLen`)
+	fn void_spend() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `215`
+		//  Estimated: `3522`
+		// Minimum execution time: 9_000_000 picoseconds.
+		Weight::from_parts(10_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 3522))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
 }
diff --git a/runtime/darwinia/src/weights/pallet_utility.rs b/runtime/darwinia/src/weights/pallet_utility.rs
index f8c7f2e7d..9497861fe 100644
--- a/runtime/darwinia/src/weights/pallet_utility.rs
+++ b/runtime/darwinia/src/weights/pallet_utility.rs
@@ -18,8 +18,8 @@
 
 //! Autogenerated weights for `pallet_utility`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-04-17, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-06-27, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `Some("darwinia-dev")`, DB CACHE: 1024
 
@@ -60,11 +60,11 @@ impl<T: frame_system::Config> pallet_utility::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 5_000_000 picoseconds.
-		Weight::from_parts(2_929_925, 0)
+		// Minimum execution time: 3_000_000 picoseconds.
+		Weight::from_parts(8_163_691, 0)
 			.saturating_add(Weight::from_parts(0, 0))
-			// Standard Error: 4_761
-			.saturating_add(Weight::from_parts(5_537_940, 0).saturating_mul(c.into()))
+			// Standard Error: 2_661
+			.saturating_add(Weight::from_parts(3_516_152, 0).saturating_mul(c.into()))
 	}
 	fn as_derivative() -> Weight {
 		// Proof Size summary in bytes:
@@ -79,18 +79,18 @@ impl<T: frame_system::Config> pallet_utility::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 5_000_000 picoseconds.
-		Weight::from_parts(2_185_317, 0)
+		// Minimum execution time: 4_000_000 picoseconds.
+		Weight::from_parts(8_605_755, 0)
 			.saturating_add(Weight::from_parts(0, 0))
-			// Standard Error: 5_832
-			.saturating_add(Weight::from_parts(5_933_205, 0).saturating_mul(c.into()))
+			// Standard Error: 3_441
+			.saturating_add(Weight::from_parts(3_778_083, 0).saturating_mul(c.into()))
 	}
 	fn dispatch_as() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 7_000_000 picoseconds.
-		Weight::from_parts(8_000_000, 0)
+		// Minimum execution time: 6_000_000 picoseconds.
+		Weight::from_parts(6_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 	}
 	/// The range of component `c` is `[0, 1000]`.
@@ -98,10 +98,10 @@ impl<T: frame_system::Config> pallet_utility::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 5_000_000 picoseconds.
-		Weight::from_parts(10_938_945, 0)
+		// Minimum execution time: 4_000_000 picoseconds.
+		Weight::from_parts(4_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
-			// Standard Error: 3_951
-			.saturating_add(Weight::from_parts(5_511_020, 0).saturating_mul(c.into()))
+			// Standard Error: 2_282
+			.saturating_add(Weight::from_parts(3_563_062, 0).saturating_mul(c.into()))
 	}
 }
diff --git a/runtime/darwinia/src/weights/pallet_whitelist.rs b/runtime/darwinia/src/weights/pallet_whitelist.rs
index cde451272..a4d6fa928 100644
--- a/runtime/darwinia/src/weights/pallet_whitelist.rs
+++ b/runtime/darwinia/src/weights/pallet_whitelist.rs
@@ -18,8 +18,8 @@
 
 //! Autogenerated weights for `pallet_whitelist`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-04-17, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-06-27, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `Some("darwinia-dev")`, DB CACHE: 1024
 
@@ -57,67 +57,75 @@ pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> pallet_whitelist::WeightInfo for WeightInfo<T> {
 	/// Storage: `Whitelist::WhitelistedCall` (r:1 w:1)
 	/// Proof: `Whitelist::WhitelistedCall` (`max_values`: None, `max_size`: Some(40), added: 2515, mode: `MaxEncodedLen`)
-	/// Storage: `Preimage::StatusFor` (r:1 w:1)
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
 	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
 	fn whitelist_call() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `84`
+		//  Measured:  `48`
 		//  Estimated: `3544`
-		// Minimum execution time: 16_000_000 picoseconds.
-		Weight::from_parts(19_000_000, 0)
+		// Minimum execution time: 15_000_000 picoseconds.
+		Weight::from_parts(16_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3544))
-			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
 	/// Storage: `Whitelist::WhitelistedCall` (r:1 w:1)
 	/// Proof: `Whitelist::WhitelistedCall` (`max_values`: None, `max_size`: Some(40), added: 2515, mode: `MaxEncodedLen`)
-	/// Storage: `Preimage::StatusFor` (r:1 w:1)
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
 	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
 	fn remove_whitelisted_call() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `213`
+		//  Measured:  `176`
 		//  Estimated: `3544`
 		// Minimum execution time: 14_000_000 picoseconds.
-		Weight::from_parts(17_000_000, 0)
+		Weight::from_parts(15_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3544))
-			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
 	/// Storage: `Whitelist::WhitelistedCall` (r:1 w:1)
 	/// Proof: `Whitelist::WhitelistedCall` (`max_values`: None, `max_size`: Some(40), added: 2515, mode: `MaxEncodedLen`)
 	/// Storage: `Preimage::PreimageFor` (r:1 w:1)
 	/// Proof: `Preimage::PreimageFor` (`max_values`: None, `max_size`: Some(4194344), added: 4196819, mode: `Measured`)
-	/// Storage: `Preimage::StatusFor` (r:1 w:1)
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
 	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
 	/// The range of component `n` is `[1, 4194294]`.
 	fn dispatch_whitelisted_call(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `289 + n * (1 ±0)`
-		//  Estimated: `3753 + n * (1 ±0)`
+		//  Measured:  `252 + n * (1 ±0)`
+		//  Estimated: `3716 + n * (1 ±0)`
 		// Minimum execution time: 24_000_000 picoseconds.
-		Weight::from_parts(27_000_000, 0)
-			.saturating_add(Weight::from_parts(0, 3753))
-			// Standard Error: 2
-			.saturating_add(Weight::from_parts(589, 0).saturating_mul(n.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
+		Weight::from_parts(25_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 3716))
+			// Standard Error: 1
+			.saturating_add(Weight::from_parts(466, 0).saturating_mul(n.into()))
+			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(3))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(n.into()))
 	}
 	/// Storage: `Whitelist::WhitelistedCall` (r:1 w:1)
 	/// Proof: `Whitelist::WhitelistedCall` (`max_values`: None, `max_size`: Some(40), added: 2515, mode: `MaxEncodedLen`)
-	/// Storage: `Preimage::StatusFor` (r:1 w:1)
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
 	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
 	/// The range of component `n` is `[1, 10000]`.
 	fn dispatch_whitelisted_call_with_preimage(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `213`
+		//  Measured:  `176`
 		//  Estimated: `3544`
 		// Minimum execution time: 17_000_000 picoseconds.
-		Weight::from_parts(20_325_635, 0)
+		Weight::from_parts(17_439_358, 0)
 			.saturating_add(Weight::from_parts(0, 3544))
-			// Standard Error: 25
-			.saturating_add(Weight::from_parts(1_152, 0).saturating_mul(n.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
+			// Standard Error: 5
+			.saturating_add(Weight::from_parts(992, 0).saturating_mul(n.into()))
+			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
 }
diff --git a/runtime/koi/src/weights/cumulus_pallet_parachain_system.rs b/runtime/koi/src/weights/cumulus_pallet_parachain_system.rs
new file mode 100644
index 000000000..4f633cfa4
--- /dev/null
+++ b/runtime/koi/src/weights/cumulus_pallet_parachain_system.rs
@@ -0,0 +1,82 @@
+// This file is part of Darwinia.
+//
+// Copyright (C) Darwinia Network
+// SPDX-License-Identifier: GPL-3.0
+//
+// Darwinia is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Darwinia is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Darwinia. If not, see <https://www.gnu.org/licenses/>.
+
+//! Autogenerated weights for `cumulus_pallet_parachain_system`
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-06-27, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! WORST CASE MAP SIZE: `1000000`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("koi-dev")`, DB CACHE: 1024
+
+// Executed Command:
+// target/release/darwinia
+// benchmark
+// pallet
+// --header
+// .maintain/license-header
+// --heap-pages
+// 4096
+// --chain
+// koi-dev
+// --output
+// runtime/koi/src/weights
+// --pallet
+// *
+// --extrinsic
+// *
+// --steps
+// 50
+// --repeat
+// 20
+
+#![cfg_attr(rustfmt, rustfmt_skip)]
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+#![allow(missing_docs)]
+
+use frame_support::{traits::Get, weights::Weight};
+use core::marker::PhantomData;
+
+/// Weight functions for `cumulus_pallet_parachain_system`.
+pub struct WeightInfo<T>(PhantomData<T>);
+impl<T: frame_system::Config> cumulus_pallet_parachain_system::WeightInfo for WeightInfo<T> {
+	/// Storage: `ParachainSystem::LastDmqMqcHead` (r:1 w:1)
+	/// Proof: `ParachainSystem::LastDmqMqcHead` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `MessageQueue::BookStateFor` (r:1 w:1)
+	/// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	/// Storage: `MessageQueue::ServiceHead` (r:1 w:1)
+	/// Proof: `MessageQueue::ServiceHead` (`max_values`: Some(1), `max_size`: Some(5), added: 500, mode: `MaxEncodedLen`)
+	/// Storage: `ParachainSystem::ProcessedDownwardMessages` (r:0 w:1)
+	/// Proof: `ParachainSystem::ProcessedDownwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `MessageQueue::Pages` (r:0 w:1000)
+	/// Proof: `MessageQueue::Pages` (`max_values`: None, `max_size`: Some(65585), added: 68060, mode: `MaxEncodedLen`)
+	/// The range of component `n` is `[0, 1000]`.
+	fn enqueue_inbound_downward_messages(n: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `82`
+		//  Estimated: `3517`
+		// Minimum execution time: 2_000_000 picoseconds.
+		Weight::from_parts(3_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 3517))
+			// Standard Error: 43_768
+			.saturating_add(Weight::from_parts(100_147_420, 0).saturating_mul(n.into()))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(4))
+			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(n.into())))
+	}
+}
diff --git a/runtime/koi/src/weights/cumulus_pallet_xcmp_queue.rs b/runtime/koi/src/weights/cumulus_pallet_xcmp_queue.rs
index f7723d76c..835628f87 100644
--- a/runtime/koi/src/weights/cumulus_pallet_xcmp_queue.rs
+++ b/runtime/koi/src/weights/cumulus_pallet_xcmp_queue.rs
@@ -18,8 +18,8 @@
 
 //! Autogenerated weights for `cumulus_pallet_xcmp_queue`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-06-04, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-06-27, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `Some("koi-dev")`, DB CACHE: 1024
 
@@ -61,22 +61,100 @@ impl<T: frame_system::Config> cumulus_pallet_xcmp_queue::WeightInfo for WeightIn
 		// Proof Size summary in bytes:
 		//  Measured:  `42`
 		//  Estimated: `1527`
-		// Minimum execution time: 5_000_000 picoseconds.
-		Weight::from_parts(6_000_000, 0)
+		// Minimum execution time: 4_000_000 picoseconds.
+		Weight::from_parts(5_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 1527))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	/// Storage: `XcmpQueue::QueueConfig` (r:1 w:1)
+	/// Storage: `XcmpQueue::QueueConfig` (r:1 w:0)
 	/// Proof: `XcmpQueue::QueueConfig` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	fn set_config_with_weight() -> Weight {
+	/// Storage: `MessageQueue::BookStateFor` (r:1 w:1)
+	/// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	/// Storage: `MessageQueue::ServiceHead` (r:1 w:1)
+	/// Proof: `MessageQueue::ServiceHead` (`max_values`: Some(1), `max_size`: Some(5), added: 500, mode: `MaxEncodedLen`)
+	/// Storage: `XcmpQueue::InboundXcmpSuspended` (r:1 w:0)
+	/// Proof: `XcmpQueue::InboundXcmpSuspended` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `MessageQueue::Pages` (r:0 w:1)
+	/// Proof: `MessageQueue::Pages` (`max_values`: None, `max_size`: Some(65585), added: 68060, mode: `MaxEncodedLen`)
+	fn enqueue_xcmp_message() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `48`
+		//  Estimated: `3517`
+		// Minimum execution time: 11_000_000 picoseconds.
+		Weight::from_parts(12_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 3517))
+			.saturating_add(T::DbWeight::get().reads(4))
+			.saturating_add(T::DbWeight::get().writes(3))
+	}
+	/// Storage: `XcmpQueue::OutboundXcmpStatus` (r:1 w:1)
+	/// Proof: `XcmpQueue::OutboundXcmpStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	fn suspend_channel() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `42`
 		//  Estimated: `1527`
-		// Minimum execution time: 5_000_000 picoseconds.
-		Weight::from_parts(6_000_000, 0)
+		// Minimum execution time: 3_000_000 picoseconds.
+		Weight::from_parts(3_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 1527))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
+	/// Storage: `XcmpQueue::OutboundXcmpStatus` (r:1 w:1)
+	/// Proof: `XcmpQueue::OutboundXcmpStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	fn resume_channel() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `77`
+		//  Estimated: `1562`
+		// Minimum execution time: 3_000_000 picoseconds.
+		Weight::from_parts(4_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 1562))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	fn take_first_concatenated_xcm() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `0`
+		//  Estimated: `0`
+		// Minimum execution time: 9_000_000 picoseconds.
+		Weight::from_parts(10_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 0))
+	}
+	/// Storage: UNKNOWN KEY `0x7b3237373ffdfeb1cab4222e3b520d6b345d8e88afa015075c945637c07e8f20` (r:1 w:1)
+	/// Proof: UNKNOWN KEY `0x7b3237373ffdfeb1cab4222e3b520d6b345d8e88afa015075c945637c07e8f20` (r:1 w:1)
+	/// Storage: UNKNOWN KEY `0x7b3237373ffdfeb1cab4222e3b520d6bedc49980ba3aa32b0a189290fd036649` (r:1 w:1)
+	/// Proof: UNKNOWN KEY `0x7b3237373ffdfeb1cab4222e3b520d6bedc49980ba3aa32b0a189290fd036649` (r:1 w:1)
+	/// Storage: `MessageQueue::BookStateFor` (r:1 w:1)
+	/// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	/// Storage: `MessageQueue::ServiceHead` (r:1 w:1)
+	/// Proof: `MessageQueue::ServiceHead` (`max_values`: Some(1), `max_size`: Some(5), added: 500, mode: `MaxEncodedLen`)
+	/// Storage: `XcmpQueue::QueueConfig` (r:1 w:0)
+	/// Proof: `XcmpQueue::QueueConfig` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `XcmpQueue::InboundXcmpSuspended` (r:1 w:0)
+	/// Proof: `XcmpQueue::InboundXcmpSuspended` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `MessageQueue::Pages` (r:0 w:1)
+	/// Proof: `MessageQueue::Pages` (`max_values`: None, `max_size`: Some(65585), added: 68060, mode: `MaxEncodedLen`)
+	fn on_idle_good_msg() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `65677`
+		//  Estimated: `69142`
+		// Minimum execution time: 45_000_000 picoseconds.
+		Weight::from_parts(46_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 69142))
+			.saturating_add(T::DbWeight::get().reads(6))
+			.saturating_add(T::DbWeight::get().writes(5))
+	}
+	/// Storage: UNKNOWN KEY `0x7b3237373ffdfeb1cab4222e3b520d6b345d8e88afa015075c945637c07e8f20` (r:1 w:1)
+	/// Proof: UNKNOWN KEY `0x7b3237373ffdfeb1cab4222e3b520d6b345d8e88afa015075c945637c07e8f20` (r:1 w:1)
+	/// Storage: UNKNOWN KEY `0x7b3237373ffdfeb1cab4222e3b520d6bedc49980ba3aa32b0a189290fd036649` (r:1 w:1)
+	/// Proof: UNKNOWN KEY `0x7b3237373ffdfeb1cab4222e3b520d6bedc49980ba3aa32b0a189290fd036649` (r:1 w:1)
+	fn on_idle_large_msg() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `65676`
+		//  Estimated: `69141`
+		// Minimum execution time: 28_000_000 picoseconds.
+		Weight::from_parts(29_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 69141))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
 }
diff --git a/runtime/koi/src/weights/darwinia_deposit.rs b/runtime/koi/src/weights/darwinia_deposit.rs
index b4cd34a8e..103ffa4c3 100644
--- a/runtime/koi/src/weights/darwinia_deposit.rs
+++ b/runtime/koi/src/weights/darwinia_deposit.rs
@@ -18,8 +18,8 @@
 
 //! Autogenerated weights for `darwinia_deposit`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-06-04, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-06-27, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `Some("koi-dev")`, DB CACHE: 1024
 
@@ -69,8 +69,8 @@ impl<T: frame_system::Config> darwinia_deposit::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `26812`
 		//  Estimated: `29615`
-		// Minimum execution time: 86_000_000 picoseconds.
-		Weight::from_parts(88_000_000, 0)
+		// Minimum execution time: 82_000_000 picoseconds.
+		Weight::from_parts(93_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 29615))
 			.saturating_add(T::DbWeight::get().reads(5))
 			.saturating_add(T::DbWeight::get().writes(4))
@@ -85,8 +85,8 @@ impl<T: frame_system::Config> darwinia_deposit::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `26541`
 		//  Estimated: `29615`
-		// Minimum execution time: 1_846_000_000 picoseconds.
-		Weight::from_parts(1_872_000_000, 0)
+		// Minimum execution time: 943_000_000 picoseconds.
+		Weight::from_parts(968_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 29615))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -105,8 +105,8 @@ impl<T: frame_system::Config> darwinia_deposit::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `26863`
 		//  Estimated: `29615`
-		// Minimum execution time: 93_000_000 picoseconds.
-		Weight::from_parts(97_000_000, 0)
+		// Minimum execution time: 86_000_000 picoseconds.
+		Weight::from_parts(99_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 29615))
 			.saturating_add(T::DbWeight::get().reads(5))
 			.saturating_add(T::DbWeight::get().writes(4))
diff --git a/runtime/koi/src/weights/darwinia_staking.rs b/runtime/koi/src/weights/darwinia_staking.rs
index b1c0c84b9..48a108955 100644
--- a/runtime/koi/src/weights/darwinia_staking.rs
+++ b/runtime/koi/src/weights/darwinia_staking.rs
@@ -18,8 +18,8 @@
 
 //! Autogenerated weights for `darwinia_staking`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-06-04, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-06-27, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `Some("koi-dev")`, DB CACHE: 1024
 
@@ -70,11 +70,11 @@ impl<T: frame_system::Config> darwinia_staking::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `7088 + x * (25 ±0)`
 		//  Estimated: `29615`
-		// Minimum execution time: 54_000_000 picoseconds.
-		Weight::from_parts(678_440_249, 0)
+		// Minimum execution time: 47_000_000 picoseconds.
+		Weight::from_parts(653_462_438, 0)
 			.saturating_add(Weight::from_parts(0, 29615))
-			// Standard Error: 236_449
-			.saturating_add(Weight::from_parts(11_970_473, 0).saturating_mul(x.into()))
+			// Standard Error: 242_063
+			.saturating_add(Weight::from_parts(12_354_738, 0).saturating_mul(x.into()))
 			.saturating_add(T::DbWeight::get().reads(5))
 			.saturating_add(T::DbWeight::get().writes(4))
 	}
@@ -93,11 +93,11 @@ impl<T: frame_system::Config> darwinia_staking::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `7415 + x * (26 ±0)`
 		//  Estimated: `29615`
-		// Minimum execution time: 53_000_000 picoseconds.
-		Weight::from_parts(666_940_010, 0)
+		// Minimum execution time: 48_000_000 picoseconds.
+		Weight::from_parts(690_303_938, 0)
 			.saturating_add(Weight::from_parts(0, 29615))
-			// Standard Error: 236_445
-			.saturating_add(Weight::from_parts(11_982_039, 0).saturating_mul(x.into()))
+			// Standard Error: 243_509
+			.saturating_add(Weight::from_parts(12_382_062, 0).saturating_mul(x.into()))
 			.saturating_add(T::DbWeight::get().reads(5))
 			.saturating_add(T::DbWeight::get().writes(4))
 	}
@@ -107,8 +107,8 @@ impl<T: frame_system::Config> darwinia_staking::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `388`
 		//  Estimated: `3497`
-		// Minimum execution time: 11_000_000 picoseconds.
-		Weight::from_parts(12_000_000, 0)
+		// Minimum execution time: 9_000_000 picoseconds.
+		Weight::from_parts(9_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3497))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -123,7 +123,7 @@ impl<T: frame_system::Config> darwinia_staking::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `574`
 		//  Estimated: `4543`
-		// Minimum execution time: 12_000_000 picoseconds.
+		// Minimum execution time: 11_000_000 picoseconds.
 		Weight::from_parts(12_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 4543))
 			.saturating_add(T::DbWeight::get().reads(3))
@@ -154,8 +154,8 @@ impl<T: frame_system::Config> darwinia_staking::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `1845`
 		//  Estimated: `5310`
-		// Minimum execution time: 202_000_000 picoseconds.
-		Weight::from_parts(204_000_000, 0)
+		// Minimum execution time: 135_000_000 picoseconds.
+		Weight::from_parts(143_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 5310))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -167,7 +167,7 @@ impl<T: frame_system::Config> darwinia_staking::WeightInfo for WeightInfo<T> {
 		//  Measured:  `0`
 		//  Estimated: `0`
 		// Minimum execution time: 2_000_000 picoseconds.
-		Weight::from_parts(3_000_000, 0)
+		Weight::from_parts(2_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -178,7 +178,7 @@ impl<T: frame_system::Config> darwinia_staking::WeightInfo for WeightInfo<T> {
 		//  Measured:  `0`
 		//  Estimated: `0`
 		// Minimum execution time: 2_000_000 picoseconds.
-		Weight::from_parts(3_000_000, 0)
+		Weight::from_parts(2_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
diff --git a/runtime/koi/src/weights/frame_system.rs b/runtime/koi/src/weights/frame_system.rs
index 691a1b252..cec635839 100644
--- a/runtime/koi/src/weights/frame_system.rs
+++ b/runtime/koi/src/weights/frame_system.rs
@@ -18,8 +18,8 @@
 
 //! Autogenerated weights for `frame_system`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-06-04, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-06-27, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `Some("koi-dev")`, DB CACHE: 1024
 
@@ -60,22 +60,22 @@ impl<T: frame_system::Config> frame_system::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_000_000 picoseconds.
-		Weight::from_parts(1_906_879, 0)
+		// Minimum execution time: 1_000_000 picoseconds.
+		Weight::from_parts(2_268_293, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 			// Standard Error: 0
-			.saturating_add(Weight::from_parts(145, 0).saturating_mul(b.into()))
+			.saturating_add(Weight::from_parts(150, 0).saturating_mul(b.into()))
 	}
 	/// The range of component `b` is `[0, 3932160]`.
 	fn remark_with_event(b: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 6_000_000 picoseconds.
-		Weight::from_parts(7_000_000, 0)
+		// Minimum execution time: 4_000_000 picoseconds.
+		Weight::from_parts(5_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 			// Standard Error: 0
-			.saturating_add(Weight::from_parts(909, 0).saturating_mul(b.into()))
+			.saturating_add(Weight::from_parts(945, 0).saturating_mul(b.into()))
 	}
 	/// Storage: `System::Digest` (r:1 w:1)
 	/// Proof: `System::Digest` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
@@ -86,7 +86,7 @@ impl<T: frame_system::Config> frame_system::WeightInfo for WeightInfo<T> {
 		//  Measured:  `0`
 		//  Estimated: `1485`
 		// Minimum execution time: 3_000_000 picoseconds.
-		Weight::from_parts(4_000_000, 0)
+		Weight::from_parts(3_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 1485))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -107,8 +107,8 @@ impl<T: frame_system::Config> frame_system::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `198`
 		//  Estimated: `1683`
-		// Minimum execution time: 70_274_000_000 picoseconds.
-		Weight::from_parts(71_428_000_000, 0)
+		// Minimum execution time: 67_336_000_000 picoseconds.
+		Weight::from_parts(71_187_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 1683))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(3))
@@ -120,11 +120,11 @@ impl<T: frame_system::Config> frame_system::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_000_000 picoseconds.
+		// Minimum execution time: 1_000_000 picoseconds.
 		Weight::from_parts(2_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
-			// Standard Error: 768
-			.saturating_add(Weight::from_parts(717_336, 0).saturating_mul(i.into()))
+			// Standard Error: 4_764
+			.saturating_add(Weight::from_parts(774_928, 0).saturating_mul(i.into()))
 			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(i.into())))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
@@ -134,11 +134,11 @@ impl<T: frame_system::Config> frame_system::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_000_000 picoseconds.
+		// Minimum execution time: 1_000_000 picoseconds.
 		Weight::from_parts(2_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
-			// Standard Error: 741
-			.saturating_add(Weight::from_parts(507_654, 0).saturating_mul(i.into()))
+			// Standard Error: 867
+			.saturating_add(Weight::from_parts(532_385, 0).saturating_mul(i.into()))
 			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(i.into())))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
@@ -147,14 +147,49 @@ impl<T: frame_system::Config> frame_system::WeightInfo for WeightInfo<T> {
 	fn kill_prefix(p: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `88 + p * (69 ±0)`
-		//  Estimated: `89 + p * (70 ±0)`
-		// Minimum execution time: 3_000_000 picoseconds.
+		//  Estimated: `92 + p * (70 ±0)`
+		// Minimum execution time: 4_000_000 picoseconds.
 		Weight::from_parts(4_000_000, 0)
-			.saturating_add(Weight::from_parts(0, 89))
-			// Standard Error: 1_048
-			.saturating_add(Weight::from_parts(940_653, 0).saturating_mul(p.into()))
+			.saturating_add(Weight::from_parts(0, 92))
+			// Standard Error: 1_084
+			.saturating_add(Weight::from_parts(975_384, 0).saturating_mul(p.into()))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(p.into())))
 			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(p.into())))
 			.saturating_add(Weight::from_parts(0, 70).saturating_mul(p.into()))
 	}
+	/// Storage: `System::AuthorizedUpgrade` (r:0 w:1)
+	/// Proof: `System::AuthorizedUpgrade` (`max_values`: Some(1), `max_size`: Some(33), added: 528, mode: `MaxEncodedLen`)
+	fn authorize_upgrade() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `0`
+		//  Estimated: `0`
+		// Minimum execution time: 6_000_000 picoseconds.
+		Weight::from_parts(7_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 0))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: `System::AuthorizedUpgrade` (r:1 w:1)
+	/// Proof: `System::AuthorizedUpgrade` (`max_values`: Some(1), `max_size`: Some(33), added: 528, mode: `MaxEncodedLen`)
+	/// Storage: `ParachainSystem::ValidationData` (r:1 w:0)
+	/// Proof: `ParachainSystem::ValidationData` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `ParachainSystem::UpgradeRestrictionSignal` (r:1 w:0)
+	/// Proof: `ParachainSystem::UpgradeRestrictionSignal` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `ParachainSystem::PendingValidationCode` (r:1 w:1)
+	/// Proof: `ParachainSystem::PendingValidationCode` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0)
+	/// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `ParachainSystem::NewValidationCode` (r:0 w:1)
+	/// Proof: `ParachainSystem::NewValidationCode` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `ParachainSystem::DidSetValidationCode` (r:0 w:1)
+	/// Proof: `ParachainSystem::DidSetValidationCode` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	fn apply_authorized_upgrade() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `220`
+		//  Estimated: `1705`
+		// Minimum execution time: 68_599_000_000 picoseconds.
+		Weight::from_parts(73_876_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 1705))
+			.saturating_add(T::DbWeight::get().reads(5))
+			.saturating_add(T::DbWeight::get().writes(4))
+	}
 }
diff --git a/runtime/koi/src/weights/pallet_assets.rs b/runtime/koi/src/weights/pallet_assets.rs
index f1ea4619b..866d6aafe 100644
--- a/runtime/koi/src/weights/pallet_assets.rs
+++ b/runtime/koi/src/weights/pallet_assets.rs
@@ -18,8 +18,8 @@
 
 //! Autogenerated weights for `pallet_assets`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-06-04, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-06-27, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `Some("koi-dev")`, DB CACHE: 1024
 
@@ -61,8 +61,8 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `157`
 		//  Estimated: `3631`
-		// Minimum execution time: 11_000_000 picoseconds.
-		Weight::from_parts(12_000_000, 0)
+		// Minimum execution time: 10_000_000 picoseconds.
+		Weight::from_parts(10_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3631))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -73,8 +73,8 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `157`
 		//  Estimated: `3631`
-		// Minimum execution time: 11_000_000 picoseconds.
-		Weight::from_parts(12_000_000, 0)
+		// Minimum execution time: 10_000_000 picoseconds.
+		Weight::from_parts(10_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3631))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -85,8 +85,8 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `307`
 		//  Estimated: `3631`
-		// Minimum execution time: 11_000_000 picoseconds.
-		Weight::from_parts(12_000_000, 0)
+		// Minimum execution time: 10_000_000 picoseconds.
+		Weight::from_parts(10_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3631))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -102,11 +102,11 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `821 + c * (183 ±0)`
 		//  Estimated: `3631 + c * (2591 ±0)`
-		// Minimum execution time: 15_000_000 picoseconds.
-		Weight::from_parts(16_000_000, 0)
+		// Minimum execution time: 13_000_000 picoseconds.
+		Weight::from_parts(57_779_552, 0)
 			.saturating_add(Weight::from_parts(0, 3631))
-			// Standard Error: 5_409
-			.saturating_add(Weight::from_parts(12_336_170, 0).saturating_mul(c.into()))
+			// Standard Error: 39_269
+			.saturating_add(Weight::from_parts(10_801_270, 0).saturating_mul(c.into()))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(c.into())))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -122,11 +122,11 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `458 + a * (74 ±0)`
 		//  Estimated: `3631 + a * (2603 ±0)`
-		// Minimum execution time: 14_000_000 picoseconds.
-		Weight::from_parts(15_000_000, 0)
+		// Minimum execution time: 13_000_000 picoseconds.
+		Weight::from_parts(13_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3631))
-			// Standard Error: 3_174
-			.saturating_add(Weight::from_parts(3_943_810, 0).saturating_mul(a.into()))
+			// Standard Error: 9_351
+			.saturating_add(Weight::from_parts(4_038_535, 0).saturating_mul(a.into()))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(a.into())))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -141,8 +141,8 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `350`
 		//  Estimated: `3631`
-		// Minimum execution time: 13_000_000 picoseconds.
-		Weight::from_parts(14_000_000, 0)
+		// Minimum execution time: 11_000_000 picoseconds.
+		Weight::from_parts(12_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3631))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -155,8 +155,8 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `350`
 		//  Estimated: `3631`
-		// Minimum execution time: 23_000_000 picoseconds.
-		Weight::from_parts(24_000_000, 0)
+		// Minimum execution time: 20_000_000 picoseconds.
+		Weight::from_parts(21_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3631))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -169,8 +169,8 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `410`
 		//  Estimated: `3631`
-		// Minimum execution time: 29_000_000 picoseconds.
-		Weight::from_parts(30_000_000, 0)
+		// Minimum execution time: 26_000_000 picoseconds.
+		Weight::from_parts(27_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3631))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -185,8 +185,8 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `449`
 		//  Estimated: `6168`
-		// Minimum execution time: 43_000_000 picoseconds.
-		Weight::from_parts(44_000_000, 0)
+		// Minimum execution time: 35_000_000 picoseconds.
+		Weight::from_parts(36_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 6168))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(4))
@@ -201,8 +201,8 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `449`
 		//  Estimated: `6168`
-		// Minimum execution time: 35_000_000 picoseconds.
-		Weight::from_parts(36_000_000, 0)
+		// Minimum execution time: 33_000_000 picoseconds.
+		Weight::from_parts(34_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 6168))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(4))
@@ -217,8 +217,8 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `449`
 		//  Estimated: `6168`
-		// Minimum execution time: 41_000_000 picoseconds.
-		Weight::from_parts(43_000_000, 0)
+		// Minimum execution time: 36_000_000 picoseconds.
+		Weight::from_parts(37_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 6168))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(4))
@@ -231,8 +231,8 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `410`
 		//  Estimated: `3631`
-		// Minimum execution time: 14_000_000 picoseconds.
-		Weight::from_parts(15_000_000, 0)
+		// Minimum execution time: 12_000_000 picoseconds.
+		Weight::from_parts(13_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3631))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -245,8 +245,8 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `410`
 		//  Estimated: `3631`
-		// Minimum execution time: 14_000_000 picoseconds.
-		Weight::from_parts(15_000_000, 0)
+		// Minimum execution time: 13_000_000 picoseconds.
+		Weight::from_parts(13_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3631))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -257,8 +257,8 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `307`
 		//  Estimated: `3631`
-		// Minimum execution time: 11_000_000 picoseconds.
-		Weight::from_parts(12_000_000, 0)
+		// Minimum execution time: 9_000_000 picoseconds.
+		Weight::from_parts(10_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3631))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -269,8 +269,8 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `307`
 		//  Estimated: `3631`
-		// Minimum execution time: 11_000_000 picoseconds.
-		Weight::from_parts(12_000_000, 0)
+		// Minimum execution time: 9_000_000 picoseconds.
+		Weight::from_parts(10_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3631))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -283,8 +283,8 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `350`
 		//  Estimated: `3631`
-		// Minimum execution time: 14_000_000 picoseconds.
-		Weight::from_parts(14_000_000, 0)
+		// Minimum execution time: 12_000_000 picoseconds.
+		Weight::from_parts(12_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3631))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -295,8 +295,8 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `307`
 		//  Estimated: `3631`
-		// Minimum execution time: 12_000_000 picoseconds.
-		Weight::from_parts(12_000_000, 0)
+		// Minimum execution time: 10_000_000 picoseconds.
+		Weight::from_parts(10_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3631))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -307,15 +307,17 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 	/// Proof: `Assets::Metadata` (`max_values`: None, `max_size`: Some(144), added: 2619, mode: `MaxEncodedLen`)
 	/// The range of component `n` is `[0, 50]`.
 	/// The range of component `s` is `[0, 50]`.
-	fn set_metadata(_n: u32, s: u32, ) -> Weight {
+	fn set_metadata(n: u32, s: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `350`
 		//  Estimated: `3631`
-		// Minimum execution time: 13_000_000 picoseconds.
-		Weight::from_parts(14_040_484, 0)
+		// Minimum execution time: 11_000_000 picoseconds.
+		Weight::from_parts(12_101_009, 0)
 			.saturating_add(Weight::from_parts(0, 3631))
-			// Standard Error: 589
-			.saturating_add(Weight::from_parts(641, 0).saturating_mul(s.into()))
+			// Standard Error: 1_067
+			.saturating_add(Weight::from_parts(1_795, 0).saturating_mul(n.into()))
+			// Standard Error: 1_067
+			.saturating_add(Weight::from_parts(2_337, 0).saturating_mul(s.into()))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -327,8 +329,8 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `478`
 		//  Estimated: `3631`
-		// Minimum execution time: 14_000_000 picoseconds.
-		Weight::from_parts(14_000_000, 0)
+		// Minimum execution time: 12_000_000 picoseconds.
+		Weight::from_parts(13_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3631))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -339,17 +341,13 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 	/// Proof: `Assets::Metadata` (`max_values`: None, `max_size`: Some(144), added: 2619, mode: `MaxEncodedLen`)
 	/// The range of component `n` is `[0, 50]`.
 	/// The range of component `s` is `[0, 50]`.
-	fn force_set_metadata(n: u32, s: u32, ) -> Weight {
+	fn force_set_metadata(_n: u32, _s: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `237`
 		//  Estimated: `3631`
-		// Minimum execution time: 13_000_000 picoseconds.
-		Weight::from_parts(13_656_035, 0)
+		// Minimum execution time: 10_000_000 picoseconds.
+		Weight::from_parts(11_725_066, 0)
 			.saturating_add(Weight::from_parts(0, 3631))
-			// Standard Error: 1_036
-			.saturating_add(Weight::from_parts(921, 0).saturating_mul(n.into()))
-			// Standard Error: 1_036
-			.saturating_add(Weight::from_parts(2_512, 0).saturating_mul(s.into()))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -361,8 +359,8 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `478`
 		//  Estimated: `3631`
-		// Minimum execution time: 13_000_000 picoseconds.
-		Weight::from_parts(14_000_000, 0)
+		// Minimum execution time: 11_000_000 picoseconds.
+		Weight::from_parts(12_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3631))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -373,8 +371,8 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `307`
 		//  Estimated: `3631`
-		// Minimum execution time: 12_000_000 picoseconds.
-		Weight::from_parts(12_000_000, 0)
+		// Minimum execution time: 9_000_000 picoseconds.
+		Weight::from_parts(10_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3631))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -387,8 +385,8 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `307`
 		//  Estimated: `3631`
-		// Minimum execution time: 16_000_000 picoseconds.
-		Weight::from_parts(16_000_000, 0)
+		// Minimum execution time: 14_000_000 picoseconds.
+		Weight::from_parts(15_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3631))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -405,8 +403,8 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `599`
 		//  Estimated: `6168`
-		// Minimum execution time: 46_000_000 picoseconds.
-		Weight::from_parts(48_000_000, 0)
+		// Minimum execution time: 42_000_000 picoseconds.
+		Weight::from_parts(43_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 6168))
 			.saturating_add(T::DbWeight::get().reads(5))
 			.saturating_add(T::DbWeight::get().writes(5))
@@ -419,8 +417,8 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `457`
 		//  Estimated: `3631`
-		// Minimum execution time: 17_000_000 picoseconds.
-		Weight::from_parts(18_000_000, 0)
+		// Minimum execution time: 15_000_000 picoseconds.
+		Weight::from_parts(16_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3631))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -433,8 +431,8 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `457`
 		//  Estimated: `3631`
-		// Minimum execution time: 17_000_000 picoseconds.
-		Weight::from_parts(18_000_000, 0)
+		// Minimum execution time: 16_000_000 picoseconds.
+		Weight::from_parts(17_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3631))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -445,8 +443,8 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `307`
 		//  Estimated: `3631`
-		// Minimum execution time: 13_000_000 picoseconds.
-		Weight::from_parts(13_000_000, 0)
+		// Minimum execution time: 10_000_000 picoseconds.
+		Weight::from_parts(11_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3631))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -461,8 +459,8 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `512`
 		//  Estimated: `3631`
-		// Minimum execution time: 32_000_000 picoseconds.
-		Weight::from_parts(33_000_000, 0)
+		// Minimum execution time: 30_000_000 picoseconds.
+		Weight::from_parts(31_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3631))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(3))
@@ -475,8 +473,8 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `350`
 		//  Estimated: `3631`
-		// Minimum execution time: 30_000_000 picoseconds.
-		Weight::from_parts(32_000_000, 0)
+		// Minimum execution time: 27_000_000 picoseconds.
+		Weight::from_parts(27_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3631))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -491,8 +489,8 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `590`
 		//  Estimated: `3631`
-		// Minimum execution time: 30_000_000 picoseconds.
-		Weight::from_parts(31_000_000, 0)
+		// Minimum execution time: 28_000_000 picoseconds.
+		Weight::from_parts(29_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3631))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(3))
@@ -505,8 +503,8 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `448`
 		//  Estimated: `3631`
-		// Minimum execution time: 27_000_000 picoseconds.
-		Weight::from_parts(28_000_000, 0)
+		// Minimum execution time: 25_000_000 picoseconds.
+		Weight::from_parts(27_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3631))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -519,8 +517,8 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `410`
 		//  Estimated: `3631`
-		// Minimum execution time: 14_000_000 picoseconds.
-		Weight::from_parts(15_000_000, 0)
+		// Minimum execution time: 13_000_000 picoseconds.
+		Weight::from_parts(13_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3631))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
diff --git a/runtime/koi/src/weights/pallet_balances.rs b/runtime/koi/src/weights/pallet_balances.rs
index caa5d992c..1e7127c3b 100644
--- a/runtime/koi/src/weights/pallet_balances.rs
+++ b/runtime/koi/src/weights/pallet_balances.rs
@@ -18,8 +18,8 @@
 
 //! Autogenerated weights for `pallet_balances`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-06-04, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-06-27, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `Some("koi-dev")`, DB CACHE: 1024
 
@@ -61,8 +61,8 @@ impl<T: frame_system::Config> pallet_balances::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `39`
 		//  Estimated: `3581`
-		// Minimum execution time: 52_000_000 picoseconds.
-		Weight::from_parts(54_000_000, 0)
+		// Minimum execution time: 43_000_000 picoseconds.
+		Weight::from_parts(44_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3581))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -73,8 +73,8 @@ impl<T: frame_system::Config> pallet_balances::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `39`
 		//  Estimated: `3581`
-		// Minimum execution time: 43_000_000 picoseconds.
-		Weight::from_parts(44_000_000, 0)
+		// Minimum execution time: 36_000_000 picoseconds.
+		Weight::from_parts(39_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3581))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -85,8 +85,8 @@ impl<T: frame_system::Config> pallet_balances::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `195`
 		//  Estimated: `3581`
-		// Minimum execution time: 16_000_000 picoseconds.
-		Weight::from_parts(17_000_000, 0)
+		// Minimum execution time: 14_000_000 picoseconds.
+		Weight::from_parts(14_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3581))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -97,8 +97,8 @@ impl<T: frame_system::Config> pallet_balances::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `195`
 		//  Estimated: `3581`
-		// Minimum execution time: 24_000_000 picoseconds.
-		Weight::from_parts(24_000_000, 0)
+		// Minimum execution time: 19_000_000 picoseconds.
+		Weight::from_parts(20_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3581))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -109,8 +109,8 @@ impl<T: frame_system::Config> pallet_balances::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `234`
 		//  Estimated: `6172`
-		// Minimum execution time: 54_000_000 picoseconds.
-		Weight::from_parts(56_000_000, 0)
+		// Minimum execution time: 46_000_000 picoseconds.
+		Weight::from_parts(49_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 6172))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -121,8 +121,8 @@ impl<T: frame_system::Config> pallet_balances::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `39`
 		//  Estimated: `3581`
-		// Minimum execution time: 55_000_000 picoseconds.
-		Weight::from_parts(56_000_000, 0)
+		// Minimum execution time: 48_000_000 picoseconds.
+		Weight::from_parts(49_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3581))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -133,8 +133,8 @@ impl<T: frame_system::Config> pallet_balances::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `195`
 		//  Estimated: `3581`
-		// Minimum execution time: 19_000_000 picoseconds.
-		Weight::from_parts(20_000_000, 0)
+		// Minimum execution time: 17_000_000 picoseconds.
+		Weight::from_parts(18_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3581))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -146,13 +146,24 @@ impl<T: frame_system::Config> pallet_balances::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `424 + u * (124 ±0)`
 		//  Estimated: `990 + u * (2591 ±0)`
-		// Minimum execution time: 18_000_000 picoseconds.
-		Weight::from_parts(18_000_000, 0)
+		// Minimum execution time: 16_000_000 picoseconds.
+		Weight::from_parts(16_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 990))
-			// Standard Error: 6_373
-			.saturating_add(Weight::from_parts(14_455_756, 0).saturating_mul(u.into()))
+			// Standard Error: 19_096
+			.saturating_add(Weight::from_parts(13_003_237, 0).saturating_mul(u.into()))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(u.into())))
 			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(u.into())))
 			.saturating_add(Weight::from_parts(0, 2591).saturating_mul(u.into()))
 	}
+	/// Storage: `Balances::InactiveIssuance` (r:1 w:0)
+	/// Proof: `Balances::InactiveIssuance` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	fn force_adjust_total_issuance() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `0`
+		//  Estimated: `1501`
+		// Minimum execution time: 5_000_000 picoseconds.
+		Weight::from_parts(6_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 1501))
+			.saturating_add(T::DbWeight::get().reads(1))
+	}
 }
diff --git a/runtime/koi/src/weights/pallet_collective.rs b/runtime/koi/src/weights/pallet_collective.rs
index 27b592ee3..3a9d25476 100644
--- a/runtime/koi/src/weights/pallet_collective.rs
+++ b/runtime/koi/src/weights/pallet_collective.rs
@@ -18,8 +18,8 @@
 
 //! Autogenerated weights for `pallet_collective`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-06-04, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-06-27, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `Some("koi-dev")`, DB CACHE: 1024
 
@@ -70,13 +70,13 @@ impl<T: frame_system::Config> pallet_collective::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0 + m * (2021 ±0) + p * (2026 ±0)`
 		//  Estimated: `12200 + m * (1231 ±15) + p * (3660 ±15)`
-		// Minimum execution time: 13_000_000 picoseconds.
-		Weight::from_parts(14_000_000, 0)
+		// Minimum execution time: 11_000_000 picoseconds.
+		Weight::from_parts(11_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 12200))
-			// Standard Error: 43_265
-			.saturating_add(Weight::from_parts(2_236_338, 0).saturating_mul(m.into()))
-			// Standard Error: 43_265
-			.saturating_add(Weight::from_parts(4_899_899, 0).saturating_mul(p.into()))
+			// Standard Error: 70_896
+			.saturating_add(Weight::from_parts(3_167_004, 0).saturating_mul(m.into()))
+			// Standard Error: 70_896
+			.saturating_add(Weight::from_parts(4_540_655, 0).saturating_mul(p.into()))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(p.into())))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -94,13 +94,13 @@ impl<T: frame_system::Config> pallet_collective::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `73 + m * (20 ±0)`
 		//  Estimated: `3997 + m * (20 ±0)`
-		// Minimum execution time: 16_000_000 picoseconds.
-		Weight::from_parts(16_159_627, 0)
+		// Minimum execution time: 14_000_000 picoseconds.
+		Weight::from_parts(14_244_966, 0)
 			.saturating_add(Weight::from_parts(0, 3997))
-			// Standard Error: 52
-			.saturating_add(Weight::from_parts(920, 0).saturating_mul(b.into()))
-			// Standard Error: 536
-			.saturating_add(Weight::from_parts(5_974, 0).saturating_mul(m.into()))
+			// Standard Error: 40
+			.saturating_add(Weight::from_parts(728, 0).saturating_mul(b.into()))
+			// Standard Error: 412
+			.saturating_add(Weight::from_parts(2_042, 0).saturating_mul(m.into()))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(Weight::from_parts(0, 20).saturating_mul(m.into()))
 	}
@@ -116,13 +116,13 @@ impl<T: frame_system::Config> pallet_collective::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `73 + m * (20 ±0)`
 		//  Estimated: `3997 + m * (20 ±0)`
-		// Minimum execution time: 18_000_000 picoseconds.
-		Weight::from_parts(18_185_562, 0)
+		// Minimum execution time: 15_000_000 picoseconds.
+		Weight::from_parts(15_664_697, 0)
 			.saturating_add(Weight::from_parts(0, 3997))
-			// Standard Error: 44
-			.saturating_add(Weight::from_parts(1_200, 0).saturating_mul(b.into()))
-			// Standard Error: 462
-			.saturating_add(Weight::from_parts(6_289, 0).saturating_mul(m.into()))
+			// Standard Error: 43
+			.saturating_add(Weight::from_parts(1_057, 0).saturating_mul(b.into()))
+			// Standard Error: 445
+			.saturating_add(Weight::from_parts(5_419, 0).saturating_mul(m.into()))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(Weight::from_parts(0, 20).saturating_mul(m.into()))
 	}
@@ -143,15 +143,15 @@ impl<T: frame_system::Config> pallet_collective::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `357 + m * (20 ±0) + p * (36 ±0)`
 		//  Estimated: `3751 + m * (21 ±0) + p * (36 ±0)`
-		// Minimum execution time: 21_000_000 picoseconds.
-		Weight::from_parts(22_431_655, 0)
+		// Minimum execution time: 16_000_000 picoseconds.
+		Weight::from_parts(18_038_161, 0)
 			.saturating_add(Weight::from_parts(0, 3751))
-			// Standard Error: 82
-			.saturating_add(Weight::from_parts(1_217, 0).saturating_mul(b.into()))
-			// Standard Error: 856
-			.saturating_add(Weight::from_parts(9_169, 0).saturating_mul(m.into()))
-			// Standard Error: 845
-			.saturating_add(Weight::from_parts(119_530, 0).saturating_mul(p.into()))
+			// Standard Error: 77
+			.saturating_add(Weight::from_parts(1_328, 0).saturating_mul(b.into()))
+			// Standard Error: 806
+			.saturating_add(Weight::from_parts(9_593, 0).saturating_mul(m.into()))
+			// Standard Error: 796
+			.saturating_add(Weight::from_parts(116_562, 0).saturating_mul(p.into()))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(4))
 			.saturating_add(Weight::from_parts(0, 21).saturating_mul(m.into()))
@@ -166,11 +166,11 @@ impl<T: frame_system::Config> pallet_collective::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `832 + m * (40 ±0)`
 		//  Estimated: `4296 + m * (40 ±0)`
-		// Minimum execution time: 16_000_000 picoseconds.
-		Weight::from_parts(17_437_339, 0)
+		// Minimum execution time: 14_000_000 picoseconds.
+		Weight::from_parts(15_243_118, 0)
 			.saturating_add(Weight::from_parts(0, 4296))
-			// Standard Error: 950
-			.saturating_add(Weight::from_parts(10_124, 0).saturating_mul(m.into()))
+			// Standard Error: 729
+			.saturating_add(Weight::from_parts(9_936, 0).saturating_mul(m.into()))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
 			.saturating_add(Weight::from_parts(0, 40).saturating_mul(m.into()))
@@ -189,13 +189,13 @@ impl<T: frame_system::Config> pallet_collective::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `409 + m * (40 ±0) + p * (36 ±0)`
 		//  Estimated: `3854 + m * (41 ±0) + p * (36 ±0)`
-		// Minimum execution time: 24_000_000 picoseconds.
-		Weight::from_parts(24_536_900, 0)
+		// Minimum execution time: 19_000_000 picoseconds.
+		Weight::from_parts(19_230_367, 0)
 			.saturating_add(Weight::from_parts(0, 3854))
-			// Standard Error: 813
-			.saturating_add(Weight::from_parts(4_357, 0).saturating_mul(m.into()))
-			// Standard Error: 792
-			.saturating_add(Weight::from_parts(112_291, 0).saturating_mul(p.into()))
+			// Standard Error: 625
+			.saturating_add(Weight::from_parts(3_816, 0).saturating_mul(m.into()))
+			// Standard Error: 609
+			.saturating_add(Weight::from_parts(119_137, 0).saturating_mul(p.into()))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(3))
 			.saturating_add(Weight::from_parts(0, 41).saturating_mul(m.into()))
@@ -218,15 +218,15 @@ impl<T: frame_system::Config> pallet_collective::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `715 + b * (1 ±0) + m * (40 ±0) + p * (40 ±0)`
 		//  Estimated: `4032 + b * (1 ±0) + m * (42 ±0) + p * (40 ±0)`
-		// Minimum execution time: 36_000_000 picoseconds.
-		Weight::from_parts(38_466_792, 0)
+		// Minimum execution time: 30_000_000 picoseconds.
+		Weight::from_parts(29_705_330, 0)
 			.saturating_add(Weight::from_parts(0, 4032))
-			// Standard Error: 122
-			.saturating_add(Weight::from_parts(524, 0).saturating_mul(b.into()))
-			// Standard Error: 1_289
-			.saturating_add(Weight::from_parts(4_641, 0).saturating_mul(m.into()))
-			// Standard Error: 1_257
-			.saturating_add(Weight::from_parts(131_843, 0).saturating_mul(p.into()))
+			// Standard Error: 123
+			.saturating_add(Weight::from_parts(1_678, 0).saturating_mul(b.into()))
+			// Standard Error: 1_301
+			.saturating_add(Weight::from_parts(10_568, 0).saturating_mul(m.into()))
+			// Standard Error: 1_268
+			.saturating_add(Weight::from_parts(142_999, 0).saturating_mul(p.into()))
 			.saturating_add(T::DbWeight::get().reads(5))
 			.saturating_add(T::DbWeight::get().writes(3))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(b.into()))
@@ -249,13 +249,13 @@ impl<T: frame_system::Config> pallet_collective::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `429 + m * (40 ±0) + p * (36 ±0)`
 		//  Estimated: `3874 + m * (41 ±0) + p * (36 ±0)`
-		// Minimum execution time: 26_000_000 picoseconds.
-		Weight::from_parts(26_817_922, 0)
+		// Minimum execution time: 20_000_000 picoseconds.
+		Weight::from_parts(21_064_164, 0)
 			.saturating_add(Weight::from_parts(0, 3874))
-			// Standard Error: 1_252
-			.saturating_add(Weight::from_parts(7_411, 0).saturating_mul(m.into()))
-			// Standard Error: 1_221
-			.saturating_add(Weight::from_parts(113_499, 0).saturating_mul(p.into()))
+			// Standard Error: 853
+			.saturating_add(Weight::from_parts(6_630, 0).saturating_mul(m.into()))
+			// Standard Error: 832
+			.saturating_add(Weight::from_parts(118_190, 0).saturating_mul(p.into()))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(3))
 			.saturating_add(Weight::from_parts(0, 41).saturating_mul(m.into()))
@@ -280,11 +280,13 @@ impl<T: frame_system::Config> pallet_collective::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `735 + b * (1 ±0) + m * (40 ±0) + p * (40 ±0)`
 		//  Estimated: `4052 + b * (1 ±0) + m * (42 ±0) + p * (40 ±0)`
-		// Minimum execution time: 39_000_000 picoseconds.
-		Weight::from_parts(42_727_420, 0)
+		// Minimum execution time: 32_000_000 picoseconds.
+		Weight::from_parts(34_768_602, 0)
 			.saturating_add(Weight::from_parts(0, 4052))
-			// Standard Error: 1_458
-			.saturating_add(Weight::from_parts(128_180, 0).saturating_mul(p.into()))
+			// Standard Error: 108
+			.saturating_add(Weight::from_parts(362, 0).saturating_mul(b.into()))
+			// Standard Error: 1_114
+			.saturating_add(Weight::from_parts(134_128, 0).saturating_mul(p.into()))
 			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(3))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(b.into()))
@@ -302,11 +304,11 @@ impl<T: frame_system::Config> pallet_collective::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `226 + p * (32 ±0)`
 		//  Estimated: `1711 + p * (32 ±0)`
-		// Minimum execution time: 14_000_000 picoseconds.
-		Weight::from_parts(15_598_814, 0)
+		// Minimum execution time: 11_000_000 picoseconds.
+		Weight::from_parts(12_143_115, 0)
 			.saturating_add(Weight::from_parts(0, 1711))
-			// Standard Error: 1_373
-			.saturating_add(Weight::from_parts(96_944, 0).saturating_mul(p.into()))
+			// Standard Error: 637
+			.saturating_add(Weight::from_parts(103_056, 0).saturating_mul(p.into()))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(3))
 			.saturating_add(Weight::from_parts(0, 32).saturating_mul(p.into()))
diff --git a/runtime/koi/src/weights/pallet_conviction_voting.rs b/runtime/koi/src/weights/pallet_conviction_voting.rs
index 922471538..c3ea2b80d 100644
--- a/runtime/koi/src/weights/pallet_conviction_voting.rs
+++ b/runtime/koi/src/weights/pallet_conviction_voting.rs
@@ -18,8 +18,8 @@
 
 //! Autogenerated weights for `pallet_conviction_voting`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-06-04, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-06-27, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `Some("koi-dev")`, DB CACHE: 1024
 
@@ -71,8 +71,8 @@ impl<T: frame_system::Config> pallet_conviction_voting::WeightInfo for WeightInf
 		// Proof Size summary in bytes:
 		//  Measured:  `13458`
 		//  Estimated: `42428`
-		// Minimum execution time: 92_000_000 picoseconds.
-		Weight::from_parts(112_000_000, 0)
+		// Minimum execution time: 79_000_000 picoseconds.
+		Weight::from_parts(84_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 42428))
 			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(5))
@@ -93,8 +93,8 @@ impl<T: frame_system::Config> pallet_conviction_voting::WeightInfo for WeightInf
 		// Proof Size summary in bytes:
 		//  Measured:  `14179`
 		//  Estimated: `83866`
-		// Minimum execution time: 155_000_000 picoseconds.
-		Weight::from_parts(170_000_000, 0)
+		// Minimum execution time: 114_000_000 picoseconds.
+		Weight::from_parts(122_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 83866))
 			.saturating_add(T::DbWeight::get().reads(7))
 			.saturating_add(T::DbWeight::get().writes(6))
@@ -109,8 +109,8 @@ impl<T: frame_system::Config> pallet_conviction_voting::WeightInfo for WeightInf
 		// Proof Size summary in bytes:
 		//  Measured:  `13928`
 		//  Estimated: `83866`
-		// Minimum execution time: 129_000_000 picoseconds.
-		Weight::from_parts(142_000_000, 0)
+		// Minimum execution time: 95_000_000 picoseconds.
+		Weight::from_parts(98_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 83866))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(4))
@@ -123,8 +123,8 @@ impl<T: frame_system::Config> pallet_conviction_voting::WeightInfo for WeightInf
 		// Proof Size summary in bytes:
 		//  Measured:  `13052`
 		//  Estimated: `30694`
-		// Minimum execution time: 48_000_000 picoseconds.
-		Weight::from_parts(54_000_000, 0)
+		// Minimum execution time: 46_000_000 picoseconds.
+		Weight::from_parts(48_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 30694))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -146,11 +146,11 @@ impl<T: frame_system::Config> pallet_conviction_voting::WeightInfo for WeightInf
 		// Proof Size summary in bytes:
 		//  Measured:  `7020 + r * (447 ±0)`
 		//  Estimated: `83866 + r * (3387 ±0)`
-		// Minimum execution time: 57_000_000 picoseconds.
-		Weight::from_parts(58_165_928, 0)
+		// Minimum execution time: 41_000_000 picoseconds.
+		Weight::from_parts(145_986_544, 0)
 			.saturating_add(Weight::from_parts(0, 83866))
-			// Standard Error: 503_137
-			.saturating_add(Weight::from_parts(59_982_755, 0).saturating_mul(r.into()))
+			// Standard Error: 350_650
+			.saturating_add(Weight::from_parts(34_511_418, 0).saturating_mul(r.into()))
 			.saturating_add(T::DbWeight::get().reads(7))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r.into())))
 			.saturating_add(T::DbWeight::get().writes(6))
@@ -168,11 +168,11 @@ impl<T: frame_system::Config> pallet_conviction_voting::WeightInfo for WeightInf
 		// Proof Size summary in bytes:
 		//  Measured:  `6876 + r * (447 ±0)`
 		//  Estimated: `83866 + r * (3387 ±0)`
-		// Minimum execution time: 28_000_000 picoseconds.
-		Weight::from_parts(20_460_591, 0)
+		// Minimum execution time: 18_000_000 picoseconds.
+		Weight::from_parts(123_366_820, 0)
 			.saturating_add(Weight::from_parts(0, 83866))
-			// Standard Error: 501_829
-			.saturating_add(Weight::from_parts(59_934_115, 0).saturating_mul(r.into()))
+			// Standard Error: 344_454
+			.saturating_add(Weight::from_parts(33_701_114, 0).saturating_mul(r.into()))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r.into())))
 			.saturating_add(T::DbWeight::get().writes(4))
@@ -191,8 +191,8 @@ impl<T: frame_system::Config> pallet_conviction_voting::WeightInfo for WeightInf
 		// Proof Size summary in bytes:
 		//  Measured:  `12038`
 		//  Estimated: `30694`
-		// Minimum execution time: 81_000_000 picoseconds.
-		Weight::from_parts(90_000_000, 0)
+		// Minimum execution time: 67_000_000 picoseconds.
+		Weight::from_parts(73_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 30694))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(3))
diff --git a/runtime/koi/src/weights/pallet_message_queue.rs b/runtime/koi/src/weights/pallet_message_queue.rs
new file mode 100644
index 000000000..069e39a35
--- /dev/null
+++ b/runtime/koi/src/weights/pallet_message_queue.rs
@@ -0,0 +1,191 @@
+// This file is part of Darwinia.
+//
+// Copyright (C) Darwinia Network
+// SPDX-License-Identifier: GPL-3.0
+//
+// Darwinia is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Darwinia is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Darwinia. If not, see <https://www.gnu.org/licenses/>.
+
+//! Autogenerated weights for `pallet_message_queue`
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-06-27, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! WORST CASE MAP SIZE: `1000000`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("koi-dev")`, DB CACHE: 1024
+
+// Executed Command:
+// target/release/darwinia
+// benchmark
+// pallet
+// --header
+// .maintain/license-header
+// --heap-pages
+// 4096
+// --chain
+// koi-dev
+// --output
+// runtime/koi/src/weights
+// --pallet
+// *
+// --extrinsic
+// *
+// --steps
+// 50
+// --repeat
+// 20
+
+#![cfg_attr(rustfmt, rustfmt_skip)]
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+#![allow(missing_docs)]
+
+use frame_support::{traits::Get, weights::Weight};
+use core::marker::PhantomData;
+
+/// Weight functions for `pallet_message_queue`.
+pub struct WeightInfo<T>(PhantomData<T>);
+impl<T: frame_system::Config> pallet_message_queue::WeightInfo for WeightInfo<T> {
+	/// Storage: `MessageQueue::ServiceHead` (r:1 w:0)
+	/// Proof: `MessageQueue::ServiceHead` (`max_values`: Some(1), `max_size`: Some(5), added: 500, mode: `MaxEncodedLen`)
+	/// Storage: `MessageQueue::BookStateFor` (r:2 w:2)
+	/// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	fn ready_ring_knit() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `223`
+		//  Estimated: `6044`
+		// Minimum execution time: 11_000_000 picoseconds.
+		Weight::from_parts(11_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 6044))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	/// Storage: `MessageQueue::BookStateFor` (r:2 w:2)
+	/// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	/// Storage: `MessageQueue::ServiceHead` (r:1 w:1)
+	/// Proof: `MessageQueue::ServiceHead` (`max_values`: Some(1), `max_size`: Some(5), added: 500, mode: `MaxEncodedLen`)
+	fn ready_ring_unknit() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `218`
+		//  Estimated: `6044`
+		// Minimum execution time: 9_000_000 picoseconds.
+		Weight::from_parts(10_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 6044))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(3))
+	}
+	/// Storage: `MessageQueue::BookStateFor` (r:1 w:1)
+	/// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	fn service_queue_base() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `6`
+		//  Estimated: `3517`
+		// Minimum execution time: 4_000_000 picoseconds.
+		Weight::from_parts(4_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 3517))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: `MessageQueue::Pages` (r:1 w:1)
+	/// Proof: `MessageQueue::Pages` (`max_values`: None, `max_size`: Some(65585), added: 68060, mode: `MaxEncodedLen`)
+	fn service_page_base_completion() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `72`
+		//  Estimated: `69050`
+		// Minimum execution time: 5_000_000 picoseconds.
+		Weight::from_parts(6_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 69050))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: `MessageQueue::Pages` (r:1 w:1)
+	/// Proof: `MessageQueue::Pages` (`max_values`: None, `max_size`: Some(65585), added: 68060, mode: `MaxEncodedLen`)
+	fn service_page_base_no_completion() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `72`
+		//  Estimated: `69050`
+		// Minimum execution time: 5_000_000 picoseconds.
+		Weight::from_parts(6_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 69050))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: `MessageQueue::BookStateFor` (r:0 w:1)
+	/// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	/// Storage: `MessageQueue::Pages` (r:0 w:1)
+	/// Proof: `MessageQueue::Pages` (`max_values`: None, `max_size`: Some(65585), added: 68060, mode: `MaxEncodedLen`)
+	fn service_page_item() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `0`
+		//  Estimated: `0`
+		// Minimum execution time: 81_000_000 picoseconds.
+		Weight::from_parts(96_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 0))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	/// Storage: `MessageQueue::ServiceHead` (r:1 w:1)
+	/// Proof: `MessageQueue::ServiceHead` (`max_values`: Some(1), `max_size`: Some(5), added: 500, mode: `MaxEncodedLen`)
+	/// Storage: `MessageQueue::BookStateFor` (r:1 w:0)
+	/// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	fn bump_service_head() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `171`
+		//  Estimated: `3517`
+		// Minimum execution time: 6_000_000 picoseconds.
+		Weight::from_parts(7_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 3517))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: `MessageQueue::BookStateFor` (r:1 w:1)
+	/// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	/// Storage: `MessageQueue::Pages` (r:1 w:1)
+	/// Proof: `MessageQueue::Pages` (`max_values`: None, `max_size`: Some(65585), added: 68060, mode: `MaxEncodedLen`)
+	fn reap_page() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `65667`
+		//  Estimated: `69050`
+		// Minimum execution time: 32_000_000 picoseconds.
+		Weight::from_parts(34_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 69050))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	/// Storage: `MessageQueue::BookStateFor` (r:1 w:1)
+	/// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	/// Storage: `MessageQueue::Pages` (r:1 w:1)
+	/// Proof: `MessageQueue::Pages` (`max_values`: None, `max_size`: Some(65585), added: 68060, mode: `MaxEncodedLen`)
+	fn execute_overweight_page_removed() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `65667`
+		//  Estimated: `69050`
+		// Minimum execution time: 42_000_000 picoseconds.
+		Weight::from_parts(43_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 69050))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	/// Storage: `MessageQueue::BookStateFor` (r:1 w:1)
+	/// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	/// Storage: `MessageQueue::Pages` (r:1 w:1)
+	/// Proof: `MessageQueue::Pages` (`max_values`: None, `max_size`: Some(65585), added: 68060, mode: `MaxEncodedLen`)
+	fn execute_overweight_page_updated() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `65667`
+		//  Estimated: `69050`
+		// Minimum execution time: 49_000_000 picoseconds.
+		Weight::from_parts(50_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 69050))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+}
diff --git a/runtime/koi/src/weights/pallet_preimage.rs b/runtime/koi/src/weights/pallet_preimage.rs
index b0a70b69e..aa2dd2a99 100644
--- a/runtime/koi/src/weights/pallet_preimage.rs
+++ b/runtime/koi/src/weights/pallet_preimage.rs
@@ -18,8 +18,8 @@
 
 //! Autogenerated weights for `pallet_preimage`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-06-04, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-06-27, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `Some("koi-dev")`, DB CACHE: 1024
 
@@ -55,25 +55,31 @@ use core::marker::PhantomData;
 /// Weight functions for `pallet_preimage`.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> pallet_preimage::WeightInfo for WeightInfo<T> {
-	/// Storage: `Preimage::StatusFor` (r:1 w:1)
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
 	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Holds` (r:1 w:1)
+	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(55), added: 2530, mode: `MaxEncodedLen`)
 	/// Storage: `Preimage::PreimageFor` (r:0 w:1)
 	/// Proof: `Preimage::PreimageFor` (`max_values`: None, `max_size`: Some(4194344), added: 4196819, mode: `MaxEncodedLen`)
 	/// The range of component `s` is `[0, 4194304]`.
 	fn note_preimage(s: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `208`
+		//  Measured:  `42`
 		//  Estimated: `3544`
-		// Minimum execution time: 30_000_000 picoseconds.
-		Weight::from_parts(30_000_000, 0)
+		// Minimum execution time: 46_000_000 picoseconds.
+		Weight::from_parts(46_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3544))
 			// Standard Error: 1
-			.saturating_add(Weight::from_parts(1_048, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(2))
+			.saturating_add(Weight::from_parts(1_067, 0).saturating_mul(s.into()))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(3))
 	}
-	/// Storage: `Preimage::StatusFor` (r:1 w:1)
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
 	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
 	/// Storage: `Preimage::PreimageFor` (r:0 w:1)
 	/// Proof: `Preimage::PreimageFor` (`max_values`: None, `max_size`: Some(4194344), added: 4196819, mode: `MaxEncodedLen`)
 	/// The range of component `s` is `[0, 4194304]`.
@@ -81,16 +87,18 @@ impl<T: frame_system::Config> pallet_preimage::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `106`
 		//  Estimated: `3544`
-		// Minimum execution time: 14_000_000 picoseconds.
-		Weight::from_parts(14_000_000, 0)
+		// Minimum execution time: 12_000_000 picoseconds.
+		Weight::from_parts(13_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3544))
 			// Standard Error: 1
-			.saturating_add(Weight::from_parts(1_056, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(Weight::from_parts(1_049, 0).saturating_mul(s.into()))
+			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	/// Storage: `Preimage::StatusFor` (r:1 w:1)
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
 	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
 	/// Storage: `Preimage::PreimageFor` (r:0 w:1)
 	/// Proof: `Preimage::PreimageFor` (`max_values`: None, `max_size`: Some(4194344), added: 4196819, mode: `MaxEncodedLen`)
 	/// The range of component `s` is `[0, 4194304]`.
@@ -98,92 +106,108 @@ impl<T: frame_system::Config> pallet_preimage::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `106`
 		//  Estimated: `3544`
-		// Minimum execution time: 14_000_000 picoseconds.
-		Weight::from_parts(10_563_587, 0)
+		// Minimum execution time: 13_000_000 picoseconds.
+		Weight::from_parts(13_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3544))
-			// Standard Error: 3
-			.saturating_add(Weight::from_parts(1_041, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
+			// Standard Error: 1
+			.saturating_add(Weight::from_parts(1_096, 0).saturating_mul(s.into()))
+			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	/// Storage: `Preimage::StatusFor` (r:1 w:1)
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
 	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Holds` (r:1 w:1)
+	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(55), added: 2530, mode: `MaxEncodedLen`)
 	/// Storage: `Preimage::PreimageFor` (r:0 w:1)
 	/// Proof: `Preimage::PreimageFor` (`max_values`: None, `max_size`: Some(4194344), added: 4196819, mode: `MaxEncodedLen`)
 	fn unnote_preimage() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `342`
+		//  Measured:  `219`
 		//  Estimated: `3544`
-		// Minimum execution time: 31_000_000 picoseconds.
-		Weight::from_parts(34_000_000, 0)
+		// Minimum execution time: 44_000_000 picoseconds.
+		Weight::from_parts(46_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3544))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(2))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(3))
 	}
-	/// Storage: `Preimage::StatusFor` (r:1 w:1)
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
 	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
 	/// Storage: `Preimage::PreimageFor` (r:0 w:1)
 	/// Proof: `Preimage::PreimageFor` (`max_values`: None, `max_size`: Some(4194344), added: 4196819, mode: `MaxEncodedLen`)
 	fn unnote_no_deposit_preimage() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `144`
 		//  Estimated: `3544`
-		// Minimum execution time: 16_000_000 picoseconds.
-		Weight::from_parts(17_000_000, 0)
+		// Minimum execution time: 17_000_000 picoseconds.
+		Weight::from_parts(18_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3544))
-			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	/// Storage: `Preimage::StatusFor` (r:1 w:1)
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
 	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
 	fn request_preimage() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `176`
 		//  Estimated: `3544`
-		// Minimum execution time: 14_000_000 picoseconds.
-		Weight::from_parts(19_000_000, 0)
+		// Minimum execution time: 13_000_000 picoseconds.
+		Weight::from_parts(14_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3544))
-			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	/// Storage: `Preimage::StatusFor` (r:1 w:1)
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
 	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
 	fn request_no_deposit_preimage() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `144`
 		//  Estimated: `3544`
-		// Minimum execution time: 8_000_000 picoseconds.
+		// Minimum execution time: 10_000_000 picoseconds.
 		Weight::from_parts(12_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3544))
-			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	/// Storage: `Preimage::StatusFor` (r:1 w:1)
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
 	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
 	fn request_unnoted_preimage() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `42`
 		//  Estimated: `3544`
-		// Minimum execution time: 11_000_000 picoseconds.
-		Weight::from_parts(12_000_000, 0)
+		// Minimum execution time: 10_000_000 picoseconds.
+		Weight::from_parts(11_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3544))
-			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	/// Storage: `Preimage::StatusFor` (r:1 w:1)
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
 	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
 	fn request_requested_preimage() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `106`
 		//  Estimated: `3544`
-		// Minimum execution time: 7_000_000 picoseconds.
-		Weight::from_parts(8_000_000, 0)
+		// Minimum execution time: 8_000_000 picoseconds.
+		Weight::from_parts(9_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3544))
-			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	/// Storage: `Preimage::StatusFor` (r:1 w:1)
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
 	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
 	/// Storage: `Preimage::PreimageFor` (r:0 w:1)
 	/// Proof: `Preimage::PreimageFor` (`max_values`: None, `max_size`: Some(4194344), added: 4196819, mode: `MaxEncodedLen`)
 	fn unrequest_preimage() -> Weight {
@@ -191,33 +215,59 @@ impl<T: frame_system::Config> pallet_preimage::WeightInfo for WeightInfo<T> {
 		//  Measured:  `144`
 		//  Estimated: `3544`
 		// Minimum execution time: 15_000_000 picoseconds.
-		Weight::from_parts(16_000_000, 0)
+		Weight::from_parts(17_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3544))
-			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	/// Storage: `Preimage::StatusFor` (r:1 w:1)
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
 	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
 	fn unrequest_unnoted_preimage() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `106`
 		//  Estimated: `3544`
-		// Minimum execution time: 7_000_000 picoseconds.
-		Weight::from_parts(8_000_000, 0)
+		// Minimum execution time: 8_000_000 picoseconds.
+		Weight::from_parts(9_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3544))
-			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	/// Storage: `Preimage::StatusFor` (r:1 w:1)
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
 	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
 	fn unrequest_multi_referenced_preimage() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `106`
 		//  Estimated: `3544`
-		// Minimum execution time: 7_000_000 picoseconds.
+		// Minimum execution time: 8_000_000 picoseconds.
 		Weight::from_parts(9_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3544))
-			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
+	/// Storage: `Preimage::StatusFor` (r:1023 w:1023)
+	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:1023 w:1023)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(116), added: 2591, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Holds` (r:1023 w:1023)
+	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(55), added: 2530, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:0 w:1023)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
+	/// The range of component `n` is `[1, 1024]`.
+	fn ensure_updated(n: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `504 + n * (203 ±0)`
+		//  Estimated: `990 + n * (2591 ±0)`
+		// Minimum execution time: 54_000_000 picoseconds.
+		Weight::from_parts(54_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 990))
+			// Standard Error: 22_013
+			.saturating_add(Weight::from_parts(53_066_920, 0).saturating_mul(n.into()))
+			.saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(n.into())))
+			.saturating_add(T::DbWeight::get().writes((4_u64).saturating_mul(n.into())))
+			.saturating_add(Weight::from_parts(0, 2591).saturating_mul(n.into()))
+	}
 }
diff --git a/runtime/koi/src/weights/pallet_proxy.rs b/runtime/koi/src/weights/pallet_proxy.rs
index 26182424e..06b2d90bb 100644
--- a/runtime/koi/src/weights/pallet_proxy.rs
+++ b/runtime/koi/src/weights/pallet_proxy.rs
@@ -18,8 +18,8 @@
 
 //! Autogenerated weights for `pallet_proxy`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-06-04, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-06-27, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `Some("koi-dev")`, DB CACHE: 1024
 
@@ -64,11 +64,11 @@ impl<T: frame_system::Config> pallet_proxy::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `119 + p * (25 ±0)`
 		//  Estimated: `4310`
-		// Minimum execution time: 14_000_000 picoseconds.
-		Weight::from_parts(15_100_010, 0)
+		// Minimum execution time: 13_000_000 picoseconds.
+		Weight::from_parts(13_336_147, 0)
 			.saturating_add(Weight::from_parts(0, 4310))
-			// Standard Error: 2_008
-			.saturating_add(Weight::from_parts(34_277, 0).saturating_mul(p.into()))
+			// Standard Error: 2_057
+			.saturating_add(Weight::from_parts(23_701, 0).saturating_mul(p.into()))
 			.saturating_add(T::DbWeight::get().reads(2))
 	}
 	/// Storage: `Proxy::Proxies` (r:1 w:0)
@@ -81,15 +81,17 @@ impl<T: frame_system::Config> pallet_proxy::WeightInfo for WeightInfo<T> {
 	/// Proof: `TxPause::PausedCalls` (`max_values`: None, `max_size`: Some(532), added: 3007, mode: `MaxEncodedLen`)
 	/// The range of component `a` is `[0, 31]`.
 	/// The range of component `p` is `[1, 31]`.
-	fn proxy_announced(a: u32, _p: u32, ) -> Weight {
+	fn proxy_announced(a: u32, p: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `371 + a * (56 ±0) + p * (25 ±0)`
 		//  Estimated: `5302`
-		// Minimum execution time: 34_000_000 picoseconds.
-		Weight::from_parts(36_388_524, 0)
+		// Minimum execution time: 31_000_000 picoseconds.
+		Weight::from_parts(32_332_960, 0)
 			.saturating_add(Weight::from_parts(0, 5302))
-			// Standard Error: 3_832
-			.saturating_add(Weight::from_parts(116_626, 0).saturating_mul(a.into()))
+			// Standard Error: 3_478
+			.saturating_add(Weight::from_parts(97_301, 0).saturating_mul(a.into()))
+			// Standard Error: 3_594
+			.saturating_add(Weight::from_parts(92, 0).saturating_mul(p.into()))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
@@ -103,11 +105,11 @@ impl<T: frame_system::Config> pallet_proxy::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `295 + a * (56 ±0)`
 		//  Estimated: `5302`
-		// Minimum execution time: 21_000_000 picoseconds.
-		Weight::from_parts(21_965_802, 0)
+		// Minimum execution time: 19_000_000 picoseconds.
+		Weight::from_parts(20_257_306, 0)
 			.saturating_add(Weight::from_parts(0, 5302))
-			// Standard Error: 2_130
-			.saturating_add(Weight::from_parts(116_871, 0).saturating_mul(a.into()))
+			// Standard Error: 2_249
+			.saturating_add(Weight::from_parts(114_708, 0).saturating_mul(a.into()))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
@@ -121,11 +123,11 @@ impl<T: frame_system::Config> pallet_proxy::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `295 + a * (56 ±0)`
 		//  Estimated: `5302`
-		// Minimum execution time: 20_000_000 picoseconds.
-		Weight::from_parts(22_207_671, 0)
+		// Minimum execution time: 19_000_000 picoseconds.
+		Weight::from_parts(20_576_197, 0)
 			.saturating_add(Weight::from_parts(0, 5302))
-			// Standard Error: 1_998
-			.saturating_add(Weight::from_parts(106_808, 0).saturating_mul(a.into()))
+			// Standard Error: 2_256
+			.saturating_add(Weight::from_parts(111_775, 0).saturating_mul(a.into()))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
@@ -141,13 +143,13 @@ impl<T: frame_system::Config> pallet_proxy::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `311 + a * (56 ±0) + p * (25 ±0)`
 		//  Estimated: `5302`
-		// Minimum execution time: 29_000_000 picoseconds.
-		Weight::from_parts(29_791_242, 0)
+		// Minimum execution time: 26_000_000 picoseconds.
+		Weight::from_parts(26_129_689, 0)
 			.saturating_add(Weight::from_parts(0, 5302))
-			// Standard Error: 2_196
-			.saturating_add(Weight::from_parts(134_102, 0).saturating_mul(a.into()))
-			// Standard Error: 2_269
-			.saturating_add(Weight::from_parts(16_253, 0).saturating_mul(p.into()))
+			// Standard Error: 2_000
+			.saturating_add(Weight::from_parts(128_553, 0).saturating_mul(a.into()))
+			// Standard Error: 2_066
+			.saturating_add(Weight::from_parts(19_273, 0).saturating_mul(p.into()))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
@@ -158,11 +160,11 @@ impl<T: frame_system::Config> pallet_proxy::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `115 + p * (25 ±0)`
 		//  Estimated: `4310`
-		// Minimum execution time: 23_000_000 picoseconds.
-		Weight::from_parts(24_145_582, 0)
+		// Minimum execution time: 20_000_000 picoseconds.
+		Weight::from_parts(20_919_041, 0)
 			.saturating_add(Weight::from_parts(0, 4310))
-			// Standard Error: 2_363
-			.saturating_add(Weight::from_parts(26_315, 0).saturating_mul(p.into()))
+			// Standard Error: 1_398
+			.saturating_add(Weight::from_parts(7_664, 0).saturating_mul(p.into()))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -173,11 +175,11 @@ impl<T: frame_system::Config> pallet_proxy::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `115 + p * (25 ±0)`
 		//  Estimated: `4310`
-		// Minimum execution time: 23_000_000 picoseconds.
-		Weight::from_parts(24_438_307, 0)
+		// Minimum execution time: 20_000_000 picoseconds.
+		Weight::from_parts(21_056_854, 0)
 			.saturating_add(Weight::from_parts(0, 4310))
-			// Standard Error: 2_791
-			.saturating_add(Weight::from_parts(19_438, 0).saturating_mul(p.into()))
+			// Standard Error: 1_550
+			.saturating_add(Weight::from_parts(1_491, 0).saturating_mul(p.into()))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -188,24 +190,26 @@ impl<T: frame_system::Config> pallet_proxy::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `115 + p * (25 ±0)`
 		//  Estimated: `4310`
-		// Minimum execution time: 21_000_000 picoseconds.
-		Weight::from_parts(21_980_707, 0)
+		// Minimum execution time: 19_000_000 picoseconds.
+		Weight::from_parts(19_917_339, 0)
 			.saturating_add(Weight::from_parts(0, 4310))
-			// Standard Error: 894
-			.saturating_add(Weight::from_parts(2_531, 0).saturating_mul(p.into()))
+			// Standard Error: 1_989
+			.saturating_add(Weight::from_parts(17_568, 0).saturating_mul(p.into()))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
 	/// Storage: `Proxy::Proxies` (r:1 w:1)
 	/// Proof: `Proxy::Proxies` (`max_values`: None, `max_size`: Some(845), added: 3320, mode: `MaxEncodedLen`)
 	/// The range of component `p` is `[1, 31]`.
-	fn create_pure(_p: u32, ) -> Weight {
+	fn create_pure(p: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `127`
 		//  Estimated: `4310`
-		// Minimum execution time: 25_000_000 picoseconds.
-		Weight::from_parts(26_128_111, 0)
+		// Minimum execution time: 21_000_000 picoseconds.
+		Weight::from_parts(21_964_308, 0)
 			.saturating_add(Weight::from_parts(0, 4310))
+			// Standard Error: 930
+			.saturating_add(Weight::from_parts(1_655, 0).saturating_mul(p.into()))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -216,11 +220,11 @@ impl<T: frame_system::Config> pallet_proxy::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `140 + p * (25 ±0)`
 		//  Estimated: `4310`
-		// Minimum execution time: 21_000_000 picoseconds.
-		Weight::from_parts(22_216_563, 0)
+		// Minimum execution time: 19_000_000 picoseconds.
+		Weight::from_parts(20_169_474, 0)
 			.saturating_add(Weight::from_parts(0, 4310))
-			// Standard Error: 2_376
-			.saturating_add(Weight::from_parts(21_861, 0).saturating_mul(p.into()))
+			// Standard Error: 2_189
+			.saturating_add(Weight::from_parts(29_788, 0).saturating_mul(p.into()))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
diff --git a/runtime/koi/src/weights/pallet_referenda.rs b/runtime/koi/src/weights/pallet_referenda.rs
index 0b74c6047..4e5eab939 100644
--- a/runtime/koi/src/weights/pallet_referenda.rs
+++ b/runtime/koi/src/weights/pallet_referenda.rs
@@ -18,8 +18,8 @@
 
 //! Autogenerated weights for `pallet_referenda`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-06-04, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-06-27, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `Some("koi-dev")`, DB CACHE: 1024
 
@@ -65,8 +65,8 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `275`
 		//  Estimated: `42428`
-		// Minimum execution time: 37_000_000 picoseconds.
-		Weight::from_parts(38_000_000, 0)
+		// Minimum execution time: 30_000_000 picoseconds.
+		Weight::from_parts(31_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 42428))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(3))
@@ -79,8 +79,8 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `516`
 		//  Estimated: `83866`
-		// Minimum execution time: 46_000_000 picoseconds.
-		Weight::from_parts(47_000_000, 0)
+		// Minimum execution time: 38_000_000 picoseconds.
+		Weight::from_parts(39_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 83866))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(3))
@@ -97,8 +97,8 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `3350`
 		//  Estimated: `42428`
-		// Minimum execution time: 53_000_000 picoseconds.
-		Weight::from_parts(56_000_000, 0)
+		// Minimum execution time: 45_000_000 picoseconds.
+		Weight::from_parts(46_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 42428))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(3))
@@ -115,8 +115,8 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `3370`
 		//  Estimated: `42428`
-		// Minimum execution time: 52_000_000 picoseconds.
-		Weight::from_parts(55_000_000, 0)
+		// Minimum execution time: 45_000_000 picoseconds.
+		Weight::from_parts(46_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 42428))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(3))
@@ -131,8 +131,8 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `516`
 		//  Estimated: `83866`
-		// Minimum execution time: 56_000_000 picoseconds.
-		Weight::from_parts(58_000_000, 0)
+		// Minimum execution time: 46_000_000 picoseconds.
+		Weight::from_parts(47_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 83866))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(4))
@@ -145,8 +145,8 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `461`
 		//  Estimated: `4377`
-		// Minimum execution time: 36_000_000 picoseconds.
-		Weight::from_parts(37_000_000, 0)
+		// Minimum execution time: 30_000_000 picoseconds.
+		Weight::from_parts(31_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 4377))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -157,8 +157,8 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `425`
 		//  Estimated: `4377`
-		// Minimum execution time: 29_000_000 picoseconds.
-		Weight::from_parts(30_000_000, 0)
+		// Minimum execution time: 25_000_000 picoseconds.
+		Weight::from_parts(26_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 4377))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -169,8 +169,8 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `384`
 		//  Estimated: `4377`
-		// Minimum execution time: 28_000_000 picoseconds.
-		Weight::from_parts(29_000_000, 0)
+		// Minimum execution time: 25_000_000 picoseconds.
+		Weight::from_parts(26_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 4377))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -183,8 +183,8 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `390`
 		//  Estimated: `83866`
-		// Minimum execution time: 33_000_000 picoseconds.
-		Weight::from_parts(34_000_000, 0)
+		// Minimum execution time: 26_000_000 picoseconds.
+		Weight::from_parts(26_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 83866))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(3))
@@ -201,8 +201,8 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `880`
 		//  Estimated: `83866`
-		// Minimum execution time: 105_000_000 picoseconds.
-		Weight::from_parts(108_000_000, 0)
+		// Minimum execution time: 85_000_000 picoseconds.
+		Weight::from_parts(87_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 83866))
 			.saturating_add(T::DbWeight::get().reads(5))
 			.saturating_add(T::DbWeight::get().writes(4))
@@ -229,10 +229,10 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(38963), added: 41438, mode: `MaxEncodedLen`)
 	fn one_fewer_deciding_failing() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3165`
+		//  Measured:  `3137`
 		//  Estimated: `42428`
-		// Minimum execution time: 32_000_000 picoseconds.
-		Weight::from_parts(34_000_000, 0)
+		// Minimum execution time: 26_000_000 picoseconds.
+		Weight::from_parts(27_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 42428))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(3))
@@ -245,10 +245,10 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(38963), added: 41438, mode: `MaxEncodedLen`)
 	fn one_fewer_deciding_passing() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3223`
+		//  Measured:  `3195`
 		//  Estimated: `42428`
-		// Minimum execution time: 40_000_000 picoseconds.
-		Weight::from_parts(42_000_000, 0)
+		// Minimum execution time: 32_000_000 picoseconds.
+		Weight::from_parts(33_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 42428))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(3))
@@ -275,8 +275,8 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `3020`
 		//  Estimated: `5477`
-		// Minimum execution time: 14_000_000 picoseconds.
-		Weight::from_parts(15_000_000, 0)
+		// Minimum execution time: 13_000_000 picoseconds.
+		Weight::from_parts(14_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 5477))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -291,7 +291,7 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `3024`
 		//  Estimated: `5477`
-		// Minimum execution time: 17_000_000 picoseconds.
+		// Minimum execution time: 16_000_000 picoseconds.
 		Weight::from_parts(17_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 5477))
 			.saturating_add(T::DbWeight::get().reads(3))
@@ -307,7 +307,7 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `3044`
 		//  Estimated: `5477`
-		// Minimum execution time: 17_000_000 picoseconds.
+		// Minimum execution time: 16_000_000 picoseconds.
 		Weight::from_parts(17_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 5477))
 			.saturating_add(T::DbWeight::get().reads(3))
@@ -321,8 +321,8 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `354`
 		//  Estimated: `42428`
-		// Minimum execution time: 20_000_000 picoseconds.
-		Weight::from_parts(21_000_000, 0)
+		// Minimum execution time: 17_000_000 picoseconds.
+		Weight::from_parts(18_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 42428))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -335,8 +335,8 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `390`
 		//  Estimated: `42428`
-		// Minimum execution time: 20_000_000 picoseconds.
-		Weight::from_parts(21_000_000, 0)
+		// Minimum execution time: 17_000_000 picoseconds.
+		Weight::from_parts(18_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 42428))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -347,8 +347,8 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `299`
 		//  Estimated: `4377`
-		// Minimum execution time: 14_000_000 picoseconds.
-		Weight::from_parts(14_000_000, 0)
+		// Minimum execution time: 11_000_000 picoseconds.
+		Weight::from_parts(12_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 4377))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -363,8 +363,8 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `390`
 		//  Estimated: `42428`
-		// Minimum execution time: 27_000_000 picoseconds.
-		Weight::from_parts(28_000_000, 0)
+		// Minimum execution time: 23_000_000 picoseconds.
+		Weight::from_parts(23_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 42428))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(3))
@@ -379,8 +379,8 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `390`
 		//  Estimated: `42428`
-		// Minimum execution time: 31_000_000 picoseconds.
-		Weight::from_parts(31_000_000, 0)
+		// Minimum execution time: 25_000_000 picoseconds.
+		Weight::from_parts(26_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 42428))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(3))
@@ -393,8 +393,8 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `443`
 		//  Estimated: `42428`
-		// Minimum execution time: 24_000_000 picoseconds.
-		Weight::from_parts(25_000_000, 0)
+		// Minimum execution time: 19_000_000 picoseconds.
+		Weight::from_parts(20_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 42428))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -407,8 +407,8 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `426`
 		//  Estimated: `42428`
-		// Minimum execution time: 25_000_000 picoseconds.
-		Weight::from_parts(25_000_000, 0)
+		// Minimum execution time: 19_000_000 picoseconds.
+		Weight::from_parts(20_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 42428))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -421,8 +421,8 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `443`
 		//  Estimated: `42428`
-		// Minimum execution time: 21_000_000 picoseconds.
-		Weight::from_parts(22_000_000, 0)
+		// Minimum execution time: 18_000_000 picoseconds.
+		Weight::from_parts(19_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 42428))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -435,8 +435,8 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `447`
 		//  Estimated: `42428`
-		// Minimum execution time: 21_000_000 picoseconds.
-		Weight::from_parts(22_000_000, 0)
+		// Minimum execution time: 18_000_000 picoseconds.
+		Weight::from_parts(19_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 42428))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -451,8 +451,8 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `447`
 		//  Estimated: `83866`
-		// Minimum execution time: 36_000_000 picoseconds.
-		Weight::from_parts(36_000_000, 0)
+		// Minimum execution time: 29_000_000 picoseconds.
+		Weight::from_parts(29_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 83866))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(4))
@@ -465,8 +465,8 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `443`
 		//  Estimated: `42428`
-		// Minimum execution time: 25_000_000 picoseconds.
-		Weight::from_parts(26_000_000, 0)
+		// Minimum execution time: 20_000_000 picoseconds.
+		Weight::from_parts(20_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 42428))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -475,16 +475,18 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 	/// Proof: `Referenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(912), added: 3387, mode: `MaxEncodedLen`)
 	/// Storage: `Preimage::StatusFor` (r:1 w:0)
 	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:0)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
 	/// Storage: `Referenda::MetadataOf` (r:0 w:1)
 	/// Proof: `Referenda::MetadataOf` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
 	fn set_some_metadata() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `443`
 		//  Estimated: `4377`
-		// Minimum execution time: 17_000_000 picoseconds.
-		Weight::from_parts(17_000_000, 0)
+		// Minimum execution time: 16_000_000 picoseconds.
+		Weight::from_parts(16_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 4377))
-			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
 	/// Storage: `Referenda::ReferendumInfoFor` (r:1 w:0)
@@ -495,8 +497,8 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `376`
 		//  Estimated: `4377`
-		// Minimum execution time: 15_000_000 picoseconds.
-		Weight::from_parts(16_000_000, 0)
+		// Minimum execution time: 12_000_000 picoseconds.
+		Weight::from_parts(13_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 4377))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
diff --git a/runtime/koi/src/weights/pallet_scheduler.rs b/runtime/koi/src/weights/pallet_scheduler.rs
index cdbf350a3..22687ea78 100644
--- a/runtime/koi/src/weights/pallet_scheduler.rs
+++ b/runtime/koi/src/weights/pallet_scheduler.rs
@@ -18,8 +18,8 @@
 
 //! Autogenerated weights for `pallet_scheduler`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-06-04, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-06-27, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `Some("koi-dev")`, DB CACHE: 1024
 
@@ -61,8 +61,8 @@ impl<T: frame_system::Config> pallet_scheduler::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `31`
 		//  Estimated: `1489`
-		// Minimum execution time: 4_000_000 picoseconds.
-		Weight::from_parts(4_000_000, 0)
+		// Minimum execution time: 3_000_000 picoseconds.
+		Weight::from_parts(3_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 1489))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -75,10 +75,10 @@ impl<T: frame_system::Config> pallet_scheduler::WeightInfo for WeightInfo<T> {
 		//  Measured:  `78 + s * (177 ±0)`
 		//  Estimated: `42428`
 		// Minimum execution time: 3_000_000 picoseconds.
-		Weight::from_parts(5_519_778, 0)
+		Weight::from_parts(5_646_595, 0)
 			.saturating_add(Weight::from_parts(0, 42428))
-			// Standard Error: 1_451
-			.saturating_add(Weight::from_parts(654_332, 0).saturating_mul(s.into()))
+			// Standard Error: 1_323
+			.saturating_add(Weight::from_parts(375_098, 0).saturating_mul(s.into()))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -86,25 +86,27 @@ impl<T: frame_system::Config> pallet_scheduler::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 4_000_000 picoseconds.
-		Weight::from_parts(5_000_000, 0)
+		// Minimum execution time: 2_000_000 picoseconds.
+		Weight::from_parts(3_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 	}
 	/// Storage: `Preimage::PreimageFor` (r:1 w:1)
 	/// Proof: `Preimage::PreimageFor` (`max_values`: None, `max_size`: Some(4194344), added: 4196819, mode: `Measured`)
-	/// Storage: `Preimage::StatusFor` (r:1 w:1)
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
 	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
 	/// The range of component `s` is `[128, 4194304]`.
 	fn service_task_fetched(s: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `179 + s * (1 ±0)`
 		//  Estimated: `3644 + s * (1 ±0)`
-		// Minimum execution time: 18_000_000 picoseconds.
-		Weight::from_parts(18_000_000, 0)
+		// Minimum execution time: 16_000_000 picoseconds.
+		Weight::from_parts(16_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3644))
-			// Standard Error: 3
-			.saturating_add(Weight::from_parts(500, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
+			// Standard Error: 1
+			.saturating_add(Weight::from_parts(443, 0).saturating_mul(s.into()))
+			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(2))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(s.into()))
 	}
@@ -114,8 +116,8 @@ impl<T: frame_system::Config> pallet_scheduler::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 6_000_000 picoseconds.
-		Weight::from_parts(6_000_000, 0)
+		// Minimum execution time: 4_000_000 picoseconds.
+		Weight::from_parts(4_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -123,8 +125,8 @@ impl<T: frame_system::Config> pallet_scheduler::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 4_000_000 picoseconds.
-		Weight::from_parts(5_000_000, 0)
+		// Minimum execution time: 2_000_000 picoseconds.
+		Weight::from_parts(3_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 	}
 	/// Storage: `TxPause::PausedCalls` (r:1 w:0)
@@ -134,7 +136,7 @@ impl<T: frame_system::Config> pallet_scheduler::WeightInfo for WeightInfo<T> {
 		//  Measured:  `4`
 		//  Estimated: `3997`
 		// Minimum execution time: 5_000_000 picoseconds.
-		Weight::from_parts(6_000_000, 0)
+		Weight::from_parts(5_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3997))
 			.saturating_add(T::DbWeight::get().reads(1))
 	}
@@ -153,11 +155,11 @@ impl<T: frame_system::Config> pallet_scheduler::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `78 + s * (177 ±0)`
 		//  Estimated: `42428`
-		// Minimum execution time: 11_000_000 picoseconds.
-		Weight::from_parts(13_308_000, 0)
+		// Minimum execution time: 9_000_000 picoseconds.
+		Weight::from_parts(11_112_705, 0)
 			.saturating_add(Weight::from_parts(0, 42428))
-			// Standard Error: 1_455
-			.saturating_add(Weight::from_parts(635_428, 0).saturating_mul(s.into()))
+			// Standard Error: 1_384
+			.saturating_add(Weight::from_parts(364_052, 0).saturating_mul(s.into()))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -170,11 +172,11 @@ impl<T: frame_system::Config> pallet_scheduler::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `78 + s * (177 ±0)`
 		//  Estimated: `42428`
-		// Minimum execution time: 15_000_000 picoseconds.
-		Weight::from_parts(13_697_877, 0)
+		// Minimum execution time: 12_000_000 picoseconds.
+		Weight::from_parts(11_587_346, 0)
 			.saturating_add(Weight::from_parts(0, 42428))
-			// Standard Error: 1_565
-			.saturating_add(Weight::from_parts(1_162_593, 0).saturating_mul(s.into()))
+			// Standard Error: 1_259
+			.saturating_add(Weight::from_parts(598_064, 0).saturating_mul(s.into()))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
@@ -187,11 +189,11 @@ impl<T: frame_system::Config> pallet_scheduler::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `255 + s * (185 ±0)`
 		//  Estimated: `42428`
-		// Minimum execution time: 14_000_000 picoseconds.
-		Weight::from_parts(16_838_588, 0)
+		// Minimum execution time: 11_000_000 picoseconds.
+		Weight::from_parts(14_706_823, 0)
 			.saturating_add(Weight::from_parts(0, 42428))
-			// Standard Error: 2_420
-			.saturating_add(Weight::from_parts(653_363, 0).saturating_mul(s.into()))
+			// Standard Error: 1_946
+			.saturating_add(Weight::from_parts(377_925, 0).saturating_mul(s.into()))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
@@ -204,11 +206,11 @@ impl<T: frame_system::Config> pallet_scheduler::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `281 + s * (185 ±0)`
 		//  Estimated: `42428`
-		// Minimum execution time: 16_000_000 picoseconds.
-		Weight::from_parts(15_553_877, 0)
+		// Minimum execution time: 14_000_000 picoseconds.
+		Weight::from_parts(14_150_285, 0)
 			.saturating_add(Weight::from_parts(0, 42428))
-			// Standard Error: 2_296
-			.saturating_add(Weight::from_parts(1_185_416, 0).saturating_mul(s.into()))
+			// Standard Error: 1_300
+			.saturating_add(Weight::from_parts(602_890, 0).saturating_mul(s.into()))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
diff --git a/runtime/koi/src/weights/pallet_session.rs b/runtime/koi/src/weights/pallet_session.rs
index a798ba20a..a3a2319f5 100644
--- a/runtime/koi/src/weights/pallet_session.rs
+++ b/runtime/koi/src/weights/pallet_session.rs
@@ -18,8 +18,8 @@
 
 //! Autogenerated weights for `pallet_session`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-06-04, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-06-27, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `Some("koi-dev")`, DB CACHE: 1024
 
diff --git a/runtime/koi/src/weights/pallet_timestamp.rs b/runtime/koi/src/weights/pallet_timestamp.rs
index b0134a58c..a36f142c3 100644
--- a/runtime/koi/src/weights/pallet_timestamp.rs
+++ b/runtime/koi/src/weights/pallet_timestamp.rs
@@ -18,8 +18,8 @@
 
 //! Autogenerated weights for `pallet_timestamp`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-06-04, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-06-27, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `Some("koi-dev")`, DB CACHE: 1024
 
@@ -61,8 +61,8 @@ impl<T: frame_system::Config> pallet_timestamp::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `6`
 		//  Estimated: `1493`
-		// Minimum execution time: 6_000_000 picoseconds.
-		Weight::from_parts(6_000_000, 0)
+		// Minimum execution time: 4_000_000 picoseconds.
+		Weight::from_parts(5_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 1493))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
diff --git a/runtime/koi/src/weights/pallet_treasury.rs b/runtime/koi/src/weights/pallet_treasury.rs
index 6e557251e..e6af41735 100644
--- a/runtime/koi/src/weights/pallet_treasury.rs
+++ b/runtime/koi/src/weights/pallet_treasury.rs
@@ -18,8 +18,8 @@
 
 //! Autogenerated weights for `pallet_treasury`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-06-04, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-06-27, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `Some("koi-dev")`, DB CACHE: 1024
 
@@ -61,12 +61,12 @@ impl<T: frame_system::Config> pallet_treasury::WeightInfo for WeightInfo<T> {
 	/// Proof: `Treasury::Approvals` (`max_values`: Some(1), `max_size`: Some(402), added: 897, mode: `MaxEncodedLen`)
 	/// Storage: `Treasury::Proposals` (r:0 w:1)
 	/// Proof: `Treasury::Proposals` (`max_values`: None, `max_size`: Some(84), added: 2559, mode: `MaxEncodedLen`)
-	fn spend() -> Weight {
+	fn spend_local() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `109`
 		//  Estimated: `1887`
-		// Minimum execution time: 12_000_000 picoseconds.
-		Weight::from_parts(13_000_000, 0)
+		// Minimum execution time: 10_000_000 picoseconds.
+		Weight::from_parts(10_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 1887))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(3))
@@ -79,8 +79,8 @@ impl<T: frame_system::Config> pallet_treasury::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `275`
 		//  Estimated: `1489`
-		// Minimum execution time: 27_000_000 picoseconds.
-		Weight::from_parts(28_000_000, 0)
+		// Minimum execution time: 23_000_000 picoseconds.
+		Weight::from_parts(24_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 1489))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -93,8 +93,8 @@ impl<T: frame_system::Config> pallet_treasury::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `571`
 		//  Estimated: `6172`
-		// Minimum execution time: 44_000_000 picoseconds.
-		Weight::from_parts(46_000_000, 0)
+		// Minimum execution time: 38_000_000 picoseconds.
+		Weight::from_parts(39_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 6172))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(3))
@@ -108,11 +108,11 @@ impl<T: frame_system::Config> pallet_treasury::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `537 + p * (8 ±0)`
 		//  Estimated: `3549`
-		// Minimum execution time: 8_000_000 picoseconds.
-		Weight::from_parts(9_844_013, 0)
+		// Minimum execution time: 7_000_000 picoseconds.
+		Weight::from_parts(8_698_281, 0)
 			.saturating_add(Weight::from_parts(0, 3549))
-			// Standard Error: 779
-			.saturating_add(Weight::from_parts(18_073, 0).saturating_mul(p.into()))
+			// Standard Error: 822
+			.saturating_add(Weight::from_parts(26_269, 0).saturating_mul(p.into()))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -122,8 +122,8 @@ impl<T: frame_system::Config> pallet_treasury::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `194`
 		//  Estimated: `1887`
-		// Minimum execution time: 7_000_000 picoseconds.
-		Weight::from_parts(7_000_000, 0)
+		// Minimum execution time: 6_000_000 picoseconds.
+		Weight::from_parts(6_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 1887))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -136,21 +136,73 @@ impl<T: frame_system::Config> pallet_treasury::WeightInfo for WeightInfo<T> {
 	/// Proof: `Balances::InactiveIssuance` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
 	/// Storage: `Treasury::Approvals` (r:1 w:1)
 	/// Proof: `Treasury::Approvals` (`max_values`: Some(1), `max_size`: Some(402), added: 897, mode: `MaxEncodedLen`)
-	/// Storage: `Treasury::Proposals` (r:100 w:0)
+	/// Storage: `Treasury::Proposals` (r:99 w:0)
 	/// Proof: `Treasury::Proposals` (`max_values`: None, `max_size`: Some(84), added: 2559, mode: `MaxEncodedLen`)
-	/// The range of component `p` is `[0, 100]`.
+	/// The range of component `p` is `[0, 99]`.
 	fn on_initialize_proposals(p: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `328 + p * (97 ±0)`
 		//  Estimated: `3581 + p * (2559 ±0)`
-		// Minimum execution time: 28_000_000 picoseconds.
-		Weight::from_parts(55_287_531, 0)
+		// Minimum execution time: 18_000_000 picoseconds.
+		Weight::from_parts(127_084_382, 0)
 			.saturating_add(Weight::from_parts(0, 3581))
-			// Standard Error: 53_594
-			.saturating_add(Weight::from_parts(2_450_736, 0).saturating_mul(p.into()))
+			// Standard Error: 161_920
+			.saturating_add(Weight::from_parts(1_326_267, 0).saturating_mul(p.into()))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(p.into())))
 			.saturating_add(T::DbWeight::get().writes(3))
 			.saturating_add(Weight::from_parts(0, 2559).saturating_mul(p.into()))
 	}
+	/// Storage: `Treasury::SpendCount` (r:1 w:1)
+	/// Proof: `Treasury::SpendCount` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Treasury::Spends` (r:0 w:1)
+	/// Proof: `Treasury::Spends` (`max_values`: None, `max_size`: Some(57), added: 2532, mode: `MaxEncodedLen`)
+	fn spend() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `109`
+		//  Estimated: `1489`
+		// Minimum execution time: 9_000_000 picoseconds.
+		Weight::from_parts(9_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 1489))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	/// Storage: `Treasury::Spends` (r:1 w:1)
+	/// Proof: `Treasury::Spends` (`max_values`: None, `max_size`: Some(57), added: 2532, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:2 w:2)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(116), added: 2591, mode: `MaxEncodedLen`)
+	fn payout() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `416`
+		//  Estimated: `6172`
+		// Minimum execution time: 49_000_000 picoseconds.
+		Weight::from_parts(50_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 6172))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(3))
+	}
+	/// Storage: `Treasury::Spends` (r:1 w:1)
+	/// Proof: `Treasury::Spends` (`max_values`: None, `max_size`: Some(57), added: 2532, mode: `MaxEncodedLen`)
+	fn check_status() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `215`
+		//  Estimated: `3522`
+		// Minimum execution time: 10_000_000 picoseconds.
+		Weight::from_parts(11_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 3522))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: `Treasury::Spends` (r:1 w:1)
+	/// Proof: `Treasury::Spends` (`max_values`: None, `max_size`: Some(57), added: 2532, mode: `MaxEncodedLen`)
+	fn void_spend() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `215`
+		//  Estimated: `3522`
+		// Minimum execution time: 9_000_000 picoseconds.
+		Weight::from_parts(10_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 3522))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
 }
diff --git a/runtime/koi/src/weights/pallet_tx_pause.rs b/runtime/koi/src/weights/pallet_tx_pause.rs
index 1da96acd4..d1f423e77 100644
--- a/runtime/koi/src/weights/pallet_tx_pause.rs
+++ b/runtime/koi/src/weights/pallet_tx_pause.rs
@@ -18,8 +18,8 @@
 
 //! Autogenerated weights for `pallet_tx_pause`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-06-04, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-06-27, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `Some("koi-dev")`, DB CACHE: 1024
 
@@ -61,8 +61,8 @@ impl<T: frame_system::Config> pallet_tx_pause::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `4`
 		//  Estimated: `3997`
-		// Minimum execution time: 12_000_000 picoseconds.
-		Weight::from_parts(12_000_000, 0)
+		// Minimum execution time: 10_000_000 picoseconds.
+		Weight::from_parts(10_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3997))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -73,8 +73,8 @@ impl<T: frame_system::Config> pallet_tx_pause::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `566`
 		//  Estimated: `3997`
-		// Minimum execution time: 15_000_000 picoseconds.
-		Weight::from_parts(16_000_000, 0)
+		// Minimum execution time: 13_000_000 picoseconds.
+		Weight::from_parts(14_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3997))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
diff --git a/runtime/koi/src/weights/pallet_utility.rs b/runtime/koi/src/weights/pallet_utility.rs
index 1849faa6d..2b45ea21f 100644
--- a/runtime/koi/src/weights/pallet_utility.rs
+++ b/runtime/koi/src/weights/pallet_utility.rs
@@ -18,8 +18,8 @@
 
 //! Autogenerated weights for `pallet_utility`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-06-04, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-06-27, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `Some("koi-dev")`, DB CACHE: 1024
 
@@ -62,11 +62,11 @@ impl<T: frame_system::Config> pallet_utility::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `4`
 		//  Estimated: `3997`
-		// Minimum execution time: 6_000_000 picoseconds.
-		Weight::from_parts(5_550_723, 0)
+		// Minimum execution time: 4_000_000 picoseconds.
+		Weight::from_parts(8_246_607, 0)
 			.saturating_add(Weight::from_parts(0, 3997))
-			// Standard Error: 5_021
-			.saturating_add(Weight::from_parts(6_822_392, 0).saturating_mul(c.into()))
+			// Standard Error: 3_195
+			.saturating_add(Weight::from_parts(5_004_046, 0).saturating_mul(c.into()))
 			.saturating_add(T::DbWeight::get().reads(1))
 	}
 	/// Storage: `TxPause::PausedCalls` (r:1 w:0)
@@ -87,19 +87,19 @@ impl<T: frame_system::Config> pallet_utility::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `4`
 		//  Estimated: `3997`
-		// Minimum execution time: 6_000_000 picoseconds.
-		Weight::from_parts(17_953_962, 0)
+		// Minimum execution time: 4_000_000 picoseconds.
+		Weight::from_parts(32_524_056, 0)
 			.saturating_add(Weight::from_parts(0, 3997))
-			// Standard Error: 4_673
-			.saturating_add(Weight::from_parts(7_089_393, 0).saturating_mul(c.into()))
+			// Standard Error: 5_851
+			.saturating_add(Weight::from_parts(5_138_356, 0).saturating_mul(c.into()))
 			.saturating_add(T::DbWeight::get().reads(1))
 	}
 	fn dispatch_as() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 8_000_000 picoseconds.
-		Weight::from_parts(9_000_000, 0)
+		// Minimum execution time: 6_000_000 picoseconds.
+		Weight::from_parts(6_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 	}
 	/// Storage: `TxPause::PausedCalls` (r:1 w:0)
@@ -109,11 +109,11 @@ impl<T: frame_system::Config> pallet_utility::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `4`
 		//  Estimated: `3997`
-		// Minimum execution time: 6_000_000 picoseconds.
-		Weight::from_parts(9_536_222, 0)
+		// Minimum execution time: 4_000_000 picoseconds.
+		Weight::from_parts(2_073_409, 0)
 			.saturating_add(Weight::from_parts(0, 3997))
-			// Standard Error: 4_291
-			.saturating_add(Weight::from_parts(6_809_869, 0).saturating_mul(c.into()))
+			// Standard Error: 3_686
+			.saturating_add(Weight::from_parts(4_893_358, 0).saturating_mul(c.into()))
 			.saturating_add(T::DbWeight::get().reads(1))
 	}
 }
diff --git a/runtime/koi/src/weights/pallet_whitelist.rs b/runtime/koi/src/weights/pallet_whitelist.rs
index cee262ac7..c23beed87 100644
--- a/runtime/koi/src/weights/pallet_whitelist.rs
+++ b/runtime/koi/src/weights/pallet_whitelist.rs
@@ -18,8 +18,8 @@
 
 //! Autogenerated weights for `pallet_whitelist`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-06-04, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-06-27, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `Some("koi-dev")`, DB CACHE: 1024
 
@@ -57,67 +57,75 @@ pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> pallet_whitelist::WeightInfo for WeightInfo<T> {
 	/// Storage: `Whitelist::WhitelistedCall` (r:1 w:1)
 	/// Proof: `Whitelist::WhitelistedCall` (`max_values`: None, `max_size`: Some(40), added: 2515, mode: `MaxEncodedLen`)
-	/// Storage: `Preimage::StatusFor` (r:1 w:1)
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
 	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
 	fn whitelist_call() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `48`
 		//  Estimated: `3544`
-		// Minimum execution time: 18_000_000 picoseconds.
-		Weight::from_parts(19_000_000, 0)
+		// Minimum execution time: 15_000_000 picoseconds.
+		Weight::from_parts(16_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3544))
-			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
 	/// Storage: `Whitelist::WhitelistedCall` (r:1 w:1)
 	/// Proof: `Whitelist::WhitelistedCall` (`max_values`: None, `max_size`: Some(40), added: 2515, mode: `MaxEncodedLen`)
-	/// Storage: `Preimage::StatusFor` (r:1 w:1)
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
 	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
 	fn remove_whitelisted_call() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `176`
 		//  Estimated: `3544`
-		// Minimum execution time: 15_000_000 picoseconds.
-		Weight::from_parts(16_000_000, 0)
+		// Minimum execution time: 14_000_000 picoseconds.
+		Weight::from_parts(15_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3544))
-			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
 	/// Storage: `Whitelist::WhitelistedCall` (r:1 w:1)
 	/// Proof: `Whitelist::WhitelistedCall` (`max_values`: None, `max_size`: Some(40), added: 2515, mode: `MaxEncodedLen`)
 	/// Storage: `Preimage::PreimageFor` (r:1 w:1)
 	/// Proof: `Preimage::PreimageFor` (`max_values`: None, `max_size`: Some(4194344), added: 4196819, mode: `Measured`)
-	/// Storage: `Preimage::StatusFor` (r:1 w:1)
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
 	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
 	/// The range of component `n` is `[1, 4194294]`.
 	fn dispatch_whitelisted_call(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `252 + n * (1 ±0)`
 		//  Estimated: `3716 + n * (1 ±0)`
-		// Minimum execution time: 27_000_000 picoseconds.
-		Weight::from_parts(15_102_813, 0)
+		// Minimum execution time: 24_000_000 picoseconds.
+		Weight::from_parts(24_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3716))
-			// Standard Error: 5
-			.saturating_add(Weight::from_parts(478, 0).saturating_mul(n.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
+			// Standard Error: 1
+			.saturating_add(Weight::from_parts(445, 0).saturating_mul(n.into()))
+			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(3))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(n.into()))
 	}
 	/// Storage: `Whitelist::WhitelistedCall` (r:1 w:1)
 	/// Proof: `Whitelist::WhitelistedCall` (`max_values`: None, `max_size`: Some(40), added: 2515, mode: `MaxEncodedLen`)
-	/// Storage: `Preimage::StatusFor` (r:1 w:1)
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
 	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
 	/// The range of component `n` is `[1, 10000]`.
 	fn dispatch_whitelisted_call_with_preimage(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `176`
 		//  Estimated: `3544`
-		// Minimum execution time: 18_000_000 picoseconds.
-		Weight::from_parts(18_932_063, 0)
+		// Minimum execution time: 17_000_000 picoseconds.
+		Weight::from_parts(17_689_949, 0)
 			.saturating_add(Weight::from_parts(0, 3544))
-			// Standard Error: 5
-			.saturating_add(Weight::from_parts(993, 0).saturating_mul(n.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
+			// Standard Error: 13
+			.saturating_add(Weight::from_parts(1_015, 0).saturating_mul(n.into()))
+			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
 }

From 9c65b2daa933d6141d216c8ab3c7dc7cf89fa4ca Mon Sep 17 00:00:00 2001
From: Xavier Lau <xavier@inv.cafe>
Date: Thu, 27 Jun 2024 10:13:26 +0800
Subject: [PATCH 50/59] Bench part.2

---
 runtime/crab/src/pallets/tx_pause.rs          |  44 ++--
 .../cumulus_pallet_parachain_system.rs        |  82 ++++++++
 .../src/weights/cumulus_pallet_xcmp_queue.rs  |  94 ++++++++-
 .../src/weights/darwinia_account_migration.rs |  48 ++---
 runtime/crab/src/weights/darwinia_deposit.rs  |  16 +-
 runtime/crab/src/weights/darwinia_staking.rs  |  32 +--
 runtime/crab/src/weights/frame_system.rs      |  79 ++++++--
 runtime/crab/src/weights/pallet_assets.rs     | 120 +++++------
 runtime/crab/src/weights/pallet_balances.rs   |  49 +++--
 runtime/crab/src/weights/pallet_collective.rs | 110 +++++-----
 .../src/weights/pallet_conviction_voting.rs   |  40 ++--
 .../crab/src/weights/pallet_message_queue.rs  | 191 ++++++++++++++++++
 runtime/crab/src/weights/pallet_preimage.rs   | 162 ++++++++++-----
 runtime/crab/src/weights/pallet_proxy.rs      |  88 ++++----
 runtime/crab/src/weights/pallet_referenda.rs  | 134 ++++++------
 runtime/crab/src/weights/pallet_scheduler.rs  |  72 +++----
 runtime/crab/src/weights/pallet_session.rs    |  12 +-
 runtime/crab/src/weights/pallet_timestamp.rs  |  12 +-
 runtime/crab/src/weights/pallet_treasury.rs   |  94 +++++++--
 runtime/crab/src/weights/pallet_tx_pause.rs   |  12 +-
 runtime/crab/src/weights/pallet_utility.rs    |  32 +--
 runtime/crab/src/weights/pallet_whitelist.rs  |  50 +++--
 22 files changed, 1032 insertions(+), 541 deletions(-)
 create mode 100644 runtime/crab/src/weights/cumulus_pallet_parachain_system.rs
 create mode 100644 runtime/crab/src/weights/pallet_message_queue.rs

diff --git a/runtime/crab/src/pallets/tx_pause.rs b/runtime/crab/src/pallets/tx_pause.rs
index 1049620f3..357b945b8 100644
--- a/runtime/crab/src/pallets/tx_pause.rs
+++ b/runtime/crab/src/pallets/tx_pause.rs
@@ -21,33 +21,33 @@ use crate::*;
 
 pub struct TxPauseWhitelistedCalls;
 // This conflicts with runtime test.
-#[cfg(feature = "runtime-benchmarks")]
-impl frame_support::traits::Contains<pallet_tx_pause::RuntimeCallNameOf<Runtime>>
-	for TxPauseWhitelistedCalls
-{
-	fn contains(_: &pallet_tx_pause::RuntimeCallNameOf<Runtime>) -> bool {
-		false
-	}
-}
-// #[cfg(not(feature = "runtime-benchmarks"))]
+// #[cfg(feature = "runtime-benchmarks")]
 // impl frame_support::traits::Contains<pallet_tx_pause::RuntimeCallNameOf<Runtime>>
 // 	for TxPauseWhitelistedCalls
 // {
-// 	fn contains(full_name: &pallet_tx_pause::RuntimeCallNameOf<Runtime>) -> bool {
-// 		let pallet = full_name.0.as_slice();
-
-// 		// Pallets that can be paused by the tx-pause pallet.
-// 		!matches!(
-// 			pallet,
-// 			b"Balances"
-// 				| b"Assets" | b"Deposit"
-// 				| b"AccountMigration"
-// 				| b"DarwiniaStaking"
-// 				| b"Ethereum"
-// 				| b"EVM" | b"EthTxForwarder"
-// 		)
+// 	fn contains(_: &pallet_tx_pause::RuntimeCallNameOf<Runtime>) -> bool {
+// 		false
 // 	}
 // }
+// #[cfg(not(feature = "runtime-benchmarks"))]
+impl frame_support::traits::Contains<pallet_tx_pause::RuntimeCallNameOf<Runtime>>
+	for TxPauseWhitelistedCalls
+{
+	fn contains(full_name: &pallet_tx_pause::RuntimeCallNameOf<Runtime>) -> bool {
+		let pallet = full_name.0.as_slice();
+
+		// Pallets that can be paused by the tx-pause pallet.
+		!matches!(
+			pallet,
+			b"Balances"
+				| b"Assets" | b"Deposit"
+				| b"AccountMigration"
+				| b"DarwiniaStaking"
+				| b"Ethereum"
+				| b"EVM" | b"EthTxForwarder"
+		)
+	}
+}
 
 impl pallet_tx_pause::Config for Runtime {
 	type MaxNameLen = ConstU32<256>;
diff --git a/runtime/crab/src/weights/cumulus_pallet_parachain_system.rs b/runtime/crab/src/weights/cumulus_pallet_parachain_system.rs
new file mode 100644
index 000000000..bd50a06fb
--- /dev/null
+++ b/runtime/crab/src/weights/cumulus_pallet_parachain_system.rs
@@ -0,0 +1,82 @@
+// This file is part of Darwinia.
+//
+// Copyright (C) Darwinia Network
+// SPDX-License-Identifier: GPL-3.0
+//
+// Darwinia is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Darwinia is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Darwinia. If not, see <https://www.gnu.org/licenses/>.
+
+//! Autogenerated weights for `cumulus_pallet_parachain_system`
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-06-27, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! WORST CASE MAP SIZE: `1000000`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("crab-dev")`, DB CACHE: 1024
+
+// Executed Command:
+// target/release/darwinia
+// benchmark
+// pallet
+// --header
+// .maintain/license-header
+// --heap-pages
+// 4096
+// --chain
+// crab-dev
+// --output
+// runtime/crab/src/weights
+// --pallet
+// *
+// --extrinsic
+// *
+// --steps
+// 50
+// --repeat
+// 20
+
+#![cfg_attr(rustfmt, rustfmt_skip)]
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+#![allow(missing_docs)]
+
+use frame_support::{traits::Get, weights::Weight};
+use core::marker::PhantomData;
+
+/// Weight functions for `cumulus_pallet_parachain_system`.
+pub struct WeightInfo<T>(PhantomData<T>);
+impl<T: frame_system::Config> cumulus_pallet_parachain_system::WeightInfo for WeightInfo<T> {
+	/// Storage: `ParachainSystem::LastDmqMqcHead` (r:1 w:1)
+	/// Proof: `ParachainSystem::LastDmqMqcHead` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `MessageQueue::BookStateFor` (r:1 w:1)
+	/// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	/// Storage: `MessageQueue::ServiceHead` (r:1 w:1)
+	/// Proof: `MessageQueue::ServiceHead` (`max_values`: Some(1), `max_size`: Some(5), added: 500, mode: `MaxEncodedLen`)
+	/// Storage: `ParachainSystem::ProcessedDownwardMessages` (r:0 w:1)
+	/// Proof: `ParachainSystem::ProcessedDownwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `MessageQueue::Pages` (r:0 w:1000)
+	/// Proof: `MessageQueue::Pages` (`max_values`: None, `max_size`: Some(65585), added: 68060, mode: `MaxEncodedLen`)
+	/// The range of component `n` is `[0, 1000]`.
+	fn enqueue_inbound_downward_messages(n: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `48`
+		//  Estimated: `3517`
+		// Minimum execution time: 2_000_000 picoseconds.
+		Weight::from_parts(2_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 3517))
+			// Standard Error: 25_931
+			.saturating_add(Weight::from_parts(93_644_619, 0).saturating_mul(n.into()))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(4))
+			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(n.into())))
+	}
+}
diff --git a/runtime/crab/src/weights/cumulus_pallet_xcmp_queue.rs b/runtime/crab/src/weights/cumulus_pallet_xcmp_queue.rs
index 9e20f2d33..4da21d6d7 100644
--- a/runtime/crab/src/weights/cumulus_pallet_xcmp_queue.rs
+++ b/runtime/crab/src/weights/cumulus_pallet_xcmp_queue.rs
@@ -18,8 +18,8 @@
 
 //! Autogenerated weights for `cumulus_pallet_xcmp_queue`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-04-17, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-06-27, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `Some("crab-dev")`, DB CACHE: 1024
 
@@ -61,22 +61,100 @@ impl<T: frame_system::Config> cumulus_pallet_xcmp_queue::WeightInfo for WeightIn
 		// Proof Size summary in bytes:
 		//  Measured:  `42`
 		//  Estimated: `1527`
-		// Minimum execution time: 5_000_000 picoseconds.
-		Weight::from_parts(6_000_000, 0)
+		// Minimum execution time: 4_000_000 picoseconds.
+		Weight::from_parts(5_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 1527))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	/// Storage: `XcmpQueue::QueueConfig` (r:1 w:1)
+	/// Storage: `XcmpQueue::QueueConfig` (r:1 w:0)
 	/// Proof: `XcmpQueue::QueueConfig` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	fn set_config_with_weight() -> Weight {
+	/// Storage: `MessageQueue::BookStateFor` (r:1 w:1)
+	/// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	/// Storage: `MessageQueue::ServiceHead` (r:1 w:1)
+	/// Proof: `MessageQueue::ServiceHead` (`max_values`: Some(1), `max_size`: Some(5), added: 500, mode: `MaxEncodedLen`)
+	/// Storage: `XcmpQueue::InboundXcmpSuspended` (r:1 w:0)
+	/// Proof: `XcmpQueue::InboundXcmpSuspended` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `MessageQueue::Pages` (r:0 w:1)
+	/// Proof: `MessageQueue::Pages` (`max_values`: None, `max_size`: Some(65585), added: 68060, mode: `MaxEncodedLen`)
+	fn enqueue_xcmp_message() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `48`
+		//  Estimated: `3517`
+		// Minimum execution time: 11_000_000 picoseconds.
+		Weight::from_parts(11_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 3517))
+			.saturating_add(T::DbWeight::get().reads(4))
+			.saturating_add(T::DbWeight::get().writes(3))
+	}
+	/// Storage: `XcmpQueue::OutboundXcmpStatus` (r:1 w:1)
+	/// Proof: `XcmpQueue::OutboundXcmpStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	fn suspend_channel() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `42`
 		//  Estimated: `1527`
-		// Minimum execution time: 5_000_000 picoseconds.
-		Weight::from_parts(6_000_000, 0)
+		// Minimum execution time: 3_000_000 picoseconds.
+		Weight::from_parts(3_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 1527))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
+	/// Storage: `XcmpQueue::OutboundXcmpStatus` (r:1 w:1)
+	/// Proof: `XcmpQueue::OutboundXcmpStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	fn resume_channel() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `77`
+		//  Estimated: `1562`
+		// Minimum execution time: 3_000_000 picoseconds.
+		Weight::from_parts(4_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 1562))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	fn take_first_concatenated_xcm() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `0`
+		//  Estimated: `0`
+		// Minimum execution time: 9_000_000 picoseconds.
+		Weight::from_parts(9_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 0))
+	}
+	/// Storage: UNKNOWN KEY `0x7b3237373ffdfeb1cab4222e3b520d6b345d8e88afa015075c945637c07e8f20` (r:1 w:1)
+	/// Proof: UNKNOWN KEY `0x7b3237373ffdfeb1cab4222e3b520d6b345d8e88afa015075c945637c07e8f20` (r:1 w:1)
+	/// Storage: UNKNOWN KEY `0x7b3237373ffdfeb1cab4222e3b520d6bedc49980ba3aa32b0a189290fd036649` (r:1 w:1)
+	/// Proof: UNKNOWN KEY `0x7b3237373ffdfeb1cab4222e3b520d6bedc49980ba3aa32b0a189290fd036649` (r:1 w:1)
+	/// Storage: `MessageQueue::BookStateFor` (r:1 w:1)
+	/// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	/// Storage: `MessageQueue::ServiceHead` (r:1 w:1)
+	/// Proof: `MessageQueue::ServiceHead` (`max_values`: Some(1), `max_size`: Some(5), added: 500, mode: `MaxEncodedLen`)
+	/// Storage: `XcmpQueue::QueueConfig` (r:1 w:0)
+	/// Proof: `XcmpQueue::QueueConfig` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `XcmpQueue::InboundXcmpSuspended` (r:1 w:0)
+	/// Proof: `XcmpQueue::InboundXcmpSuspended` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `MessageQueue::Pages` (r:0 w:1)
+	/// Proof: `MessageQueue::Pages` (`max_values`: None, `max_size`: Some(65585), added: 68060, mode: `MaxEncodedLen`)
+	fn on_idle_good_msg() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `65677`
+		//  Estimated: `69142`
+		// Minimum execution time: 42_000_000 picoseconds.
+		Weight::from_parts(45_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 69142))
+			.saturating_add(T::DbWeight::get().reads(6))
+			.saturating_add(T::DbWeight::get().writes(5))
+	}
+	/// Storage: UNKNOWN KEY `0x7b3237373ffdfeb1cab4222e3b520d6b345d8e88afa015075c945637c07e8f20` (r:1 w:1)
+	/// Proof: UNKNOWN KEY `0x7b3237373ffdfeb1cab4222e3b520d6b345d8e88afa015075c945637c07e8f20` (r:1 w:1)
+	/// Storage: UNKNOWN KEY `0x7b3237373ffdfeb1cab4222e3b520d6bedc49980ba3aa32b0a189290fd036649` (r:1 w:1)
+	/// Proof: UNKNOWN KEY `0x7b3237373ffdfeb1cab4222e3b520d6bedc49980ba3aa32b0a189290fd036649` (r:1 w:1)
+	fn on_idle_large_msg() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `65676`
+		//  Estimated: `69141`
+		// Minimum execution time: 27_000_000 picoseconds.
+		Weight::from_parts(32_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 69141))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
 }
diff --git a/runtime/crab/src/weights/darwinia_account_migration.rs b/runtime/crab/src/weights/darwinia_account_migration.rs
index c8470aea1..b02563407 100644
--- a/runtime/crab/src/weights/darwinia_account_migration.rs
+++ b/runtime/crab/src/weights/darwinia_account_migration.rs
@@ -18,8 +18,8 @@
 
 //! Autogenerated weights for `darwinia_account_migration`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-04-17, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-06-27, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `Some("crab-dev")`, DB CACHE: 1024
 
@@ -61,10 +61,6 @@ impl<T: frame_system::Config> darwinia_account_migration::WeightInfo for WeightI
 	/// Proof: `AccountMigration::KtonAccounts` (`max_values`: None, `max_size`: Some(82), added: 2557, mode: `MaxEncodedLen`)
 	/// Storage: `Assets::Asset` (r:1 w:1)
 	/// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(166), added: 2641, mode: `MaxEncodedLen`)
-	/// Storage: `AccountMigration::Identities` (r:1 w:1)
-	/// Proof: `AccountMigration::Identities` (`max_values`: None, `max_size`: Some(9219), added: 11694, mode: `MaxEncodedLen`)
-	/// Storage: `Identity::Registrars` (r:1 w:1)
-	/// Proof: `Identity::Registrars` (`max_values`: Some(1), `max_size`: Some(901), added: 1396, mode: `MaxEncodedLen`)
 	/// Storage: `AccountMigration::Ledgers` (r:1 w:1)
 	/// Proof: `AccountMigration::Ledgers` (`max_values`: None, `max_size`: Some(1845), added: 4320, mode: `MaxEncodedLen`)
 	/// Storage: `System::Account` (r:2 w:3)
@@ -73,21 +69,19 @@ impl<T: frame_system::Config> darwinia_account_migration::WeightInfo for WeightI
 	/// Proof: `AccountMigration::Deposits` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `DarwiniaStaking::Ledgers` (r:0 w:1)
 	/// Proof: `DarwiniaStaking::Ledgers` (`max_values`: None, `max_size`: Some(1078), added: 3553, mode: `MaxEncodedLen`)
-	/// Storage: `Identity::IdentityOf` (r:0 w:1)
-	/// Proof: `Identity::IdentityOf` (`max_values`: None, `max_size`: Some(7526), added: 10001, mode: `MaxEncodedLen`)
 	/// Storage: `Assets::Account` (r:0 w:1)
 	/// Proof: `Assets::Account` (`max_values`: None, `max_size`: Some(114), added: 2589, mode: `MaxEncodedLen`)
 	/// Storage: `Deposit::Deposits` (r:0 w:1)
 	/// Proof: `Deposit::Deposits` (`max_values`: None, `max_size`: Some(26150), added: 28625, mode: `MaxEncodedLen`)
 	fn migrate() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `28815`
-		//  Estimated: `32280`
-		// Minimum execution time: 172_000_000 picoseconds.
-		Weight::from_parts(187_000_000, 0)
-			.saturating_add(Weight::from_parts(0, 32280))
-			.saturating_add(T::DbWeight::get().reads(9))
-			.saturating_add(T::DbWeight::get().writes(14))
+		//  Measured:  `28401`
+		//  Estimated: `31866`
+		// Minimum execution time: 116_000_000 picoseconds.
+		Weight::from_parts(121_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 31866))
+			.saturating_add(T::DbWeight::get().reads(7))
+			.saturating_add(T::DbWeight::get().writes(11))
 	}
 	/// Storage: `AccountMigration::Multisigs` (r:0 w:1)
 	/// Proof: `AccountMigration::Multisigs` (`max_values`: None, `max_size`: None, mode: `Measured`)
@@ -97,10 +91,6 @@ impl<T: frame_system::Config> darwinia_account_migration::WeightInfo for WeightI
 	/// Proof: `AccountMigration::KtonAccounts` (`max_values`: None, `max_size`: Some(82), added: 2557, mode: `MaxEncodedLen`)
 	/// Storage: `Assets::Asset` (r:1 w:1)
 	/// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(166), added: 2641, mode: `MaxEncodedLen`)
-	/// Storage: `AccountMigration::Identities` (r:1 w:1)
-	/// Proof: `AccountMigration::Identities` (`max_values`: None, `max_size`: Some(9219), added: 11694, mode: `MaxEncodedLen`)
-	/// Storage: `Identity::Registrars` (r:1 w:1)
-	/// Proof: `Identity::Registrars` (`max_values`: Some(1), `max_size`: Some(901), added: 1396, mode: `MaxEncodedLen`)
 	/// Storage: `AccountMigration::Ledgers` (r:1 w:1)
 	/// Proof: `AccountMigration::Ledgers` (`max_values`: None, `max_size`: Some(1845), added: 4320, mode: `MaxEncodedLen`)
 	/// Storage: `System::Account` (r:2 w:3)
@@ -109,8 +99,6 @@ impl<T: frame_system::Config> darwinia_account_migration::WeightInfo for WeightI
 	/// Proof: `AccountMigration::Deposits` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `DarwiniaStaking::Ledgers` (r:0 w:1)
 	/// Proof: `DarwiniaStaking::Ledgers` (`max_values`: None, `max_size`: Some(1078), added: 3553, mode: `MaxEncodedLen`)
-	/// Storage: `Identity::IdentityOf` (r:0 w:1)
-	/// Proof: `Identity::IdentityOf` (`max_values`: None, `max_size`: Some(7526), added: 10001, mode: `MaxEncodedLen`)
 	/// Storage: `Assets::Account` (r:0 w:1)
 	/// Proof: `Assets::Account` (`max_values`: None, `max_size`: Some(114), added: 2589, mode: `MaxEncodedLen`)
 	/// Storage: `Deposit::Deposits` (r:0 w:1)
@@ -121,16 +109,16 @@ impl<T: frame_system::Config> darwinia_account_migration::WeightInfo for WeightI
 	fn migrate_multisig(x: u32, _y: u32, z: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
-		//  Estimated: `2 + x * (163 ±0) + z * (163 ±0)`
-		// Minimum execution time: 8_000_000 picoseconds.
-		Weight::from_parts(27_194_964, 0)
+		//  Estimated: `2 + x * (161 ±0) + z * (161 ±0)`
+		// Minimum execution time: 6_000_000 picoseconds.
+		Weight::from_parts(18_311_896, 0)
 			.saturating_add(Weight::from_parts(0, 2))
-			// Standard Error: 15_383
-			.saturating_add(Weight::from_parts(14_823, 0).saturating_mul(x.into()))
+			// Standard Error: 9_962
+			.saturating_add(Weight::from_parts(19_788, 0).saturating_mul(x.into()))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(2))
-			.saturating_add(Weight::from_parts(0, 163).saturating_mul(x.into()))
-			.saturating_add(Weight::from_parts(0, 163).saturating_mul(z.into()))
+			.saturating_add(Weight::from_parts(0, 161).saturating_mul(x.into()))
+			.saturating_add(Weight::from_parts(0, 161).saturating_mul(z.into()))
 	}
 	/// Storage: `AccountMigration::Multisigs` (r:1 w:1)
 	/// Proof: `AccountMigration::Multisigs` (`max_values`: None, `max_size`: None, mode: `Measured`)
@@ -140,8 +128,8 @@ impl<T: frame_system::Config> darwinia_account_migration::WeightInfo for WeightI
 		// Proof Size summary in bytes:
 		//  Measured:  `3499`
 		//  Estimated: `6964`
-		// Minimum execution time: 9_000_000 picoseconds.
-		Weight::from_parts(12_000_000, 0)
+		// Minimum execution time: 10_000_000 picoseconds.
+		Weight::from_parts(11_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 6964))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
diff --git a/runtime/crab/src/weights/darwinia_deposit.rs b/runtime/crab/src/weights/darwinia_deposit.rs
index d96735037..5d62a886b 100644
--- a/runtime/crab/src/weights/darwinia_deposit.rs
+++ b/runtime/crab/src/weights/darwinia_deposit.rs
@@ -18,8 +18,8 @@
 
 //! Autogenerated weights for `darwinia_deposit`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-04-17, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-06-27, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `Some("crab-dev")`, DB CACHE: 1024
 
@@ -69,8 +69,8 @@ impl<T: frame_system::Config> darwinia_deposit::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `26712`
 		//  Estimated: `29615`
-		// Minimum execution time: 87_000_000 picoseconds.
-		Weight::from_parts(95_000_000, 0)
+		// Minimum execution time: 76_000_000 picoseconds.
+		Weight::from_parts(83_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 29615))
 			.saturating_add(T::DbWeight::get().reads(5))
 			.saturating_add(T::DbWeight::get().writes(4))
@@ -85,8 +85,8 @@ impl<T: frame_system::Config> darwinia_deposit::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `26441`
 		//  Estimated: `29615`
-		// Minimum execution time: 1_645_000_000 picoseconds.
-		Weight::from_parts(2_150_000_000, 0)
+		// Minimum execution time: 928_000_000 picoseconds.
+		Weight::from_parts(962_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 29615))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -105,8 +105,8 @@ impl<T: frame_system::Config> darwinia_deposit::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `26763`
 		//  Estimated: `29615`
-		// Minimum execution time: 88_000_000 picoseconds.
-		Weight::from_parts(107_000_000, 0)
+		// Minimum execution time: 84_000_000 picoseconds.
+		Weight::from_parts(91_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 29615))
 			.saturating_add(T::DbWeight::get().reads(5))
 			.saturating_add(T::DbWeight::get().writes(4))
diff --git a/runtime/crab/src/weights/darwinia_staking.rs b/runtime/crab/src/weights/darwinia_staking.rs
index a2b3a10e4..771d4e19a 100644
--- a/runtime/crab/src/weights/darwinia_staking.rs
+++ b/runtime/crab/src/weights/darwinia_staking.rs
@@ -18,8 +18,8 @@
 
 //! Autogenerated weights for `darwinia_staking`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-04-17, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-06-27, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `Some("crab-dev")`, DB CACHE: 1024
 
@@ -70,11 +70,11 @@ impl<T: frame_system::Config> darwinia_staking::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `7021 + x * (25 ±0)`
 		//  Estimated: `29615`
-		// Minimum execution time: 48_000_000 picoseconds.
-		Weight::from_parts(685_264_990, 0)
+		// Minimum execution time: 47_000_000 picoseconds.
+		Weight::from_parts(672_333_775, 0)
 			.saturating_add(Weight::from_parts(0, 29615))
-			// Standard Error: 276_267
-			.saturating_add(Weight::from_parts(14_127_904, 0).saturating_mul(x.into()))
+			// Standard Error: 237_459
+			.saturating_add(Weight::from_parts(11_911_464, 0).saturating_mul(x.into()))
 			.saturating_add(T::DbWeight::get().reads(5))
 			.saturating_add(T::DbWeight::get().writes(4))
 	}
@@ -93,11 +93,11 @@ impl<T: frame_system::Config> darwinia_staking::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `7348 + x * (26 ±0)`
 		//  Estimated: `29615`
-		// Minimum execution time: 46_000_000 picoseconds.
-		Weight::from_parts(753_638_178, 0)
+		// Minimum execution time: 48_000_000 picoseconds.
+		Weight::from_parts(641_792_186, 0)
 			.saturating_add(Weight::from_parts(0, 29615))
-			// Standard Error: 276_450
-			.saturating_add(Weight::from_parts(14_122_363, 0).saturating_mul(x.into()))
+			// Standard Error: 237_475
+			.saturating_add(Weight::from_parts(12_048_394, 0).saturating_mul(x.into()))
 			.saturating_add(T::DbWeight::get().reads(5))
 			.saturating_add(T::DbWeight::get().writes(4))
 	}
@@ -107,8 +107,8 @@ impl<T: frame_system::Config> darwinia_staking::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `388`
 		//  Estimated: `3497`
-		// Minimum execution time: 10_000_000 picoseconds.
-		Weight::from_parts(12_000_000, 0)
+		// Minimum execution time: 9_000_000 picoseconds.
+		Weight::from_parts(9_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3497))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -137,7 +137,7 @@ impl<T: frame_system::Config> darwinia_staking::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 3_000_000 picoseconds.
+		// Minimum execution time: 4_000_000 picoseconds.
 		Weight::from_parts(5_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -154,8 +154,8 @@ impl<T: frame_system::Config> darwinia_staking::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `1811`
 		//  Estimated: `5276`
-		// Minimum execution time: 173_000_000 picoseconds.
-		Weight::from_parts(179_000_000, 0)
+		// Minimum execution time: 133_000_000 picoseconds.
+		Weight::from_parts(136_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 5276))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -178,7 +178,7 @@ impl<T: frame_system::Config> darwinia_staking::WeightInfo for WeightInfo<T> {
 		//  Measured:  `0`
 		//  Estimated: `0`
 		// Minimum execution time: 2_000_000 picoseconds.
-		Weight::from_parts(3_000_000, 0)
+		Weight::from_parts(2_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
diff --git a/runtime/crab/src/weights/frame_system.rs b/runtime/crab/src/weights/frame_system.rs
index a7be73269..18d8a534e 100644
--- a/runtime/crab/src/weights/frame_system.rs
+++ b/runtime/crab/src/weights/frame_system.rs
@@ -18,8 +18,8 @@
 
 //! Autogenerated weights for `frame_system`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-04-17, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-06-27, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `Some("crab-dev")`, DB CACHE: 1024
 
@@ -61,21 +61,21 @@ impl<T: frame_system::Config> frame_system::WeightInfo for WeightInfo<T> {
 		//  Measured:  `0`
 		//  Estimated: `0`
 		// Minimum execution time: 1_000_000 picoseconds.
-		Weight::from_parts(1_512_300, 0)
+		Weight::from_parts(1_839_585, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 			// Standard Error: 0
-			.saturating_add(Weight::from_parts(169, 0).saturating_mul(b.into()))
+			.saturating_add(Weight::from_parts(145, 0).saturating_mul(b.into()))
 	}
 	/// The range of component `b` is `[0, 3932160]`.
 	fn remark_with_event(b: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 6_000_000 picoseconds.
-		Weight::from_parts(6_000_000, 0)
+		// Minimum execution time: 4_000_000 picoseconds.
+		Weight::from_parts(4_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
-			// Standard Error: 1
-			.saturating_add(Weight::from_parts(1_087, 0).saturating_mul(b.into()))
+			// Standard Error: 0
+			.saturating_add(Weight::from_parts(895, 0).saturating_mul(b.into()))
 	}
 	/// Storage: `System::Digest` (r:1 w:1)
 	/// Proof: `System::Digest` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
@@ -86,7 +86,7 @@ impl<T: frame_system::Config> frame_system::WeightInfo for WeightInfo<T> {
 		//  Measured:  `0`
 		//  Estimated: `1485`
 		// Minimum execution time: 3_000_000 picoseconds.
-		Weight::from_parts(4_000_000, 0)
+		Weight::from_parts(3_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 1485))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -107,8 +107,8 @@ impl<T: frame_system::Config> frame_system::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `164`
 		//  Estimated: `1649`
-		// Minimum execution time: 80_449_000_000 picoseconds.
-		Weight::from_parts(82_891_000_000, 0)
+		// Minimum execution time: 59_823_000_000 picoseconds.
+		Weight::from_parts(60_726_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 1649))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(3))
@@ -120,11 +120,11 @@ impl<T: frame_system::Config> frame_system::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_000_000 picoseconds.
+		// Minimum execution time: 1_000_000 picoseconds.
 		Weight::from_parts(2_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
-			// Standard Error: 1_368
-			.saturating_add(Weight::from_parts(790_984, 0).saturating_mul(i.into()))
+			// Standard Error: 2_060
+			.saturating_add(Weight::from_parts(721_127, 0).saturating_mul(i.into()))
 			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(i.into())))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
@@ -137,8 +137,8 @@ impl<T: frame_system::Config> frame_system::WeightInfo for WeightInfo<T> {
 		// Minimum execution time: 1_000_000 picoseconds.
 		Weight::from_parts(2_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
-			// Standard Error: 1_080
-			.saturating_add(Weight::from_parts(557_607, 0).saturating_mul(i.into()))
+			// Standard Error: 822
+			.saturating_add(Weight::from_parts(510_498, 0).saturating_mul(i.into()))
 			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(i.into())))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
@@ -146,15 +146,50 @@ impl<T: frame_system::Config> frame_system::WeightInfo for WeightInfo<T> {
 	/// The range of component `p` is `[0, 1000]`.
 	fn kill_prefix(p: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `98 + p * (69 ±0)`
-		//  Estimated: `97 + p * (70 ±0)`
+		//  Measured:  `97 + p * (69 ±0)`
+		//  Estimated: `100 + p * (70 ±0)`
 		// Minimum execution time: 3_000_000 picoseconds.
-		Weight::from_parts(4_000_000, 0)
-			.saturating_add(Weight::from_parts(0, 97))
-			// Standard Error: 1_426
-			.saturating_add(Weight::from_parts(1_011_754, 0).saturating_mul(p.into()))
+		Weight::from_parts(3_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 100))
+			// Standard Error: 809
+			.saturating_add(Weight::from_parts(938_486, 0).saturating_mul(p.into()))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(p.into())))
 			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(p.into())))
 			.saturating_add(Weight::from_parts(0, 70).saturating_mul(p.into()))
 	}
+	/// Storage: `System::AuthorizedUpgrade` (r:0 w:1)
+	/// Proof: `System::AuthorizedUpgrade` (`max_values`: Some(1), `max_size`: Some(33), added: 528, mode: `MaxEncodedLen`)
+	fn authorize_upgrade() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `0`
+		//  Estimated: `0`
+		// Minimum execution time: 5_000_000 picoseconds.
+		Weight::from_parts(6_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 0))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: `System::AuthorizedUpgrade` (r:1 w:1)
+	/// Proof: `System::AuthorizedUpgrade` (`max_values`: Some(1), `max_size`: Some(33), added: 528, mode: `MaxEncodedLen`)
+	/// Storage: `ParachainSystem::ValidationData` (r:1 w:0)
+	/// Proof: `ParachainSystem::ValidationData` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `ParachainSystem::UpgradeRestrictionSignal` (r:1 w:0)
+	/// Proof: `ParachainSystem::UpgradeRestrictionSignal` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `ParachainSystem::PendingValidationCode` (r:1 w:1)
+	/// Proof: `ParachainSystem::PendingValidationCode` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0)
+	/// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `ParachainSystem::NewValidationCode` (r:0 w:1)
+	/// Proof: `ParachainSystem::NewValidationCode` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `ParachainSystem::DidSetValidationCode` (r:0 w:1)
+	/// Proof: `ParachainSystem::DidSetValidationCode` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	fn apply_authorized_upgrade() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `186`
+		//  Estimated: `1671`
+		// Minimum execution time: 62_898_000_000 picoseconds.
+		Weight::from_parts(63_339_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 1671))
+			.saturating_add(T::DbWeight::get().reads(5))
+			.saturating_add(T::DbWeight::get().writes(4))
+	}
 }
diff --git a/runtime/crab/src/weights/pallet_assets.rs b/runtime/crab/src/weights/pallet_assets.rs
index 3659185e1..58f674ac3 100644
--- a/runtime/crab/src/weights/pallet_assets.rs
+++ b/runtime/crab/src/weights/pallet_assets.rs
@@ -18,8 +18,8 @@
 
 //! Autogenerated weights for `pallet_assets`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-04-17, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-06-27, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `Some("crab-dev")`, DB CACHE: 1024
 
@@ -61,8 +61,8 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `157`
 		//  Estimated: `3631`
-		// Minimum execution time: 10_000_000 picoseconds.
-		Weight::from_parts(12_000_000, 0)
+		// Minimum execution time: 9_000_000 picoseconds.
+		Weight::from_parts(9_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3631))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -73,8 +73,8 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `157`
 		//  Estimated: `3631`
-		// Minimum execution time: 10_000_000 picoseconds.
-		Weight::from_parts(12_000_000, 0)
+		// Minimum execution time: 9_000_000 picoseconds.
+		Weight::from_parts(10_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3631))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -85,7 +85,7 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `307`
 		//  Estimated: `3631`
-		// Minimum execution time: 10_000_000 picoseconds.
+		// Minimum execution time: 9_000_000 picoseconds.
 		Weight::from_parts(10_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3631))
 			.saturating_add(T::DbWeight::get().reads(1))
@@ -103,10 +103,10 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		//  Measured:  `509 + c * (183 ±0)`
 		//  Estimated: `3631 + c * (2591 ±0)`
 		// Minimum execution time: 13_000_000 picoseconds.
-		Weight::from_parts(13_000_000, 0)
+		Weight::from_parts(14_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3631))
-			// Standard Error: 8_261
-			.saturating_add(Weight::from_parts(12_968_886, 0).saturating_mul(c.into()))
+			// Standard Error: 8_479
+			.saturating_add(Weight::from_parts(10_170_840, 0).saturating_mul(c.into()))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(c.into())))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -122,11 +122,11 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `458 + a * (74 ±0)`
 		//  Estimated: `3631 + a * (2603 ±0)`
-		// Minimum execution time: 14_000_000 picoseconds.
-		Weight::from_parts(15_000_000, 0)
+		// Minimum execution time: 12_000_000 picoseconds.
+		Weight::from_parts(80_268_905, 0)
 			.saturating_add(Weight::from_parts(0, 3631))
-			// Standard Error: 4_304
-			.saturating_add(Weight::from_parts(4_202_955, 0).saturating_mul(a.into()))
+			// Standard Error: 16_839
+			.saturating_add(Weight::from_parts(3_729_918, 0).saturating_mul(a.into()))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(a.into())))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -141,8 +141,8 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `350`
 		//  Estimated: `3631`
-		// Minimum execution time: 12_000_000 picoseconds.
-		Weight::from_parts(14_000_000, 0)
+		// Minimum execution time: 11_000_000 picoseconds.
+		Weight::from_parts(12_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3631))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -155,8 +155,8 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `350`
 		//  Estimated: `3631`
-		// Minimum execution time: 21_000_000 picoseconds.
-		Weight::from_parts(24_000_000, 0)
+		// Minimum execution time: 19_000_000 picoseconds.
+		Weight::from_parts(20_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3631))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -170,7 +170,7 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		//  Measured:  `410`
 		//  Estimated: `3631`
 		// Minimum execution time: 25_000_000 picoseconds.
-		Weight::from_parts(30_000_000, 0)
+		Weight::from_parts(25_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3631))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -185,8 +185,8 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `501`
 		//  Estimated: `6168`
-		// Minimum execution time: 35_000_000 picoseconds.
-		Weight::from_parts(43_000_000, 0)
+		// Minimum execution time: 34_000_000 picoseconds.
+		Weight::from_parts(36_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 6168))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(4))
@@ -201,8 +201,8 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `501`
 		//  Estimated: `6168`
-		// Minimum execution time: 32_000_000 picoseconds.
-		Weight::from_parts(36_000_000, 0)
+		// Minimum execution time: 31_000_000 picoseconds.
+		Weight::from_parts(31_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 6168))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(4))
@@ -218,7 +218,7 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		//  Measured:  `501`
 		//  Estimated: `6168`
 		// Minimum execution time: 35_000_000 picoseconds.
-		Weight::from_parts(41_000_000, 0)
+		Weight::from_parts(36_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 6168))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(4))
@@ -231,8 +231,8 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `410`
 		//  Estimated: `3631`
-		// Minimum execution time: 13_000_000 picoseconds.
-		Weight::from_parts(15_000_000, 0)
+		// Minimum execution time: 12_000_000 picoseconds.
+		Weight::from_parts(13_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3631))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -245,8 +245,8 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `410`
 		//  Estimated: `3631`
-		// Minimum execution time: 13_000_000 picoseconds.
-		Weight::from_parts(14_000_000, 0)
+		// Minimum execution time: 12_000_000 picoseconds.
+		Weight::from_parts(13_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3631))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -258,7 +258,7 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		//  Measured:  `307`
 		//  Estimated: `3631`
 		// Minimum execution time: 9_000_000 picoseconds.
-		Weight::from_parts(10_000_000, 0)
+		Weight::from_parts(9_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3631))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -283,8 +283,8 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `350`
 		//  Estimated: `3631`
-		// Minimum execution time: 12_000_000 picoseconds.
-		Weight::from_parts(15_000_000, 0)
+		// Minimum execution time: 11_000_000 picoseconds.
+		Weight::from_parts(12_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3631))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -295,8 +295,8 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `307`
 		//  Estimated: `3631`
-		// Minimum execution time: 10_000_000 picoseconds.
-		Weight::from_parts(12_000_000, 0)
+		// Minimum execution time: 9_000_000 picoseconds.
+		Weight::from_parts(10_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3631))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -312,12 +312,12 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		//  Measured:  `350`
 		//  Estimated: `3631`
 		// Minimum execution time: 11_000_000 picoseconds.
-		Weight::from_parts(13_351_483, 0)
+		Weight::from_parts(11_711_844, 0)
 			.saturating_add(Weight::from_parts(0, 3631))
-			// Standard Error: 2_630
-			.saturating_add(Weight::from_parts(4_303, 0).saturating_mul(n.into()))
-			// Standard Error: 2_630
-			.saturating_add(Weight::from_parts(4_835, 0).saturating_mul(s.into()))
+			// Standard Error: 1_106
+			.saturating_add(Weight::from_parts(306, 0).saturating_mul(n.into()))
+			// Standard Error: 1_106
+			.saturating_add(Weight::from_parts(3_079, 0).saturating_mul(s.into()))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -330,7 +330,7 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		//  Measured:  `478`
 		//  Estimated: `3631`
 		// Minimum execution time: 12_000_000 picoseconds.
-		Weight::from_parts(14_000_000, 0)
+		Weight::from_parts(12_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3631))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -345,8 +345,8 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `237`
 		//  Estimated: `3631`
-		// Minimum execution time: 11_000_000 picoseconds.
-		Weight::from_parts(14_153_124, 0)
+		// Minimum execution time: 10_000_000 picoseconds.
+		Weight::from_parts(11_234_739, 0)
 			.saturating_add(Weight::from_parts(0, 3631))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -359,8 +359,8 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `478`
 		//  Estimated: `3631`
-		// Minimum execution time: 12_000_000 picoseconds.
-		Weight::from_parts(14_000_000, 0)
+		// Minimum execution time: 11_000_000 picoseconds.
+		Weight::from_parts(12_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3631))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -371,8 +371,8 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `307`
 		//  Estimated: `3631`
-		// Minimum execution time: 10_000_000 picoseconds.
-		Weight::from_parts(13_000_000, 0)
+		// Minimum execution time: 9_000_000 picoseconds.
+		Weight::from_parts(10_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3631))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -386,7 +386,7 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		//  Measured:  `307`
 		//  Estimated: `3631`
 		// Minimum execution time: 14_000_000 picoseconds.
-		Weight::from_parts(16_000_000, 0)
+		Weight::from_parts(14_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3631))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -403,8 +403,8 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `599`
 		//  Estimated: `6168`
-		// Minimum execution time: 42_000_000 picoseconds.
-		Weight::from_parts(48_000_000, 0)
+		// Minimum execution time: 41_000_000 picoseconds.
+		Weight::from_parts(42_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 6168))
 			.saturating_add(T::DbWeight::get().reads(5))
 			.saturating_add(T::DbWeight::get().writes(5))
@@ -417,8 +417,8 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `457`
 		//  Estimated: `3631`
-		// Minimum execution time: 16_000_000 picoseconds.
-		Weight::from_parts(18_000_000, 0)
+		// Minimum execution time: 15_000_000 picoseconds.
+		Weight::from_parts(16_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3631))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -431,8 +431,8 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `457`
 		//  Estimated: `3631`
-		// Minimum execution time: 16_000_000 picoseconds.
-		Weight::from_parts(18_000_000, 0)
+		// Minimum execution time: 15_000_000 picoseconds.
+		Weight::from_parts(16_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3631))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -443,7 +443,7 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `307`
 		//  Estimated: `3631`
-		// Minimum execution time: 11_000_000 picoseconds.
+		// Minimum execution time: 10_000_000 picoseconds.
 		Weight::from_parts(11_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3631))
 			.saturating_add(T::DbWeight::get().reads(1))
@@ -459,8 +459,8 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `478`
 		//  Estimated: `3631`
-		// Minimum execution time: 31_000_000 picoseconds.
-		Weight::from_parts(36_000_000, 0)
+		// Minimum execution time: 28_000_000 picoseconds.
+		Weight::from_parts(29_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3631))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(3))
@@ -473,8 +473,8 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `350`
 		//  Estimated: `3631`
-		// Minimum execution time: 27_000_000 picoseconds.
-		Weight::from_parts(30_000_000, 0)
+		// Minimum execution time: 26_000_000 picoseconds.
+		Weight::from_parts(27_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3631))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -490,7 +490,7 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		//  Measured:  `556`
 		//  Estimated: `3631`
 		// Minimum execution time: 27_000_000 picoseconds.
-		Weight::from_parts(33_000_000, 0)
+		Weight::from_parts(28_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3631))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(3))
@@ -503,8 +503,8 @@ impl<T: frame_system::Config> pallet_assets::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `448`
 		//  Estimated: `3631`
-		// Minimum execution time: 26_000_000 picoseconds.
-		Weight::from_parts(31_000_000, 0)
+		// Minimum execution time: 25_000_000 picoseconds.
+		Weight::from_parts(26_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3631))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
diff --git a/runtime/crab/src/weights/pallet_balances.rs b/runtime/crab/src/weights/pallet_balances.rs
index f048afe4a..26ca547d4 100644
--- a/runtime/crab/src/weights/pallet_balances.rs
+++ b/runtime/crab/src/weights/pallet_balances.rs
@@ -18,8 +18,8 @@
 
 //! Autogenerated weights for `pallet_balances`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-04-17, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-06-27, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `Some("crab-dev")`, DB CACHE: 1024
 
@@ -61,8 +61,8 @@ impl<T: frame_system::Config> pallet_balances::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `39`
 		//  Estimated: `3581`
-		// Minimum execution time: 47_000_000 picoseconds.
-		Weight::from_parts(54_000_000, 0)
+		// Minimum execution time: 43_000_000 picoseconds.
+		Weight::from_parts(44_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3581))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -73,8 +73,8 @@ impl<T: frame_system::Config> pallet_balances::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `39`
 		//  Estimated: `3581`
-		// Minimum execution time: 38_000_000 picoseconds.
-		Weight::from_parts(42_000_000, 0)
+		// Minimum execution time: 36_000_000 picoseconds.
+		Weight::from_parts(38_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3581))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -85,8 +85,8 @@ impl<T: frame_system::Config> pallet_balances::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `162`
 		//  Estimated: `3581`
-		// Minimum execution time: 14_000_000 picoseconds.
-		Weight::from_parts(17_000_000, 0)
+		// Minimum execution time: 13_000_000 picoseconds.
+		Weight::from_parts(14_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3581))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -97,8 +97,8 @@ impl<T: frame_system::Config> pallet_balances::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `162`
 		//  Estimated: `3581`
-		// Minimum execution time: 20_000_000 picoseconds.
-		Weight::from_parts(23_000_000, 0)
+		// Minimum execution time: 19_000_000 picoseconds.
+		Weight::from_parts(20_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3581))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -109,8 +109,8 @@ impl<T: frame_system::Config> pallet_balances::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `201`
 		//  Estimated: `6172`
-		// Minimum execution time: 46_000_000 picoseconds.
-		Weight::from_parts(52_000_000, 0)
+		// Minimum execution time: 45_000_000 picoseconds.
+		Weight::from_parts(46_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 6172))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -121,8 +121,8 @@ impl<T: frame_system::Config> pallet_balances::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `39`
 		//  Estimated: `3581`
-		// Minimum execution time: 48_000_000 picoseconds.
-		Weight::from_parts(53_000_000, 0)
+		// Minimum execution time: 46_000_000 picoseconds.
+		Weight::from_parts(47_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3581))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -134,7 +134,7 @@ impl<T: frame_system::Config> pallet_balances::WeightInfo for WeightInfo<T> {
 		//  Measured:  `162`
 		//  Estimated: `3581`
 		// Minimum execution time: 16_000_000 picoseconds.
-		Weight::from_parts(18_000_000, 0)
+		Weight::from_parts(17_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3581))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -146,13 +146,24 @@ impl<T: frame_system::Config> pallet_balances::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `91 + u * (124 ±0)`
 		//  Estimated: `990 + u * (2591 ±0)`
-		// Minimum execution time: 16_000_000 picoseconds.
-		Weight::from_parts(17_000_000, 0)
+		// Minimum execution time: 15_000_000 picoseconds.
+		Weight::from_parts(16_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 990))
-			// Standard Error: 9_097
-			.saturating_add(Weight::from_parts(15_166_869, 0).saturating_mul(u.into()))
+			// Standard Error: 12_953
+			.saturating_add(Weight::from_parts(12_353_948, 0).saturating_mul(u.into()))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(u.into())))
 			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(u.into())))
 			.saturating_add(Weight::from_parts(0, 2591).saturating_mul(u.into()))
 	}
+	/// Storage: `Balances::InactiveIssuance` (r:1 w:0)
+	/// Proof: `Balances::InactiveIssuance` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	fn force_adjust_total_issuance() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `0`
+		//  Estimated: `1501`
+		// Minimum execution time: 5_000_000 picoseconds.
+		Weight::from_parts(5_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 1501))
+			.saturating_add(T::DbWeight::get().reads(1))
+	}
 }
diff --git a/runtime/crab/src/weights/pallet_collective.rs b/runtime/crab/src/weights/pallet_collective.rs
index f74244118..1f54955c9 100644
--- a/runtime/crab/src/weights/pallet_collective.rs
+++ b/runtime/crab/src/weights/pallet_collective.rs
@@ -18,8 +18,8 @@
 
 //! Autogenerated weights for `pallet_collective`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-04-17, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-06-27, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `Some("crab-dev")`, DB CACHE: 1024
 
@@ -70,13 +70,13 @@ impl<T: frame_system::Config> pallet_collective::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0 + m * (2021 ±0) + p * (2026 ±0)`
 		//  Estimated: `12200 + m * (1231 ±14) + p * (3660 ±14)`
-		// Minimum execution time: 12_000_000 picoseconds.
-		Weight::from_parts(13_000_000, 0)
+		// Minimum execution time: 11_000_000 picoseconds.
+		Weight::from_parts(11_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 12200))
-			// Standard Error: 38_940
-			.saturating_add(Weight::from_parts(2_479_101, 0).saturating_mul(m.into()))
-			// Standard Error: 38_940
-			.saturating_add(Weight::from_parts(5_893_289, 0).saturating_mul(p.into()))
+			// Standard Error: 43_919
+			.saturating_add(Weight::from_parts(2_400_988, 0).saturating_mul(m.into()))
+			// Standard Error: 43_919
+			.saturating_add(Weight::from_parts(5_149_399, 0).saturating_mul(p.into()))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(p.into())))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -95,12 +95,12 @@ impl<T: frame_system::Config> pallet_collective::WeightInfo for WeightInfo<T> {
 		//  Measured:  `73 + m * (20 ±0)`
 		//  Estimated: `3997 + m * (20 ±0)`
 		// Minimum execution time: 13_000_000 picoseconds.
-		Weight::from_parts(16_243_800, 0)
+		Weight::from_parts(13_154_191, 0)
 			.saturating_add(Weight::from_parts(0, 3997))
-			// Standard Error: 170
-			.saturating_add(Weight::from_parts(1_289, 0).saturating_mul(b.into()))
-			// Standard Error: 1_755
-			.saturating_add(Weight::from_parts(3_140, 0).saturating_mul(m.into()))
+			// Standard Error: 38
+			.saturating_add(Weight::from_parts(767, 0).saturating_mul(b.into()))
+			// Standard Error: 394
+			.saturating_add(Weight::from_parts(3_491, 0).saturating_mul(m.into()))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(Weight::from_parts(0, 20).saturating_mul(m.into()))
 	}
@@ -117,12 +117,12 @@ impl<T: frame_system::Config> pallet_collective::WeightInfo for WeightInfo<T> {
 		//  Measured:  `73 + m * (20 ±0)`
 		//  Estimated: `3997 + m * (20 ±0)`
 		// Minimum execution time: 15_000_000 picoseconds.
-		Weight::from_parts(17_977_907, 0)
+		Weight::from_parts(14_546_634, 0)
 			.saturating_add(Weight::from_parts(0, 3997))
-			// Standard Error: 183
-			.saturating_add(Weight::from_parts(1_585, 0).saturating_mul(b.into()))
-			// Standard Error: 1_887
-			.saturating_add(Weight::from_parts(7_696, 0).saturating_mul(m.into()))
+			// Standard Error: 40
+			.saturating_add(Weight::from_parts(1_165, 0).saturating_mul(b.into()))
+			// Standard Error: 413
+			.saturating_add(Weight::from_parts(6_158, 0).saturating_mul(m.into()))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(Weight::from_parts(0, 20).saturating_mul(m.into()))
 	}
@@ -143,15 +143,15 @@ impl<T: frame_system::Config> pallet_collective::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `357 + m * (20 ±0) + p * (36 ±0)`
 		//  Estimated: `3751 + m * (21 ±0) + p * (36 ±0)`
-		// Minimum execution time: 20_000_000 picoseconds.
-		Weight::from_parts(22_175_250, 0)
+		// Minimum execution time: 16_000_000 picoseconds.
+		Weight::from_parts(17_790_958, 0)
 			.saturating_add(Weight::from_parts(0, 3751))
-			// Standard Error: 243
-			.saturating_add(Weight::from_parts(1_882, 0).saturating_mul(b.into()))
-			// Standard Error: 2_539
-			.saturating_add(Weight::from_parts(9_290, 0).saturating_mul(m.into()))
-			// Standard Error: 2_507
-			.saturating_add(Weight::from_parts(163_978, 0).saturating_mul(p.into()))
+			// Standard Error: 56
+			.saturating_add(Weight::from_parts(754, 0).saturating_mul(b.into()))
+			// Standard Error: 592
+			.saturating_add(Weight::from_parts(7_595, 0).saturating_mul(m.into()))
+			// Standard Error: 585
+			.saturating_add(Weight::from_parts(111_810, 0).saturating_mul(p.into()))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(4))
 			.saturating_add(Weight::from_parts(0, 21).saturating_mul(m.into()))
@@ -167,10 +167,10 @@ impl<T: frame_system::Config> pallet_collective::WeightInfo for WeightInfo<T> {
 		//  Measured:  `832 + m * (40 ±0)`
 		//  Estimated: `4296 + m * (40 ±0)`
 		// Minimum execution time: 14_000_000 picoseconds.
-		Weight::from_parts(20_275_652, 0)
+		Weight::from_parts(14_670_830, 0)
 			.saturating_add(Weight::from_parts(0, 4296))
-			// Standard Error: 2_637
-			.saturating_add(Weight::from_parts(12_732, 0).saturating_mul(m.into()))
+			// Standard Error: 803
+			.saturating_add(Weight::from_parts(6_942, 0).saturating_mul(m.into()))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
 			.saturating_add(Weight::from_parts(0, 40).saturating_mul(m.into()))
@@ -189,13 +189,11 @@ impl<T: frame_system::Config> pallet_collective::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `409 + m * (40 ±0) + p * (36 ±0)`
 		//  Estimated: `3854 + m * (41 ±0) + p * (36 ±0)`
-		// Minimum execution time: 21_000_000 picoseconds.
-		Weight::from_parts(25_371_176, 0)
+		// Minimum execution time: 18_000_000 picoseconds.
+		Weight::from_parts(18_802_178, 0)
 			.saturating_add(Weight::from_parts(0, 3854))
-			// Standard Error: 2_709
-			.saturating_add(Weight::from_parts(8_933, 0).saturating_mul(m.into()))
-			// Standard Error: 2_641
-			.saturating_add(Weight::from_parts(152_940, 0).saturating_mul(p.into()))
+			// Standard Error: 587
+			.saturating_add(Weight::from_parts(112_449, 0).saturating_mul(p.into()))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(3))
 			.saturating_add(Weight::from_parts(0, 41).saturating_mul(m.into()))
@@ -218,11 +216,13 @@ impl<T: frame_system::Config> pallet_collective::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `715 + b * (1 ±0) + m * (40 ±0) + p * (40 ±0)`
 		//  Estimated: `4032 + b * (1 ±0) + m * (42 ±0) + p * (40 ±0)`
-		// Minimum execution time: 32_000_000 picoseconds.
-		Weight::from_parts(43_250_733, 0)
+		// Minimum execution time: 28_000_000 picoseconds.
+		Weight::from_parts(29_779_778, 0)
 			.saturating_add(Weight::from_parts(0, 4032))
-			// Standard Error: 3_716
-			.saturating_add(Weight::from_parts(177_511, 0).saturating_mul(p.into()))
+			// Standard Error: 104
+			.saturating_add(Weight::from_parts(789, 0).saturating_mul(b.into()))
+			// Standard Error: 1_073
+			.saturating_add(Weight::from_parts(128_305, 0).saturating_mul(p.into()))
 			.saturating_add(T::DbWeight::get().reads(5))
 			.saturating_add(T::DbWeight::get().writes(3))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(b.into()))
@@ -245,13 +245,11 @@ impl<T: frame_system::Config> pallet_collective::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `429 + m * (40 ±0) + p * (36 ±0)`
 		//  Estimated: `3874 + m * (41 ±0) + p * (36 ±0)`
-		// Minimum execution time: 24_000_000 picoseconds.
-		Weight::from_parts(28_025_150, 0)
+		// Minimum execution time: 20_000_000 picoseconds.
+		Weight::from_parts(20_815_416, 0)
 			.saturating_add(Weight::from_parts(0, 3874))
-			// Standard Error: 2_606
-			.saturating_add(Weight::from_parts(6_312, 0).saturating_mul(m.into()))
-			// Standard Error: 2_541
-			.saturating_add(Weight::from_parts(153_801, 0).saturating_mul(p.into()))
+			// Standard Error: 689
+			.saturating_add(Weight::from_parts(113_104, 0).saturating_mul(p.into()))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(3))
 			.saturating_add(Weight::from_parts(0, 41).saturating_mul(m.into()))
@@ -276,15 +274,13 @@ impl<T: frame_system::Config> pallet_collective::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `735 + b * (1 ±0) + m * (40 ±0) + p * (40 ±0)`
 		//  Estimated: `4052 + b * (1 ±0) + m * (42 ±0) + p * (40 ±0)`
-		// Minimum execution time: 35_000_000 picoseconds.
-		Weight::from_parts(41_239_860, 0)
+		// Minimum execution time: 30_000_000 picoseconds.
+		Weight::from_parts(32_855_426, 0)
 			.saturating_add(Weight::from_parts(0, 4052))
-			// Standard Error: 329
-			.saturating_add(Weight::from_parts(1_952, 0).saturating_mul(b.into()))
-			// Standard Error: 3_485
-			.saturating_add(Weight::from_parts(16_071, 0).saturating_mul(m.into()))
-			// Standard Error: 3_397
-			.saturating_add(Weight::from_parts(193_363, 0).saturating_mul(p.into()))
+			// Standard Error: 1_179
+			.saturating_add(Weight::from_parts(1_316, 0).saturating_mul(m.into()))
+			// Standard Error: 1_150
+			.saturating_add(Weight::from_parts(126_969, 0).saturating_mul(p.into()))
 			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(3))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(b.into()))
@@ -302,11 +298,11 @@ impl<T: frame_system::Config> pallet_collective::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `226 + p * (32 ±0)`
 		//  Estimated: `1711 + p * (32 ±0)`
-		// Minimum execution time: 12_000_000 picoseconds.
-		Weight::from_parts(14_026_604, 0)
+		// Minimum execution time: 11_000_000 picoseconds.
+		Weight::from_parts(11_369_868, 0)
 			.saturating_add(Weight::from_parts(0, 1711))
-			// Standard Error: 2_518
-			.saturating_add(Weight::from_parts(160_323, 0).saturating_mul(p.into()))
+			// Standard Error: 556
+			.saturating_add(Weight::from_parts(102_481, 0).saturating_mul(p.into()))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(3))
 			.saturating_add(Weight::from_parts(0, 32).saturating_mul(p.into()))
diff --git a/runtime/crab/src/weights/pallet_conviction_voting.rs b/runtime/crab/src/weights/pallet_conviction_voting.rs
index 13e36523a..454b22dcf 100644
--- a/runtime/crab/src/weights/pallet_conviction_voting.rs
+++ b/runtime/crab/src/weights/pallet_conviction_voting.rs
@@ -18,8 +18,8 @@
 
 //! Autogenerated weights for `pallet_conviction_voting`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-04-17, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-06-27, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `Some("crab-dev")`, DB CACHE: 1024
 
@@ -71,8 +71,8 @@ impl<T: frame_system::Config> pallet_conviction_voting::WeightInfo for WeightInf
 		// Proof Size summary in bytes:
 		//  Measured:  `13458`
 		//  Estimated: `42428`
-		// Minimum execution time: 90_000_000 picoseconds.
-		Weight::from_parts(111_000_000, 0)
+		// Minimum execution time: 78_000_000 picoseconds.
+		Weight::from_parts(81_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 42428))
 			.saturating_add(T::DbWeight::get().reads(6))
 			.saturating_add(T::DbWeight::get().writes(5))
@@ -93,8 +93,8 @@ impl<T: frame_system::Config> pallet_conviction_voting::WeightInfo for WeightInf
 		// Proof Size summary in bytes:
 		//  Measured:  `14179`
 		//  Estimated: `83866`
-		// Minimum execution time: 164_000_000 picoseconds.
-		Weight::from_parts(190_000_000, 0)
+		// Minimum execution time: 113_000_000 picoseconds.
+		Weight::from_parts(117_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 83866))
 			.saturating_add(T::DbWeight::get().reads(7))
 			.saturating_add(T::DbWeight::get().writes(6))
@@ -109,8 +109,8 @@ impl<T: frame_system::Config> pallet_conviction_voting::WeightInfo for WeightInf
 		// Proof Size summary in bytes:
 		//  Measured:  `13928`
 		//  Estimated: `83866`
-		// Minimum execution time: 127_000_000 picoseconds.
-		Weight::from_parts(162_000_000, 0)
+		// Minimum execution time: 86_000_000 picoseconds.
+		Weight::from_parts(88_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 83866))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(4))
@@ -123,8 +123,8 @@ impl<T: frame_system::Config> pallet_conviction_voting::WeightInfo for WeightInf
 		// Proof Size summary in bytes:
 		//  Measured:  `13052`
 		//  Estimated: `30694`
-		// Minimum execution time: 48_000_000 picoseconds.
-		Weight::from_parts(58_000_000, 0)
+		// Minimum execution time: 40_000_000 picoseconds.
+		Weight::from_parts(46_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 30694))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -146,11 +146,11 @@ impl<T: frame_system::Config> pallet_conviction_voting::WeightInfo for WeightInf
 		// Proof Size summary in bytes:
 		//  Measured:  `7020 + r * (447 ±0)`
 		//  Estimated: `83866 + r * (3387 ±0)`
-		// Minimum execution time: 54_000_000 picoseconds.
-		Weight::from_parts(27_693_220, 0)
+		// Minimum execution time: 40_000_000 picoseconds.
+		Weight::from_parts(127_759_577, 0)
 			.saturating_add(Weight::from_parts(0, 83866))
-			// Standard Error: 587_556
-			.saturating_add(Weight::from_parts(69_339_272, 0).saturating_mul(r.into()))
+			// Standard Error: 247_296
+			.saturating_add(Weight::from_parts(31_633_691, 0).saturating_mul(r.into()))
 			.saturating_add(T::DbWeight::get().reads(7))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r.into())))
 			.saturating_add(T::DbWeight::get().writes(6))
@@ -168,11 +168,11 @@ impl<T: frame_system::Config> pallet_conviction_voting::WeightInfo for WeightInf
 		// Proof Size summary in bytes:
 		//  Measured:  `6876 + r * (447 ±0)`
 		//  Estimated: `83866 + r * (3387 ±0)`
-		// Minimum execution time: 27_000_000 picoseconds.
-		Weight::from_parts(30_000_000, 0)
+		// Minimum execution time: 17_000_000 picoseconds.
+		Weight::from_parts(153_324_605, 0)
 			.saturating_add(Weight::from_parts(0, 83866))
-			// Standard Error: 295_266
-			.saturating_add(Weight::from_parts(68_678_652, 0).saturating_mul(r.into()))
+			// Standard Error: 263_649
+			.saturating_add(Weight::from_parts(30_778_339, 0).saturating_mul(r.into()))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r.into())))
 			.saturating_add(T::DbWeight::get().writes(4))
@@ -191,8 +191,8 @@ impl<T: frame_system::Config> pallet_conviction_voting::WeightInfo for WeightInf
 		// Proof Size summary in bytes:
 		//  Measured:  `12038`
 		//  Estimated: `30694`
-		// Minimum execution time: 67_000_000 picoseconds.
-		Weight::from_parts(95_000_000, 0)
+		// Minimum execution time: 64_000_000 picoseconds.
+		Weight::from_parts(67_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 30694))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(3))
diff --git a/runtime/crab/src/weights/pallet_message_queue.rs b/runtime/crab/src/weights/pallet_message_queue.rs
new file mode 100644
index 000000000..5f45a3634
--- /dev/null
+++ b/runtime/crab/src/weights/pallet_message_queue.rs
@@ -0,0 +1,191 @@
+// This file is part of Darwinia.
+//
+// Copyright (C) Darwinia Network
+// SPDX-License-Identifier: GPL-3.0
+//
+// Darwinia is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Darwinia is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Darwinia. If not, see <https://www.gnu.org/licenses/>.
+
+//! Autogenerated weights for `pallet_message_queue`
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-06-27, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! WORST CASE MAP SIZE: `1000000`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("crab-dev")`, DB CACHE: 1024
+
+// Executed Command:
+// target/release/darwinia
+// benchmark
+// pallet
+// --header
+// .maintain/license-header
+// --heap-pages
+// 4096
+// --chain
+// crab-dev
+// --output
+// runtime/crab/src/weights
+// --pallet
+// *
+// --extrinsic
+// *
+// --steps
+// 50
+// --repeat
+// 20
+
+#![cfg_attr(rustfmt, rustfmt_skip)]
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+#![allow(missing_docs)]
+
+use frame_support::{traits::Get, weights::Weight};
+use core::marker::PhantomData;
+
+/// Weight functions for `pallet_message_queue`.
+pub struct WeightInfo<T>(PhantomData<T>);
+impl<T: frame_system::Config> pallet_message_queue::WeightInfo for WeightInfo<T> {
+	/// Storage: `MessageQueue::ServiceHead` (r:1 w:0)
+	/// Proof: `MessageQueue::ServiceHead` (`max_values`: Some(1), `max_size`: Some(5), added: 500, mode: `MaxEncodedLen`)
+	/// Storage: `MessageQueue::BookStateFor` (r:2 w:2)
+	/// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	fn ready_ring_knit() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `223`
+		//  Estimated: `6044`
+		// Minimum execution time: 10_000_000 picoseconds.
+		Weight::from_parts(11_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 6044))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	/// Storage: `MessageQueue::BookStateFor` (r:2 w:2)
+	/// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	/// Storage: `MessageQueue::ServiceHead` (r:1 w:1)
+	/// Proof: `MessageQueue::ServiceHead` (`max_values`: Some(1), `max_size`: Some(5), added: 500, mode: `MaxEncodedLen`)
+	fn ready_ring_unknit() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `218`
+		//  Estimated: `6044`
+		// Minimum execution time: 9_000_000 picoseconds.
+		Weight::from_parts(9_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 6044))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(3))
+	}
+	/// Storage: `MessageQueue::BookStateFor` (r:1 w:1)
+	/// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	fn service_queue_base() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `6`
+		//  Estimated: `3517`
+		// Minimum execution time: 3_000_000 picoseconds.
+		Weight::from_parts(4_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 3517))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: `MessageQueue::Pages` (r:1 w:1)
+	/// Proof: `MessageQueue::Pages` (`max_values`: None, `max_size`: Some(65585), added: 68060, mode: `MaxEncodedLen`)
+	fn service_page_base_completion() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `72`
+		//  Estimated: `69050`
+		// Minimum execution time: 5_000_000 picoseconds.
+		Weight::from_parts(6_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 69050))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: `MessageQueue::Pages` (r:1 w:1)
+	/// Proof: `MessageQueue::Pages` (`max_values`: None, `max_size`: Some(65585), added: 68060, mode: `MaxEncodedLen`)
+	fn service_page_base_no_completion() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `72`
+		//  Estimated: `69050`
+		// Minimum execution time: 5_000_000 picoseconds.
+		Weight::from_parts(6_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 69050))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: `MessageQueue::BookStateFor` (r:0 w:1)
+	/// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	/// Storage: `MessageQueue::Pages` (r:0 w:1)
+	/// Proof: `MessageQueue::Pages` (`max_values`: None, `max_size`: Some(65585), added: 68060, mode: `MaxEncodedLen`)
+	fn service_page_item() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `0`
+		//  Estimated: `0`
+		// Minimum execution time: 79_000_000 picoseconds.
+		Weight::from_parts(80_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 0))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	/// Storage: `MessageQueue::ServiceHead` (r:1 w:1)
+	/// Proof: `MessageQueue::ServiceHead` (`max_values`: Some(1), `max_size`: Some(5), added: 500, mode: `MaxEncodedLen`)
+	/// Storage: `MessageQueue::BookStateFor` (r:1 w:0)
+	/// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	fn bump_service_head() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `171`
+		//  Estimated: `3517`
+		// Minimum execution time: 6_000_000 picoseconds.
+		Weight::from_parts(6_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 3517))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: `MessageQueue::BookStateFor` (r:1 w:1)
+	/// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	/// Storage: `MessageQueue::Pages` (r:1 w:1)
+	/// Proof: `MessageQueue::Pages` (`max_values`: None, `max_size`: Some(65585), added: 68060, mode: `MaxEncodedLen`)
+	fn reap_page() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `65667`
+		//  Estimated: `69050`
+		// Minimum execution time: 36_000_000 picoseconds.
+		Weight::from_parts(38_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 69050))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	/// Storage: `MessageQueue::BookStateFor` (r:1 w:1)
+	/// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	/// Storage: `MessageQueue::Pages` (r:1 w:1)
+	/// Proof: `MessageQueue::Pages` (`max_values`: None, `max_size`: Some(65585), added: 68060, mode: `MaxEncodedLen`)
+	fn execute_overweight_page_removed() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `65667`
+		//  Estimated: `69050`
+		// Minimum execution time: 44_000_000 picoseconds.
+		Weight::from_parts(46_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 69050))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	/// Storage: `MessageQueue::BookStateFor` (r:1 w:1)
+	/// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	/// Storage: `MessageQueue::Pages` (r:1 w:1)
+	/// Proof: `MessageQueue::Pages` (`max_values`: None, `max_size`: Some(65585), added: 68060, mode: `MaxEncodedLen`)
+	fn execute_overweight_page_updated() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `65667`
+		//  Estimated: `69050`
+		// Minimum execution time: 48_000_000 picoseconds.
+		Weight::from_parts(50_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 69050))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+}
diff --git a/runtime/crab/src/weights/pallet_preimage.rs b/runtime/crab/src/weights/pallet_preimage.rs
index 129207b10..da8869f11 100644
--- a/runtime/crab/src/weights/pallet_preimage.rs
+++ b/runtime/crab/src/weights/pallet_preimage.rs
@@ -18,8 +18,8 @@
 
 //! Autogenerated weights for `pallet_preimage`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-04-17, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-06-27, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `Some("crab-dev")`, DB CACHE: 1024
 
@@ -55,25 +55,31 @@ use core::marker::PhantomData;
 /// Weight functions for `pallet_preimage`.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> pallet_preimage::WeightInfo for WeightInfo<T> {
-	/// Storage: `Preimage::StatusFor` (r:1 w:1)
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
 	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Holds` (r:1 w:1)
+	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(55), added: 2530, mode: `MaxEncodedLen`)
 	/// Storage: `Preimage::PreimageFor` (r:0 w:1)
 	/// Proof: `Preimage::PreimageFor` (`max_values`: None, `max_size`: Some(4194344), added: 4196819, mode: `MaxEncodedLen`)
 	/// The range of component `s` is `[0, 4194304]`.
 	fn note_preimage(s: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `208`
+		//  Measured:  `42`
 		//  Estimated: `3544`
-		// Minimum execution time: 24_000_000 picoseconds.
-		Weight::from_parts(24_000_000, 0)
+		// Minimum execution time: 44_000_000 picoseconds.
+		Weight::from_parts(45_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3544))
 			// Standard Error: 1
-			.saturating_add(Weight::from_parts(1_267, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(2))
+			.saturating_add(Weight::from_parts(1_007, 0).saturating_mul(s.into()))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(3))
 	}
-	/// Storage: `Preimage::StatusFor` (r:1 w:1)
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
 	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
 	/// Storage: `Preimage::PreimageFor` (r:0 w:1)
 	/// Proof: `Preimage::PreimageFor` (`max_values`: None, `max_size`: Some(4194344), added: 4196819, mode: `MaxEncodedLen`)
 	/// The range of component `s` is `[0, 4194304]`.
@@ -81,16 +87,18 @@ impl<T: frame_system::Config> pallet_preimage::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `106`
 		//  Estimated: `3544`
-		// Minimum execution time: 13_000_000 picoseconds.
-		Weight::from_parts(14_000_000, 0)
+		// Minimum execution time: 12_000_000 picoseconds.
+		Weight::from_parts(12_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3544))
-			// Standard Error: 2
-			.saturating_add(Weight::from_parts(1_260, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
+			// Standard Error: 1
+			.saturating_add(Weight::from_parts(1_003, 0).saturating_mul(s.into()))
+			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	/// Storage: `Preimage::StatusFor` (r:1 w:1)
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
 	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
 	/// Storage: `Preimage::PreimageFor` (r:0 w:1)
 	/// Proof: `Preimage::PreimageFor` (`max_values`: None, `max_size`: Some(4194344), added: 4196819, mode: `MaxEncodedLen`)
 	/// The range of component `s` is `[0, 4194304]`.
@@ -98,30 +106,36 @@ impl<T: frame_system::Config> pallet_preimage::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `106`
 		//  Estimated: `3544`
-		// Minimum execution time: 13_000_000 picoseconds.
-		Weight::from_parts(15_000_000, 0)
+		// Minimum execution time: 12_000_000 picoseconds.
+		Weight::from_parts(12_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3544))
 			// Standard Error: 1
-			.saturating_add(Weight::from_parts(1_274, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(Weight::from_parts(1_034, 0).saturating_mul(s.into()))
+			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	/// Storage: `Preimage::StatusFor` (r:1 w:1)
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
 	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Holds` (r:1 w:1)
+	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(55), added: 2530, mode: `MaxEncodedLen`)
 	/// Storage: `Preimage::PreimageFor` (r:0 w:1)
 	/// Proof: `Preimage::PreimageFor` (`max_values`: None, `max_size`: Some(4194344), added: 4196819, mode: `MaxEncodedLen`)
 	fn unnote_preimage() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `342`
+		//  Measured:  `219`
 		//  Estimated: `3544`
-		// Minimum execution time: 36_000_000 picoseconds.
-		Weight::from_parts(42_000_000, 0)
+		// Minimum execution time: 40_000_000 picoseconds.
+		Weight::from_parts(41_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3544))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(2))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(3))
 	}
-	/// Storage: `Preimage::StatusFor` (r:1 w:1)
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
 	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
 	/// Storage: `Preimage::PreimageFor` (r:0 w:1)
 	/// Proof: `Preimage::PreimageFor` (`max_values`: None, `max_size`: Some(4194344), added: 4196819, mode: `MaxEncodedLen`)
 	fn unnote_no_deposit_preimage() -> Weight {
@@ -129,95 +143,131 @@ impl<T: frame_system::Config> pallet_preimage::WeightInfo for WeightInfo<T> {
 		//  Measured:  `144`
 		//  Estimated: `3544`
 		// Minimum execution time: 14_000_000 picoseconds.
-		Weight::from_parts(22_000_000, 0)
+		Weight::from_parts(15_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3544))
-			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	/// Storage: `Preimage::StatusFor` (r:1 w:1)
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
 	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
 	fn request_preimage() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `176`
 		//  Estimated: `3544`
-		// Minimum execution time: 15_000_000 picoseconds.
-		Weight::from_parts(21_000_000, 0)
+		// Minimum execution time: 11_000_000 picoseconds.
+		Weight::from_parts(12_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3544))
-			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	/// Storage: `Preimage::StatusFor` (r:1 w:1)
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
 	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
 	fn request_no_deposit_preimage() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `144`
 		//  Estimated: `3544`
-		// Minimum execution time: 10_000_000 picoseconds.
-		Weight::from_parts(14_000_000, 0)
+		// Minimum execution time: 8_000_000 picoseconds.
+		Weight::from_parts(9_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3544))
-			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	/// Storage: `Preimage::StatusFor` (r:1 w:1)
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
 	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
 	fn request_unnoted_preimage() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `42`
 		//  Estimated: `3544`
-		// Minimum execution time: 11_000_000 picoseconds.
-		Weight::from_parts(14_000_000, 0)
+		// Minimum execution time: 9_000_000 picoseconds.
+		Weight::from_parts(10_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3544))
-			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	/// Storage: `Preimage::StatusFor` (r:1 w:1)
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
 	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
 	fn request_requested_preimage() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `106`
 		//  Estimated: `3544`
-		// Minimum execution time: 7_000_000 picoseconds.
-		Weight::from_parts(10_000_000, 0)
+		// Minimum execution time: 8_000_000 picoseconds.
+		Weight::from_parts(8_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3544))
-			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	/// Storage: `Preimage::StatusFor` (r:1 w:1)
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
 	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
 	/// Storage: `Preimage::PreimageFor` (r:0 w:1)
 	/// Proof: `Preimage::PreimageFor` (`max_values`: None, `max_size`: Some(4194344), added: 4196819, mode: `MaxEncodedLen`)
 	fn unrequest_preimage() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `144`
 		//  Estimated: `3544`
-		// Minimum execution time: 13_000_000 picoseconds.
-		Weight::from_parts(22_000_000, 0)
+		// Minimum execution time: 12_000_000 picoseconds.
+		Weight::from_parts(13_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3544))
-			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
-	/// Storage: `Preimage::StatusFor` (r:1 w:1)
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
 	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
 	fn unrequest_unnoted_preimage() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `106`
 		//  Estimated: `3544`
-		// Minimum execution time: 7_000_000 picoseconds.
-		Weight::from_parts(10_000_000, 0)
+		// Minimum execution time: 8_000_000 picoseconds.
+		Weight::from_parts(8_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3544))
-			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
-	/// Storage: `Preimage::StatusFor` (r:1 w:1)
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
 	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
 	fn unrequest_multi_referenced_preimage() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `106`
 		//  Estimated: `3544`
 		// Minimum execution time: 8_000_000 picoseconds.
-		Weight::from_parts(10_000_000, 0)
+		Weight::from_parts(8_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3544))
-			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
+	/// Storage: `Preimage::StatusFor` (r:1023 w:1023)
+	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:1023 w:1023)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(116), added: 2591, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Holds` (r:1023 w:1023)
+	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(55), added: 2530, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:0 w:1023)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
+	/// The range of component `n` is `[1, 1024]`.
+	fn ensure_updated(n: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `181 + n * (203 ±0)`
+		//  Estimated: `990 + n * (2591 ±0)`
+		// Minimum execution time: 52_000_000 picoseconds.
+		Weight::from_parts(53_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 990))
+			// Standard Error: 22_653
+			.saturating_add(Weight::from_parts(50_300_431, 0).saturating_mul(n.into()))
+			.saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(n.into())))
+			.saturating_add(T::DbWeight::get().writes((4_u64).saturating_mul(n.into())))
+			.saturating_add(Weight::from_parts(0, 2591).saturating_mul(n.into()))
+	}
 }
diff --git a/runtime/crab/src/weights/pallet_proxy.rs b/runtime/crab/src/weights/pallet_proxy.rs
index 719865ddc..36bf65747 100644
--- a/runtime/crab/src/weights/pallet_proxy.rs
+++ b/runtime/crab/src/weights/pallet_proxy.rs
@@ -18,8 +18,8 @@
 
 //! Autogenerated weights for `pallet_proxy`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-04-17, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-06-27, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `Some("crab-dev")`, DB CACHE: 1024
 
@@ -65,10 +65,10 @@ impl<T: frame_system::Config> pallet_proxy::WeightInfo for WeightInfo<T> {
 		//  Measured:  `153 + p * (25 ±0)`
 		//  Estimated: `4310`
 		// Minimum execution time: 12_000_000 picoseconds.
-		Weight::from_parts(15_374_496, 0)
+		Weight::from_parts(13_135_940, 0)
 			.saturating_add(Weight::from_parts(0, 4310))
-			// Standard Error: 5_984
-			.saturating_add(Weight::from_parts(30_251, 0).saturating_mul(p.into()))
+			// Standard Error: 1_839
+			.saturating_add(Weight::from_parts(1_292, 0).saturating_mul(p.into()))
 			.saturating_add(T::DbWeight::get().reads(2))
 	}
 	/// Storage: `Proxy::Proxies` (r:1 w:0)
@@ -85,13 +85,13 @@ impl<T: frame_system::Config> pallet_proxy::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `405 + a * (56 ±0) + p * (25 ±0)`
 		//  Estimated: `5302`
-		// Minimum execution time: 30_000_000 picoseconds.
-		Weight::from_parts(35_457_813, 0)
+		// Minimum execution time: 29_000_000 picoseconds.
+		Weight::from_parts(29_778_618, 0)
 			.saturating_add(Weight::from_parts(0, 5302))
-			// Standard Error: 8_273
-			.saturating_add(Weight::from_parts(162_133, 0).saturating_mul(a.into()))
-			// Standard Error: 8_548
-			.saturating_add(Weight::from_parts(30_803, 0).saturating_mul(p.into()))
+			// Standard Error: 2_462
+			.saturating_add(Weight::from_parts(121_996, 0).saturating_mul(a.into()))
+			// Standard Error: 2_544
+			.saturating_add(Weight::from_parts(13_681, 0).saturating_mul(p.into()))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
@@ -101,17 +101,15 @@ impl<T: frame_system::Config> pallet_proxy::WeightInfo for WeightInfo<T> {
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(116), added: 2591, mode: `MaxEncodedLen`)
 	/// The range of component `a` is `[0, 31]`.
 	/// The range of component `p` is `[1, 31]`.
-	fn remove_announcement(a: u32, p: u32, ) -> Weight {
+	fn remove_announcement(a: u32, _p: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `329 + a * (56 ±0)`
 		//  Estimated: `5302`
 		// Minimum execution time: 18_000_000 picoseconds.
-		Weight::from_parts(21_662_175, 0)
+		Weight::from_parts(19_593_958, 0)
 			.saturating_add(Weight::from_parts(0, 5302))
-			// Standard Error: 6_591
-			.saturating_add(Weight::from_parts(143_989, 0).saturating_mul(a.into()))
-			// Standard Error: 6_810
-			.saturating_add(Weight::from_parts(5_916, 0).saturating_mul(p.into()))
+			// Standard Error: 1_731
+			.saturating_add(Weight::from_parts(93_827, 0).saturating_mul(a.into()))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
@@ -121,17 +119,15 @@ impl<T: frame_system::Config> pallet_proxy::WeightInfo for WeightInfo<T> {
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(116), added: 2591, mode: `MaxEncodedLen`)
 	/// The range of component `a` is `[0, 31]`.
 	/// The range of component `p` is `[1, 31]`.
-	fn reject_announcement(a: u32, p: u32, ) -> Weight {
+	fn reject_announcement(a: u32, _p: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `329 + a * (56 ±0)`
 		//  Estimated: `5302`
-		// Minimum execution time: 19_000_000 picoseconds.
-		Weight::from_parts(21_983_825, 0)
+		// Minimum execution time: 18_000_000 picoseconds.
+		Weight::from_parts(19_112_704, 0)
 			.saturating_add(Weight::from_parts(0, 5302))
-			// Standard Error: 6_235
-			.saturating_add(Weight::from_parts(136_719, 0).saturating_mul(a.into()))
-			// Standard Error: 6_442
-			.saturating_add(Weight::from_parts(441, 0).saturating_mul(p.into()))
+			// Standard Error: 1_910
+			.saturating_add(Weight::from_parts(108_487, 0).saturating_mul(a.into()))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
@@ -148,12 +144,12 @@ impl<T: frame_system::Config> pallet_proxy::WeightInfo for WeightInfo<T> {
 		//  Measured:  `345 + a * (56 ±0) + p * (25 ±0)`
 		//  Estimated: `5302`
 		// Minimum execution time: 25_000_000 picoseconds.
-		Weight::from_parts(30_211_721, 0)
+		Weight::from_parts(24_595_286, 0)
 			.saturating_add(Weight::from_parts(0, 5302))
-			// Standard Error: 7_329
-			.saturating_add(Weight::from_parts(136_328, 0).saturating_mul(a.into()))
-			// Standard Error: 7_572
-			.saturating_add(Weight::from_parts(6_851, 0).saturating_mul(p.into()))
+			// Standard Error: 2_019
+			.saturating_add(Weight::from_parts(126_646, 0).saturating_mul(a.into()))
+			// Standard Error: 2_086
+			.saturating_add(Weight::from_parts(24_659, 0).saturating_mul(p.into()))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
@@ -164,11 +160,11 @@ impl<T: frame_system::Config> pallet_proxy::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `149 + p * (25 ±0)`
 		//  Estimated: `4310`
-		// Minimum execution time: 20_000_000 picoseconds.
-		Weight::from_parts(23_147_168, 0)
+		// Minimum execution time: 19_000_000 picoseconds.
+		Weight::from_parts(20_200_551, 0)
 			.saturating_add(Weight::from_parts(0, 4310))
-			// Standard Error: 8_441
-			.saturating_add(Weight::from_parts(52_501, 0).saturating_mul(p.into()))
+			// Standard Error: 2_421
+			.saturating_add(Weight::from_parts(14_139, 0).saturating_mul(p.into()))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -180,10 +176,10 @@ impl<T: frame_system::Config> pallet_proxy::WeightInfo for WeightInfo<T> {
 		//  Measured:  `149 + p * (25 ±0)`
 		//  Estimated: `4310`
 		// Minimum execution time: 19_000_000 picoseconds.
-		Weight::from_parts(23_281_603, 0)
+		Weight::from_parts(20_074_833, 0)
 			.saturating_add(Weight::from_parts(0, 4310))
-			// Standard Error: 8_765
-			.saturating_add(Weight::from_parts(58_401, 0).saturating_mul(p.into()))
+			// Standard Error: 2_738
+			.saturating_add(Weight::from_parts(17_987, 0).saturating_mul(p.into()))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -194,11 +190,11 @@ impl<T: frame_system::Config> pallet_proxy::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `149 + p * (25 ±0)`
 		//  Estimated: `4310`
-		// Minimum execution time: 17_000_000 picoseconds.
-		Weight::from_parts(20_828_579, 0)
+		// Minimum execution time: 18_000_000 picoseconds.
+		Weight::from_parts(19_694_090, 0)
 			.saturating_add(Weight::from_parts(0, 4310))
-			// Standard Error: 6_996
-			.saturating_add(Weight::from_parts(46_483, 0).saturating_mul(p.into()))
+			// Standard Error: 3_886
+			.saturating_add(Weight::from_parts(38_911, 0).saturating_mul(p.into()))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -209,8 +205,8 @@ impl<T: frame_system::Config> pallet_proxy::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `161`
 		//  Estimated: `4310`
-		// Minimum execution time: 21_000_000 picoseconds.
-		Weight::from_parts(25_489_068, 0)
+		// Minimum execution time: 19_000_000 picoseconds.
+		Weight::from_parts(21_849_560, 0)
 			.saturating_add(Weight::from_parts(0, 4310))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -222,11 +218,11 @@ impl<T: frame_system::Config> pallet_proxy::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `174 + p * (25 ±0)`
 		//  Estimated: `4310`
-		// Minimum execution time: 18_000_000 picoseconds.
-		Weight::from_parts(21_184_967, 0)
+		// Minimum execution time: 19_000_000 picoseconds.
+		Weight::from_parts(19_947_736, 0)
 			.saturating_add(Weight::from_parts(0, 4310))
-			// Standard Error: 7_334
-			.saturating_add(Weight::from_parts(80_511, 0).saturating_mul(p.into()))
+			// Standard Error: 1_368
+			.saturating_add(Weight::from_parts(5_527, 0).saturating_mul(p.into()))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
diff --git a/runtime/crab/src/weights/pallet_referenda.rs b/runtime/crab/src/weights/pallet_referenda.rs
index 88d7fde7d..fbf1154d0 100644
--- a/runtime/crab/src/weights/pallet_referenda.rs
+++ b/runtime/crab/src/weights/pallet_referenda.rs
@@ -18,8 +18,8 @@
 
 //! Autogenerated weights for `pallet_referenda`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-04-17, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-06-27, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `Some("crab-dev")`, DB CACHE: 1024
 
@@ -65,8 +65,8 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `275`
 		//  Estimated: `42428`
-		// Minimum execution time: 30_000_000 picoseconds.
-		Weight::from_parts(31_000_000, 0)
+		// Minimum execution time: 29_000_000 picoseconds.
+		Weight::from_parts(29_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 42428))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(3))
@@ -79,8 +79,8 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `516`
 		//  Estimated: `83866`
-		// Minimum execution time: 39_000_000 picoseconds.
-		Weight::from_parts(46_000_000, 0)
+		// Minimum execution time: 37_000_000 picoseconds.
+		Weight::from_parts(37_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 83866))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(3))
@@ -95,10 +95,10 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(38963), added: 41438, mode: `MaxEncodedLen`)
 	fn place_decision_deposit_queued() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3309`
+		//  Measured:  `3276`
 		//  Estimated: `42428`
-		// Minimum execution time: 46_000_000 picoseconds.
-		Weight::from_parts(54_000_000, 0)
+		// Minimum execution time: 40_000_000 picoseconds.
+		Weight::from_parts(41_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 42428))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(3))
@@ -113,10 +113,10 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(38963), added: 41438, mode: `MaxEncodedLen`)
 	fn place_decision_deposit_not_queued() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3329`
+		//  Measured:  `3296`
 		//  Estimated: `42428`
-		// Minimum execution time: 52_000_000 picoseconds.
-		Weight::from_parts(58_000_000, 0)
+		// Minimum execution time: 40_000_000 picoseconds.
+		Weight::from_parts(41_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 42428))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(3))
@@ -131,8 +131,8 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `516`
 		//  Estimated: `83866`
-		// Minimum execution time: 52_000_000 picoseconds.
-		Weight::from_parts(59_000_000, 0)
+		// Minimum execution time: 43_000_000 picoseconds.
+		Weight::from_parts(45_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 83866))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(4))
@@ -147,8 +147,8 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `516`
 		//  Estimated: `83866`
-		// Minimum execution time: 46_000_000 picoseconds.
-		Weight::from_parts(56_000_000, 0)
+		// Minimum execution time: 42_000_000 picoseconds.
+		Weight::from_parts(43_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 83866))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(4))
@@ -159,8 +159,8 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `425`
 		//  Estimated: `4377`
-		// Minimum execution time: 26_000_000 picoseconds.
-		Weight::from_parts(29_000_000, 0)
+		// Minimum execution time: 24_000_000 picoseconds.
+		Weight::from_parts(25_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 4377))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -171,8 +171,8 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `384`
 		//  Estimated: `4377`
-		// Minimum execution time: 25_000_000 picoseconds.
-		Weight::from_parts(30_000_000, 0)
+		// Minimum execution time: 24_000_000 picoseconds.
+		Weight::from_parts(25_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 4377))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -185,8 +185,8 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `390`
 		//  Estimated: `83866`
-		// Minimum execution time: 29_000_000 picoseconds.
-		Weight::from_parts(34_000_000, 0)
+		// Minimum execution time: 24_000_000 picoseconds.
+		Weight::from_parts(25_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 83866))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(3))
@@ -203,8 +203,8 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `846`
 		//  Estimated: `83866`
-		// Minimum execution time: 89_000_000 picoseconds.
-		Weight::from_parts(90_000_000, 0)
+		// Minimum execution time: 80_000_000 picoseconds.
+		Weight::from_parts(81_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 83866))
 			.saturating_add(T::DbWeight::get().reads(5))
 			.saturating_add(T::DbWeight::get().writes(4))
@@ -218,7 +218,7 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 		//  Measured:  `207`
 		//  Estimated: `5477`
 		// Minimum execution time: 7_000_000 picoseconds.
-		Weight::from_parts(10_000_000, 0)
+		Weight::from_parts(8_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 5477))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -231,10 +231,10 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(38963), added: 41438, mode: `MaxEncodedLen`)
 	fn one_fewer_deciding_failing() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3209`
+		//  Measured:  `3162`
 		//  Estimated: `42428`
-		// Minimum execution time: 33_000_000 picoseconds.
-		Weight::from_parts(39_000_000, 0)
+		// Minimum execution time: 25_000_000 picoseconds.
+		Weight::from_parts(26_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 42428))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(3))
@@ -247,10 +247,10 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(38963), added: 41438, mode: `MaxEncodedLen`)
 	fn one_fewer_deciding_passing() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3195`
+		//  Measured:  `3162`
 		//  Estimated: `42428`
-		// Minimum execution time: 36_000_000 picoseconds.
-		Weight::from_parts(41_000_000, 0)
+		// Minimum execution time: 26_000_000 picoseconds.
+		Weight::from_parts(27_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 42428))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(3))
@@ -263,8 +263,8 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `3020`
 		//  Estimated: `5477`
-		// Minimum execution time: 15_000_000 picoseconds.
-		Weight::from_parts(18_000_000, 0)
+		// Minimum execution time: 12_000_000 picoseconds.
+		Weight::from_parts(13_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 5477))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -277,8 +277,8 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `3020`
 		//  Estimated: `5477`
-		// Minimum execution time: 13_000_000 picoseconds.
-		Weight::from_parts(18_000_000, 0)
+		// Minimum execution time: 12_000_000 picoseconds.
+		Weight::from_parts(13_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 5477))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -293,8 +293,8 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `3024`
 		//  Estimated: `5477`
-		// Minimum execution time: 16_000_000 picoseconds.
-		Weight::from_parts(20_000_000, 0)
+		// Minimum execution time: 15_000_000 picoseconds.
+		Weight::from_parts(16_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 5477))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -309,8 +309,8 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `3044`
 		//  Estimated: `5477`
-		// Minimum execution time: 17_000_000 picoseconds.
-		Weight::from_parts(21_000_000, 0)
+		// Minimum execution time: 15_000_000 picoseconds.
+		Weight::from_parts(16_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 5477))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -323,8 +323,8 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `354`
 		//  Estimated: `42428`
-		// Minimum execution time: 19_000_000 picoseconds.
-		Weight::from_parts(22_000_000, 0)
+		// Minimum execution time: 16_000_000 picoseconds.
+		Weight::from_parts(17_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 42428))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -337,8 +337,8 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `390`
 		//  Estimated: `42428`
-		// Minimum execution time: 19_000_000 picoseconds.
-		Weight::from_parts(22_000_000, 0)
+		// Minimum execution time: 16_000_000 picoseconds.
+		Weight::from_parts(17_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 42428))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -349,8 +349,8 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `299`
 		//  Estimated: `4377`
-		// Minimum execution time: 13_000_000 picoseconds.
-		Weight::from_parts(15_000_000, 0)
+		// Minimum execution time: 11_000_000 picoseconds.
+		Weight::from_parts(12_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 4377))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -365,8 +365,8 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `390`
 		//  Estimated: `42428`
-		// Minimum execution time: 24_000_000 picoseconds.
-		Weight::from_parts(27_000_000, 0)
+		// Minimum execution time: 21_000_000 picoseconds.
+		Weight::from_parts(22_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 42428))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(3))
@@ -381,8 +381,8 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `390`
 		//  Estimated: `42428`
-		// Minimum execution time: 28_000_000 picoseconds.
-		Weight::from_parts(35_000_000, 0)
+		// Minimum execution time: 23_000_000 picoseconds.
+		Weight::from_parts(24_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 42428))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(3))
@@ -395,8 +395,8 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `443`
 		//  Estimated: `42428`
-		// Minimum execution time: 22_000_000 picoseconds.
-		Weight::from_parts(27_000_000, 0)
+		// Minimum execution time: 18_000_000 picoseconds.
+		Weight::from_parts(19_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 42428))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -409,8 +409,8 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `426`
 		//  Estimated: `42428`
-		// Minimum execution time: 22_000_000 picoseconds.
-		Weight::from_parts(25_000_000, 0)
+		// Minimum execution time: 18_000_000 picoseconds.
+		Weight::from_parts(19_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 42428))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -423,8 +423,8 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `443`
 		//  Estimated: `42428`
-		// Minimum execution time: 19_000_000 picoseconds.
-		Weight::from_parts(22_000_000, 0)
+		// Minimum execution time: 17_000_000 picoseconds.
+		Weight::from_parts(18_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 42428))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -437,8 +437,8 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `447`
 		//  Estimated: `42428`
-		// Minimum execution time: 19_000_000 picoseconds.
-		Weight::from_parts(22_000_000, 0)
+		// Minimum execution time: 16_000_000 picoseconds.
+		Weight::from_parts(17_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 42428))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -453,8 +453,8 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `447`
 		//  Estimated: `83866`
-		// Minimum execution time: 32_000_000 picoseconds.
-		Weight::from_parts(38_000_000, 0)
+		// Minimum execution time: 27_000_000 picoseconds.
+		Weight::from_parts(27_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 83866))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(4))
@@ -467,8 +467,8 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `443`
 		//  Estimated: `42428`
-		// Minimum execution time: 22_000_000 picoseconds.
-		Weight::from_parts(26_000_000, 0)
+		// Minimum execution time: 19_000_000 picoseconds.
+		Weight::from_parts(19_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 42428))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -477,16 +477,18 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 	/// Proof: `Referenda::ReferendumInfoFor` (`max_values`: None, `max_size`: Some(912), added: 3387, mode: `MaxEncodedLen`)
 	/// Storage: `Preimage::StatusFor` (r:1 w:0)
 	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:0)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
 	/// Storage: `Referenda::MetadataOf` (r:0 w:1)
 	/// Proof: `Referenda::MetadataOf` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
 	fn set_some_metadata() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `443`
 		//  Estimated: `4377`
-		// Minimum execution time: 16_000_000 picoseconds.
-		Weight::from_parts(18_000_000, 0)
+		// Minimum execution time: 15_000_000 picoseconds.
+		Weight::from_parts(15_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 4377))
-			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
 	/// Storage: `Referenda::ReferendumInfoFor` (r:1 w:0)
@@ -497,8 +499,8 @@ impl<T: frame_system::Config> pallet_referenda::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `376`
 		//  Estimated: `4377`
-		// Minimum execution time: 13_000_000 picoseconds.
-		Weight::from_parts(16_000_000, 0)
+		// Minimum execution time: 12_000_000 picoseconds.
+		Weight::from_parts(13_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 4377))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
diff --git a/runtime/crab/src/weights/pallet_scheduler.rs b/runtime/crab/src/weights/pallet_scheduler.rs
index 2471145ac..b5a94f598 100644
--- a/runtime/crab/src/weights/pallet_scheduler.rs
+++ b/runtime/crab/src/weights/pallet_scheduler.rs
@@ -18,8 +18,8 @@
 
 //! Autogenerated weights for `pallet_scheduler`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-04-17, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-06-27, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `Some("crab-dev")`, DB CACHE: 1024
 
@@ -61,8 +61,8 @@ impl<T: frame_system::Config> pallet_scheduler::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `31`
 		//  Estimated: `1489`
-		// Minimum execution time: 3_000_000 picoseconds.
-		Weight::from_parts(4_000_000, 0)
+		// Minimum execution time: 2_000_000 picoseconds.
+		Weight::from_parts(3_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 1489))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -75,10 +75,10 @@ impl<T: frame_system::Config> pallet_scheduler::WeightInfo for WeightInfo<T> {
 		//  Measured:  `78 + s * (177 ±0)`
 		//  Estimated: `42428`
 		// Minimum execution time: 2_000_000 picoseconds.
-		Weight::from_parts(5_515_858, 0)
+		Weight::from_parts(5_467_868, 0)
 			.saturating_add(Weight::from_parts(0, 42428))
-			// Standard Error: 4_611
-			.saturating_add(Weight::from_parts(773_088, 0).saturating_mul(s.into()))
+			// Standard Error: 1_549
+			.saturating_add(Weight::from_parts(358_732, 0).saturating_mul(s.into()))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -86,25 +86,27 @@ impl<T: frame_system::Config> pallet_scheduler::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 4_000_000 picoseconds.
-		Weight::from_parts(5_000_000, 0)
+		// Minimum execution time: 2_000_000 picoseconds.
+		Weight::from_parts(3_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 	}
 	/// Storage: `Preimage::PreimageFor` (r:1 w:1)
 	/// Proof: `Preimage::PreimageFor` (`max_values`: None, `max_size`: Some(4194344), added: 4196819, mode: `Measured`)
-	/// Storage: `Preimage::StatusFor` (r:1 w:1)
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
 	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
 	/// The range of component `s` is `[128, 4194304]`.
 	fn service_task_fetched(s: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `179 + s * (1 ±0)`
 		//  Estimated: `3644 + s * (1 ±0)`
-		// Minimum execution time: 16_000_000 picoseconds.
-		Weight::from_parts(16_000_000, 0)
+		// Minimum execution time: 15_000_000 picoseconds.
+		Weight::from_parts(15_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3644))
-			// Standard Error: 3
-			.saturating_add(Weight::from_parts(640, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
+			// Standard Error: 1
+			.saturating_add(Weight::from_parts(423, 0).saturating_mul(s.into()))
+			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(2))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(s.into()))
 	}
@@ -114,8 +116,8 @@ impl<T: frame_system::Config> pallet_scheduler::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 5_000_000 picoseconds.
-		Weight::from_parts(6_000_000, 0)
+		// Minimum execution time: 3_000_000 picoseconds.
+		Weight::from_parts(4_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -123,8 +125,8 @@ impl<T: frame_system::Config> pallet_scheduler::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 4_000_000 picoseconds.
-		Weight::from_parts(5_000_000, 0)
+		// Minimum execution time: 2_000_000 picoseconds.
+		Weight::from_parts(3_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 	}
 	/// Storage: `TxPause::PausedCalls` (r:1 w:0)
@@ -142,7 +144,7 @@ impl<T: frame_system::Config> pallet_scheduler::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_000_000 picoseconds.
+		// Minimum execution time: 1_000_000 picoseconds.
 		Weight::from_parts(2_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 	}
@@ -153,11 +155,11 @@ impl<T: frame_system::Config> pallet_scheduler::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `78 + s * (177 ±0)`
 		//  Estimated: `42428`
-		// Minimum execution time: 9_000_000 picoseconds.
-		Weight::from_parts(12_672_941, 0)
+		// Minimum execution time: 8_000_000 picoseconds.
+		Weight::from_parts(10_470_823, 0)
 			.saturating_add(Weight::from_parts(0, 42428))
-			// Standard Error: 6_747
-			.saturating_add(Weight::from_parts(782_492, 0).saturating_mul(s.into()))
+			// Standard Error: 1_522
+			.saturating_add(Weight::from_parts(349_517, 0).saturating_mul(s.into()))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -170,11 +172,11 @@ impl<T: frame_system::Config> pallet_scheduler::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `78 + s * (177 ±0)`
 		//  Estimated: `42428`
-		// Minimum execution time: 13_000_000 picoseconds.
-		Weight::from_parts(12_279_265, 0)
+		// Minimum execution time: 12_000_000 picoseconds.
+		Weight::from_parts(11_154_775, 0)
 			.saturating_add(Weight::from_parts(0, 42428))
-			// Standard Error: 9_283
-			.saturating_add(Weight::from_parts(1_416_264, 0).saturating_mul(s.into()))
+			// Standard Error: 1_155
+			.saturating_add(Weight::from_parts(570_400, 0).saturating_mul(s.into()))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
@@ -187,11 +189,11 @@ impl<T: frame_system::Config> pallet_scheduler::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `255 + s * (185 ±0)`
 		//  Estimated: `42428`
-		// Minimum execution time: 12_000_000 picoseconds.
-		Weight::from_parts(16_405_411, 0)
+		// Minimum execution time: 10_000_000 picoseconds.
+		Weight::from_parts(13_980_235, 0)
 			.saturating_add(Weight::from_parts(0, 42428))
-			// Standard Error: 6_979
-			.saturating_add(Weight::from_parts(790_717, 0).saturating_mul(s.into()))
+			// Standard Error: 1_964
+			.saturating_add(Weight::from_parts(358_521, 0).saturating_mul(s.into()))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
@@ -205,10 +207,10 @@ impl<T: frame_system::Config> pallet_scheduler::WeightInfo for WeightInfo<T> {
 		//  Measured:  `281 + s * (185 ±0)`
 		//  Estimated: `42428`
 		// Minimum execution time: 14_000_000 picoseconds.
-		Weight::from_parts(15_445_551, 0)
+		Weight::from_parts(13_459_673, 0)
 			.saturating_add(Weight::from_parts(0, 42428))
-			// Standard Error: 8_180
-			.saturating_add(Weight::from_parts(1_435_860, 0).saturating_mul(s.into()))
+			// Standard Error: 2_778
+			.saturating_add(Weight::from_parts(588_797, 0).saturating_mul(s.into()))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
diff --git a/runtime/crab/src/weights/pallet_session.rs b/runtime/crab/src/weights/pallet_session.rs
index 675fd41b1..aef597f56 100644
--- a/runtime/crab/src/weights/pallet_session.rs
+++ b/runtime/crab/src/weights/pallet_session.rs
@@ -18,8 +18,8 @@
 
 //! Autogenerated weights for `pallet_session`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-04-17, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-06-27, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `Some("crab-dev")`, DB CACHE: 1024
 
@@ -63,8 +63,8 @@ impl<T: frame_system::Config> pallet_session::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `246`
 		//  Estimated: `3711`
-		// Minimum execution time: 15_000_000 picoseconds.
-		Weight::from_parts(18_000_000, 0)
+		// Minimum execution time: 14_000_000 picoseconds.
+		Weight::from_parts(14_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3711))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -77,8 +77,8 @@ impl<T: frame_system::Config> pallet_session::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `228`
 		//  Estimated: `3693`
-		// Minimum execution time: 8_000_000 picoseconds.
-		Weight::from_parts(9_000_000, 0)
+		// Minimum execution time: 10_000_000 picoseconds.
+		Weight::from_parts(10_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3693))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(2))
diff --git a/runtime/crab/src/weights/pallet_timestamp.rs b/runtime/crab/src/weights/pallet_timestamp.rs
index 662a9c2dc..169352220 100644
--- a/runtime/crab/src/weights/pallet_timestamp.rs
+++ b/runtime/crab/src/weights/pallet_timestamp.rs
@@ -18,8 +18,8 @@
 
 //! Autogenerated weights for `pallet_timestamp`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-04-17, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-06-27, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `Some("crab-dev")`, DB CACHE: 1024
 
@@ -61,8 +61,8 @@ impl<T: frame_system::Config> pallet_timestamp::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `6`
 		//  Estimated: `1493`
-		// Minimum execution time: 4_000_000 picoseconds.
-		Weight::from_parts(6_000_000, 0)
+		// Minimum execution time: 3_000_000 picoseconds.
+		Weight::from_parts(4_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 1493))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -71,8 +71,8 @@ impl<T: frame_system::Config> pallet_timestamp::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `57`
 		//  Estimated: `0`
-		// Minimum execution time: 3_000_000 picoseconds.
-		Weight::from_parts(4_000_000, 0)
+		// Minimum execution time: 2_000_000 picoseconds.
+		Weight::from_parts(3_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 	}
 }
diff --git a/runtime/crab/src/weights/pallet_treasury.rs b/runtime/crab/src/weights/pallet_treasury.rs
index 2f8ad27a8..62c4e44b3 100644
--- a/runtime/crab/src/weights/pallet_treasury.rs
+++ b/runtime/crab/src/weights/pallet_treasury.rs
@@ -18,8 +18,8 @@
 
 //! Autogenerated weights for `pallet_treasury`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-04-17, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-06-27, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `Some("crab-dev")`, DB CACHE: 1024
 
@@ -61,12 +61,12 @@ impl<T: frame_system::Config> pallet_treasury::WeightInfo for WeightInfo<T> {
 	/// Proof: `Treasury::Approvals` (`max_values`: Some(1), `max_size`: Some(402), added: 897, mode: `MaxEncodedLen`)
 	/// Storage: `Treasury::Proposals` (r:0 w:1)
 	/// Proof: `Treasury::Proposals` (`max_values`: None, `max_size`: Some(84), added: 2559, mode: `MaxEncodedLen`)
-	fn spend() -> Weight {
+	fn spend_local() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `42`
 		//  Estimated: `1887`
-		// Minimum execution time: 11_000_000 picoseconds.
-		Weight::from_parts(12_000_000, 0)
+		// Minimum execution time: 9_000_000 picoseconds.
+		Weight::from_parts(10_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 1887))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(3))
@@ -79,8 +79,8 @@ impl<T: frame_system::Config> pallet_treasury::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `208`
 		//  Estimated: `1489`
-		// Minimum execution time: 23_000_000 picoseconds.
-		Weight::from_parts(27_000_000, 0)
+		// Minimum execution time: 22_000_000 picoseconds.
+		Weight::from_parts(23_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 1489))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(2))
@@ -93,8 +93,8 @@ impl<T: frame_system::Config> pallet_treasury::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `470`
 		//  Estimated: `6172`
-		// Minimum execution time: 37_000_000 picoseconds.
-		Weight::from_parts(46_000_000, 0)
+		// Minimum execution time: 36_000_000 picoseconds.
+		Weight::from_parts(37_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 6172))
 			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(3))
@@ -109,10 +109,10 @@ impl<T: frame_system::Config> pallet_treasury::WeightInfo for WeightInfo<T> {
 		//  Measured:  `470 + p * (8 ±0)`
 		//  Estimated: `3549`
 		// Minimum execution time: 7_000_000 picoseconds.
-		Weight::from_parts(10_400_293, 0)
+		Weight::from_parts(8_639_558, 0)
 			.saturating_add(Weight::from_parts(0, 3549))
-			// Standard Error: 1_929
-			.saturating_add(Weight::from_parts(30_144, 0).saturating_mul(p.into()))
+			// Standard Error: 707
+			.saturating_add(Weight::from_parts(18_205, 0).saturating_mul(p.into()))
 			.saturating_add(T::DbWeight::get().reads(2))
 			.saturating_add(T::DbWeight::get().writes(1))
 	}
@@ -122,8 +122,8 @@ impl<T: frame_system::Config> pallet_treasury::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `127`
 		//  Estimated: `1887`
-		// Minimum execution time: 6_000_000 picoseconds.
-		Weight::from_parts(7_000_000, 0)
+		// Minimum execution time: 5_000_000 picoseconds.
+		Weight::from_parts(6_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 1887))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -136,21 +136,73 @@ impl<T: frame_system::Config> pallet_treasury::WeightInfo for WeightInfo<T> {
 	/// Proof: `Balances::InactiveIssuance` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
 	/// Storage: `Treasury::Approvals` (r:1 w:1)
 	/// Proof: `Treasury::Approvals` (`max_values`: Some(1), `max_size`: Some(402), added: 897, mode: `MaxEncodedLen`)
-	/// Storage: `Treasury::Proposals` (r:100 w:0)
+	/// Storage: `Treasury::Proposals` (r:99 w:0)
 	/// Proof: `Treasury::Proposals` (`max_values`: None, `max_size`: Some(84), added: 2559, mode: `MaxEncodedLen`)
-	/// The range of component `p` is `[0, 100]`.
+	/// The range of component `p` is `[0, 99]`.
 	fn on_initialize_proposals(p: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `218 + p * (97 ±0)`
+		//  Measured:  `219 + p * (97 ±0)`
 		//  Estimated: `3581 + p * (2559 ±0)`
-		// Minimum execution time: 24_000_000 picoseconds.
-		Weight::from_parts(23_099_387, 0)
+		// Minimum execution time: 18_000_000 picoseconds.
+		Weight::from_parts(149_309_488, 0)
 			.saturating_add(Weight::from_parts(0, 3581))
-			// Standard Error: 18_489
-			.saturating_add(Weight::from_parts(2_664_309, 0).saturating_mul(p.into()))
+			// Standard Error: 228_094
+			.saturating_add(Weight::from_parts(2_150_806, 0).saturating_mul(p.into()))
 			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(p.into())))
 			.saturating_add(T::DbWeight::get().writes(3))
 			.saturating_add(Weight::from_parts(0, 2559).saturating_mul(p.into()))
 	}
+	/// Storage: `Treasury::SpendCount` (r:1 w:1)
+	/// Proof: `Treasury::SpendCount` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Treasury::Spends` (r:0 w:1)
+	/// Proof: `Treasury::Spends` (`max_values`: None, `max_size`: Some(57), added: 2532, mode: `MaxEncodedLen`)
+	fn spend() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `42`
+		//  Estimated: `1489`
+		// Minimum execution time: 8_000_000 picoseconds.
+		Weight::from_parts(9_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 1489))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(2))
+	}
+	/// Storage: `Treasury::Spends` (r:1 w:1)
+	/// Proof: `Treasury::Spends` (`max_values`: None, `max_size`: Some(57), added: 2532, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:2 w:2)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(116), added: 2591, mode: `MaxEncodedLen`)
+	fn payout() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `315`
+		//  Estimated: `6172`
+		// Minimum execution time: 47_000_000 picoseconds.
+		Weight::from_parts(48_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 6172))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(3))
+	}
+	/// Storage: `Treasury::Spends` (r:1 w:1)
+	/// Proof: `Treasury::Spends` (`max_values`: None, `max_size`: Some(57), added: 2532, mode: `MaxEncodedLen`)
+	fn check_status() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `148`
+		//  Estimated: `3522`
+		// Minimum execution time: 10_000_000 picoseconds.
+		Weight::from_parts(10_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 3522))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
+	/// Storage: `Treasury::Spends` (r:1 w:1)
+	/// Proof: `Treasury::Spends` (`max_values`: None, `max_size`: Some(57), added: 2532, mode: `MaxEncodedLen`)
+	fn void_spend() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `148`
+		//  Estimated: `3522`
+		// Minimum execution time: 9_000_000 picoseconds.
+		Weight::from_parts(10_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 3522))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(1))
+	}
 }
diff --git a/runtime/crab/src/weights/pallet_tx_pause.rs b/runtime/crab/src/weights/pallet_tx_pause.rs
index 87e1fe17a..e0fe27272 100644
--- a/runtime/crab/src/weights/pallet_tx_pause.rs
+++ b/runtime/crab/src/weights/pallet_tx_pause.rs
@@ -18,8 +18,8 @@
 
 //! Autogenerated weights for `pallet_tx_pause`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-04-17, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-06-27, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `Some("crab-dev")`, DB CACHE: 1024
 
@@ -61,8 +61,8 @@ impl<T: frame_system::Config> pallet_tx_pause::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `4`
 		//  Estimated: `3997`
-		// Minimum execution time: 11_000_000 picoseconds.
-		Weight::from_parts(13_000_000, 0)
+		// Minimum execution time: 8_000_000 picoseconds.
+		Weight::from_parts(9_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3997))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
@@ -73,8 +73,8 @@ impl<T: frame_system::Config> pallet_tx_pause::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `566`
 		//  Estimated: `3997`
-		// Minimum execution time: 14_000_000 picoseconds.
-		Weight::from_parts(18_000_000, 0)
+		// Minimum execution time: 13_000_000 picoseconds.
+		Weight::from_parts(13_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3997))
 			.saturating_add(T::DbWeight::get().reads(1))
 			.saturating_add(T::DbWeight::get().writes(1))
diff --git a/runtime/crab/src/weights/pallet_utility.rs b/runtime/crab/src/weights/pallet_utility.rs
index fdafb6111..f7f48c85e 100644
--- a/runtime/crab/src/weights/pallet_utility.rs
+++ b/runtime/crab/src/weights/pallet_utility.rs
@@ -18,8 +18,8 @@
 
 //! Autogenerated weights for `pallet_utility`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-04-17, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-06-27, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `Some("crab-dev")`, DB CACHE: 1024
 
@@ -62,11 +62,11 @@ impl<T: frame_system::Config> pallet_utility::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `4`
 		//  Estimated: `3997`
-		// Minimum execution time: 5_000_000 picoseconds.
-		Weight::from_parts(18_271_523, 0)
+		// Minimum execution time: 4_000_000 picoseconds.
+		Weight::from_parts(14_705_375, 0)
 			.saturating_add(Weight::from_parts(0, 3997))
-			// Standard Error: 3_571
-			.saturating_add(Weight::from_parts(6_692_085, 0).saturating_mul(c.into()))
+			// Standard Error: 2_279
+			.saturating_add(Weight::from_parts(4_479_733, 0).saturating_mul(c.into()))
 			.saturating_add(T::DbWeight::get().reads(1))
 	}
 	/// Storage: `TxPause::PausedCalls` (r:1 w:0)
@@ -87,19 +87,19 @@ impl<T: frame_system::Config> pallet_utility::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `4`
 		//  Estimated: `3997`
-		// Minimum execution time: 5_000_000 picoseconds.
-		Weight::from_parts(16_236_377, 0)
+		// Minimum execution time: 4_000_000 picoseconds.
+		Weight::from_parts(14_269_732, 0)
 			.saturating_add(Weight::from_parts(0, 3997))
-			// Standard Error: 21_681
-			.saturating_add(Weight::from_parts(6_953_450, 0).saturating_mul(c.into()))
+			// Standard Error: 2_782
+			.saturating_add(Weight::from_parts(4_694_927, 0).saturating_mul(c.into()))
 			.saturating_add(T::DbWeight::get().reads(1))
 	}
 	fn dispatch_as() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 7_000_000 picoseconds.
-		Weight::from_parts(9_000_000, 0)
+		// Minimum execution time: 6_000_000 picoseconds.
+		Weight::from_parts(6_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 0))
 	}
 	/// Storage: `TxPause::PausedCalls` (r:1 w:0)
@@ -109,11 +109,11 @@ impl<T: frame_system::Config> pallet_utility::WeightInfo for WeightInfo<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `4`
 		//  Estimated: `3997`
-		// Minimum execution time: 5_000_000 picoseconds.
-		Weight::from_parts(7_163_036, 0)
+		// Minimum execution time: 4_000_000 picoseconds.
+		Weight::from_parts(19_242_416, 0)
 			.saturating_add(Weight::from_parts(0, 3997))
-			// Standard Error: 4_847
-			.saturating_add(Weight::from_parts(6_701_419, 0).saturating_mul(c.into()))
+			// Standard Error: 3_223
+			.saturating_add(Weight::from_parts(4_480_011, 0).saturating_mul(c.into()))
 			.saturating_add(T::DbWeight::get().reads(1))
 	}
 }
diff --git a/runtime/crab/src/weights/pallet_whitelist.rs b/runtime/crab/src/weights/pallet_whitelist.rs
index 980696337..af7e39822 100644
--- a/runtime/crab/src/weights/pallet_whitelist.rs
+++ b/runtime/crab/src/weights/pallet_whitelist.rs
@@ -18,8 +18,8 @@
 
 //! Autogenerated weights for `pallet_whitelist`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-04-17, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-06-27, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `Some("crab-dev")`, DB CACHE: 1024
 
@@ -57,67 +57,75 @@ pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> pallet_whitelist::WeightInfo for WeightInfo<T> {
 	/// Storage: `Whitelist::WhitelistedCall` (r:1 w:1)
 	/// Proof: `Whitelist::WhitelistedCall` (`max_values`: None, `max_size`: Some(40), added: 2515, mode: `MaxEncodedLen`)
-	/// Storage: `Preimage::StatusFor` (r:1 w:1)
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
 	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
 	fn whitelist_call() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `48`
 		//  Estimated: `3544`
-		// Minimum execution time: 15_000_000 picoseconds.
-		Weight::from_parts(18_000_000, 0)
+		// Minimum execution time: 14_000_000 picoseconds.
+		Weight::from_parts(15_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3544))
-			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
 	/// Storage: `Whitelist::WhitelistedCall` (r:1 w:1)
 	/// Proof: `Whitelist::WhitelistedCall` (`max_values`: None, `max_size`: Some(40), added: 2515, mode: `MaxEncodedLen`)
-	/// Storage: `Preimage::StatusFor` (r:1 w:1)
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
 	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
 	fn remove_whitelisted_call() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `176`
 		//  Estimated: `3544`
 		// Minimum execution time: 13_000_000 picoseconds.
-		Weight::from_parts(13_000_000, 0)
+		Weight::from_parts(14_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3544))
-			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
 	/// Storage: `Whitelist::WhitelistedCall` (r:1 w:1)
 	/// Proof: `Whitelist::WhitelistedCall` (`max_values`: None, `max_size`: Some(40), added: 2515, mode: `MaxEncodedLen`)
 	/// Storage: `Preimage::PreimageFor` (r:1 w:1)
 	/// Proof: `Preimage::PreimageFor` (`max_values`: None, `max_size`: Some(4194344), added: 4196819, mode: `Measured`)
-	/// Storage: `Preimage::StatusFor` (r:1 w:1)
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
 	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
 	/// The range of component `n` is `[1, 4194294]`.
 	fn dispatch_whitelisted_call(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `252 + n * (1 ±0)`
 		//  Estimated: `3716 + n * (1 ±0)`
-		// Minimum execution time: 24_000_000 picoseconds.
-		Weight::from_parts(26_000_000, 0)
+		// Minimum execution time: 22_000_000 picoseconds.
+		Weight::from_parts(23_000_000, 0)
 			.saturating_add(Weight::from_parts(0, 3716))
-			// Standard Error: 3
-			.saturating_add(Weight::from_parts(629, 0).saturating_mul(n.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
+			// Standard Error: 0
+			.saturating_add(Weight::from_parts(418, 0).saturating_mul(n.into()))
+			.saturating_add(T::DbWeight::get().reads(4))
 			.saturating_add(T::DbWeight::get().writes(3))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(n.into()))
 	}
 	/// Storage: `Whitelist::WhitelistedCall` (r:1 w:1)
 	/// Proof: `Whitelist::WhitelistedCall` (`max_values`: None, `max_size`: Some(40), added: 2515, mode: `MaxEncodedLen`)
-	/// Storage: `Preimage::StatusFor` (r:1 w:1)
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
 	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(79), added: 2554, mode: `MaxEncodedLen`)
 	/// The range of component `n` is `[1, 10000]`.
 	fn dispatch_whitelisted_call_with_preimage(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `176`
 		//  Estimated: `3544`
-		// Minimum execution time: 16_000_000 picoseconds.
-		Weight::from_parts(19_485_102, 0)
+		// Minimum execution time: 17_000_000 picoseconds.
+		Weight::from_parts(17_227_831, 0)
 			.saturating_add(Weight::from_parts(0, 3544))
-			// Standard Error: 20
-			.saturating_add(Weight::from_parts(1_236, 0).saturating_mul(n.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
+			// Standard Error: 5
+			.saturating_add(Weight::from_parts(976, 0).saturating_mul(n.into()))
+			.saturating_add(T::DbWeight::get().reads(3))
 			.saturating_add(T::DbWeight::get().writes(2))
 	}
 }

From 5b0c4041125381d6c787c9ea9c08379e20454ddf Mon Sep 17 00:00:00 2001
From: Xavier Lau <xavier@inv.cafe>
Date: Thu, 27 Jun 2024 10:35:14 +0800
Subject: [PATCH 51/59] Bench part.3

---
 runtime/crab/src/lib.rs                       |   3 +-
 runtime/crab/src/pallets/account_migration.rs |   3 +-
 runtime/crab/src/pallets/assets.rs            |   3 +-
 runtime/crab/src/pallets/balances.rs          |   3 +-
 runtime/crab/src/pallets/deposit.rs           |   3 +-
 runtime/crab/src/pallets/dmp_queue.rs         |   1 -
 runtime/crab/src/pallets/evm.rs               |   2 +-
 runtime/crab/src/pallets/governance.rs        |  15 +-
 runtime/crab/src/pallets/message_queue.rs     |   3 +-
 runtime/crab/src/pallets/parachain_system.rs  |   2 +-
 runtime/crab/src/pallets/preimage.rs          |   3 +-
 runtime/crab/src/pallets/proxy.rs             |   3 +-
 runtime/crab/src/pallets/scheduler.rs         |   3 +-
 runtime/crab/src/pallets/session.rs           |   3 +-
 runtime/crab/src/pallets/staking.rs           |   3 +-
 runtime/crab/src/pallets/timestamp.rs         |   3 +-
 runtime/crab/src/pallets/tx_pause.rs          |   3 +-
 runtime/crab/src/pallets/utility.rs           |   3 +-
 runtime/crab/src/pallets/xcmp_queue.rs        |   3 +-
 runtime/crab/src/weights.rs                   |   2 +
 runtime/darwinia/src/lib.rs                   |   4 +-
 .../darwinia/src/pallets/account_migration.rs |   3 +-
 runtime/darwinia/src/pallets/asset_manager.rs |   3 +-
 runtime/darwinia/src/pallets/assets.rs        |   3 +-
 runtime/darwinia/src/pallets/balances.rs      |   3 +-
 runtime/darwinia/src/pallets/deposit.rs       |   3 +-
 runtime/darwinia/src/pallets/dmp_queue.rs     |   1 -
 runtime/darwinia/src/pallets/evm.rs           |   2 +-
 runtime/darwinia/src/pallets/governance.rs    |  15 +-
 runtime/darwinia/src/pallets/message_queue.rs |   3 +-
 .../darwinia/src/pallets/parachain_system.rs  |   2 +-
 runtime/darwinia/src/pallets/preimage.rs      |   3 +-
 runtime/darwinia/src/pallets/proxy.rs         |   3 +-
 runtime/darwinia/src/pallets/scheduler.rs     |   3 +-
 runtime/darwinia/src/pallets/session.rs       |   3 +-
 runtime/darwinia/src/pallets/staking.rs       |   3 +-
 runtime/darwinia/src/pallets/timestamp.rs     |   3 +-
 runtime/darwinia/src/pallets/tx_pause.rs      |   3 +-
 runtime/darwinia/src/pallets/utility.rs       |   3 +-
 runtime/darwinia/src/pallets/xcmp_queue.rs    |   3 +-
 runtime/darwinia/src/weights.rs               |   3 +
 .../src/weights/pallet_asset_manager.rs       | 158 ++++++++++++++++++
 runtime/koi/src/lib.rs                        |   4 +-
 runtime/koi/src/pallets/asset_manager.rs      |   3 +-
 runtime/koi/src/pallets/assets.rs             |   3 +-
 runtime/koi/src/pallets/balances.rs           |   3 +-
 runtime/koi/src/pallets/deposit.rs            |   3 +-
 runtime/koi/src/pallets/dmp_queue.rs          |   1 -
 runtime/koi/src/pallets/evm.rs                |   2 +-
 runtime/koi/src/pallets/governance.rs         |  15 +-
 runtime/koi/src/pallets/message_queue.rs      |   3 +-
 runtime/koi/src/pallets/parachain_system.rs   |   2 +-
 runtime/koi/src/pallets/preimage.rs           |   3 +-
 runtime/koi/src/pallets/proxy.rs              |   3 +-
 runtime/koi/src/pallets/scheduler.rs          |   3 +-
 runtime/koi/src/pallets/session.rs            |   3 +-
 runtime/koi/src/pallets/staking.rs            |   3 +-
 runtime/koi/src/pallets/sudo.rs               |   3 +-
 runtime/koi/src/pallets/timestamp.rs          |   3 +-
 runtime/koi/src/pallets/tx_pause.rs           |   3 +-
 runtime/koi/src/pallets/utility.rs            |   3 +-
 runtime/koi/src/pallets/xcmp_queue.rs         |   3 +-
 runtime/koi/src/weights.rs                    |   3 +
 .../koi/src/weights/pallet_asset_manager.rs   | 158 ++++++++++++++++++
 64 files changed, 397 insertions(+), 130 deletions(-)
 create mode 100644 runtime/darwinia/src/weights/pallet_asset_manager.rs
 create mode 100644 runtime/koi/src/weights/pallet_asset_manager.rs

diff --git a/runtime/crab/src/lib.rs b/runtime/crab/src/lib.rs
index 394f6c160..edd010430 100644
--- a/runtime/crab/src/lib.rs
+++ b/runtime/crab/src/lib.rs
@@ -29,7 +29,7 @@ pub use pallets::*;
 
 mod migration;
 
-// pub mod weights;
+mod weights;
 
 pub use darwinia_common_runtime::*;
 pub use dc_primitives::*;
@@ -175,6 +175,7 @@ frame_benchmarking::define_benchmarks! {
 	[pallet_balances, Balances]
 	[pallet_collective, TechnicalCommittee]
 	[pallet_conviction_voting, ConvictionVoting]
+	[pallet_evm, EVM]
 	[pallet_message_queue, MessageQueue]
 	[pallet_preimage, Preimage]
 	[pallet_proxy, Proxy]
diff --git a/runtime/crab/src/pallets/account_migration.rs b/runtime/crab/src/pallets/account_migration.rs
index a0892fd39..a13c1a789 100644
--- a/runtime/crab/src/pallets/account_migration.rs
+++ b/runtime/crab/src/pallets/account_migration.rs
@@ -21,6 +21,5 @@ use crate::*;
 
 impl darwinia_account_migration::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
-	// type WeightInfo = weights::darwinia_account_migration::WeightInfo<Self>;
-	type WeightInfo = ();
+	type WeightInfo = weights::darwinia_account_migration::WeightInfo<Self>;
 }
diff --git a/runtime/crab/src/pallets/assets.rs b/runtime/crab/src/pallets/assets.rs
index 4a69b53be..1db1f823b 100644
--- a/runtime/crab/src/pallets/assets.rs
+++ b/runtime/crab/src/pallets/assets.rs
@@ -52,6 +52,5 @@ impl pallet_assets::Config for Runtime {
 	type RemoveItemsLimit = ConstU32<1_000>;
 	type RuntimeEvent = RuntimeEvent;
 	type StringLimit = ConstU32<50>;
-	// type WeightInfo = weights::pallet_assets::WeightInfo<Self>;
-	type WeightInfo = ();
+	type WeightInfo = weights::pallet_assets::WeightInfo<Self>;
 }
diff --git a/runtime/crab/src/pallets/balances.rs b/runtime/crab/src/pallets/balances.rs
index 91274a7f0..35bfd308e 100644
--- a/runtime/crab/src/pallets/balances.rs
+++ b/runtime/crab/src/pallets/balances.rs
@@ -32,6 +32,5 @@ impl pallet_balances::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type RuntimeFreezeReason = RuntimeFreezeReason;
 	type RuntimeHoldReason = RuntimeHoldReason;
-	// type WeightInfo = weights::pallet_balances::WeightInfo<Self>;
-	type WeightInfo = ();
+	type WeightInfo = weights::pallet_balances::WeightInfo<Self>;
 }
diff --git a/runtime/crab/src/pallets/deposit.rs b/runtime/crab/src/pallets/deposit.rs
index 8aa69a5ee..bdfdbd804 100644
--- a/runtime/crab/src/pallets/deposit.rs
+++ b/runtime/crab/src/pallets/deposit.rs
@@ -49,6 +49,5 @@ impl darwinia_deposit::Config for Runtime {
 	type MinLockingAmount = ConstU128<UNIT>;
 	type Ring = Balances;
 	type RuntimeEvent = RuntimeEvent;
-	// type WeightInfo = weights::darwinia_deposit::WeightInfo<Self>;
-	type WeightInfo = ();
+	type WeightInfo = weights::darwinia_deposit::WeightInfo<Self>;
 }
diff --git a/runtime/crab/src/pallets/dmp_queue.rs b/runtime/crab/src/pallets/dmp_queue.rs
index 0db751ffd..a1464981b 100644
--- a/runtime/crab/src/pallets/dmp_queue.rs
+++ b/runtime/crab/src/pallets/dmp_queue.rs
@@ -23,6 +23,5 @@ impl cumulus_pallet_dmp_queue::Config for Runtime {
 	type DmpSink =
 		frame_support::traits::EnqueueWithOrigin<MessageQueue, pallet_config::RelayOrigin>;
 	type RuntimeEvent = RuntimeEvent;
-	// type WeightInfo = ();
 	type WeightInfo = ();
 }
diff --git a/runtime/crab/src/pallets/evm.rs b/runtime/crab/src/pallets/evm.rs
index 3f4cf8145..c15389f42 100644
--- a/runtime/crab/src/pallets/evm.rs
+++ b/runtime/crab/src/pallets/evm.rs
@@ -200,7 +200,7 @@ impl pallet_evm::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type SuicideQuickClearLimit = ();
 	type Timestamp = Timestamp;
-	// type WeightInfo = ();
+	// TODO: benchmark.
 	type WeightInfo = ();
 	type WeightPerGas = pallet_config::WeightPerGas;
 	type WithdrawOrigin = pallet_evm::EnsureAddressNever<Self::AccountId>;
diff --git a/runtime/crab/src/pallets/governance.rs b/runtime/crab/src/pallets/governance.rs
index 90176da80..50814a563 100644
--- a/runtime/crab/src/pallets/governance.rs
+++ b/runtime/crab/src/pallets/governance.rs
@@ -37,8 +37,7 @@ impl pallet_collective::Config<TechnicalCollective> for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type RuntimeOrigin = RuntimeOrigin;
 	type SetMembersOrigin = RootOr<GeneralAdmin>;
-	// type WeightInfo = weights::pallet_collective::WeightInfo<Self>;
-	type WeightInfo = ();
+	type WeightInfo = weights::pallet_collective::WeightInfo<Self>;
 }
 
 impl pallet_conviction_voting::Config for Runtime {
@@ -48,8 +47,7 @@ impl pallet_conviction_voting::Config for Runtime {
 	type Polls = Referenda;
 	type RuntimeEvent = RuntimeEvent;
 	type VoteLockingPeriod = ConstU32<{ DAYS }>;
-	// type WeightInfo = weights::pallet_conviction_voting::WeightInfo<Self>;
-	type WeightInfo = ();
+	type WeightInfo = weights::pallet_conviction_voting::WeightInfo<Self>;
 }
 
 pallet_referenda::impl_tracksinfo_get!(TracksInfo, Balance, BlockNumber);
@@ -71,8 +69,7 @@ impl pallet_referenda::Config for Runtime {
 	type Tracks = TracksInfo;
 	type UndecidingTimeout = ConstU32<{ 14 * DAYS }>;
 	type Votes = pallet_conviction_voting::VotesOf<Self>;
-	// type WeightInfo = weights::pallet_referenda::WeightInfo<Self>;
-	type WeightInfo = ();
+	type WeightInfo = weights::pallet_referenda::WeightInfo<Self>;
 }
 
 impl custom_origins::Config for Runtime {}
@@ -84,8 +81,7 @@ impl pallet_whitelist::Config for Runtime {
 	type Preimages = Preimage;
 	type RuntimeCall = RuntimeCall;
 	type RuntimeEvent = RuntimeEvent;
-	// type WeightInfo = weights::pallet_whitelist::WeightInfo<Self>;
-	type WeightInfo = ();
+	type WeightInfo = weights::pallet_whitelist::WeightInfo<Self>;
 	type WhitelistOrigin = RootOrAtLeastFourFifth<TechnicalCollective>;
 }
 
@@ -121,6 +117,5 @@ impl pallet_treasury::Config for Runtime {
 		Spender,
 	>;
 	type SpendPeriod = ConstU32<{ 14 * DAYS }>;
-	// type WeightInfo = weights::pallet_treasury::WeightInfo<Self>;
-	type WeightInfo = ();
+	type WeightInfo = weights::pallet_treasury::WeightInfo<Self>;
 }
diff --git a/runtime/crab/src/pallets/message_queue.rs b/runtime/crab/src/pallets/message_queue.rs
index fce765f47..3e4922339 100644
--- a/runtime/crab/src/pallets/message_queue.rs
+++ b/runtime/crab/src/pallets/message_queue.rs
@@ -38,6 +38,5 @@ impl pallet_message_queue::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type ServiceWeight = pallet_config::MessageQueueServiceWeight;
 	type Size = u32;
-	// type WeightInfo = ();
-	type WeightInfo = ();
+	type WeightInfo = weights::pallet_message_queue::WeightInfo<Self>;
 }
diff --git a/runtime/crab/src/pallets/parachain_system.rs b/runtime/crab/src/pallets/parachain_system.rs
index d151115c6..0e8e34912 100644
--- a/runtime/crab/src/pallets/parachain_system.rs
+++ b/runtime/crab/src/pallets/parachain_system.rs
@@ -31,6 +31,6 @@ impl cumulus_pallet_parachain_system::Config for Runtime {
 	type ReservedXcmpWeight = pallet_config::ReservedXcmpWeight;
 	type RuntimeEvent = RuntimeEvent;
 	type SelfParaId = parachain_info::Pallet<Self>;
-	type WeightInfo = ();
+	type WeightInfo = weights::cumulus_pallet_parachain_system::WeightInfo<Self>;
 	type XcmpMessageHandler = XcmpQueue;
 }
diff --git a/runtime/crab/src/pallets/preimage.rs b/runtime/crab/src/pallets/preimage.rs
index 9863af883..e08c6e245 100644
--- a/runtime/crab/src/pallets/preimage.rs
+++ b/runtime/crab/src/pallets/preimage.rs
@@ -39,6 +39,5 @@ impl pallet_preimage::Config for Runtime {
 	type Currency = Balances;
 	type ManagerOrigin = RootOr<GeneralAdmin>;
 	type RuntimeEvent = RuntimeEvent;
-	// type WeightInfo = weights::pallet_preimage::WeightInfo<Self>;
-	type WeightInfo = ();
+	type WeightInfo = weights::pallet_preimage::WeightInfo<Self>;
 }
diff --git a/runtime/crab/src/pallets/proxy.rs b/runtime/crab/src/pallets/proxy.rs
index d062f943a..6f0e7a601 100644
--- a/runtime/crab/src/pallets/proxy.rs
+++ b/runtime/crab/src/pallets/proxy.rs
@@ -118,6 +118,5 @@ impl pallet_proxy::Config for Runtime {
 	type ProxyType = ProxyType;
 	type RuntimeCall = RuntimeCall;
 	type RuntimeEvent = RuntimeEvent;
-	// type WeightInfo = weights::pallet_proxy::WeightInfo<Self>;
-	type WeightInfo = ();
+	type WeightInfo = weights::pallet_proxy::WeightInfo<Self>;
 }
diff --git a/runtime/crab/src/pallets/scheduler.rs b/runtime/crab/src/pallets/scheduler.rs
index 3ac4d4fc7..3f46d2e0a 100644
--- a/runtime/crab/src/pallets/scheduler.rs
+++ b/runtime/crab/src/pallets/scheduler.rs
@@ -58,6 +58,5 @@ impl pallet_scheduler::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type RuntimeOrigin = RuntimeOrigin;
 	type ScheduleOrigin = RootOr<GeneralAdmin>;
-	// type WeightInfo = weights::pallet_scheduler::WeightInfo<Self>;
-	type WeightInfo = ();
+	type WeightInfo = weights::pallet_scheduler::WeightInfo<Self>;
 }
diff --git a/runtime/crab/src/pallets/session.rs b/runtime/crab/src/pallets/session.rs
index 5629b9c1f..c5b764597 100644
--- a/runtime/crab/src/pallets/session.rs
+++ b/runtime/crab/src/pallets/session.rs
@@ -41,6 +41,5 @@ impl pallet_session::Config for Runtime {
 	type ValidatorId = Self::AccountId;
 	// We don't have stash and controller, thus we don't need the convert as well.
 	type ValidatorIdOf = darwinia_staking::IdentityCollator;
-	// type WeightInfo = weights::pallet_session::WeightInfo<Self>;
-	type WeightInfo = ();
+	type WeightInfo = weights::pallet_session::WeightInfo<Self>;
 }
diff --git a/runtime/crab/src/pallets/staking.rs b/runtime/crab/src/pallets/staking.rs
index 659636658..76c51f47f 100644
--- a/runtime/crab/src/pallets/staking.rs
+++ b/runtime/crab/src/pallets/staking.rs
@@ -109,8 +109,7 @@ impl darwinia_staking::Config for Runtime {
 	type Ring = RingStaking;
 	type RuntimeEvent = RuntimeEvent;
 	type ShouldEndSession = ShouldEndSession;
-	// type WeightInfo = weights::darwinia_staking::WeightInfo<Self>;
-	type WeightInfo = ();
+	type WeightInfo = weights::darwinia_staking::WeightInfo<Self>;
 }
 #[cfg(not(feature = "runtime-benchmarks"))]
 impl darwinia_staking::DepositConfig for Runtime {}
diff --git a/runtime/crab/src/pallets/timestamp.rs b/runtime/crab/src/pallets/timestamp.rs
index f6bbcb561..0f10ddb6c 100644
--- a/runtime/crab/src/pallets/timestamp.rs
+++ b/runtime/crab/src/pallets/timestamp.rs
@@ -27,6 +27,5 @@ impl pallet_timestamp::Config for Runtime {
 	type OnTimestampSet = Aura;
 	#[cfg(feature = "runtime-benchmarks")]
 	type OnTimestampSet = ();
-	// type WeightInfo = weights::pallet_timestamp::WeightInfo<Self>;
-	type WeightInfo = ();
+	type WeightInfo = weights::pallet_timestamp::WeightInfo<Self>;
 }
diff --git a/runtime/crab/src/pallets/tx_pause.rs b/runtime/crab/src/pallets/tx_pause.rs
index 357b945b8..3a7c19db4 100644
--- a/runtime/crab/src/pallets/tx_pause.rs
+++ b/runtime/crab/src/pallets/tx_pause.rs
@@ -55,7 +55,6 @@ impl pallet_tx_pause::Config for Runtime {
 	type RuntimeCall = RuntimeCall;
 	type RuntimeEvent = RuntimeEvent;
 	type UnpauseOrigin = RootOrAtLeastTwoThird<TechnicalCollective>;
-	// type WeightInfo = weights::pallet_tx_pause::WeightInfo<Runtime>;
-	type WeightInfo = ();
+	type WeightInfo = weights::pallet_tx_pause::WeightInfo<Runtime>;
 	type WhitelistedCalls = TxPauseWhitelistedCalls;
 }
diff --git a/runtime/crab/src/pallets/utility.rs b/runtime/crab/src/pallets/utility.rs
index bad2dcc75..59c5759a2 100644
--- a/runtime/crab/src/pallets/utility.rs
+++ b/runtime/crab/src/pallets/utility.rs
@@ -23,6 +23,5 @@ impl pallet_utility::Config for Runtime {
 	type PalletsOrigin = OriginCaller;
 	type RuntimeCall = RuntimeCall;
 	type RuntimeEvent = RuntimeEvent;
-	// type WeightInfo = weights::pallet_utility::WeightInfo<Self>;
-	type WeightInfo = ();
+	type WeightInfo = weights::pallet_utility::WeightInfo<Self>;
 }
diff --git a/runtime/crab/src/pallets/xcmp_queue.rs b/runtime/crab/src/pallets/xcmp_queue.rs
index fe37db174..e38c6f192 100644
--- a/runtime/crab/src/pallets/xcmp_queue.rs
+++ b/runtime/crab/src/pallets/xcmp_queue.rs
@@ -29,8 +29,7 @@ impl cumulus_pallet_xcmp_queue::Config for Runtime {
 	>;
 	type RuntimeEvent = RuntimeEvent;
 	type VersionWrapper = ();
-	// type WeightInfo = weights::cumulus_pallet_xcmp_queue::WeightInfo<Self>;
-	type WeightInfo = ();
+	type WeightInfo = weights::cumulus_pallet_xcmp_queue::WeightInfo<Self>;
 	// Enqueue XCMP messages from siblings for later processing.
 	type XcmpQueue = frame_support::traits::TransformOrigin<
 		MessageQueue,
diff --git a/runtime/crab/src/weights.rs b/runtime/crab/src/weights.rs
index 2a856063b..d2bd1a4f9 100644
--- a/runtime/crab/src/weights.rs
+++ b/runtime/crab/src/weights.rs
@@ -20,6 +20,7 @@
 
 #![allow(clippy::unnecessary_cast)]
 
+pub mod cumulus_pallet_parachain_system;
 pub mod cumulus_pallet_xcmp_queue;
 pub mod darwinia_account_migration;
 pub mod darwinia_deposit;
@@ -29,6 +30,7 @@ pub mod pallet_assets;
 pub mod pallet_balances;
 pub mod pallet_collective;
 pub mod pallet_conviction_voting;
+pub mod pallet_message_queue;
 pub mod pallet_preimage;
 pub mod pallet_proxy;
 pub mod pallet_referenda;
diff --git a/runtime/darwinia/src/lib.rs b/runtime/darwinia/src/lib.rs
index 8bf8ed9ec..038580e4f 100644
--- a/runtime/darwinia/src/lib.rs
+++ b/runtime/darwinia/src/lib.rs
@@ -29,7 +29,7 @@ pub use pallets::*;
 
 mod migration;
 
-// pub mod weights;
+mod weights;
 
 pub use darwinia_common_runtime::*;
 pub use dc_primitives::*;
@@ -176,9 +176,11 @@ frame_benchmarking::define_benchmarks! {
 	[cumulus_pallet_xcmp_queue, XcmpQueue]
 	[frame_system, SystemBench::<Runtime>]
 	[pallet_assets, Assets]
+	[pallet_asset_manager, AssetManager]
 	[pallet_balances, Balances]
 	[pallet_collective, TechnicalCommittee]
 	[pallet_conviction_voting, ConvictionVoting]
+	[pallet_evm, EVM]
 	[pallet_message_queue, MessageQueue]
 	[pallet_preimage, Preimage]
 	[pallet_proxy, Proxy]
diff --git a/runtime/darwinia/src/pallets/account_migration.rs b/runtime/darwinia/src/pallets/account_migration.rs
index a0892fd39..a13c1a789 100644
--- a/runtime/darwinia/src/pallets/account_migration.rs
+++ b/runtime/darwinia/src/pallets/account_migration.rs
@@ -21,6 +21,5 @@ use crate::*;
 
 impl darwinia_account_migration::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
-	// type WeightInfo = weights::darwinia_account_migration::WeightInfo<Self>;
-	type WeightInfo = ();
+	type WeightInfo = weights::darwinia_account_migration::WeightInfo<Self>;
 }
diff --git a/runtime/darwinia/src/pallets/asset_manager.rs b/runtime/darwinia/src/pallets/asset_manager.rs
index be75d1172..78598466f 100644
--- a/runtime/darwinia/src/pallets/asset_manager.rs
+++ b/runtime/darwinia/src/pallets/asset_manager.rs
@@ -150,6 +150,5 @@ impl pallet_asset_manager::Config for Runtime {
 	type ForeignAssetModifierOrigin = RootOr<GeneralAdmin>;
 	type ForeignAssetType = AssetType;
 	type RuntimeEvent = RuntimeEvent;
-	// type WeightInfo = pallet_asset_manager::weights::SubstrateWeight<Runtime>;
-	type WeightInfo = ();
+	type WeightInfo = weights::pallet_asset_manager::WeightInfo<Self>;
 }
diff --git a/runtime/darwinia/src/pallets/assets.rs b/runtime/darwinia/src/pallets/assets.rs
index f48800bb8..68121f715 100644
--- a/runtime/darwinia/src/pallets/assets.rs
+++ b/runtime/darwinia/src/pallets/assets.rs
@@ -52,6 +52,5 @@ impl pallet_assets::Config for Runtime {
 	type RemoveItemsLimit = ConstU32<1000>;
 	type RuntimeEvent = RuntimeEvent;
 	type StringLimit = ConstU32<50>;
-	// type WeightInfo = weights::pallet_assets::WeightInfo<Self>;
-	type WeightInfo = ();
+	type WeightInfo = weights::pallet_assets::WeightInfo<Self>;
 }
diff --git a/runtime/darwinia/src/pallets/balances.rs b/runtime/darwinia/src/pallets/balances.rs
index 91274a7f0..35bfd308e 100644
--- a/runtime/darwinia/src/pallets/balances.rs
+++ b/runtime/darwinia/src/pallets/balances.rs
@@ -32,6 +32,5 @@ impl pallet_balances::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type RuntimeFreezeReason = RuntimeFreezeReason;
 	type RuntimeHoldReason = RuntimeHoldReason;
-	// type WeightInfo = weights::pallet_balances::WeightInfo<Self>;
-	type WeightInfo = ();
+	type WeightInfo = weights::pallet_balances::WeightInfo<Self>;
 }
diff --git a/runtime/darwinia/src/pallets/deposit.rs b/runtime/darwinia/src/pallets/deposit.rs
index bcab9b52a..a4f6a672a 100644
--- a/runtime/darwinia/src/pallets/deposit.rs
+++ b/runtime/darwinia/src/pallets/deposit.rs
@@ -49,6 +49,5 @@ impl darwinia_deposit::Config for Runtime {
 	type MinLockingAmount = ConstU128<UNIT>;
 	type Ring = Balances;
 	type RuntimeEvent = RuntimeEvent;
-	// type WeightInfo = weights::darwinia_deposit::WeightInfo<Self>;
-	type WeightInfo = ();
+	type WeightInfo = weights::darwinia_deposit::WeightInfo<Self>;
 }
diff --git a/runtime/darwinia/src/pallets/dmp_queue.rs b/runtime/darwinia/src/pallets/dmp_queue.rs
index 0db751ffd..a1464981b 100644
--- a/runtime/darwinia/src/pallets/dmp_queue.rs
+++ b/runtime/darwinia/src/pallets/dmp_queue.rs
@@ -23,6 +23,5 @@ impl cumulus_pallet_dmp_queue::Config for Runtime {
 	type DmpSink =
 		frame_support::traits::EnqueueWithOrigin<MessageQueue, pallet_config::RelayOrigin>;
 	type RuntimeEvent = RuntimeEvent;
-	// type WeightInfo = ();
 	type WeightInfo = ();
 }
diff --git a/runtime/darwinia/src/pallets/evm.rs b/runtime/darwinia/src/pallets/evm.rs
index 3ba6ef1ba..814e0b4e0 100644
--- a/runtime/darwinia/src/pallets/evm.rs
+++ b/runtime/darwinia/src/pallets/evm.rs
@@ -201,7 +201,7 @@ impl pallet_evm::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type SuicideQuickClearLimit = ();
 	type Timestamp = Timestamp;
-	// type WeightInfo = ();
+	// TODO: benchmark.
 	type WeightInfo = ();
 	type WeightPerGas = pallet_config::WeightPerGas;
 	type WithdrawOrigin = pallet_evm::EnsureAddressNever<Self::AccountId>;
diff --git a/runtime/darwinia/src/pallets/governance.rs b/runtime/darwinia/src/pallets/governance.rs
index 953b31417..3c79cd3e5 100644
--- a/runtime/darwinia/src/pallets/governance.rs
+++ b/runtime/darwinia/src/pallets/governance.rs
@@ -37,8 +37,7 @@ impl pallet_collective::Config<TechnicalCollective> for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type RuntimeOrigin = RuntimeOrigin;
 	type SetMembersOrigin = RootOr<GeneralAdmin>;
-	// type WeightInfo = weights::pallet_collective::WeightInfo<Self>;
-	type WeightInfo = ();
+	type WeightInfo = weights::pallet_collective::WeightInfo<Self>;
 }
 
 impl pallet_conviction_voting::Config for Runtime {
@@ -48,8 +47,7 @@ impl pallet_conviction_voting::Config for Runtime {
 	type Polls = Referenda;
 	type RuntimeEvent = RuntimeEvent;
 	type VoteLockingPeriod = ConstU32<{ DAYS }>;
-	// type WeightInfo = weights::pallet_conviction_voting::WeightInfo<Self>;
-	type WeightInfo = ();
+	type WeightInfo = weights::pallet_conviction_voting::WeightInfo<Self>;
 }
 
 pallet_referenda::impl_tracksinfo_get!(TracksInfo, Balance, BlockNumber);
@@ -71,8 +69,7 @@ impl pallet_referenda::Config for Runtime {
 	type Tracks = TracksInfo;
 	type UndecidingTimeout = ConstU32<{ 28 * DAYS }>;
 	type Votes = pallet_conviction_voting::VotesOf<Self>;
-	// type WeightInfo = weights::pallet_referenda::WeightInfo<Self>;
-	type WeightInfo = ();
+	type WeightInfo = weights::pallet_referenda::WeightInfo<Self>;
 }
 
 impl custom_origins::Config for Runtime {}
@@ -84,8 +81,7 @@ impl pallet_whitelist::Config for Runtime {
 	type Preimages = Preimage;
 	type RuntimeCall = RuntimeCall;
 	type RuntimeEvent = RuntimeEvent;
-	// type WeightInfo = weights::pallet_whitelist::WeightInfo<Self>;
-	type WeightInfo = ();
+	type WeightInfo = weights::pallet_whitelist::WeightInfo<Self>;
 	type WhitelistOrigin = RootOrAtLeastFourFifth<TechnicalCollective>;
 }
 
@@ -121,6 +117,5 @@ impl pallet_treasury::Config for Runtime {
 		Spender,
 	>;
 	type SpendPeriod = ConstU32<{ 28 * DAYS }>;
-	// type WeightInfo = weights::pallet_treasury::WeightInfo<Self>;
-	type WeightInfo = ();
+	type WeightInfo = weights::pallet_treasury::WeightInfo<Self>;
 }
diff --git a/runtime/darwinia/src/pallets/message_queue.rs b/runtime/darwinia/src/pallets/message_queue.rs
index fce765f47..3e4922339 100644
--- a/runtime/darwinia/src/pallets/message_queue.rs
+++ b/runtime/darwinia/src/pallets/message_queue.rs
@@ -38,6 +38,5 @@ impl pallet_message_queue::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type ServiceWeight = pallet_config::MessageQueueServiceWeight;
 	type Size = u32;
-	// type WeightInfo = ();
-	type WeightInfo = ();
+	type WeightInfo = weights::pallet_message_queue::WeightInfo<Self>;
 }
diff --git a/runtime/darwinia/src/pallets/parachain_system.rs b/runtime/darwinia/src/pallets/parachain_system.rs
index d151115c6..0e8e34912 100644
--- a/runtime/darwinia/src/pallets/parachain_system.rs
+++ b/runtime/darwinia/src/pallets/parachain_system.rs
@@ -31,6 +31,6 @@ impl cumulus_pallet_parachain_system::Config for Runtime {
 	type ReservedXcmpWeight = pallet_config::ReservedXcmpWeight;
 	type RuntimeEvent = RuntimeEvent;
 	type SelfParaId = parachain_info::Pallet<Self>;
-	type WeightInfo = ();
+	type WeightInfo = weights::cumulus_pallet_parachain_system::WeightInfo<Self>;
 	type XcmpMessageHandler = XcmpQueue;
 }
diff --git a/runtime/darwinia/src/pallets/preimage.rs b/runtime/darwinia/src/pallets/preimage.rs
index 9863af883..e08c6e245 100644
--- a/runtime/darwinia/src/pallets/preimage.rs
+++ b/runtime/darwinia/src/pallets/preimage.rs
@@ -39,6 +39,5 @@ impl pallet_preimage::Config for Runtime {
 	type Currency = Balances;
 	type ManagerOrigin = RootOr<GeneralAdmin>;
 	type RuntimeEvent = RuntimeEvent;
-	// type WeightInfo = weights::pallet_preimage::WeightInfo<Self>;
-	type WeightInfo = ();
+	type WeightInfo = weights::pallet_preimage::WeightInfo<Self>;
 }
diff --git a/runtime/darwinia/src/pallets/proxy.rs b/runtime/darwinia/src/pallets/proxy.rs
index da0983840..135795ec7 100644
--- a/runtime/darwinia/src/pallets/proxy.rs
+++ b/runtime/darwinia/src/pallets/proxy.rs
@@ -118,6 +118,5 @@ impl pallet_proxy::Config for Runtime {
 	type ProxyType = ProxyType;
 	type RuntimeCall = RuntimeCall;
 	type RuntimeEvent = RuntimeEvent;
-	// type WeightInfo = weights::pallet_proxy::WeightInfo<Self>;
-	type WeightInfo = ();
+	type WeightInfo = weights::pallet_proxy::WeightInfo<Self>;
 }
diff --git a/runtime/darwinia/src/pallets/scheduler.rs b/runtime/darwinia/src/pallets/scheduler.rs
index 3ac4d4fc7..3f46d2e0a 100644
--- a/runtime/darwinia/src/pallets/scheduler.rs
+++ b/runtime/darwinia/src/pallets/scheduler.rs
@@ -58,6 +58,5 @@ impl pallet_scheduler::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type RuntimeOrigin = RuntimeOrigin;
 	type ScheduleOrigin = RootOr<GeneralAdmin>;
-	// type WeightInfo = weights::pallet_scheduler::WeightInfo<Self>;
-	type WeightInfo = ();
+	type WeightInfo = weights::pallet_scheduler::WeightInfo<Self>;
 }
diff --git a/runtime/darwinia/src/pallets/session.rs b/runtime/darwinia/src/pallets/session.rs
index 5629b9c1f..c5b764597 100644
--- a/runtime/darwinia/src/pallets/session.rs
+++ b/runtime/darwinia/src/pallets/session.rs
@@ -41,6 +41,5 @@ impl pallet_session::Config for Runtime {
 	type ValidatorId = Self::AccountId;
 	// We don't have stash and controller, thus we don't need the convert as well.
 	type ValidatorIdOf = darwinia_staking::IdentityCollator;
-	// type WeightInfo = weights::pallet_session::WeightInfo<Self>;
-	type WeightInfo = ();
+	type WeightInfo = weights::pallet_session::WeightInfo<Self>;
 }
diff --git a/runtime/darwinia/src/pallets/staking.rs b/runtime/darwinia/src/pallets/staking.rs
index 9cfd762a6..82cceb2ed 100644
--- a/runtime/darwinia/src/pallets/staking.rs
+++ b/runtime/darwinia/src/pallets/staking.rs
@@ -120,8 +120,7 @@ impl darwinia_staking::Config for Runtime {
 	type Ring = RingStaking;
 	type RuntimeEvent = RuntimeEvent;
 	type ShouldEndSession = ShouldEndSession;
-	// type WeightInfo = weights::darwinia_staking::WeightInfo<Self>;
-	type WeightInfo = ();
+	type WeightInfo = weights::darwinia_staking::WeightInfo<Self>;
 }
 #[cfg(not(feature = "runtime-benchmarks"))]
 impl darwinia_staking::DepositConfig for Runtime {}
diff --git a/runtime/darwinia/src/pallets/timestamp.rs b/runtime/darwinia/src/pallets/timestamp.rs
index f6bbcb561..0f10ddb6c 100644
--- a/runtime/darwinia/src/pallets/timestamp.rs
+++ b/runtime/darwinia/src/pallets/timestamp.rs
@@ -27,6 +27,5 @@ impl pallet_timestamp::Config for Runtime {
 	type OnTimestampSet = Aura;
 	#[cfg(feature = "runtime-benchmarks")]
 	type OnTimestampSet = ();
-	// type WeightInfo = weights::pallet_timestamp::WeightInfo<Self>;
-	type WeightInfo = ();
+	type WeightInfo = weights::pallet_timestamp::WeightInfo<Self>;
 }
diff --git a/runtime/darwinia/src/pallets/tx_pause.rs b/runtime/darwinia/src/pallets/tx_pause.rs
index 357b945b8..3a7c19db4 100644
--- a/runtime/darwinia/src/pallets/tx_pause.rs
+++ b/runtime/darwinia/src/pallets/tx_pause.rs
@@ -55,7 +55,6 @@ impl pallet_tx_pause::Config for Runtime {
 	type RuntimeCall = RuntimeCall;
 	type RuntimeEvent = RuntimeEvent;
 	type UnpauseOrigin = RootOrAtLeastTwoThird<TechnicalCollective>;
-	// type WeightInfo = weights::pallet_tx_pause::WeightInfo<Runtime>;
-	type WeightInfo = ();
+	type WeightInfo = weights::pallet_tx_pause::WeightInfo<Runtime>;
 	type WhitelistedCalls = TxPauseWhitelistedCalls;
 }
diff --git a/runtime/darwinia/src/pallets/utility.rs b/runtime/darwinia/src/pallets/utility.rs
index bad2dcc75..59c5759a2 100644
--- a/runtime/darwinia/src/pallets/utility.rs
+++ b/runtime/darwinia/src/pallets/utility.rs
@@ -23,6 +23,5 @@ impl pallet_utility::Config for Runtime {
 	type PalletsOrigin = OriginCaller;
 	type RuntimeCall = RuntimeCall;
 	type RuntimeEvent = RuntimeEvent;
-	// type WeightInfo = weights::pallet_utility::WeightInfo<Self>;
-	type WeightInfo = ();
+	type WeightInfo = weights::pallet_utility::WeightInfo<Self>;
 }
diff --git a/runtime/darwinia/src/pallets/xcmp_queue.rs b/runtime/darwinia/src/pallets/xcmp_queue.rs
index fe37db174..e38c6f192 100644
--- a/runtime/darwinia/src/pallets/xcmp_queue.rs
+++ b/runtime/darwinia/src/pallets/xcmp_queue.rs
@@ -29,8 +29,7 @@ impl cumulus_pallet_xcmp_queue::Config for Runtime {
 	>;
 	type RuntimeEvent = RuntimeEvent;
 	type VersionWrapper = ();
-	// type WeightInfo = weights::cumulus_pallet_xcmp_queue::WeightInfo<Self>;
-	type WeightInfo = ();
+	type WeightInfo = weights::cumulus_pallet_xcmp_queue::WeightInfo<Self>;
 	// Enqueue XCMP messages from siblings for later processing.
 	type XcmpQueue = frame_support::traits::TransformOrigin<
 		MessageQueue,
diff --git a/runtime/darwinia/src/weights.rs b/runtime/darwinia/src/weights.rs
index 56c95fd37..97ba441fe 100644
--- a/runtime/darwinia/src/weights.rs
+++ b/runtime/darwinia/src/weights.rs
@@ -20,15 +20,18 @@
 
 #![allow(clippy::unnecessary_cast)]
 
+pub mod cumulus_pallet_parachain_system;
 pub mod cumulus_pallet_xcmp_queue;
 pub mod darwinia_account_migration;
 pub mod darwinia_deposit;
 pub mod darwinia_staking;
 pub mod frame_system;
+pub mod pallet_asset_manager;
 pub mod pallet_assets;
 pub mod pallet_balances;
 pub mod pallet_collective;
 pub mod pallet_conviction_voting;
+pub mod pallet_message_queue;
 pub mod pallet_preimage;
 pub mod pallet_proxy;
 pub mod pallet_referenda;
diff --git a/runtime/darwinia/src/weights/pallet_asset_manager.rs b/runtime/darwinia/src/weights/pallet_asset_manager.rs
new file mode 100644
index 000000000..218905813
--- /dev/null
+++ b/runtime/darwinia/src/weights/pallet_asset_manager.rs
@@ -0,0 +1,158 @@
+// This file is part of Darwinia.
+//
+// Copyright (C) Darwinia Network
+// SPDX-License-Identifier: GPL-3.0
+//
+// Darwinia is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Darwinia is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Darwinia. If not, see <https://www.gnu.org/licenses/>.
+
+//! Autogenerated weights for `pallet_asset_manager`
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-06-27, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! WORST CASE MAP SIZE: `1000000`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("darwinia-dev")`, DB CACHE: 1024
+
+// Executed Command:
+// target/release/darwinia
+// benchmark
+// pallet
+// --header
+// .maintain/license-header
+// --heap-pages
+// 4096
+// --chain
+// darwinia-dev
+// --output
+// runtime/darwinia/src/weights
+// --pallet
+// *
+// --extrinsic
+// *
+// --steps
+// 50
+// --repeat
+// 20
+
+#![cfg_attr(rustfmt, rustfmt_skip)]
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+#![allow(missing_docs)]
+
+use frame_support::{traits::Get, weights::Weight};
+use core::marker::PhantomData;
+
+/// Weight functions for `pallet_asset_manager`.
+pub struct WeightInfo<T>(PhantomData<T>);
+impl<T: frame_system::Config> pallet_asset_manager::WeightInfo for WeightInfo<T> {
+	/// Storage: `AssetManager::AssetIdType` (r:1 w:1)
+	/// Proof: `AssetManager::AssetIdType` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Assets::Asset` (r:1 w:1)
+	/// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(166), added: 2641, mode: `MaxEncodedLen`)
+	/// Storage: `Assets::Metadata` (r:1 w:1)
+	/// Proof: `Assets::Metadata` (`max_values`: None, `max_size`: Some(144), added: 2619, mode: `MaxEncodedLen`)
+	/// Storage: `AssetManager::AssetTypeId` (r:0 w:1)
+	/// Proof: `AssetManager::AssetTypeId` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	fn register_foreign_asset() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `276`
+		//  Estimated: `3741`
+		// Minimum execution time: 28_000_000 picoseconds.
+		Weight::from_parts(29_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 3741))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(4))
+	}
+	/// Storage: `AssetManager::AssetTypeId` (r:1 w:0)
+	/// Proof: `AssetManager::AssetTypeId` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `AssetManager::SupportedFeePaymentAssets` (r:1 w:1)
+	/// Proof: `AssetManager::SupportedFeePaymentAssets` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `AssetManager::AssetTypeUnitsPerSecond` (r:0 w:1)
+	/// Proof: `AssetManager::AssetTypeUnitsPerSecond` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// The range of component `x` is `[5, 100]`.
+	fn set_asset_units_per_second(x: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `595 + x * (9 ±0)`
+		//  Estimated: `3983 + x * (10 ±0)`
+		// Minimum execution time: 16_000_000 picoseconds.
+		Weight::from_parts(16_810_363, 0)
+			.saturating_add(Weight::from_parts(0, 3983))
+			// Standard Error: 2_082
+			.saturating_add(Weight::from_parts(329_481, 0).saturating_mul(x.into()))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(2))
+			.saturating_add(Weight::from_parts(0, 10).saturating_mul(x.into()))
+	}
+	/// Storage: `AssetManager::SupportedFeePaymentAssets` (r:1 w:1)
+	/// Proof: `AssetManager::SupportedFeePaymentAssets` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `AssetManager::AssetIdType` (r:1 w:1)
+	/// Proof: `AssetManager::AssetIdType` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `AssetManager::AssetTypeUnitsPerSecond` (r:1 w:2)
+	/// Proof: `AssetManager::AssetTypeUnitsPerSecond` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `AssetManager::AssetTypeId` (r:0 w:2)
+	/// Proof: `AssetManager::AssetTypeId` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// The range of component `x` is `[5, 100]`.
+	fn change_existing_asset_type(x: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `968 + x * (13 ±0)`
+		//  Estimated: `4303 + x * (14 ±0)`
+		// Minimum execution time: 24_000_000 picoseconds.
+		Weight::from_parts(25_440_012, 0)
+			.saturating_add(Weight::from_parts(0, 4303))
+			// Standard Error: 3_740
+			.saturating_add(Weight::from_parts(336_831, 0).saturating_mul(x.into()))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(6))
+			.saturating_add(Weight::from_parts(0, 14).saturating_mul(x.into()))
+	}
+	/// Storage: `AssetManager::SupportedFeePaymentAssets` (r:1 w:1)
+	/// Proof: `AssetManager::SupportedFeePaymentAssets` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `AssetManager::AssetTypeUnitsPerSecond` (r:0 w:1)
+	/// Proof: `AssetManager::AssetTypeUnitsPerSecond` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// The range of component `x` is `[5, 100]`.
+	fn remove_supported_asset(x: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `196 + x * (5 ±0)`
+		//  Estimated: `1678 + x * (5 ±0)`
+		// Minimum execution time: 11_000_000 picoseconds.
+		Weight::from_parts(9_832_398, 0)
+			.saturating_add(Weight::from_parts(0, 1678))
+			// Standard Error: 1_647
+			.saturating_add(Weight::from_parts(290_226, 0).saturating_mul(x.into()))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(2))
+			.saturating_add(Weight::from_parts(0, 5).saturating_mul(x.into()))
+	}
+	/// Storage: `AssetManager::SupportedFeePaymentAssets` (r:1 w:1)
+	/// Proof: `AssetManager::SupportedFeePaymentAssets` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `AssetManager::AssetIdType` (r:1 w:1)
+	/// Proof: `AssetManager::AssetIdType` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `AssetManager::AssetTypeUnitsPerSecond` (r:0 w:1)
+	/// Proof: `AssetManager::AssetTypeUnitsPerSecond` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `AssetManager::AssetTypeId` (r:0 w:1)
+	/// Proof: `AssetManager::AssetTypeId` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// The range of component `x` is `[5, 100]`.
+	fn remove_existing_asset_type(x: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `486 + x * (10 ±0)`
+		//  Estimated: `3949 + x * (10 ±0)`
+		// Minimum execution time: 17_000_000 picoseconds.
+		Weight::from_parts(17_425_346, 0)
+			.saturating_add(Weight::from_parts(0, 3949))
+			// Standard Error: 4_402
+			.saturating_add(Weight::from_parts(311_738, 0).saturating_mul(x.into()))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(4))
+			.saturating_add(Weight::from_parts(0, 10).saturating_mul(x.into()))
+	}
+}
diff --git a/runtime/koi/src/lib.rs b/runtime/koi/src/lib.rs
index 8ab46106a..605884b44 100644
--- a/runtime/koi/src/lib.rs
+++ b/runtime/koi/src/lib.rs
@@ -29,7 +29,7 @@ pub use pallets::*;
 
 mod migration;
 
-// pub mod weights;
+mod weights;
 
 pub use darwinia_common_runtime::*;
 pub use dc_primitives::*;
@@ -164,9 +164,11 @@ frame_benchmarking::define_benchmarks! {
 	[cumulus_pallet_xcmp_queue, XcmpQueue]
 	[frame_system, SystemBench::<Runtime>]
 	[pallet_assets, Assets]
+	[pallet_asset_manager, AssetManager]
 	[pallet_balances, Balances]
 	[pallet_collective, TechnicalCommittee]
 	[pallet_conviction_voting, ConvictionVoting]
+	[pallet_evm, EVM]
 	[pallet_message_queue, MessageQueue]
 	[pallet_preimage, Preimage]
 	[pallet_proxy, Proxy]
diff --git a/runtime/koi/src/pallets/asset_manager.rs b/runtime/koi/src/pallets/asset_manager.rs
index ba25866b8..7b91a8680 100644
--- a/runtime/koi/src/pallets/asset_manager.rs
+++ b/runtime/koi/src/pallets/asset_manager.rs
@@ -145,6 +145,5 @@ impl pallet_asset_manager::Config for Runtime {
 	type ForeignAssetModifierOrigin = RootOr<GeneralAdmin>;
 	type ForeignAssetType = AssetType;
 	type RuntimeEvent = RuntimeEvent;
-	// type WeightInfo = pallet_asset_manager::weights::SubstrateWeight<Runtime>;
-	type WeightInfo = ();
+	type WeightInfo = weights::pallet_asset_manager::WeightInfo<Self>;
 }
diff --git a/runtime/koi/src/pallets/assets.rs b/runtime/koi/src/pallets/assets.rs
index 22562f8c4..fc07e336a 100644
--- a/runtime/koi/src/pallets/assets.rs
+++ b/runtime/koi/src/pallets/assets.rs
@@ -52,6 +52,5 @@ impl pallet_assets::Config for Runtime {
 	type RemoveItemsLimit = ConstU32<1000>;
 	type RuntimeEvent = RuntimeEvent;
 	type StringLimit = ConstU32<50>;
-	// type WeightInfo = weights::pallet_assets::WeightInfo<Self>;
-	type WeightInfo = ();
+	type WeightInfo = weights::pallet_assets::WeightInfo<Self>;
 }
diff --git a/runtime/koi/src/pallets/balances.rs b/runtime/koi/src/pallets/balances.rs
index 91274a7f0..35bfd308e 100644
--- a/runtime/koi/src/pallets/balances.rs
+++ b/runtime/koi/src/pallets/balances.rs
@@ -32,6 +32,5 @@ impl pallet_balances::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type RuntimeFreezeReason = RuntimeFreezeReason;
 	type RuntimeHoldReason = RuntimeHoldReason;
-	// type WeightInfo = weights::pallet_balances::WeightInfo<Self>;
-	type WeightInfo = ();
+	type WeightInfo = weights::pallet_balances::WeightInfo<Self>;
 }
diff --git a/runtime/koi/src/pallets/deposit.rs b/runtime/koi/src/pallets/deposit.rs
index 3ad97e9b1..ad51b2ba0 100644
--- a/runtime/koi/src/pallets/deposit.rs
+++ b/runtime/koi/src/pallets/deposit.rs
@@ -49,6 +49,5 @@ impl darwinia_deposit::Config for Runtime {
 	type MinLockingAmount = ConstU128<UNIT>;
 	type Ring = Balances;
 	type RuntimeEvent = RuntimeEvent;
-	// type WeightInfo = weights::darwinia_deposit::WeightInfo<Self>;
-	type WeightInfo = ();
+	type WeightInfo = weights::darwinia_deposit::WeightInfo<Self>;
 }
diff --git a/runtime/koi/src/pallets/dmp_queue.rs b/runtime/koi/src/pallets/dmp_queue.rs
index 0db751ffd..a1464981b 100644
--- a/runtime/koi/src/pallets/dmp_queue.rs
+++ b/runtime/koi/src/pallets/dmp_queue.rs
@@ -23,6 +23,5 @@ impl cumulus_pallet_dmp_queue::Config for Runtime {
 	type DmpSink =
 		frame_support::traits::EnqueueWithOrigin<MessageQueue, pallet_config::RelayOrigin>;
 	type RuntimeEvent = RuntimeEvent;
-	// type WeightInfo = ();
 	type WeightInfo = ();
 }
diff --git a/runtime/koi/src/pallets/evm.rs b/runtime/koi/src/pallets/evm.rs
index 54a006f34..986e1dc7d 100644
--- a/runtime/koi/src/pallets/evm.rs
+++ b/runtime/koi/src/pallets/evm.rs
@@ -219,7 +219,7 @@ impl pallet_evm::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type SuicideQuickClearLimit = ();
 	type Timestamp = Timestamp;
-	// type WeightInfo = ();
+	// TODO: benchmark.
 	type WeightInfo = ();
 	type WeightPerGas = pallet_config::WeightPerGas;
 	type WithdrawOrigin = pallet_evm::EnsureAddressNever<Self::AccountId>;
diff --git a/runtime/koi/src/pallets/governance.rs b/runtime/koi/src/pallets/governance.rs
index 3c4db08c9..84a203797 100644
--- a/runtime/koi/src/pallets/governance.rs
+++ b/runtime/koi/src/pallets/governance.rs
@@ -43,8 +43,7 @@ impl pallet_collective::Config<TechnicalCollective> for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type RuntimeOrigin = RuntimeOrigin;
 	type SetMembersOrigin = RootOr<GeneralAdmin>;
-	// type WeightInfo = weights::pallet_collective::WeightInfo<Self>;
-	type WeightInfo = ();
+	type WeightInfo = weights::pallet_collective::WeightInfo<Self>;
 }
 
 impl pallet_conviction_voting::Config for Runtime {
@@ -54,8 +53,7 @@ impl pallet_conviction_voting::Config for Runtime {
 	type Polls = Referenda;
 	type RuntimeEvent = RuntimeEvent;
 	type VoteLockingPeriod = Time2;
-	// type WeightInfo = weights::pallet_conviction_voting::WeightInfo<Self>;
-	type WeightInfo = ();
+	type WeightInfo = weights::pallet_conviction_voting::WeightInfo<Self>;
 }
 
 pallet_referenda::impl_tracksinfo_get!(TracksInfo, Balance, BlockNumber);
@@ -77,8 +75,7 @@ impl pallet_referenda::Config for Runtime {
 	type Tracks = TracksInfo;
 	type UndecidingTimeout = Time2;
 	type Votes = pallet_conviction_voting::VotesOf<Self>;
-	// type WeightInfo = weights::pallet_referenda::WeightInfo<Self>;
-	type WeightInfo = ();
+	type WeightInfo = weights::pallet_referenda::WeightInfo<Self>;
 }
 
 impl custom_origins::Config for Runtime {}
@@ -90,8 +87,7 @@ impl pallet_whitelist::Config for Runtime {
 	type Preimages = Preimage;
 	type RuntimeCall = RuntimeCall;
 	type RuntimeEvent = RuntimeEvent;
-	// type WeightInfo = weights::pallet_whitelist::WeightInfo<Self>;
-	type WeightInfo = ();
+	type WeightInfo = weights::pallet_whitelist::WeightInfo<Self>;
 	type WhitelistOrigin = RootOrAtLeastFourFifth<TechnicalCollective>;
 }
 
@@ -127,6 +123,5 @@ impl pallet_treasury::Config for Runtime {
 		Spender,
 	>;
 	type SpendPeriod = Time1;
-	// type WeightInfo = weights::pallet_treasury::WeightInfo<Self>;
-	type WeightInfo = ();
+	type WeightInfo = weights::pallet_treasury::WeightInfo<Self>;
 }
diff --git a/runtime/koi/src/pallets/message_queue.rs b/runtime/koi/src/pallets/message_queue.rs
index fce765f47..3e4922339 100644
--- a/runtime/koi/src/pallets/message_queue.rs
+++ b/runtime/koi/src/pallets/message_queue.rs
@@ -38,6 +38,5 @@ impl pallet_message_queue::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type ServiceWeight = pallet_config::MessageQueueServiceWeight;
 	type Size = u32;
-	// type WeightInfo = ();
-	type WeightInfo = ();
+	type WeightInfo = weights::pallet_message_queue::WeightInfo<Self>;
 }
diff --git a/runtime/koi/src/pallets/parachain_system.rs b/runtime/koi/src/pallets/parachain_system.rs
index d151115c6..0e8e34912 100644
--- a/runtime/koi/src/pallets/parachain_system.rs
+++ b/runtime/koi/src/pallets/parachain_system.rs
@@ -31,6 +31,6 @@ impl cumulus_pallet_parachain_system::Config for Runtime {
 	type ReservedXcmpWeight = pallet_config::ReservedXcmpWeight;
 	type RuntimeEvent = RuntimeEvent;
 	type SelfParaId = parachain_info::Pallet<Self>;
-	type WeightInfo = ();
+	type WeightInfo = weights::cumulus_pallet_parachain_system::WeightInfo<Self>;
 	type XcmpMessageHandler = XcmpQueue;
 }
diff --git a/runtime/koi/src/pallets/preimage.rs b/runtime/koi/src/pallets/preimage.rs
index 9863af883..e08c6e245 100644
--- a/runtime/koi/src/pallets/preimage.rs
+++ b/runtime/koi/src/pallets/preimage.rs
@@ -39,6 +39,5 @@ impl pallet_preimage::Config for Runtime {
 	type Currency = Balances;
 	type ManagerOrigin = RootOr<GeneralAdmin>;
 	type RuntimeEvent = RuntimeEvent;
-	// type WeightInfo = weights::pallet_preimage::WeightInfo<Self>;
-	type WeightInfo = ();
+	type WeightInfo = weights::pallet_preimage::WeightInfo<Self>;
 }
diff --git a/runtime/koi/src/pallets/proxy.rs b/runtime/koi/src/pallets/proxy.rs
index 64c9a802c..36a62b8e7 100644
--- a/runtime/koi/src/pallets/proxy.rs
+++ b/runtime/koi/src/pallets/proxy.rs
@@ -111,6 +111,5 @@ impl pallet_proxy::Config for Runtime {
 	type ProxyType = ProxyType;
 	type RuntimeCall = RuntimeCall;
 	type RuntimeEvent = RuntimeEvent;
-	// type WeightInfo = weights::pallet_proxy::WeightInfo<Self>;
-	type WeightInfo = ();
+	type WeightInfo = weights::pallet_proxy::WeightInfo<Self>;
 }
diff --git a/runtime/koi/src/pallets/scheduler.rs b/runtime/koi/src/pallets/scheduler.rs
index 3ac4d4fc7..3f46d2e0a 100644
--- a/runtime/koi/src/pallets/scheduler.rs
+++ b/runtime/koi/src/pallets/scheduler.rs
@@ -58,6 +58,5 @@ impl pallet_scheduler::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type RuntimeOrigin = RuntimeOrigin;
 	type ScheduleOrigin = RootOr<GeneralAdmin>;
-	// type WeightInfo = weights::pallet_scheduler::WeightInfo<Self>;
-	type WeightInfo = ();
+	type WeightInfo = weights::pallet_scheduler::WeightInfo<Self>;
 }
diff --git a/runtime/koi/src/pallets/session.rs b/runtime/koi/src/pallets/session.rs
index 5629b9c1f..c5b764597 100644
--- a/runtime/koi/src/pallets/session.rs
+++ b/runtime/koi/src/pallets/session.rs
@@ -41,6 +41,5 @@ impl pallet_session::Config for Runtime {
 	type ValidatorId = Self::AccountId;
 	// We don't have stash and controller, thus we don't need the convert as well.
 	type ValidatorIdOf = darwinia_staking::IdentityCollator;
-	// type WeightInfo = weights::pallet_session::WeightInfo<Self>;
-	type WeightInfo = ();
+	type WeightInfo = weights::pallet_session::WeightInfo<Self>;
 }
diff --git a/runtime/koi/src/pallets/staking.rs b/runtime/koi/src/pallets/staking.rs
index 00926815c..f741f6d9a 100644
--- a/runtime/koi/src/pallets/staking.rs
+++ b/runtime/koi/src/pallets/staking.rs
@@ -105,8 +105,7 @@ impl darwinia_staking::Config for Runtime {
 	type Ring = RingStaking;
 	type RuntimeEvent = RuntimeEvent;
 	type ShouldEndSession = ShouldEndSession;
-	// type WeightInfo = weights::darwinia_staking::WeightInfo<Self>;
-	type WeightInfo = ();
+	type WeightInfo = weights::darwinia_staking::WeightInfo<Self>;
 }
 #[cfg(not(feature = "runtime-benchmarks"))]
 impl darwinia_staking::DepositConfig for Runtime {}
diff --git a/runtime/koi/src/pallets/sudo.rs b/runtime/koi/src/pallets/sudo.rs
index 72fcbc29c..a7fcb20b4 100644
--- a/runtime/koi/src/pallets/sudo.rs
+++ b/runtime/koi/src/pallets/sudo.rs
@@ -22,6 +22,5 @@ use crate::*;
 impl pallet_sudo::Config for Runtime {
 	type RuntimeCall = RuntimeCall;
 	type RuntimeEvent = RuntimeEvent;
-	// type WeightInfo = pallet_sudo::weights::SubstrateWeight<Self>;
-	type WeightInfo = ();
+	type WeightInfo = pallet_sudo::weights::SubstrateWeight<Self>;
 }
diff --git a/runtime/koi/src/pallets/timestamp.rs b/runtime/koi/src/pallets/timestamp.rs
index f6bbcb561..0f10ddb6c 100644
--- a/runtime/koi/src/pallets/timestamp.rs
+++ b/runtime/koi/src/pallets/timestamp.rs
@@ -27,6 +27,5 @@ impl pallet_timestamp::Config for Runtime {
 	type OnTimestampSet = Aura;
 	#[cfg(feature = "runtime-benchmarks")]
 	type OnTimestampSet = ();
-	// type WeightInfo = weights::pallet_timestamp::WeightInfo<Self>;
-	type WeightInfo = ();
+	type WeightInfo = weights::pallet_timestamp::WeightInfo<Self>;
 }
diff --git a/runtime/koi/src/pallets/tx_pause.rs b/runtime/koi/src/pallets/tx_pause.rs
index c0db67c7c..4ff419cf8 100644
--- a/runtime/koi/src/pallets/tx_pause.rs
+++ b/runtime/koi/src/pallets/tx_pause.rs
@@ -54,7 +54,6 @@ impl pallet_tx_pause::Config for Runtime {
 	type RuntimeCall = RuntimeCall;
 	type RuntimeEvent = RuntimeEvent;
 	type UnpauseOrigin = RootOrAtLeastTwoThird<TechnicalCollective>;
-	// type WeightInfo = weights::pallet_tx_pause::WeightInfo<Runtime>;
-	type WeightInfo = ();
+	type WeightInfo = weights::pallet_tx_pause::WeightInfo<Runtime>;
 	type WhitelistedCalls = TxPauseWhitelistedCalls;
 }
diff --git a/runtime/koi/src/pallets/utility.rs b/runtime/koi/src/pallets/utility.rs
index bad2dcc75..59c5759a2 100644
--- a/runtime/koi/src/pallets/utility.rs
+++ b/runtime/koi/src/pallets/utility.rs
@@ -23,6 +23,5 @@ impl pallet_utility::Config for Runtime {
 	type PalletsOrigin = OriginCaller;
 	type RuntimeCall = RuntimeCall;
 	type RuntimeEvent = RuntimeEvent;
-	// type WeightInfo = weights::pallet_utility::WeightInfo<Self>;
-	type WeightInfo = ();
+	type WeightInfo = weights::pallet_utility::WeightInfo<Self>;
 }
diff --git a/runtime/koi/src/pallets/xcmp_queue.rs b/runtime/koi/src/pallets/xcmp_queue.rs
index fe37db174..e38c6f192 100644
--- a/runtime/koi/src/pallets/xcmp_queue.rs
+++ b/runtime/koi/src/pallets/xcmp_queue.rs
@@ -29,8 +29,7 @@ impl cumulus_pallet_xcmp_queue::Config for Runtime {
 	>;
 	type RuntimeEvent = RuntimeEvent;
 	type VersionWrapper = ();
-	// type WeightInfo = weights::cumulus_pallet_xcmp_queue::WeightInfo<Self>;
-	type WeightInfo = ();
+	type WeightInfo = weights::cumulus_pallet_xcmp_queue::WeightInfo<Self>;
 	// Enqueue XCMP messages from siblings for later processing.
 	type XcmpQueue = frame_support::traits::TransformOrigin<
 		MessageQueue,
diff --git a/runtime/koi/src/weights.rs b/runtime/koi/src/weights.rs
index 6b3bf6bf4..c2d018505 100644
--- a/runtime/koi/src/weights.rs
+++ b/runtime/koi/src/weights.rs
@@ -20,14 +20,17 @@
 
 #![allow(clippy::unnecessary_cast)]
 
+pub mod cumulus_pallet_parachain_system;
 pub mod cumulus_pallet_xcmp_queue;
 pub mod darwinia_deposit;
 pub mod darwinia_staking;
 pub mod frame_system;
+pub mod pallet_asset_manager;
 pub mod pallet_assets;
 pub mod pallet_balances;
 pub mod pallet_collective;
 pub mod pallet_conviction_voting;
+pub mod pallet_message_queue;
 pub mod pallet_preimage;
 pub mod pallet_proxy;
 pub mod pallet_referenda;
diff --git a/runtime/koi/src/weights/pallet_asset_manager.rs b/runtime/koi/src/weights/pallet_asset_manager.rs
new file mode 100644
index 000000000..d3ab9406a
--- /dev/null
+++ b/runtime/koi/src/weights/pallet_asset_manager.rs
@@ -0,0 +1,158 @@
+// This file is part of Darwinia.
+//
+// Copyright (C) Darwinia Network
+// SPDX-License-Identifier: GPL-3.0
+//
+// Darwinia is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Darwinia is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Darwinia. If not, see <https://www.gnu.org/licenses/>.
+
+//! Autogenerated weights for `pallet_asset_manager`
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-06-27, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! WORST CASE MAP SIZE: `1000000`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("koi-dev")`, DB CACHE: 1024
+
+// Executed Command:
+// target/release/darwinia
+// benchmark
+// pallet
+// --header
+// .maintain/license-header
+// --heap-pages
+// 4096
+// --chain
+// koi-dev
+// --output
+// runtime/koi/src/weights
+// --pallet
+// *
+// --extrinsic
+// *
+// --steps
+// 50
+// --repeat
+// 20
+
+#![cfg_attr(rustfmt, rustfmt_skip)]
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+#![allow(missing_docs)]
+
+use frame_support::{traits::Get, weights::Weight};
+use core::marker::PhantomData;
+
+/// Weight functions for `pallet_asset_manager`.
+pub struct WeightInfo<T>(PhantomData<T>);
+impl<T: frame_system::Config> pallet_asset_manager::WeightInfo for WeightInfo<T> {
+	/// Storage: `AssetManager::AssetIdType` (r:1 w:1)
+	/// Proof: `AssetManager::AssetIdType` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `Assets::Asset` (r:1 w:1)
+	/// Proof: `Assets::Asset` (`max_values`: None, `max_size`: Some(166), added: 2641, mode: `MaxEncodedLen`)
+	/// Storage: `Assets::Metadata` (r:1 w:1)
+	/// Proof: `Assets::Metadata` (`max_values`: None, `max_size`: Some(144), added: 2619, mode: `MaxEncodedLen`)
+	/// Storage: `AssetManager::AssetTypeId` (r:0 w:1)
+	/// Proof: `AssetManager::AssetTypeId` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	fn register_foreign_asset() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `276`
+		//  Estimated: `3741`
+		// Minimum execution time: 28_000_000 picoseconds.
+		Weight::from_parts(29_000_000, 0)
+			.saturating_add(Weight::from_parts(0, 3741))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(4))
+	}
+	/// Storage: `AssetManager::AssetTypeId` (r:1 w:0)
+	/// Proof: `AssetManager::AssetTypeId` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `AssetManager::SupportedFeePaymentAssets` (r:1 w:1)
+	/// Proof: `AssetManager::SupportedFeePaymentAssets` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `AssetManager::AssetTypeUnitsPerSecond` (r:0 w:1)
+	/// Proof: `AssetManager::AssetTypeUnitsPerSecond` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// The range of component `x` is `[5, 100]`.
+	fn set_asset_units_per_second(x: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `595 + x * (9 ±0)`
+		//  Estimated: `3983 + x * (10 ±0)`
+		// Minimum execution time: 16_000_000 picoseconds.
+		Weight::from_parts(16_313_288, 0)
+			.saturating_add(Weight::from_parts(0, 3983))
+			// Standard Error: 2_365
+			.saturating_add(Weight::from_parts(333_385, 0).saturating_mul(x.into()))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(2))
+			.saturating_add(Weight::from_parts(0, 10).saturating_mul(x.into()))
+	}
+	/// Storage: `AssetManager::SupportedFeePaymentAssets` (r:1 w:1)
+	/// Proof: `AssetManager::SupportedFeePaymentAssets` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `AssetManager::AssetIdType` (r:1 w:1)
+	/// Proof: `AssetManager::AssetIdType` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `AssetManager::AssetTypeUnitsPerSecond` (r:1 w:2)
+	/// Proof: `AssetManager::AssetTypeUnitsPerSecond` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `AssetManager::AssetTypeId` (r:0 w:2)
+	/// Proof: `AssetManager::AssetTypeId` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// The range of component `x` is `[5, 100]`.
+	fn change_existing_asset_type(x: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `968 + x * (13 ±0)`
+		//  Estimated: `4303 + x * (14 ±0)`
+		// Minimum execution time: 24_000_000 picoseconds.
+		Weight::from_parts(25_074_438, 0)
+			.saturating_add(Weight::from_parts(0, 4303))
+			// Standard Error: 2_774
+			.saturating_add(Weight::from_parts(338_361, 0).saturating_mul(x.into()))
+			.saturating_add(T::DbWeight::get().reads(3))
+			.saturating_add(T::DbWeight::get().writes(6))
+			.saturating_add(Weight::from_parts(0, 14).saturating_mul(x.into()))
+	}
+	/// Storage: `AssetManager::SupportedFeePaymentAssets` (r:1 w:1)
+	/// Proof: `AssetManager::SupportedFeePaymentAssets` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `AssetManager::AssetTypeUnitsPerSecond` (r:0 w:1)
+	/// Proof: `AssetManager::AssetTypeUnitsPerSecond` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// The range of component `x` is `[5, 100]`.
+	fn remove_supported_asset(x: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `196 + x * (5 ±0)`
+		//  Estimated: `1678 + x * (5 ±0)`
+		// Minimum execution time: 11_000_000 picoseconds.
+		Weight::from_parts(10_468_267, 0)
+			.saturating_add(Weight::from_parts(0, 1678))
+			// Standard Error: 2_533
+			.saturating_add(Weight::from_parts(296_419, 0).saturating_mul(x.into()))
+			.saturating_add(T::DbWeight::get().reads(1))
+			.saturating_add(T::DbWeight::get().writes(2))
+			.saturating_add(Weight::from_parts(0, 5).saturating_mul(x.into()))
+	}
+	/// Storage: `AssetManager::SupportedFeePaymentAssets` (r:1 w:1)
+	/// Proof: `AssetManager::SupportedFeePaymentAssets` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `AssetManager::AssetIdType` (r:1 w:1)
+	/// Proof: `AssetManager::AssetIdType` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `AssetManager::AssetTypeUnitsPerSecond` (r:0 w:1)
+	/// Proof: `AssetManager::AssetTypeUnitsPerSecond` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `AssetManager::AssetTypeId` (r:0 w:1)
+	/// Proof: `AssetManager::AssetTypeId` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// The range of component `x` is `[5, 100]`.
+	fn remove_existing_asset_type(x: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `486 + x * (10 ±0)`
+		//  Estimated: `3949 + x * (10 ±0)`
+		// Minimum execution time: 18_000_000 picoseconds.
+		Weight::from_parts(19_047_312, 0)
+			.saturating_add(Weight::from_parts(0, 3949))
+			// Standard Error: 2_328
+			.saturating_add(Weight::from_parts(282_558, 0).saturating_mul(x.into()))
+			.saturating_add(T::DbWeight::get().reads(2))
+			.saturating_add(T::DbWeight::get().writes(4))
+			.saturating_add(Weight::from_parts(0, 10).saturating_mul(x.into()))
+	}
+}

From 54ce5dd8bc4f5f66b14a17fe2d88f1e15a72de08 Mon Sep 17 00:00:00 2001
From: Xavier Lau <xavier@inv.cafe>
Date: Thu, 27 Jun 2024 10:46:50 +0800
Subject: [PATCH 52/59] Fix all tests

---
 .github/actions/build/action.yml |   2 +-
 .github/workflows/checks.yml     |   7 +-
 pallet/staking/src/mock.rs       |   2 +
 runtime/common/src/test.rs       | 107 ++++++-------------------------
 runtime/crab/src/lib.rs          |   4 +-
 runtime/darwinia/src/lib.rs      |   4 +-
 runtime/koi/src/lib.rs           |   4 +-
 tool/am-signer/README.md         |   2 +-
 8 files changed, 33 insertions(+), 99 deletions(-)

diff --git a/.github/actions/build/action.yml b/.github/actions/build/action.yml
index 64618551d..9ac434cd4 100644
--- a/.github/actions/build/action.yml
+++ b/.github/actions/build/action.yml
@@ -61,7 +61,7 @@ runs:
             --name=build-darwinia \
             -v=$(pwd):/build \
             darwinia-network/build-tool:latest \
-              cargo build --release --locked \
+              cargo b --release --locked \
                 -p darwinia \
                 --no-default-features \
                 --features=$FEATURES
diff --git a/.github/workflows/checks.yml b/.github/workflows/checks.yml
index a6425d86b..4626eb881 100644
--- a/.github/workflows/checks.yml
+++ b/.github/workflows/checks.yml
@@ -69,10 +69,10 @@ jobs:
             ${{ matrix.action }}-${{ env.CACHE_VERSION }}-${{ runner.os }}-
       - name: Action ${{ matrix.action }}
         if: matrix.action == 'build'
-        run: cargo build --locked -p darwinia --features all-natives,evm-tracing --profile ci-dev
+        run: cargo b --locked -p darwinia --no-default-features --features all-natives,evm-tracing --profile ci-dev
       - name: Action ${{ matrix.action }}
         if: matrix.action == 'test'
-        run: SKIP_WASM_BUILD=1 cargo test --locked --features all-natives,runtime-benchmarks --profile ci-dev
+        run: SKIP_WASM_BUILD=1 cargo t --locked --no-default-features --features all-natives,runtime-benchmarks --profile ci-dev
       - name: Configure artifacts
         if: matrix.action == 'build'
         run: |
@@ -109,8 +109,7 @@ jobs:
     if: github.event_name == 'push' || !github.event.pull_request.draft
     strategy:
       matrix:
-        runtime:
-          [runtime/darwinia, runtime/crab, runtime/koi]
+        runtime: [runtime/darwinia, runtime/crab, runtime/koi]
     runs-on: ubuntu-latest
     steps:
       - name: Fetch latest code
diff --git a/pallet/staking/src/mock.rs b/pallet/staking/src/mock.rs
index 77a1737c0..63f5d74c7 100644
--- a/pallet/staking/src/mock.rs
+++ b/pallet/staking/src/mock.rs
@@ -130,6 +130,8 @@ impl pallet_treasury::Config for Runtime {
 	type ApproveOrigin = frame_system::EnsureRoot<AccountId>;
 	type AssetKind = ();
 	type BalanceConverter = frame_support::traits::tokens::UnityAssetBalanceConversion;
+	#[cfg(feature = "runtime-benchmarks")]
+	type BenchmarkHelper = ();
 	type Beneficiary = AccountId;
 	type BeneficiaryLookup = Self::Lookup;
 	type Burn = ();
diff --git a/runtime/common/src/test.rs b/runtime/common/src/test.rs
index d858ac02d..6a6c44196 100644
--- a/runtime/common/src/test.rs
+++ b/runtime/common/src/test.rs
@@ -321,73 +321,6 @@ macro_rules! impl_account_migration_tests {
 						assert_eq!(DarwiniaStaking::ledger_of(to).unwrap().ring, 20);
 					});
 			}
-			#[test]
-			fn identities_should_work() {
-				let (from, from_pk) = alice();
-				let to = H160::from_low_u64_be(255).into();
-
-				ExtBuilder::default().build().execute_with(|| {
-					preset_state_of(&from);
-
-					let info = IdentityInfo {
-						additional: Default::default(),
-						display: Data::Sha256([1u8; 32]),
-						legal: Data::None,
-						web: Data::None,
-						riot: Data::None,
-						email: Data::None,
-						pgp_fingerprint: None,
-						image: Data::None,
-						twitter: Data::None,
-					};
-					<darwinia_account_migration::Identities<Runtime>>::insert(
-						from_pk,
-						Registration {
-							judgements: Default::default(),
-							deposit: RING_AMOUNT,
-							info: info.clone(),
-						},
-					);
-
-					assert_ok!(migrate(from, to));
-					assert_eq!(Identity::identity(to).unwrap().info, info);
-					assert_eq!(Identity::identity(to).unwrap().deposit, 0);
-					assert_eq!(Identity::identity(to).unwrap().judgements.len(), 0);
-				});
-			}
-
-			#[test]
-			fn registrars_should_work() {
-				let (from, from_pk) = alice();
-				let mut truncated_from = [0_u8; 20];
-
-				truncated_from
-					.copy_from_slice(&<AccountId32 as AsRef<[u8; 32]>>::as_ref(&from_pk)[..20]);
-
-				let to = H160::from_low_u64_be(255).into();
-
-				ExtBuilder::default().build().execute_with(|| {
-					preset_state_of(&from);
-
-					let info = RegistrarInfo::<Balance, AccountId> {
-						account: truncated_from.into(),
-						fee: RING_AMOUNT,
-						fields: IdentityFields::default(),
-					};
-
-					migration::put_storage_value(
-						b"Identity",
-						b"Registrars",
-						&[],
-						vec![Some(info.clone()), None],
-					);
-
-					assert_ok!(migrate(from, to));
-					assert_eq!(Identity::registrars()[0].as_ref().unwrap().account, to);
-					assert_eq!(Identity::registrars()[0].as_ref().unwrap().fee, info.fee);
-					assert!(Identity::registrars()[1].is_none());
-				});
-			}
 		}
 	};
 }
@@ -407,7 +340,7 @@ macro_rules! impl_evm_tests {
 
 			#[test]
 			fn configured_base_extrinsic_weight_is_evm_compatible() {
-				let min_ethereum_transaction_weight = WeightPerGas::get() * 21_000;
+				let min_ethereum_transaction_weight = pallet_config::WeightPerGas::get() * 21_000;
 				let base_extrinsic = <Runtime as frame_system::Config>::BlockWeights::get()
 					.get(frame_support::dispatch::DispatchClass::Normal)
 					.base_extrinsic;
@@ -417,8 +350,8 @@ macro_rules! impl_evm_tests {
 
 			#[test]
 			fn evm_constants_are_correctly() {
-				assert_eq!(BlockGasLimit::get(), U256::from(20_000_000));
-				assert_eq!(WeightPerGas::get().ref_time(), 18750);
+				assert_eq!(pallet_config::BlockGasLimit::get(), U256::from(20_000_000));
+				assert_eq!(pallet_config::WeightPerGas::get().ref_time(), 75000);
 			}
 
 			#[test]
@@ -539,25 +472,25 @@ macro_rules! impl_weight_tests {
 				// substrate
 				use pallet_balances::WeightInfo;
 
-				let block = RuntimeBlockWeights::get().max_block;
-				let base = RuntimeBlockWeights::get().get(DispatchClass::Normal).base_extrinsic;
-				let transfer =
+				let block = pallet_config::RuntimeBlockWeights::get().max_block;
+				let base = pallet_config::RuntimeBlockWeights::get().get(DispatchClass::Normal).base_extrinsic;
+				let transfer_allow_death =
 					base + weights::pallet_balances::WeightInfo::<Runtime>::transfer_allow_death();
-				let fit = block.checked_div_per_component(&transfer).unwrap_or_default();
+				let fit = block.checked_div_per_component(&transfer_allow_death).unwrap_or_default();
 
 				assert!(fit >= 1000, "{} should be at least 1000", fit);
 			}
 
-			// The fee for one transfer is at most 1 UNIT.
+			// The fee for one transfer_allow_death is at most 1 UNIT.
 			#[test]
 			fn sane_transfer_fee() {
 				// substrate
 				use pallet_balances::WeightInfo;
 
-				let base = RuntimeBlockWeights::get().get(DispatchClass::Normal).base_extrinsic;
-				let transfer =
+				let base = pallet_config::RuntimeBlockWeights::get().get(DispatchClass::Normal).base_extrinsic;
+				let transfer_allow_death =
 					base + weights::pallet_balances::WeightInfo::<Runtime>::transfer_allow_death();
-				let fee = WeightToFee::weight_to_fee(&transfer);
+				let fee = WeightToFee::weight_to_fee(&transfer_allow_death);
 
 				assert!(fee <= UNIT, "{} MILLIUNIT should be at most 1000", fee / MILLIUNIT);
 			}
@@ -577,7 +510,7 @@ macro_rules! impl_weight_tests {
 			// This is just a sanity check.
 			#[test]
 			fn full_block_fee_ratio() {
-				let block = RuntimeBlockWeights::get().max_block;
+				let block = pallet_config::RuntimeBlockWeights::get().max_block;
 				let time_fee = WeightToFee::weight_to_fee(&Weight::from_parts(block.ref_time(), 0));
 				let proof_fee =
 					WeightToFee::weight_to_fee(&Weight::from_parts(0, block.proof_size()));
@@ -661,7 +594,7 @@ macro_rules! impl_fee_tests {
 			fn multiplier_can_grow_from_zero() {
 				let minimum_multiplier = MinimumMultiplier::get();
 				let target = TargetBlockFullness::get()
-					* RuntimeBlockWeights::get().get(DispatchClass::Normal).max_total.unwrap();
+					* pallet_config::RuntimeBlockWeights::get().get(DispatchClass::Normal).max_total.unwrap();
 				// if the min is too small, then this will not change, and we are doomed forever.
 				// the weight is 1/100th bigger than target.
 				run_with_system_weight(target.saturating_mul(101) / 100, || {
@@ -685,7 +618,7 @@ macro_rules! impl_fee_tests {
 			fn test_evm_fee_adjustment() {
 				ExtBuilder::default().build().execute_with(|| {
 					let sim = |fullness: Perbill, num_blocks: u64| -> U256 {
-						let block_weight = NORMAL_DISPATCH_RATIO * MAXIMUM_BLOCK_WEIGHT * fullness;
+						let block_weight = pallet_config::NORMAL_DISPATCH_RATIO * pallet_config::MAXIMUM_BLOCK_WEIGHT * fullness;
 						for i in 0..num_blocks {
 							System::set_block_number(i as u32);
 							System::set_block_consumed_resources(block_weight, 0);
@@ -789,12 +722,12 @@ macro_rules! impl_maintenance_tests {
 				ExtBuilder::default().build().execute_with(|| {
 					assert_ok!(TxPause::pause(
 						RuntimeOrigin::root(),
-						full_name(b"Balances", b"transfer")
+						full_name(b"Balances", b"transfer_allow_death")
 					));
 					assert_err!(
 						TxPause::pause(
 							RuntimeOrigin::signed(H160::default().into()),
-							full_name(b"Balances", b"transfer")
+							full_name(b"Balances", b"transfer_allow_death")
 						),
 						DispatchError::BadOrigin
 					);
@@ -809,10 +742,10 @@ macro_rules! impl_maintenance_tests {
 				ExtBuilder::default().with_balances(vec![(from, 100)]).build().execute_with(|| {
 					assert_ok!(TxPause::pause(
 						RuntimeOrigin::root(),
-						full_name(b"Balances", b"transfer")
+						full_name(b"Balances", b"transfer_allow_death")
 					));
 					assert_err!(
-						RuntimeCall::Balances(pallet_balances::Call::transfer {
+						RuntimeCall::Balances(pallet_balances::Call::transfer_allow_death {
 							dest: to,
 							value: 1,
 						})
@@ -822,9 +755,9 @@ macro_rules! impl_maintenance_tests {
 
 					assert_ok!(TxPause::unpause(
 						RuntimeOrigin::root(),
-						full_name(b"Balances", b"transfer")
+						full_name(b"Balances", b"transfer_allow_death")
 					));
-					assert_ok!(RuntimeCall::Balances(pallet_balances::Call::transfer {
+					assert_ok!(RuntimeCall::Balances(pallet_balances::Call::transfer_allow_death {
 						dest: to,
 						value: 1,
 					})
diff --git a/runtime/crab/src/lib.rs b/runtime/crab/src/lib.rs
index edd010430..c59d763ee 100644
--- a/runtime/crab/src/lib.rs
+++ b/runtime/crab/src/lib.rs
@@ -24,13 +24,13 @@
 #[cfg(feature = "std")]
 include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
 
+pub mod weights;
+
 mod pallets;
 pub use pallets::*;
 
 mod migration;
 
-mod weights;
-
 pub use darwinia_common_runtime::*;
 pub use dc_primitives::*;
 
diff --git a/runtime/darwinia/src/lib.rs b/runtime/darwinia/src/lib.rs
index 038580e4f..3aaea620d 100644
--- a/runtime/darwinia/src/lib.rs
+++ b/runtime/darwinia/src/lib.rs
@@ -24,13 +24,13 @@
 #[cfg(feature = "std")]
 include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
 
+pub mod weights;
+
 mod pallets;
 pub use pallets::*;
 
 mod migration;
 
-mod weights;
-
 pub use darwinia_common_runtime::*;
 pub use dc_primitives::*;
 
diff --git a/runtime/koi/src/lib.rs b/runtime/koi/src/lib.rs
index 605884b44..f0c802776 100644
--- a/runtime/koi/src/lib.rs
+++ b/runtime/koi/src/lib.rs
@@ -24,13 +24,13 @@
 #[cfg(feature = "std")]
 include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
 
+pub mod weights;
+
 mod pallets;
 pub use pallets::*;
 
 mod migration;
 
-mod weights;
-
 pub use darwinia_common_runtime::*;
 pub use dc_primitives::*;
 
diff --git a/tool/am-signer/README.md b/tool/am-signer/README.md
index 5e5c807ef..0065e40e4 100644
--- a/tool/am-signer/README.md
+++ b/tool/am-signer/README.md
@@ -2,7 +2,7 @@
 
 ```sh
 # Build
-cargo build
+cargo b
 # Get more detail
 target/debug/am-signer --help
 

From 8f82c719620cdfd167c2beedd4cd9174b94c6d7c Mon Sep 17 00:00:00 2001
From: Xavier Lau <xavier@inv.cafe>
Date: Thu, 27 Jun 2024 10:50:58 +0800
Subject: [PATCH 53/59] Typo

---
 runtime/common/src/pallet_config.rs |  2 +-
 runtime/common/src/test.rs          | 27 ++++++++++++++++++---------
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/runtime/common/src/pallet_config.rs b/runtime/common/src/pallet_config.rs
index 52d0b8098..eb745798f 100644
--- a/runtime/common/src/pallet_config.rs
+++ b/runtime/common/src/pallet_config.rs
@@ -78,6 +78,6 @@ frame_support::parameter_types! {
 		fp_evm::weight_per_gas(BLOCK_GAS_LIMIT, NORMAL_DISPATCH_RATIO, WEIGHT_MILLISECS_PER_BLOCK * 4),
 		0
 	);
-	// TODO: FIX ME. https://github.com/rust-lang/rust/issues/88581
+	// FIXME: https://github.com/rust-lang/rust/issues/88581
 	pub GasLimitPovSizeRatio: u64 = BLOCK_GAS_LIMIT.saturating_div(BlockPovSizeLimit::get()) + 1;
 }
diff --git a/runtime/common/src/test.rs b/runtime/common/src/test.rs
index 6a6c44196..0273d5b20 100644
--- a/runtime/common/src/test.rs
+++ b/runtime/common/src/test.rs
@@ -473,10 +473,13 @@ macro_rules! impl_weight_tests {
 				use pallet_balances::WeightInfo;
 
 				let block = pallet_config::RuntimeBlockWeights::get().max_block;
-				let base = pallet_config::RuntimeBlockWeights::get().get(DispatchClass::Normal).base_extrinsic;
+				let base = pallet_config::RuntimeBlockWeights::get()
+					.get(DispatchClass::Normal)
+					.base_extrinsic;
 				let transfer_allow_death =
 					base + weights::pallet_balances::WeightInfo::<Runtime>::transfer_allow_death();
-				let fit = block.checked_div_per_component(&transfer_allow_death).unwrap_or_default();
+				let fit =
+					block.checked_div_per_component(&transfer_allow_death).unwrap_or_default();
 
 				assert!(fit >= 1000, "{} should be at least 1000", fit);
 			}
@@ -487,7 +490,9 @@ macro_rules! impl_weight_tests {
 				// substrate
 				use pallet_balances::WeightInfo;
 
-				let base = pallet_config::RuntimeBlockWeights::get().get(DispatchClass::Normal).base_extrinsic;
+				let base = pallet_config::RuntimeBlockWeights::get()
+					.get(DispatchClass::Normal)
+					.base_extrinsic;
 				let transfer_allow_death =
 					base + weights::pallet_balances::WeightInfo::<Runtime>::transfer_allow_death();
 				let fee = WeightToFee::weight_to_fee(&transfer_allow_death);
@@ -594,7 +599,10 @@ macro_rules! impl_fee_tests {
 			fn multiplier_can_grow_from_zero() {
 				let minimum_multiplier = MinimumMultiplier::get();
 				let target = TargetBlockFullness::get()
-					* pallet_config::RuntimeBlockWeights::get().get(DispatchClass::Normal).max_total.unwrap();
+					* pallet_config::RuntimeBlockWeights::get()
+						.get(DispatchClass::Normal)
+						.max_total
+						.unwrap();
 				// if the min is too small, then this will not change, and we are doomed forever.
 				// the weight is 1/100th bigger than target.
 				run_with_system_weight(target.saturating_mul(101) / 100, || {
@@ -618,7 +626,9 @@ macro_rules! impl_fee_tests {
 			fn test_evm_fee_adjustment() {
 				ExtBuilder::default().build().execute_with(|| {
 					let sim = |fullness: Perbill, num_blocks: u64| -> U256 {
-						let block_weight = pallet_config::NORMAL_DISPATCH_RATIO * pallet_config::MAXIMUM_BLOCK_WEIGHT * fullness;
+						let block_weight = pallet_config::NORMAL_DISPATCH_RATIO
+							* pallet_config::MAXIMUM_BLOCK_WEIGHT
+							* fullness;
 						for i in 0..num_blocks {
 							System::set_block_number(i as u32);
 							System::set_block_consumed_resources(block_weight, 0);
@@ -757,10 +767,9 @@ macro_rules! impl_maintenance_tests {
 						RuntimeOrigin::root(),
 						full_name(b"Balances", b"transfer_allow_death")
 					));
-					assert_ok!(RuntimeCall::Balances(pallet_balances::Call::transfer_allow_death {
-						dest: to,
-						value: 1,
-					})
+					assert_ok!(RuntimeCall::Balances(
+						pallet_balances::Call::transfer_allow_death { dest: to, value: 1 }
+					)
 					.dispatch(RuntimeOrigin::signed(from)));
 				});
 			}

From 5491858bc7a094db76262eeab100d8b5bb23e427 Mon Sep 17 00:00:00 2001
From: Xavier Lau <xavier@inv.cafe>
Date: Thu, 27 Jun 2024 10:54:34 +0800
Subject: [PATCH 54/59] Feat

---
 runtime/common/Cargo.toml   | 1 +
 runtime/crab/Cargo.toml     | 1 +
 runtime/darwinia/Cargo.toml | 1 +
 runtime/koi/Cargo.toml      | 1 +
 4 files changed, 4 insertions(+)

diff --git a/runtime/common/Cargo.toml b/runtime/common/Cargo.toml
index d6ef7cb37..0f3be8450 100644
--- a/runtime/common/Cargo.toml
+++ b/runtime/common/Cargo.toml
@@ -80,6 +80,7 @@ test = []
 
 runtime-benchmarks = [
 	# polkadot-sdk
+	"cumulus-primitives-core/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 	"pallet-balances/runtime-benchmarks",
diff --git a/runtime/crab/Cargo.toml b/runtime/crab/Cargo.toml
index a81a0b0af..27b471edd 100644
--- a/runtime/crab/Cargo.toml
+++ b/runtime/crab/Cargo.toml
@@ -263,6 +263,7 @@ runtime-benchmarks = [
 	# polkadot-sdk
 	"cumulus-pallet-parachain-system/runtime-benchmarks",
 	"cumulus-pallet-xcmp-queue/runtime-benchmarks",
+	"cumulus-primitives-core/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 	"pallet-assets/runtime-benchmarks",
diff --git a/runtime/darwinia/Cargo.toml b/runtime/darwinia/Cargo.toml
index 75c9a1416..b2ecf5964 100644
--- a/runtime/darwinia/Cargo.toml
+++ b/runtime/darwinia/Cargo.toml
@@ -284,6 +284,7 @@ runtime-benchmarks = [
 	# polkadot-sdk
 	"cumulus-pallet-parachain-system/runtime-benchmarks",
 	"cumulus-pallet-xcmp-queue/runtime-benchmarks",
+	"cumulus-primitives-core/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 	"pallet-assets/runtime-benchmarks",
diff --git a/runtime/koi/Cargo.toml b/runtime/koi/Cargo.toml
index 1e3a27cf2..51b4352e2 100644
--- a/runtime/koi/Cargo.toml
+++ b/runtime/koi/Cargo.toml
@@ -281,6 +281,7 @@ runtime-benchmarks = [
 	# polkadot-sdk
 	"cumulus-pallet-parachain-system/runtime-benchmarks",
 	"cumulus-pallet-xcmp-queue/runtime-benchmarks",
+	"cumulus-primitives-core/runtime-benchmarks",
 	"frame-support/runtime-benchmarks",
 	"frame-system/runtime-benchmarks",
 	"pallet-assets/runtime-benchmarks",

From 1ae7f7e5588688f9b2cf3b92ad1b8df1129bf594 Mon Sep 17 00:00:00 2001
From: Xavier Lau <xavier@inv.cafe>
Date: Thu, 27 Jun 2024 11:57:21 +0800
Subject: [PATCH 55/59] Fix EVM tracing build

---
 runtime/crab/src/lib.rs     | 33 +++++++++++++++++++++++++++------
 runtime/darwinia/src/lib.rs | 33 +++++++++++++++++++++++++++------
 runtime/koi/src/lib.rs      | 33 +++++++++++++++++++++++++++------
 3 files changed, 81 insertions(+), 18 deletions(-)

diff --git a/runtime/crab/src/lib.rs b/runtime/crab/src/lib.rs
index c59d763ee..0f6c60fe1 100644
--- a/runtime/crab/src/lib.rs
+++ b/runtime/crab/src/lib.rs
@@ -591,12 +591,11 @@ sp_api::impl_runtime_apis! {
 					EthereumXcmTracingStatus
 				};
 				use frame_support::storage::unhashed;
-				use frame_system::pallet_prelude::BlockNumberFor;
 
 				// Tell the CallDispatcher we are tracing a specific Transaction.
 				unhashed::put::<EthereumXcmTracingStatus>(
 					ETHEREUM_XCM_TRACING_STORAGE_KEY,
-					&EthereumXcmTracingStatus::Transaction(traced_transaction.hash()),
+					&EthereumXcmTracingStatus::Transaction(_traced_transaction.hash()),
 				);
 
 				// Initialize block: calls the "on_initialize" hook on every pallet
@@ -610,7 +609,7 @@ sp_api::impl_runtime_apis! {
 				// transactions that preceded the requested transaction.
 				for ext in _extrinsics.into_iter() {
 					let _ = match &ext.0.function {
-						RuntimeCall::Ethereum(transact { transaction }) => {
+						RuntimeCall::Ethereum(pallet_ethereum::Call::transact { transaction }) => {
 							if transaction == _traced_transaction {
 								EvmTracer::new().trace(|| Executive::apply_extrinsic(ext));
 								return Ok(());
@@ -664,7 +663,6 @@ sp_api::impl_runtime_apis! {
 			#[cfg(feature = "evm-tracing")]
 			{
 				use moonbeam_evm_tracer::tracer::EvmTracer;
-				use frame_system::pallet_prelude::BlockNumberFor;
 				use xcm_primitives::EthereumXcmTracingStatus;
 
 				// Tell the CallDispatcher we are tracing a full Block.
@@ -686,7 +684,7 @@ sp_api::impl_runtime_apis! {
 				// Apply all extrinsics. Ethereum extrinsics are traced.
 				for ext in _extrinsics.into_iter() {
 					match &ext.0.function {
-						RuntimeCall::Ethereum(transact { transaction }) => {
+						RuntimeCall::Ethereum(pallet_ethereum::Call::transact { transaction }) => {
 							if _known_transactions.contains(&transaction.hash()) {
 								// Each known extrinsic is a new call stack.
 								EvmTracer::emit_new();
@@ -727,6 +725,7 @@ sp_api::impl_runtime_apis! {
 		) -> Result<(), sp_runtime::DispatchError> {
 			#[cfg(feature = "evm-tracing")]
 			{
+				use pallet_evm::{GasWeightMapping, Runner};
 				use moonbeam_evm_tracer::tracer::EvmTracer;
 
 				// Initialize block: calls the "on_initialize" hook on every pallet
@@ -783,7 +782,7 @@ sp_api::impl_runtime_apis! {
 						_max_priority_fee_per_gas,
 						_nonce,
 						_access_list.unwrap_or_default(),
-						_is_transactional,
+						is_transactional,
 						validate,
 						weight_limit,
 						proof_size_base_cost,
@@ -889,6 +888,28 @@ sp_api::impl_runtime_apis! {
 	}
 }
 
+// Helper function to replay the "on_idle" hook for all pallets, we need this for
+// evm-tracing because some ethereum-xcm transactions might be executed at on_idle.
+//
+// We need to make sure that we replay on_idle exactly the same way as the
+// original block execution, but unfortunatly frame executive diosn't provide a function
+// to replay only on_idle, so we need to copy here some code inside frame executive.
+#[cfg(feature = "evm-tracing")]
+fn replay_on_idle() {
+	use frame_support::traits::OnIdle;
+	use frame_system::pallet_prelude::BlockNumberFor;
+
+	let weight = <frame_system::Pallet<Runtime>>::block_weight();
+	let max_weight = pallet_config::RuntimeBlockWeights::get().max_block;
+	let remaining_weight = max_weight.saturating_sub(weight.total());
+	if remaining_weight.all_gt(frame_support::weights::Weight::zero()) {
+		let _ = <AllPalletsWithSystem as OnIdle<BlockNumberFor<Runtime>>>::on_idle(
+			<frame_system::Pallet<Runtime>>::block_number(),
+			remaining_weight,
+		);
+	}
+}
+
 cumulus_pallet_parachain_system::register_validate_block! {
 	Runtime = Runtime,
 	BlockExecutor = cumulus_pallet_aura_ext::BlockExecutor::<Runtime, Executive>,
diff --git a/runtime/darwinia/src/lib.rs b/runtime/darwinia/src/lib.rs
index 3aaea620d..43bdbce66 100644
--- a/runtime/darwinia/src/lib.rs
+++ b/runtime/darwinia/src/lib.rs
@@ -597,12 +597,11 @@ sp_api::impl_runtime_apis! {
 					EthereumXcmTracingStatus
 				};
 				use frame_support::storage::unhashed;
-				use frame_system::pallet_prelude::BlockNumberFor;
 
 				// Tell the CallDispatcher we are tracing a specific Transaction.
 				unhashed::put::<EthereumXcmTracingStatus>(
 					ETHEREUM_XCM_TRACING_STORAGE_KEY,
-					&EthereumXcmTracingStatus::Transaction(traced_transaction.hash()),
+					&EthereumXcmTracingStatus::Transaction(_traced_transaction.hash()),
 				);
 
 				// Initialize block: calls the "on_initialize" hook on every pallet
@@ -616,7 +615,7 @@ sp_api::impl_runtime_apis! {
 				// transactions that preceded the requested transaction.
 				for ext in _extrinsics.into_iter() {
 					let _ = match &ext.0.function {
-						RuntimeCall::Ethereum(transact { transaction }) => {
+						RuntimeCall::Ethereum(pallet_ethereum::Call::transact { transaction }) => {
 							if transaction == _traced_transaction {
 								EvmTracer::new().trace(|| Executive::apply_extrinsic(ext));
 								return Ok(());
@@ -670,7 +669,6 @@ sp_api::impl_runtime_apis! {
 			#[cfg(feature = "evm-tracing")]
 			{
 				use moonbeam_evm_tracer::tracer::EvmTracer;
-				use frame_system::pallet_prelude::BlockNumberFor;
 				use xcm_primitives::EthereumXcmTracingStatus;
 
 				// Tell the CallDispatcher we are tracing a full Block.
@@ -692,7 +690,7 @@ sp_api::impl_runtime_apis! {
 				// Apply all extrinsics. Ethereum extrinsics are traced.
 				for ext in _extrinsics.into_iter() {
 					match &ext.0.function {
-						RuntimeCall::Ethereum(transact { transaction }) => {
+						RuntimeCall::Ethereum(pallet_ethereum::Call::transact { transaction }) => {
 							if _known_transactions.contains(&transaction.hash()) {
 								// Each known extrinsic is a new call stack.
 								EvmTracer::emit_new();
@@ -733,6 +731,7 @@ sp_api::impl_runtime_apis! {
 		) -> Result<(), sp_runtime::DispatchError> {
 			#[cfg(feature = "evm-tracing")]
 			{
+				use pallet_evm::{GasWeightMapping, Runner};
 				use moonbeam_evm_tracer::tracer::EvmTracer;
 
 				// Initialize block: calls the "on_initialize" hook on every pallet
@@ -789,7 +788,7 @@ sp_api::impl_runtime_apis! {
 						_max_priority_fee_per_gas,
 						_nonce,
 						_access_list.unwrap_or_default(),
-						_is_transactional,
+						is_transactional,
 						validate,
 						weight_limit,
 						proof_size_base_cost,
@@ -895,6 +894,28 @@ sp_api::impl_runtime_apis! {
 	}
 }
 
+// Helper function to replay the "on_idle" hook for all pallets, we need this for
+// evm-tracing because some ethereum-xcm transactions might be executed at on_idle.
+//
+// We need to make sure that we replay on_idle exactly the same way as the
+// original block execution, but unfortunatly frame executive diosn't provide a function
+// to replay only on_idle, so we need to copy here some code inside frame executive.
+#[cfg(feature = "evm-tracing")]
+fn replay_on_idle() {
+	use frame_support::traits::OnIdle;
+	use frame_system::pallet_prelude::BlockNumberFor;
+
+	let weight = <frame_system::Pallet<Runtime>>::block_weight();
+	let max_weight = pallet_config::RuntimeBlockWeights::get().max_block;
+	let remaining_weight = max_weight.saturating_sub(weight.total());
+	if remaining_weight.all_gt(frame_support::weights::Weight::zero()) {
+		let _ = <AllPalletsWithSystem as OnIdle<BlockNumberFor<Runtime>>>::on_idle(
+			<frame_system::Pallet<Runtime>>::block_number(),
+			remaining_weight,
+		);
+	}
+}
+
 cumulus_pallet_parachain_system::register_validate_block! {
 	Runtime = Runtime,
 	BlockExecutor = cumulus_pallet_aura_ext::BlockExecutor::<Runtime, Executive>,
diff --git a/runtime/koi/src/lib.rs b/runtime/koi/src/lib.rs
index f0c802776..e326cca7c 100644
--- a/runtime/koi/src/lib.rs
+++ b/runtime/koi/src/lib.rs
@@ -585,12 +585,11 @@ sp_api::impl_runtime_apis! {
 					EthereumXcmTracingStatus
 				};
 				use frame_support::storage::unhashed;
-				use frame_system::pallet_prelude::BlockNumberFor;
 
 				// Tell the CallDispatcher we are tracing a specific Transaction.
 				unhashed::put::<EthereumXcmTracingStatus>(
 					ETHEREUM_XCM_TRACING_STORAGE_KEY,
-					&EthereumXcmTracingStatus::Transaction(traced_transaction.hash()),
+					&EthereumXcmTracingStatus::Transaction(_traced_transaction.hash()),
 				);
 
 				// Initialize block: calls the "on_initialize" hook on every pallet
@@ -604,7 +603,7 @@ sp_api::impl_runtime_apis! {
 				// transactions that preceded the requested transaction.
 				for ext in _extrinsics.into_iter() {
 					let _ = match &ext.0.function {
-						RuntimeCall::Ethereum(transact { transaction }) => {
+						RuntimeCall::Ethereum(pallet_ethereum::Call::transact { transaction }) => {
 							if transaction == _traced_transaction {
 								EvmTracer::new().trace(|| Executive::apply_extrinsic(ext));
 								return Ok(());
@@ -658,7 +657,6 @@ sp_api::impl_runtime_apis! {
 			#[cfg(feature = "evm-tracing")]
 			{
 				use moonbeam_evm_tracer::tracer::EvmTracer;
-				use frame_system::pallet_prelude::BlockNumberFor;
 				use xcm_primitives::EthereumXcmTracingStatus;
 
 				// Tell the CallDispatcher we are tracing a full Block.
@@ -680,7 +678,7 @@ sp_api::impl_runtime_apis! {
 				// Apply all extrinsics. Ethereum extrinsics are traced.
 				for ext in _extrinsics.into_iter() {
 					match &ext.0.function {
-						RuntimeCall::Ethereum(transact { transaction }) => {
+						RuntimeCall::Ethereum(pallet_ethereum::Call::transact { transaction }) => {
 							if _known_transactions.contains(&transaction.hash()) {
 								// Each known extrinsic is a new call stack.
 								EvmTracer::emit_new();
@@ -721,6 +719,7 @@ sp_api::impl_runtime_apis! {
 		) -> Result<(), sp_runtime::DispatchError> {
 			#[cfg(feature = "evm-tracing")]
 			{
+				use pallet_evm::{GasWeightMapping, Runner};
 				use moonbeam_evm_tracer::tracer::EvmTracer;
 
 				// Initialize block: calls the "on_initialize" hook on every pallet
@@ -777,7 +776,7 @@ sp_api::impl_runtime_apis! {
 						_max_priority_fee_per_gas,
 						_nonce,
 						_access_list.unwrap_or_default(),
-						_is_transactional,
+						is_transactional,
 						validate,
 						weight_limit,
 						proof_size_base_cost,
@@ -884,6 +883,28 @@ sp_api::impl_runtime_apis! {
 	}
 }
 
+// Helper function to replay the "on_idle" hook for all pallets, we need this for
+// evm-tracing because some ethereum-xcm transactions might be executed at on_idle.
+//
+// We need to make sure that we replay on_idle exactly the same way as the
+// original block execution, but unfortunatly frame executive diosn't provide a function
+// to replay only on_idle, so we need to copy here some code inside frame executive.
+#[cfg(feature = "evm-tracing")]
+fn replay_on_idle() {
+	use frame_support::traits::OnIdle;
+	use frame_system::pallet_prelude::BlockNumberFor;
+
+	let weight = <frame_system::Pallet<Runtime>>::block_weight();
+	let max_weight = pallet_config::RuntimeBlockWeights::get().max_block;
+	let remaining_weight = max_weight.saturating_sub(weight.total());
+	if remaining_weight.all_gt(frame_support::weights::Weight::zero()) {
+		let _ = <AllPalletsWithSystem as OnIdle<BlockNumberFor<Runtime>>>::on_idle(
+			<frame_system::Pallet<Runtime>>::block_number(),
+			remaining_weight,
+		);
+	}
+}
+
 cumulus_pallet_parachain_system::register_validate_block! {
 	Runtime = Runtime,
 	BlockExecutor = cumulus_pallet_aura_ext::BlockExecutor::<Runtime, Executive>,

From 52d94ba50ef5f27f5332dd00f3846afa6122d2ec Mon Sep 17 00:00:00 2001
From: Bear Wang <boundless.forest@outlook.com>
Date: Thu, 27 Jun 2024 13:38:20 +0800
Subject: [PATCH 56/59] Reuse upstream `proof_size_base_cost()` (#1521)

---
 pallet/ethtx-forwarder/src/lib.rs | 16 +++-------------
 1 file changed, 3 insertions(+), 13 deletions(-)

diff --git a/pallet/ethtx-forwarder/src/lib.rs b/pallet/ethtx-forwarder/src/lib.rs
index 3be878aca..5927bcbe7 100644
--- a/pallet/ethtx-forwarder/src/lib.rs
+++ b/pallet/ethtx-forwarder/src/lib.rs
@@ -230,8 +230,9 @@ impl<T: Config> Pallet<T> {
 				transaction_data.gas_limit.unique_saturated_into(),
 				true,
 			) {
-				weight_limit if weight_limit.proof_size() > 0 =>
-					(Some(weight_limit), Some(proof_size_base_cost(&transaction))),
+				weight_limit if weight_limit.proof_size() > 0 => {
+					(Some(weight_limit), Some(transaction_data.proof_size_base_cost()))
+				},
 				_ => (None, None),
 			};
 
@@ -290,17 +291,6 @@ impl From<TransactionValidationError> for TxErrorWrapper {
 	}
 }
 
-// TODO: Reuse the frontier implementation
-fn proof_size_base_cost(transaction: &Transaction) -> u64 {
-	transaction
-		.encode()
-		.len()
-		// pallet index
-		.saturating_add(1)
-		// call index
-		.saturating_add(1) as u64
-}
-
 #[derive(Clone, Debug, PartialEq, Eq, Encode, Decode, TypeInfo)]
 pub struct ForwardRequest {
 	pub tx_type: TxType,

From c7f51f53c4c73eb404b80ab553e56725822c0d49 Mon Sep 17 00:00:00 2001
From: bear <boundless.forest@outlook.com>
Date: Thu, 27 Jun 2024 13:42:51 +0800
Subject: [PATCH 57/59] Format issue

---
 pallet/ethtx-forwarder/src/lib.rs    | 5 ++---
 runtime/crab/src/pallets/tx_pause.rs | 4 ++--
 runtime/koi/src/pallets/tx_pause.rs  | 4 ++--
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/pallet/ethtx-forwarder/src/lib.rs b/pallet/ethtx-forwarder/src/lib.rs
index 5927bcbe7..ca1ff3784 100644
--- a/pallet/ethtx-forwarder/src/lib.rs
+++ b/pallet/ethtx-forwarder/src/lib.rs
@@ -230,9 +230,8 @@ impl<T: Config> Pallet<T> {
 				transaction_data.gas_limit.unique_saturated_into(),
 				true,
 			) {
-				weight_limit if weight_limit.proof_size() > 0 => {
-					(Some(weight_limit), Some(transaction_data.proof_size_base_cost()))
-				},
+				weight_limit if weight_limit.proof_size() > 0 =>
+					(Some(weight_limit), Some(transaction_data.proof_size_base_cost())),
 				_ => (None, None),
 			};
 
diff --git a/runtime/crab/src/pallets/tx_pause.rs b/runtime/crab/src/pallets/tx_pause.rs
index 3a7c19db4..dd9651728 100644
--- a/runtime/crab/src/pallets/tx_pause.rs
+++ b/runtime/crab/src/pallets/tx_pause.rs
@@ -43,8 +43,8 @@ impl frame_support::traits::Contains<pallet_tx_pause::RuntimeCallNameOf<Runtime>
 				| b"Assets" | b"Deposit"
 				| b"AccountMigration"
 				| b"DarwiniaStaking"
-				| b"Ethereum"
-				| b"EVM" | b"EthTxForwarder"
+				| b"Ethereum" | b"EVM"
+				| b"EthTxForwarder"
 		)
 	}
 }
diff --git a/runtime/koi/src/pallets/tx_pause.rs b/runtime/koi/src/pallets/tx_pause.rs
index 4ff419cf8..e4661cb2f 100644
--- a/runtime/koi/src/pallets/tx_pause.rs
+++ b/runtime/koi/src/pallets/tx_pause.rs
@@ -42,8 +42,8 @@ impl frame_support::traits::Contains<pallet_tx_pause::RuntimeCallNameOf<Runtime>
 			b"Balances"
 				| b"Assets" | b"Deposit"
 				| b"DarwiniaStaking"
-				| b"Ethereum"
-				| b"EVM" | b"EthTxForwarder"
+				| b"Ethereum" | b"EVM"
+				| b"EthTxForwarder"
 		)
 	}
 }

From a66f683ac43ba6e417ee79433e9bdf9eed633655 Mon Sep 17 00:00:00 2001
From: Xavier Lau <xavier@inv.cafe>
Date: Thu, 27 Jun 2024 15:13:19 +0800
Subject: [PATCH 58/59] Fixes

---
 runtime/common/src/benchmark_helper.rs | 18 ++++++++++++++++++
 runtime/common/src/pallet_config.rs    |  5 ++---
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/runtime/common/src/benchmark_helper.rs b/runtime/common/src/benchmark_helper.rs
index 33391e083..b50697a98 100644
--- a/runtime/common/src/benchmark_helper.rs
+++ b/runtime/common/src/benchmark_helper.rs
@@ -1,3 +1,21 @@
+// This file is part of Darwinia.
+//
+// Copyright (C) Darwinia Network
+// SPDX-License-Identifier: GPL-3.0
+//
+// Darwinia is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Darwinia is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU General Public License for more details.
+//
+// You should have received a copy of the GNU General Public License
+// along with Darwinia. If not, see <https://www.gnu.org/licenses/>.
+
 // crates.io
 use codec::Encode;
 // darwinia
diff --git a/runtime/common/src/pallet_config.rs b/runtime/common/src/pallet_config.rs
index eb745798f..f3f81c7b1 100644
--- a/runtime/common/src/pallet_config.rs
+++ b/runtime/common/src/pallet_config.rs
@@ -11,8 +11,7 @@ const AVERAGE_ON_INITIALIZE_RATIO: sp_runtime::Perbill = sp_runtime::Perbill::fr
 /// We allow `Normal` extrinsics to fill up the block up to 75%, the rest can be used by
 /// `Operational` extrinsics.
 pub const NORMAL_DISPATCH_RATIO: sp_runtime::Perbill = sp_runtime::Perbill::from_percent(75);
-/// We allow for 0.5 of a second of compute with a 12 second average block time.
-const WEIGHT_MILLISECS_PER_BLOCK: u64 = 500;
+const WEIGHT_MILLISECS_PER_BLOCK: u64 = 2_000;
 pub const MAXIMUM_BLOCK_WEIGHT: frame_support::weights::Weight =
 	frame_support::weights::Weight::from_parts(
 		frame_support::weights::constants::WEIGHT_REF_TIME_PER_SECOND.saturating_mul(2),
@@ -75,7 +74,7 @@ frame_support::parameter_types! {
 	// Restrict the POV size of the Ethereum transactions in the same way as weight limit.
 	pub BlockPovSizeLimit: u64 = NORMAL_DISPATCH_RATIO * cumulus_primitives_core::relay_chain::MAX_POV_SIZE as u64;
 	pub WeightPerGas: frame_support::weights::Weight = frame_support::weights::Weight::from_parts(
-		fp_evm::weight_per_gas(BLOCK_GAS_LIMIT, NORMAL_DISPATCH_RATIO, WEIGHT_MILLISECS_PER_BLOCK * 4),
+		fp_evm::weight_per_gas(BLOCK_GAS_LIMIT, NORMAL_DISPATCH_RATIO, WEIGHT_MILLISECS_PER_BLOCK),
 		0
 	);
 	// FIXME: https://github.com/rust-lang/rust/issues/88581

From 3a5256292daf45f7257a7266865da28edec5bd10 Mon Sep 17 00:00:00 2001
From: bear <boundless.forest@outlook.com>
Date: Thu, 27 Jun 2024 16:13:46 +0800
Subject: [PATCH 59/59] Fix CI

---
 runtime/crab/src/pallets/tx_pause.rs | 4 ++--
 runtime/koi/src/pallets/tx_pause.rs  | 4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/runtime/crab/src/pallets/tx_pause.rs b/runtime/crab/src/pallets/tx_pause.rs
index dd9651728..3a7c19db4 100644
--- a/runtime/crab/src/pallets/tx_pause.rs
+++ b/runtime/crab/src/pallets/tx_pause.rs
@@ -43,8 +43,8 @@ impl frame_support::traits::Contains<pallet_tx_pause::RuntimeCallNameOf<Runtime>
 				| b"Assets" | b"Deposit"
 				| b"AccountMigration"
 				| b"DarwiniaStaking"
-				| b"Ethereum" | b"EVM"
-				| b"EthTxForwarder"
+				| b"Ethereum"
+				| b"EVM" | b"EthTxForwarder"
 		)
 	}
 }
diff --git a/runtime/koi/src/pallets/tx_pause.rs b/runtime/koi/src/pallets/tx_pause.rs
index e4661cb2f..4ff419cf8 100644
--- a/runtime/koi/src/pallets/tx_pause.rs
+++ b/runtime/koi/src/pallets/tx_pause.rs
@@ -42,8 +42,8 @@ impl frame_support::traits::Contains<pallet_tx_pause::RuntimeCallNameOf<Runtime>
 			b"Balances"
 				| b"Assets" | b"Deposit"
 				| b"DarwiniaStaking"
-				| b"Ethereum" | b"EVM"
-				| b"EthTxForwarder"
+				| b"Ethereum"
+				| b"EVM" | b"EthTxForwarder"
 		)
 	}
 }