diff --git a/operator/Cargo.lock b/operator/Cargo.lock
index 586435c36..cf90f05da 100644
--- a/operator/Cargo.lock
+++ b/operator/Cargo.lock
@@ -343,7 +343,7 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fb00293ba84f51ce3bd026bd0de55899c4e68f0a39a5728cebae3a73ffdc0a4f"
 dependencies = [
- "ark-ec",
+ "ark-ec 0.4.2",
  "ark-ff 0.4.2",
  "ark-std 0.4.0",
 ]
@@ -354,12 +354,24 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c775f0d12169cba7aae4caeb547bb6a50781c7449a8aa53793827c9ec4abf488"
 dependencies = [
- "ark-ec",
+ "ark-ec 0.4.2",
  "ark-ff 0.4.2",
  "ark-serialize 0.4.2",
  "ark-std 0.4.0",
 ]
 
+[[package]]
+name = "ark-bls12-381"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3df4dcc01ff89867cd86b0da835f23c3f02738353aaee7dde7495af71363b8d5"
+dependencies = [
+ "ark-ec 0.5.0",
+ "ark-ff 0.5.0",
+ "ark-serialize 0.5.0",
+ "ark-std 0.5.0",
+]
+
 [[package]]
 name = "ark-ec"
 version = "0.4.2"
@@ -367,7 +379,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "defd9a439d56ac24968cca0571f598a61bc8c55f71d50a89cda591cb750670ba"
 dependencies = [
  "ark-ff 0.4.2",
- "ark-poly",
+ "ark-poly 0.4.2",
  "ark-serialize 0.4.2",
  "ark-std 0.4.0",
  "derivative",
@@ -377,6 +389,39 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "ark-ec"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43d68f2d516162846c1238e755a7c4d131b892b70cc70c471a8e3ca3ed818fce"
+dependencies = [
+ "ahash",
+ "ark-ff 0.5.0",
+ "ark-poly 0.5.0",
+ "ark-serialize 0.5.0",
+ "ark-std 0.5.0",
+ "educe",
+ "fnv",
+ "hashbrown 0.15.5",
+ "itertools 0.13.0",
+ "num-bigint",
+ "num-integer",
+ "num-traits",
+ "zeroize",
+]
+
+[[package]]
+name = "ark-ed-on-bls12-381-bandersnatch"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1786b2e3832f6f0f7c8d62d5d5a282f6952a1ab99981c54cd52b6ac1d8f02df5"
+dependencies = [
+ "ark-bls12-381 0.5.0",
+ "ark-ec 0.5.0",
+ "ark-ff 0.5.0",
+ "ark-std 0.5.0",
+]
+
 [[package]]
 name = "ark-ff"
 version = "0.3.0"
@@ -516,6 +561,21 @@ dependencies = [
  "hashbrown 0.13.2",
 ]
 
+[[package]]
+name = "ark-poly"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "579305839da207f02b89cd1679e50e67b4331e2f9294a57693e5051b7703fe27"
+dependencies = [
+ "ahash",
+ "ark-ff 0.5.0",
+ "ark-serialize 0.5.0",
+ "ark-std 0.5.0",
+ "educe",
+ "fnv",
+ "hashbrown 0.15.5",
+]
+
 [[package]]
 name = "ark-serialize"
 version = "0.3.0"
@@ -532,7 +592,7 @@ version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "adb7b85a02b83d2f22f89bd5cac66c9c89474240cb6207cb1efc16d098e822a5"
 dependencies = [
- "ark-serialize-derive",
+ "ark-serialize-derive 0.4.2",
  "ark-std 0.4.0",
  "digest 0.10.7",
  "num-bigint",
@@ -544,6 +604,7 @@ version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f4d068aaf107ebcd7dfb52bc748f8030e0fc930ac8e360146ca54c1203088f7"
 dependencies = [
+ "ark-serialize-derive 0.5.0",
  "ark-std 0.5.0",
  "arrayvec 0.7.6",
  "digest 0.10.7",
@@ -561,6 +622,17 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "ark-serialize-derive"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "213888f660fddcca0d257e88e54ac05bca01885f258ccdf695bafd77031bb69d"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.106",
+]
+
 [[package]]
 name = "ark-std"
 version = "0.3.0"
@@ -591,6 +663,39 @@ dependencies = [
  "rand 0.8.5",
 ]
 
+[[package]]
+name = "ark-transcript"
+version = "0.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "47c1c928edb9d8ff24cb5dcb7651d3a98494fff3099eee95c2404cd813a9139f"
+dependencies = [
+ "ark-ff 0.5.0",
+ "ark-serialize 0.5.0",
+ "ark-std 0.5.0",
+ "digest 0.10.7",
+ "rand_core 0.6.4",
+ "sha3",
+]
+
+[[package]]
+name = "ark-vrf"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0d63e9780640021b74d02b32895d8cec1b4abe8e5547b560a6bda6b14b78c6da"
+dependencies = [
+ "ark-bls12-381 0.5.0",
+ "ark-ec 0.5.0",
+ "ark-ed-on-bls12-381-bandersnatch",
+ "ark-ff 0.5.0",
+ "ark-serialize 0.5.0",
+ "ark-std 0.5.0",
+ "digest 0.10.7",
+ "rand_chacha 0.3.1",
+ "sha2 0.10.9",
+ "w3f-ring-proof",
+ "zeroize",
+]
+
 [[package]]
 name = "array-bytes"
 version = "6.2.3"
@@ -620,12 +725,12 @@ checksum = "7c02d123df017efcdfbd739ef81735b36c5ba83ec3c59c80a9d7ecc718f92e50"
 
 [[package]]
 name = "asn1-rs"
-version = "0.5.2"
+version = "0.6.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7f6fd5ddaf0351dff5b8da21b2fb4ff8e08ddd02857f0bf69c47639106c0fff0"
+checksum = "5493c3bedbacf7fd7382c6346bbd66687d12bbaad3a89a2d2c303ee6cf20b048"
 dependencies = [
- "asn1-rs-derive 0.4.0",
- "asn1-rs-impl 0.1.0",
+ "asn1-rs-derive 0.5.1",
+ "asn1-rs-impl",
  "displaydoc",
  "nom",
  "num-traits",
@@ -641,7 +746,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "56624a96882bb8c26d61312ae18cb45868e5a9992ea73c58e45c3101e56a1e60"
 dependencies = [
  "asn1-rs-derive 0.6.0",
- "asn1-rs-impl 0.2.0",
+ "asn1-rs-impl",
  "displaydoc",
  "nom",
  "num-traits",
@@ -652,14 +757,14 @@ dependencies = [
 
 [[package]]
 name = "asn1-rs-derive"
-version = "0.4.0"
+version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "726535892e8eae7e70657b4c8ea93d26b8553afb1ce617caee529ef96d7dee6c"
+checksum = "965c2d33e53cb6b267e148a4cb0760bc01f4904c1cd4bb4002a085bb016d1490"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 1.0.109",
- "synstructure 0.12.6",
+ "syn 2.0.106",
+ "synstructure 0.13.2",
 ]
 
 [[package]]
@@ -674,17 +779,6 @@ dependencies = [
  "synstructure 0.13.2",
 ]
 
-[[package]]
-name = "asn1-rs-impl"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2777730b2039ac0f95f093556e61b6d26cebed5393ca6f152717777cec3a42ed"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "asn1-rs-impl"
 version = "0.2.0"
@@ -897,6 +991,19 @@ dependencies = [
  "pin-project-lite",
 ]
 
+[[package]]
+name = "asynchronous-codec"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a860072022177f903e59730004fb5dc13db9275b79bb2aef7ba8ce831956c233"
+dependencies = [
+ "bytes",
+ "futures-sink",
+ "futures-util",
+ "memchr",
+ "pin-project-lite",
+]
+
 [[package]]
 name = "atoi"
 version = "2.0.0"
@@ -1068,12 +1175,6 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6107fe1be6682a68940da878d9e9f5e90ca5745b3dec9fd1bb393c8777d4f581"
 
-[[package]]
-name = "base64"
-version = "0.13.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9e1b586273c5702936fe7b7d6896644d8be71e6314cfe09d3167c95f712589e8"
-
 [[package]]
 name = "base64"
 version = "0.21.7"
@@ -1104,15 +1205,6 @@ dependencies = [
  "tokio",
 ]
 
-[[package]]
-name = "beef"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3a8241f3ebb85c056b509d4327ad0358fbbba6ffb340bf388f26350aeda225b1"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "bigdecimal"
 version = "0.4.8"
@@ -1130,7 +1222,7 @@ dependencies = [
 [[package]]
 name = "binary-merkle-tree"
 version = "16.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "hash-db",
  "log",
@@ -1208,7 +1300,7 @@ version = "2.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "43d193de1f7487df1914d3a568b772458861d33f9c54249612cc2893d6915054"
 dependencies = [
- "bitcoin_hashes",
+ "bitcoin_hashes 0.13.0",
  "serde",
  "unicode-normalization",
 ]
@@ -1234,6 +1326,12 @@ version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9425c3bf7089c983facbae04de54513cce73b41c7f9ff8c845b54e7bc64ebbfb"
 
+[[package]]
+name = "bitcoin-io"
+version = "0.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2dee39a0ee5b4095224a0cfc6bf4cc1baf0f9624b96b367e53b66d974e51d953"
+
 [[package]]
 name = "bitcoin_hashes"
 version = "0.13.0"
@@ -1241,7 +1339,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1930a4dabfebb8d7d9992db18ebe3ae2876f0a305fab206fd168df931ede293b"
 dependencies = [
  "bitcoin-internals",
- "hex-conservative",
+ "hex-conservative 0.1.2",
+]
+
+[[package]]
+name = "bitcoin_hashes"
+version = "0.14.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26ec84b80c482df901772e931a9a681e26a1b9ee2302edeff23cb30328745c8b"
+dependencies = [
+ "bitcoin-io",
+ "hex-conservative 0.2.2",
 ]
 
 [[package]]
@@ -1389,8 +1497,8 @@ dependencies = [
 
 [[package]]
 name = "bp-header-chain"
-version = "0.19.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "0.20.1"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "bp-runtime",
  "finality-grandpa",
@@ -1406,8 +1514,8 @@ dependencies = [
 
 [[package]]
 name = "bp-messages"
-version = "0.19.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "0.20.1"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "bp-header-chain",
  "bp-runtime",
@@ -1422,8 +1530,8 @@ dependencies = [
 
 [[package]]
 name = "bp-parachains"
-version = "0.19.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "0.20.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "bp-header-chain",
  "bp-polkadot-core",
@@ -1439,8 +1547,8 @@ dependencies = [
 
 [[package]]
 name = "bp-polkadot-core"
-version = "0.19.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "0.20.1"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "bp-messages",
  "bp-runtime",
@@ -1456,8 +1564,8 @@ dependencies = [
 
 [[package]]
 name = "bp-relayers"
-version = "0.19.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "0.20.1"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "bp-header-chain",
  "bp-messages",
@@ -1474,8 +1582,8 @@ dependencies = [
 
 [[package]]
 name = "bp-runtime"
-version = "0.19.1"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "0.20.1"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -1492,36 +1600,37 @@ dependencies = [
  "sp-state-machine",
  "sp-std",
  "sp-trie",
- "trie-db 0.29.1",
+ "trie-db 0.30.0",
 ]
 
 [[package]]
 name = "bridge-hub-common"
-version = "0.12.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "0.13.1"
 dependencies = [
  "cumulus-primitives-core",
  "frame-support",
  "pallet-message-queue",
  "parity-scale-codec",
  "scale-info",
- "snowbridge-core 0.12.2",
+ "snowbridge-core 0.23.0",
  "sp-core",
  "sp-runtime",
- "sp-std",
  "staging-xcm",
+ "staging-xcm-builder",
+ "staging-xcm-executor",
 ]
 
 [[package]]
 name = "bridge-hub-common"
 version = "0.13.1"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "cumulus-primitives-core",
  "frame-support",
  "pallet-message-queue",
  "parity-scale-codec",
  "scale-info",
- "snowbridge-core 0.26.0",
+ "snowbridge-core 0.13.2",
  "sp-core",
  "sp-runtime",
  "sp-std",
@@ -1833,7 +1942,7 @@ dependencies = [
  "anstream",
  "anstyle",
  "clap_lex",
- "strsim 0.11.1",
+ "strsim",
  "terminal_size",
 ]
 
@@ -2286,6 +2395,21 @@ dependencies = [
  "subtle 2.6.1",
 ]
 
+[[package]]
+name = "crypto_secretbox"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b9d6cf87adf719ddf43a805e92c6870a531aedda35ff640442cbaf8674e141e1"
+dependencies = [
+ "aead",
+ "cipher 0.4.4",
+ "generic-array 0.14.7",
+ "poly1305",
+ "salsa20",
+ "subtle 2.6.1",
+ "zeroize",
+]
+
 [[package]]
 name = "ctr"
 version = "0.9.2"
@@ -2297,8 +2421,8 @@ dependencies = [
 
 [[package]]
 name = "cumulus-client-parachain-inherent"
-version = "0.15.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "0.17.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "async-trait",
  "cumulus-primitives-core",
@@ -2307,20 +2431,18 @@ dependencies = [
  "cumulus-test-relay-sproof-builder",
  "parity-scale-codec",
  "sc-client-api",
- "sp-api",
- "sp-crypto-hashing 0.1.0 (git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6)",
+ "sp-crypto-hashing 0.1.0 (git+https://github.com/paritytech/polkadot-sdk?branch=stable2503)",
  "sp-inherents",
  "sp-runtime",
  "sp-state-machine",
  "sp-storage",
- "sp-trie",
  "tracing",
 ]
 
 [[package]]
 name = "cumulus-primitives-core"
-version = "0.17.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "0.18.1"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "parity-scale-codec",
  "polkadot-core-primitives",
@@ -2335,8 +2457,8 @@ dependencies = [
 
 [[package]]
 name = "cumulus-primitives-parachain-inherent"
-version = "0.17.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "0.18.1"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "async-trait",
  "cumulus-primitives-core",
@@ -2349,8 +2471,8 @@ dependencies = [
 
 [[package]]
 name = "cumulus-primitives-proof-size-hostfunction"
-version = "0.11.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "0.12.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "sp-externalities",
  "sp-runtime-interface",
@@ -2359,8 +2481,8 @@ dependencies = [
 
 [[package]]
 name = "cumulus-primitives-storage-weight-reclaim"
-version = "9.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "11.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "cumulus-primitives-core",
  "cumulus-primitives-proof-size-hostfunction",
@@ -2376,13 +2498,13 @@ dependencies = [
 
 [[package]]
 name = "cumulus-relay-chain-interface"
-version = "0.21.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "0.23.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "async-trait",
  "cumulus-primitives-core",
  "futures",
- "jsonrpsee-core 0.24.9",
+ "jsonrpsee-core",
  "parity-scale-codec",
  "polkadot-overseer",
  "sc-client-api",
@@ -2395,8 +2517,8 @@ dependencies = [
 
 [[package]]
 name = "cumulus-test-relay-sproof-builder"
-version = "0.17.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "0.19.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "cumulus-primitives-core",
  "parity-scale-codec",
@@ -2496,38 +2618,14 @@ dependencies = [
  "syn 2.0.106",
 ]
 
-[[package]]
-name = "darling"
-version = "0.14.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7b750cb3417fd1b327431a470f388520309479ab0bf5e323505daf0290cd3850"
-dependencies = [
- "darling_core 0.14.4",
- "darling_macro 0.14.4",
-]
-
 [[package]]
 name = "darling"
 version = "0.20.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc7f46116c46ff9ab3eb1597a45688b6715c6e628b5c133e288e709a29bcb4ee"
 dependencies = [
- "darling_core 0.20.11",
- "darling_macro 0.20.11",
-]
-
-[[package]]
-name = "darling_core"
-version = "0.14.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "109c1ca6e6b7f82cc233a97004ea8ed7ca123a9af07a8230878fcfda9b158bf0"
-dependencies = [
- "fnv",
- "ident_case",
- "proc-macro2",
- "quote",
- "strsim 0.10.0",
- "syn 1.0.109",
+ "darling_core",
+ "darling_macro",
 ]
 
 [[package]]
@@ -2540,28 +2638,17 @@ dependencies = [
  "ident_case",
  "proc-macro2",
  "quote",
- "strsim 0.11.1",
+ "strsim",
  "syn 2.0.106",
 ]
 
-[[package]]
-name = "darling_macro"
-version = "0.14.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4aab4dbc9f7611d8b55048a3a16d2d010c2c8334e46304b40ac1cc14bf3b48e"
-dependencies = [
- "darling_core 0.14.4",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "darling_macro"
 version = "0.20.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc34b93ccb385b40dc71c6fceac4b2ad23662c7eeb248cf10d529b7e055b6ead"
 dependencies = [
- "darling_core 0.20.11",
+ "darling_core",
  "quote",
  "syn 2.0.106",
 ]
@@ -2607,12 +2694,13 @@ dependencies = [
 
 [[package]]
 name = "datahaven-mainnet-runtime"
-version = "0.26.0"
+version = "0.23.0"
 dependencies = [
  "alloy-core",
  "bridge-hub-common 0.13.1",
  "datahaven-runtime-common",
  "dhp-bridge",
+ "ethereum",
  "fp-account",
  "fp-evm",
  "fp-rpc",
@@ -2720,11 +2808,11 @@ dependencies = [
  "shp-treasury-funding",
  "shp-tx-implicits-runtime-api",
  "smallvec",
- "snowbridge-beacon-primitives 0.26.0",
- "snowbridge-core 0.26.0",
+ "snowbridge-beacon-primitives 0.23.0",
+ "snowbridge-core 0.23.0",
  "snowbridge-inbound-queue-primitives",
- "snowbridge-merkle-tree",
- "snowbridge-outbound-queue-primitives",
+ "snowbridge-merkle-tree 0.23.0",
+ "snowbridge-outbound-queue-primitives 0.23.0",
  "snowbridge-outbound-queue-v2-runtime-api",
  "snowbridge-pallet-ethereum-client",
  "snowbridge-pallet-ethereum-client-fixtures",
@@ -2733,7 +2821,7 @@ dependencies = [
  "snowbridge-pallet-system",
  "snowbridge-pallet-system-v2",
  "snowbridge-system-v2-runtime-api",
- "snowbridge-verification-primitives",
+ "snowbridge-verification-primitives 0.23.0",
  "sp-api",
  "sp-block-builder",
  "sp-consensus-babe",
@@ -2748,7 +2836,6 @@ dependencies = [
  "sp-runtime",
  "sp-session",
  "sp-staking",
- "sp-std",
  "sp-storage",
  "sp-tracing",
  "sp-transaction-pool",
@@ -2764,7 +2851,7 @@ dependencies = [
 
 [[package]]
 name = "datahaven-node"
-version = "0.26.0"
+version = "0.23.0"
 dependencies = [
  "async-channel 1.9.0",
  "clap",
@@ -2790,7 +2877,7 @@ dependencies = [
  "frame-system-rpc-runtime-api",
  "futures",
  "hex-literal 0.3.4",
- "jsonrpsee 0.24.9",
+ "jsonrpsee",
  "log",
  "mmr-gadget",
  "mmr-rpc",
@@ -2877,7 +2964,7 @@ dependencies = [
 
 [[package]]
 name = "datahaven-runtime-common"
-version = "0.26.0"
+version = "0.23.0"
 dependencies = [
  "alloy-core",
  "fp-account",
@@ -2901,22 +2988,22 @@ dependencies = [
  "polkadot-runtime-common",
  "precompile-utils",
  "scale-info",
- "snowbridge-outbound-queue-primitives",
+ "snowbridge-outbound-queue-primitives 0.23.0",
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
  "staging-xcm",
 ]
 
 [[package]]
 name = "datahaven-stagenet-runtime"
-version = "0.26.0"
+version = "0.23.0"
 dependencies = [
  "alloy-core",
  "bridge-hub-common 0.13.1",
  "datahaven-runtime-common",
  "dhp-bridge",
+ "ethereum",
  "fp-account",
  "fp-evm",
  "fp-rpc",
@@ -3024,11 +3111,11 @@ dependencies = [
  "shp-treasury-funding",
  "shp-tx-implicits-runtime-api",
  "smallvec",
- "snowbridge-beacon-primitives 0.26.0",
- "snowbridge-core 0.26.0",
+ "snowbridge-beacon-primitives 0.23.0",
+ "snowbridge-core 0.23.0",
  "snowbridge-inbound-queue-primitives",
- "snowbridge-merkle-tree",
- "snowbridge-outbound-queue-primitives",
+ "snowbridge-merkle-tree 0.23.0",
+ "snowbridge-outbound-queue-primitives 0.23.0",
  "snowbridge-outbound-queue-v2-runtime-api",
  "snowbridge-pallet-ethereum-client",
  "snowbridge-pallet-ethereum-client-fixtures",
@@ -3037,7 +3124,7 @@ dependencies = [
  "snowbridge-pallet-system",
  "snowbridge-pallet-system-v2",
  "snowbridge-system-v2-runtime-api",
- "snowbridge-verification-primitives",
+ "snowbridge-verification-primitives 0.23.0",
  "sp-api",
  "sp-block-builder",
  "sp-consensus-babe",
@@ -3052,7 +3139,6 @@ dependencies = [
  "sp-runtime",
  "sp-session",
  "sp-staking",
- "sp-std",
  "sp-storage",
  "sp-tracing",
  "sp-transaction-pool",
@@ -3068,12 +3154,13 @@ dependencies = [
 
 [[package]]
 name = "datahaven-testnet-runtime"
-version = "0.26.0"
+version = "0.23.0"
 dependencies = [
  "alloy-core",
  "bridge-hub-common 0.13.1",
  "datahaven-runtime-common",
  "dhp-bridge",
+ "ethereum",
  "fp-account",
  "fp-evm",
  "fp-rpc",
@@ -3181,11 +3268,11 @@ dependencies = [
  "shp-treasury-funding",
  "shp-tx-implicits-runtime-api",
  "smallvec",
- "snowbridge-beacon-primitives 0.26.0",
- "snowbridge-core 0.26.0",
+ "snowbridge-beacon-primitives 0.23.0",
+ "snowbridge-core 0.23.0",
  "snowbridge-inbound-queue-primitives",
- "snowbridge-merkle-tree",
- "snowbridge-outbound-queue-primitives",
+ "snowbridge-merkle-tree 0.23.0",
+ "snowbridge-outbound-queue-primitives 0.23.0",
  "snowbridge-outbound-queue-v2-runtime-api",
  "snowbridge-pallet-ethereum-client",
  "snowbridge-pallet-ethereum-client-fixtures",
@@ -3194,7 +3281,7 @@ dependencies = [
  "snowbridge-pallet-system",
  "snowbridge-pallet-system-v2",
  "snowbridge-system-v2-runtime-api",
- "snowbridge-verification-primitives",
+ "snowbridge-verification-primitives 0.23.0",
  "sp-api",
  "sp-block-builder",
  "sp-consensus-babe",
@@ -3209,7 +3296,6 @@ dependencies = [
  "sp-runtime",
  "sp-session",
  "sp-staking",
- "sp-std",
  "sp-storage",
  "sp-tracing",
  "sp-transaction-pool",
@@ -3238,11 +3324,11 @@ dependencies = [
 
 [[package]]
 name = "der-parser"
-version = "8.2.0"
+version = "9.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dbd676fbbab537128ef0278adb5576cf363cff6aa22a7b24effe97347cfab61e"
+checksum = "5cd0a5c643689626bec213c4d8bd4d96acc8ffdb4ad4bb6bc16abf27d5f4b553"
 dependencies = [
- "asn1-rs 0.5.2",
+ "asn1-rs 0.6.2",
  "displaydoc",
  "nom",
  "num-bigint",
@@ -3374,7 +3460,7 @@ dependencies = [
 
 [[package]]
 name = "dhp-bridge"
-version = "0.26.0"
+version = "0.23.0"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3382,10 +3468,9 @@ dependencies = [
  "pallet-datahaven-native-transfer",
  "pallet-external-validators",
  "parity-scale-codec",
- "snowbridge-core 0.26.0",
+ "snowbridge-core 0.23.0",
  "snowbridge-inbound-queue-primitives",
  "sp-core",
- "sp-std",
 ]
 
 [[package]]
@@ -3460,12 +3545,6 @@ version = "0.1.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "56254986775e3233ffa9c4d7d3faaf6d36a2c09d30b20687e9f88bc8bafc16c8"
 
-[[package]]
-name = "difflib"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6184e33543162437515c2e2b48714794e37845ec9851711914eec9d308f6ebe8"
-
 [[package]]
 name = "digest"
 version = "0.8.1"
@@ -3515,6 +3594,15 @@ dependencies = [
  "dirs-sys-next",
 ]
 
+[[package]]
+name = "dirs"
+version = "5.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44c45a9d03d6676652bcb5e724c7e988de1acad23a711b5217ab9cbecbec2225"
+dependencies = [
+ "dirs-sys",
+]
+
 [[package]]
 name = "dirs-sys"
 version = "0.4.1"
@@ -3606,7 +3694,7 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "139ae9aca7527f85f26dd76483eb38533fd84bd571065da1739656ef71c5ff5b"
 dependencies = [
- "darling 0.20.11",
+ "darling",
  "either",
  "heck 0.5.0",
  "proc-macro2",
@@ -3765,18 +3853,6 @@ dependencies = [
  "cfg-if",
 ]
 
-[[package]]
-name = "enum-as-inner"
-version = "0.5.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c9720bba047d567ffc8a3cba48bf19126600e249ab7f128e9233e6376976a116"
-dependencies = [
- "heck 0.4.1",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "enum-as-inner"
 version = "0.6.1"
@@ -3895,20 +3971,22 @@ dependencies = [
  "fixed-hash",
  "impl-codec 0.7.1",
  "impl-rlp",
- "impl-serde 0.5.0",
+ "impl-serde",
  "scale-info",
  "tiny-keccak",
 ]
 
 [[package]]
 name = "ethereum"
-version = "0.15.0"
-source = "git+https://github.com/rust-ethereum/ethereum?rev=3be0d8fd4c2ad1ba216b69ef65b9382612efc8ba#3be0d8fd4c2ad1ba216b69ef65b9382612efc8ba"
+version = "0.18.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3ee371ebb7479ed3258617557ab0b3247e741075cb6b02b820d188f68da44441"
 dependencies = [
  "bytes",
  "ethereum-types",
  "hash-db",
  "hash256-std-hasher",
+ "k256",
  "parity-scale-codec",
  "rlp 0.6.1",
  "scale-info",
@@ -3927,7 +4005,7 @@ dependencies = [
  "fixed-hash",
  "impl-codec 0.7.1",
  "impl-rlp",
- "impl-serde 0.5.0",
+ "impl-serde",
  "primitive-types 0.13.1",
  "scale-info",
  "uint 0.10.0",
@@ -3939,16 +4017,6 @@ version = "2.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0206175f82b8d6bf6652ff7d71a1e27fd2e4efde587fd368662814d6ec1d9ce0"
 
-[[package]]
-name = "event-listener"
-version = "4.0.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "67b215c49b2b248c855fb73579eb1f4f26c38ffdc12973e20e07b91d78d5646e"
-dependencies = [
- "concurrent-queue",
- "pin-project-lite",
-]
-
 [[package]]
 name = "event-listener"
 version = "5.4.1"
@@ -3972,8 +4040,9 @@ dependencies = [
 
 [[package]]
 name = "evm"
-version = "0.42.0"
-source = "git+https://github.com/rust-ethereum/evm?rev=6d86fe2d3bcc14887c2575f62958a67ac2d523db#6d86fe2d3bcc14887c2575f62958a67ac2d523db"
+version = "0.43.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b54f188e7563c1702ecefdef92c8b2c4be8941b84a50684907a747f87121aace"
 dependencies = [
  "auto_impl",
  "environmental",
@@ -3992,8 +4061,9 @@ dependencies = [
 
 [[package]]
 name = "evm-core"
-version = "0.42.0"
-source = "git+https://github.com/rust-ethereum/evm?rev=6d86fe2d3bcc14887c2575f62958a67ac2d523db#6d86fe2d3bcc14887c2575f62958a67ac2d523db"
+version = "0.43.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "22ef956f8cc0c25a2d8be1dea7d659782b7c5f201f7e8057878f2051eec78350"
 dependencies = [
  "parity-scale-codec",
  "primitive-types 0.13.1",
@@ -4003,8 +4073,9 @@ dependencies = [
 
 [[package]]
 name = "evm-gasometer"
-version = "0.42.0"
-source = "git+https://github.com/rust-ethereum/evm?rev=6d86fe2d3bcc14887c2575f62958a67ac2d523db#6d86fe2d3bcc14887c2575f62958a67ac2d523db"
+version = "0.43.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "54aa0327b242bad8dd83ba524effd1d798e9102ff592910dfdded79c6bde4ff3"
 dependencies = [
  "environmental",
  "evm-core",
@@ -4014,9 +4085,10 @@ dependencies = [
 
 [[package]]
 name = "evm-runtime"
-version = "0.42.0"
-source = "git+https://github.com/rust-ethereum/evm?rev=6d86fe2d3bcc14887c2575f62958a67ac2d523db#6d86fe2d3bcc14887c2575f62958a67ac2d523db"
-dependencies = [
+version = "0.43.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cf22109a8f12b6d9ae60475584c80f2c9d48cf12427eac651b69ce14e5b95666"
+dependencies = [
  "auto_impl",
  "environmental",
  "evm-core",
@@ -4115,7 +4187,7 @@ dependencies = [
 [[package]]
 name = "fc-api"
 version = "1.0.0-dev"
-source = "git+https://github.com/polkadot-evm/frontier?branch=stable2412#75329a2df49e2cc7981485392c31160929d1bd48"
+source = "git+https://github.com/polkadot-evm/frontier?branch=stable2503#7d1cff7f13828b563752ad8a71458cab1ea42009"
 dependencies = [
  "async-trait",
  "fp-storage",
@@ -4127,7 +4199,7 @@ dependencies = [
 [[package]]
 name = "fc-cli"
 version = "1.0.0-dev"
-source = "git+https://github.com/polkadot-evm/frontier?branch=stable2412#75329a2df49e2cc7981485392c31160929d1bd48"
+source = "git+https://github.com/polkadot-evm/frontier?branch=stable2503#7d1cff7f13828b563752ad8a71458cab1ea42009"
 dependencies = [
  "clap",
  "ethereum-types",
@@ -4145,7 +4217,7 @@ dependencies = [
 [[package]]
 name = "fc-consensus"
 version = "2.0.0-dev"
-source = "git+https://github.com/polkadot-evm/frontier?branch=stable2412#75329a2df49e2cc7981485392c31160929d1bd48"
+source = "git+https://github.com/polkadot-evm/frontier?branch=stable2503#7d1cff7f13828b563752ad8a71458cab1ea42009"
 dependencies = [
  "async-trait",
  "fp-consensus",
@@ -4155,13 +4227,13 @@ dependencies = [
  "sp-block-builder",
  "sp-consensus",
  "sp-runtime",
- "thiserror 1.0.69",
+ "thiserror 2.0.17",
 ]
 
 [[package]]
 name = "fc-db"
 version = "2.0.0-dev"
-source = "git+https://github.com/polkadot-evm/frontier?branch=stable2412#75329a2df49e2cc7981485392c31160929d1bd48"
+source = "git+https://github.com/polkadot-evm/frontier?branch=stable2503#7d1cff7f13828b563752ad8a71458cab1ea42009"
 dependencies = [
  "async-trait",
  "ethereum",
@@ -4191,7 +4263,7 @@ dependencies = [
 [[package]]
 name = "fc-mapping-sync"
 version = "2.0.0-dev"
-source = "git+https://github.com/polkadot-evm/frontier?branch=stable2412#75329a2df49e2cc7981485392c31160929d1bd48"
+source = "git+https://github.com/polkadot-evm/frontier?branch=stable2503#7d1cff7f13828b563752ad8a71458cab1ea42009"
 dependencies = [
  "fc-db",
  "fc-storage",
@@ -4214,7 +4286,7 @@ dependencies = [
 [[package]]
 name = "fc-rpc"
 version = "2.0.0-dev"
-source = "git+https://github.com/polkadot-evm/frontier?branch=stable2412#75329a2df49e2cc7981485392c31160929d1bd48"
+source = "git+https://github.com/polkadot-evm/frontier?branch=stable2503#7d1cff7f13828b563752ad8a71458cab1ea42009"
 dependencies = [
  "ethereum",
  "ethereum-types",
@@ -4228,20 +4300,19 @@ dependencies = [
  "fp-storage",
  "futures",
  "hex",
- "jsonrpsee 0.24.9",
+ "jsonrpsee",
  "libsecp256k1",
  "log",
  "pallet-evm",
  "parity-scale-codec",
  "prometheus",
- "rand 0.8.5",
+ "rand 0.9.2",
  "rlp 0.6.1",
  "sc-client-api",
  "sc-network",
  "sc-network-sync",
  "sc-rpc",
  "sc-service",
- "sc-transaction-pool",
  "sc-transaction-pool-api",
  "sc-utils",
  "schnellru",
@@ -4257,30 +4328,31 @@ dependencies = [
  "sp-runtime",
  "sp-state-machine",
  "sp-storage",
+ "sp-trie",
  "substrate-prometheus-endpoint",
- "thiserror 1.0.69",
+ "thiserror 2.0.17",
  "tokio",
 ]
 
 [[package]]
 name = "fc-rpc-core"
 version = "1.1.0-dev"
-source = "git+https://github.com/polkadot-evm/frontier?branch=stable2412#75329a2df49e2cc7981485392c31160929d1bd48"
+source = "git+https://github.com/polkadot-evm/frontier?branch=stable2503#7d1cff7f13828b563752ad8a71458cab1ea42009"
 dependencies = [
  "ethereum",
  "ethereum-types",
- "jsonrpsee 0.24.9",
+ "jsonrpsee",
  "rlp 0.6.1",
  "rustc-hex",
  "serde",
  "serde_json",
- "sp-crypto-hashing 0.1.0 (git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6)",
+ "sp-crypto-hashing 0.1.0 (git+https://github.com/paritytech/polkadot-sdk?branch=stable2503)",
 ]
 
 [[package]]
 name = "fc-storage"
 version = "1.0.0-dev"
-source = "git+https://github.com/polkadot-evm/frontier?branch=stable2412#75329a2df49e2cc7981485392c31160929d1bd48"
+source = "git+https://github.com/polkadot-evm/frontier?branch=stable2503#7d1cff7f13828b563752ad8a71458cab1ea42009"
 dependencies = [
  "ethereum",
  "ethereum-types",
@@ -4374,16 +4446,6 @@ version = "0.1.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0399f9d26e5191ce32c498bebd31e7a3ceabc2745f0ac54af3f335126c3f24b3"
 
-[[package]]
-name = "finito"
-version = "0.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2384245d85162258a14b43567a9ee3598f5ae746a1581fb5d3d2cb780f0dbf95"
-dependencies = [
- "futures-timer",
- "pin-project",
-]
-
 [[package]]
 name = "fixed-hash"
 version = "0.8.0"
@@ -4414,15 +4476,6 @@ version = "0.4.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b7ac824320a75a52197e8f2d787f6a38b6718bb6897a35142d749af3c0e8f4fe"
 
-[[package]]
-name = "float-cmp"
-version = "0.9.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "98de4bbd547a563b716d8dfa9aad1cb19bfab00f4fa09a6a4ed21dbcf44ce9c4"
-dependencies = [
- "num-traits",
-]
-
 [[package]]
 name = "flume"
 version = "0.10.14"
@@ -4483,7 +4536,7 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
 [[package]]
 name = "fork-tree"
 version = "13.0.1"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "parity-scale-codec",
 ]
@@ -4510,10 +4563,10 @@ dependencies = [
 [[package]]
 name = "fp-account"
 version = "1.0.0-dev"
-source = "git+https://github.com/polkadot-evm/frontier?branch=stable2412#75329a2df49e2cc7981485392c31160929d1bd48"
+source = "git+https://github.com/polkadot-evm/frontier?branch=stable2503#7d1cff7f13828b563752ad8a71458cab1ea42009"
 dependencies = [
  "hex",
- "impl-serde 0.5.0",
+ "impl-serde",
  "libsecp256k1",
  "log",
  "parity-scale-codec",
@@ -4529,7 +4582,7 @@ dependencies = [
 [[package]]
 name = "fp-consensus"
 version = "2.0.0-dev"
-source = "git+https://github.com/polkadot-evm/frontier?branch=stable2412#75329a2df49e2cc7981485392c31160929d1bd48"
+source = "git+https://github.com/polkadot-evm/frontier?branch=stable2503#7d1cff7f13828b563752ad8a71458cab1ea42009"
 dependencies = [
  "ethereum",
  "parity-scale-codec",
@@ -4540,7 +4593,7 @@ dependencies = [
 [[package]]
 name = "fp-ethereum"
 version = "1.0.0-dev"
-source = "git+https://github.com/polkadot-evm/frontier?branch=stable2412#75329a2df49e2cc7981485392c31160929d1bd48"
+source = "git+https://github.com/polkadot-evm/frontier?branch=stable2503#7d1cff7f13828b563752ad8a71458cab1ea42009"
 dependencies = [
  "ethereum",
  "ethereum-types",
@@ -4552,7 +4605,7 @@ dependencies = [
 [[package]]
 name = "fp-evm"
 version = "3.0.0-dev"
-source = "git+https://github.com/polkadot-evm/frontier?branch=stable2412#75329a2df49e2cc7981485392c31160929d1bd48"
+source = "git+https://github.com/polkadot-evm/frontier?branch=stable2503#7d1cff7f13828b563752ad8a71458cab1ea42009"
 dependencies = [
  "environmental",
  "evm",
@@ -4568,7 +4621,7 @@ dependencies = [
 [[package]]
 name = "fp-rpc"
 version = "3.0.0-dev"
-source = "git+https://github.com/polkadot-evm/frontier?branch=stable2412#75329a2df49e2cc7981485392c31160929d1bd48"
+source = "git+https://github.com/polkadot-evm/frontier?branch=stable2503#7d1cff7f13828b563752ad8a71458cab1ea42009"
 dependencies = [
  "ethereum",
  "ethereum-types",
@@ -4584,7 +4637,7 @@ dependencies = [
 [[package]]
 name = "fp-self-contained"
 version = "1.0.0-dev"
-source = "git+https://github.com/polkadot-evm/frontier?branch=stable2412#75329a2df49e2cc7981485392c31160929d1bd48"
+source = "git+https://github.com/polkadot-evm/frontier?branch=stable2503#7d1cff7f13828b563752ad8a71458cab1ea42009"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
@@ -4596,7 +4649,7 @@ dependencies = [
 [[package]]
 name = "fp-storage"
 version = "2.0.0"
-source = "git+https://github.com/polkadot-evm/frontier?branch=stable2412#75329a2df49e2cc7981485392c31160929d1bd48"
+source = "git+https://github.com/polkadot-evm/frontier?branch=stable2503#7d1cff7f13828b563752ad8a71458cab1ea42009"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -4610,8 +4663,8 @@ checksum = "28dd6caf6059519a65843af8fe2a3ae298b14b80179855aeb4adc2c1934ee619"
 
 [[package]]
 name = "frame-benchmarking"
-version = "39.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "40.2.1"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "frame-support",
  "frame-support-procedural",
@@ -4634,8 +4687,8 @@ dependencies = [
 
 [[package]]
 name = "frame-benchmarking-cli"
-version = "46.2.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "48.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "Inflector",
  "array-bytes",
@@ -4649,7 +4702,6 @@ dependencies = [
  "frame-system",
  "gethostname",
  "handlebars",
- "hex",
  "itertools 0.11.0",
  "linked-hash-map",
  "log",
@@ -4664,7 +4716,7 @@ dependencies = [
  "sc-client-api",
  "sc-client-db",
  "sc-executor",
- "sc-executor-common",
+ "sc-runtime-utilities",
  "sc-service",
  "sc-sysinfo",
  "serde",
@@ -4673,7 +4725,6 @@ dependencies = [
  "sp-block-builder",
  "sp-blockchain",
  "sp-core",
- "sp-crypto-hashing 0.1.0 (git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6)",
  "sp-database",
  "sp-externalities",
  "sp-genesis-builder",
@@ -4694,10 +4745,24 @@ dependencies = [
  "thousands",
 ]
 
+[[package]]
+name = "frame-decode"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6027a409bac4fe95b4d107f965fcdbc252fc89d884a360d076b3070b6128c094"
+dependencies = [
+ "frame-metadata 17.0.0",
+ "parity-scale-codec",
+ "scale-decode 0.14.0",
+ "scale-info",
+ "scale-type-resolver",
+ "sp-crypto-hashing 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "frame-election-provider-solution-type"
-version = "14.0.2"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "16.1.1"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "proc-macro-crate 3.4.0",
  "proc-macro2",
@@ -4707,8 +4772,8 @@ dependencies = [
 
 [[package]]
 name = "frame-election-provider-support"
-version = "39.0.1"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "40.1.1"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "frame-election-provider-solution-type",
  "frame-support",
@@ -4723,8 +4788,8 @@ dependencies = [
 
 [[package]]
 name = "frame-executive"
-version = "39.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "40.0.1"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "aquamarine",
  "frame-support",
@@ -4741,20 +4806,9 @@ dependencies = [
 
 [[package]]
 name = "frame-metadata"
-version = "15.1.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "878babb0b136e731cc77ec2fd883ff02745ff21e6fb662729953d44923df009c"
-dependencies = [
- "cfg-if",
- "parity-scale-codec",
- "scale-info",
-]
-
-[[package]]
-name = "frame-metadata"
-version = "16.0.0"
+version = "17.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "87cf1549fba25a6fcac22785b61698317d958e96cac72a59102ea45b9ae64692"
+checksum = "701bac17e9b55e0f95067c428ebcb46496587f08e8cf4ccc0fe5903bea10dbb8"
 dependencies = [
  "cfg-if",
  "parity-scale-codec",
@@ -4764,9 +4818,9 @@ dependencies = [
 
 [[package]]
 name = "frame-metadata"
-version = "18.0.0"
+version = "20.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "daaf440c68eb2c3d88e5760fe8c7af3f9fee9181fab6c2f2c4e7cc48dcc40bb8"
+checksum = "26de808fa6461f2485dc51811aefed108850064994fb4a62b3ac21ffa62ac8df"
 dependencies = [
  "cfg-if",
  "parity-scale-codec",
@@ -4776,8 +4830,8 @@ dependencies = [
 
 [[package]]
 name = "frame-metadata-hash-extension"
-version = "0.7.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "0.8.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "array-bytes",
  "const-hex",
@@ -4792,8 +4846,8 @@ dependencies = [
 
 [[package]]
 name = "frame-support"
-version = "39.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "40.1.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "aquamarine",
  "array-bytes",
@@ -4801,7 +4855,7 @@ dependencies = [
  "bitflags 1.3.2",
  "docify",
  "environmental",
- "frame-metadata 18.0.0",
+ "frame-metadata 20.0.0",
  "frame-support-procedural",
  "impl-trait-for-tuples",
  "k256",
@@ -4812,7 +4866,6 @@ dependencies = [
  "scale-info",
  "serde",
  "serde_json",
- "smallvec",
  "sp-api",
  "sp-arithmetic",
  "sp-core",
@@ -4829,14 +4882,13 @@ dependencies = [
  "sp-tracing",
  "sp-trie",
  "sp-weights",
- "static_assertions",
  "tt-call",
 ]
 
 [[package]]
 name = "frame-support-procedural"
-version = "31.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "33.0.1"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "Inflector",
  "cfg-expr",
@@ -4846,17 +4898,17 @@ dependencies = [
  "frame-support-procedural-tools",
  "itertools 0.11.0",
  "macro_magic",
- "proc-macro-warning 1.84.1",
+ "proc-macro-warning",
  "proc-macro2",
  "quote",
- "sp-crypto-hashing 0.1.0 (git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6)",
+ "sp-crypto-hashing 0.1.0 (git+https://github.com/paritytech/polkadot-sdk?branch=stable2503)",
  "syn 2.0.106",
 ]
 
 [[package]]
 name = "frame-support-procedural-tools"
 version = "13.0.1"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "frame-support-procedural-tools-derive",
  "proc-macro-crate 3.4.0",
@@ -4868,7 +4920,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools-derive"
 version = "12.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4878,11 +4930,11 @@ dependencies = [
 [[package]]
 name = "frame-support-test"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "frame-benchmarking",
  "frame-executive",
- "frame-metadata 18.0.0",
+ "frame-metadata 20.0.0",
  "frame-support",
  "frame-support-test-pallet",
  "frame-system",
@@ -4905,7 +4957,7 @@ dependencies = [
 [[package]]
 name = "frame-support-test-pallet"
 version = "4.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4917,8 +4969,8 @@ dependencies = [
 
 [[package]]
 name = "frame-system"
-version = "39.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "40.2.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "cfg-if",
  "docify",
@@ -4930,15 +4982,14 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
  "sp-version",
  "sp-weights",
 ]
 
 [[package]]
 name = "frame-system-benchmarking"
-version = "39.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "40.0.1"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4951,8 +5002,8 @@ dependencies = [
 
 [[package]]
 name = "frame-system-rpc-runtime-api"
-version = "35.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "36.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "docify",
  "parity-scale-codec",
@@ -4961,8 +5012,8 @@ dependencies = [
 
 [[package]]
 name = "frame-try-runtime"
-version = "0.45.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "0.46.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
@@ -5012,9 +5063,9 @@ dependencies = [
 
 [[package]]
 name = "futures-bounded"
-version = "0.1.0"
+version = "0.2.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8b07bbbe7d7e78809544c6f718d875627addc73a7c3582447abc052cd3dc67e0"
+checksum = "91f328e7fb845fc832912fb6a34f40cf6d1888c92f974d1893a54e97b5ff542e"
 dependencies = [
  "futures-timer",
  "futures-util",
@@ -5091,12 +5142,13 @@ dependencies = [
 
 [[package]]
 name = "futures-rustls"
-version = "0.24.0"
+version = "0.26.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "35bd3cf68c183738046838e300353e4716c674dc5e56890de4826801a6622a28"
+checksum = "a8f2f12607f92c69b12ed746fabf9ca4f5c482cba46679c1a75b874ed7c26adb"
 dependencies = [
  "futures-io",
- "rustls 0.21.12",
+ "rustls",
+ "rustls-pki-types",
 ]
 
 [[package]]
@@ -5234,9 +5286,9 @@ dependencies = [
 
 [[package]]
 name = "gimli"
-version = "0.28.1"
+version = "0.31.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
+checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
 dependencies = [
  "fallible-iterator 0.3.0",
  "stable_deref_trait",
@@ -5485,6 +5537,15 @@ version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "212ab92002354b4819390025006c897e8140934349e8635c9b077f47b4dcbd20"
 
+[[package]]
+name = "hex-conservative"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fda06d18ac606267c40c04e41b9947729bf8b9efe74bd4e82b61a5f26a510b9f"
+dependencies = [
+ "arrayvec 0.7.6",
+]
+
 [[package]]
 name = "hex-literal"
 version = "0.3.4"
@@ -5497,6 +5558,31 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6fe2267d4ed49bc07b63801559be28c718ea06c4738b7a03c94df7386d2cde46"
 
+[[package]]
+name = "hickory-proto"
+version = "0.24.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "92652067c9ce6f66ce53cc38d1169daa36e6e7eb7dd3b63b5103bd9d97117248"
+dependencies = [
+ "async-trait",
+ "cfg-if",
+ "data-encoding",
+ "enum-as-inner",
+ "futures-channel",
+ "futures-io",
+ "futures-util",
+ "idna",
+ "ipnet",
+ "once_cell",
+ "rand 0.8.5",
+ "socket2 0.5.10",
+ "thiserror 1.0.69",
+ "tinyvec",
+ "tokio",
+ "tracing",
+ "url",
+]
+
 [[package]]
 name = "hickory-proto"
 version = "0.25.2"
@@ -5506,11 +5592,11 @@ dependencies = [
  "async-trait",
  "cfg-if",
  "data-encoding",
- "enum-as-inner 0.6.1",
+ "enum-as-inner",
  "futures-channel",
  "futures-io",
  "futures-util",
- "idna 1.1.0",
+ "idna",
  "ipnet",
  "once_cell",
  "rand 0.9.2",
@@ -5522,6 +5608,27 @@ dependencies = [
  "url",
 ]
 
+[[package]]
+name = "hickory-resolver"
+version = "0.24.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cbb117a1ca520e111743ab2f6688eddee69db4e0ea242545a604dce8a66fd22e"
+dependencies = [
+ "cfg-if",
+ "futures-util",
+ "hickory-proto 0.24.4",
+ "ipconfig",
+ "lru-cache",
+ "once_cell",
+ "parking_lot 0.12.5",
+ "rand 0.8.5",
+ "resolv-conf",
+ "smallvec",
+ "thiserror 1.0.69",
+ "tokio",
+ "tracing",
+]
+
 [[package]]
 name = "hickory-resolver"
 version = "0.25.2"
@@ -5530,7 +5637,7 @@ checksum = "dc62a9a99b0bfb44d2ab95a7208ac952d31060efc16241c87eaf36406fecf87a"
 dependencies = [
  "cfg-if",
  "futures-util",
- "hickory-proto",
+ "hickory-proto 0.25.2",
  "ipconfig",
  "moka",
  "once_cell",
@@ -5656,6 +5763,16 @@ version = "2.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "135b12329e5e3ce057a9f972339ea52bc954fe1e9358ef27f95e89716fbc5424"
 
+[[package]]
+name = "humantime-serde"
+version = "1.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "57a3db5ea5923d99402c94e9feb261dc5ee9b4efa158b0315f788cf549cc200c"
+dependencies = [
+ "humantime",
+ "serde",
+]
+
 [[package]]
 name = "hyper"
 version = "0.14.32"
@@ -5703,22 +5820,6 @@ dependencies = [
  "want",
 ]
 
-[[package]]
-name = "hyper-rustls"
-version = "0.24.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ec3efd23720e2049821a693cbc7e65ea87c72f1c58ff2f9522ff332b1491e590"
-dependencies = [
- "futures-util",
- "http 0.2.12",
- "hyper 0.14.32",
- "log",
- "rustls 0.21.12",
- "rustls-native-certs 0.6.3",
- "tokio",
- "tokio-rustls 0.24.1",
-]
-
 [[package]]
 name = "hyper-rustls"
 version = "0.27.7"
@@ -5729,11 +5830,11 @@ dependencies = [
  "hyper 1.7.0",
  "hyper-util",
  "log",
- "rustls 0.23.32",
- "rustls-native-certs 0.8.1",
+ "rustls",
+ "rustls-native-certs",
  "rustls-pki-types",
  "tokio",
- "tokio-rustls 0.26.4",
+ "tokio-rustls",
  "tower-service",
  "webpki-roots 1.0.3",
 ]
@@ -5878,27 +5979,6 @@ version = "1.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b9e0384b61958566e926dc50660321d12159025e767c18e043daf26b70104c39"
 
-[[package]]
-name = "idna"
-version = "0.2.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "418a0a6fab821475f634efe3ccc45c013f742efe03d853e8d3355d5cb850ecf8"
-dependencies = [
- "matches",
- "unicode-bidi",
- "unicode-normalization",
-]
-
-[[package]]
-name = "idna"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c"
-dependencies = [
- "unicode-bidi",
- "unicode-normalization",
-]
-
 [[package]]
 name = "idna"
 version = "1.1.0"
@@ -6010,15 +6090,6 @@ dependencies = [
  "rlp 0.6.1",
 ]
 
-[[package]]
-name = "impl-serde"
-version = "0.4.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ebc88fc67028ae3db0c853baa36269d398d5f45b6982f95549ff5def78c935cd"
-dependencies = [
- "serde",
-]
-
 [[package]]
 name = "impl-serde"
 version = "0.5.0"
@@ -6229,20 +6300,6 @@ version = "1.0.15"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
 
-[[package]]
-name = "jni"
-version = "0.19.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c6df18c2e3db7e453d3c6ac5b3e9d5182664d28788126d39b91f2d1e22b017ec"
-dependencies = [
- "cesu8",
- "combine",
- "jni-sys",
- "log",
- "thiserror 1.0.69",
- "walkdir",
-]
-
 [[package]]
 name = "jni"
 version = "0.21.1"
@@ -6285,82 +6342,40 @@ dependencies = [
  "wasm-bindgen",
 ]
 
-[[package]]
-name = "jsonrpsee"
-version = "0.22.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cfdb12a2381ea5b2e68c3469ec604a007b367778cdb14d09612c8069ebd616ad"
-dependencies = [
- "jsonrpsee-client-transport 0.22.5",
- "jsonrpsee-core 0.22.5",
- "jsonrpsee-http-client",
- "jsonrpsee-types 0.22.5",
-]
-
-[[package]]
-name = "jsonrpsee"
-version = "0.23.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62b089779ad7f80768693755a031cc14a7766aba707cbe886674e3f79e9b7e47"
-dependencies = [
- "jsonrpsee-core 0.23.2",
- "jsonrpsee-types 0.23.2",
- "jsonrpsee-ws-client",
-]
-
 [[package]]
 name = "jsonrpsee"
 version = "0.24.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "37b26c20e2178756451cfeb0661fb74c47dd5988cb7e3939de7e9241fd604d42"
 dependencies = [
- "jsonrpsee-core 0.24.9",
+ "jsonrpsee-client-transport",
+ "jsonrpsee-core",
  "jsonrpsee-proc-macros",
  "jsonrpsee-server",
- "jsonrpsee-types 0.24.9",
- "tokio",
- "tracing",
-]
-
-[[package]]
-name = "jsonrpsee-client-transport"
-version = "0.22.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4978087a58c3ab02efc5b07c5e5e2803024536106fd5506f558db172c889b3aa"
-dependencies = [
- "futures-util",
- "http 0.2.12",
- "jsonrpsee-core 0.22.5",
- "pin-project",
- "rustls-native-certs 0.7.3",
- "rustls-pki-types",
- "soketto 0.7.1",
- "thiserror 1.0.69",
+ "jsonrpsee-types",
+ "jsonrpsee-ws-client",
  "tokio",
- "tokio-rustls 0.25.0",
- "tokio-util",
  "tracing",
- "url",
 ]
 
 [[package]]
 name = "jsonrpsee-client-transport"
-version = "0.23.2"
+version = "0.24.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "08163edd8bcc466c33d79e10f695cdc98c00d1e6ddfb95cec41b6b0279dd5432"
+checksum = "bacb85abf4117092455e1573625e21b8f8ef4dec8aff13361140b2dc266cdff2"
 dependencies = [
  "base64 0.22.1",
  "futures-util",
  "http 1.3.1",
- "jsonrpsee-core 0.23.2",
+ "jsonrpsee-core",
  "pin-project",
- "rustls 0.23.32",
+ "rustls",
  "rustls-pki-types",
- "rustls-platform-verifier 0.3.4",
- "soketto 0.8.1",
+ "rustls-platform-verifier",
+ "soketto",
  "thiserror 1.0.69",
  "tokio",
- "tokio-rustls 0.26.4",
+ "tokio-rustls",
  "tokio-util",
  "tracing",
  "url",
@@ -6368,19 +6383,22 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-core"
-version = "0.22.5"
+version = "0.24.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b4b257e1ec385e07b0255dde0b933f948b5c8b8c28d42afda9587c3a967b896d"
+checksum = "456196007ca3a14db478346f58c7238028d55ee15c1df15115596e411ff27925"
 dependencies = [
- "anyhow",
  "async-trait",
- "beef",
+ "bytes",
  "futures-timer",
  "futures-util",
- "hyper 0.14.32",
- "jsonrpsee-types 0.22.5",
+ "http 1.3.1",
+ "http-body 1.0.1",
+ "http-body-util",
+ "jsonrpsee-types",
+ "parking_lot 0.12.5",
  "pin-project",
- "rustc-hash 1.1.0",
+ "rand 0.8.5",
+ "rustc-hash 2.1.1",
  "serde",
  "serde_json",
  "thiserror 1.0.69",
@@ -6390,136 +6408,45 @@ dependencies = [
 ]
 
 [[package]]
-name = "jsonrpsee-core"
-version = "0.23.2"
+name = "jsonrpsee-proc-macros"
+version = "0.24.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "79712302e737d23ca0daa178e752c9334846b08321d439fd89af9a384f8c830b"
+checksum = "5e65763c942dfc9358146571911b0cd1c361c2d63e2d2305622d40d36376ca80"
 dependencies = [
- "anyhow",
- "async-trait",
- "beef",
- "futures-timer",
- "futures-util",
- "jsonrpsee-types 0.23.2",
- "pin-project",
- "rustc-hash 1.1.0",
- "serde",
- "serde_json",
- "thiserror 1.0.69",
- "tokio",
- "tokio-stream",
- "tracing",
+ "heck 0.5.0",
+ "proc-macro-crate 3.4.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.106",
 ]
 
 [[package]]
-name = "jsonrpsee-core"
+name = "jsonrpsee-server"
 version = "0.24.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "456196007ca3a14db478346f58c7238028d55ee15c1df15115596e411ff27925"
+checksum = "55e363146da18e50ad2b51a0a7925fc423137a0b1371af8235b1c231a0647328"
 dependencies = [
- "async-trait",
- "bytes",
  "futures-util",
  "http 1.3.1",
  "http-body 1.0.1",
  "http-body-util",
- "jsonrpsee-types 0.24.9",
- "parking_lot 0.12.5",
- "rand 0.8.5",
- "rustc-hash 2.1.1",
+ "hyper 1.7.0",
+ "hyper-util",
+ "jsonrpsee-core",
+ "jsonrpsee-types",
+ "pin-project",
+ "route-recognizer",
  "serde",
  "serde_json",
+ "soketto",
  "thiserror 1.0.69",
  "tokio",
+ "tokio-stream",
+ "tokio-util",
+ "tower 0.4.13",
  "tracing",
 ]
 
-[[package]]
-name = "jsonrpsee-http-client"
-version = "0.22.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ccf93fc4a0bfe05d851d37d7c32b7f370fe94336b52a2f0efc5f1981895c2e5"
-dependencies = [
- "async-trait",
- "hyper 0.14.32",
- "hyper-rustls 0.24.2",
- "jsonrpsee-core 0.22.5",
- "jsonrpsee-types 0.22.5",
- "serde",
- "serde_json",
- "thiserror 1.0.69",
- "tokio",
- "tower 0.4.13",
- "tracing",
- "url",
-]
-
-[[package]]
-name = "jsonrpsee-proc-macros"
-version = "0.24.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5e65763c942dfc9358146571911b0cd1c361c2d63e2d2305622d40d36376ca80"
-dependencies = [
- "heck 0.5.0",
- "proc-macro-crate 3.4.0",
- "proc-macro2",
- "quote",
- "syn 2.0.106",
-]
-
-[[package]]
-name = "jsonrpsee-server"
-version = "0.24.9"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55e363146da18e50ad2b51a0a7925fc423137a0b1371af8235b1c231a0647328"
-dependencies = [
- "futures-util",
- "http 1.3.1",
- "http-body 1.0.1",
- "http-body-util",
- "hyper 1.7.0",
- "hyper-util",
- "jsonrpsee-core 0.24.9",
- "jsonrpsee-types 0.24.9",
- "pin-project",
- "route-recognizer",
- "serde",
- "serde_json",
- "soketto 0.8.1",
- "thiserror 1.0.69",
- "tokio",
- "tokio-stream",
- "tokio-util",
- "tower 0.4.13",
- "tracing",
-]
-
-[[package]]
-name = "jsonrpsee-types"
-version = "0.22.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "150d6168405890a7a3231a3c74843f58b8959471f6df76078db2619ddee1d07d"
-dependencies = [
- "anyhow",
- "beef",
- "serde",
- "serde_json",
- "thiserror 1.0.69",
-]
-
-[[package]]
-name = "jsonrpsee-types"
-version = "0.23.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d9c465fbe385238e861fdc4d1c85e04ada6c1fd246161d26385c1b311724d2af"
-dependencies = [
- "beef",
- "http 1.3.1",
- "serde",
- "serde_json",
- "thiserror 1.0.69",
-]
-
 [[package]]
 name = "jsonrpsee-types"
 version = "0.24.9"
@@ -6534,14 +6461,14 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-ws-client"
-version = "0.23.2"
+version = "0.24.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c28759775f5cb2f1ea9667672d3fe2b0e701d1f4b7b67954e60afe7fd058b5e"
+checksum = "01b3323d890aa384f12148e8d2a1fd18eb66e9e7e825f9de4fa53bcc19b93eef"
 dependencies = [
  "http 1.3.1",
- "jsonrpsee-client-transport 0.23.2",
- "jsonrpsee-core 0.23.2",
- "jsonrpsee-types 0.23.2",
+ "jsonrpsee-client-transport",
+ "jsonrpsee-core",
+ "jsonrpsee-types",
  "url",
 ]
 
@@ -6581,11 +6508,11 @@ dependencies = [
 
 [[package]]
 name = "keccak-hash"
-version = "0.10.0"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4b286e6b663fb926e1eeb68528e69cb70ed46c6d65871a21b2215ae8154c6d3c"
+checksum = "3e1b8590eb6148af2ea2d75f38e7d29f5ca970d5a4df456b3ef19b8b415d0264"
 dependencies = [
- "primitive-types 0.12.2",
+ "primitive-types 0.13.1",
  "tiny-keccak",
 ]
 
@@ -6710,16 +6637,15 @@ checksum = "f9fbbcab51052fe104eb5e5d351cf728d30a5be1fe14d9be8a3b097481fb97de"
 
 [[package]]
 name = "libp2p"
-version = "0.52.4"
+version = "0.54.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e94495eb319a85b70a68b85e2389a95bb3555c71c49025b78c691a854a7e6464"
+checksum = "bbbe80f9c7e00526cd6b838075b9c171919404a4732cb2fa8ece0a093223bfc4"
 dependencies = [
  "bytes",
  "either",
  "futures",
  "futures-timer",
  "getrandom 0.2.16",
- "instant",
  "libp2p-allow-block-list",
  "libp2p-connection-limits",
  "libp2p-core",
@@ -6736,7 +6662,6 @@ dependencies = [
  "libp2p-swarm",
  "libp2p-tcp",
  "libp2p-upnp",
- "libp2p-wasm-ext",
  "libp2p-websocket",
  "libp2p-yamux",
  "multiaddr 0.18.2",
@@ -6747,9 +6672,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-allow-block-list"
-version = "0.2.0"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "55b46558c5c0bf99d3e2a1a38fd54ff5476ca66dd1737b12466a1824dd219311"
+checksum = "d1027ccf8d70320ed77e984f273bc8ce952f623762cb9bf2d126df73caef8041"
 dependencies = [
  "libp2p-core",
  "libp2p-identity",
@@ -6759,9 +6684,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-connection-limits"
-version = "0.2.1"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2f5107ad45cb20b2f6c3628c7b6014b996fcb13a88053f4569c872c6e30abf58"
+checksum = "8d003540ee8baef0d254f7b6bfd79bac3ddf774662ca0abf69186d517ef82ad8"
 dependencies = [
  "libp2p-core",
  "libp2p-identity",
@@ -6771,17 +6696,15 @@ dependencies = [
 
 [[package]]
 name = "libp2p-core"
-version = "0.40.1"
+version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dd44289ab25e4c9230d9246c475a22241e301b23e8f4061d3bdef304a1a99713"
+checksum = "a61f26c83ed111104cd820fe9bc3aaabbac5f1652a1d213ed6e900b7918a1298"
 dependencies = [
  "either",
  "fnv",
  "futures",
  "futures-timer",
- "instant",
  "libp2p-identity",
- "log",
  "multiaddr 0.18.2",
  "multihash 0.19.3",
  "multistream-select",
@@ -6793,33 +6716,35 @@ dependencies = [
  "rw-stream-sink",
  "smallvec",
  "thiserror 1.0.69",
- "unsigned-varint 0.7.2",
+ "tracing",
+ "unsigned-varint 0.8.0",
  "void",
+ "web-time",
 ]
 
 [[package]]
 name = "libp2p-dns"
-version = "0.40.1"
+version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6a18db73084b4da2871438f6239fef35190b05023de7656e877c18a00541a3b"
+checksum = "97f37f30d5c7275db282ecd86e54f29dd2176bd3ac656f06abf43bedb21eb8bd"
 dependencies = [
  "async-trait",
  "futures",
+ "hickory-resolver 0.24.4",
  "libp2p-core",
  "libp2p-identity",
- "log",
  "parking_lot 0.12.5",
  "smallvec",
- "trust-dns-resolver",
+ "tracing",
 ]
 
 [[package]]
 name = "libp2p-identify"
-version = "0.43.1"
+version = "0.45.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "45a96638a0a176bec0a4bcaebc1afa8cf909b114477209d7456ade52c61cd9cd"
+checksum = "1711b004a273be4f30202778856368683bd9a83c4c7dcc8f848847606831a4e3"
 dependencies = [
- "asynchronous-codec",
+ "asynchronous-codec 0.7.0",
  "either",
  "futures",
  "futures-bounded",
@@ -6827,12 +6752,12 @@ dependencies = [
  "libp2p-core",
  "libp2p-identity",
  "libp2p-swarm",
- "log",
  "lru 0.12.5",
  "quick-protobuf",
  "quick-protobuf-codec",
  "smallvec",
  "thiserror 1.0.69",
+ "tracing",
  "void",
 ]
 
@@ -6856,83 +6781,84 @@ dependencies = [
 
 [[package]]
 name = "libp2p-kad"
-version = "0.44.6"
+version = "0.46.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "16ea178dabba6dde6ffc260a8e0452ccdc8f79becf544946692fff9d412fc29d"
+checksum = "ced237d0bd84bbebb7c2cad4c073160dacb4fe40534963c32ed6d4c6bb7702a3"
 dependencies = [
  "arrayvec 0.7.6",
- "asynchronous-codec",
+ "asynchronous-codec 0.7.0",
  "bytes",
  "either",
  "fnv",
  "futures",
+ "futures-bounded",
  "futures-timer",
- "instant",
  "libp2p-core",
  "libp2p-identity",
  "libp2p-swarm",
- "log",
  "quick-protobuf",
  "quick-protobuf-codec",
  "rand 0.8.5",
  "sha2 0.10.9",
  "smallvec",
  "thiserror 1.0.69",
+ "tracing",
  "uint 0.9.5",
- "unsigned-varint 0.7.2",
  "void",
+ "web-time",
 ]
 
 [[package]]
 name = "libp2p-mdns"
-version = "0.44.0"
+version = "0.46.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "42a2567c305232f5ef54185e9604579a894fd0674819402bb0ac0246da82f52a"
+checksum = "14b8546b6644032565eb29046b42744aee1e9f261ed99671b2c93fb140dba417"
 dependencies = [
  "data-encoding",
  "futures",
+ "hickory-proto 0.24.4",
  "if-watch",
  "libp2p-core",
  "libp2p-identity",
  "libp2p-swarm",
- "log",
  "rand 0.8.5",
  "smallvec",
  "socket2 0.5.10",
  "tokio",
- "trust-dns-proto 0.22.0",
+ "tracing",
  "void",
 ]
 
 [[package]]
 name = "libp2p-metrics"
-version = "0.13.1"
+version = "0.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "239ba7d28f8d0b5d77760dc6619c05c7e88e74ec8fbbe97f856f20a56745e620"
+checksum = "77ebafa94a717c8442d8db8d3ae5d1c6a15e30f2d347e0cd31d057ca72e42566"
 dependencies = [
- "instant",
+ "futures",
  "libp2p-core",
  "libp2p-identify",
  "libp2p-identity",
  "libp2p-kad",
  "libp2p-ping",
  "libp2p-swarm",
- "once_cell",
+ "pin-project",
  "prometheus-client",
+ "web-time",
 ]
 
 [[package]]
 name = "libp2p-noise"
-version = "0.43.2"
+version = "0.45.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d2eeec39ad3ad0677551907dd304b2f13f17208ccebe333bef194076cd2e8921"
+checksum = "36b137cb1ae86ee39f8e5d6245a296518912014eaa87427d24e6ff58cfc1b28c"
 dependencies = [
+ "asynchronous-codec 0.7.0",
  "bytes",
  "curve25519-dalek",
  "futures",
  "libp2p-core",
  "libp2p-identity",
- "log",
  "multiaddr 0.18.2",
  "multihash 0.19.3",
  "once_cell",
@@ -6942,33 +6868,34 @@ dependencies = [
  "snow",
  "static_assertions",
  "thiserror 1.0.69",
+ "tracing",
  "x25519-dalek",
  "zeroize",
 ]
 
 [[package]]
 name = "libp2p-ping"
-version = "0.43.1"
+version = "0.45.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e702d75cd0827dfa15f8fd92d15b9932abe38d10d21f47c50438c71dd1b5dae3"
+checksum = "005a34420359223b974ee344457095f027e51346e992d1e0dcd35173f4cdd422"
 dependencies = [
  "either",
  "futures",
  "futures-timer",
- "instant",
  "libp2p-core",
  "libp2p-identity",
  "libp2p-swarm",
- "log",
  "rand 0.8.5",
+ "tracing",
  "void",
+ "web-time",
 ]
 
 [[package]]
 name = "libp2p-quic"
-version = "0.9.3"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "130d451d83f21b81eb7b35b360bc7972aeafb15177784adc56528db082e6b927"
+checksum = "46352ac5cd040c70e88e7ff8257a2ae2f891a4076abad2c439584a31c15fd24e"
 dependencies = [
  "bytes",
  "futures",
@@ -6977,66 +6904,68 @@ dependencies = [
  "libp2p-core",
  "libp2p-identity",
  "libp2p-tls",
- "log",
  "parking_lot 0.12.5",
- "quinn 0.10.2",
+ "quinn",
  "rand 0.8.5",
- "ring 0.16.20",
- "rustls 0.21.12",
+ "ring 0.17.14",
+ "rustls",
  "socket2 0.5.10",
  "thiserror 1.0.69",
  "tokio",
+ "tracing",
 ]
 
 [[package]]
 name = "libp2p-request-response"
-version = "0.25.3"
+version = "0.27.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d8e3b4d67870478db72bac87bfc260ee6641d0734e0e3e275798f089c3fecfd4"
+checksum = "1356c9e376a94a75ae830c42cdaea3d4fe1290ba409a22c809033d1b7dcab0a6"
 dependencies = [
  "async-trait",
  "futures",
- "instant",
+ "futures-bounded",
+ "futures-timer",
  "libp2p-core",
  "libp2p-identity",
  "libp2p-swarm",
- "log",
  "rand 0.8.5",
  "smallvec",
+ "tracing",
  "void",
+ "web-time",
 ]
 
 [[package]]
 name = "libp2p-swarm"
-version = "0.43.7"
+version = "0.45.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "580189e0074af847df90e75ef54f3f30059aedda37ea5a1659e8b9fca05c0141"
+checksum = "d7dd6741793d2c1fb2088f67f82cf07261f25272ebe3c0b0c311e0c6b50e851a"
 dependencies = [
  "either",
  "fnv",
  "futures",
  "futures-timer",
- "instant",
  "libp2p-core",
  "libp2p-identity",
  "libp2p-swarm-derive",
- "log",
+ "lru 0.12.5",
  "multistream-select",
  "once_cell",
  "rand 0.8.5",
  "smallvec",
  "tokio",
+ "tracing",
  "void",
+ "web-time",
 ]
 
 [[package]]
 name = "libp2p-swarm-derive"
-version = "0.33.0"
+version = "0.35.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c4d5ec2a3df00c7836d7696c136274c9c59705bac69133253696a6c932cd1d74"
+checksum = "206e0aa0ebe004d778d79fb0966aa0de996c19894e2c0605ba2f8524dd4443d8"
 dependencies = [
- "heck 0.4.1",
- "proc-macro-warning 0.4.2",
+ "heck 0.5.0",
  "proc-macro2",
  "quote",
  "syn 2.0.106",
@@ -7044,9 +6973,9 @@ dependencies = [
 
 [[package]]
 name = "libp2p-tcp"
-version = "0.40.1"
+version = "0.42.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b558dd40d1bcd1aaaed9de898e9ec6a436019ecc2420dd0016e712fbb61c5508"
+checksum = "ad964f312c59dcfcac840acd8c555de8403e295d39edf96f5240048b5fcaa314"
 dependencies = [
  "futures",
  "futures-timer",
@@ -7054,92 +6983,80 @@ dependencies = [
  "libc",
  "libp2p-core",
  "libp2p-identity",
- "log",
  "socket2 0.5.10",
  "tokio",
+ "tracing",
 ]
 
 [[package]]
 name = "libp2p-tls"
-version = "0.2.1"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8218d1d5482b122ccae396bbf38abdcb283ecc96fa54760e1dfd251f0546ac61"
+checksum = "47b23dddc2b9c355f73c1e36eb0c3ae86f7dc964a3715f0731cfad352db4d847"
 dependencies = [
  "futures",
  "futures-rustls",
  "libp2p-core",
  "libp2p-identity",
  "rcgen",
- "ring 0.16.20",
- "rustls 0.21.12",
+ "ring 0.17.14",
+ "rustls",
  "rustls-webpki 0.101.7",
  "thiserror 1.0.69",
- "x509-parser 0.15.1",
+ "x509-parser 0.16.0",
  "yasna",
 ]
 
 [[package]]
 name = "libp2p-upnp"
-version = "0.1.1"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82775a47b34f10f787ad3e2a22e2c1541e6ebef4fe9f28f3ac553921554c94c1"
+checksum = "01bf2d1b772bd3abca049214a3304615e6a36fa6ffc742bdd1ba774486200b8f"
 dependencies = [
  "futures",
  "futures-timer",
  "igd-next",
  "libp2p-core",
  "libp2p-swarm",
- "log",
  "tokio",
+ "tracing",
  "void",
 ]
 
-[[package]]
-name = "libp2p-wasm-ext"
-version = "0.40.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1e5d8e3a9e07da0ef5b55a9f26c009c8fb3c725d492d8bb4b431715786eea79c"
-dependencies = [
- "futures",
- "js-sys",
- "libp2p-core",
- "send_wrapper",
- "wasm-bindgen",
- "wasm-bindgen-futures",
-]
-
 [[package]]
 name = "libp2p-websocket"
-version = "0.42.2"
+version = "0.44.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "004ee9c4a4631435169aee6aad2f62e3984dc031c43b6d29731e8e82a016c538"
+checksum = "888b2ff2e5d8dcef97283daab35ad1043d18952b65e05279eecbe02af4c6e347"
 dependencies = [
  "either",
  "futures",
  "futures-rustls",
  "libp2p-core",
  "libp2p-identity",
- "log",
  "parking_lot 0.12.5",
  "pin-project-lite",
  "rw-stream-sink",
- "soketto 0.8.1",
+ "soketto",
  "thiserror 1.0.69",
+ "tracing",
  "url",
  "webpki-roots 0.25.4",
 ]
 
 [[package]]
 name = "libp2p-yamux"
-version = "0.44.1"
+version = "0.46.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8eedcb62824c4300efb9cfd4e2a6edaf3ca097b9e68b36dabe45a44469fd6a85"
+checksum = "788b61c80789dba9760d8c669a5bedb642c8267555c803fabd8396e4ca5c5882"
 dependencies = [
+ "either",
  "futures",
  "libp2p-core",
- "log",
  "thiserror 1.0.69",
+ "tracing",
  "yamux 0.12.1",
+ "yamux 0.13.7",
 ]
 
 [[package]]
@@ -7316,10 +7233,10 @@ dependencies = [
  "ed25519-dalek",
  "futures",
  "futures-timer",
- "hickory-resolver",
+ "hickory-resolver 0.25.2",
  "indexmap 2.11.4",
  "libc",
- "mockall 0.13.1",
+ "mockall",
  "multiaddr 0.17.1",
  "multihash 0.17.0",
  "network-interface",
@@ -7524,12 +7441,6 @@ dependencies = [
  "regex-automata",
 ]
 
-[[package]]
-name = "matches"
-version = "0.1.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2532096657941c2fea9c289d370a250971c689d4f143798ff67113ec042024a5"
-
 [[package]]
 name = "matchit"
 version = "0.8.4"
@@ -7609,15 +7520,15 @@ dependencies = [
 
 [[package]]
 name = "merkleized-metadata"
-version = "0.2.0"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "38c592efaf1b3250df14c8f3c2d952233f0302bb81d3586db2f303666c1cd607"
+checksum = "dc9b7ac0ce054412d9a85ff39bac27aec27483b06cef8756b57d9c29d448d081"
 dependencies = [
  "array-bytes",
  "blake3",
- "frame-metadata 18.0.0",
+ "frame-metadata 20.0.0",
  "parity-scale-codec",
- "scale-decode",
+ "scale-decode 0.13.1",
  "scale-info",
 ]
 
@@ -7723,8 +7634,8 @@ dependencies = [
 
 [[package]]
 name = "mmr-gadget"
-version = "43.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "45.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "futures",
  "log",
@@ -7742,10 +7653,10 @@ dependencies = [
 
 [[package]]
 name = "mmr-rpc"
-version = "39.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "40.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
- "jsonrpsee 0.24.9",
+ "jsonrpsee",
  "parity-scale-codec",
  "serde",
  "sp-api",
@@ -7755,21 +7666,6 @@ dependencies = [
  "sp-runtime",
 ]
 
-[[package]]
-name = "mockall"
-version = "0.11.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4c84490118f2ee2d74570d114f3d0493cbf02790df303d2707606c3e14e07c96"
-dependencies = [
- "cfg-if",
- "downcast",
- "fragile",
- "lazy_static",
- "mockall_derive 0.11.4",
- "predicates 2.1.5",
- "predicates-tree",
-]
-
 [[package]]
 name = "mockall"
 version = "0.13.1"
@@ -7779,23 +7675,11 @@ dependencies = [
  "cfg-if",
  "downcast",
  "fragile",
- "mockall_derive 0.13.1",
- "predicates 3.1.3",
+ "mockall_derive",
+ "predicates",
  "predicates-tree",
 ]
 
-[[package]]
-name = "mockall_derive"
-version = "0.11.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "22ce75669015c4f47b289fd4d4f56e894e4c96003ffdf3ac51313126f94c6cbb"
-dependencies = [
- "cfg-if",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "mockall_derive"
 version = "0.13.1"
@@ -7843,6 +7727,12 @@ dependencies = [
  "version_check",
 ]
 
+[[package]]
+name = "multi-stash"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "685a9ac4b61f4e728e1d2c6a7844609c16527aeb5e6c865915c08e619c16410f"
+
 [[package]]
 name = "multiaddr"
 version = "0.17.1"
@@ -8097,12 +7987,6 @@ version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b93853da6d84c2e3c7d730d6473e8817692dd89be387eb01b94d7f108ecb5b8c"
 
-[[package]]
-name = "no-std-net"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43794a0ace135be66a25d3ae77d41b91615fb68ae937f904090203e81f755b65"
-
 [[package]]
 name = "nodrop"
 version = "0.1.14"
@@ -8137,12 +8021,6 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "38bf9645c8b145698bb0b18a4637dcacbc421ea49bef2317e4fd8065a387cf21"
 
-[[package]]
-name = "normalize-line-endings"
-version = "0.3.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be"
-
 [[package]]
 name = "ntapi"
 version = "0.4.2"
@@ -8200,6 +8078,17 @@ version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "51d515d32fb182ee37cda2ccdcb92950d6a3c2893aa280e540671c2cd0f3b1d9"
 
+[[package]]
+name = "num-derive"
+version = "0.4.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed3955f1a9c7c0c15e092f9c887db08b1fc683305fdf6eb6684f22555355e202"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.106",
+]
+
 [[package]]
 name = "num-format"
 version = "0.4.4"
@@ -8316,9 +8205,9 @@ dependencies = [
 
 [[package]]
 name = "object"
-version = "0.32.2"
+version = "0.36.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
+checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87"
 dependencies = [
  "memchr",
 ]
@@ -8334,11 +8223,11 @@ dependencies = [
 
 [[package]]
 name = "oid-registry"
-version = "0.6.1"
+version = "0.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9bedf36ffb6ba96c2eb7144ef6270557b52e54b20c0a8e1eb2ff99a6c6959bff"
+checksum = "a8d8034d9489cdaf79228eb9f6a3b8d7bb32ba00d6645ebd48eef4077ceb5bd9"
 dependencies = [
- "asn1-rs 0.5.2",
+ "asn1-rs 0.6.2",
 ]
 
 [[package]]
@@ -8482,8 +8371,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-asset-conversion"
-version = "21.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "22.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8500,8 +8389,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-asset-rate"
-version = "18.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "19.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8514,8 +8403,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-authority-discovery"
-version = "39.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "40.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -8529,8 +8418,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-authorship"
-version = "39.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "40.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -8542,8 +8431,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-babe"
-version = "39.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "40.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8565,8 +8454,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-balances"
-version = "40.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "41.1.1"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "docify",
  "frame-benchmarking",
@@ -8575,13 +8464,14 @@ dependencies = [
  "log",
  "parity-scale-codec",
  "scale-info",
+ "sp-core",
  "sp-runtime",
 ]
 
 [[package]]
 name = "pallet-beefy"
-version = "40.1.1"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "41.1.1"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -8599,8 +8489,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-beefy-mmr"
-version = "40.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "41.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "array-bytes",
  "binary-merkle-tree",
@@ -8624,8 +8514,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-broker"
-version = "0.18.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "0.19.2"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "bitvec",
  "frame-benchmarking",
@@ -8642,8 +8532,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-bucket-nfts"
-version = "0.4.3"
-source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.4.3#0176413b97dbbacb9148f1134e2797e174afa713"
+version = "0.5.1"
+source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.5.1#f1d33efb306f972675830e06a6f44e9c5d9d5f71"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8661,13 +8551,12 @@ dependencies = [
  "sp-core",
  "sp-keyring",
  "sp-runtime",
- "sp-std",
 ]
 
 [[package]]
 name = "pallet-collective"
-version = "39.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "40.1.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "docify",
  "frame-benchmarking",
@@ -8683,8 +8572,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-conviction-voting"
-version = "39.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "40.1.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "assert_matches",
  "frame-benchmarking",
@@ -8699,8 +8588,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-cr-randomness"
-version = "0.4.3"
-source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.4.3#0176413b97dbbacb9148f1134e2797e174afa713"
+version = "0.5.1"
+source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.5.1#f1d33efb306f972675830e06a6f44e9c5d9d5f71"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -8714,12 +8603,11 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
 ]
 
 [[package]]
 name = "pallet-datahaven-native-transfer"
-version = "0.26.0"
+version = "0.23.0"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8727,20 +8615,19 @@ dependencies = [
  "pallet-balances",
  "parity-scale-codec",
  "scale-info",
- "snowbridge-core 0.26.0",
- "snowbridge-outbound-queue-primitives",
+ "snowbridge-core 0.23.0",
+ "snowbridge-outbound-queue-primitives 0.23.0",
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
  "staging-xcm",
  "staging-xcm-builder",
 ]
 
 [[package]]
 name = "pallet-election-provider-multi-phase"
-version = "38.2.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "39.2.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -8761,8 +8648,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-election-provider-support-benchmarking"
-version = "38.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "39.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -8775,7 +8662,7 @@ dependencies = [
 [[package]]
 name = "pallet-ethereum"
 version = "4.0.0-dev"
-source = "git+https://github.com/polkadot-evm/frontier?branch=stable2412#75329a2df49e2cc7981485392c31160929d1bd48"
+source = "git+https://github.com/polkadot-evm/frontier?branch=stable2503#7d1cff7f13828b563752ad8a71458cab1ea42009"
 dependencies = [
  "ethereum",
  "ethereum-types",
@@ -8798,9 +8685,11 @@ dependencies = [
 [[package]]
 name = "pallet-evm"
 version = "6.0.0-dev"
-source = "git+https://github.com/polkadot-evm/frontier?branch=stable2412#75329a2df49e2cc7981485392c31160929d1bd48"
+source = "git+https://github.com/polkadot-evm/frontier?branch=stable2503#7d1cff7f13828b563752ad8a71458cab1ea42009"
 dependencies = [
+ "cumulus-primitives-storage-weight-reclaim",
  "environmental",
+ "ethereum",
  "evm",
  "fp-account",
  "fp-evm",
@@ -8821,7 +8710,7 @@ dependencies = [
 [[package]]
 name = "pallet-evm-chain-id"
 version = "1.0.0-dev"
-source = "git+https://github.com/polkadot-evm/frontier?branch=stable2412#75329a2df49e2cc7981485392c31160929d1bd48"
+source = "git+https://github.com/polkadot-evm/frontier?branch=stable2503#7d1cff7f13828b563752ad8a71458cab1ea42009"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -8831,7 +8720,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-evm-precompile-balances-erc20"
-version = "0.26.0"
+version = "0.23.0"
 dependencies = [
  "fp-evm",
  "frame-support",
@@ -8849,12 +8738,11 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
 ]
 
 [[package]]
 name = "pallet-evm-precompile-batch"
-version = "0.26.0"
+version = "0.23.0"
 dependencies = [
  "evm",
  "fp-evm",
@@ -8870,13 +8758,12 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
 ]
 
 [[package]]
 name = "pallet-evm-precompile-blake2"
 version = "2.0.0-dev"
-source = "git+https://github.com/polkadot-evm/frontier?branch=stable2412#75329a2df49e2cc7981485392c31160929d1bd48"
+source = "git+https://github.com/polkadot-evm/frontier?branch=stable2503#7d1cff7f13828b563752ad8a71458cab1ea42009"
 dependencies = [
  "fp-evm",
 ]
@@ -8884,7 +8771,7 @@ dependencies = [
 [[package]]
 name = "pallet-evm-precompile-bn128"
 version = "2.0.0-dev"
-source = "git+https://github.com/polkadot-evm/frontier?branch=stable2412#75329a2df49e2cc7981485392c31160929d1bd48"
+source = "git+https://github.com/polkadot-evm/frontier?branch=stable2503#7d1cff7f13828b563752ad8a71458cab1ea42009"
 dependencies = [
  "fp-evm",
  "sp-core",
@@ -8893,7 +8780,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-evm-precompile-call-permit"
-version = "0.26.0"
+version = "0.23.0"
 dependencies = [
  "evm",
  "fp-evm",
@@ -8910,7 +8797,6 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
 ]
 
 [[package]]
@@ -8933,7 +8819,6 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
 ]
 
 [[package]]
@@ -8954,12 +8839,11 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
 ]
 
 [[package]]
 name = "pallet-evm-precompile-datahaven-native-transfer"
-version = "0.26.0"
+version = "0.23.0"
 dependencies = [
  "evm",
  "fp-evm",
@@ -8973,18 +8857,17 @@ dependencies = [
  "parity-scale-codec",
  "precompile-utils",
  "scale-info",
- "snowbridge-core 0.26.0",
- "snowbridge-outbound-queue-primitives",
+ "snowbridge-core 0.23.0",
+ "snowbridge-outbound-queue-primitives 0.23.0",
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
 ]
 
 [[package]]
 name = "pallet-evm-precompile-file-system"
-version = "0.4.3"
-source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.4.3#0176413b97dbbacb9148f1134e2797e174afa713"
+version = "0.5.1"
+source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.5.1#f1d33efb306f972675830e06a6f44e9c5d9d5f71"
 dependencies = [
  "fp-account",
  "fp-evm",
@@ -8998,7 +8881,6 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
 ]
 
 [[package]]
@@ -9015,16 +8897,16 @@ dependencies = [
  "parity-scale-codec",
  "precompile-utils",
  "scale-info",
+ "serde",
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
 ]
 
 [[package]]
 name = "pallet-evm-precompile-modexp"
 version = "2.0.0-dev"
-source = "git+https://github.com/polkadot-evm/frontier?branch=stable2412#75329a2df49e2cc7981485392c31160929d1bd48"
+source = "git+https://github.com/polkadot-evm/frontier?branch=stable2503#7d1cff7f13828b563752ad8a71458cab1ea42009"
 dependencies = [
  "fp-evm",
  "num",
@@ -9047,12 +8929,11 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
 ]
 
 [[package]]
 name = "pallet-evm-precompile-proxy"
-version = "0.26.0"
+version = "0.23.0"
 dependencies = [
  "evm",
  "fp-evm",
@@ -9068,7 +8949,6 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
 ]
 
 [[package]]
@@ -9091,12 +8971,11 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
 ]
 
 [[package]]
 name = "pallet-evm-precompile-registry"
-version = "0.26.0"
+version = "0.23.0"
 dependencies = [
  "fp-evm",
  "frame-support",
@@ -9115,7 +8994,7 @@ dependencies = [
 [[package]]
 name = "pallet-evm-precompile-sha3fips"
 version = "2.0.0-dev"
-source = "git+https://github.com/polkadot-evm/frontier?branch=stable2412#75329a2df49e2cc7981485392c31160929d1bd48"
+source = "git+https://github.com/polkadot-evm/frontier?branch=stable2503#7d1cff7f13828b563752ad8a71458cab1ea42009"
 dependencies = [
  "fp-evm",
  "tiny-keccak",
@@ -9124,7 +9003,7 @@ dependencies = [
 [[package]]
 name = "pallet-evm-precompile-simple"
 version = "2.0.0-dev"
-source = "git+https://github.com/polkadot-evm/frontier?branch=stable2412#75329a2df49e2cc7981485392c31160929d1bd48"
+source = "git+https://github.com/polkadot-evm/frontier?branch=stable2503#7d1cff7f13828b563752ad8a71458cab1ea42009"
 dependencies = [
  "fp-evm",
  "ripemd",
@@ -9146,8 +9025,8 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "serde",
- "snowbridge-core 0.26.0",
- "snowbridge-outbound-queue-primitives",
+ "snowbridge-core 0.23.0",
+ "snowbridge-outbound-queue-primitives 0.23.0",
  "sp-core",
  "sp-io",
  "sp-runtime",
@@ -9156,7 +9035,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-external-validators"
-version = "0.26.0"
+version = "0.23.0"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -9170,17 +9049,16 @@ dependencies = [
  "parity-scale-codec",
  "rand 0.8.5",
  "scale-info",
- "snowbridge-outbound-queue-primitives",
+ "snowbridge-outbound-queue-primitives 0.23.0",
  "sp-core",
  "sp-io",
  "sp-runtime",
  "sp-staking",
- "sp-std",
 ]
 
 [[package]]
 name = "pallet-external-validators-rewards"
-version = "0.26.0"
+version = "0.23.0"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -9193,19 +9071,18 @@ dependencies = [
  "pallet-timestamp",
  "parity-scale-codec",
  "scale-info",
- "snowbridge-core 0.26.0",
- "snowbridge-outbound-queue-primitives",
+ "snowbridge-core 0.23.0",
+ "snowbridge-outbound-queue-primitives 0.23.0",
  "sp-core",
  "sp-io",
  "sp-runtime",
  "sp-staking",
- "sp-std",
 ]
 
 [[package]]
 name = "pallet-fast-unstake"
-version = "38.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "39.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "docify",
  "frame-benchmarking",
@@ -9222,8 +9099,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-file-system"
-version = "0.4.3"
-source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.4.3#0176413b97dbbacb9148f1134e2797e174afa713"
+version = "0.5.1"
+source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.5.1#f1d33efb306f972675830e06a6f44e9c5d9d5f71"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -9244,28 +9121,26 @@ dependencies = [
  "shp-traits",
  "sp-core",
  "sp-runtime",
- "sp-std",
  "sp-trie",
  "sp-weights",
 ]
 
 [[package]]
 name = "pallet-file-system-runtime-api"
-version = "0.4.3"
-source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.4.3#0176413b97dbbacb9148f1134e2797e174afa713"
+version = "0.5.1"
+source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.5.1#f1d33efb306f972675830e06a6f44e9c5d9d5f71"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-api",
  "sp-core",
  "sp-runtime",
- "sp-std",
 ]
 
 [[package]]
 name = "pallet-grandpa"
-version = "39.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "40.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -9286,7 +9161,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-grandpa-benchmarking"
-version = "0.26.0"
+version = "0.23.0"
 dependencies = [
  "finality-grandpa",
  "frame-benchmarking",
@@ -9300,13 +9175,12 @@ dependencies = [
  "sp-core",
  "sp-runtime",
  "sp-session",
- "sp-std",
 ]
 
 [[package]]
 name = "pallet-identity"
-version = "39.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "40.1.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "enumflags2",
  "frame-benchmarking",
@@ -9321,8 +9195,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-im-online"
-version = "38.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "39.1.1"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -9340,8 +9214,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-message-queue"
-version = "42.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "43.1.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "environmental",
  "frame-benchmarking",
@@ -9359,10 +9233,9 @@ dependencies = [
 
 [[package]]
 name = "pallet-migrations"
-version = "9.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "10.1.1"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
- "cfg-if",
  "docify",
  "frame-benchmarking",
  "frame-support",
@@ -9370,32 +9243,29 @@ dependencies = [
  "impl-trait-for-tuples",
  "log",
  "parity-scale-codec",
+ "polkadot-sdk-frame",
  "scale-info",
  "sp-core",
+ "sp-io",
  "sp-runtime",
 ]
 
 [[package]]
 name = "pallet-mmr"
-version = "39.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "40.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
- "frame-benchmarking",
- "frame-support",
- "frame-system",
  "log",
  "parity-scale-codec",
+ "polkadot-sdk-frame",
  "scale-info",
- "sp-core",
- "sp-io",
  "sp-mmr-primitives",
- "sp-runtime",
 ]
 
 [[package]]
 name = "pallet-multisig"
-version = "39.1.1"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "40.1.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -9405,8 +9275,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-nfts"
-version = "33.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "34.1.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "enumflags2",
  "frame-benchmarking",
@@ -9422,13 +9292,12 @@ dependencies = [
 
 [[package]]
 name = "pallet-offences"
-version = "38.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "39.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "frame-support",
  "frame-system",
  "log",
- "pallet-balances",
  "parity-scale-codec",
  "scale-info",
  "serde",
@@ -9438,7 +9307,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-outbound-commitment-store"
-version = "0.26.0"
+version = "0.23.0"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -9449,8 +9318,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-parameters"
-version = "0.10.1"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "0.11.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "docify",
  "frame-benchmarking",
@@ -9466,8 +9335,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-payment-streams"
-version = "0.4.3"
-source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.4.3#0176413b97dbbacb9148f1134e2797e174afa713"
+version = "0.5.1"
+source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.5.1#f1d33efb306f972675830e06a6f44e9c5d9d5f71"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -9486,20 +9355,19 @@ dependencies = [
 
 [[package]]
 name = "pallet-payment-streams-runtime-api"
-version = "0.4.3"
-source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.4.3#0176413b97dbbacb9148f1134e2797e174afa713"
+version = "0.5.1"
+source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.5.1#f1d33efb306f972675830e06a6f44e9c5d9d5f71"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-api",
  "sp-runtime",
- "sp-std",
 ]
 
 [[package]]
 name = "pallet-preimage"
-version = "39.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "40.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -9514,8 +9382,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-proofs-dealer"
-version = "0.4.3"
-source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.4.3#0176413b97dbbacb9148f1134e2797e174afa713"
+version = "0.5.1"
+source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.5.1#f1d33efb306f972675830e06a6f44e9c5d9d5f71"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -9533,27 +9401,25 @@ dependencies = [
  "sp-core",
  "sp-keyring",
  "sp-runtime",
- "sp-std",
  "sp-trie",
  "sp-weights",
 ]
 
 [[package]]
 name = "pallet-proofs-dealer-runtime-api"
-version = "0.4.3"
-source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.4.3#0176413b97dbbacb9148f1134e2797e174afa713"
+version = "0.5.1"
+source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.5.1#f1d33efb306f972675830e06a6f44e9c5d9d5f71"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-api",
  "sp-runtime",
- "sp-std",
 ]
 
 [[package]]
 name = "pallet-proxy"
-version = "39.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "40.1.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "parity-scale-codec",
  "polkadot-sdk-frame",
@@ -9562,7 +9428,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-proxy-genesis-companion"
-version = "0.26.0"
+version = "0.23.0"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -9574,13 +9440,12 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
 ]
 
 [[package]]
 name = "pallet-randomness"
-version = "0.4.3"
-source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.4.3#0176413b97dbbacb9148f1134e2797e174afa713"
+version = "0.5.1"
+source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.5.1#f1d33efb306f972675830e06a6f44e9c5d9d5f71"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -9594,13 +9459,12 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
 ]
 
 [[package]]
 name = "pallet-referenda"
-version = "39.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "40.1.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "assert_matches",
  "frame-benchmarking",
@@ -9615,10 +9479,94 @@ dependencies = [
  "sp-runtime",
 ]
 
+[[package]]
+name = "pallet-revive"
+version = "0.6.2"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
+dependencies = [
+ "alloy-core",
+ "derive_more 0.99.20",
+ "environmental",
+ "ethabi-decode",
+ "ethereum-types",
+ "frame-benchmarking",
+ "frame-support",
+ "frame-system",
+ "hex-literal 0.4.1",
+ "humantime-serde",
+ "impl-trait-for-tuples",
+ "log",
+ "num-bigint",
+ "num-integer",
+ "num-traits",
+ "pallet-revive-fixtures",
+ "pallet-revive-proc-macro",
+ "pallet-revive-uapi",
+ "pallet-transaction-payment",
+ "parity-scale-codec",
+ "paste",
+ "polkavm 0.21.0",
+ "polkavm-common 0.21.0",
+ "rand 0.8.5",
+ "rand_pcg",
+ "ripemd",
+ "rlp 0.6.1",
+ "scale-info",
+ "serde",
+ "sp-api",
+ "sp-arithmetic",
+ "sp-consensus-aura",
+ "sp-consensus-babe",
+ "sp-consensus-slots",
+ "sp-core",
+ "sp-io",
+ "sp-runtime",
+ "staging-xcm",
+ "staging-xcm-builder",
+ "substrate-bn",
+ "subxt-signer",
+]
+
+[[package]]
+name = "pallet-revive-fixtures"
+version = "0.3.2"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
+dependencies = [
+ "anyhow",
+ "cargo_metadata",
+ "pallet-revive-uapi",
+ "polkavm-linker 0.21.0",
+ "sp-core",
+ "sp-io",
+ "toml 0.8.23",
+]
+
+[[package]]
+name = "pallet-revive-proc-macro"
+version = "0.3.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.106",
+]
+
+[[package]]
+name = "pallet-revive-uapi"
+version = "0.4.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
+dependencies = [
+ "bitflags 1.3.2",
+ "pallet-revive-proc-macro",
+ "parity-scale-codec",
+ "polkavm-derive 0.21.0",
+ "scale-info",
+]
+
 [[package]]
 name = "pallet-safe-mode"
-version = "20.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "21.1.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "docify",
  "frame-benchmarking",
@@ -9635,8 +9583,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-scheduler"
-version = "40.2.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "41.2.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "docify",
  "frame-benchmarking",
@@ -9652,8 +9600,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-session"
-version = "39.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "40.0.1"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -9673,7 +9621,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-session-benchmarking"
-version = "0.26.0"
+version = "0.23.0"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -9681,13 +9629,12 @@ dependencies = [
  "pallet-session",
  "parity-scale-codec",
  "sp-runtime",
- "sp-std",
 ]
 
 [[package]]
 name = "pallet-staking"
-version = "39.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "40.1.1"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -9708,8 +9655,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-staking-reward-fn"
-version = "22.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "22.0.1"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "log",
  "sp-arithmetic",
@@ -9717,8 +9664,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-storage-providers"
-version = "0.4.3"
-source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.4.3#0176413b97dbbacb9148f1134e2797e174afa713"
+version = "0.5.1"
+source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.5.1#f1d33efb306f972675830e06a6f44e9c5d9d5f71"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -9733,26 +9680,24 @@ dependencies = [
  "shp-traits",
  "sp-arithmetic",
  "sp-runtime",
- "sp-std",
  "sp-trie",
 ]
 
 [[package]]
 name = "pallet-storage-providers-runtime-api"
-version = "0.4.3"
-source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.4.3#0176413b97dbbacb9148f1134e2797e174afa713"
+version = "0.5.1"
+source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.5.1#f1d33efb306f972675830e06a6f44e9c5d9d5f71"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-api",
  "sp-runtime",
- "sp-std",
 ]
 
 [[package]]
 name = "pallet-sudo"
-version = "39.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "40.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "docify",
  "frame-benchmarking",
@@ -9766,8 +9711,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-timestamp"
-version = "38.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "39.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "docify",
  "frame-benchmarking",
@@ -9785,8 +9730,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-transaction-payment"
-version = "39.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "40.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -9801,10 +9746,10 @@ dependencies = [
 
 [[package]]
 name = "pallet-transaction-payment-rpc"
-version = "42.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "43.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
- "jsonrpsee 0.24.9",
+ "jsonrpsee",
  "pallet-transaction-payment-rpc-runtime-api",
  "parity-scale-codec",
  "sp-api",
@@ -9817,8 +9762,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-transaction-payment-rpc-runtime-api"
-version = "39.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "40.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "pallet-transaction-payment",
  "parity-scale-codec",
@@ -9829,8 +9774,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-treasury"
-version = "38.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "39.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "docify",
  "frame-benchmarking",
@@ -9848,25 +9793,22 @@ dependencies = [
 
 [[package]]
 name = "pallet-tx-pause"
-version = "20.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "21.1.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "docify",
- "frame-benchmarking",
- "frame-support",
- "frame-system",
  "pallet-balances",
  "pallet-proxy",
  "pallet-utility",
  "parity-scale-codec",
+ "polkadot-sdk-frame",
  "scale-info",
- "sp-runtime",
 ]
 
 [[package]]
 name = "pallet-utility"
-version = "39.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "40.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -9880,8 +9822,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-vesting"
-version = "39.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "40.1.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -9894,28 +9836,27 @@ dependencies = [
 
 [[package]]
 name = "pallet-whitelist"
-version = "38.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "39.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
- "frame-benchmarking",
- "frame-support",
- "frame-system",
  "parity-scale-codec",
+ "polkadot-sdk-frame",
  "scale-info",
- "sp-api",
- "sp-runtime",
 ]
 
 [[package]]
 name = "pallet-xcm"
-version = "18.1.1"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "19.2.2"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "bounded-collections",
  "frame-benchmarking",
  "frame-support",
  "frame-system",
+ "hex-literal 0.4.1",
  "pallet-balances",
+ "pallet-revive",
+ "pallet-timestamp",
  "parity-scale-codec",
  "scale-info",
  "serde",
@@ -9935,7 +9876,7 @@ version = "2.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4e69bf016dc406eff7d53a7d3f7cf1c2e72c82b9088aac1118591e36dd2cd3e9"
 dependencies = [
- "bitcoin_hashes",
+ "bitcoin_hashes 0.13.0",
  "rand 0.8.5",
  "rand_core 0.6.4",
  "serde",
@@ -10088,6 +10029,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2"
 dependencies = [
  "digest 0.10.7",
+ "hmac 0.12.1",
  "password-hash",
 ]
 
@@ -10099,11 +10041,12 @@ checksum = "19b17cddbe7ec3f8bc800887bab5e717348c95ea2ca0b1bf0837fb964dc67099"
 
 [[package]]
 name = "pem"
-version = "1.1.1"
+version = "3.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a8835c273a76a90455d7344889b0964598e3316e2a79ede8e36f16bdcf2228b8"
+checksum = "1d30c53c26bc5b31a98cd02d20f25a7c8567146caf63ed593a9d87b2775291be"
 dependencies = [
- "base64 0.13.1",
+ "base64 0.22.1",
+ "serde_core",
 ]
 
 [[package]]
@@ -10264,9 +10207,9 @@ checksum = "7edddbd0b52d732b21ad9a5fab5c704c14cd949e5e9a1ec5929a24fded1b904c"
 
 [[package]]
 name = "polkadot-ckb-merkle-mountain-range"
-version = "0.7.0"
+version = "0.8.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a4b44320e5f7ce2c18227537a3032ae5b2c476a7e8eddba45333e1011fc31b92"
+checksum = "221c71b432b38e494a0fdedb5f720e4cb974edf03a0af09e5b2238dbac7e6947"
 dependencies = [
  "cfg-if",
  "itertools 0.10.5",
@@ -10274,8 +10217,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-core-primitives"
-version = "16.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "17.1.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -10285,13 +10228,12 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-metrics"
-version = "21.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "23.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "bs58",
  "futures",
  "futures-timer",
- "log",
  "parity-scale-codec",
  "polkadot-primitives",
  "prioritized-metered-channel",
@@ -10299,13 +10241,12 @@ dependencies = [
  "sc-service",
  "sc-tracing",
  "substrate-prometheus-endpoint",
- "tracing-gum",
 ]
 
 [[package]]
 name = "polkadot-node-network-protocol"
-version = "21.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "23.1.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "async-channel 1.9.0",
  "async-trait",
@@ -10329,8 +10270,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-primitives"
-version = "17.0.1"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "19.1.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "bitvec",
  "bounded-vec",
@@ -10345,21 +10286,18 @@ dependencies = [
  "sp-application-crypto",
  "sp-consensus-babe",
  "sp-consensus-slots",
- "sp-core",
  "sp-keystore",
  "sp-maybe-compressed-blob",
- "sp-runtime",
  "thiserror 1.0.69",
  "zstd 0.12.4",
 ]
 
 [[package]]
 name = "polkadot-node-subsystem-types"
-version = "21.0.1"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "23.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "async-trait",
- "bitvec",
  "derive_more 0.99.20",
  "fatality",
  "futures",
@@ -10384,21 +10322,19 @@ dependencies = [
 
 [[package]]
 name = "polkadot-overseer"
-version = "21.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "23.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "async-trait",
  "futures",
  "futures-timer",
  "orchestra",
- "parking_lot 0.12.5",
  "polkadot-node-metrics",
  "polkadot-node-network-protocol",
  "polkadot-node-primitives",
  "polkadot-node-subsystem-types",
  "polkadot-primitives",
  "sc-client-api",
- "sp-api",
  "sp-core",
  "tikv-jemalloc-ctl",
  "tracing-gum",
@@ -10406,8 +10342,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-parachain-primitives"
-version = "15.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "16.1.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "bounded-collections",
  "derive_more 0.99.20",
@@ -10422,8 +10358,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-primitives"
-version = "17.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "18.2.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "bitvec",
  "hex-literal 0.4.1",
@@ -10450,8 +10386,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-runtime-common"
-version = "18.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "19.1.1"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "bitvec",
  "frame-benchmarking",
@@ -10482,7 +10418,6 @@ dependencies = [
  "rustc-hex",
  "scale-info",
  "serde",
- "serde_derive",
  "slot-range-helper",
  "sp-api",
  "sp-core",
@@ -10501,8 +10436,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-runtime-metrics"
-version = "18.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "20.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "bs58",
  "frame-benchmarking",
@@ -10513,12 +10448,11 @@ dependencies = [
 
 [[package]]
 name = "polkadot-runtime-parachains"
-version = "18.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "19.2.1"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "bitflags 1.3.2",
  "bitvec",
- "derive_more 0.99.20",
  "frame-benchmarking",
  "frame-support",
  "frame-system",
@@ -10534,7 +10468,6 @@ dependencies = [
  "pallet-session",
  "pallet-staking",
  "pallet-timestamp",
- "pallet-vesting",
  "parity-scale-codec",
  "polkadot-core-primitives",
  "polkadot-parachain-primitives",
@@ -10560,10 +10493,19 @@ dependencies = [
  "static_assertions",
 ]
 
+[[package]]
+name = "polkadot-sdk"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eb819108697967452fa6d8d96ab4c0d48cbaa423b3156499dcb24f1cf95d6775"
+dependencies = [
+ "sp-crypto-hashing 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
+]
+
 [[package]]
 name = "polkadot-sdk-frame"
-version = "0.8.1"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "0.9.1"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "docify",
  "frame-benchmarking",
@@ -10576,6 +10518,7 @@ dependencies = [
  "log",
  "parity-scale-codec",
  "scale-info",
+ "serde",
  "sp-api",
  "sp-arithmetic",
  "sp-block-builder",
@@ -10596,62 +10539,116 @@ dependencies = [
 
 [[package]]
 name = "polkadot-statement-table"
-version = "17.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "19.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "parity-scale-codec",
  "polkadot-primitives",
- "sp-core",
  "tracing-gum",
 ]
 
 [[package]]
 name = "polkavm"
-version = "0.9.3"
+version = "0.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dd044ab1d3b11567ab6b98ca71259a992b4034220d5972988a0e96518e5d343d"
+dependencies = [
+ "libc",
+ "log",
+ "polkavm-assembler 0.18.0",
+ "polkavm-common 0.18.0",
+ "polkavm-linux-raw 0.18.0",
+]
+
+[[package]]
+name = "polkavm"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8a3693e5efdb2bf74e449cd25fd777a28bd7ed87e41f5d5da75eb31b4de48b94"
+checksum = "cfd34e2f74206fff33482ae1718e275f11365ef8c4de7f0e69217f8845303867"
 dependencies = [
  "libc",
  "log",
- "polkavm-assembler",
- "polkavm-common",
- "polkavm-linux-raw",
+ "polkavm-assembler 0.21.0",
+ "polkavm-common 0.21.0",
+ "polkavm-linux-raw 0.21.0",
 ]
 
 [[package]]
 name = "polkavm-assembler"
-version = "0.9.0"
+version = "0.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "eaad38dc420bfed79e6f731471c973ce5ff5e47ab403e63cf40358fef8a6368f"
+dependencies = [
+ "log",
+]
+
+[[package]]
+name = "polkavm-assembler"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1fa96d6d868243acc12de813dd48e756cbadcc8e13964c70d272753266deadc1"
+checksum = "f512bc80cb10439391a7c13a9eb2d37cf66b7305e7df0a06d662eff4f5b07625"
 dependencies = [
  "log",
 ]
 
 [[package]]
 name = "polkavm-common"
-version = "0.9.0"
+version = "0.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "31ff33982a807d8567645d4784b9b5d7ab87bcb494f534a57cadd9012688e102"
+dependencies = [
+ "log",
+ "polkavm-assembler 0.18.0",
+]
+
+[[package]]
+name = "polkavm-common"
+version = "0.21.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c16b809cfd398f861261c045a8745e6c78b71ea7e0d3ef6f7cc553eb27bc17e"
+dependencies = [
+ "blake3",
+ "log",
+ "polkavm-assembler 0.21.0",
+]
+
+[[package]]
+name = "polkavm-derive"
+version = "0.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c2eb703f3b6404c13228402e98a5eae063fd16b8f58afe334073ec105ee4117e"
+dependencies = [
+ "polkavm-derive-impl-macro 0.18.0",
+]
+
+[[package]]
+name = "polkavm-derive"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1d9428a5cfcc85c5d7b9fc4b6a18c4b802d0173d768182a51cc7751640f08b92"
+checksum = "47239245f87329541932c0d7fec750a66a75b13aa87dfe4fbfd637bab86ad387"
 dependencies = [
- "log",
+ "polkavm-derive-impl-macro 0.21.0",
 ]
 
 [[package]]
-name = "polkavm-derive"
-version = "0.9.1"
+name = "polkavm-derive-impl"
+version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae8c4bea6f3e11cd89bb18bcdddac10bd9a24015399bd1c485ad68a985a19606"
+checksum = "2f2116a92e6e96220a398930f4c8a6cda1264206f3e2034fc9982bfd93f261f7"
 dependencies = [
- "polkavm-derive-impl-macro",
+ "polkavm-common 0.18.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.106",
 ]
 
 [[package]]
 name = "polkavm-derive-impl"
-version = "0.9.0"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c4fdfc49717fb9a196e74a5d28e0bc764eb394a2c803eb11133a31ac996c60c"
+checksum = "24fd6c6215450c3e57511df5c38a82eb4bde208de15ee15046ac33852f3c3eaa"
 dependencies = [
- "polkavm-common",
+ "polkavm-common 0.21.0",
  "proc-macro2",
  "quote",
  "syn 2.0.106",
@@ -10659,34 +10656,67 @@ dependencies = [
 
 [[package]]
 name = "polkavm-derive-impl-macro"
-version = "0.9.0"
+version = "0.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "48c16669ddc7433e34c1007d31080b80901e3e8e523cb9d4b441c3910cf9294b"
+dependencies = [
+ "polkavm-derive-impl 0.18.1",
+ "syn 2.0.106",
+]
+
+[[package]]
+name = "polkavm-derive-impl-macro"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8ba81f7b5faac81e528eb6158a6f3c9e0bb1008e0ffa19653bc8dea925ecb429"
+checksum = "36837f6b7edfd6f4498f8d25d81da16cf03bd6992c3e56f3d477dfc90f4fefca"
 dependencies = [
- "polkavm-derive-impl",
+ "polkavm-derive-impl 0.21.0",
  "syn 2.0.106",
 ]
 
 [[package]]
 name = "polkavm-linker"
-version = "0.9.2"
+version = "0.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e9bfe793b094d9ea5c99b7c43ba46e277b0f8f48f4bbfdbabf8d3ebf701a4bd3"
+dependencies = [
+ "dirs",
+ "gimli 0.31.1",
+ "hashbrown 0.14.5",
+ "log",
+ "object 0.36.7",
+ "polkavm-common 0.18.0",
+ "regalloc2 0.9.3",
+ "rustc-demangle",
+]
+
+[[package]]
+name = "polkavm-linker"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9c7be503e60cf56c0eb785f90aaba4b583b36bff00e93997d93fef97f9553c39"
+checksum = "23bc764986c4a63f9ab9890c3f4eb9b4c13b6ff80d79685bd48ade147234aab4"
 dependencies = [
- "gimli 0.28.1",
+ "dirs",
+ "gimli 0.31.1",
  "hashbrown 0.14.5",
  "log",
- "object 0.32.2",
- "polkavm-common",
+ "object 0.36.7",
+ "polkavm-common 0.21.0",
  "regalloc2 0.9.3",
  "rustc-demangle",
 ]
 
 [[package]]
 name = "polkavm-linux-raw"
-version = "0.9.0"
+version = "0.18.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "23eff02c070c70f31878a3d915e88a914ecf3e153741e2fb572dde28cce20fde"
+
+[[package]]
+name = "polkavm-linux-raw"
+version = "0.21.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "26e85d3456948e650dff0cfc85603915847faf893ed1e66b020bb82ef4557120"
+checksum = "be6cd1d48c5e7814d287a3e12a339386a5dfa2f3ac72f932335f4cf56467f1b3"
 
 [[package]]
 name = "polling"
@@ -10809,7 +10839,7 @@ dependencies = [
 [[package]]
 name = "precompile-utils"
 version = "0.1.0"
-source = "git+https://github.com/polkadot-evm/frontier?branch=stable2412#75329a2df49e2cc7981485392c31160929d1bd48"
+source = "git+https://github.com/polkadot-evm/frontier?branch=stable2503#7d1cff7f13828b563752ad8a71458cab1ea42009"
 dependencies = [
  "derive_more 1.0.0",
  "environmental",
@@ -10838,31 +10868,17 @@ dependencies = [
 [[package]]
 name = "precompile-utils-macro"
 version = "0.1.0"
-source = "git+https://github.com/polkadot-evm/frontier?branch=stable2412#75329a2df49e2cc7981485392c31160929d1bd48"
+source = "git+https://github.com/polkadot-evm/frontier?branch=stable2503#7d1cff7f13828b563752ad8a71458cab1ea42009"
 dependencies = [
  "case",
  "num_enum",
  "prettyplease",
  "proc-macro2",
  "quote",
- "sp-crypto-hashing 0.1.0 (git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6)",
+ "sp-crypto-hashing 0.1.0 (git+https://github.com/paritytech/polkadot-sdk?branch=stable2503)",
  "syn 2.0.106",
 ]
 
-[[package]]
-name = "predicates"
-version = "2.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59230a63c37f3e18569bdb90e4a89cbf5bf8b06fea0b84e65ea10cc4df47addd"
-dependencies = [
- "difflib",
- "float-cmp",
- "itertools 0.10.5",
- "normalize-line-endings",
- "predicates-core",
- "regex",
-]
-
 [[package]]
 name = "predicates"
 version = "3.1.3"
@@ -10917,8 +10933,6 @@ checksum = "0b34d9fd68ae0b74a41b21c03c2f62847aa0ffea044eee893b4c140b37e244e2"
 dependencies = [
  "fixed-hash",
  "impl-codec 0.6.0",
- "impl-serde 0.4.0",
- "scale-info",
  "uint 0.9.5",
 ]
 
@@ -10932,7 +10946,7 @@ dependencies = [
  "impl-codec 0.7.1",
  "impl-num-traits",
  "impl-rlp",
- "impl-serde 0.5.0",
+ "impl-serde",
  "scale-info",
  "uint 0.10.0",
 ]
@@ -11028,17 +11042,6 @@ dependencies = [
  "syn 2.0.106",
 ]
 
-[[package]]
-name = "proc-macro-warning"
-version = "0.4.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d1eaa7fa0aa1929ffdf7eeb6eac234dde6268914a14ad44d23521ab6a9b258e"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.106",
-]
-
 [[package]]
 name = "proc-macro-warning"
 version = "1.84.1"
@@ -11075,9 +11078,9 @@ dependencies = [
 
 [[package]]
 name = "prometheus-client"
-version = "0.21.2"
+version = "0.22.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3c99afa9a01501019ac3a14d71d9f94050346f55ca471ce90c799a15c58f61e2"
+checksum = "504ee9ff529add891127c4827eb481bd69dc0ebc72e9a682e187db4caa60c3ca"
 dependencies = [
  "dtoa",
  "itoa",
@@ -11262,33 +11265,15 @@ dependencies = [
 
 [[package]]
 name = "quick-protobuf-codec"
-version = "0.2.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f8ededb1cd78531627244d51dd0c7139fbe736c7d57af0092a76f0ffb2f56e98"
+checksum = "15a0580ab32b169745d7a39db2ba969226ca16738931be152a3209b409de2474"
 dependencies = [
- "asynchronous-codec",
+ "asynchronous-codec 0.7.0",
  "bytes",
  "quick-protobuf",
  "thiserror 1.0.69",
- "unsigned-varint 0.7.2",
-]
-
-[[package]]
-name = "quinn"
-version = "0.10.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cc2c5017e4b43d5995dcea317bc46c1e09404c0a9664d2908f7f02dfe943d75"
-dependencies = [
- "bytes",
- "futures-io",
- "pin-project-lite",
- "quinn-proto 0.10.6",
- "quinn-udp 0.4.1",
- "rustc-hash 1.1.0",
- "rustls 0.21.12",
- "thiserror 1.0.69",
- "tokio",
- "tracing",
+ "unsigned-varint 0.8.0",
 ]
 
 [[package]]
@@ -11299,11 +11284,12 @@ checksum = "b9e20a958963c291dc322d98411f541009df2ced7b5a4f2bd52337638cfccf20"
 dependencies = [
  "bytes",
  "cfg_aliases 0.2.1",
+ "futures-io",
  "pin-project-lite",
- "quinn-proto 0.11.13",
- "quinn-udp 0.5.14",
+ "quinn-proto",
+ "quinn-udp",
  "rustc-hash 2.1.1",
- "rustls 0.23.32",
+ "rustls",
  "socket2 0.6.0",
  "thiserror 2.0.17",
  "tokio",
@@ -11311,23 +11297,6 @@ dependencies = [
  "web-time",
 ]
 
-[[package]]
-name = "quinn-proto"
-version = "0.10.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "141bf7dfde2fbc246bfd3fe12f2455aa24b0fbd9af535d8c86c7bd1381ff2b1a"
-dependencies = [
- "bytes",
- "rand 0.8.5",
- "ring 0.16.20",
- "rustc-hash 1.1.0",
- "rustls 0.21.12",
- "slab",
- "thiserror 1.0.69",
- "tinyvec",
- "tracing",
-]
-
 [[package]]
 name = "quinn-proto"
 version = "0.11.13"
@@ -11340,7 +11309,7 @@ dependencies = [
  "rand 0.9.2",
  "ring 0.17.14",
  "rustc-hash 2.1.1",
- "rustls 0.23.32",
+ "rustls",
  "rustls-pki-types",
  "slab",
  "thiserror 2.0.17",
@@ -11349,19 +11318,6 @@ dependencies = [
  "web-time",
 ]
 
-[[package]]
-name = "quinn-udp"
-version = "0.4.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "055b4e778e8feb9f93c4e439f71dc2156ef13360b432b799e179a8c4cdf0b1d7"
-dependencies = [
- "bytes",
- "libc",
- "socket2 0.5.10",
- "tracing",
- "windows-sys 0.48.0",
-]
-
 [[package]]
 name = "quinn-udp"
 version = "0.5.14"
@@ -11522,9 +11478,9 @@ dependencies = [
 
 [[package]]
 name = "rcgen"
-version = "0.10.0"
+version = "0.11.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ffbe84efe2f38dea12e9bfc1f65377fdf03e53a18cb3b995faedf7934c7e785b"
+checksum = "52c4f3084aa3bc7dfbba4eff4fab2a54db4324965d8872ab933565e6fbd83bc6"
 dependencies = [
  "pem",
  "ring 0.16.20",
@@ -11532,22 +11488,6 @@ dependencies = [
  "yasna",
 ]
 
-[[package]]
-name = "reconnecting-jsonrpsee-ws-client"
-version = "0.4.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "06fa4f17e09edfc3131636082faaec633c7baa269396b4004040bc6c52f49f65"
-dependencies = [
- "cfg_aliases 0.2.1",
- "finito",
- "futures",
- "jsonrpsee 0.23.2",
- "serde_json",
- "thiserror 1.0.69",
- "tokio",
- "tracing",
-]
-
 [[package]]
 name = "redox_syscall"
 version = "0.2.16"
@@ -11680,21 +11620,21 @@ dependencies = [
  "http-body 1.0.1",
  "http-body-util",
  "hyper 1.7.0",
- "hyper-rustls 0.27.7",
+ "hyper-rustls",
  "hyper-util",
  "js-sys",
  "log",
  "percent-encoding",
  "pin-project-lite",
- "quinn 0.11.9",
- "rustls 0.23.32",
+ "quinn",
+ "rustls",
  "rustls-pki-types",
  "serde",
  "serde_json",
  "serde_urlencoded",
  "sync_wrapper",
  "tokio",
- "tokio-rustls 0.26.4",
+ "tokio-rustls",
  "tokio-util",
  "tower 0.5.2",
  "tower-http 0.6.6",
@@ -11960,32 +11900,6 @@ dependencies = [
  "windows-sys 0.61.2",
 ]
 
-[[package]]
-name = "rustls"
-version = "0.21.12"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f56a14d1f48b391359b22f731fd4bd7e43c97f3c50eee276f3aa09c94784d3e"
-dependencies = [
- "log",
- "ring 0.17.14",
- "rustls-webpki 0.101.7",
- "sct",
-]
-
-[[package]]
-name = "rustls"
-version = "0.22.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432"
-dependencies = [
- "log",
- "ring 0.17.14",
- "rustls-pki-types",
- "rustls-webpki 0.102.8",
- "subtle 2.6.1",
- "zeroize",
-]
-
 [[package]]
 name = "rustls"
 version = "0.23.32"
@@ -12001,31 +11915,6 @@ dependencies = [
  "zeroize",
 ]
 
-[[package]]
-name = "rustls-native-certs"
-version = "0.6.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00"
-dependencies = [
- "openssl-probe",
- "rustls-pemfile 1.0.4",
- "schannel",
- "security-framework 2.11.1",
-]
-
-[[package]]
-name = "rustls-native-certs"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5bfb394eeed242e909609f56089eecfe5fda225042e8b171791b9c95f5931e5"
-dependencies = [
- "openssl-probe",
- "rustls-pemfile 2.2.0",
- "rustls-pki-types",
- "schannel",
- "security-framework 2.11.1",
-]
-
 [[package]]
 name = "rustls-native-certs"
 version = "0.8.1"
@@ -12038,15 +11927,6 @@ dependencies = [
  "security-framework 3.5.1",
 ]
 
-[[package]]
-name = "rustls-pemfile"
-version = "1.0.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c74cae0a4cf6ccbbf5f359f08efdf8ee7e1dc532573bf0db71968cb56b1448c"
-dependencies = [
- "base64 0.21.7",
-]
-
 [[package]]
 name = "rustls-pemfile"
 version = "2.2.0"
@@ -12066,27 +11946,6 @@ dependencies = [
  "zeroize",
 ]
 
-[[package]]
-name = "rustls-platform-verifier"
-version = "0.3.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "afbb878bdfdf63a336a5e63561b1835e7a8c91524f51621db870169eac84b490"
-dependencies = [
- "core-foundation 0.9.4",
- "core-foundation-sys",
- "jni 0.19.0",
- "log",
- "once_cell",
- "rustls 0.23.32",
- "rustls-native-certs 0.7.3",
- "rustls-platform-verifier-android",
- "rustls-webpki 0.102.8",
- "security-framework 2.11.1",
- "security-framework-sys",
- "webpki-roots 0.26.11",
- "winapi",
-]
-
 [[package]]
 name = "rustls-platform-verifier"
 version = "0.5.3"
@@ -12095,11 +11954,11 @@ checksum = "19787cda76408ec5404443dc8b31795c87cd8fec49762dc75fa727740d34acc1"
 dependencies = [
  "core-foundation 0.10.1",
  "core-foundation-sys",
- "jni 0.21.1",
+ "jni",
  "log",
  "once_cell",
- "rustls 0.23.32",
- "rustls-native-certs 0.8.1",
+ "rustls",
+ "rustls-native-certs",
  "rustls-platform-verifier-android",
  "rustls-webpki 0.103.7",
  "security-framework 3.5.1",
@@ -12124,17 +11983,6 @@ dependencies = [
  "untrusted 0.9.0",
 ]
 
-[[package]]
-name = "rustls-webpki"
-version = "0.102.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "64ca1bc8749bd4cf37b5ce386cc146580777b4e8572c7b97baf22c83f444bee9"
-dependencies = [
- "ring 0.17.14",
- "rustls-pki-types",
- "untrusted 0.9.0",
-]
-
 [[package]]
 name = "rustls-webpki"
 version = "0.103.7"
@@ -12166,13 +12014,12 @@ dependencies = [
 
 [[package]]
 name = "ruzstd"
-version = "0.5.0"
+version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58c4eb8a81997cf040a091d1f7e1938aeab6749d3a0dfa73af43cdc32393483d"
+checksum = "5174a470eeb535a721ae9fdd6e291c2411a906b96592182d05217591d5c5cf7b"
 dependencies = [
  "byteorder",
  "derive_more 0.99.20",
- "twox-hash",
 ]
 
 [[package]]
@@ -12201,6 +12048,15 @@ dependencies = [
  "bytemuck",
 ]
 
+[[package]]
+name = "salsa20"
+version = "0.10.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "97a22f5af31f73a954c10289c93e8a50cc23d971e80ee446f1f6f7137a088213"
+dependencies = [
+ "cipher 0.4.4",
+]
+
 [[package]]
 name = "same-file"
 version = "1.0.6"
@@ -12212,8 +12068,8 @@ dependencies = [
 
 [[package]]
 name = "sc-allocator"
-version = "30.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "31.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "log",
  "sp-core",
@@ -12223,17 +12079,15 @@ dependencies = [
 
 [[package]]
 name = "sc-authority-discovery"
-version = "0.48.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "0.50.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "async-trait",
  "futures",
  "futures-timer",
  "ip_network",
- "libp2p",
  "linked_hash_set",
  "log",
- "multihash 0.19.3",
  "parity-scale-codec",
  "prost 0.12.6",
  "prost-build 0.13.5",
@@ -12253,11 +12107,10 @@ dependencies = [
 
 [[package]]
 name = "sc-basic-authorship"
-version = "0.48.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "0.49.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "futures",
- "futures-timer",
  "log",
  "parity-scale-codec",
  "sc-block-builder",
@@ -12275,8 +12128,8 @@ dependencies = [
 
 [[package]]
 name = "sc-block-builder"
-version = "0.43.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "0.44.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -12290,12 +12143,11 @@ dependencies = [
 
 [[package]]
 name = "sc-chain-spec"
-version = "41.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "43.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "array-bytes",
  "docify",
- "log",
  "memmap2 0.9.8",
  "parity-scale-codec",
  "sc-chain-spec-derive",
@@ -12307,7 +12159,7 @@ dependencies = [
  "serde_json",
  "sp-blockchain",
  "sp-core",
- "sp-crypto-hashing 0.1.0 (git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6)",
+ "sp-crypto-hashing 0.1.0 (git+https://github.com/paritytech/polkadot-sdk?branch=stable2503)",
  "sp-genesis-builder",
  "sp-io",
  "sp-runtime",
@@ -12318,7 +12170,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec-derive"
 version = "12.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "proc-macro-crate 3.4.0",
  "proc-macro2",
@@ -12328,8 +12180,8 @@ dependencies = [
 
 [[package]]
 name = "sc-cli"
-version = "0.50.1"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "0.52.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "array-bytes",
  "chrono",
@@ -12370,8 +12222,8 @@ dependencies = [
 
 [[package]]
 name = "sc-client-api"
-version = "38.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "39.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "fnv",
  "futures",
@@ -12389,7 +12241,6 @@ dependencies = [
  "sp-externalities",
  "sp-runtime",
  "sp-state-machine",
- "sp-statement-store",
  "sp-storage",
  "sp-trie",
  "substrate-prometheus-endpoint",
@@ -12397,8 +12248,8 @@ dependencies = [
 
 [[package]]
 name = "sc-client-db"
-version = "0.45.1"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "0.46.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "hash-db",
  "kvdb",
@@ -12423,19 +12274,18 @@ dependencies = [
 
 [[package]]
 name = "sc-consensus"
-version = "0.47.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "0.49.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "async-trait",
  "futures",
  "log",
- "mockall 0.11.4",
+ "mockall",
  "parking_lot 0.12.5",
  "sc-client-api",
  "sc-network-types",
  "sc-utils",
  "serde",
- "sp-api",
  "sp-blockchain",
  "sp-consensus",
  "sp-core",
@@ -12447,8 +12297,8 @@ dependencies = [
 
 [[package]]
 name = "sc-consensus-aura"
-version = "0.48.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "0.50.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "async-trait",
  "futures",
@@ -12476,8 +12326,8 @@ dependencies = [
 
 [[package]]
 name = "sc-consensus-babe"
-version = "0.48.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "0.50.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "async-trait",
  "fork-tree",
@@ -12502,7 +12352,7 @@ dependencies = [
  "sp-consensus-babe",
  "sp-consensus-slots",
  "sp-core",
- "sp-crypto-hashing 0.1.0 (git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6)",
+ "sp-crypto-hashing 0.1.0 (git+https://github.com/paritytech/polkadot-sdk?branch=stable2503)",
  "sp-inherents",
  "sp-keystore",
  "sp-runtime",
@@ -12512,13 +12362,12 @@ dependencies = [
 
 [[package]]
 name = "sc-consensus-beefy"
-version = "27.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "29.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "array-bytes",
  "async-channel 1.9.0",
  "async-trait",
- "fnv",
  "futures",
  "log",
  "parity-scale-codec",
@@ -12537,7 +12386,6 @@ dependencies = [
  "sp-consensus",
  "sp-consensus-beefy",
  "sp-core",
- "sp-crypto-hashing 0.1.0 (git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6)",
  "sp-keystore",
  "sp-runtime",
  "substrate-prometheus-endpoint",
@@ -12548,11 +12396,11 @@ dependencies = [
 
 [[package]]
 name = "sc-consensus-beefy-rpc"
-version = "27.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "29.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "futures",
- "jsonrpsee 0.24.9",
+ "jsonrpsee",
  "log",
  "parity-scale-codec",
  "parking_lot 0.12.5",
@@ -12568,8 +12416,8 @@ dependencies = [
 
 [[package]]
 name = "sc-consensus-epochs"
-version = "0.47.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "0.49.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "fork-tree",
  "parity-scale-codec",
@@ -12581,8 +12429,8 @@ dependencies = [
 
 [[package]]
 name = "sc-consensus-grandpa"
-version = "0.33.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "0.35.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "ahash",
  "array-bytes",
@@ -12616,7 +12464,7 @@ dependencies = [
  "sp-consensus",
  "sp-consensus-grandpa",
  "sp-core",
- "sp-crypto-hashing 0.1.0 (git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6)",
+ "sp-crypto-hashing 0.1.0 (git+https://github.com/paritytech/polkadot-sdk?branch=stable2503)",
  "sp-keystore",
  "sp-runtime",
  "substrate-prometheus-endpoint",
@@ -12625,14 +12473,14 @@ dependencies = [
 
 [[package]]
 name = "sc-consensus-manual-seal"
-version = "0.49.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "0.51.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "assert_matches",
  "async-trait",
  "futures",
  "futures-timer",
- "jsonrpsee 0.24.9",
+ "jsonrpsee",
  "log",
  "parity-scale-codec",
  "sc-client-api",
@@ -12660,8 +12508,8 @@ dependencies = [
 
 [[package]]
 name = "sc-consensus-slots"
-version = "0.47.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "0.49.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "async-trait",
  "futures",
@@ -12683,8 +12531,8 @@ dependencies = [
 
 [[package]]
 name = "sc-executor"
-version = "0.41.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "0.42.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "parity-scale-codec",
  "parking_lot 0.12.5",
@@ -12706,10 +12554,10 @@ dependencies = [
 
 [[package]]
 name = "sc-executor-common"
-version = "0.36.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "0.38.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
- "polkavm",
+ "polkavm 0.18.0",
  "sc-allocator",
  "sp-maybe-compressed-blob",
  "sp-wasm-interface",
@@ -12719,23 +12567,21 @@ dependencies = [
 
 [[package]]
 name = "sc-executor-polkavm"
-version = "0.33.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "0.35.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "log",
- "polkavm",
+ "polkavm 0.18.0",
  "sc-executor-common",
  "sp-wasm-interface",
 ]
 
 [[package]]
 name = "sc-executor-wasmtime"
-version = "0.36.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "0.38.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "anyhow",
- "cfg-if",
- "libc",
  "log",
  "parking_lot 0.12.5",
  "rustix 0.36.17",
@@ -12748,8 +12594,8 @@ dependencies = [
 
 [[package]]
 name = "sc-informant"
-version = "0.47.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "0.49.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "console",
  "futures",
@@ -12757,7 +12603,6 @@ dependencies = [
  "log",
  "sc-client-api",
  "sc-network",
- "sc-network-common",
  "sc-network-sync",
  "sp-blockchain",
  "sp-runtime",
@@ -12765,8 +12610,8 @@ dependencies = [
 
 [[package]]
 name = "sc-keystore"
-version = "34.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "35.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "array-bytes",
  "parking_lot 0.12.5",
@@ -12779,8 +12624,8 @@ dependencies = [
 
 [[package]]
 name = "sc-mixnet"
-version = "0.18.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "0.20.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "array-bytes",
  "arrayvec 0.7.6",
@@ -12790,7 +12635,6 @@ dependencies = [
  "futures-timer",
  "log",
  "mixnet",
- "multiaddr 0.18.2",
  "parity-scale-codec",
  "parking_lot 0.12.5",
  "sc-client-api",
@@ -12808,13 +12652,13 @@ dependencies = [
 
 [[package]]
 name = "sc-network"
-version = "0.48.4"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "0.50.1"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "array-bytes",
  "async-channel 1.9.0",
  "async-trait",
- "asynchronous-codec",
+ "asynchronous-codec 0.6.2",
  "bytes",
  "cid 0.9.0",
  "either",
@@ -12826,8 +12670,7 @@ dependencies = [
  "linked_hash_set",
  "litep2p",
  "log",
- "mockall 0.11.4",
- "once_cell",
+ "mockall",
  "parity-scale-codec",
  "parking_lot 0.12.5",
  "partial_sort",
@@ -12859,26 +12702,18 @@ dependencies = [
 
 [[package]]
 name = "sc-network-common"
-version = "0.47.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
-dependencies = [
- "async-trait",
- "bitflags 1.3.2",
- "futures",
- "libp2p-identity",
- "parity-scale-codec",
- "prost-build 0.13.5",
- "sc-consensus",
- "sc-network-types",
- "sp-consensus",
- "sp-consensus-grandpa",
+version = "0.48.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
+dependencies = [
+ "bitflags 1.3.2",
+ "parity-scale-codec",
  "sp-runtime",
 ]
 
 [[package]]
 name = "sc-network-gossip"
-version = "0.48.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "0.50.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "ahash",
  "futures",
@@ -12896,8 +12731,8 @@ dependencies = [
 
 [[package]]
 name = "sc-network-light"
-version = "0.47.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "0.49.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "array-bytes",
  "async-channel 1.9.0",
@@ -12917,17 +12752,16 @@ dependencies = [
 
 [[package]]
 name = "sc-network-sync"
-version = "0.47.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "0.49.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "array-bytes",
  "async-channel 1.9.0",
  "async-trait",
  "fork-tree",
  "futures",
- "futures-timer",
  "log",
- "mockall 0.11.4",
+ "mockall",
  "parity-scale-codec",
  "prost 0.12.6",
  "prost-build 0.13.5",
@@ -12953,8 +12787,8 @@ dependencies = [
 
 [[package]]
 name = "sc-network-transactions"
-version = "0.47.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "0.49.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "array-bytes",
  "futures",
@@ -12972,12 +12806,14 @@ dependencies = [
 
 [[package]]
 name = "sc-network-types"
-version = "0.15.2"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "0.16.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "bs58",
+ "bytes",
  "ed25519-dalek",
  "libp2p-identity",
+ "libp2p-kad",
  "litep2p",
  "log",
  "multiaddr 0.18.2",
@@ -12989,28 +12825,25 @@ dependencies = [
 
 [[package]]
 name = "sc-offchain"
-version = "43.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "45.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
- "array-bytes",
  "bytes",
  "fnv",
  "futures",
  "futures-timer",
  "http-body-util",
  "hyper 1.7.0",
- "hyper-rustls 0.27.7",
+ "hyper-rustls",
  "hyper-util",
- "log",
  "num_cpus",
  "once_cell",
  "parity-scale-codec",
  "parking_lot 0.12.5",
  "rand 0.8.5",
- "rustls 0.23.32",
+ "rustls",
  "sc-client-api",
  "sc-network",
- "sc-network-common",
  "sc-network-types",
  "sc-transaction-pool-api",
  "sc-utils",
@@ -13026,8 +12859,8 @@ dependencies = [
 
 [[package]]
 name = "sc-proposer-metrics"
-version = "0.18.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "0.20.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "log",
  "substrate-prometheus-endpoint",
@@ -13035,11 +12868,11 @@ dependencies = [
 
 [[package]]
 name = "sc-rpc"
-version = "43.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "45.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "futures",
- "jsonrpsee 0.24.9",
+ "jsonrpsee",
  "log",
  "parity-scale-codec",
  "parking_lot 0.12.5",
@@ -13067,10 +12900,10 @@ dependencies = [
 
 [[package]]
 name = "sc-rpc-api"
-version = "0.47.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "0.49.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
- "jsonrpsee 0.24.9",
+ "jsonrpsee",
  "parity-scale-codec",
  "sc-chain-spec",
  "sc-mixnet",
@@ -13087,8 +12920,8 @@ dependencies = [
 
 [[package]]
 name = "sc-rpc-server"
-version = "20.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "22.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "dyn-clone",
  "forwarded-header-value",
@@ -13098,7 +12931,7 @@ dependencies = [
  "http-body-util",
  "hyper 1.7.0",
  "ip_network",
- "jsonrpsee 0.24.9",
+ "jsonrpsee",
  "log",
  "sc-rpc-api",
  "serde",
@@ -13111,15 +12944,15 @@ dependencies = [
 
 [[package]]
 name = "sc-rpc-spec-v2"
-version = "0.48.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "0.50.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "array-bytes",
  "futures",
  "futures-util",
  "hex",
  "itertools 0.11.0",
- "jsonrpsee 0.24.9",
+ "jsonrpsee",
  "log",
  "parity-scale-codec",
  "parking_lot 0.12.5",
@@ -13136,22 +12969,38 @@ dependencies = [
  "sp-rpc",
  "sp-runtime",
  "sp-version",
+ "substrate-prometheus-endpoint",
  "thiserror 1.0.69",
  "tokio",
  "tokio-stream",
 ]
 
+[[package]]
+name = "sc-runtime-utilities"
+version = "0.2.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
+dependencies = [
+ "parity-scale-codec",
+ "sc-executor",
+ "sc-executor-common",
+ "sp-core",
+ "sp-crypto-hashing 0.1.0 (git+https://github.com/paritytech/polkadot-sdk?branch=stable2503)",
+ "sp-state-machine",
+ "sp-wasm-interface",
+ "thiserror 1.0.69",
+]
+
 [[package]]
 name = "sc-service"
-version = "0.49.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "0.51.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "async-trait",
  "directories",
  "exit-future",
  "futures",
  "futures-timer",
- "jsonrpsee 0.24.9",
+ "jsonrpsee",
  "log",
  "parity-scale-codec",
  "parking_lot 0.12.5",
@@ -13207,8 +13056,8 @@ dependencies = [
 
 [[package]]
 name = "sc-state-db"
-version = "0.37.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "0.38.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -13218,8 +13067,8 @@ dependencies = [
 
 [[package]]
 name = "sc-sysinfo"
-version = "41.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "42.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "derive_more 0.99.20",
  "futures",
@@ -13232,15 +13081,14 @@ dependencies = [
  "serde",
  "serde_json",
  "sp-core",
- "sp-crypto-hashing 0.1.0 (git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6)",
+ "sp-crypto-hashing 0.1.0 (git+https://github.com/paritytech/polkadot-sdk?branch=stable2503)",
  "sp-io",
- "sp-std",
 ]
 
 [[package]]
 name = "sc-telemetry"
-version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "28.1.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "chrono",
  "futures",
@@ -13249,7 +13097,6 @@ dependencies = [
  "parking_lot 0.12.5",
  "pin-project",
  "rand 0.8.5",
- "sc-network",
  "sc-utils",
  "serde",
  "serde_json",
@@ -13259,8 +13106,8 @@ dependencies = [
 
 [[package]]
 name = "sc-tracing"
-version = "38.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "39.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "chrono",
  "console",
@@ -13287,8 +13134,8 @@ dependencies = [
 
 [[package]]
 name = "sc-tracing-proc-macro"
-version = "11.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "11.1.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "proc-macro-crate 3.4.0",
  "proc-macro2",
@@ -13298,8 +13145,8 @@ dependencies = [
 
 [[package]]
 name = "sc-transaction-pool"
-version = "38.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "39.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "async-trait",
  "futures",
@@ -13317,7 +13164,7 @@ dependencies = [
  "sp-api",
  "sp-blockchain",
  "sp-core",
- "sp-crypto-hashing 0.1.0 (git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6)",
+ "sp-crypto-hashing 0.1.0 (git+https://github.com/paritytech/polkadot-sdk?branch=stable2503)",
  "sp-runtime",
  "sp-tracing",
  "sp-transaction-pool",
@@ -13325,15 +13172,17 @@ dependencies = [
  "thiserror 1.0.69",
  "tokio",
  "tokio-stream",
+ "tracing",
 ]
 
 [[package]]
 name = "sc-transaction-pool-api"
-version = "38.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "39.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "async-trait",
  "futures",
+ "indexmap 2.11.4",
  "log",
  "parity-scale-codec",
  "serde",
@@ -13345,8 +13194,8 @@ dependencies = [
 
 [[package]]
 name = "sc-utils"
-version = "18.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "18.0.1"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "async-channel 1.9.0",
  "futures",
@@ -13377,7 +13226,20 @@ checksum = "e98f3262c250d90e700bb802eb704e1f841e03331c2eb815e46516c4edbf5b27"
 dependencies = [
  "derive_more 0.99.20",
  "parity-scale-codec",
- "primitive-types 0.12.2",
+ "scale-bits",
+ "scale-type-resolver",
+ "smallvec",
+]
+
+[[package]]
+name = "scale-decode"
+version = "0.14.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8ae9cc099ae85ff28820210732b00f019546f36f33225f509fe25d5816864a0"
+dependencies = [
+ "derive_more 1.0.0",
+ "parity-scale-codec",
+ "primitive-types 0.13.1",
  "scale-bits",
  "scale-decode-derive",
  "scale-type-resolver",
@@ -13386,25 +13248,25 @@ dependencies = [
 
 [[package]]
 name = "scale-decode-derive"
-version = "0.13.1"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9bb22f574168103cdd3133b19281639ca65ad985e24612728f727339dcaf4021"
+checksum = "5ed9401effa946b493f9f84dc03714cca98119b230497df6f3df6b84a2b03648"
 dependencies = [
- "darling 0.14.4",
+ "darling",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.106",
 ]
 
 [[package]]
 name = "scale-encode"
-version = "0.7.2"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "528464e6ae6c8f98e2b79633bf79ef939552e795e316579dab09c61670d56602"
+checksum = "5f9271284d05d0749c40771c46180ce89905fd95aa72a2a2fddb4b7c0aa424db"
 dependencies = [
- "derive_more 0.99.20",
+ "derive_more 1.0.0",
  "parity-scale-codec",
- "primitive-types 0.12.2",
+ "primitive-types 0.13.1",
  "scale-bits",
  "scale-encode-derive",
  "scale-type-resolver",
@@ -13413,11 +13275,11 @@ dependencies = [
 
 [[package]]
 name = "scale-encode-derive"
-version = "0.7.2"
+version = "0.8.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bef2618f123c88da9cd8853b69d766068f1eddc7692146d7dfe9b89e25ce2efd"
+checksum = "102fbc6236de6c53906c0b262f12c7aa69c2bdc604862c12728f5f4d370bc137"
 dependencies = [
- "darling 0.20.11",
+ "darling",
  "proc-macro-crate 3.4.0",
  "proc-macro2",
  "quote",
@@ -13462,9 +13324,9 @@ dependencies = [
 
 [[package]]
 name = "scale-typegen"
-version = "0.8.0"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "498d1aecf2ea61325d4511787c115791639c0fd21ef4f8e11e49dd09eff2bbac"
+checksum = "0dc4c70c7fea2eef1740f0081d3fe385d8bee1eef11e9272d3bec7dc8e5438e0"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -13475,18 +13337,17 @@ dependencies = [
 
 [[package]]
 name = "scale-value"
-version = "0.16.3"
+version = "0.17.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8cd6ab090d823e75cfdb258aad5fe92e13f2af7d04b43a55d607d25fcc38c811"
+checksum = "f5e0ef2a0ee1e02a69ada37feb87ea1616ce9808aca072befe2d3131bf28576e"
 dependencies = [
  "base58",
  "blake2 0.10.6",
- "derive_more 0.99.20",
+ "derive_more 1.0.0",
  "either",
- "frame-metadata 15.1.0",
  "parity-scale-codec",
  "scale-bits",
- "scale-decode",
+ "scale-decode 0.14.0",
  "scale-encode",
  "scale-info",
  "scale-type-resolver",
@@ -13555,13 +13416,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d68f2ec51b097e4c1a75b681a8bec621909b5e91f15bb7b840c4f2f7b01148b2"
 
 [[package]]
-name = "sct"
-version = "0.7.1"
+name = "scrypt"
+version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da046153aa2352493d6cb7da4b6e5c0c057d8a1d0a9aa8560baffdd945acd414"
+checksum = "0516a385866c09368f0b5bcd1caff3366aace790fcd46e2bb032697bb172fd1f"
 dependencies = [
- "ring 0.17.14",
- "untrusted 0.9.0",
+ "password-hash",
+ "pbkdf2",
+ "salsa20",
+ "sha2 0.10.9",
 ]
 
 [[package]]
@@ -13597,6 +13460,17 @@ dependencies = [
  "secp256k1-sys 0.9.2",
 ]
 
+[[package]]
+name = "secp256k1"
+version = "0.30.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b50c5943d326858130af85e049f2661ba3c78b26589b8ab98e65e80ae44a1252"
+dependencies = [
+ "bitcoin_hashes 0.14.1",
+ "rand 0.8.5",
+ "secp256k1-sys 0.10.1",
+]
+
 [[package]]
 name = "secp256k1-sys"
 version = "0.8.2"
@@ -13615,6 +13489,15 @@ dependencies = [
  "cc",
 ]
 
+[[package]]
+name = "secp256k1-sys"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d4387882333d3aa8cb20530a17c69a3752e97837832f34f6dccc760e715001d9"
+dependencies = [
+ "cc",
+]
+
 [[package]]
 name = "secrecy"
 version = "0.8.0"
@@ -13624,6 +13507,15 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "secrecy"
+version = "0.10.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e891af845473308773346dc847b2c23ee78fe442e0472ac50e22a18a93d3ae5a"
+dependencies = [
+ "zeroize",
+]
+
 [[package]]
 name = "security-framework"
 version = "2.11.1"
@@ -13634,7 +13526,6 @@ dependencies = [
  "core-foundation 0.9.4",
  "core-foundation-sys",
  "libc",
- "num-bigint",
  "security-framework-sys",
 ]
 
@@ -13704,12 +13595,6 @@ dependencies = [
  "pest",
 ]
 
-[[package]]
-name = "send_wrapper"
-version = "0.6.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cd0b0ec5f1c1ca621c432a25813d8d60c88abe6d3e08a3eb9cf37d97a0fe3d73"
-
 [[package]]
 name = "serde"
 version = "1.0.228"
@@ -13823,19 +13708,6 @@ dependencies = [
  "serde",
 ]
 
-[[package]]
-name = "sha-1"
-version = "0.9.8"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "99cd6713db3cf16b6c84e06321e049a9b9f699826e16096d23bbcc44d15d51a6"
-dependencies = [
- "block-buffer 0.9.0",
- "cfg-if",
- "cpufeatures",
- "digest 0.9.0",
- "opaque-debug 0.3.1",
-]
-
 [[package]]
 name = "sha1"
 version = "0.10.6"
@@ -13902,8 +13774,8 @@ dependencies = [
 
 [[package]]
 name = "shc-actors-derive"
-version = "0.4.3"
-source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.4.3#0176413b97dbbacb9148f1134e2797e174afa713"
+version = "0.5.1"
+source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.5.1#f1d33efb306f972675830e06a6f44e9c5d9d5f71"
 dependencies = [
  "once_cell",
  "proc-macro2",
@@ -13915,8 +13787,8 @@ dependencies = [
 
 [[package]]
 name = "shc-actors-framework"
-version = "0.4.3"
-source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.4.3#0176413b97dbbacb9148f1134e2797e174afa713"
+version = "0.5.1"
+source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.5.1#f1d33efb306f972675830e06a6f44e9c5d9d5f71"
 dependencies = [
  "anyhow",
  "bincode",
@@ -13934,8 +13806,8 @@ dependencies = [
 
 [[package]]
 name = "shc-blockchain-service"
-version = "0.4.3"
-source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.4.3#0176413b97dbbacb9148f1134e2797e174afa713"
+version = "0.5.1"
+source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.5.1#f1d33efb306f972675830e06a6f44e9c5d9d5f71"
 dependencies = [
  "anyhow",
  "array-bytes",
@@ -13990,8 +13862,8 @@ dependencies = [
 
 [[package]]
 name = "shc-blockchain-service-db"
-version = "0.4.3"
-source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.4.3#0176413b97dbbacb9148f1134e2797e174afa713"
+version = "0.5.1"
+source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.5.1#f1d33efb306f972675830e06a6f44e9c5d9d5f71"
 dependencies = [
  "chrono",
  "diesel",
@@ -14000,9 +13872,9 @@ dependencies = [
  "futures",
  "hex",
  "log",
- "rustls 0.23.32",
- "rustls-pemfile 2.2.0",
- "rustls-platform-verifier 0.5.3",
+ "rustls",
+ "rustls-pemfile",
+ "rustls-platform-verifier",
  "sc-transaction-pool-api",
  "serde",
  "serde_json",
@@ -14014,8 +13886,8 @@ dependencies = [
 
 [[package]]
 name = "shc-client"
-version = "0.4.3"
-source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.4.3#0176413b97dbbacb9148f1134e2797e174afa713"
+version = "0.5.1"
+source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.5.1#f1d33efb306f972675830e06a6f44e9c5d9d5f71"
 dependencies = [
  "anyhow",
  "array-bytes",
@@ -14031,7 +13903,7 @@ dependencies = [
  "frame-system",
  "futures",
  "hex",
- "jsonrpsee 0.24.9",
+ "jsonrpsee",
  "kvdb",
  "kvdb-rocksdb",
  "lazy_static",
@@ -14089,14 +13961,15 @@ dependencies = [
 
 [[package]]
 name = "shc-common"
-version = "0.4.3"
-source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.4.3#0176413b97dbbacb9148f1134e2797e174afa713"
+version = "0.5.1"
+source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.5.1#f1d33efb306f972675830e06a6f44e9c5d9d5f71"
 dependencies = [
  "anyhow",
  "bigdecimal",
  "bincode",
  "bytes",
  "cumulus-primitives-core",
+ "cumulus-primitives-proof-size-hostfunction",
  "cumulus-primitives-storage-weight-reclaim",
  "fp-account",
  "frame-benchmarking",
@@ -14145,17 +14018,16 @@ dependencies = [
  "sp-keystore",
  "sp-rpc",
  "sp-runtime",
- "sp-std",
  "sp-trie",
  "substrate-frame-rpc-system",
  "thiserror 1.0.69",
- "trie-db 0.29.1",
+ "trie-db 0.30.0",
 ]
 
 [[package]]
 name = "shc-file-manager"
-version = "0.4.3"
-source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.4.3#0176413b97dbbacb9148f1134e2797e174afa713"
+version = "0.5.1"
+source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.5.1#f1d33efb306f972675830e06a6f44e9c5d9d5f71"
 dependencies = [
  "bincode",
  "hash-db",
@@ -14174,13 +14046,13 @@ dependencies = [
  "sp-trie",
  "strum 0.26.3",
  "thiserror 1.0.69",
- "trie-db 0.29.1",
+ "trie-db 0.30.0",
 ]
 
 [[package]]
 name = "shc-file-transfer-service"
-version = "0.4.3"
-source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.4.3#0176413b97dbbacb9148f1134e2797e174afa713"
+version = "0.5.1"
+source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.5.1#f1d33efb306f972675830e06a6f44e9c5d9d5f71"
 dependencies = [
  "anyhow",
  "array-bytes",
@@ -14210,8 +14082,8 @@ dependencies = [
 
 [[package]]
 name = "shc-fisherman-service"
-version = "0.4.3"
-source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.4.3#0176413b97dbbacb9148f1134e2797e174afa713"
+version = "0.5.1"
+source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.5.1#f1d33efb306f972675830e06a6f44e9c5d9d5f71"
 dependencies = [
  "async-trait",
  "diesel",
@@ -14241,8 +14113,8 @@ dependencies = [
 
 [[package]]
 name = "shc-forest-manager"
-version = "0.4.3"
-source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.4.3#0176413b97dbbacb9148f1134e2797e174afa713"
+version = "0.5.1"
+source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.5.1#f1d33efb306f972675830e06a6f44e9c5d9d5f71"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -14262,13 +14134,13 @@ dependencies = [
  "sp-trie",
  "thiserror 1.0.69",
  "tokio",
- "trie-db 0.29.1",
+ "trie-db 0.30.0",
 ]
 
 [[package]]
 name = "shc-indexer-db"
-version = "0.4.3"
-source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.4.3#0176413b97dbbacb9148f1134e2797e174afa713"
+version = "0.5.1"
+source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.5.1#f1d33efb306f972675830e06a6f44e9c5d9d5f71"
 dependencies = [
  "bigdecimal",
  "chrono",
@@ -14278,9 +14150,9 @@ dependencies = [
  "futures",
  "hex",
  "log",
- "rustls 0.23.32",
- "rustls-pemfile 2.2.0",
- "rustls-platform-verifier 0.5.3",
+ "rustls",
+ "rustls-pemfile",
+ "rustls-platform-verifier",
  "sc-network",
  "serde",
  "serde_json",
@@ -14295,8 +14167,8 @@ dependencies = [
 
 [[package]]
 name = "shc-indexer-service"
-version = "0.4.3"
-source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.4.3#0176413b97dbbacb9148f1134e2797e174afa713"
+version = "0.5.1"
+source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.5.1#f1d33efb306f972675830e06a6f44e9c5d9d5f71"
 dependencies = [
  "anyhow",
  "array-bytes",
@@ -14346,8 +14218,8 @@ dependencies = [
 
 [[package]]
 name = "shc-rpc"
-version = "0.4.3"
-source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.4.3#0176413b97dbbacb9148f1134e2797e174afa713"
+version = "0.5.1"
+source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.5.1#f1d33efb306f972675830e06a6f44e9c5d9d5f71"
 dependencies = [
  "array-bytes",
  "async-trait",
@@ -14355,7 +14227,7 @@ dependencies = [
  "futures",
  "futures-util",
  "hex",
- "jsonrpsee 0.24.9",
+ "jsonrpsee",
  "log",
  "mime_guess",
  "pallet-file-system-runtime-api",
@@ -14368,6 +14240,7 @@ dependencies = [
  "sc-rpc-api",
  "serde",
  "shc-actors-framework",
+ "shc-blockchain-service",
  "shc-common",
  "shc-file-manager",
  "shc-file-transfer-service",
@@ -14392,8 +14265,8 @@ dependencies = [
 
 [[package]]
 name = "shc-telemetry"
-version = "0.4.3"
-source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.4.3#0176413b97dbbacb9148f1134e2797e174afa713"
+version = "0.5.1"
+source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.5.1#f1d33efb306f972675830e06a6f44e9c5d9d5f71"
 dependencies = [
  "log",
  "substrate-prometheus-endpoint",
@@ -14409,8 +14282,8 @@ checksum = "0fda2ff0d084019ba4d7c6f371c95d8fd75ce3524c3cb8fb653a3023f6323e64"
 
 [[package]]
 name = "shp-constants"
-version = "0.4.3"
-source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.4.3#0176413b97dbbacb9148f1134e2797e174afa713"
+version = "0.5.1"
+source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.5.1#f1d33efb306f972675830e06a6f44e9c5d9d5f71"
 dependencies = [
  "sp-core",
  "sp-runtime",
@@ -14418,8 +14291,8 @@ dependencies = [
 
 [[package]]
 name = "shp-data-price-updater"
-version = "0.4.3"
-source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.4.3#0176413b97dbbacb9148f1134e2797e174afa713"
+version = "0.5.1"
+source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.5.1#f1d33efb306f972675830e06a6f44e9c5d9d5f71"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
@@ -14428,13 +14301,12 @@ dependencies = [
  "shp-traits",
  "sp-core",
  "sp-runtime",
- "sp-std",
 ]
 
 [[package]]
 name = "shp-file-key-verifier"
-version = "0.4.3"
-source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.4.3#0176413b97dbbacb9148f1134e2797e174afa713"
+version = "0.5.1"
+source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.5.1#f1d33efb306f972675830e06a6f44e9c5d9d5f71"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
@@ -14444,15 +14316,14 @@ dependencies = [
  "shp-traits",
  "sp-core",
  "sp-runtime",
- "sp-std",
  "sp-trie",
- "trie-db 0.29.1",
+ "trie-db 0.30.0",
 ]
 
 [[package]]
 name = "shp-file-metadata"
-version = "0.4.3"
-source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.4.3#0176413b97dbbacb9148f1134e2797e174afa713"
+version = "0.5.1"
+source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.5.1#f1d33efb306f972675830e06a6f44e9c5d9d5f71"
 dependencies = [
  "hex",
  "num-bigint",
@@ -14467,8 +14338,8 @@ dependencies = [
 
 [[package]]
 name = "shp-forest-verifier"
-version = "0.4.3"
-source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.4.3#0176413b97dbbacb9148f1134e2797e174afa713"
+version = "0.5.1"
+source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.5.1#f1d33efb306f972675830e06a6f44e9c5d9d5f71"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
@@ -14477,23 +14348,22 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
  "sp-trie",
- "trie-db 0.29.1",
+ "trie-db 0.30.0",
 ]
 
 [[package]]
 name = "shp-opaque"
-version = "0.4.3"
-source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.4.3#0176413b97dbbacb9148f1134e2797e174afa713"
+version = "0.5.1"
+source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.5.1#f1d33efb306f972675830e06a6f44e9c5d9d5f71"
 dependencies = [
  "sp-runtime",
 ]
 
 [[package]]
 name = "shp-session-keys"
-version = "0.4.3"
-source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.4.3#0176413b97dbbacb9148f1134e2797e174afa713"
+version = "0.5.1"
+source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.5.1#f1d33efb306f972675830e06a6f44e9c5d9d5f71"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -14502,27 +14372,25 @@ dependencies = [
  "sp-inherents",
  "sp-keystore",
  "sp-runtime",
- "sp-std",
 ]
 
 [[package]]
 name = "shp-traits"
-version = "0.4.3"
-source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.4.3#0176413b97dbbacb9148f1134e2797e174afa713"
+version = "0.5.1"
+source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.5.1#f1d33efb306f972675830e06a6f44e9c5d9d5f71"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
  "scale-info",
  "sp-core",
  "sp-runtime",
- "sp-std",
  "sp-trie",
 ]
 
 [[package]]
 name = "shp-treasury-funding"
-version = "0.4.3"
-source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.4.3#0176413b97dbbacb9148f1134e2797e174afa713"
+version = "0.5.1"
+source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.5.1#f1d33efb306f972675830e06a6f44e9c5d9d5f71"
 dependencies = [
  "log",
  "shp-traits",
@@ -14532,21 +14400,20 @@ dependencies = [
 
 [[package]]
 name = "shp-tx-implicits-runtime-api"
-version = "0.4.3"
-source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.4.3#0176413b97dbbacb9148f1134e2797e174afa713"
+version = "0.5.1"
+source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.5.1#f1d33efb306f972675830e06a6f44e9c5d9d5f71"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-api",
  "sp-core",
  "sp-runtime",
- "sp-std",
 ]
 
 [[package]]
 name = "shp-types"
-version = "0.4.3"
-source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.4.3#0176413b97dbbacb9148f1134e2797e174afa713"
+version = "0.5.1"
+source = "git+https://github.com/Moonsong-Labs/storage-hub.git?tag=v0.5.1#f1d33efb306f972675830e06a6f44e9c5d9d5f71"
 dependencies = [
  "sp-core",
  "sp-runtime",
@@ -14646,8 +14513,8 @@ checksum = "826167069c09b99d56f31e9ae5c99049e932a98c9dc2dac47645b08dbbf76ba7"
 
 [[package]]
 name = "slot-range-helper"
-version = "16.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "17.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "enumn",
  "parity-scale-codec",
@@ -14680,14 +14547,14 @@ dependencies = [
 
 [[package]]
 name = "smoldot"
-version = "0.16.0"
+version = "0.18.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e6d1eaa97d77be4d026a1e7ffad1bb3b78448763b357ea6f8188d3e6f736a9b9"
+checksum = "966e72d77a3b2171bb7461d0cb91f43670c63558c62d7cf42809cae6c8b6b818"
 dependencies = [
  "arrayvec 0.7.6",
  "async-lock",
  "atomic-take",
- "base64 0.21.7",
+ "base64 0.22.1",
  "bip39",
  "blake2-rfc",
  "bs58",
@@ -14696,18 +14563,17 @@ dependencies = [
  "derive_more 0.99.20",
  "ed25519-zebra",
  "either",
- "event-listener 4.0.3",
+ "event-listener 5.4.1",
  "fnv",
  "futures-lite",
  "futures-util",
  "hashbrown 0.14.5",
  "hex",
  "hmac 0.12.1",
- "itertools 0.12.1",
+ "itertools 0.13.0",
  "libm",
  "libsecp256k1",
  "merlin",
- "no-std-net",
  "nom",
  "num-bigint",
  "num-rational",
@@ -14726,7 +14592,7 @@ dependencies = [
  "siphasher 1.0.1",
  "slab",
  "smallvec",
- "soketto 0.7.1",
+ "soketto",
  "twox-hash",
  "wasmi",
  "x25519-dalek",
@@ -14735,27 +14601,27 @@ dependencies = [
 
 [[package]]
 name = "smoldot-light"
-version = "0.14.0"
+version = "0.16.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5496f2d116b7019a526b1039ec2247dd172b8670633b1a64a614c9ea12c9d8c7"
+checksum = "2a33b06891f687909632ce6a4e3fd7677b24df930365af3d0bcb078310129f3f"
 dependencies = [
  "async-channel 2.5.0",
  "async-lock",
- "base64 0.21.7",
+ "base64 0.22.1",
  "blake2-rfc",
+ "bs58",
  "derive_more 0.99.20",
  "either",
- "event-listener 4.0.3",
+ "event-listener 5.4.1",
  "fnv",
  "futures-channel",
  "futures-lite",
  "futures-util",
  "hashbrown 0.14.5",
  "hex",
- "itertools 0.12.1",
+ "itertools 0.13.0",
  "log",
  "lru 0.12.5",
- "no-std-net",
  "parking_lot 0.12.5",
  "pin-project",
  "rand 0.8.5",
@@ -14804,8 +14670,8 @@ dependencies = [
 
 [[package]]
 name = "snowbridge-beacon-primitives"
-version = "0.12.1"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "0.13.1"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "byte-slice-cast",
  "frame-support",
@@ -14814,7 +14680,7 @@ dependencies = [
  "rlp 0.6.1",
  "scale-info",
  "serde",
- "snowbridge-ethereum 0.11.0",
+ "snowbridge-ethereum 0.12.0",
  "snowbridge-milagro-bls",
  "sp-core",
  "sp-io",
@@ -14826,7 +14692,7 @@ dependencies = [
 
 [[package]]
 name = "snowbridge-beacon-primitives"
-version = "0.26.0"
+version = "0.23.0"
 dependencies = [
  "byte-slice-cast",
  "frame-support",
@@ -14841,25 +14707,25 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
  "ssz_rs",
  "ssz_rs_derive",
 ]
 
 [[package]]
 name = "snowbridge-core"
-version = "0.12.2"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "0.13.2"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
+ "bp-relayers",
  "ethabi-decode",
  "frame-support",
  "frame-system",
  "hex-literal 0.4.1",
+ "log",
  "parity-scale-codec",
  "polkadot-parachain-primitives",
  "scale-info",
  "serde",
- "snowbridge-beacon-primitives 0.12.1",
  "sp-arithmetic",
  "sp-core",
  "sp-io",
@@ -14867,11 +14733,12 @@ dependencies = [
  "sp-std",
  "staging-xcm",
  "staging-xcm-builder",
+ "staging-xcm-executor",
 ]
 
 [[package]]
 name = "snowbridge-core"
-version = "0.26.0"
+version = "0.23.0"
 dependencies = [
  "bp-relayers",
  "ethabi-decode",
@@ -14888,7 +14755,6 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
  "staging-xcm",
  "staging-xcm-builder",
  "staging-xcm-executor",
@@ -14912,13 +14778,12 @@ dependencies = [
  "serde_json",
  "sp-io",
  "sp-runtime",
- "sp-std",
 ]
 
 [[package]]
 name = "snowbridge-ethereum"
-version = "0.11.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "0.12.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "ethabi-decode",
  "ethbloom",
@@ -14948,13 +14813,12 @@ dependencies = [
  "log",
  "parity-scale-codec",
  "scale-info",
- "snowbridge-beacon-primitives 0.26.0",
- "snowbridge-core 0.26.0",
- "snowbridge-verification-primitives",
+ "snowbridge-beacon-primitives 0.23.0",
+ "snowbridge-core 0.23.0",
+ "snowbridge-verification-primitives 0.23.0",
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
  "staging-xcm",
  "staging-xcm-builder",
  "staging-xcm-executor",
@@ -14962,7 +14826,18 @@ dependencies = [
 
 [[package]]
 name = "snowbridge-merkle-tree"
-version = "0.26.0"
+version = "0.2.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
+dependencies = [
+ "parity-scale-codec",
+ "scale-info",
+ "sp-core",
+ "sp-runtime",
+]
+
+[[package]]
+name = "snowbridge-merkle-tree"
+version = "0.23.0"
 dependencies = [
  "array-bytes",
  "hex",
@@ -14970,7 +14845,7 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-core",
- "sp-crypto-hashing 0.1.0 (git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6)",
+ "sp-crypto-hashing 0.1.0 (git+https://github.com/paritytech/polkadot-sdk?branch=stable2503)",
  "sp-runtime",
  "sp-tracing",
 ]
@@ -14991,19 +14866,34 @@ dependencies = [
 ]
 
 [[package]]
-name = "snowbridge-outbound-queue-merkle-tree"
-version = "0.10.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+name = "snowbridge-outbound-queue-primitives"
+version = "0.2.2"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
+ "alloy-core",
+ "ethabi-decode",
+ "frame-support",
+ "frame-system",
+ "hex-literal 0.4.1",
+ "log",
  "parity-scale-codec",
+ "polkadot-parachain-primitives",
  "scale-info",
+ "snowbridge-core 0.13.2",
+ "snowbridge-verification-primitives 0.2.0",
+ "sp-arithmetic",
  "sp-core",
+ "sp-io",
  "sp-runtime",
+ "sp-std",
+ "staging-xcm",
+ "staging-xcm-builder",
+ "staging-xcm-executor",
 ]
 
 [[package]]
 name = "snowbridge-outbound-queue-primitives"
-version = "0.26.0"
+version = "0.23.0"
 dependencies = [
  "alloy-core",
  "ethabi-decode",
@@ -15015,13 +14905,12 @@ dependencies = [
  "parity-scale-codec",
  "polkadot-parachain-primitives",
  "scale-info",
- "snowbridge-core 0.26.0",
- "snowbridge-verification-primitives",
+ "snowbridge-core 0.23.0",
+ "snowbridge-verification-primitives 0.23.0",
  "sp-arithmetic",
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
  "staging-xcm",
  "staging-xcm-builder",
  "staging-xcm-executor",
@@ -15029,22 +14918,21 @@ dependencies = [
 
 [[package]]
 name = "snowbridge-outbound-queue-v2-runtime-api"
-version = "0.26.0"
+version = "0.23.0"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
  "scale-info",
- "snowbridge-core 0.26.0",
- "snowbridge-merkle-tree",
- "snowbridge-outbound-queue-primitives",
+ "snowbridge-core 0.23.0",
+ "snowbridge-merkle-tree 0.23.0",
+ "snowbridge-outbound-queue-primitives 0.23.0",
  "sp-api",
- "sp-std",
  "staging-xcm",
 ]
 
 [[package]]
 name = "snowbridge-pallet-ethereum-client"
-version = "0.26.0"
+version = "0.23.0"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -15057,15 +14945,14 @@ dependencies = [
  "scale-info",
  "serde",
  "serde_json",
- "snowbridge-beacon-primitives 0.26.0",
- "snowbridge-core 0.26.0",
+ "snowbridge-beacon-primitives 0.23.0",
+ "snowbridge-core 0.23.0",
  "snowbridge-ethereum 0.3.0",
  "snowbridge-inbound-queue-primitives",
  "snowbridge-pallet-ethereum-client-fixtures",
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
  "static_assertions",
 ]
 
@@ -15074,16 +14961,15 @@ name = "snowbridge-pallet-ethereum-client-fixtures"
 version = "0.9.0"
 dependencies = [
  "hex-literal 0.3.4",
- "snowbridge-beacon-primitives 0.26.0",
- "snowbridge-core 0.26.0",
+ "snowbridge-beacon-primitives 0.23.0",
+ "snowbridge-core 0.23.0",
  "snowbridge-inbound-queue-primitives",
  "sp-core",
- "sp-std",
 ]
 
 [[package]]
 name = "snowbridge-pallet-inbound-queue-v2"
-version = "0.26.0"
+version = "0.23.0"
 dependencies = [
  "alloy-core",
  "bp-relayers",
@@ -15097,8 +14983,8 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "serde",
- "snowbridge-beacon-primitives 0.26.0",
- "snowbridge-core 0.26.0",
+ "snowbridge-beacon-primitives 0.23.0",
+ "snowbridge-core 0.23.0",
  "snowbridge-inbound-queue-primitives",
  "snowbridge-pallet-ethereum-client",
  "snowbridge-pallet-inbound-queue-v2-fixtures",
@@ -15107,7 +14993,6 @@ dependencies = [
  "sp-io",
  "sp-keyring",
  "sp-runtime",
- "sp-std",
  "staging-xcm",
  "staging-xcm-builder",
  "staging-xcm-executor",
@@ -15119,19 +15004,18 @@ name = "snowbridge-pallet-inbound-queue-v2-fixtures"
 version = "0.10.0"
 dependencies = [
  "hex-literal 0.3.4",
- "snowbridge-beacon-primitives 0.26.0",
- "snowbridge-core 0.26.0",
+ "snowbridge-beacon-primitives 0.23.0",
+ "snowbridge-core 0.23.0",
  "snowbridge-inbound-queue-primitives",
  "sp-core",
- "sp-std",
 ]
 
 [[package]]
 name = "snowbridge-pallet-outbound-queue"
-version = "0.12.1"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "0.13.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
- "bridge-hub-common 0.12.0",
+ "bridge-hub-common 0.13.1 (git+https://github.com/paritytech/polkadot-sdk?branch=stable2503)",
  "ethabi-decode",
  "frame-benchmarking",
  "frame-support",
@@ -15139,8 +15023,9 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "serde",
- "snowbridge-core 0.12.2",
- "snowbridge-outbound-queue-merkle-tree",
+ "snowbridge-core 0.13.2",
+ "snowbridge-merkle-tree 0.2.0",
+ "snowbridge-outbound-queue-primitives 0.2.2",
  "sp-arithmetic",
  "sp-core",
  "sp-io",
@@ -15150,7 +15035,7 @@ dependencies = [
 
 [[package]]
 name = "snowbridge-pallet-outbound-queue-v2"
-version = "0.26.0"
+version = "0.23.0"
 dependencies = [
  "alloy-core",
  "bp-relayers",
@@ -15164,18 +15049,17 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "serde",
- "snowbridge-beacon-primitives 0.26.0",
- "snowbridge-core 0.26.0",
+ "snowbridge-beacon-primitives 0.23.0",
+ "snowbridge-core 0.23.0",
  "snowbridge-inbound-queue-primitives",
- "snowbridge-merkle-tree",
- "snowbridge-outbound-queue-primitives",
- "snowbridge-verification-primitives",
+ "snowbridge-merkle-tree 0.23.0",
+ "snowbridge-outbound-queue-primitives 0.23.0",
+ "snowbridge-verification-primitives 0.23.0",
  "sp-arithmetic",
  "sp-core",
  "sp-io",
  "sp-keyring",
  "sp-runtime",
- "sp-std",
  "staging-xcm",
  "staging-xcm-builder",
  "staging-xcm-executor",
@@ -15196,20 +15080,19 @@ dependencies = [
  "parity-scale-codec",
  "polkadot-primitives",
  "scale-info",
- "snowbridge-core 0.26.0",
- "snowbridge-outbound-queue-primitives",
+ "snowbridge-core 0.23.0",
+ "snowbridge-outbound-queue-primitives 0.23.0",
  "snowbridge-pallet-outbound-queue",
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
  "staging-xcm",
  "staging-xcm-executor",
 ]
 
 [[package]]
 name = "snowbridge-pallet-system-v2"
-version = "0.26.0"
+version = "0.23.0"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -15221,8 +15104,8 @@ dependencies = [
  "parity-scale-codec",
  "polkadot-primitives",
  "scale-info",
- "snowbridge-core 0.26.0",
- "snowbridge-outbound-queue-primitives",
+ "snowbridge-core 0.23.0",
+ "snowbridge-outbound-queue-primitives 0.23.0",
  "snowbridge-pallet-outbound-queue-v2",
  "snowbridge-pallet-system",
  "snowbridge-test-utils",
@@ -15230,25 +15113,23 @@ dependencies = [
  "sp-io",
  "sp-keyring",
  "sp-runtime",
- "sp-std",
  "staging-xcm",
  "staging-xcm-executor",
 ]
 
 [[package]]
 name = "snowbridge-system-v2-runtime-api"
-version = "0.26.0"
+version = "0.23.0"
 dependencies = [
  "parity-scale-codec",
- "snowbridge-core 0.26.0",
+ "snowbridge-core 0.23.0",
  "sp-api",
- "sp-std",
  "staging-xcm",
 ]
 
 [[package]]
 name = "snowbridge-test-utils"
-version = "0.26.0"
+version = "0.23.0"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -15258,9 +15139,8 @@ dependencies = [
  "pallet-xcm",
  "parity-scale-codec",
  "scale-info",
- "snowbridge-outbound-queue-primitives",
+ "snowbridge-outbound-queue-primitives 0.23.0",
  "sp-core",
- "sp-std",
  "staging-xcm",
  "staging-xcm-builder",
  "staging-xcm-executor",
@@ -15268,24 +15148,26 @@ dependencies = [
 
 [[package]]
 name = "snowbridge-verification-primitives"
-version = "0.26.0"
+version = "0.2.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
  "scale-info",
- "snowbridge-beacon-primitives 0.26.0",
+ "snowbridge-beacon-primitives 0.13.1",
  "sp-core",
  "sp-std",
 ]
 
 [[package]]
-name = "socket2"
-version = "0.4.10"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d"
+name = "snowbridge-verification-primitives"
+version = "0.23.0"
 dependencies = [
- "libc",
- "winapi",
+ "frame-support",
+ "parity-scale-codec",
+ "scale-info",
+ "snowbridge-beacon-primitives 0.23.0",
+ "sp-core",
 ]
 
 [[package]]
@@ -15308,21 +15190,6 @@ dependencies = [
  "windows-sys 0.59.0",
 ]
 
-[[package]]
-name = "soketto"
-version = "0.7.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "41d1c5305e39e09653383c2c7244f2f78b3bcae37cf50c64cb4789c9f5096ec2"
-dependencies = [
- "base64 0.13.1",
- "bytes",
- "futures",
- "httparse",
- "log",
- "rand 0.8.5",
- "sha-1",
-]
-
 [[package]]
 name = "soketto"
 version = "0.8.1"
@@ -15341,8 +15208,8 @@ dependencies = [
 
 [[package]]
 name = "sp-api"
-version = "35.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "36.0.1"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "docify",
  "hash-db",
@@ -15363,8 +15230,8 @@ dependencies = [
 
 [[package]]
 name = "sp-api-proc-macro"
-version = "21.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "22.0.1"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "Inflector",
  "blake2 0.10.6",
@@ -15377,8 +15244,8 @@ dependencies = [
 
 [[package]]
 name = "sp-application-crypto"
-version = "39.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "40.1.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -15389,8 +15256,8 @@ dependencies = [
 
 [[package]]
 name = "sp-arithmetic"
-version = "26.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "26.1.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "docify",
  "integer-sqrt",
@@ -15403,8 +15270,8 @@ dependencies = [
 
 [[package]]
 name = "sp-authority-discovery"
-version = "35.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "36.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -15415,8 +15282,8 @@ dependencies = [
 
 [[package]]
 name = "sp-block-builder"
-version = "35.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "36.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "sp-api",
  "sp-inherents",
@@ -15425,8 +15292,8 @@ dependencies = [
 
 [[package]]
 name = "sp-blockchain"
-version = "38.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "39.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "futures",
  "parity-scale-codec",
@@ -15444,13 +15311,12 @@ dependencies = [
 
 [[package]]
 name = "sp-consensus"
-version = "0.41.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "0.42.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "async-trait",
  "futures",
  "log",
- "sp-core",
  "sp-inherents",
  "sp-runtime",
  "sp-state-machine",
@@ -15459,8 +15325,8 @@ dependencies = [
 
 [[package]]
 name = "sp-consensus-aura"
-version = "0.41.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "0.42.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -15475,8 +15341,8 @@ dependencies = [
 
 [[package]]
 name = "sp-consensus-babe"
-version = "0.41.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "0.42.1"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -15493,8 +15359,8 @@ dependencies = [
 
 [[package]]
 name = "sp-consensus-beefy"
-version = "23.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "24.1.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -15502,7 +15368,7 @@ dependencies = [
  "sp-api",
  "sp-application-crypto",
  "sp-core",
- "sp-crypto-hashing 0.1.0 (git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6)",
+ "sp-crypto-hashing 0.1.0 (git+https://github.com/paritytech/polkadot-sdk?branch=stable2503)",
  "sp-io",
  "sp-keystore",
  "sp-mmr-primitives",
@@ -15513,8 +15379,8 @@ dependencies = [
 
 [[package]]
 name = "sp-consensus-grandpa"
-version = "22.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "23.1.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "finality-grandpa",
  "log",
@@ -15530,8 +15396,8 @@ dependencies = [
 
 [[package]]
 name = "sp-consensus-slots"
-version = "0.41.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "0.42.1"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -15541,9 +15407,10 @@ dependencies = [
 
 [[package]]
 name = "sp-core"
-version = "35.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "36.1.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
+ "ark-vrf",
  "array-bytes",
  "bitflags 1.3.2",
  "blake2 0.10.6",
@@ -15554,7 +15421,7 @@ dependencies = [
  "futures",
  "hash-db",
  "hash256-std-hasher",
- "impl-serde 0.5.0",
+ "impl-serde",
  "itertools 0.11.0",
  "k256",
  "libsecp256k1",
@@ -15569,9 +15436,9 @@ dependencies = [
  "scale-info",
  "schnorrkel",
  "secp256k1 0.28.2",
- "secrecy",
+ "secrecy 0.8.0",
  "serde",
- "sp-crypto-hashing 0.1.0 (git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6)",
+ "sp-crypto-hashing 0.1.0 (git+https://github.com/paritytech/polkadot-sdk?branch=stable2503)",
  "sp-debug-derive",
  "sp-externalities",
  "sp-runtime-interface",
@@ -15602,7 +15469,7 @@ dependencies = [
 [[package]]
 name = "sp-crypto-hashing"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "blake2b_simd",
  "byteorder",
@@ -15615,17 +15482,17 @@ dependencies = [
 [[package]]
 name = "sp-crypto-hashing-proc-macro"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "quote",
- "sp-crypto-hashing 0.1.0 (git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6)",
+ "sp-crypto-hashing 0.1.0 (git+https://github.com/paritytech/polkadot-sdk?branch=stable2503)",
  "syn 2.0.106",
 ]
 
 [[package]]
 name = "sp-database"
 version = "10.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "kvdb",
  "parking_lot 0.12.5",
@@ -15634,7 +15501,7 @@ dependencies = [
 [[package]]
 name = "sp-debug-derive"
 version = "14.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -15644,7 +15511,7 @@ dependencies = [
 [[package]]
 name = "sp-externalities"
 version = "0.30.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "environmental",
  "parity-scale-codec",
@@ -15653,8 +15520,8 @@ dependencies = [
 
 [[package]]
 name = "sp-genesis-builder"
-version = "0.16.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "0.17.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -15665,8 +15532,8 @@ dependencies = [
 
 [[package]]
 name = "sp-inherents"
-version = "35.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "36.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "async-trait",
  "impl-trait-for-tuples",
@@ -15678,8 +15545,8 @@ dependencies = [
 
 [[package]]
 name = "sp-io"
-version = "39.0.1"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "40.0.1"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "bytes",
  "docify",
@@ -15687,11 +15554,11 @@ dependencies = [
  "libsecp256k1",
  "log",
  "parity-scale-codec",
- "polkavm-derive",
+ "polkavm-derive 0.18.0",
  "rustversion",
  "secp256k1 0.28.2",
  "sp-core",
- "sp-crypto-hashing 0.1.0 (git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6)",
+ "sp-crypto-hashing 0.1.0 (git+https://github.com/paritytech/polkadot-sdk?branch=stable2503)",
  "sp-externalities",
  "sp-keystore",
  "sp-runtime-interface",
@@ -15704,8 +15571,8 @@ dependencies = [
 
 [[package]]
 name = "sp-keyring"
-version = "40.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "41.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "sp-core",
  "sp-runtime",
@@ -15714,8 +15581,8 @@ dependencies = [
 
 [[package]]
 name = "sp-keystore"
-version = "0.41.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "0.42.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "parity-scale-codec",
  "parking_lot 0.12.5",
@@ -15726,7 +15593,7 @@ dependencies = [
 [[package]]
 name = "sp-maybe-compressed-blob"
 version = "11.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "thiserror 1.0.69",
  "zstd 0.12.4",
@@ -15734,18 +15601,18 @@ dependencies = [
 
 [[package]]
 name = "sp-metadata-ir"
-version = "0.8.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "0.10.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
- "frame-metadata 18.0.0",
+ "frame-metadata 20.0.0",
  "parity-scale-codec",
  "scale-info",
 ]
 
 [[package]]
 name = "sp-mixnet"
-version = "0.13.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "0.14.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -15755,8 +15622,8 @@ dependencies = [
 
 [[package]]
 name = "sp-mmr-primitives"
-version = "35.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "36.1.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -15772,8 +15639,8 @@ dependencies = [
 
 [[package]]
 name = "sp-npos-elections"
-version = "35.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "36.2.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -15785,8 +15652,8 @@ dependencies = [
 
 [[package]]
 name = "sp-offchain"
-version = "35.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "36.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "sp-api",
  "sp-core",
@@ -15795,8 +15662,8 @@ dependencies = [
 
 [[package]]
 name = "sp-panic-handler"
-version = "13.0.1"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "13.0.2"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "backtrace",
  "regex",
@@ -15804,8 +15671,8 @@ dependencies = [
 
 [[package]]
 name = "sp-rpc"
-version = "33.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "34.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "rustc-hash 1.1.0",
  "serde",
@@ -15814,8 +15681,8 @@ dependencies = [
 
 [[package]]
 name = "sp-runtime"
-version = "40.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "41.1.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "binary-merkle-tree",
  "docify",
@@ -15843,13 +15710,13 @@ dependencies = [
 
 [[package]]
 name = "sp-runtime-interface"
-version = "29.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "29.0.1"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "bytes",
  "impl-trait-for-tuples",
  "parity-scale-codec",
- "polkavm-derive",
+ "polkavm-derive 0.18.0",
  "primitive-types 0.13.1",
  "sp-externalities",
  "sp-runtime-interface-proc-macro",
@@ -15863,7 +15730,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface-proc-macro"
 version = "18.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "Inflector",
  "expander",
@@ -15875,8 +15742,8 @@ dependencies = [
 
 [[package]]
 name = "sp-session"
-version = "37.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "38.1.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -15889,8 +15756,8 @@ dependencies = [
 
 [[package]]
 name = "sp-staking"
-version = "37.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "38.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -15902,8 +15769,8 @@ dependencies = [
 
 [[package]]
 name = "sp-state-machine"
-version = "0.44.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "0.45.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "hash-db",
  "log",
@@ -15917,13 +15784,13 @@ dependencies = [
  "sp-trie",
  "thiserror 1.0.69",
  "tracing",
- "trie-db 0.29.1",
+ "trie-db 0.30.0",
 ]
 
 [[package]]
 name = "sp-statement-store"
-version = "19.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "20.1.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "aes-gcm",
  "curve25519-dalek",
@@ -15936,7 +15803,7 @@ dependencies = [
  "sp-api",
  "sp-application-crypto",
  "sp-core",
- "sp-crypto-hashing 0.1.0 (git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6)",
+ "sp-crypto-hashing 0.1.0 (git+https://github.com/paritytech/polkadot-sdk?branch=stable2503)",
  "sp-externalities",
  "sp-runtime",
  "sp-runtime-interface",
@@ -15947,14 +15814,14 @@ dependencies = [
 [[package]]
 name = "sp-std"
 version = "14.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 
 [[package]]
 name = "sp-storage"
 version = "22.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
- "impl-serde 0.5.0",
+ "impl-serde",
  "parity-scale-codec",
  "ref-cast",
  "serde",
@@ -15963,8 +15830,8 @@ dependencies = [
 
 [[package]]
 name = "sp-timestamp"
-version = "35.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "36.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -15975,8 +15842,8 @@ dependencies = [
 
 [[package]]
 name = "sp-tracing"
-version = "17.0.1"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "17.1.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "parity-scale-codec",
  "tracing",
@@ -15986,8 +15853,8 @@ dependencies = [
 
 [[package]]
 name = "sp-transaction-pool"
-version = "35.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "36.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "sp-api",
  "sp-runtime",
@@ -15995,8 +15862,8 @@ dependencies = [
 
 [[package]]
 name = "sp-transaction-storage-proof"
-version = "35.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "36.1.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -16009,8 +15876,8 @@ dependencies = [
 
 [[package]]
 name = "sp-trie"
-version = "38.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "39.1.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "ahash",
  "hash-db",
@@ -16025,16 +15892,16 @@ dependencies = [
  "sp-externalities",
  "thiserror 1.0.69",
  "tracing",
- "trie-db 0.29.1",
+ "trie-db 0.30.0",
  "trie-root",
 ]
 
 [[package]]
 name = "sp-version"
-version = "38.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "39.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
- "impl-serde 0.5.0",
+ "impl-serde",
  "parity-scale-codec",
  "parity-wasm",
  "scale-info",
@@ -16049,10 +15916,10 @@ dependencies = [
 [[package]]
 name = "sp-version-proc-macro"
 version = "15.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "parity-scale-codec",
- "proc-macro-warning 1.84.1",
+ "proc-macro-warning",
  "proc-macro2",
  "quote",
  "syn 2.0.106",
@@ -16061,7 +15928,7 @@ dependencies = [
 [[package]]
 name = "sp-wasm-interface"
 version = "21.0.1"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "anyhow",
  "impl-trait-for-tuples",
@@ -16072,8 +15939,8 @@ dependencies = [
 
 [[package]]
 name = "sp-weights"
-version = "31.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "31.1.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "bounded-collections",
  "parity-scale-codec",
@@ -16284,12 +16151,12 @@ checksum = "6ce2be8dc25455e1f91df71bfa12ad37d7af1092ae736f3a6cd0e37bc7810596"
 
 [[package]]
 name = "staging-xcm"
-version = "15.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "16.2.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "array-bytes",
  "bounded-collections",
- "derivative",
+ "derive-where",
  "environmental",
  "frame-support",
  "hex-literal 0.4.1",
@@ -16305,30 +16172,32 @@ dependencies = [
 
 [[package]]
 name = "staging-xcm-builder"
-version = "18.2.1"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "20.1.1"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
+ "environmental",
  "frame-support",
  "frame-system",
  "impl-trait-for-tuples",
- "log",
  "pallet-asset-conversion",
  "pallet-transaction-payment",
  "parity-scale-codec",
  "polkadot-parachain-primitives",
  "scale-info",
  "sp-arithmetic",
+ "sp-core",
  "sp-io",
  "sp-runtime",
  "sp-weights",
  "staging-xcm",
  "staging-xcm-executor",
+ "tracing",
 ]
 
 [[package]]
 name = "staging-xcm-executor"
-version = "18.0.3"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "19.1.3"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "environmental",
  "frame-benchmarking",
@@ -16379,6 +16248,16 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "string-interner"
+version = "0.17.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1c6a0d765f5807e98a091107bae0a56ea3799f66a5de47b2c84c94a39c09974e"
+dependencies = [
+ "cfg-if",
+ "hashbrown 0.14.5",
+]
+
 [[package]]
 name = "stringprep"
 version = "0.1.5"
@@ -16390,12 +16269,6 @@ dependencies = [
  "unicode-properties",
 ]
 
-[[package]]
-name = "strsim"
-version = "0.10.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
-
 [[package]]
 name = "strsim"
 version = "0.11.1"
@@ -16446,7 +16319,7 @@ dependencies = [
 [[package]]
 name = "substrate-bip39"
 version = "0.6.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "hmac 0.12.1",
  "pbkdf2",
@@ -16471,17 +16344,17 @@ dependencies = [
 [[package]]
 name = "substrate-build-script-utils"
 version = "11.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 
 [[package]]
 name = "substrate-frame-rpc-system"
-version = "42.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "44.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "docify",
  "frame-system-rpc-runtime-api",
  "futures",
- "jsonrpsee 0.24.9",
+ "jsonrpsee",
  "log",
  "parity-scale-codec",
  "sc-rpc-api",
@@ -16495,8 +16368,8 @@ dependencies = [
 
 [[package]]
 name = "substrate-prometheus-endpoint"
-version = "0.17.1"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "0.17.3"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "http-body-util",
  "hyper 1.7.0",
@@ -16509,20 +16382,20 @@ dependencies = [
 
 [[package]]
 name = "substrate-wasm-builder"
-version = "25.0.1"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "26.0.1"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "array-bytes",
  "build-helper",
  "cargo_metadata",
  "console",
  "filetime",
- "frame-metadata 18.0.0",
+ "frame-metadata 20.0.0",
  "jobserver",
  "merkleized-metadata",
  "parity-scale-codec",
  "parity-wasm",
- "polkavm-linker",
+ "polkavm-linker 0.18.0",
  "sc-executor",
  "shlex",
  "sp-core",
@@ -16551,50 +16424,47 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
 
 [[package]]
 name = "subxt"
-version = "0.37.0"
+version = "0.38.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a160cba1edbf3ec4fbbeaea3f1a185f70448116a6bccc8276bb39adb3b3053bd"
+checksum = "1c17d7ec2359d33133b63c97e28c8b7cd3f0a5bc6ce567ae3aef9d9e85be3433"
 dependencies = [
  "async-trait",
  "derive-where",
  "either",
- "frame-metadata 16.0.0",
+ "frame-metadata 17.0.0",
  "futures",
  "hex",
- "impl-serde 0.4.0",
- "instant",
- "jsonrpsee 0.22.5",
+ "impl-serde",
+ "jsonrpsee",
  "parity-scale-codec",
- "primitive-types 0.12.2",
- "reconnecting-jsonrpsee-ws-client",
+ "polkadot-sdk",
+ "primitive-types 0.13.1",
  "scale-bits",
- "scale-decode",
+ "scale-decode 0.14.0",
  "scale-encode",
  "scale-info",
  "scale-value",
  "serde",
  "serde_json",
- "sp-crypto-hashing 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "subxt-core",
  "subxt-lightclient",
  "subxt-macro",
  "subxt-metadata",
  "thiserror 1.0.69",
+ "tokio",
  "tokio-util",
  "tracing",
  "url",
+ "web-time",
 ]
 
 [[package]]
 name = "subxt-codegen"
-version = "0.37.0"
+version = "0.38.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d703dca0905cc5272d7cc27a4ac5f37dcaae7671acc7fef0200057cc8c317786"
+checksum = "6550ef451c77db6e3bc7c56fb6fe1dca9398a2c8fc774b127f6a396a769b9c5b"
 dependencies = [
- "frame-metadata 16.0.0",
  "heck 0.5.0",
- "hex",
- "jsonrpsee 0.22.5",
  "parity-scale-codec",
  "proc-macro2",
  "quote",
@@ -16603,41 +16473,42 @@ dependencies = [
  "subxt-metadata",
  "syn 2.0.106",
  "thiserror 1.0.69",
- "tokio",
 ]
 
 [[package]]
 name = "subxt-core"
-version = "0.37.1"
+version = "0.38.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3af3b36405538a36b424d229dc908d1396ceb0994c90825ce928709eac1a159a"
+checksum = "cb7a1bc6c9c1724971636a66e3225a7253cdb35bb6efb81524a6c71c04f08c59"
 dependencies = [
  "base58",
  "blake2 0.10.6",
  "derive-where",
- "frame-metadata 16.0.0",
+ "frame-decode",
+ "frame-metadata 17.0.0",
  "hashbrown 0.14.5",
  "hex",
- "impl-serde 0.4.0",
+ "impl-serde",
+ "keccak-hash",
  "parity-scale-codec",
- "primitive-types 0.12.2",
+ "polkadot-sdk",
+ "primitive-types 0.13.1",
  "scale-bits",
- "scale-decode",
+ "scale-decode 0.14.0",
  "scale-encode",
  "scale-info",
  "scale-value",
  "serde",
  "serde_json",
- "sp-crypto-hashing 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "subxt-metadata",
  "tracing",
 ]
 
 [[package]]
 name = "subxt-lightclient"
-version = "0.37.0"
+version = "0.38.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "9d9406fbdb9548c110803cb8afa750f8b911d51eefdf95474b11319591d225d9"
+checksum = "89ebc9131da4d0ba1f7814495b8cc79698798ccd52cacd7bcefe451e415bd945"
 dependencies = [
  "futures",
  "futures-util",
@@ -16652,56 +16523,74 @@ dependencies = [
 
 [[package]]
 name = "subxt-macro"
-version = "0.37.0"
+version = "0.38.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1c195f803d70687e409aba9be6c87115b5da8952cd83c4d13f2e043239818fcd"
+checksum = "7819c5e09aae0319981ee853869f2fcd1fac4db8babd0d004c17161297aadc05"
 dependencies = [
- "darling 0.20.11",
+ "darling",
  "parity-scale-codec",
- "proc-macro-error",
+ "proc-macro-error2",
  "quote",
  "scale-typegen",
  "subxt-codegen",
+ "subxt-utils-fetchmetadata",
  "syn 2.0.106",
 ]
 
 [[package]]
 name = "subxt-metadata"
-version = "0.37.0"
+version = "0.38.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "738be5890fdeff899bbffff4d9c0f244fe2a952fb861301b937e3aa40ebb55da"
+checksum = "aacd4e7484fef58deaa2dcb32d94753a864b208a668c0dd0c28be1d8abeeadb2"
 dependencies = [
- "frame-metadata 16.0.0",
+ "frame-decode",
+ "frame-metadata 17.0.0",
  "hashbrown 0.14.5",
  "parity-scale-codec",
+ "polkadot-sdk",
  "scale-info",
- "sp-crypto-hashing 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
 ]
 
 [[package]]
 name = "subxt-signer"
-version = "0.37.0"
+version = "0.38.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f49888ae6ae90fe01b471193528eea5bd4ed52d8eecd2d13f4a2333b87388850"
+checksum = "d680352d04665b1e4eb6f9d2a54b800c4d8e1b20478e69be1b7d975b08d9fc34"
 dependencies = [
+ "base64 0.22.1",
  "bip32",
  "bip39",
  "cfg-if",
+ "crypto_secretbox",
  "hex",
  "hmac 0.12.1",
  "keccak-hash",
  "parity-scale-codec",
  "pbkdf2",
+ "polkadot-sdk",
  "regex",
  "schnorrkel",
- "secp256k1 0.28.2",
- "secrecy",
+ "scrypt",
+ "secp256k1 0.30.0",
+ "secrecy 0.10.3",
+ "serde",
+ "serde_json",
  "sha2 0.10.9",
- "sp-crypto-hashing 0.1.0 (registry+https://github.com/rust-lang/crates.io-index)",
  "subxt-core",
  "zeroize",
 ]
 
+[[package]]
+name = "subxt-utils-fetchmetadata"
+version = "0.38.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a3c53bc3eeaacc143a2f29ace4082edd2edaccab37b69ad20befba9fb00fdb3d"
+dependencies = [
+ "hex",
+ "parity-scale-codec",
+ "thiserror 1.0.69",
+]
+
 [[package]]
 name = "suppaftp"
 version = "6.3.0"
@@ -16715,7 +16604,7 @@ dependencies = [
  "lazy-regex",
  "log",
  "pin-project",
- "rustls 0.23.32",
+ "rustls",
  "thiserror 2.0.17",
 ]
 
@@ -17118,41 +17007,20 @@ checksum = "27d684bad428a0f2481f42241f821db42c54e2dc81d8c00db8536c506b0a0144"
 dependencies = [
  "const-oid",
  "ring 0.17.14",
- "rustls 0.23.32",
+ "rustls",
  "tokio",
  "tokio-postgres",
- "tokio-rustls 0.26.4",
+ "tokio-rustls",
  "x509-cert",
 ]
 
-[[package]]
-name = "tokio-rustls"
-version = "0.24.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c28327cf380ac148141087fbfb9de9d7bd4e84ab5d2c28fbc911d753de8a7081"
-dependencies = [
- "rustls 0.21.12",
- "tokio",
-]
-
-[[package]]
-name = "tokio-rustls"
-version = "0.25.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f"
-dependencies = [
- "rustls 0.22.4",
- "rustls-pki-types",
- "tokio",
-]
-
 [[package]]
 name = "tokio-rustls"
 version = "0.26.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1729aa945f29d91ba541258c8df89027d5792d85a8841fb65e8bf0f4ede4ef61"
 dependencies = [
- "rustls 0.23.32",
+ "rustls",
  "tokio",
 ]
 
@@ -17176,11 +17044,11 @@ checksum = "7a9daff607c6d2bf6c16fd681ccb7eecc83e4e2cdc1ca067ffaadfca5de7f084"
 dependencies = [
  "futures-util",
  "log",
- "rustls 0.23.32",
- "rustls-native-certs 0.8.1",
+ "rustls",
+ "rustls-native-certs",
  "rustls-pki-types",
  "tokio",
- "tokio-rustls 0.26.4",
+ "tokio-rustls",
  "tungstenite",
 ]
 
@@ -17422,8 +17290,8 @@ dependencies = [
 
 [[package]]
 name = "tracing-gum"
-version = "17.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "19.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "coarsetime",
  "polkadot-primitives",
@@ -17434,7 +17302,7 @@ dependencies = [
 [[package]]
 name = "tracing-gum-proc-macro"
 version = "5.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "expander",
  "proc-macro-crate 3.4.0",
@@ -17489,9 +17357,9 @@ dependencies = [
 
 [[package]]
 name = "trie-db"
-version = "0.29.1"
+version = "0.30.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0c992b4f40c234a074d48a757efeabb1a6be88af84c0c23f7ca158950cb0ae7f"
+checksum = "6c0670ab45a6b7002c7df369fee950a27cf29ae0474343fd3a15aa15f691e7a6"
 dependencies = [
  "hash-db",
  "log",
@@ -17508,78 +17376,6 @@ dependencies = [
  "hash-db",
 ]
 
-[[package]]
-name = "trust-dns-proto"
-version = "0.22.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4f7f83d1e4a0e4358ac54c5c3681e5d7da5efc5a7a632c90bb6d6669ddd9bc26"
-dependencies = [
- "async-trait",
- "cfg-if",
- "data-encoding",
- "enum-as-inner 0.5.1",
- "futures-channel",
- "futures-io",
- "futures-util",
- "idna 0.2.3",
- "ipnet",
- "lazy_static",
- "rand 0.8.5",
- "smallvec",
- "socket2 0.4.10",
- "thiserror 1.0.69",
- "tinyvec",
- "tokio",
- "tracing",
- "url",
-]
-
-[[package]]
-name = "trust-dns-proto"
-version = "0.23.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3119112651c157f4488931a01e586aa459736e9d6046d3bd9105ffb69352d374"
-dependencies = [
- "async-trait",
- "cfg-if",
- "data-encoding",
- "enum-as-inner 0.6.1",
- "futures-channel",
- "futures-io",
- "futures-util",
- "idna 0.4.0",
- "ipnet",
- "once_cell",
- "rand 0.8.5",
- "smallvec",
- "thiserror 1.0.69",
- "tinyvec",
- "tokio",
- "tracing",
- "url",
-]
-
-[[package]]
-name = "trust-dns-resolver"
-version = "0.23.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "10a3e6c3aff1718b3c73e395d1f35202ba2ffa847c6a62eea0db8fb4cfe30be6"
-dependencies = [
- "cfg-if",
- "futures-util",
- "ipconfig",
- "lru-cache",
- "once_cell",
- "parking_lot 0.12.5",
- "rand 0.8.5",
- "resolv-conf",
- "smallvec",
- "thiserror 1.0.69",
- "tokio",
- "tracing",
- "trust-dns-proto 0.23.2",
-]
-
 [[package]]
 name = "try-lock"
 version = "0.2.5"
@@ -17620,7 +17416,7 @@ dependencies = [
  "httparse",
  "log",
  "rand 0.9.2",
- "rustls 0.23.32",
+ "rustls",
  "rustls-pki-types",
  "sha1",
  "thiserror 2.0.17",
@@ -17761,7 +17557,7 @@ version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6889a77d49f1f013504cec6bf97a2c730394adedaeb1deb5ea08949a50541105"
 dependencies = [
- "asynchronous-codec",
+ "asynchronous-codec 0.6.2",
  "bytes",
  "futures-io",
  "futures-util",
@@ -17796,7 +17592,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "08bc136a29a3d1758e07a9cca267be308aeebf5cfd5a10f3f67ab2097683ef5b"
 dependencies = [
  "form_urlencoded",
- "idna 1.1.0",
+ "idna",
  "percent-encoding",
  "serde",
 ]
@@ -17873,11 +17669,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e6bfb937b3d12077654a9e43e32a4e9c20177dd9fea0f3aba673e7840bb54f32"
 dependencies = [
  "ark-bls12-377",
- "ark-bls12-381",
- "ark-ec",
+ "ark-bls12-381 0.4.0",
+ "ark-ec 0.4.2",
  "ark-ff 0.4.2",
  "ark-serialize 0.4.2",
- "ark-serialize-derive",
+ "ark-serialize-derive 0.4.2",
  "arrayref",
  "digest 0.10.7",
  "rand 0.8.5",
@@ -17888,6 +17684,52 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "w3f-pcs"
+version = "0.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fbe7a8d5c914b69392ab3b267f679a2e546fe29afaddce47981772ac71bd02e1"
+dependencies = [
+ "ark-ec 0.5.0",
+ "ark-ff 0.5.0",
+ "ark-poly 0.5.0",
+ "ark-serialize 0.5.0",
+ "ark-std 0.5.0",
+ "merlin",
+]
+
+[[package]]
+name = "w3f-plonk-common"
+version = "0.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1aca389e494fe08c5c108b512e2328309036ee1c0bc7bdfdb743fef54d448c8c"
+dependencies = [
+ "ark-ec 0.5.0",
+ "ark-ff 0.5.0",
+ "ark-poly 0.5.0",
+ "ark-serialize 0.5.0",
+ "ark-std 0.5.0",
+ "getrandom_or_panic",
+ "rand_core 0.6.4",
+ "w3f-pcs",
+]
+
+[[package]]
+name = "w3f-ring-proof"
+version = "0.0.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a639379402ad51504575dbd258740383291ac8147d3b15859bdf1ea48c677de"
+dependencies = [
+ "ark-ec 0.5.0",
+ "ark-ff 0.5.0",
+ "ark-poly 0.5.0",
+ "ark-serialize 0.5.0",
+ "ark-std 0.5.0",
+ "ark-transcript",
+ "w3f-pcs",
+ "w3f-plonk-common",
+]
+
 [[package]]
 name = "wait-timeout"
 version = "0.2.1"
@@ -18106,28 +17948,37 @@ dependencies = [
 
 [[package]]
 name = "wasmi"
-version = "0.31.2"
+version = "0.32.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "77a8281d1d660cdf54c76a3efa9ddd0c270cada1383a995db3ccb43d166456c7"
+checksum = "50386c99b9c32bd2ed71a55b6dd4040af2580530fae8bdb9a6576571a80d0cca"
 dependencies = [
+ "arrayvec 0.7.6",
+ "multi-stash",
+ "num-derive",
+ "num-traits",
  "smallvec",
  "spin 0.9.8",
- "wasmi_arena",
+ "wasmi_collections",
  "wasmi_core",
  "wasmparser-nostd",
 ]
 
 [[package]]
-name = "wasmi_arena"
-version = "0.4.1"
+name = "wasmi_collections"
+version = "0.32.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "104a7f73be44570cac297b3035d76b169d6599637631cf37a1703326a0727073"
+checksum = "9c128c039340ffd50d4195c3f8ce31aac357f06804cfc494c8b9508d4b30dca4"
+dependencies = [
+ "ahash",
+ "hashbrown 0.14.5",
+ "string-interner",
+]
 
 [[package]]
 name = "wasmi_core"
-version = "0.13.0"
+version = "0.32.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcf1a7db34bff95b85c261002720c00c3a6168256dcb93041d3fa2054d19856a"
+checksum = "a23b3a7f6c8c3ceeec6b83531ee61f0013c56e51cbf2b14b0f213548b23a4b41"
 dependencies = [
  "downcast-rs",
  "libm",
@@ -18393,15 +18244,6 @@ version = "0.25.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5f20c57d8d7db6d3b86154206ae5d8fba62dd39573114de97c2cb0578251f8e1"
 
-[[package]]
-name = "webpki-roots"
-version = "0.26.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "521bc38abb08001b01866da9f51eb7c5d647a19260e00054a8c7fd5f9e57f7a9"
-dependencies = [
- "webpki-roots 1.0.3",
-]
-
 [[package]]
 name = "webpki-roots"
 version = "1.0.3"
@@ -18978,16 +18820,16 @@ dependencies = [
 
 [[package]]
 name = "x509-parser"
-version = "0.15.1"
+version = "0.16.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7069fba5b66b9193bd2c5d3d4ff12b839118f6bcbef5328efafafb5395cf63da"
+checksum = "fcbc162f30700d6f3f82a24bf7cc62ffe7caea42c0b2cba8bf7f3ae50cf51f69"
 dependencies = [
- "asn1-rs 0.5.2",
+ "asn1-rs 0.6.2",
  "data-encoding",
- "der-parser 8.2.0",
+ "der-parser 9.0.0",
  "lazy_static",
  "nom",
- "oid-registry 0.6.1",
+ "oid-registry 0.7.1",
  "rusticata-macros",
  "thiserror 1.0.69",
  "time",
@@ -19012,8 +18854,8 @@ dependencies = [
 
 [[package]]
 name = "xcm-procedural"
-version = "11.0.1"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "11.0.2"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "Inflector",
  "proc-macro2",
@@ -19023,8 +18865,8 @@ dependencies = [
 
 [[package]]
 name = "xcm-runtime-apis"
-version = "0.5.3"
-source = "git+https://github.com/paritytech/polkadot-sdk?tag=polkadot-stable2412-6#bbc435c7667d3283ba280a8fec44676357392753"
+version = "0.7.1"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=stable2503#067482ed1703588b2a3eb9805fb45e5e1e868efb"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
diff --git a/operator/Cargo.toml b/operator/Cargo.toml
index 40a689e9e..12e449cc4 100644
--- a/operator/Cargo.toml
+++ b/operator/Cargo.toml
@@ -5,12 +5,11 @@ edition = "2021"
 homepage = "https://datahaven.xyz/"
 license = "GPL-3"
 repository = "https://github.com/datahavenxyz/datahaven"
-version = "0.26.0"
+version = "0.23.0"
 
 [workspace]
 members = [
     "node",
-    "pallets/outbound-commitment-store",
     "pallets/*",
     "precompiles/*",
     "primitives/bridge",
@@ -40,11 +39,11 @@ pallet-evm-precompile-proxy = { path = "./precompiles/proxy", default-features =
 pallet-evm-precompile-referenda = { path = "./precompiles/referenda", default-features = false }
 pallet-evm-precompile-registry = { path = "./precompiles/precompile-registry", default-features = false }
 pallet-external-validator-slashes = { path = "./pallets/external-validator-slashes", default-features = false }
+pallet-grandpa-benchmarking = { path = "./pallets/grandpa-benchmarking", default-features = false }
 pallet-external-validators = { path = "./pallets/external-validators", default-features = false }
 pallet-external-validators-rewards = { path = "./pallets/external-validators-rewards", default-features = false }
 pallet-outbound-commitment-store = { path = "./pallets/outbound-commitment-store", default-features = false }
 pallet-proxy-genesis-companion = { path = "./pallets/proxy-genesis-companion", default-features = false }
-pallet-grandpa-benchmarking = { path = "./pallets/grandpa-benchmarking", default-features = false }
 pallet-session-benchmarking = { path = "./pallets/session-benchmarking", default-features = false }
 
 # Crates.io (wasm)
@@ -57,7 +56,7 @@ async-trait = { version = "0.1.42" }
 blake2-rfc = { version = "0.2.18", default-features = false }
 byte-slice-cast = { version = "1.2.1", default-features = false }
 clap = { version = "4.5.10", features = ["derive", "env"] }
-codec = { version = "3.6.12", default-features = false, package = "parity-scale-codec" }
+codec = { version = "3.7.4", default-features = false, package = "parity-scale-codec" }
 ethabi = { version = "2.0.0", default-features = false, package = "ethabi-decode" }
 ethbloom = { version = "0.14.1", default-features = false }
 ethereum-types = { version = "0.15.1", default-features = false }
@@ -83,7 +82,7 @@ openssl-sys = { version = "0.9", features = [
     "vendored",
 ] } # This is just to set the "vendored" feature required for the crossbuild, so that OpenSSL builds from source
 parity-bytes = { version = "0.1.2", default-features = false }
-parity-scale-codec = { version = "3.0.0", default-features = false, features = [
+parity-scale-codec = { version = "3.7.4", default-features = false, features = [
     "derive",
 ] }
 paste = "1.0.14"
@@ -108,117 +107,117 @@ tracing-subscriber = { version = "=0.3.19", features = [
 url = "2.2.2"
 
 # Polkadot SDK
-cumulus-primitives-core = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-frame-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-frame-benchmarking-cli = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-frame-executive = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-frame-metadata-hash-extension = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-frame-support = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-frame-support-test = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-frame-system = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-frame-system-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-frame-try-runtime = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-mmr-gadget = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-mmr-rpc = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-pallet-assets = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-pallet-authorship = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-pallet-babe = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-pallet-beefy = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-pallet-beefy-mmr = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-pallet-collator-selection = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2412-6", default-features = false }
-pallet-collective = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-pallet-conviction-voting = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-pallet-grandpa = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-pallet-identity = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-pallet-im-online = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-pallet-message-queue = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-pallet-migrations = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-pallet-mmr = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-pallet-multisig = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-pallet-nfts = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-pallet-offences = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-pallet-parameters = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-pallet-preimage = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-pallet-proxy = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-pallet-referenda = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-pallet-safe-mode = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-pallet-scheduler = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-pallet-session = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-pallet-sudo = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-pallet-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-pallet-transaction-payment = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-pallet-treasury = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-pallet-tx-pause = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-pallet-utility = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-pallet-whitelist = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-pallet-xcm = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-parachain-info = { package = "staging-parachain-info", git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2412-6", default-features = false }
-parachains-common = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-stable2412-6", default-features = false }
-polkadot-parachain-primitives = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-polkadot-primitives = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-sc-basic-authorship = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-sc-cli = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-sc-client-api = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-sc-consensus = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-sc-consensus-babe = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-sc-consensus-beefy = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-sc-consensus-beefy-rpc = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-sc-consensus-grandpa = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-sc-consensus-manual-seal = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-sc-executor = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-sc-network = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-sc-network-sync = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-sc-offchain = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-sc-rpc = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-sc-service = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-sc-telemetry = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-sc-transaction-pool = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-sc-transaction-pool-api = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-sp-api = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-sp-application-crypto = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-sp-arithmetic = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-sp-block-builder = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-sp-blockchain = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-sp-consensus = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-sp-consensus-babe = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-sp-consensus-beefy = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-sp-consensus-grandpa = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-sp-consensus-slots = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-sp-core = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-sp-crypto-hashing = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-sp-genesis-builder = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-sp-inherents = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-sp-io = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-sp-keyring = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-sp-keystore = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-sp-mmr-primitives = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-sp-offchain = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-sp-runtime-interface = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-sp-session = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-sp-staking = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-sp-std = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-sp-storage = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-sp-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-sp-tracing = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-sp-transaction-pool = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-sp-trie = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-sp-version = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-substrate-build-script-utils = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-substrate-frame-rpc-system = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-substrate-prometheus-endpoint = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-substrate-wasm-builder = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
-xcm = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false, package = "staging-xcm" }
-xcm-builder = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false, package = "staging-xcm-builder" }
-xcm-executor = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false, package = "staging-xcm-executor" }
+cumulus-primitives-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+frame-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+frame-benchmarking-cli = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+frame-executive = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+frame-metadata-hash-extension = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+frame-support-test = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+frame-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+frame-system-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+frame-try-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+mmr-gadget = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+mmr-rpc = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+pallet-assets = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+pallet-authorship = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+pallet-babe = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+pallet-beefy = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+pallet-beefy-mmr = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+pallet-collator-selection = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2503", default-features = false }
+pallet-collective = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+pallet-conviction-voting = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+pallet-grandpa = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+pallet-identity = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+pallet-im-online = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+pallet-message-queue = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+pallet-migrations = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+pallet-mmr = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+pallet-multisig = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+pallet-nfts = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+pallet-offences = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+pallet-parameters = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+pallet-preimage = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+pallet-proxy = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+pallet-referenda = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+pallet-safe-mode = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+pallet-scheduler = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+pallet-session = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+pallet-staking = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+pallet-sudo = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+pallet-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+pallet-transaction-payment = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+pallet-treasury = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+pallet-tx-pause = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+pallet-utility = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+pallet-whitelist = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+pallet-xcm = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+parachain-info = { package = "staging-parachain-info", git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2503", default-features = false }
+parachains-common = { git = "https://github.com/paritytech/polkadot-sdk.git", branch = "stable2503", default-features = false }
+polkadot-parachain-primitives = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+polkadot-primitives = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+sc-basic-authorship = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+sc-cli = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+sc-client-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+sc-consensus = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+sc-consensus-babe = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+sc-consensus-beefy = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+sc-consensus-beefy-rpc = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+sc-consensus-grandpa = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+sc-consensus-manual-seal = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+sc-executor = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+sc-network = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+sc-network-sync = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+sc-offchain = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+sc-rpc = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+sc-service = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+sc-telemetry = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+sc-transaction-pool = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+sc-transaction-pool-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+sp-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+sp-application-crypto = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+sp-arithmetic = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+sp-block-builder = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+sp-blockchain = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+sp-consensus = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+sp-consensus-babe = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+sp-consensus-beefy = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+sp-consensus-grandpa = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+sp-consensus-slots = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+sp-crypto-hashing = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+sp-genesis-builder = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+sp-inherents = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+sp-keyring = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+sp-keystore = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+sp-mmr-primitives = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+sp-offchain = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+sp-runtime-interface = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+sp-session = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+sp-staking = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+sp-storage = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+sp-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+sp-tracing = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+sp-transaction-pool = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+sp-trie = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+sp-version = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+substrate-build-script-utils = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+substrate-frame-rpc-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+substrate-prometheus-endpoint = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+substrate-wasm-builder = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
+xcm = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false, package = "staging-xcm" }
+xcm-builder = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false, package = "staging-xcm-builder" }
+xcm-executor = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false, package = "staging-xcm-executor" }
 
 # Snowbridge
-bp-relayers = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
+bp-relayers = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
 bridge-hub-common = { path = "primitives/snowbridge/bridge-hub-common", default-features = false }
 snowbridge-beacon-primitives = { path = "primitives/snowbridge/beacon", default-features = false }
 snowbridge-core = { path = "primitives/snowbridge/core", default-features = false }
@@ -231,7 +230,7 @@ snowbridge-pallet-ethereum-client = { path = "pallets/ethereum-client", default-
 snowbridge-pallet-ethereum-client-fixtures = { path = "pallets/ethereum-client/fixtures", default-features = false }
 snowbridge-pallet-inbound-queue-v2 = { path = "pallets/inbound-queue-v2", default-features = false }
 snowbridge-pallet-inbound-queue-v2-fixtures = { path = "pallets/inbound-queue-v2/fixtures", default-features = false }
-snowbridge-pallet-outbound-queue = { git = "https://github.com/paritytech/polkadot-sdk", tag = "polkadot-stable2412-6", default-features = false }
+snowbridge-pallet-outbound-queue = { git = "https://github.com/paritytech/polkadot-sdk", branch = "stable2503", default-features = false }
 snowbridge-pallet-outbound-queue-v2 = { path = "pallets/outbound-queue-v2", default-features = false }
 snowbridge-pallet-system = { path = "pallets/system", default-features = false }
 snowbridge-pallet-system-v2 = { path = "pallets/system-v2", default-features = false }
@@ -240,74 +239,77 @@ snowbridge-test-utils = { path = "primitives/snowbridge/test-utils", default-fea
 snowbridge-verification-primitives = { path = "primitives/snowbridge/verification", default-features = false }
 
 # Frontier (wasm)
-evm = { git = "https://github.com/rust-ethereum/evm", rev = "6d86fe2d3bcc14887c2575f62958a67ac2d523db", default-features = false }
-fp-account = { git = "https://github.com/polkadot-evm/frontier", branch = "stable2412", default-features = false }
-fp-evm = { git = "https://github.com/polkadot-evm/frontier", branch = "stable2412", default-features = false }
-fp-rpc = { git = "https://github.com/polkadot-evm/frontier", branch = "stable2412", default-features = false }
-fp-self-contained = { git = "https://github.com/polkadot-evm/frontier", branch = "stable2412", default-features = false }
-fp-storage = { git = "https://github.com/polkadot-evm/frontier", branch = "stable2412", default-features = false }
-pallet-base-fee = { git = "https://github.com/polkadot-evm/frontier", branch = "stable2412", default-features = false }
-pallet-dynamic-fee = { git = "https://github.com/polkadot-evm/frontier", branch = "stable2412", default-features = false }
-pallet-ethereum = { git = "https://github.com/polkadot-evm/frontier/", branch = "stable2412", default-features = false }
-pallet-evm = { git = "https://github.com/polkadot-evm/frontier/", branch = "stable2412", default-features = false }
-pallet-evm-chain-id = { git = "https://github.com/polkadot-evm/frontier/", branch = "stable2412", default-features = false }
-pallet-evm-precompile-blake2 = { git = "https://github.com/polkadot-evm/frontier", branch = "stable2412", default-features = false }
-pallet-evm-precompile-bn128 = { git = "https://github.com/polkadot-evm/frontier", branch = "stable2412", default-features = false }
-pallet-evm-precompile-modexp = { git = "https://github.com/polkadot-evm/frontier", branch = "stable2412", default-features = false }
-pallet-evm-precompile-sha3fips = { git = "https://github.com/polkadot-evm/frontier", branch = "stable2412", default-features = false }
-pallet-evm-precompile-simple = { git = "https://github.com/polkadot-evm/frontier", branch = "stable2412", default-features = false }
-pallet-hotfix-sufficients = { git = "https://github.com/polkadot-evm/frontier", branch = "stable2412", default-features = false }
-precompile-utils = { git = "https://github.com/polkadot-evm/frontier/", branch = "stable2412", default-features = false }
-precompile-utils-macro = { git = "https://github.com/polkadot-evm/frontier", branch = "stable2412", default-features = false }
+evm = { version = "0.43.2", default-features = false }
+fp-account = { git = "https://github.com/polkadot-evm/frontier", branch = "stable2503", default-features = false }
+fp-evm = { git = "https://github.com/polkadot-evm/frontier", branch = "stable2503", default-features = false }
+fp-rpc = { git = "https://github.com/polkadot-evm/frontier", branch = "stable2503", default-features = false }
+fp-self-contained = { git = "https://github.com/polkadot-evm/frontier", branch = "stable2503", default-features = false }
+fp-storage = { git = "https://github.com/polkadot-evm/frontier", branch = "stable2503", default-features = false }
+pallet-base-fee = { git = "https://github.com/polkadot-evm/frontier", branch = "stable2503", default-features = false }
+pallet-dynamic-fee = { git = "https://github.com/polkadot-evm/frontier", branch = "stable2503", default-features = false }
+pallet-ethereum = { git = "https://github.com/polkadot-evm/frontier/", branch = "stable2503", default-features = false }
+pallet-evm = { git = "https://github.com/polkadot-evm/frontier/", branch = "stable2503", default-features = false }
+pallet-evm-chain-id = { git = "https://github.com/polkadot-evm/frontier/", branch = "stable2503", default-features = false }
+pallet-evm-precompile-blake2 = { git = "https://github.com/polkadot-evm/frontier", branch = "stable2503", default-features = false }
+pallet-evm-precompile-bn128 = { git = "https://github.com/polkadot-evm/frontier", branch = "stable2503", default-features = false }
+pallet-evm-precompile-modexp = { git = "https://github.com/polkadot-evm/frontier", branch = "stable2503", default-features = false }
+pallet-evm-precompile-sha3fips = { git = "https://github.com/polkadot-evm/frontier", branch = "stable2503", default-features = false }
+pallet-evm-precompile-simple = { git = "https://github.com/polkadot-evm/frontier", branch = "stable2503", default-features = false }
+pallet-hotfix-sufficients = { git = "https://github.com/polkadot-evm/frontier", branch = "stable2503", default-features = false }
+precompile-utils = { git = "https://github.com/polkadot-evm/frontier/", branch = "stable2503", default-features = false }
+precompile-utils-macro = { git = "https://github.com/polkadot-evm/frontier", branch = "stable2503", default-features = false }
+ethereum = { version = "0.18.2", default-features = false, features = [
+    "with-scale",
+] }
 
 # Frontier (client)
-fc-api = { git = "https://github.com/polkadot-evm/frontier", branch = "stable2412", default-features = false }
-fc-cli = { git = "https://github.com/polkadot-evm/frontier", branch = "stable2412", default-features = false }
-fc-consensus = { git = "https://github.com/polkadot-evm/frontier", branch = "stable2412", default-features = false }
-fc-db = { git = "https://github.com/polkadot-evm/frontier", branch = "stable2412" }
-fc-mapping-sync = { git = "https://github.com/polkadot-evm/frontier", branch = "stable2412", default-features = false }
-fc-rpc = { git = "https://github.com/polkadot-evm/frontier", branch = "stable2412", default-features = false }
-fc-rpc-core = { git = "https://github.com/polkadot-evm/frontier", branch = "stable2412", default-features = false }
-fc-storage = { git = "https://github.com/polkadot-evm/frontier", branch = "stable2412", default-features = false }
+fc-api = { git = "https://github.com/polkadot-evm/frontier", branch = "stable2503", default-features = false }
+fc-cli = { git = "https://github.com/polkadot-evm/frontier", branch = "stable2503", default-features = false }
+fc-consensus = { git = "https://github.com/polkadot-evm/frontier", branch = "stable2503", default-features = false }
+fc-db = { git = "https://github.com/polkadot-evm/frontier", branch = "stable2503" }
+fc-mapping-sync = { git = "https://github.com/polkadot-evm/frontier", branch = "stable2503", default-features = false }
+fc-rpc = { git = "https://github.com/polkadot-evm/frontier", branch = "stable2503", default-features = false }
+fc-rpc-core = { git = "https://github.com/polkadot-evm/frontier", branch = "stable2503", default-features = false }
+fc-storage = { git = "https://github.com/polkadot-evm/frontier", branch = "stable2503", default-features = false }
 
 # StorageHub
 ## Runtime
-pallet-bucket-nfts = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.4.3", default-features = false }
-pallet-cr-randomness = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.4.3", default-features = false }
-pallet-file-system = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.4.3", default-features = false }
-pallet-file-system-runtime-api = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.4.3", default-features = false }
-pallet-payment-streams = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.4.3", default-features = false }
-pallet-payment-streams-runtime-api = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.4.3", default-features = false }
-pallet-proofs-dealer = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.4.3", default-features = false }
-pallet-proofs-dealer-runtime-api = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.4.3", default-features = false }
-pallet-randomness = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.4.3", default-features = false }
-pallet-storage-providers = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.4.3", default-features = false }
-pallet-storage-providers-runtime-api = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.4.3", default-features = false }
-shp-constants = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.4.3", default-features = false }
-shp-data-price-updater = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.4.3", default-features = false }
-shp-file-key-verifier = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.4.3", default-features = false }
-shp-file-metadata = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.4.3", default-features = false }
-shp-forest-verifier = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.4.3", default-features = false }
-shp-traits = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.4.3", default-features = false }
-shp-treasury-funding = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.4.3", default-features = false }
+pallet-bucket-nfts = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.5.1", default-features = false }
+pallet-cr-randomness = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.5.1", default-features = false }
+pallet-file-system = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.5.1", default-features = false }
+pallet-file-system-runtime-api = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.5.1", default-features = false }
+pallet-payment-streams = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.5.1", default-features = false }
+pallet-payment-streams-runtime-api = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.5.1", default-features = false }
+pallet-proofs-dealer = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.5.1", default-features = false }
+pallet-proofs-dealer-runtime-api = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.5.1", default-features = false }
+pallet-randomness = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.5.1", default-features = false }
+pallet-storage-providers = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.5.1", default-features = false }
+pallet-storage-providers-runtime-api = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.5.1", default-features = false }
+shp-constants = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.5.1", default-features = false }
+shp-data-price-updater = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.5.1", default-features = false }
+shp-file-key-verifier = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.5.1", default-features = false }
+shp-file-metadata = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.5.1", default-features = false }
+shp-forest-verifier = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.5.1", default-features = false }
+shp-traits = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.5.1", default-features = false }
+shp-treasury-funding = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.5.1", default-features = false }
 ## Client
-shc-actors-derive = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.4.3", default-features = false }
-shc-actors-framework = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.4.3", default-features = false }
-shc-blockchain-service = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.4.3", default-features = false }
-shc-client = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.4.3", default-features = false }
-shc-common = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.4.3", default-features = false }
-shc-file-manager = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.4.3", default-features = false }
-shc-file-transfer-service = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.4.3", default-features = false }
-shc-fisherman-service = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.4.3", default-features = false }
-shc-forest-manager = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.4.3", default-features = false }
-shc-indexer-db = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.4.3", default-features = false }
-shc-indexer-service = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.4.3", default-features = false }
-shc-rpc = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.4.3", default-features = false }
-shp-opaque = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.4.3", default-features = false }
-shp-tx-implicits-runtime-api = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.4.3", default-features = false }
-shp-types = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.4.3", default-features = false }
+shc-actors-derive = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.5.1", default-features = false }
+shc-actors-framework = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.5.1", default-features = false }
+shc-blockchain-service = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.5.1", default-features = false }
+shc-client = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.5.1", default-features = false }
+shc-common = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.5.1", default-features = false }
+shc-file-manager = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.5.1", default-features = false }
+shc-file-transfer-service = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.5.1", default-features = false }
+shc-fisherman-service = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.5.1", default-features = false }
+shc-forest-manager = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.5.1", default-features = false }
+shc-indexer-db = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.5.1", default-features = false }
+shc-indexer-service = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.5.1", default-features = false }
+shc-rpc = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.5.1", default-features = false }
+shp-opaque = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.5.1", default-features = false }
+shp-tx-implicits-runtime-api = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.5.1", default-features = false }
+shp-types = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.5.1", default-features = false }
 ## Precompiles
-pallet-evm-precompile-file-system = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.4.3", default-features = false }
+pallet-evm-precompile-file-system = { git = "https://github.com/Moonsong-Labs/storage-hub.git", tag = "v0.5.1", default-features = false }
 
 
 # Static linking
diff --git a/operator/benchmarking/frame-weight-template.hbs b/operator/benchmarking/frame-weight-template.hbs
index 9fcc72c57..5a220d5a6 100644
--- a/operator/benchmarking/frame-weight-template.hbs
+++ b/operator/benchmarking/frame-weight-template.hbs
@@ -18,7 +18,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `{{pallet}}`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/node/src/benchmarking.rs b/operator/node/src/benchmarking.rs
index 648cd574b..9f4bf4e1e 100644
--- a/operator/node/src/benchmarking.rs
+++ b/operator/node/src/benchmarking.rs
@@ -147,6 +147,7 @@ pub fn create_benchmark_extrinsic<RuntimeApi>(
         frame_system::CheckWeight::<runtime::Runtime>::new(),
         pallet_transaction_payment::ChargeTransactionPayment::<runtime::Runtime>::from(0),
         frame_metadata_hash_extension::CheckMetadataHash::<runtime::Runtime>::new(false),
+        frame_system::WeightReclaim::<runtime::Runtime>::new(),
     );
 
     let raw_payload = runtime::SignedPayload::from_raw(
@@ -162,6 +163,7 @@ pub fn create_benchmark_extrinsic<RuntimeApi>(
             (),
             (),
             None,
+            (),
         ),
     );
     let signature = raw_payload.using_encoded(|e| sender.sign(e));
diff --git a/operator/node/src/command.rs b/operator/node/src/command.rs
index bcd4a3a4c..6a8533fac 100644
--- a/operator/node/src/command.rs
+++ b/operator/node/src/command.rs
@@ -427,78 +427,72 @@ pub fn run() -> sc_cli::Result<()> {
                 };
 
                 match config.network.network_backend {
-                    // TODO: Litep2p becomes standard with Polkadot SDK stable2412-7 (should move None to other arm)
-                    // cfr. https://github.com/paritytech/polkadot-sdk/releases/tag/polkadot-stable2412-7
-                    Some(sc_network::config::NetworkBackendType::Libp2p) | None => {
-                        match config.chain_spec {
-                            ref spec if spec.is_mainnet() => {
-                                service::new_full::<
-                                    datahaven_mainnet_runtime::Runtime,
-                                    datahaven_mainnet_runtime::RuntimeApi,
-                                    sc_network::NetworkWorker<_, _>,
-                                >(
-                                    config, cli.eth, role_options, indexer_options, sealing_mode
-                                )
-                                .await
-                            }
-                            ref spec if spec.is_testnet() => {
-                                service::new_full::<
-                                    datahaven_testnet_runtime::Runtime,
-                                    datahaven_testnet_runtime::RuntimeApi,
-                                    sc_network::NetworkWorker<_, _>,
-                                >(
-                                    config, cli.eth, role_options, indexer_options, sealing_mode
-                                )
-                                .await
-                            }
-                            _ => {
-                                service::new_full::<
-                                    datahaven_stagenet_runtime::Runtime,
-                                    datahaven_stagenet_runtime::RuntimeApi,
-                                    sc_network::NetworkWorker<_, _>,
-                                >(
-                                    config, cli.eth, role_options, indexer_options, sealing_mode
-                                )
-                                .await
-                            }
+                    sc_network::config::NetworkBackendType::Libp2p => match config.chain_spec {
+                        ref spec if spec.is_mainnet() => {
+                            service::new_full::<
+                                datahaven_mainnet_runtime::Runtime,
+                                datahaven_mainnet_runtime::RuntimeApi,
+                                sc_network::NetworkWorker<_, _>,
+                            >(
+                                config, cli.eth, role_options, indexer_options, sealing_mode
+                            )
+                            .await
+                        }
+                        ref spec if spec.is_testnet() => {
+                            service::new_full::<
+                                datahaven_testnet_runtime::Runtime,
+                                datahaven_testnet_runtime::RuntimeApi,
+                                sc_network::NetworkWorker<_, _>,
+                            >(
+                                config, cli.eth, role_options, indexer_options, sealing_mode
+                            )
+                            .await
+                        }
+                        _ => {
+                            service::new_full::<
+                                datahaven_stagenet_runtime::Runtime,
+                                datahaven_stagenet_runtime::RuntimeApi,
+                                sc_network::NetworkWorker<_, _>,
+                            >(
+                                config, cli.eth, role_options, indexer_options, sealing_mode
+                            )
+                            .await
                         }
-                        .map_err(sc_cli::Error::Service)
                     }
-                    Some(sc_network::config::NetworkBackendType::Litep2p) => {
-                        match config.chain_spec {
-                            ref spec if spec.is_mainnet() => {
-                                service::new_full::<
-                                    datahaven_mainnet_runtime::Runtime,
-                                    datahaven_mainnet_runtime::RuntimeApi,
-                                    sc_network::Litep2pNetworkBackend,
-                                >(
-                                    config, cli.eth, role_options, indexer_options, sealing_mode
-                                )
-                                .await
-                            }
-                            ref spec if spec.is_testnet() => {
-                                service::new_full::<
-                                    datahaven_testnet_runtime::Runtime,
-                                    datahaven_testnet_runtime::RuntimeApi,
-                                    sc_network::Litep2pNetworkBackend,
-                                >(
-                                    config, cli.eth, role_options, indexer_options, sealing_mode
-                                )
-                                .await
-                            }
-                            _ => {
-                                service::new_full::<
-                                    datahaven_stagenet_runtime::Runtime,
-                                    datahaven_stagenet_runtime::RuntimeApi,
-                                    sc_network::Litep2pNetworkBackend,
-                                >(
-                                    config, cli.eth, role_options, indexer_options, sealing_mode
-                                )
-                                .await
-                            }
+                    .map_err(sc_cli::Error::Service),
+                    sc_network::config::NetworkBackendType::Litep2p => match config.chain_spec {
+                        ref spec if spec.is_mainnet() => {
+                            service::new_full::<
+                                datahaven_mainnet_runtime::Runtime,
+                                datahaven_mainnet_runtime::RuntimeApi,
+                                sc_network::Litep2pNetworkBackend,
+                            >(
+                                config, cli.eth, role_options, indexer_options, sealing_mode
+                            )
+                            .await
+                        }
+                        ref spec if spec.is_testnet() => {
+                            service::new_full::<
+                                datahaven_testnet_runtime::Runtime,
+                                datahaven_testnet_runtime::RuntimeApi,
+                                sc_network::Litep2pNetworkBackend,
+                            >(
+                                config, cli.eth, role_options, indexer_options, sealing_mode
+                            )
+                            .await
+                        }
+                        _ => {
+                            service::new_full::<
+                                datahaven_stagenet_runtime::Runtime,
+                                datahaven_stagenet_runtime::RuntimeApi,
+                                sc_network::Litep2pNetworkBackend,
+                            >(
+                                config, cli.eth, role_options, indexer_options, sealing_mode
+                            )
+                            .await
                         }
-                        .map_err(sc_cli::Error::Service)
                     }
+                    .map_err(sc_cli::Error::Service),
                 }
             })
         }
diff --git a/operator/node/src/rpc.rs b/operator/node/src/rpc.rs
index 25380cdb6..7aeaf1a56 100644
--- a/operator/node/src/rpc.rs
+++ b/operator/node/src/rpc.rs
@@ -40,7 +40,7 @@ use sc_consensus_beefy::communication::notification::{
 };
 use sc_consensus_manual_seal::rpc::{EngineCommand, ManualSeal, ManualSealApiServer};
 use sc_network_sync::SyncingService;
-use sc_transaction_pool::{ChainApi, Pool};
+use sc_transaction_pool::ChainApi;
 use sc_transaction_pool_api::TransactionPool;
 use shc_client::types::FileStorageT;
 use shc_common::traits::StorageEnableRuntime;
@@ -54,7 +54,7 @@ use shc_rpc::StorageHubClientRpcConfig;
 use sp_consensus_babe::{BabeApi, SlotDuration};
 use sp_consensus_beefy::AuthorityIdBound;
 use sp_core::H256;
-use sp_runtime::traits::BlakeTwo256;
+use sp_runtime::traits::{BlakeTwo256, Block as BlockT, Header as HeaderT};
 use std::collections::BTreeMap;
 use std::sync::Arc;
 
@@ -69,9 +69,10 @@ pub struct BeefyDeps<AuthorityId: AuthorityIdBound> {
 }
 
 /// Full client dependencies.
-pub struct FullDeps<P, B, AuthorityId: AuthorityIdBound, A: ChainApi, FL, FS, Runtime>
+pub struct FullDeps<P, B, AuthorityId: AuthorityIdBound, FL, FS, Runtime>
 where
     Runtime: StorageEnableRuntime,
+    FS: ForestStorageHandler<Runtime> + Clone + Send + Sync + 'static,
 {
     /// The client instance to use.
     pub client: Arc<StorageHubClient<Runtime::RuntimeApi>>,
@@ -80,7 +81,7 @@ where
     /// BEEFY dependencies.
     pub beefy: BeefyDeps<AuthorityId>,
     /// Graph pool instance.
-    pub graph: Arc<Pool<A>>,
+    pub graph: Arc<P>,
     /// Backend used by the node.
     pub backend: Arc<B>,
     /// Network service
@@ -112,8 +113,8 @@ where
 }
 
 /// Instantiate all full RPC extensions.
-pub fn create_full<P, BE, AuthorityId, A, FL, FSH, Runtime>(
-    deps: FullDeps<P, BE, AuthorityId, A, FL, FSH, Runtime>,
+pub fn create_full<P, BE, AuthorityId, FL, FSH, Runtime>(
+    deps: FullDeps<P, BE, AuthorityId, FL, FSH, Runtime>,
     subscription_task_executor: sc_rpc::SubscriptionTaskExecutor,
     pubsub_notification_sinks: Arc<
         fc_mapping_sync::EthereumBlockNotificationSinks<
@@ -122,11 +123,10 @@ pub fn create_full<P, BE, AuthorityId, A, FL, FSH, Runtime>(
     >,
 ) -> Result<RpcModule<()>, Box<dyn std::error::Error + Send + Sync>>
 where
-    P: TransactionPool<Block = Block> + 'static,
+    P: TransactionPool<Block = Block, Hash = <Block as BlockT>::Hash> + 'static,
     BE: Backend<Block> + Send + Sync + 'static,
     BE::State: StateBackend<BlakeTwo256>,
     AuthorityId: AuthorityIdBound,
-    A: ChainApi<Block = Block> + 'static,
     Runtime: StorageEnableRuntime,
     Runtime::RuntimeApi: StorageEnableRuntimeApi<
         RuntimeApi: mmr_rpc::MmrRuntimeApi<
@@ -139,7 +139,7 @@ where
     >,
     StorageHubClient<Runtime::RuntimeApi>: StorageProvider<Block, BE>,
     FL: FileStorageT,
-    FSH: ForestStorageHandler<Runtime> + Send + Sync + 'static,
+    FSH: ForestStorageHandler<Runtime> + Clone + Send + Sync + 'static,
 {
     use mmr_rpc::{Mmr, MmrApiServer};
     use pallet_transaction_payment_rpc::{TransactionPayment, TransactionPaymentApiServer};
@@ -225,7 +225,7 @@ where
     };
 
     module.merge(
-        Eth::<_, _, _, _, _, _, _, DefaultEthConfig<StorageHubClient<Runtime::RuntimeApi>, BE>>::new(
+        Eth::<_, _, _, _, _, _, DefaultEthConfig<StorageHubClient<Runtime::RuntimeApi>, BE>>::new(
             Arc::clone(&client),
             Arc::clone(&pool),
             graph.clone(),
diff --git a/operator/node/src/service.rs b/operator/node/src/service.rs
index 7b307420f..18f79c325 100644
--- a/operator/node/src/service.rs
+++ b/operator/node/src/service.rs
@@ -572,7 +572,7 @@ where
         Vec::default(),
     ));
 
-    let (network, system_rpc_tx, tx_handler_controller, network_starter, sync_service) =
+    let (network, system_rpc_tx, tx_handler_controller, sync_service) =
         sc_service::build_network(sc_service::BuildNetworkParams {
             config: &config,
             net_config,
@@ -698,7 +698,7 @@ where
                 let deps = crate::rpc::FullDeps {
                     client: client.clone(),
                     pool: pool.clone(),
-                    graph: pool.pool().clone(),
+                    graph: pool.clone(),
                     beefy: BeefyDeps::<BeefyId> {
                         beefy_finality_proof_stream: beefy_rpc_links
                             .from_voter_justif_stream
@@ -996,7 +996,6 @@ where
         .await?;
     }
 
-    network_starter.start_network();
     Ok(task_manager)
 }
 
@@ -1375,7 +1374,6 @@ where
         .with_blockchain(
             client.clone(),
             keystore.clone(),
-            Arc::new(rpc_handlers),
             rocks_db_path.clone(),
             maintenance_mode,
         )
diff --git a/operator/pallets/datahaven-native-transfer/Cargo.toml b/operator/pallets/datahaven-native-transfer/Cargo.toml
index da35d0d06..ee85cc109 100644
--- a/operator/pallets/datahaven-native-transfer/Cargo.toml
+++ b/operator/pallets/datahaven-native-transfer/Cargo.toml
@@ -20,7 +20,6 @@ frame-support = { workspace = true }
 frame-system = { workspace = true }
 sp-core = { workspace = true }
 sp-runtime = { workspace = true }
-sp-std = { workspace = true }
 
 snowbridge-core = { workspace = true }
 snowbridge-outbound-queue-primitives = { workspace = true }
@@ -48,7 +47,6 @@ std = [
 	"sp-core/std",
 	"sp-io/std",
 	"sp-runtime/std",
-	"sp-std/std",
 	"xcm/std",
 	"xcm-builder/std",
 	"pallet-balances/std",
diff --git a/operator/pallets/datahaven-native-transfer/src/lib.rs b/operator/pallets/datahaven-native-transfer/src/lib.rs
index a60315b0a..91fad6357 100644
--- a/operator/pallets/datahaven-native-transfer/src/lib.rs
+++ b/operator/pallets/datahaven-native-transfer/src/lib.rs
@@ -29,7 +29,9 @@
 //! It uses a dedicated Ethereum sovereign account to hold locked tokens during transfers.
 
 #![cfg_attr(not(feature = "std"), no_std)]
+extern crate alloc;
 
+use alloc::vec;
 use frame_support::{
     pallet_prelude::*,
     traits::{
@@ -41,7 +43,6 @@ use snowbridge_core::TokenId;
 use snowbridge_outbound_queue_primitives::v2::{Command, Message as OutboundMessage, SendMessage};
 use sp_core::{H160, H256};
 use sp_runtime::{traits::Saturating, BoundedVec};
-use sp_std::vec;
 
 pub use pallet::*;
 
diff --git a/operator/pallets/datahaven-native-transfer/src/mock.rs b/operator/pallets/datahaven-native-transfer/src/mock.rs
index f9bc4f12e..172d32937 100644
--- a/operator/pallets/datahaven-native-transfer/src/mock.rs
+++ b/operator/pallets/datahaven-native-transfer/src/mock.rs
@@ -166,9 +166,12 @@ pub fn new_test_ext() -> sp_io::TestExternalities {
         (BOB, INITIAL_BALANCE),
         (CHARLIE, INITIAL_BALANCE),
     ];
-    pallet_balances::GenesisConfig::<Test> { balances }
-        .assimilate_storage(&mut t)
-        .unwrap();
+    pallet_balances::GenesisConfig::<Test> {
+        balances,
+        dev_accounts: Default::default(),
+    }
+    .assimilate_storage(&mut t)
+    .unwrap();
 
     let mut ext: sp_io::TestExternalities = t.into();
     ext.execute_with(|| {
diff --git a/operator/pallets/ethereum-client/Cargo.toml b/operator/pallets/ethereum-client/Cargo.toml
index bc354399b..752a46fba 100644
--- a/operator/pallets/ethereum-client/Cargo.toml
+++ b/operator/pallets/ethereum-client/Cargo.toml
@@ -28,7 +28,6 @@ frame-system = { workspace = true }
 sp-core = { workspace = true }
 sp-io = { optional = true, workspace = true }
 sp-runtime = { workspace = true }
-sp-std = { workspace = true }
 
 pallet-timestamp = { optional = true, workspace = true }
 snowbridge-beacon-primitives = { workspace = true }
@@ -77,7 +76,6 @@ std = [
     "sp-core/std",
     "sp-io/std",
     "sp-runtime/std",
-    "sp-std/std",
     'frame-benchmarking/std',
 ]
 try-runtime = [
diff --git a/operator/pallets/ethereum-client/fixtures/Cargo.toml b/operator/pallets/ethereum-client/fixtures/Cargo.toml
index 49a545c66..f5aa84fa6 100644
--- a/operator/pallets/ethereum-client/fixtures/Cargo.toml
+++ b/operator/pallets/ethereum-client/fixtures/Cargo.toml
@@ -20,7 +20,6 @@ snowbridge-beacon-primitives = { workspace = true }
 snowbridge-core = { workspace = true }
 snowbridge-inbound-queue-primitives = { workspace = true }
 sp-core = { workspace = true }
-sp-std = { workspace = true }
 
 [features]
 default = ["std"]
@@ -33,5 +32,4 @@ std = [
     "snowbridge-core/std",
     "snowbridge-inbound-queue-primitives/std",
     "sp-core/std",
-    "sp-std/std",
 ]
diff --git a/operator/pallets/ethereum-client/fixtures/src/lib.rs b/operator/pallets/ethereum-client/fixtures/src/lib.rs
index ff9493527..c4b438841 100644
--- a/operator/pallets/ethereum-client/fixtures/src/lib.rs
+++ b/operator/pallets/ethereum-client/fixtures/src/lib.rs
@@ -3,7 +3,9 @@
 // Generated, do not edit!
 // See README.md for instructions to generate
 #![cfg_attr(not(feature = "std"), no_std)]
+extern crate alloc;
 
+use alloc::{boxed::Box, vec};
 use hex_literal::hex;
 use snowbridge_beacon_primitives::{
     types::deneb, AncestryProof, BeaconHeader, ExecutionProof, NextSyncCommitteeUpdate,
@@ -11,7 +13,6 @@ use snowbridge_beacon_primitives::{
 };
 use snowbridge_inbound_queue_primitives::{EventProof, InboundQueueFixture, Log, Proof};
 use sp_core::U256;
-use sp_std::{boxed::Box, vec};
 
 const SC_SIZE: usize = 512;
 const SC_BITS_SIZE: usize = 64;
diff --git a/operator/pallets/ethereum-client/src/benchmarking/util.rs b/operator/pallets/ethereum-client/src/benchmarking/util.rs
index 444032266..e1dab30bf 100644
--- a/operator/pallets/ethereum-client/src/benchmarking/util.rs
+++ b/operator/pallets/ethereum-client/src/benchmarking/util.rs
@@ -2,8 +2,9 @@
 // SPDX-FileCopyrightText: 2023 Snowfork <hello@snowfork.com>
 use crate::{
     decompress_sync_committee_bits, Config, CurrentSyncCommittee, Pallet as EthereumBeaconClient,
-    Update, ValidatorsRoot, Vec,
+    Update, ValidatorsRoot,
 };
+use alloc::vec::Vec;
 use snowbridge_beacon_primitives::PublicKeyPrepared;
 use sp_core::H256;
 
diff --git a/operator/pallets/ethereum-client/src/impls.rs b/operator/pallets/ethereum-client/src/impls.rs
index c1702ef49..e0546982f 100644
--- a/operator/pallets/ethereum-client/src/impls.rs
+++ b/operator/pallets/ethereum-client/src/impls.rs
@@ -4,6 +4,7 @@ use super::*;
 use frame_support::ensure;
 use snowbridge_beacon_primitives::ExecutionProof;
 
+use alloc::vec::Vec;
 use snowbridge_beacon_primitives::merkle_proof::{generalized_index_length, subtree_index};
 use snowbridge_ethereum::Receipt;
 use snowbridge_inbound_queue_primitives::{
diff --git a/operator/pallets/ethereum-client/src/lib.rs b/operator/pallets/ethereum-client/src/lib.rs
index dfe9c1319..ca6d59091 100644
--- a/operator/pallets/ethereum-client/src/lib.rs
+++ b/operator/pallets/ethereum-client/src/lib.rs
@@ -16,6 +16,7 @@
 //!
 //! * [`Call::submit`]: Submit a finalized beacon header with an optional sync committee update
 #![cfg_attr(not(feature = "std"), no_std)]
+extern crate alloc;
 
 pub mod config;
 pub mod functions;
@@ -38,6 +39,7 @@ mod tests_electra;
 #[cfg(feature = "runtime-benchmarks")]
 mod benchmarking;
 
+use alloc::boxed::Box;
 use frame_support::{
     dispatch::{DispatchResult, PostDispatchInfo},
     pallet_prelude::OptionQuery,
@@ -53,7 +55,6 @@ use snowbridge_beacon_primitives::{
 };
 use snowbridge_core::{BasicOperatingMode, RingBufferMap};
 use sp_core::H256;
-use sp_std::prelude::*;
 pub use weights::WeightInfo;
 
 use functions::{
@@ -71,6 +72,7 @@ pub const LOG_TARGET: &str = "ethereum-client";
 pub mod pallet {
     use super::*;
 
+    use alloc::vec::Vec;
     use frame_support::pallet_prelude::*;
     use frame_system::pallet_prelude::*;
 
diff --git a/operator/pallets/ethereum-client/src/mock.rs b/operator/pallets/ethereum-client/src/mock.rs
index 6c1ca8a70..cb3963be5 100644
--- a/operator/pallets/ethereum-client/src/mock.rs
+++ b/operator/pallets/ethereum-client/src/mock.rs
@@ -2,11 +2,11 @@
 // SPDX-FileCopyrightText: 2023 Snowfork <hello@snowfork.com>
 use crate as ethereum_beacon_client;
 use crate::config;
+use alloc::default::Default;
 use frame_support::{derive_impl, dispatch::DispatchResult, parameter_types};
 use pallet_timestamp;
 use snowbridge_beacon_primitives::{Fork, ForkVersions};
 use snowbridge_inbound_queue_primitives::{Log, Proof};
-use sp_std::default::Default;
 use std::{fs::File, path::PathBuf};
 
 type Block = frame_system::mocking::MockBlock<Test>;
@@ -136,6 +136,10 @@ parameter_types! {
         },
         electra: Fork {
             version: [5, 0, 0, 0], // 0x05000000
+            epoch: 0,
+        },
+        fulu: Fork {
+            version: [6, 0, 0, 0], // 0x06000000
             epoch: 80000000000,
         }
     };
diff --git a/operator/pallets/ethereum-client/src/mock_electra.rs b/operator/pallets/ethereum-client/src/mock_electra.rs
index 740bbb895..bb6ba573a 100644
--- a/operator/pallets/ethereum-client/src/mock_electra.rs
+++ b/operator/pallets/ethereum-client/src/mock_electra.rs
@@ -2,11 +2,11 @@
 // SPDX-FileCopyrightText: 2023 Snowfork <hello@snowfork.com>
 use crate as ethereum_beacon_client;
 use crate::config;
+use alloc::default::Default;
 use frame_support::{derive_impl, dispatch::DispatchResult, parameter_types};
 use pallet_timestamp;
 use snowbridge_beacon_primitives::{Fork, ForkVersions};
 use snowbridge_inbound_queue_primitives::{Log, Proof};
-use sp_std::default::Default;
 use std::{fs::File, path::PathBuf};
 
 type Block = frame_system::mocking::MockBlock<Test>;
@@ -117,6 +117,10 @@ parameter_types! {
         electra: Fork {
             version: [5, 0, 0, 0], // 0x05000000
             epoch: 0,
+        },
+        fulu: Fork {
+            version: [6, 0, 0, 0], // 0x06000000
+            epoch: 0,
         }
     };
 }
diff --git a/operator/pallets/ethereum-client/src/tests.rs b/operator/pallets/ethereum-client/src/tests.rs
index 143315b69..c56817d8a 100644
--- a/operator/pallets/ethereum-client/src/tests.rs
+++ b/operator/pallets/ethereum-client/src/tests.rs
@@ -248,6 +248,10 @@ fn compute_fork_version() {
             version: [0, 0, 0, 5],
             epoch: 50,
         },
+        fulu: Fork {
+            version: [0, 0, 0, 6],
+            epoch: 60,
+        },
     };
     new_tester().execute_with(|| {
         assert_eq!(
diff --git a/operator/pallets/ethereum-client/src/tests_electra.rs b/operator/pallets/ethereum-client/src/tests_electra.rs
index 73666b2cf..aed3dce57 100644
--- a/operator/pallets/ethereum-client/src/tests_electra.rs
+++ b/operator/pallets/ethereum-client/src/tests_electra.rs
@@ -247,6 +247,10 @@ fn compute_fork_version() {
             version: [0, 0, 0, 5],
             epoch: 50,
         },
+        fulu: Fork {
+            version: [0, 0, 0, 6],
+            epoch: 60,
+        },
     };
     new_tester().execute_with(|| {
         assert_eq!(
@@ -281,6 +285,10 @@ fn compute_fork_version() {
             EthereumBeaconClient::select_fork_version(&mock_fork_versions, 50),
             [0, 0, 0, 5]
         );
+        assert_eq!(
+            EthereumBeaconClient::select_fork_version(&mock_fork_versions, 60),
+            [0, 0, 0, 6]
+        );
     });
 }
 
diff --git a/operator/pallets/ethereum-client/src/weights.rs b/operator/pallets/ethereum-client/src/weights.rs
index e4629746a..5361fabf2 100644
--- a/operator/pallets/ethereum-client/src/weights.rs
+++ b/operator/pallets/ethereum-client/src/weights.rs
@@ -29,7 +29,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weight functions needed for ethereum_beacon_client.
 pub trait WeightInfo {
diff --git a/operator/pallets/external-validator-slashes/src/mock.rs b/operator/pallets/external-validator-slashes/src/mock.rs
index efe2c5097..34ba198ee 100644
--- a/operator/pallets/external-validator-slashes/src/mock.rs
+++ b/operator/pallets/external-validator-slashes/src/mock.rs
@@ -171,6 +171,7 @@ impl pallet_session::Config for Test {
     type ValidatorIdOf = ConvertInto;
     type NextSessionRotation = pallet_session::PeriodicSessions<Period, Offset>;
     type WeightInfo = ();
+    type DisablingStrategy = ();
 }
 
 sp_runtime::impl_opaque_keys! {
diff --git a/operator/pallets/external-validators-rewards/Cargo.toml b/operator/pallets/external-validators-rewards/Cargo.toml
index aeaa7f329..f61ec1d87 100644
--- a/operator/pallets/external-validators-rewards/Cargo.toml
+++ b/operator/pallets/external-validators-rewards/Cargo.toml
@@ -22,7 +22,6 @@ frame-system = { workspace = true }
 sp-core = { workspace = true }
 sp-runtime = { workspace = true }
 sp-staking = { workspace = true }
-sp-std = { workspace = true }
 
 frame-benchmarking = { workspace = true }
 
@@ -58,7 +57,6 @@ std = [
 	"sp-io/std",
 	"sp-runtime/std",
 	"sp-staking/std",
-	"sp-std/std",
 ]
 runtime-benchmarks = [
 	"frame-benchmarking/runtime-benchmarks",
diff --git a/operator/pallets/external-validators-rewards/src/benchmarking.rs b/operator/pallets/external-validators-rewards/src/benchmarking.rs
index 4b84bc3f0..f3a834ec7 100644
--- a/operator/pallets/external-validators-rewards/src/benchmarking.rs
+++ b/operator/pallets/external-validators-rewards/src/benchmarking.rs
@@ -24,7 +24,6 @@ use {
     crate::types::BenchmarkHelper,
     frame_benchmarking::{account, v2::*, BenchmarkError},
     frame_support::traits::{Currency, EnsureOrigin},
-    sp_std::prelude::*,
 };
 
 const SEED: u32 = 0;
diff --git a/operator/pallets/external-validators-rewards/src/lib.rs b/operator/pallets/external-validators-rewards/src/lib.rs
index 8aeaa1234..0e8231891 100644
--- a/operator/pallets/external-validators-rewards/src/lib.rs
+++ b/operator/pallets/external-validators-rewards/src/lib.rs
@@ -18,6 +18,7 @@
 //! Storage will be cleared after a period of time.
 
 #![cfg_attr(not(feature = "std"), no_std)]
+extern crate alloc;
 
 #[cfg(test)]
 mod mock;
@@ -33,6 +34,7 @@ pub mod weights;
 
 pub use pallet::*;
 
+use alloc::vec::Vec;
 use {
     crate::types::{EraRewardsUtils, HandleInflation, SendMessage},
     frame_support::traits::{Get, ValidatorSet},
@@ -44,7 +46,6 @@ use {
         Perbill,
     },
     sp_staking::SessionIndex,
-    sp_std::vec::Vec,
 };
 
 /// Trait for checking if a validator has been slashed in a given era
@@ -65,10 +66,10 @@ pub mod pallet {
     use sp_runtime::PerThing;
 
     pub use crate::weights::WeightInfo;
+    use alloc::collections::BTreeMap;
     use {
         super::*, frame_support::pallet_prelude::*, frame_system::pallet_prelude::OriginFor,
         pallet_external_validators::traits::EraIndexProvider, sp_runtime::Saturating,
-        sp_std::collections::btree_map::BTreeMap,
     };
 
     /// The current storage version.
diff --git a/operator/pallets/external-validators-rewards/src/mock.rs b/operator/pallets/external-validators-rewards/src/mock.rs
index 6b99b7c36..e28599bfc 100644
--- a/operator/pallets/external-validators-rewards/src/mock.rs
+++ b/operator/pallets/external-validators-rewards/src/mock.rs
@@ -283,6 +283,7 @@ impl HandleInflation<H160> for InflationMinter {
 // Pallet to provide some mock data, used to test
 #[frame_support::pallet]
 pub mod mock_data {
+    use alloc::vec::Vec;
     use {
         frame_support::pallet_prelude::*,
         pallet_external_validators::traits::{ActiveEraInfo, EraIndex, EraIndexProvider},
@@ -293,9 +294,9 @@ pub mod mock_data {
         pub active_era: Option<ActiveEraInfo>,
         pub era_inflation: Option<u128>,
         /// Set of validators that are considered offline (for liveness testing)
-        pub offline_validators: sp_std::vec::Vec<sp_core::H160>,
+        pub offline_validators: Vec<sp_core::H160>,
         /// Set of (era_index, validator_id) pairs that are slashed
-        pub slashed_validators: sp_std::vec::Vec<(u32, sp_core::H160)>,
+        pub slashed_validators: Vec<(u32, sp_core::H160)>,
         /// When true, MockOkOutboundQueue::validate will return Err(SendError::MessageTooLarge)
         pub send_message_fails: bool,
     }
@@ -357,9 +358,12 @@ pub fn new_test_ext() -> sp_io::TestExternalities {
             ExistentialDeposit::get(),
         ), // Rewards account needs existential deposit
     ];
-    pallet_balances::GenesisConfig::<Test> { balances }
-        .assimilate_storage(&mut t)
-        .unwrap();
+    pallet_balances::GenesisConfig::<Test> {
+        balances,
+        dev_accounts: Default::default(),
+    }
+    .assimilate_storage(&mut t)
+    .unwrap();
 
     let ext: sp_io::TestExternalities = t.into();
 
diff --git a/operator/pallets/external-validators-rewards/src/tests.rs b/operator/pallets/external-validators-rewards/src/tests.rs
index 752a55c03..d5741cb4a 100644
--- a/operator/pallets/external-validators-rewards/src/tests.rs
+++ b/operator/pallets/external-validators-rewards/src/tests.rs
@@ -16,10 +16,10 @@
 
 use {
     crate::{self as pallet_external_validators_rewards, mock::*},
+    alloc::collections::btree_map::BTreeMap,
     frame_support::{assert_noop, assert_ok, traits::fungible::Mutate},
     pallet_external_validators::traits::{ActiveEraInfo, OnEraEnd, OnEraStart},
     sp_core::H160,
-    sp_std::collections::btree_map::BTreeMap,
 };
 
 #[test]
diff --git a/operator/pallets/external-validators-rewards/src/types.rs b/operator/pallets/external-validators-rewards/src/types.rs
index 540e6b942..23004d3fc 100644
--- a/operator/pallets/external-validators-rewards/src/types.rs
+++ b/operator/pallets/external-validators-rewards/src/types.rs
@@ -14,9 +14,9 @@
 // You should have received a copy of the GNU General Public License
 // along with Tanssi.  If not, see <http://www.gnu.org/licenses/>
 
+use alloc::vec::Vec;
 use snowbridge_outbound_queue_primitives::SendError;
 use sp_core::{H160, H256};
-use sp_std::vec::Vec;
 
 /// Data needed for EigenLayer rewards submission via Snowbridge.
 #[derive(Debug, PartialEq, Eq, Clone)]
diff --git a/operator/pallets/external-validators-rewards/src/weights.rs b/operator/pallets/external-validators-rewards/src/weights.rs
index a75857785..882ee0191 100644
--- a/operator/pallets/external-validators-rewards/src/weights.rs
+++ b/operator/pallets/external-validators-rewards/src/weights.rs
@@ -49,7 +49,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weight functions needed for pallet_external_validators_rewards.
 pub trait WeightInfo {
diff --git a/operator/pallets/external-validators/Cargo.toml b/operator/pallets/external-validators/Cargo.toml
index f7d63eb3b..cf9fb0772 100644
--- a/operator/pallets/external-validators/Cargo.toml
+++ b/operator/pallets/external-validators/Cargo.toml
@@ -24,7 +24,6 @@ frame-system = { workspace = true }
 impl-trait-for-tuples = { workspace = true }
 sp-runtime = { workspace = true }
 sp-staking = { workspace = true }
-sp-std = { workspace = true }
 sp-core = { workspace = true }
 
 frame-benchmarking = { workspace = true }
@@ -56,7 +55,6 @@ std = [
     "sp-io/std",
     "sp-runtime/std",
     "sp-staking/std",
-    "sp-std/std",
 ]
 runtime-benchmarks = [
     "frame-benchmarking/runtime-benchmarks",
diff --git a/operator/pallets/external-validators/src/benchmarking.rs b/operator/pallets/external-validators/src/benchmarking.rs
index 14c4df6b6..b4f81073c 100644
--- a/operator/pallets/external-validators/src/benchmarking.rs
+++ b/operator/pallets/external-validators/src/benchmarking.rs
@@ -27,7 +27,6 @@ use {
     pallet_session::{self as session, SessionManager},
     rand::{RngCore, SeedableRng},
     sp_runtime::{codec, traits::Convert},
-    sp_std::prelude::*,
 };
 const SEED: u32 = 0;
 
diff --git a/operator/pallets/external-validators/src/lib.rs b/operator/pallets/external-validators/src/lib.rs
index 7b2fdaf51..be82fd373 100644
--- a/operator/pallets/external-validators/src/lib.rs
+++ b/operator/pallets/external-validators/src/lib.rs
@@ -31,16 +31,17 @@
 //! The structure of this pallet and the concept of eras is inspired by `pallet_staking` from Polkadot.
 
 #![cfg_attr(not(feature = "std"), no_std)]
+extern crate alloc;
 
 pub use pallet::*;
 use {
+    alloc::{collections::btree_set::BTreeSet, vec::Vec},
     frame_support::pallet_prelude::Weight,
     log::log,
-    parity_scale_codec::{Decode, Encode, MaxEncodedLen},
+    parity_scale_codec::{Decode, DecodeWithMemTracking, Encode, MaxEncodedLen},
     scale_info::TypeInfo,
     sp_runtime::{traits::Get, RuntimeDebug},
     sp_staking::SessionIndex,
-    sp_std::{collections::btree_set::BTreeSet, vec::Vec},
     traits::{
         ActiveEraInfo, EraIndex, EraIndexProvider, ExternalIndexProvider, InvulnerablesProvider,
         OnEraEnd, OnEraStart, ValidatorProvider,
@@ -92,6 +93,7 @@ pub mod pallet {
     use frame_support::traits::Currency;
     use {
         super::*,
+        alloc::vec::Vec,
         frame_support::{
             dispatch::DispatchResultWithPostInfo,
             pallet_prelude::*,
@@ -101,7 +103,6 @@ pub mod pallet {
         frame_system::pallet_prelude::*,
         sp_core::H160,
         sp_runtime::{traits::Convert, SaturatedConversion},
-        sp_std::vec::Vec,
     };
 
     /// Configure the pallet by specifying the parameters and types on which it depends.
@@ -255,7 +256,7 @@ pub mod pallet {
                 // T::ValidatorId does not impl Ord or Hash so we cannot collect into set directly,
                 // but we can check for duplicates if we encode them first.
                 .map(|x| x.encode())
-                .collect::<sp_std::collections::btree_set::BTreeSet<_>>();
+                .collect::<alloc::collections::btree_set::BTreeSet<_>>();
             assert!(
                 duplicate_validators.len() == self.whitelisted_validators.len(),
                 "duplicate validators in genesis."
@@ -763,7 +764,17 @@ impl<T: Config> InvulnerablesProvider<T::ValidatorId> for Pallet<T> {
 
 /// Mode of era-forcing.
 #[derive(
-    Copy, Clone, PartialEq, Eq, Default, Encode, Decode, RuntimeDebug, TypeInfo, MaxEncodedLen,
+    Copy,
+    Clone,
+    PartialEq,
+    Eq,
+    Default,
+    Encode,
+    Decode,
+    RuntimeDebug,
+    TypeInfo,
+    MaxEncodedLen,
+    DecodeWithMemTracking,
 )]
 pub enum Forcing {
     /// Not forcing anything - just let whatever happen.
diff --git a/operator/pallets/external-validators/src/mock.rs b/operator/pallets/external-validators/src/mock.rs
index 0e8e1fd8b..8db7676cd 100644
--- a/operator/pallets/external-validators/src/mock.rs
+++ b/operator/pallets/external-validators/src/mock.rs
@@ -199,6 +199,7 @@ impl pallet_session::Config for Test {
     type SessionHandler = TestSessionHandler;
     type Keys = MockSessionKeys;
     type WeightInfo = ();
+    type DisablingStrategy = ();
 }
 
 // Pallet to provide some mock data, used to test
@@ -298,9 +299,12 @@ pub fn new_test_ext() -> sp_io::TestExternalities {
         keys,
         ..Default::default()
     };
-    pallet_balances::GenesisConfig::<Test> { balances }
-        .assimilate_storage(&mut t)
-        .unwrap();
+    pallet_balances::GenesisConfig::<Test> {
+        balances,
+        dev_accounts: Default::default(),
+    }
+    .assimilate_storage(&mut t)
+    .unwrap();
     pallet_external_validators::GenesisConfig::<Test> {
         skip_external_validators: false,
         whitelisted_validators,
diff --git a/operator/pallets/external-validators/src/traits.rs b/operator/pallets/external-validators/src/traits.rs
index 183ea0c29..3b778d588 100644
--- a/operator/pallets/external-validators/src/traits.rs
+++ b/operator/pallets/external-validators/src/traits.rs
@@ -14,12 +14,12 @@
 // You should have received a copy of the GNU General Public License
 // along with Tanssi.  If not, see <http://www.gnu.org/licenses/>
 
+use alloc::vec::Vec;
 use parity_scale_codec::{Decode, Encode, MaxEncodedLen};
 use scale_info::TypeInfo;
 use snowbridge_outbound_queue_primitives::SendError;
 use sp_core::H256;
 use sp_runtime::RuntimeDebug;
-use sp_std::vec::Vec;
 
 /// Information regarding the active era (era in used in session).
 #[derive(Clone, Encode, Decode, RuntimeDebug, TypeInfo, MaxEncodedLen)]
diff --git a/operator/pallets/external-validators/src/weights.rs b/operator/pallets/external-validators/src/weights.rs
index 8e8cee550..c29568186 100644
--- a/operator/pallets/external-validators/src/weights.rs
+++ b/operator/pallets/external-validators/src/weights.rs
@@ -49,7 +49,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weight functions needed for pallet_external_validators.
 pub trait WeightInfo {
diff --git a/operator/pallets/grandpa-benchmarking/Cargo.toml b/operator/pallets/grandpa-benchmarking/Cargo.toml
index 67f8cbd88..0451b3cf6 100644
--- a/operator/pallets/grandpa-benchmarking/Cargo.toml
+++ b/operator/pallets/grandpa-benchmarking/Cargo.toml
@@ -25,7 +25,6 @@ sp-application-crypto = { workspace = true }
 sp-core = { workspace = true }
 sp-runtime = { workspace = true }
 sp-session = { workspace = true }
-sp-std = { workspace = true }
 
 [features]
 default = ["std"]
@@ -42,7 +41,6 @@ std = [
     "sp-core/std",
     "sp-runtime/std",
     "sp-session/std",
-    "sp-std/std",
 ]
 runtime-benchmarks = [
     "frame-benchmarking/runtime-benchmarks",
diff --git a/operator/pallets/inbound-queue-v2/Cargo.toml b/operator/pallets/inbound-queue-v2/Cargo.toml
index edf40297f..a84c0b510 100644
--- a/operator/pallets/inbound-queue-v2/Cargo.toml
+++ b/operator/pallets/inbound-queue-v2/Cargo.toml
@@ -30,7 +30,6 @@ pallet-balances = { 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 }
@@ -87,7 +86,6 @@ std = [
     "sp-core/std",
     "sp-io/std",
     "sp-runtime/std",
-    "sp-std/std",
     "tracing/std",
     "xcm-builder/std",
     "xcm-executor/std",
diff --git a/operator/pallets/inbound-queue-v2/fixtures/Cargo.toml b/operator/pallets/inbound-queue-v2/fixtures/Cargo.toml
index 7568f8fc9..f95515b88 100644
--- a/operator/pallets/inbound-queue-v2/fixtures/Cargo.toml
+++ b/operator/pallets/inbound-queue-v2/fixtures/Cargo.toml
@@ -20,7 +20,6 @@ snowbridge-beacon-primitives = { workspace = true }
 snowbridge-core = { workspace = true }
 snowbridge-inbound-queue-primitives = { workspace = true }
 sp-core = { workspace = true }
-sp-std = { workspace = true }
 
 [features]
 default = ["std"]
@@ -33,5 +32,4 @@ std = [
     "snowbridge-core/std",
     "snowbridge-inbound-queue-primitives/std",
     "sp-core/std",
-    "sp-std/std",
 ]
diff --git a/operator/pallets/inbound-queue-v2/fixtures/src/lib.rs b/operator/pallets/inbound-queue-v2/fixtures/src/lib.rs
index 3fe70c51a..471d0b811 100644
--- a/operator/pallets/inbound-queue-v2/fixtures/src/lib.rs
+++ b/operator/pallets/inbound-queue-v2/fixtures/src/lib.rs
@@ -1,5 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2023 Snowfork <hello@snowfork.com>
 #![cfg_attr(not(feature = "std"), no_std)]
+extern crate alloc;
 
 pub mod register_token;
diff --git a/operator/pallets/inbound-queue-v2/fixtures/src/register_token.rs b/operator/pallets/inbound-queue-v2/fixtures/src/register_token.rs
index 24645c52e..a98833e91 100644
--- a/operator/pallets/inbound-queue-v2/fixtures/src/register_token.rs
+++ b/operator/pallets/inbound-queue-v2/fixtures/src/register_token.rs
@@ -3,13 +3,13 @@
 // Generated, do not edit!
 // See ethereum client README.md for instructions to generate
 
+use alloc::vec;
 use hex_literal::hex;
 use snowbridge_beacon_primitives::{
     types::deneb, AncestryProof, BeaconHeader, ExecutionProof, VersionedExecutionPayloadHeader,
 };
 use snowbridge_inbound_queue_primitives::{EventProof, InboundQueueFixture, Log, Proof};
 use sp_core::U256;
-use sp_std::vec;
 
 pub fn make_register_token_message() -> InboundQueueFixture {
     InboundQueueFixture {
diff --git a/operator/pallets/inbound-queue-v2/src/lib.rs b/operator/pallets/inbound-queue-v2/src/lib.rs
index 702005c2f..94a3b43e7 100644
--- a/operator/pallets/inbound-queue-v2/src/lib.rs
+++ b/operator/pallets/inbound-queue-v2/src/lib.rs
@@ -37,6 +37,7 @@ mod mock;
 mod test;
 
 pub use crate::weights::WeightInfo;
+use alloc::boxed::Box;
 use frame_system::ensure_signed;
 use snowbridge_core::{
     sparse_bitmap::{SparseBitmap, SparseBitmapImpl},
@@ -48,7 +49,6 @@ use snowbridge_inbound_queue_primitives::{
 };
 use sp_core::H160;
 use sp_runtime::traits::Zero;
-use sp_std::prelude::*;
 use xcm::prelude::*;
 
 #[cfg(feature = "runtime-benchmarks")]
diff --git a/operator/pallets/inbound-queue-v2/src/message_processors.rs b/operator/pallets/inbound-queue-v2/src/message_processors.rs
index 1bbec9d71..4b2d5e3ac 100644
--- a/operator/pallets/inbound-queue-v2/src/message_processors.rs
+++ b/operator/pallets/inbound-queue-v2/src/message_processors.rs
@@ -2,10 +2,10 @@
 // SPDX-FileCopyrightText: 2023 Snowfork <hello@snowfork.com>
 use super::*;
 use codec::Encode;
+use core::marker::PhantomData;
 use frame_support::traits::Get;
 use sp_runtime::traits::TryConvert;
 use sp_runtime::DispatchError;
-use sp_std::marker::PhantomData;
 use xcm::prelude::{ExecuteXcm, Location, Parachain, SendError, SendXcm, XcmHash};
 
 /// A message processor that simply returns the Blake2_256 hash of the SCALE encoded message
diff --git a/operator/pallets/inbound-queue-v2/src/mock.rs b/operator/pallets/inbound-queue-v2/src/mock.rs
index f216f8681..ac972ded7 100644
--- a/operator/pallets/inbound-queue-v2/src/mock.rs
+++ b/operator/pallets/inbound-queue-v2/src/mock.rs
@@ -4,6 +4,7 @@ use super::*;
 
 use crate::{self as inbound_queue_v2, message_processors::XcmMessageProcessor};
 use codec::{Decode, DecodeWithMemTracking, Encode, MaxEncodedLen};
+use core::{convert::From, default::Default, marker::PhantomData};
 use frame_support::{derive_impl, parameter_types, traits::ConstU32};
 use hex_literal::hex;
 use scale_info::TypeInfo;
@@ -17,7 +18,6 @@ use sp_runtime::{
     traits::{IdentityLookup, MaybeEquivalence, TryConvert},
     BuildStorage, DispatchError,
 };
-use sp_std::{convert::From, default::Default, marker::PhantomData};
 use xcm::{opaque::latest::WESTEND_GENESIS_HASH, prelude::*};
 type Block = frame_system::mocking::MockBlock<Test>;
 pub use snowbridge_test_utils::mock_xcm::{MockXcmExecutor, MockXcmSender};
diff --git a/operator/pallets/inbound-queue-v2/src/weights.rs b/operator/pallets/inbound-queue-v2/src/weights.rs
index c96d3a03b..139bd90bb 100644
--- a/operator/pallets/inbound-queue-v2/src/weights.rs
+++ b/operator/pallets/inbound-queue-v2/src/weights.rs
@@ -13,7 +13,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weight functions needed for ethereum_beacon_client.
 pub trait WeightInfo {
diff --git a/operator/pallets/outbound-queue-v2/Cargo.toml b/operator/pallets/outbound-queue-v2/Cargo.toml
index de17829b1..d538a221e 100644
--- a/operator/pallets/outbound-queue-v2/Cargo.toml
+++ b/operator/pallets/outbound-queue-v2/Cargo.toml
@@ -29,7 +29,6 @@ sp-arithmetic = { workspace = true }
 sp-core = { workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
-sp-std = { workspace = true }
 
 bp-relayers = { workspace = true }
 bridge-hub-common = { workspace = true }
@@ -82,7 +81,6 @@ std = [
     "sp-core/std",
     "sp-io/std",
     "sp-runtime/std",
-    "sp-std/std",
     "xcm-builder/std",
     "xcm-executor/std",
     "xcm/std",
diff --git a/operator/pallets/outbound-queue-v2/runtime-api/Cargo.toml b/operator/pallets/outbound-queue-v2/runtime-api/Cargo.toml
index caab8c277..75d82c932 100644
--- a/operator/pallets/outbound-queue-v2/runtime-api/Cargo.toml
+++ b/operator/pallets/outbound-queue-v2/runtime-api/Cargo.toml
@@ -22,7 +22,6 @@ snowbridge-core = { workspace = true }
 snowbridge-merkle-tree = { workspace = true }
 snowbridge-outbound-queue-primitives = { workspace = true }
 sp-api = { workspace = true }
-sp-std = { workspace = true }
 xcm = { workspace = true }
 
 [features]
@@ -35,6 +34,5 @@ std = [
     "snowbridge-merkle-tree/std",
     "snowbridge-outbound-queue-primitives/std",
     "sp-api/std",
-    "sp-std/std",
     "xcm/std",
 ]
diff --git a/operator/pallets/outbound-queue-v2/src/benchmarking.rs b/operator/pallets/outbound-queue-v2/src/benchmarking.rs
index 1a498da6b..b60e2d653 100644
--- a/operator/pallets/outbound-queue-v2/src/benchmarking.rs
+++ b/operator/pallets/outbound-queue-v2/src/benchmarking.rs
@@ -21,6 +21,9 @@ use crate::Pallet as OutboundQueue;
 )]
 mod benchmarks {
     use super::*;
+    use alloc::boxed::Box;
+    use alloc::vec;
+    use alloc::vec::Vec;
 
     /// Build `Upgrade` message with `MaxMessagePayloadSize`, in the worst-case.
     fn build_message<T: Config>() -> (Message, OutboundMessage) {
diff --git a/operator/pallets/outbound-queue-v2/src/fixture.rs b/operator/pallets/outbound-queue-v2/src/fixture.rs
index 7c303b334..c759670cc 100644
--- a/operator/pallets/outbound-queue-v2/src/fixture.rs
+++ b/operator/pallets/outbound-queue-v2/src/fixture.rs
@@ -3,13 +3,13 @@
 // Generated, do not edit!
 // See ethereum client README.md for instructions to generate
 
+use alloc::vec;
 use hex_literal::hex;
 use snowbridge_beacon_primitives::{
     types::deneb, AncestryProof, BeaconHeader, ExecutionProof, VersionedExecutionPayloadHeader,
 };
 use snowbridge_verification_primitives::{EventFixture, EventProof, Log, Proof};
 use sp_core::U256;
-use sp_std::vec;
 
 pub fn make_submit_delivery_receipt_message() -> EventFixture {
     EventFixture {
diff --git a/operator/pallets/outbound-queue-v2/src/lib.rs b/operator/pallets/outbound-queue-v2/src/lib.rs
index 40c03fe3a..b36ea9d4d 100644
--- a/operator/pallets/outbound-queue-v2/src/lib.rs
+++ b/operator/pallets/outbound-queue-v2/src/lib.rs
@@ -49,6 +49,8 @@
 //!
 //! * `prove_message`: Generate a merkle proof for a committed message
 #![cfg_attr(not(feature = "std"), no_std)]
+extern crate alloc;
+
 pub mod api;
 pub mod process_message_impl;
 pub mod send_message_impl;
@@ -93,7 +95,6 @@ use sp_runtime::{
     traits::{BlockNumberProvider, Hash, MaybeEquivalence},
     DigestItem,
 };
-use sp_std::prelude::*;
 pub use types::{OnNewCommitment, PendingOrder, ProcessMessageOriginOf};
 pub use weights::WeightInfo;
 use xcm::latest::{Location, NetworkId};
@@ -107,6 +108,8 @@ pub use pallet::*;
 #[frame_support::pallet]
 pub mod pallet {
     use super::*;
+    use alloc::boxed::Box;
+    use alloc::vec::Vec;
     use frame_support::pallet_prelude::*;
     use frame_system::pallet_prelude::*;
 
diff --git a/operator/pallets/outbound-queue-v2/src/mock.rs b/operator/pallets/outbound-queue-v2/src/mock.rs
index 39ee8c910..599e27f4d 100644
--- a/operator/pallets/outbound-queue-v2/src/mock.rs
+++ b/operator/pallets/outbound-queue-v2/src/mock.rs
@@ -10,6 +10,7 @@ use frame_support::{
 };
 
 use codec::{DecodeWithMemTracking, Encode, MaxEncodedLen};
+use core::marker::PhantomData;
 use hex_literal::hex;
 use scale_info::TypeInfo;
 use snowbridge_core::{
@@ -23,7 +24,6 @@ use sp_runtime::{
     traits::{BlakeTwo256, IdentityLookup, Keccak256},
     AccountId32, BuildStorage, FixedU128,
 };
-use sp_std::marker::PhantomData;
 use xcm::prelude::Here;
 use xcm_executor::traits::ConvertLocation;
 
diff --git a/operator/pallets/outbound-queue-v2/src/types.rs b/operator/pallets/outbound-queue-v2/src/types.rs
index dccc9a728..5aa498a9b 100644
--- a/operator/pallets/outbound-queue-v2/src/types.rs
+++ b/operator/pallets/outbound-queue-v2/src/types.rs
@@ -7,7 +7,6 @@ use scale_info::TypeInfo;
 pub use snowbridge_merkle_tree::MerkleProof;
 use sp_core::H256;
 use sp_runtime::RuntimeDebug;
-use sp_std::prelude::*;
 
 pub type ProcessMessageOriginOf<T> = <Pallet<T> as ProcessMessage>::Origin;
 
diff --git a/operator/pallets/proxy-genesis-companion/Cargo.toml b/operator/pallets/proxy-genesis-companion/Cargo.toml
index 1e9c634dc..2003d21ee 100644
--- a/operator/pallets/proxy-genesis-companion/Cargo.toml
+++ b/operator/pallets/proxy-genesis-companion/Cargo.toml
@@ -13,7 +13,6 @@ frame-system = { workspace = true }
 pallet-proxy = { workspace = true }
 scale-info = { workspace = true, features = ["derive"] }
 sp-runtime = { workspace = true }
-sp-std = { workspace = true }
 
 [dev-dependencies]
 pallet-balances = { workspace = true, features = ["insecure_zero_ed", "std"] }
@@ -30,7 +29,6 @@ std = [
     "pallet-proxy/std",
     "scale-info/std",
     "sp-runtime/std",
-    "sp-std/std",
 ]
 try-runtime = [
     "frame-support/try-runtime",
diff --git a/operator/pallets/proxy-genesis-companion/src/lib.rs b/operator/pallets/proxy-genesis-companion/src/lib.rs
index 9711075ba..1e18773d3 100644
--- a/operator/pallets/proxy-genesis-companion/src/lib.rs
+++ b/operator/pallets/proxy-genesis-companion/src/lib.rs
@@ -21,6 +21,7 @@
 //! obstacles to including it here.
 
 #![cfg_attr(not(feature = "std"), no_std)]
+extern crate alloc;
 
 #[cfg(test)]
 mod mock;
@@ -32,9 +33,9 @@ pub use pallet::*;
 
 #[pallet]
 pub mod pallet {
+    use alloc::vec::Vec;
     use frame_support::pallet_prelude::*;
     use frame_system::pallet_prelude::BlockNumberFor;
-    use sp_std::vec::Vec;
 
     /// Pallet for configuring proxy at genesis
     #[pallet::pallet]
@@ -44,7 +45,11 @@ pub mod pallet {
     /// This pallet requires pallet-proxy to be installed.
     #[pallet::config]
     pub trait Config:
-        frame_system::Config + pallet_proxy::Config<ProxyType = <Self as Config>::ProxyType>
+        frame_system::Config
+        + pallet_proxy::Config<
+            ProxyType = <Self as Config>::ProxyType,
+            BlockNumberProvider = frame_system::Pallet<Self>,
+        >
     {
         /// This MUST be the same as in pallet_proxy or it won't compile
         type ProxyType: MaybeSerializeDeserialize + Clone;
diff --git a/operator/pallets/proxy-genesis-companion/src/mock.rs b/operator/pallets/proxy-genesis-companion/src/mock.rs
index 116fd2c2d..ef57a1d93 100644
--- a/operator/pallets/proxy-genesis-companion/src/mock.rs
+++ b/operator/pallets/proxy-genesis-companion/src/mock.rs
@@ -17,7 +17,7 @@
 //! A minimal runtime including the proxy-genesis-companion pallet
 use super::*;
 use crate as proxy_companion;
-use codec::{Decode, Encode, MaxEncodedLen};
+use codec::{Decode, DecodeWithMemTracking, Encode, MaxEncodedLen};
 use frame_support::{
     construct_runtime, derive_impl, parameter_types,
     traits::{ConstU32, InstanceFilter},
@@ -79,6 +79,7 @@ parameter_types! {
     Debug,
     MaxEncodedLen,
     scale_info::TypeInfo,
+    DecodeWithMemTracking,
     serde::Serialize,
     serde::Deserialize,
     Default,
@@ -108,6 +109,7 @@ impl pallet_proxy::Config for Test {
     type CallHasher = BlakeTwo256;
     type AnnouncementDepositBase = AnnouncementDepositBase;
     type AnnouncementDepositFactor = AnnouncementDepositFactor;
+    type BlockNumberProvider = System;
 }
 
 impl Config for Test {
@@ -147,7 +149,7 @@ impl ExtBuilder {
 
         pallet_balances::GenesisConfig::<Test> {
             balances: self.balances,
-            ..Default::default()
+            dev_accounts: Default::default(),
         }
         .assimilate_storage(&mut t)
         .expect("Pallet balances storage can be assimilated");
diff --git a/operator/pallets/session-benchmarking/Cargo.toml b/operator/pallets/session-benchmarking/Cargo.toml
index 41b64d87a..7699c33e3 100644
--- a/operator/pallets/session-benchmarking/Cargo.toml
+++ b/operator/pallets/session-benchmarking/Cargo.toml
@@ -19,7 +19,6 @@ frame-support = { workspace = true }
 frame-system = { workspace = true }
 pallet-session = { workspace = true }
 sp-runtime = { workspace = true }
-sp-std = { workspace = true }
 
 [features]
 default = ["std"]
@@ -30,7 +29,6 @@ std = [
     "frame-system/std",
     "pallet-session/std",
     "sp-runtime/std",
-    "sp-std/std",
 ]
 runtime-benchmarks = [
     "frame-benchmarking/runtime-benchmarks",
diff --git a/operator/pallets/system-v2/Cargo.toml b/operator/pallets/system-v2/Cargo.toml
index 6d1c14a9c..82df1a06d 100644
--- a/operator/pallets/system-v2/Cargo.toml
+++ b/operator/pallets/system-v2/Cargo.toml
@@ -28,7 +28,6 @@ snowbridge-pallet-system = { workspace = true }
 sp-core = { workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
-sp-std = { workspace = true }
 xcm = { workspace = true }
 xcm-executor = { workspace = true }
 
@@ -70,7 +69,6 @@ std = [
     "sp-core/std",
     "sp-io/std",
     "sp-runtime/std",
-    "sp-std/std",
     "xcm-executor/std",
     "xcm/std",
 ]
diff --git a/operator/pallets/system-v2/runtime-api/Cargo.toml b/operator/pallets/system-v2/runtime-api/Cargo.toml
index 968895075..30ba160c4 100644
--- a/operator/pallets/system-v2/runtime-api/Cargo.toml
+++ b/operator/pallets/system-v2/runtime-api/Cargo.toml
@@ -21,7 +21,6 @@ exclude-from-umbrella = true
 codec = { features = ["derive"], workspace = true }
 snowbridge-core.workspace = true
 sp-api.workspace = true
-sp-std.workspace = true
 xcm.workspace = true
 
 [features]
@@ -30,6 +29,5 @@ std = [
     "codec/std",
     "snowbridge-core/std",
     "sp-api/std",
-    "sp-std/std",
     "xcm/std",
 ]
diff --git a/operator/pallets/system-v2/src/benchmarking.rs b/operator/pallets/system-v2/src/benchmarking.rs
index b2571f8fa..a0f967ca4 100644
--- a/operator/pallets/system-v2/src/benchmarking.rs
+++ b/operator/pallets/system-v2/src/benchmarking.rs
@@ -15,6 +15,7 @@ use xcm::prelude::*;
 #[benchmarks]
 mod benchmarks {
     use super::*;
+    use alloc::vec::Vec;
 
     #[benchmark]
     fn register_token() -> Result<(), BenchmarkError> {
diff --git a/operator/pallets/system-v2/src/lib.rs b/operator/pallets/system-v2/src/lib.rs
index 22a0f0155..2ddd28212 100644
--- a/operator/pallets/system-v2/src/lib.rs
+++ b/operator/pallets/system-v2/src/lib.rs
@@ -16,6 +16,8 @@
 //!
 //! * [`Call::register_token`]: Register a token location as a wrapped ERC20 contract on Ethereum.
 #![cfg_attr(not(feature = "std"), no_std)]
+extern crate alloc;
+
 #[cfg(test)]
 mod mock;
 
@@ -29,6 +31,8 @@ pub mod api;
 pub mod weights;
 pub use weights::*;
 
+use alloc::boxed::Box;
+use alloc::vec;
 use frame_support::{pallet_prelude::*, traits::EnsureOrigin};
 use frame_system::pallet_prelude::*;
 use snowbridge_core::{AgentIdOf as LocationHashOf, AssetMetadata, TokenId, TokenIdOf};
@@ -40,7 +44,6 @@ use snowbridge_pallet_system::{ForeignToNativeId, NativeToForeignId};
 use sp_core::{H160, H256};
 use sp_io::hashing::blake2_256;
 use sp_runtime::traits::MaybeEquivalence;
-use sp_std::prelude::*;
 use xcm::prelude::*;
 use xcm_executor::traits::ConvertLocation;
 
diff --git a/operator/pallets/system/Cargo.toml b/operator/pallets/system/Cargo.toml
index 601a67836..24b0e6227 100644
--- a/operator/pallets/system/Cargo.toml
+++ b/operator/pallets/system/Cargo.toml
@@ -25,7 +25,6 @@ snowbridge-outbound-queue-primitives.workspace = true
 sp-core.workspace = true
 sp-io.workspace = true
 sp-runtime.workspace = true
-sp-std.workspace = true
 xcm.workspace = true
 xcm-executor.workspace = true
 
@@ -63,7 +62,6 @@ std = [
     "sp-core/std",
     "sp-io/std",
     "sp-runtime/std",
-    "sp-std/std",
     "xcm-executor/std",
     "xcm/std",
 ]
diff --git a/operator/pallets/system/runtime-api/Cargo.toml b/operator/pallets/system/runtime-api/Cargo.toml
index 72d53e174..55a3a05bf 100644
--- a/operator/pallets/system/runtime-api/Cargo.toml
+++ b/operator/pallets/system/runtime-api/Cargo.toml
@@ -21,7 +21,6 @@ exclude-from-umbrella = true
 codec = { features = ["derive"], workspace = true }
 snowbridge-core.workspace = true
 sp-api.workspace = true
-sp-std.workspace = true
 xcm.workspace = true
 
 [features]
@@ -30,6 +29,5 @@ std = [
     "codec/std",
     "snowbridge-core/std",
     "sp-api/std",
-    "sp-std/std",
     "xcm/std",
 ]
diff --git a/operator/pallets/system/src/benchmarking.rs b/operator/pallets/system/src/benchmarking.rs
index e8c0f6dd8..ced6c0539 100644
--- a/operator/pallets/system/src/benchmarking.rs
+++ b/operator/pallets/system/src/benchmarking.rs
@@ -15,6 +15,8 @@ use xcm::prelude::*;
 #[benchmarks]
 mod benchmarks {
     use super::*;
+    use alloc::boxed::Box;
+    use alloc::vec::Vec;
 
     #[benchmark]
     fn upgrade() -> Result<(), BenchmarkError> {
diff --git a/operator/pallets/system/src/lib.rs b/operator/pallets/system/src/lib.rs
index 20b37a37c..2eb51db18 100644
--- a/operator/pallets/system/src/lib.rs
+++ b/operator/pallets/system/src/lib.rs
@@ -18,6 +18,8 @@
 //!
 //! * [`Call::register_token`]: Register a token location as a wrapped ERC20 contract on Ethereum.
 #![cfg_attr(not(feature = "std"), no_std)]
+extern crate alloc;
+
 #[cfg(test)]
 mod mock;
 
@@ -32,6 +34,7 @@ pub mod api;
 pub mod weights;
 pub use weights::*;
 
+use alloc::boxed::Box;
 use frame_support::{
     pallet_prelude::*,
     traits::{
@@ -53,7 +56,6 @@ use snowbridge_outbound_queue_primitives::{
 use sp_core::{RuntimeDebug, H160, H256};
 use sp_io::hashing::blake2_256;
 use sp_runtime::{traits::MaybeEquivalence, DispatchError, SaturatedConversion};
-use sp_std::prelude::*;
 use xcm::prelude::*;
 use xcm_executor::traits::ConvertLocation;
 
diff --git a/operator/pallets/system/src/migration.rs b/operator/pallets/system/src/migration.rs
index 7a6aacd06..f7ee316cf 100644
--- a/operator/pallets/system/src/migration.rs
+++ b/operator/pallets/system/src/migration.rs
@@ -2,6 +2,8 @@
 // SPDX-FileCopyrightText: 2023 Snowfork <hello@snowfork.com>
 //! Governance API for controlling the Ethereum side of the bridge
 use super::*;
+use alloc::vec::Vec;
+use core::marker::PhantomData;
 use frame_support::{
     migrations::VersionedMigration,
     pallet_prelude::*,
@@ -9,7 +11,6 @@ use frame_support::{
     weights::Weight,
 };
 use log;
-use sp_std::marker::PhantomData;
 
 #[cfg(feature = "try-runtime")]
 use sp_runtime::TryRuntimeError;
@@ -22,6 +23,9 @@ pub const STORAGE_VERSION: StorageVersion = StorageVersion::new(1);
 pub mod v0 {
     use super::*;
 
+    #[cfg(feature = "try-runtime")]
+    use alloc::vec;
+
     pub struct InitializeOnUpgrade<T, BridgeHubParaId, AssetHubParaId>(
         PhantomData<(T, BridgeHubParaId, AssetHubParaId)>,
     );
diff --git a/operator/pallets/system/src/mock.rs b/operator/pallets/system/src/mock.rs
index d3572eaff..b513b3752 100644
--- a/operator/pallets/system/src/mock.rs
+++ b/operator/pallets/system/src/mock.rs
@@ -49,7 +49,17 @@ mod pallet_xcm_origin {
 
     // Insert this custom Origin into the aggregate RuntimeOrigin
     #[pallet::origin]
-    #[derive(PartialEq, Eq, Clone, Encode, Decode, RuntimeDebug, TypeInfo, MaxEncodedLen)]
+    #[derive(
+        PartialEq,
+        Eq,
+        Clone,
+        Encode,
+        Decode,
+        RuntimeDebug,
+        TypeInfo,
+        DecodeWithMemTracking,
+        MaxEncodedLen,
+    )]
     pub struct Origin(pub Location);
 
     impl From<Location> for Origin {
diff --git a/operator/precompiles/batch/Cargo.toml b/operator/precompiles/batch/Cargo.toml
index db9946854..7bc5775d9 100644
--- a/operator/precompiles/batch/Cargo.toml
+++ b/operator/precompiles/batch/Cargo.toml
@@ -13,7 +13,6 @@ frame-system = { workspace = true }
 parity-scale-codec = { workspace = true, features = ["max-encoded-len"] }
 sp-core = { workspace = true }
 sp-io = { workspace = true }
-sp-std = { workspace = true }
 
 # Frontier
 evm = { workspace = true, features = ["with-codec"] }
@@ -42,5 +41,4 @@ std = [
 	"precompile-utils/std",
 	"sp-core/std",
 	"sp-io/std",
-	"sp-std/std",
 ]
diff --git a/operator/precompiles/batch/src/lib.rs b/operator/precompiles/batch/src/lib.rs
index 86b026384..aa3dd99f1 100644
--- a/operator/precompiles/batch/src/lib.rs
+++ b/operator/precompiles/batch/src/lib.rs
@@ -17,13 +17,16 @@
 //! Precompile to interact with pallet_balances instances using the ERC20 interface standard.
 
 #![cfg_attr(not(feature = "std"), no_std)]
+extern crate alloc;
 
+use alloc::vec;
+use alloc::vec::Vec;
+use core::{iter::repeat, marker::PhantomData};
 use evm::{ExitError, ExitReason};
 use fp_evm::{Context, Log, PrecompileFailure, PrecompileHandle, Transfer};
 use frame_support::traits::ConstU32;
 use precompile_utils::{evm::costs::call_cost, prelude::*};
 use sp_core::{H160, U256};
-use sp_std::{iter::repeat, marker::PhantomData, vec, vec::Vec};
 
 #[cfg(test)]
 mod mock;
diff --git a/operator/precompiles/batch/src/mock.rs b/operator/precompiles/batch/src/mock.rs
index 5b51a83e7..85e2ada3a 100644
--- a/operator/precompiles/batch/src/mock.rs
+++ b/operator/precompiles/batch/src/mock.rs
@@ -142,6 +142,8 @@ impl pallet_evm::Config for Runtime {
     type GasWeightMapping = pallet_evm::FixedGasWeightMapping<Self>;
     type WeightPerGas = WeightPerGas;
     type CallOrigin = EnsureAddressRoot<AccountId>;
+    type CreateOriginFilter = ();
+    type CreateInnerOriginFilter = ();
     type WithdrawOrigin = EnsureAddressNever<AccountId>;
     type AddressMapping = AccountId;
     type Currency = Balances;
@@ -196,6 +198,7 @@ impl ExtBuilder {
 
         pallet_balances::GenesisConfig::<Runtime> {
             balances: self.balances,
+            dev_accounts: Default::default(),
         }
         .assimilate_storage(&mut t)
         .expect("Pallet balances storage can be assimilated");
@@ -206,6 +209,7 @@ impl ExtBuilder {
             pallet_evm::Pallet::<Runtime>::create_account(
                 Revert.into(),
                 hex_literal::hex!("1460006000fd").to_vec(),
+                None,
             );
         });
         ext
diff --git a/operator/precompiles/batch/src/tests.rs b/operator/precompiles/batch/src/tests.rs
index 61883b457..655a9cb0f 100644
--- a/operator/precompiles/batch/src/tests.rs
+++ b/operator/precompiles/batch/src/tests.rs
@@ -45,6 +45,7 @@ fn evm_call(from: impl Into<H160>, input: Vec<u8>) -> EvmCall<Runtime> {
         max_priority_fee_per_gas: Some(U256::zero()),
         nonce: None, // Use the next nonce
         access_list: Vec::new(),
+        authorization_list: Vec::new(),
     }
 }
 
diff --git a/operator/precompiles/call-permit/Cargo.toml b/operator/precompiles/call-permit/Cargo.toml
index 6d74c82e0..ddc55831c 100644
--- a/operator/precompiles/call-permit/Cargo.toml
+++ b/operator/precompiles/call-permit/Cargo.toml
@@ -14,7 +14,6 @@ parity-scale-codec = { workspace = true, features = [ "max-encoded-len" ] }
 sp-core = { workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
-sp-std = { workspace = true }
 
 # Frontier
 evm = { workspace = true, features = [ "with-codec" ] }
@@ -43,5 +42,4 @@ std = [
 	"precompile-utils/std",
 	"sp-core/std",
 	"sp-io/std",
-	"sp-std/std",
 ]
diff --git a/operator/precompiles/call-permit/src/lib.rs b/operator/precompiles/call-permit/src/lib.rs
index d03642352..a1037f546 100644
--- a/operator/precompiles/call-permit/src/lib.rs
+++ b/operator/precompiles/call-permit/src/lib.rs
@@ -15,7 +15,9 @@
 // along with Moonbeam.  If not, see <http://www.gnu.org/licenses/>.
 
 #![cfg_attr(not(feature = "std"), no_std)]
+extern crate alloc;
 
+use alloc::vec::Vec;
 use core::marker::PhantomData;
 use evm::ExitReason;
 use fp_evm::{Context, ExitRevert, PrecompileFailure, PrecompileHandle, Transfer};
@@ -29,7 +31,6 @@ use precompile_utils::{evm::costs::call_cost, prelude::*};
 use sp_core::{H160, H256, U256};
 use sp_io::hashing::keccak_256;
 use sp_runtime::traits::UniqueSaturatedInto;
-use sp_std::vec::Vec;
 
 #[cfg(test)]
 mod mock;
diff --git a/operator/precompiles/call-permit/src/mock.rs b/operator/precompiles/call-permit/src/mock.rs
index efe85f835..4eb53cb44 100644
--- a/operator/precompiles/call-permit/src/mock.rs
+++ b/operator/precompiles/call-permit/src/mock.rs
@@ -126,6 +126,8 @@ impl pallet_evm::Config for Runtime {
     type GasWeightMapping = pallet_evm::FixedGasWeightMapping<Self>;
     type WeightPerGas = WeightPerGas;
     type CallOrigin = EnsureAddressRoot<AccountId>;
+    type CreateOriginFilter = ();
+    type CreateInnerOriginFilter = ();
     type WithdrawOrigin = EnsureAddressNever<AccountId>;
     type AddressMapping = AccountId;
     type Currency = Balances;
@@ -180,6 +182,7 @@ impl ExtBuilder {
 
         pallet_balances::GenesisConfig::<Runtime> {
             balances: self.balances,
+            dev_accounts: Default::default(),
         }
         .assimilate_storage(&mut t)
         .expect("Pallet balances storage can be assimilated");
@@ -190,6 +193,7 @@ impl ExtBuilder {
             pallet_evm::Pallet::<Runtime>::create_account(
                 Revert.into(),
                 hex_literal::hex!("1460006000fd").to_vec(),
+                None,
             );
         });
         ext
diff --git a/operator/precompiles/collective/Cargo.toml b/operator/precompiles/collective/Cargo.toml
index 7cdc58762..f605d8dbb 100644
--- a/operator/precompiles/collective/Cargo.toml
+++ b/operator/precompiles/collective/Cargo.toml
@@ -14,7 +14,6 @@ parity-scale-codec = { workspace = true, features = ["max-encoded-len"] }
 sp-core = { workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
-sp-std = { workspace = true }
 
 # Frontier
 evm = { workspace = true, features = ["with-codec"] }
@@ -46,6 +45,5 @@ std = [
 	"precompile-utils/std",
 	"sp-core/std",
 	"sp-io/std",
-	"sp-std/std",
 ]
 runtime-benchmarks = []
diff --git a/operator/precompiles/collective/src/lib.rs b/operator/precompiles/collective/src/lib.rs
index 885bb8d9c..95afa826f 100644
--- a/operator/precompiles/collective/src/lib.rs
+++ b/operator/precompiles/collective/src/lib.rs
@@ -17,7 +17,10 @@
 //! Precompile to interact with pallet_collective instances.
 
 #![cfg_attr(not(feature = "std"), no_std)]
+extern crate alloc;
 
+use alloc::boxed::Box;
+use alloc::vec::Vec;
 use core::marker::PhantomData;
 use fp_account::AccountId20;
 use fp_evm::Log;
@@ -32,7 +35,6 @@ use parity_scale_codec::{DecodeLimit as _, MaxEncodedLen};
 use precompile_utils::prelude::*;
 use sp_core::{Decode, Get, H160, H256};
 use sp_runtime::traits::Dispatchable;
-use sp_std::{boxed::Box, vec::Vec};
 
 #[cfg(test)]
 mod mock;
diff --git a/operator/precompiles/collective/src/mock.rs b/operator/precompiles/collective/src/mock.rs
index 8a27223ee..bbdf68330 100644
--- a/operator/precompiles/collective/src/mock.rs
+++ b/operator/precompiles/collective/src/mock.rs
@@ -143,6 +143,8 @@ impl pallet_evm::Config for Runtime {
     type GasWeightMapping = pallet_evm::FixedGasWeightMapping<Self>;
     type WeightPerGas = WeightPerGas;
     type CallOrigin = EnsureAddressRoot<AccountId>;
+    type CreateOriginFilter = ();
+    type CreateInnerOriginFilter = ();
     type WithdrawOrigin = EnsureAddressNever<AccountId>;
     type AddressMapping = AccountId;
     type Currency = Balances;
@@ -298,6 +300,7 @@ impl ExtBuilder {
 
         pallet_balances::GenesisConfig::<Runtime> {
             balances: self.balances.clone(),
+            dev_accounts: Default::default(),
         }
         .assimilate_storage(&mut t)
         .expect("Pallet balances storage can be assimilated");
diff --git a/operator/precompiles/conviction-voting/Cargo.toml b/operator/precompiles/conviction-voting/Cargo.toml
index 716d0247e..a0a91daef 100644
--- a/operator/precompiles/conviction-voting/Cargo.toml
+++ b/operator/precompiles/conviction-voting/Cargo.toml
@@ -15,7 +15,6 @@ pallet-conviction-voting = { workspace = true }
 parity-scale-codec = { workspace = true, features = ["derive"] }
 sp-core = { workspace = true }
 sp-runtime = { workspace = true }
-sp-std = { workspace = true }
 
 # Frontier
 fp-evm = { workspace = true }
@@ -44,7 +43,6 @@ std = [
 	"parity-scale-codec/std",
 	"precompile-utils/std",
 	"sp-runtime/std",
-	"sp-std/std",
 ]
 runtime-benchmarks = [
 	"frame-support/runtime-benchmarks",
diff --git a/operator/precompiles/conviction-voting/src/lib.rs b/operator/precompiles/conviction-voting/src/lib.rs
index e46fd8612..bfaffb2a6 100644
--- a/operator/precompiles/conviction-voting/src/lib.rs
+++ b/operator/precompiles/conviction-voting/src/lib.rs
@@ -15,11 +15,13 @@
 // along with Moonbeam.  If not, see <http://www.gnu.org/licenses/>.
 
 #![cfg_attr(not(feature = "std"), no_std)]
+extern crate alloc;
 
+use alloc::vec::Vec;
+use core::marker::PhantomData;
 use fp_evm::PrecompileHandle;
 use frame_support::dispatch::{GetDispatchInfo, PostDispatchInfo};
 use frame_support::traits::{Currency, Polling};
-use frame_system::pallet_prelude::BlockNumberFor;
 use pallet_conviction_voting::Call as ConvictionVotingCall;
 use pallet_conviction_voting::{
     AccountVote, Casting, ClassLocksFor, Conviction, Delegating, Tally, TallyOf, Vote, Voting,
@@ -29,8 +31,6 @@ use pallet_evm::{AddressMapping, Log};
 use precompile_utils::prelude::*;
 use sp_core::{Get, MaxEncodedLen, H160, H256, U256};
 use sp_runtime::traits::{Dispatchable, StaticLookup};
-use sp_std::marker::PhantomData;
-use sp_std::vec::Vec;
 
 #[cfg(test)]
 mod mock;
@@ -56,10 +56,10 @@ type ClassOf<Runtime> = <<Runtime as pallet_conviction_voting::Config>::Polls as
         <Runtime as pallet_conviction_voting::Config>::MaxTurnout,
     >,
 >>::Class;
-type VotingOf<Runtime> = Voting<
+type VotingOf<Runtime, Instance = ()> = Voting<
     BalanceOf<Runtime>,
     <Runtime as frame_system::Config>::AccountId,
-    BlockNumberFor<Runtime>,
+    pallet_conviction_voting::BlockNumberFor<Runtime, Instance>,
     <<Runtime as pallet_conviction_voting::Config>::Polls as Polling<TallyOf<Runtime>>>::Index,
     <Runtime as pallet_conviction_voting::Config>::MaxVotes,
 >;
@@ -109,18 +109,16 @@ impl<Runtime> ConvictionVotingPrecompile<Runtime>
 where
     Runtime: pallet_conviction_voting::Config + pallet_evm::Config + frame_system::Config,
     BalanceOf<Runtime>: TryFrom<U256> + Into<U256>,
-    <Runtime as frame_system::Config>::RuntimeCall:
-        Dispatchable<PostInfo = PostDispatchInfo> + GetDispatchInfo,
-    <<Runtime as frame_system::Config>::RuntimeCall as Dispatchable>::RuntimeOrigin:
-        From<Option<Runtime::AccountId>>,
+    Runtime::RuntimeCall: Dispatchable<PostInfo = PostDispatchInfo> + GetDispatchInfo,
+    <Runtime::RuntimeCall as Dispatchable>::RuntimeOrigin: From<Option<Runtime::AccountId>>,
     Runtime::AccountId: Into<H160>,
-    <Runtime as frame_system::Config>::RuntimeCall: From<ConvictionVotingCall<Runtime>>,
+    Runtime::RuntimeCall: From<ConvictionVotingCall<Runtime>>,
     IndexOf<Runtime>: TryFrom<u32> + TryInto<u32>,
     ClassOf<Runtime>: TryFrom<u16> + TryInto<u16>,
     <Runtime as pallet_conviction_voting::Config>::Polls: Polling<
         Tally<
             <<Runtime as pallet_conviction_voting::Config>::Currency as Currency<
-                <Runtime as frame_system::Config>::AccountId,
+                Runtime::AccountId,
             >>::Balance,
             <Runtime as pallet_conviction_voting::Config>::MaxTurnout,
         >,
diff --git a/operator/precompiles/conviction-voting/src/mock.rs b/operator/precompiles/conviction-voting/src/mock.rs
index b0e432752..cdff74bc4 100644
--- a/operator/precompiles/conviction-voting/src/mock.rs
+++ b/operator/precompiles/conviction-voting/src/mock.rs
@@ -16,6 +16,7 @@
 
 //! Test utilities
 use super::*;
+use alloc::collections::btree_map::BTreeMap;
 use frame_support::{
     construct_runtime, parameter_types,
     traits::{Everything, PollStatus, Polling, TotalIssuanceOf},
@@ -29,7 +30,6 @@ use sp_runtime::{
     traits::{BlakeTwo256, ConstU32, ConstU64, IdentityLookup},
     BuildStorage, DispatchError, Perbill,
 };
-use sp_std::collections::btree_map::BTreeMap;
 
 #[cfg(feature = "runtime-benchmarks")]
 use frame_support::traits::VoteTally;
@@ -133,6 +133,8 @@ impl pallet_evm::Config for Runtime {
     type GasWeightMapping = pallet_evm::FixedGasWeightMapping<Self>;
     type WeightPerGas = WeightPerGas;
     type CallOrigin = EnsureAddressRoot<AccountId>;
+    type CreateOriginFilter = ();
+    type CreateInnerOriginFilter = ();
     type WithdrawOrigin = EnsureAddressNever<AccountId>;
     type AddressMapping = AccountId;
     type Currency = Balances;
@@ -266,6 +268,8 @@ impl pallet_conviction_voting::Config for Runtime {
     type WeightInfo = ();
     type MaxTurnout = TotalIssuanceOf<Balances, Self::AccountId>;
     type Polls = TestPolls;
+    type BlockNumberProvider = frame_system::Pallet<Runtime>;
+    type VotingHooks = ();
 }
 
 pub(crate) struct ExtBuilder {
@@ -294,6 +298,7 @@ impl ExtBuilder {
 
         pallet_balances::GenesisConfig::<Runtime> {
             balances: self.balances.clone(),
+            dev_accounts: Default::default(),
         }
         .assimilate_storage(&mut t)
         .expect("Pallet balances storage can be assimilated");
diff --git a/operator/precompiles/conviction-voting/src/tests.rs b/operator/precompiles/conviction-voting/src/tests.rs
index 36f45fe15..32450ded6 100644
--- a/operator/precompiles/conviction-voting/src/tests.rs
+++ b/operator/precompiles/conviction-voting/src/tests.rs
@@ -45,6 +45,7 @@ fn evm_call(input: Vec<u8>) -> EvmCall<Runtime> {
         max_priority_fee_per_gas: Some(U256::zero()),
         nonce: None,
         access_list: Vec::new(),
+        authorization_list: Vec::new(),
     }
 }
 
diff --git a/operator/precompiles/datahaven-native-transfer/Cargo.toml b/operator/precompiles/datahaven-native-transfer/Cargo.toml
index bbc6fb044..c5812dbd5 100644
--- a/operator/precompiles/datahaven-native-transfer/Cargo.toml
+++ b/operator/precompiles/datahaven-native-transfer/Cargo.toml
@@ -13,7 +13,6 @@ parity-scale-codec = { workspace = true, features = ["max-encoded-len"] }
 sp-core = { workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
-sp-std = { workspace = true }
 
 # Frontier
 evm = { workspace = true, features = ["with-codec"] }
@@ -48,6 +47,5 @@ std = [
 	"sp-core/std",
 	"sp-io/std",
 	"sp-runtime/std",
-	"sp-std/std",
 ]
 
diff --git a/operator/precompiles/datahaven-native-transfer/src/lib.rs b/operator/precompiles/datahaven-native-transfer/src/lib.rs
index 6cff5810c..82a94696c 100644
--- a/operator/precompiles/datahaven-native-transfer/src/lib.rs
+++ b/operator/precompiles/datahaven-native-transfer/src/lib.rs
@@ -21,6 +21,7 @@
 
 #![cfg_attr(not(feature = "std"), no_std)]
 
+use core::marker::PhantomData;
 use fp_evm::PrecompileHandle;
 use frame_support::dispatch::{GetDispatchInfo, PostDispatchInfo};
 use frame_support::traits::fungible::Inspect;
@@ -31,7 +32,6 @@ use pallet_evm::AddressMapping;
 use precompile_utils::prelude::*;
 use sp_core::{H160, U256};
 use sp_runtime::traits::Dispatchable;
-use sp_std::marker::PhantomData;
 
 /// Solidity selector for the TokensLocked event:
 /// keccak256("TokensLocked(address,uint256)")
diff --git a/operator/precompiles/datahaven-native-transfer/src/mock.rs b/operator/precompiles/datahaven-native-transfer/src/mock.rs
index 48dc96271..ea2f26241 100644
--- a/operator/precompiles/datahaven-native-transfer/src/mock.rs
+++ b/operator/precompiles/datahaven-native-transfer/src/mock.rs
@@ -21,7 +21,7 @@ use super::*;
 use frame_support::traits::Everything;
 use frame_support::{construct_runtime, parameter_types, weights::Weight};
 use pallet_evm::{EnsureAddressNever, EnsureAddressRoot, FrameSystemAccountProvider};
-use parity_scale_codec::{Decode, Encode};
+use parity_scale_codec::{Decode, DecodeWithMemTracking, Encode};
 use precompile_utils::{mock_account, precompile_set::*, testing::MockAccount};
 use snowbridge_core::TokenId;
 use snowbridge_outbound_queue_primitives::v1::Ticket;
@@ -146,6 +146,8 @@ impl pallet_evm::Config for Runtime {
     type GasWeightMapping = pallet_evm::FixedGasWeightMapping<Self>;
     type WeightPerGas = WeightPerGas;
     type CallOrigin = EnsureAddressRoot<AccountId>;
+    type CreateOriginFilter = ();
+    type CreateInnerOriginFilter = ();
     type WithdrawOrigin = EnsureAddressNever<AccountId>;
     type AddressMapping = AccountId;
     type Currency = Balances;
@@ -194,7 +196,7 @@ impl SendMessage for MockOutboundQueue {
     }
 }
 
-#[derive(Clone, Encode, Decode)]
+#[derive(Clone, Encode, Decode, DecodeWithMemTracking)]
 pub struct MockTicket;
 
 impl Ticket for MockTicket {
@@ -272,6 +274,7 @@ impl ExtBuilder {
 
         pallet_balances::GenesisConfig::<Runtime> {
             balances: self.balances,
+            dev_accounts: Default::default(),
         }
         .assimilate_storage(&mut t)
         .expect("Pallet balances storage can be assimilated");
diff --git a/operator/precompiles/erc20-balances/Cargo.toml b/operator/precompiles/erc20-balances/Cargo.toml
index 787ee63d0..059b98da9 100644
--- a/operator/precompiles/erc20-balances/Cargo.toml
+++ b/operator/precompiles/erc20-balances/Cargo.toml
@@ -16,7 +16,6 @@ parity-scale-codec = { workspace = true, features = ["max-encoded-len"] }
 sp-core = { workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
-sp-std = { workspace = true }
 
 # Frontier
 fp-evm = { workspace = true }
@@ -46,5 +45,4 @@ std = [
         "precompile-utils/std",
         "sp-core/std",
         "sp-io/std",
-        "sp-std/std",
 ]
diff --git a/operator/precompiles/erc20-balances/src/eip2612.rs b/operator/precompiles/erc20-balances/src/eip2612.rs
index da764a45d..ec78e3168 100644
--- a/operator/precompiles/erc20-balances/src/eip2612.rs
+++ b/operator/precompiles/erc20-balances/src/eip2612.rs
@@ -15,6 +15,7 @@
 // along with Moonbeam.  If not, see <http://www.gnu.org/licenses/>.
 
 use super::*;
+use alloc::vec::Vec;
 use frame_support::{
     ensure,
     traits::{Get, Time},
@@ -22,7 +23,6 @@ use frame_support::{
 use sp_core::H256;
 use sp_io::hashing::keccak_256;
 use sp_runtime::traits::UniqueSaturatedInto;
-use sp_std::vec::Vec;
 
 /// EIP2612 permit typehash.
 pub const PERMIT_TYPEHASH: [u8; 32] = keccak256!(
@@ -39,9 +39,11 @@ pub struct Eip2612<Runtime, Metadata, Instance = ()>(PhantomData<(Runtime, Metad
 impl<Runtime, Metadata, Instance> Eip2612<Runtime, Metadata, Instance>
 where
     Runtime: pallet_balances::Config<Instance> + pallet_evm::Config,
-    Runtime::RuntimeCall: Dispatchable<PostInfo = PostDispatchInfo> + GetDispatchInfo,
-    Runtime::RuntimeCall: From<pallet_balances::Call<Runtime, Instance>>,
-    <Runtime::RuntimeCall as Dispatchable>::RuntimeOrigin: From<Option<Runtime::AccountId>>,
+    <Runtime as frame_system::Config>::RuntimeCall:
+        Dispatchable<PostInfo = PostDispatchInfo> + GetDispatchInfo,
+    <Runtime as frame_system::Config>::RuntimeCall: From<pallet_balances::Call<Runtime, Instance>>,
+    <<Runtime as frame_system::Config>::RuntimeCall as Dispatchable>::RuntimeOrigin:
+        From<Option<Runtime::AccountId>>,
     BalanceOf<Runtime, Instance>: TryFrom<U256> + Into<U256>,
     Metadata: Erc20Metadata,
     Instance: InstanceToPrefix + 'static,
diff --git a/operator/precompiles/erc20-balances/src/lib.rs b/operator/precompiles/erc20-balances/src/lib.rs
index af0a0032d..0c283970d 100644
--- a/operator/precompiles/erc20-balances/src/lib.rs
+++ b/operator/precompiles/erc20-balances/src/lib.rs
@@ -17,7 +17,10 @@
 //! Precompile to interact with pallet_balances instances using the ERC20 interface standard.
 
 #![cfg_attr(not(feature = "std"), no_std)]
+extern crate alloc;
 
+use core::convert::{TryFrom, TryInto};
+use core::marker::PhantomData;
 use fp_evm::PrecompileHandle;
 use frame_support::{
     dispatch::{GetDispatchInfo, PostDispatchInfo},
@@ -33,10 +36,6 @@ use pallet_balances::pallet::{
 use pallet_evm::AddressMapping;
 use precompile_utils::prelude::*;
 use sp_core::{H160, H256, U256};
-use sp_std::{
-    convert::{TryFrom, TryInto},
-    marker::PhantomData,
-};
 
 mod eip2612;
 use eip2612::Eip2612;
diff --git a/operator/precompiles/erc20-balances/src/mock.rs b/operator/precompiles/erc20-balances/src/mock.rs
index aaa2a64d4..35bc3727a 100644
--- a/operator/precompiles/erc20-balances/src/mock.rs
+++ b/operator/precompiles/erc20-balances/src/mock.rs
@@ -127,6 +127,8 @@ impl pallet_evm::Config for Runtime {
     type GasWeightMapping = pallet_evm::FixedGasWeightMapping<Self>;
     type WeightPerGas = WeightPerGas;
     type CallOrigin = EnsureAddressRoot<AccountId>;
+    type CreateOriginFilter = ();
+    type CreateInnerOriginFilter = ();
     type WithdrawOrigin = EnsureAddressNever<AccountId>;
     type AddressMapping = AccountId;
     type Currency = Balances;
@@ -207,6 +209,7 @@ impl ExtBuilder {
 
         pallet_balances::GenesisConfig::<Runtime> {
             balances: self.balances,
+            dev_accounts: Default::default(),
         }
         .assimilate_storage(&mut t)
         .expect("Pallet balances storage can be assimilated");
diff --git a/operator/precompiles/erc20-balances/src/tests.rs b/operator/precompiles/erc20-balances/src/tests.rs
index e4eb35c11..b14d8930b 100644
--- a/operator/precompiles/erc20-balances/src/tests.rs
+++ b/operator/precompiles/erc20-balances/src/tests.rs
@@ -280,7 +280,7 @@ fn transfer() {
                         value: 400.into(),
                     },
                 )
-                .expect_cost(176106756) // 1 weight => 1 gas in mock
+                .expect_cost(173835756) // 1 weight => 1 gas in mock
                 .expect_log(log3(
                     Precompile1,
                     SELECTOR_LOG_TRANSFER,
@@ -370,7 +370,7 @@ fn transfer_from() {
                         value: 400.into(),
                     },
                 )
-                .expect_cost(176106756) // 1 weight => 1 gas in mock
+                .expect_cost(173835756) // 1 weight => 1 gas in mock
                 .expect_log(log3(
                     Precompile1,
                     SELECTOR_LOG_TRANSFER,
@@ -466,7 +466,7 @@ fn transfer_from_self() {
                         value: 400.into(),
                     },
                 )
-                .expect_cost(176106756) // 1 weight => 1 gas in mock
+                .expect_cost(173835756) // 1 weight => 1 gas in mock
                 .expect_log(log3(
                     Precompile1,
                     SELECTOR_LOG_TRANSFER,
@@ -576,6 +576,7 @@ fn deposit(data: Vec<u8>) {
                 None,            // max priority
                 None,            // nonce
                 vec![],          // access list
+                vec![],          // authorization list
             )
             .expect("it works");
 
@@ -692,6 +693,7 @@ fn deposit_zero() {
                 None,          // max priority
                 None,          // nonce
                 vec![],        // access list
+                vec![],        // authorization list
             )
             .expect("it works");
 
diff --git a/operator/precompiles/identity/Cargo.toml b/operator/precompiles/identity/Cargo.toml
index 127e27074..0162614f6 100644
--- a/operator/precompiles/identity/Cargo.toml
+++ b/operator/precompiles/identity/Cargo.toml
@@ -14,7 +14,6 @@ parity-scale-codec = { workspace = true, features = [ "max-encoded-len" ] }
 sp-core = { workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
-sp-std = { workspace = true }
 pallet-identity = { workspace = true }
 
 # Frontier
@@ -22,6 +21,10 @@ fp-evm = { workspace = true }
 pallet-evm = { workspace = true, features = [ "forbid-evm-reentrancy" ] }
 precompile-utils = { workspace = true }
 
+# Temp
+## TODO/ remove it once we move to 2506
+serde = { workspace = true }
+
 [dev-dependencies]
 
 pallet-balances = { workspace = true, features = [ "std" ] }
@@ -47,7 +50,6 @@ std = [
 	"sp-core/std",
 	"sp-io/std",
 	"sp-runtime/std",
-	"sp-std/std",
 ]
 runtime-benchmarks = [
 	"frame-support/runtime-benchmarks",
diff --git a/operator/precompiles/identity/src/lib.rs b/operator/precompiles/identity/src/lib.rs
index 7b2e29ee7..113d434b0 100644
--- a/operator/precompiles/identity/src/lib.rs
+++ b/operator/precompiles/identity/src/lib.rs
@@ -20,6 +20,9 @@
 
 extern crate alloc;
 
+use alloc::boxed::Box;
+use alloc::vec::Vec;
+use core::marker::PhantomData;
 use fp_evm::PrecompileHandle;
 use frame_support::dispatch::{GetDispatchInfo, PostDispatchInfo};
 use frame_support::sp_runtime::traits::StaticLookup;
@@ -30,9 +33,6 @@ use parity_scale_codec::MaxEncodedLen;
 use precompile_utils::prelude::*;
 use sp_core::{ConstU32, Get, H160, H256, U256};
 use sp_runtime::traits::Dispatchable;
-use sp_std::boxed::Box;
-use sp_std::marker::PhantomData;
-use sp_std::vec::Vec;
 
 #[cfg(test)]
 mod mock;
@@ -78,8 +78,10 @@ where
         >,
     Runtime::AccountId: Into<H160>,
     Runtime::Hash: From<H256>,
-    Runtime::RuntimeCall: Dispatchable<PostInfo = PostDispatchInfo> + GetDispatchInfo,
-    <Runtime::RuntimeCall as Dispatchable>::RuntimeOrigin: From<Option<Runtime::AccountId>>,
+    <Runtime as frame_system::Config>::RuntimeCall:
+        Dispatchable<PostInfo = PostDispatchInfo> + GetDispatchInfo,
+    <<Runtime as frame_system::Config>::RuntimeCall as Dispatchable>::RuntimeOrigin:
+        From<Option<Runtime::AccountId>>,
     Runtime::RuntimeCall: From<pallet_identity::Call<Runtime>>,
     BalanceOf<Runtime>: TryFrom<U256> + Into<U256> + solidity::Codec,
     <Runtime as pallet_evm::Config>::AddressMapping: AddressMapping<Runtime::AccountId>,
diff --git a/operator/precompiles/identity/src/mock.rs b/operator/precompiles/identity/src/mock.rs
index b984730fe..e91b7a7b4 100644
--- a/operator/precompiles/identity/src/mock.rs
+++ b/operator/precompiles/identity/src/mock.rs
@@ -25,10 +25,12 @@ use frame_system::{EnsureRoot, EnsureSignedBy};
 use pallet_evm::{EnsureAddressNever, EnsureAddressRoot, FrameSystemAccountProvider};
 use pallet_identity::legacy::IdentityInfo;
 use precompile_utils::mock_account;
-use precompile_utils::{
-    precompile_set::*,
-    testing::{MockAccount, MockSignature},
-};
+use precompile_utils::testing::MockSigner;
+use precompile_utils::{precompile_set::*, testing::MockAccount};
+use scale_info::TypeInfo;
+use serde::{Deserialize, Serialize};
+use sp_core::keccak_256;
+use sp_core::{Decode, DecodeWithMemTracking, Encode};
 use sp_core::{H256, U256};
 use sp_runtime::{
     traits::{BlakeTwo256, IdentityLookup},
@@ -40,6 +42,60 @@ pub type Balance = u128;
 
 type Block = frame_system::mocking::MockBlockU32<Runtime>;
 
+// TODO: remove this chunk once we moved to 2506. `MockSignature` was missing the `DecodeWithMemTracking` trait in frontier 2503.
+// We should be able to use the one from frontier when migrating to 2506
+#[derive(
+    Eq,
+    PartialEq,
+    Clone,
+    Encode,
+    Decode,
+    DecodeWithMemTracking,
+    sp_core::RuntimeDebug,
+    TypeInfo,
+    Serialize,
+    Deserialize,
+)]
+pub struct MockSignature(sp_core::ecdsa::Signature);
+
+impl From<sp_core::ecdsa::Signature> for MockSignature {
+    fn from(x: sp_core::ecdsa::Signature) -> Self {
+        MockSignature(x)
+    }
+}
+
+impl From<sp_runtime::MultiSignature> for MockSignature {
+    fn from(signature: sp_runtime::MultiSignature) -> Self {
+        match signature {
+            sp_runtime::MultiSignature::Ed25519(_) => {
+                panic!("Ed25519 not supported for MockSignature")
+            }
+            sp_runtime::MultiSignature::Sr25519(_) => {
+                panic!("Sr25519 not supported for MockSignature")
+            }
+            sp_runtime::MultiSignature::Ecdsa(sig) => Self(sig),
+        }
+    }
+}
+
+impl sp_runtime::traits::Verify for MockSignature {
+    type Signer = MockSigner;
+    fn verify<L: sp_runtime::traits::Lazy<[u8]>>(&self, mut msg: L, signer: &MockAccount) -> bool {
+        let mut m = [0u8; 32];
+        m.copy_from_slice(keccak_256(msg.get()).as_slice());
+        match sp_io::crypto::secp256k1_ecdsa_recover(self.0.as_ref(), &m) {
+            Ok(pubkey) => {
+                MockAccount(sp_core::H160::from_slice(
+                    &keccak_256(&pubkey).as_slice()[12..32],
+                )) == *signer
+            }
+            Err(sp_io::EcdsaVerifyError::BadRS) => false,
+            Err(sp_io::EcdsaVerifyError::BadV) => false,
+            Err(sp_io::EcdsaVerifyError::BadSignature) => false,
+        }
+    }
+}
+
 construct_runtime!(
     pub enum Runtime	{
         System: frame_system,
@@ -136,6 +192,8 @@ impl pallet_evm::Config for Runtime {
     type GasWeightMapping = pallet_evm::FixedGasWeightMapping<Self>;
     type WeightPerGas = WeightPerGas;
     type CallOrigin = EnsureAddressRoot<AccountId>;
+    type CreateOriginFilter = ();
+    type CreateInnerOriginFilter = ();
     type WithdrawOrigin = EnsureAddressNever<AccountId>;
     type AddressMapping = AccountId;
     type Currency = Balances;
@@ -240,6 +298,7 @@ impl ExtBuilder {
 
         pallet_balances::GenesisConfig::<Runtime> {
             balances: self.balances.clone(),
+            dev_accounts: Default::default(),
         }
         .assimilate_storage(&mut t)
         .expect("Pallet balances storage can be assimilated");
diff --git a/operator/precompiles/identity/src/tests.rs b/operator/precompiles/identity/src/tests.rs
index 7efa15198..e3d25173e 100644
--- a/operator/precompiles/identity/src/tests.rs
+++ b/operator/precompiles/identity/src/tests.rs
@@ -49,6 +49,7 @@ fn evm_call(source: impl Into<H160>, input: Vec<u8>) -> EvmCall<Runtime> {
         max_priority_fee_per_gas: Some(U256::zero()),
         nonce: None,
         access_list: Vec::new(),
+        authorization_list: Vec::new(),
     }
 }
 
diff --git a/operator/precompiles/precompile-registry/src/lib.rs b/operator/precompiles/precompile-registry/src/lib.rs
index e81bb4770..5e52d3fbf 100644
--- a/operator/precompiles/precompile-registry/src/lib.rs
+++ b/operator/precompiles/precompile-registry/src/lib.rs
@@ -92,7 +92,7 @@ where
         // AccountCodes: Blake2128(16) + H160(20) + Vec(5)
         // We asume an existing precompile can hold at most 5 bytes worth of dummy code.
         handle.record_db_read::<Runtime>(41)?;
-        pallet_evm::Pallet::<Runtime>::create_account(address.0, DUMMY_CODE.to_vec());
+        let _ = pallet_evm::Pallet::<Runtime>::create_account(address.0, DUMMY_CODE.to_vec(), None);
 
         Ok(())
     }
diff --git a/operator/precompiles/precompile-registry/src/mock.rs b/operator/precompiles/precompile-registry/src/mock.rs
index 45f364ceb..c1a667807 100644
--- a/operator/precompiles/precompile-registry/src/mock.rs
+++ b/operator/precompiles/precompile-registry/src/mock.rs
@@ -127,6 +127,8 @@ impl pallet_evm::Config for Runtime {
     type GasWeightMapping = pallet_evm::FixedGasWeightMapping<Self>;
     type WeightPerGas = WeightPerGas;
     type CallOrigin = EnsureAddressRoot<AccountId>;
+    type CreateOriginFilter = ();
+    type CreateInnerOriginFilter = ();
     type WithdrawOrigin = EnsureAddressNever<AccountId>;
     type AddressMapping = AccountId;
     type Currency = Balances;
@@ -181,6 +183,7 @@ impl ExtBuilder {
 
         pallet_balances::GenesisConfig::<Runtime> {
             balances: self.balances,
+            dev_accounts: Default::default(),
         }
         .assimilate_storage(&mut t)
         .expect("Pallet balances storage can be assimilated");
@@ -191,6 +194,7 @@ impl ExtBuilder {
             pallet_evm::Pallet::<Runtime>::create_account(
                 SmartContract.into(),
                 b"SmartContract".to_vec(),
+                None,
             );
         });
         ext
diff --git a/operator/precompiles/preimage/Cargo.toml b/operator/precompiles/preimage/Cargo.toml
index 757540bd9..a59887460 100644
--- a/operator/precompiles/preimage/Cargo.toml
+++ b/operator/precompiles/preimage/Cargo.toml
@@ -14,7 +14,6 @@ pallet-preimage = { workspace = true }
 parity-scale-codec = { workspace = true, features = ["derive"] }
 sp-core = { workspace = true }
 sp-runtime = { workspace = true }
-sp-std = { workspace = true }
 
 # Frontier
 fp-evm = { workspace = true }
@@ -41,8 +40,6 @@ std = [
 	"pallet-evm/std",
 	"pallet-preimage/std",
 	"parity-scale-codec/std",
-	"parity-scale-codec/std",
 	"precompile-utils/std",
 	"sp-runtime/std",
-	"sp-std/std",
 ]
diff --git a/operator/precompiles/preimage/src/lib.rs b/operator/precompiles/preimage/src/lib.rs
index 4a93a378c..d5133e125 100644
--- a/operator/precompiles/preimage/src/lib.rs
+++ b/operator/precompiles/preimage/src/lib.rs
@@ -15,7 +15,10 @@
 // along with Moonbeam.  If not, see <http://www.gnu.org/licenses/>.
 
 #![cfg_attr(not(feature = "std"), no_std)]
+extern crate alloc;
 
+use alloc::vec::Vec;
+use core::marker::PhantomData;
 use fp_evm::PrecompileHandle;
 use frame_support::dispatch::{GetDispatchInfo, PostDispatchInfo};
 use frame_support::traits::ConstU32;
@@ -24,7 +27,6 @@ use pallet_preimage::Call as PreimageCall;
 use precompile_utils::prelude::*;
 use sp_core::{Hasher, H256};
 use sp_runtime::traits::Dispatchable;
-use sp_std::{marker::PhantomData, vec::Vec};
 
 #[cfg(test)]
 mod mock;
diff --git a/operator/precompiles/preimage/src/mock.rs b/operator/precompiles/preimage/src/mock.rs
index 2c520ef1d..6bb4279ae 100644
--- a/operator/precompiles/preimage/src/mock.rs
+++ b/operator/precompiles/preimage/src/mock.rs
@@ -125,6 +125,8 @@ impl pallet_evm::Config for Runtime {
     type GasWeightMapping = pallet_evm::FixedGasWeightMapping<Self>;
     type WeightPerGas = WeightPerGas;
     type CallOrigin = EnsureAddressRoot<AccountId>;
+    type CreateOriginFilter = ();
+    type CreateInnerOriginFilter = ();
     type WithdrawOrigin = EnsureAddressNever<AccountId>;
     type AddressMapping = AccountId;
     type Currency = Balances;
@@ -187,6 +189,7 @@ impl ExtBuilder {
 
         pallet_balances::GenesisConfig::<Runtime> {
             balances: self.balances,
+            dev_accounts: Default::default(),
         }
         .assimilate_storage(&mut t)
         .expect("Pallet balances storage can be assimilated");
diff --git a/operator/precompiles/preimage/src/tests.rs b/operator/precompiles/preimage/src/tests.rs
index 626c22f4a..dddddd7f0 100644
--- a/operator/precompiles/preimage/src/tests.rs
+++ b/operator/precompiles/preimage/src/tests.rs
@@ -34,6 +34,7 @@ fn evm_call(input: Vec<u8>) -> EvmCall<Runtime> {
         max_priority_fee_per_gas: Some(U256::zero()),
         nonce: None,
         access_list: Vec::new(),
+        authorization_list: Vec::new(),
     }
 }
 
diff --git a/operator/precompiles/proxy/Cargo.toml b/operator/precompiles/proxy/Cargo.toml
index 6760477d7..c2dda3442 100644
--- a/operator/precompiles/proxy/Cargo.toml
+++ b/operator/precompiles/proxy/Cargo.toml
@@ -15,7 +15,6 @@ pallet-proxy = { workspace = true }
 parity-scale-codec = { workspace = true, features = ["derive"] }
 sp-core = { workspace = true }
 sp-runtime = { workspace = true }
-sp-std = { workspace = true }
 
 # Frontier
 evm = { workspace = true, features = ["with-codec"] }
@@ -47,5 +46,4 @@ std = [
 	"precompile-utils/std",
 	"sp-core/std",
 	"sp-runtime/std",
-	"sp-std/std",
 ]
\ No newline at end of file
diff --git a/operator/precompiles/proxy/src/lib.rs b/operator/precompiles/proxy/src/lib.rs
index 031e6afc7..bb54449e9 100644
--- a/operator/precompiles/proxy/src/lib.rs
+++ b/operator/precompiles/proxy/src/lib.rs
@@ -15,7 +15,10 @@
 // along with Moonbeam.  If not, see <http://www.gnu.org/licenses/>.
 
 #![cfg_attr(not(feature = "std"), no_std)]
+extern crate alloc;
 
+use alloc::vec::Vec;
+use core::marker::PhantomData;
 use evm::ExitReason;
 use fp_evm::{
     Context, PrecompileFailure, PrecompileHandle, Transfer, ACCOUNT_CODES_METADATA_PROOF_SIZE,
@@ -33,7 +36,6 @@ use sp_runtime::{
     traits::{ConstU32, Dispatchable, StaticLookup, Zero},
     SaturatedConversion,
 };
-use sp_std::marker::PhantomData;
 
 /// System account size in bytes = Pallet_Name_Hash (16) + Storage_name_hash (16) +
 /// Blake2_128Concat (16) + AccountId (20) + AccountInfo (4 + 12 + AccountData (4* 16)) = 148
@@ -57,11 +59,12 @@ where
     <Runtime as frame_system::Config>::RuntimeCall:
         Dispatchable<PostInfo = PostDispatchInfo> + GetDispatchInfo,
     <<Runtime as frame_system::Config>::RuntimeCall as Dispatchable>::RuntimeOrigin:
-        From<Option<Runtime::AccountId>>,
+        From<Option<<Runtime as frame_system::Config>::AccountId>>,
     <Runtime as frame_system::Config>::RuntimeCall:
         From<ProxyCall<Runtime>> + From<BalancesCall<Runtime>>,
     <Runtime as pallet_balances::Config<()>>::Balance: TryFrom<U256> + Into<U256>,
-    <Runtime as pallet_evm::Config>::AddressMapping: AddressMapping<Runtime::AccountId>,
+    <Runtime as pallet_evm::Config>::AddressMapping:
+        AddressMapping<<Runtime as frame_system::Config>::AccountId>,
 {
     fn is_allowed(_caller: H160, selector: Option<u32>) -> bool {
         match selector {
@@ -85,16 +88,17 @@ where
     Runtime:
         pallet_proxy::Config + pallet_evm::Config + frame_system::Config + pallet_balances::Config,
     <<Runtime as pallet_proxy::Config>::RuntimeCall as Dispatchable>::RuntimeOrigin:
-        From<Option<Runtime::AccountId>>,
+        From<Option<<Runtime as frame_system::Config>::AccountId>>,
     <Runtime as pallet_proxy::Config>::ProxyType: Decode + EvmProxyCallFilter,
     <Runtime as frame_system::Config>::RuntimeCall:
         Dispatchable<PostInfo = PostDispatchInfo> + GetDispatchInfo,
     <<Runtime as frame_system::Config>::RuntimeCall as Dispatchable>::RuntimeOrigin:
-        From<Option<Runtime::AccountId>>,
+        From<Option<<Runtime as frame_system::Config>::AccountId>>,
     <Runtime as frame_system::Config>::RuntimeCall:
         From<ProxyCall<Runtime>> + From<BalancesCall<Runtime>>,
     <Runtime as pallet_balances::Config<()>>::Balance: TryFrom<U256> + Into<U256>,
-    <Runtime as pallet_evm::Config>::AddressMapping: AddressMapping<Runtime::AccountId>,
+    <Runtime as pallet_evm::Config>::AddressMapping:
+        AddressMapping<<Runtime as frame_system::Config>::AccountId>,
 {
     fn is_allowed(_caller: H160, selector: Option<u32>) -> bool {
         match selector {
@@ -147,16 +151,17 @@ where
     Runtime:
         pallet_proxy::Config + pallet_evm::Config + frame_system::Config + pallet_balances::Config,
     <<Runtime as pallet_proxy::Config>::RuntimeCall as Dispatchable>::RuntimeOrigin:
-        From<Option<Runtime::AccountId>>,
+        From<Option<<Runtime as frame_system::Config>::AccountId>>,
     <Runtime as pallet_proxy::Config>::ProxyType: Decode + EvmProxyCallFilter,
     <Runtime as frame_system::Config>::RuntimeCall:
         Dispatchable<PostInfo = PostDispatchInfo> + GetDispatchInfo,
     <<Runtime as frame_system::Config>::RuntimeCall as Dispatchable>::RuntimeOrigin:
-        From<Option<Runtime::AccountId>>,
+        From<Option<<Runtime as frame_system::Config>::AccountId>>,
     <Runtime as frame_system::Config>::RuntimeCall:
         From<ProxyCall<Runtime>> + From<BalancesCall<Runtime>>,
     <Runtime as pallet_balances::Config<()>>::Balance: TryFrom<U256> + Into<U256>,
-    <Runtime as pallet_evm::Config>::AddressMapping: AddressMapping<Runtime::AccountId>,
+    <Runtime as pallet_evm::Config>::AddressMapping:
+        AddressMapping<<Runtime as frame_system::Config>::AccountId>,
 {
     /// Register a proxy account for the sender that is able to make calls on its behalf.
     /// The dispatch origin for this call must be Signed.
@@ -198,8 +203,8 @@ where
             return Err(revert("Cannot add more than one proxy"));
         }
 
-        let delegate: <Runtime::Lookup as StaticLookup>::Source =
-            Runtime::Lookup::unlookup(delegate.clone());
+        let delegate: <<Runtime as frame_system::Config>::Lookup as StaticLookup>::Source =
+            <Runtime as frame_system::Config>::Lookup::unlookup(delegate.clone());
         let call: ProxyCall<Runtime> = ProxyCall::<Runtime>::add_proxy {
             delegate,
             proxy_type,
@@ -233,8 +238,8 @@ where
             })?;
         let delay = delay.into();
 
-        let delegate: <Runtime::Lookup as StaticLookup>::Source =
-            Runtime::Lookup::unlookup(delegate.clone());
+        let delegate: <<Runtime as frame_system::Config>::Lookup as StaticLookup>::Source =
+            <Runtime as frame_system::Config>::Lookup::unlookup(delegate.clone());
         let origin = Runtime::AddressMapping::into_account_id(handle.context().caller);
         let call: ProxyCall<Runtime> = ProxyCall::<Runtime>::remove_proxy {
             delegate,
@@ -413,7 +418,7 @@ where
         let transfer = if value.is_zero() {
             None
         } else {
-            let contract_address: Runtime::AccountId =
+            let contract_address: <Runtime as frame_system::Config>::AccountId =
                 Runtime::AddressMapping::into_account_id(handle.context().address);
 
             // Send back funds received by the precompile.
@@ -421,12 +426,12 @@ where
                 handle,
                 Some(contract_address).into(),
                 pallet_balances::Call::<Runtime>::transfer_allow_death {
-                    dest: Runtime::Lookup::unlookup(who),
+                    dest: <Runtime as frame_system::Config>::Lookup::unlookup(who),
                     value: {
                         let balance: <Runtime as pallet_balances::Config<()>>::Balance =
                             value.try_into().map_err(|_| PrecompileFailure::Revert {
                                 exit_status: fp_evm::ExitRevert::Reverted,
-                                output: sp_std::vec::Vec::new(),
+                                output: Vec::new(),
                             })?;
                         balance
                     },
diff --git a/operator/precompiles/proxy/src/mock.rs b/operator/precompiles/proxy/src/mock.rs
index 3985182ee..394a1787f 100644
--- a/operator/precompiles/proxy/src/mock.rs
+++ b/operator/precompiles/proxy/src/mock.rs
@@ -168,6 +168,8 @@ impl pallet_evm::Config for Runtime {
     type GasWeightMapping = pallet_evm::FixedGasWeightMapping<Self>;
     type WeightPerGas = WeightPerGas;
     type CallOrigin = EnsureAddressAlways;
+    type CreateOriginFilter = ();
+    type CreateInnerOriginFilter = ();
     type WithdrawOrigin = EnsureAddressNever<AccountId>;
     type AddressMapping = AccountId;
     type Currency = Balances;
@@ -269,6 +271,7 @@ impl pallet_proxy::Config for Runtime {
     type CallHasher = BlakeTwo256;
     type AnnouncementDepositBase = ();
     type AnnouncementDepositFactor = ();
+    type BlockNumberProvider = ();
 }
 
 /// Build test externalities, prepopulated with data for testing democracy precompiles
@@ -298,6 +301,7 @@ impl ExtBuilder {
 
         pallet_balances::GenesisConfig::<Runtime> {
             balances: self.balances.clone(),
+            dev_accounts: Default::default(),
         }
         .assimilate_storage(&mut t)
         .expect("Pallet balances storage can be assimilated");
diff --git a/operator/precompiles/proxy/src/tests.rs b/operator/precompiles/proxy/src/tests.rs
index b7d7c906a..bf3a60b6f 100644
--- a/operator/precompiles/proxy/src/tests.rs
+++ b/operator/precompiles/proxy/src/tests.rs
@@ -551,6 +551,7 @@ fn test_nested_evm_bypass_proxy_should_allow_elevating_proxy_type() {
                 max_priority_fee_per_gas: Some(U256::zero()),
                 nonce: None,
                 access_list: Vec::new(),
+                authorization_list: Vec::new(),
             });
 
             // call the evm call in a proxy call
@@ -603,19 +604,20 @@ fn fails_if_called_by_smart_contract() {
 
 #[test]
 fn succeed_if_called_by_precompile() {
+    // AddressU64<2> is registered in the precompile set as RevertPrecompile and is the only
+    // precompile allowed to call Proxy via CallableByPrecompile<OnlyFrom<AddressU64<2>>>.
+    let precompile2 = MockAccount::from_u64(2);
     ExtBuilder::default()
-        .with_balances(vec![(Alice.into(), 1000), (Bob.into(), 1000)])
+        .with_balances(vec![
+            (Alice.into(), 1000),
+            (Bob.into(), 1000),
+            (precompile2.into(), 1000),
+        ])
         .build()
         .execute_with(|| {
-            // Set dummy code to Alice address as it if was a precompile.
-            pallet_evm::AccountCodes::<Runtime>::insert(
-                H160::from(Alice),
-                vec![0x60, 0x00, 0x60, 0x00, 0xfd],
-            );
-
             PrecompilesValue::get()
                 .prepare_test(
-                    Alice,
+                    precompile2,
                     Precompile1,
                     PCall::add_proxy {
                         delegate: Address(Bob.into()),
diff --git a/operator/precompiles/referenda/Cargo.toml b/operator/precompiles/referenda/Cargo.toml
index e8451753d..0e2b79dc0 100644
--- a/operator/precompiles/referenda/Cargo.toml
+++ b/operator/precompiles/referenda/Cargo.toml
@@ -15,7 +15,6 @@ pallet-referenda = { workspace = true }
 parity-scale-codec = { workspace = true, features = ["derive"] }
 sp-core = { workspace = true }
 sp-runtime = { workspace = true }
-sp-std = { workspace = true }
 
 # Frontier
 fp-evm = { workspace = true }
@@ -47,7 +46,6 @@ std = [
 	"parity-scale-codec/std",
 	"precompile-utils/std",
 	"sp-runtime/std",
-	"sp-std/std",
 ]
 runtime-benchmarks = [
 	"frame-support/runtime-benchmarks",
diff --git a/operator/precompiles/referenda/src/lib.rs b/operator/precompiles/referenda/src/lib.rs
index d56877749..bd6bfa976 100644
--- a/operator/precompiles/referenda/src/lib.rs
+++ b/operator/precompiles/referenda/src/lib.rs
@@ -15,7 +15,11 @@
 // along with Moonbeam.  If not, see <http://www.gnu.org/licenses/>.
 
 #![cfg_attr(not(feature = "std"), no_std)]
+extern crate alloc;
 
+use alloc::boxed::Box;
+use alloc::vec::Vec;
+use core::{marker::PhantomData, str::FromStr};
 use fp_evm::PrecompileHandle;
 use frame_support::dispatch::{GetDispatchInfo, PostDispatchInfo};
 use frame_support::traits::{
@@ -29,8 +33,8 @@ use pallet_referenda::{
 use parity_scale_codec::{Encode, MaxEncodedLen};
 use precompile_utils::prelude::*;
 use sp_core::{H160, H256, U256};
+use sp_runtime::str_array;
 use sp_runtime::traits::Dispatchable;
-use sp_std::{boxed::Box, marker::PhantomData, str::FromStr, vec::Vec};
 
 #[cfg(test)]
 mod mock;
@@ -39,7 +43,7 @@ mod tests;
 
 pub const CALL_DATA_LIMIT: u32 = 2u32.pow(16);
 
-type BlockNumberFor<T> = frame_system::pallet_prelude::BlockNumberFor<T>;
+type BlockNumberFor<T> = pallet_referenda::BlockNumberFor<T, ()>;
 type BalanceOf<Runtime> = <<Runtime as pallet_referenda::Config>::Currency as Currency<
     <Runtime as frame_system::Config>::AccountId,
 >>::Balance;
@@ -202,7 +206,7 @@ where
     fn track_ids(_handle: &mut impl PrecompileHandle) -> EvmResult<Vec<u16>> {
         let track_ids: Vec<u16> = Runtime::Tracks::tracks()
             .into_iter()
-            .filter_map(|(track_id, _)| (*track_id).try_into().ok())
+            .filter_map(|track| track.id.try_into().ok())
             .collect();
 
         Ok(track_ids)
@@ -215,21 +219,18 @@ where
             .try_into()
             .map_err(|_| RevertReason::value_is_too_large("Track id type").into())
             .in_field("trackId")?;
-        let (_, track_info) = Runtime::Tracks::tracks()
-            .iter()
-            .find(|(id, _)| *id == track_id)
+        let track = Runtime::Tracks::tracks()
+            .find(|track| track.id == track_id)
             .ok_or(RevertReason::custom("No such track").in_field("trackId"))?;
+        let track_info = &track.info;
 
         // trim the nulls bytes at the end of the name
         // caused by this https://github.com/paritytech/polkadot-sdk/pull/2072
         let track_name_trimmed: &[u8] = track_info
             .name
-            .as_bytes()
             .iter()
             .rposition(|&b| b != 0)
-            .map_or(track_info.name.as_bytes(), |pos| {
-                &track_info.name.as_bytes()[..=pos]
-            });
+            .map_or(&[], |pos| &track_info.name[..=pos]);
 
         Ok(TrackInfo {
             name: track_name_trimmed.into(),
@@ -246,19 +247,22 @@ where
 
     /// Use Runtime::Tracks::tracks to get the origin for input trackId
     fn track_id_to_origin(track_id: TrackIdOf<Runtime>) -> EvmResult<Box<OriginOf<Runtime>>> {
-        let (_, track_info) = Runtime::Tracks::tracks()
-            .iter()
-            .find(|(id, _)| *id == track_id)
+        let track = Runtime::Tracks::tracks()
+            .find(|track| track.id == track_id)
             .ok_or(RevertReason::custom("No such track").in_field("trackId"))?;
-        let origin = if track_info.name == "root" {
+        let track_info = &track.info;
+
+        let origin = if track_info.name == str_array("root") {
             frame_system::RawOrigin::Root.into()
         } else {
-            GovOrigin::from_str(track_info.name)
-                .map_err(|_| {
-                    RevertReason::custom("Custom origin does not exist for {track_info.name}")
-                        .in_field("trackId")
-                })?
-                .into()
+            GovOrigin::from_str(str::from_utf8(&track_info.name).map_err(|_| {
+                RevertReason::custom("Track name is not valid UTF-8").in_field("trackId")
+            })?)
+            .map_err(|_| {
+                RevertReason::custom("Custom origin does not exist for {track_info.name}")
+                    .in_field("trackId")
+            })?
+            .into()
         };
         Ok(Box::new(origin))
     }
diff --git a/operator/precompiles/referenda/src/mock.rs b/operator/precompiles/referenda/src/mock.rs
index 661c11db5..903f476fb 100644
--- a/operator/precompiles/referenda/src/mock.rs
+++ b/operator/precompiles/referenda/src/mock.rs
@@ -18,6 +18,7 @@
 
 use super::*;
 
+use alloc::borrow::Cow;
 use frame_support::pallet_prelude::*;
 use frame_support::traits::VoteTally;
 use frame_support::{
@@ -29,6 +30,7 @@ use frame_system::RawOrigin;
 use pallet_evm::{
     EnsureAddressNever, EnsureAddressRoot, FrameSystemAccountProvider, SubstrateBlockHashMapping,
 };
+use pallet_referenda::Track;
 use pallet_referenda::{Curve, TrackInfo, TracksInfo};
 use precompile_utils::{precompile_set::*, testing::MockAccount};
 use sp_core::{H256, U256};
@@ -36,7 +38,7 @@ use sp_runtime::{
     traits::{BlakeTwo256, IdentityLookup},
     BuildStorage, Perbill,
 };
-use sp_std::{str::FromStr, vec::Vec};
+use std::{str::FromStr, vec::Vec};
 
 pub type AccountId = MockAccount;
 pub type Balance = u128;
@@ -164,6 +166,8 @@ impl pallet_evm::Config for Runtime {
     type GasWeightMapping = pallet_evm::FixedGasWeightMapping<Self>;
     type WeightPerGas = WeightPerGas;
     type CallOrigin = EnsureAddressRoot<AccountId>;
+    type CreateOriginFilter = ();
+    type CreateInnerOriginFilter = ();
     type WithdrawOrigin = EnsureAddressNever<AccountId>;
     type AddressMapping = AccountId;
     type Currency = Balances;
@@ -217,6 +221,7 @@ impl pallet_scheduler::Config for Runtime {
     type WeightInfo = ();
     type OriginPrivilegeCmp = EqualPrivilegeOnly;
     type Preimages = Preimage;
+    type BlockNumberProvider = ();
 }
 
 // Preimage configuration
@@ -244,7 +249,9 @@ parameter_types! {
 pub struct TestTracksInfo;
 
 // Simple tally implementation for testing
-#[derive(Debug, Clone, PartialEq, Eq, Encode, Decode, TypeInfo, MaxEncodedLen)]
+#[derive(
+    Debug, Clone, PartialEq, Eq, Encode, Decode, DecodeWithMemTracking, TypeInfo, MaxEncodedLen,
+)]
 pub struct Tally {
     pub ayes: u128,
     pub nays: u128,
@@ -274,7 +281,7 @@ impl Get<Vec<(u8, TrackInfo<Balance, u32>)>> for TestTracksInfo {
             (
                 0,
                 TrackInfo {
-                    name: "root",
+                    name: str_array("root"),
                     max_deciding: 1,
                     decision_deposit: 10,
                     prepare_period: 2,
@@ -296,7 +303,7 @@ impl Get<Vec<(u8, TrackInfo<Balance, u32>)>> for TestTracksInfo {
             (
                 1,
                 TrackInfo {
-                    name: "none",
+                    name: str_array("none"),
                     max_deciding: 1,
                     decision_deposit: 10,
                     prepare_period: 2,
@@ -323,12 +330,12 @@ impl TracksInfo<Balance, u32> for TestTracksInfo {
     type Id = u8;
     type RuntimeOrigin = OriginCaller;
 
-    fn tracks() -> &'static [(Self::Id, TrackInfo<Balance, u32>)] {
-        static TRACKS: &[(u8, TrackInfo<Balance, u32>)] = &[
-            (
-                0,
-                TrackInfo {
-                    name: "root",
+    fn tracks() -> impl Iterator<Item = Cow<'static, Track<Self::Id, Balance, u32>>> {
+        static DATA: [Track<u8, u128, u32>; 2] = [
+            Track {
+                id: 0,
+                info: TrackInfo {
+                    name: str_array("root"),
                     max_deciding: 1,
                     decision_deposit: 10,
                     prepare_period: 2,
@@ -346,11 +353,11 @@ impl TracksInfo<Balance, u32> for TestTracksInfo {
                         ceil: Perbill::from_percent(50),
                     },
                 },
-            ),
-            (
-                1,
-                TrackInfo {
-                    name: "none",
+            },
+            Track {
+                id: 1,
+                info: TrackInfo {
+                    name: str_array("none"),
                     max_deciding: 1,
                     decision_deposit: 10,
                     prepare_period: 2,
@@ -368,9 +375,9 @@ impl TracksInfo<Balance, u32> for TestTracksInfo {
                         ceil: Perbill::from_percent(50),
                     },
                 },
-            ),
+            },
         ];
-        TRACKS
+        DATA.iter().map(Cow::Borrowed)
     }
 
     fn track_for(origin: &Self::RuntimeOrigin) -> Result<Self::Id, ()> {
@@ -399,6 +406,7 @@ impl pallet_referenda::Config for Runtime {
     type AlarmInterval = ();
     type Tracks = TestTracksInfo;
     type Preimages = Preimage;
+    type BlockNumberProvider = ();
 }
 
 pub(crate) struct ExtBuilder {
@@ -425,6 +433,7 @@ impl ExtBuilder {
 
         pallet_balances::GenesisConfig::<Runtime> {
             balances: self.balances,
+            dev_accounts: Default::default(),
         }
         .assimilate_storage(&mut t)
         .expect("Pallet balances storage can be assimilated");
diff --git a/operator/precompiles/referenda/src/tests.rs b/operator/precompiles/referenda/src/tests.rs
index 028a08cad..0a9c18622 100644
--- a/operator/precompiles/referenda/src/tests.rs
+++ b/operator/precompiles/referenda/src/tests.rs
@@ -42,6 +42,7 @@ fn evm_call(input: Vec<u8>) -> EvmCall<Runtime> {
         max_priority_fee_per_gas: Some(U256::zero()),
         nonce: None,
         access_list: Vec::new(),
+        authorization_list: Vec::new(),
     }
 }
 
@@ -295,7 +296,7 @@ fn submit_track_id_oob_fails() {
         .execute_with(|| {
             let proposal = vec![1, 2, 3];
             let proposal_hash = sp_runtime::traits::BlakeTwo256::hash(&proposal);
-            let oob_track_id = <Runtime as pallet_referenda::Config>::Tracks::tracks().len();
+            let oob_track_id = <Runtime as pallet_referenda::Config>::Tracks::tracks().count();
 
             // submit with an invalid track_id
             let input: Vec<u8> = PCall::submit_at {
diff --git a/operator/primitives/bridge/Cargo.toml b/operator/primitives/bridge/Cargo.toml
index 135bbcdf1..e00ca4d2d 100644
--- a/operator/primitives/bridge/Cargo.toml
+++ b/operator/primitives/bridge/Cargo.toml
@@ -16,7 +16,6 @@ parity-scale-codec = { workspace = true }
 snowbridge-core = { workspace = true }
 snowbridge-inbound-queue-primitives = { workspace = true }
 sp-core = { workspace = true }
-sp-std = { workspace = true }
 hex = { workspace = true }
 
 [features]
@@ -29,6 +28,5 @@ std = [
     "pallet-external-validators/std",
     "pallet-datahaven-native-transfer/std",
     "sp-core/std",
-    "sp-std/std",
     "snowbridge-inbound-queue-primitives/std",
 ]
diff --git a/operator/primitives/bridge/src/lib.rs b/operator/primitives/bridge/src/lib.rs
index ab8fcad07..c467312f9 100644
--- a/operator/primitives/bridge/src/lib.rs
+++ b/operator/primitives/bridge/src/lib.rs
@@ -15,14 +15,15 @@
 // along with DataHaven.  If not, see <http://www.gnu.org/licenses/>.
 
 #![cfg_attr(not(feature = "std"), no_std)]
+extern crate alloc;
 
+use alloc::vec::Vec;
 use frame_support::pallet_prelude::*;
 use parity_scale_codec::DecodeAll;
 use snowbridge_inbound_queue_primitives::v2::{
     EthereumAsset, Message as SnowbridgeMessage, MessageProcessor,
 };
 use sp_core::H160;
-use sp_std::vec::Vec;
 
 // Message ID. This is not expected to change and its arbitrary bytes defined here.
 // It should match the EL_MESSAGE_ID in DataHavenSnowbridgeMessages.sol
diff --git a/operator/primitives/snowbridge/beacon/Cargo.toml b/operator/primitives/snowbridge/beacon/Cargo.toml
index b22e6e6ed..42a3c2125 100644
--- a/operator/primitives/snowbridge/beacon/Cargo.toml
+++ b/operator/primitives/snowbridge/beacon/Cargo.toml
@@ -24,7 +24,6 @@ frame-support = { workspace = true }
 sp-core = { workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
-sp-std = { workspace = true }
 
 byte-slice-cast = { workspace = true }
 ssz_rs = { workspace = true }
@@ -51,6 +50,5 @@ std = [
     "sp-core/std",
     "sp-io/std",
     "sp-runtime/std",
-    "sp-std/std",
     "ssz_rs/std",
 ]
diff --git a/operator/primitives/snowbridge/beacon/src/bits.rs b/operator/primitives/snowbridge/beacon/src/bits.rs
index 6c5e9e161..42bc8a22d 100644
--- a/operator/primitives/snowbridge/beacon/src/bits.rs
+++ b/operator/primitives/snowbridge/beacon/src/bits.rs
@@ -1,6 +1,6 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2023 Snowfork <hello@snowfork.com>
-use sp_std::prelude::*;
+use alloc::vec::Vec;
 use ssz_rs::{Bitvector, Deserialize};
 
 pub fn decompress_sync_committee_bits<
diff --git a/operator/primitives/snowbridge/beacon/src/bls.rs b/operator/primitives/snowbridge/beacon/src/bls.rs
index c96d1d024..8669a459f 100644
--- a/operator/primitives/snowbridge/beacon/src/bls.rs
+++ b/operator/primitives/snowbridge/beacon/src/bls.rs
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2023 Snowfork <hello@snowfork.com>
 use crate::{PublicKey, Signature};
+use alloc::vec::Vec;
 use codec::{Decode, DecodeWithMemTracking, Encode};
 use frame_support::{ensure, PalletError};
 pub use milagro_bls::{
@@ -10,7 +11,6 @@ pub use milagro_bls::{
 use scale_info::TypeInfo;
 use sp_core::H256;
 use sp_runtime::RuntimeDebug;
-use sp_std::prelude::*;
 
 #[derive(
     Copy,
diff --git a/operator/primitives/snowbridge/beacon/src/lib.rs b/operator/primitives/snowbridge/beacon/src/lib.rs
index 7afb8f213..a36952862 100644
--- a/operator/primitives/snowbridge/beacon/src/lib.rs
+++ b/operator/primitives/snowbridge/beacon/src/lib.rs
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2023 Snowfork <hello@snowfork.com>
 #![cfg_attr(not(feature = "std"), no_std)]
+extern crate alloc;
 
 pub mod bits;
 pub mod bls;
diff --git a/operator/primitives/snowbridge/beacon/src/receipt.rs b/operator/primitives/snowbridge/beacon/src/receipt.rs
index 60e7744c2..3f57681b2 100644
--- a/operator/primitives/snowbridge/beacon/src/receipt.rs
+++ b/operator/primitives/snowbridge/beacon/src/receipt.rs
@@ -1,8 +1,9 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2023 Snowfork <hello@snowfork.com>
+use alloc::boxed::Box;
+use alloc::vec::Vec;
 use sp_core::H256;
 use sp_io::hashing::keccak_256;
-use sp_std::prelude::*;
 
 use snowbridge_ethereum::{mpt, Receipt};
 
diff --git a/operator/primitives/snowbridge/beacon/src/serde_utils.rs b/operator/primitives/snowbridge/beacon/src/serde_utils.rs
index ac0b506ae..5e09d27d5 100644
--- a/operator/primitives/snowbridge/beacon/src/serde_utils.rs
+++ b/operator/primitives/snowbridge/beacon/src/serde_utils.rs
@@ -100,7 +100,7 @@ pub struct HexVisitor<const LENGTH: usize>();
 impl<'de, const LENGTH: usize> serde::de::Visitor<'de> for HexVisitor<LENGTH> {
     type Value = [u8; LENGTH];
 
-    fn expecting(&self, formatter: &mut Formatter) -> sp_std::fmt::Result {
+    fn expecting(&self, formatter: &mut Formatter) -> core::fmt::Result {
         formatter.write_str("a hex string with an '0x' prefix")
     }
 
diff --git a/operator/primitives/snowbridge/beacon/src/ssz.rs b/operator/primitives/snowbridge/beacon/src/ssz.rs
index f4b026caf..8903f3675 100644
--- a/operator/primitives/snowbridge/beacon/src/ssz.rs
+++ b/operator/primitives/snowbridge/beacon/src/ssz.rs
@@ -6,9 +6,9 @@ use crate::{
         BeaconHeader, ExecutionPayloadHeader, ForkData, SigningData, SyncAggregate, SyncCommittee,
     },
 };
+use alloc::{vec, vec::Vec};
 use byte_slice_cast::AsByteSlice;
 use sp_core::H256;
-use sp_std::{vec, vec::Vec};
 use ssz_rs::{
     prelude::{List, Vector},
     Bitvector, Deserialize, DeserializeError, SimpleSerialize, SimpleSerializeError, Sized, U256,
@@ -204,9 +204,9 @@ pub mod deneb {
         ssz::hash_tree_root,
         types::deneb::ExecutionPayloadHeader,
     };
+    use alloc::{vec, vec::Vec};
     use byte_slice_cast::AsByteSlice;
     use sp_core::H256;
-    use sp_std::{vec, vec::Vec};
     use ssz_rs::{
         prelude::{List, Vector},
         Deserialize, DeserializeError, SimpleSerializeError, Sized, U256,
diff --git a/operator/primitives/snowbridge/beacon/src/types.rs b/operator/primitives/snowbridge/beacon/src/types.rs
index 062eb2189..e44a5f2bb 100644
--- a/operator/primitives/snowbridge/beacon/src/types.rs
+++ b/operator/primitives/snowbridge/beacon/src/types.rs
@@ -1,11 +1,13 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2023 Snowfork <hello@snowfork.com>
+use alloc::boxed::Box;
+use alloc::vec::Vec;
 use codec::{Decode, DecodeWithMemTracking, Encode, MaxEncodedLen};
+use core::iter::repeat;
 use frame_support::{CloneNoBound, PartialEqNoBound, RuntimeDebugNoBound};
 use scale_info::TypeInfo;
 use sp_core::{H160, H256, U256};
 use sp_runtime::RuntimeDebug;
-use sp_std::{boxed::Box, iter::repeat, prelude::*};
 
 use crate::config::{PUBKEY_SIZE, SIGNATURE_SIZE};
 
@@ -89,7 +91,7 @@ impl Serialize for PublicKey {
     }
 }
 
-#[derive(Copy, Clone, Encode, Decode, PartialEq, RuntimeDebug, TypeInfo)]
+#[derive(Copy, Clone, Encode, Decode, PartialEq, RuntimeDebug, TypeInfo, DecodeWithMemTracking)]
 pub struct Signature(pub [u8; SIGNATURE_SIZE]);
 
 impl Default for Signature {
@@ -238,7 +240,16 @@ impl<const COMMITTEE_SIZE: usize> TryFrom<&SyncCommittee<COMMITTEE_SIZE>>
 /// Beacon block header as it is stored in the runtime storage. The block root is the
 /// Merkleization of a BeaconHeader.
 #[derive(
-    Copy, Clone, Default, Encode, Decode, PartialEq, RuntimeDebug, TypeInfo, MaxEncodedLen,
+    Copy,
+    Clone,
+    Default,
+    Encode,
+    Decode,
+    PartialEq,
+    RuntimeDebug,
+    TypeInfo,
+    MaxEncodedLen,
+    DecodeWithMemTracking,
 )]
 #[cfg_attr(feature = "std", derive(Serialize, Deserialize))]
 pub struct BeaconHeader {
@@ -261,7 +272,15 @@ impl BeaconHeader {
     }
 }
 
-#[derive(Encode, Decode, CloneNoBound, PartialEqNoBound, RuntimeDebugNoBound, TypeInfo)]
+#[derive(
+    Encode,
+    Decode,
+    CloneNoBound,
+    PartialEqNoBound,
+    RuntimeDebugNoBound,
+    TypeInfo,
+    DecodeWithMemTracking,
+)]
 #[cfg_attr(
     feature = "std",
     derive(Deserialize),
@@ -329,7 +348,14 @@ impl<const COMMITTEE_SIZE: usize, const COMMITTEE_BITS_SIZE: usize>
 /// ExecutionPayloadHeader
 /// <https://github.com/ethereum/annotated-spec/blob/master/capella/beacon-chain.md#executionpayloadheader>
 #[derive(
-    Default, Encode, Decode, CloneNoBound, PartialEqNoBound, RuntimeDebugNoBound, TypeInfo,
+    Default,
+    Encode,
+    Decode,
+    CloneNoBound,
+    PartialEqNoBound,
+    RuntimeDebugNoBound,
+    TypeInfo,
+    DecodeWithMemTracking,
 )]
 #[cfg_attr(
     feature = "std",
@@ -391,7 +417,15 @@ pub struct CompactBeaconState {
 }
 
 /// VersionedExecutionPayloadHeader
-#[derive(Encode, Decode, CloneNoBound, PartialEqNoBound, RuntimeDebugNoBound, TypeInfo)]
+#[derive(
+    Encode,
+    Decode,
+    CloneNoBound,
+    PartialEqNoBound,
+    RuntimeDebugNoBound,
+    TypeInfo,
+    DecodeWithMemTracking,
+)]
 #[cfg_attr(
     feature = "std",
     derive(Serialize, Deserialize),
@@ -453,7 +487,15 @@ impl VersionedExecutionPayloadHeader {
     }
 }
 
-#[derive(Encode, Decode, CloneNoBound, PartialEqNoBound, RuntimeDebugNoBound, TypeInfo)]
+#[derive(
+    Encode,
+    Decode,
+    CloneNoBound,
+    PartialEqNoBound,
+    RuntimeDebugNoBound,
+    TypeInfo,
+    DecodeWithMemTracking,
+)]
 #[cfg_attr(
     feature = "std",
     derive(serde::Deserialize),
@@ -470,7 +512,15 @@ pub struct ExecutionProof {
     pub execution_branch: Vec<H256>,
 }
 
-#[derive(Encode, Decode, CloneNoBound, PartialEqNoBound, RuntimeDebugNoBound, TypeInfo)]
+#[derive(
+    Encode,
+    Decode,
+    CloneNoBound,
+    PartialEqNoBound,
+    RuntimeDebugNoBound,
+    TypeInfo,
+    DecodeWithMemTracking,
+)]
 #[cfg_attr(
     feature = "std",
     derive(serde::Deserialize),
@@ -609,18 +659,25 @@ pub enum Mode {
 }
 
 pub mod deneb {
-    use codec::{Decode, Encode};
+    use alloc::vec::Vec;
+    use codec::{Decode, DecodeWithMemTracking, Encode};
     use frame_support::{CloneNoBound, PartialEqNoBound, RuntimeDebugNoBound};
     use scale_info::TypeInfo;
     #[cfg(feature = "std")]
     use serde::{Deserialize, Serialize};
     use sp_core::{H160, H256, U256};
-    use sp_std::prelude::*;
 
     /// ExecutionPayloadHeader
     /// <https://github.com/ethereum/consensus-specs/blob/dev/specs/deneb/beacon-chain.md#executionpayloadheader>
     #[derive(
-        Default, Encode, Decode, CloneNoBound, PartialEqNoBound, RuntimeDebugNoBound, TypeInfo,
+        Default,
+        Encode,
+        Decode,
+        CloneNoBound,
+        PartialEqNoBound,
+        RuntimeDebugNoBound,
+        TypeInfo,
+        DecodeWithMemTracking,
     )]
     #[cfg_attr(
         feature = "std",
diff --git a/operator/primitives/snowbridge/beacon/src/updates.rs b/operator/primitives/snowbridge/beacon/src/updates.rs
index 07d5564ae..f580f5a29 100644
--- a/operator/primitives/snowbridge/beacon/src/updates.rs
+++ b/operator/primitives/snowbridge/beacon/src/updates.rs
@@ -1,14 +1,22 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2023 Snowfork <hello@snowfork.com>
-use codec::{Decode, Encode};
+use alloc::vec::Vec;
+use codec::{Decode, DecodeWithMemTracking, Encode};
 use frame_support::{CloneNoBound, PartialEqNoBound, RuntimeDebugNoBound};
 use scale_info::TypeInfo;
 use sp_core::H256;
-use sp_std::prelude::*;
 
 use crate::types::{BeaconHeader, SyncAggregate, SyncCommittee};
 
-#[derive(Encode, Decode, CloneNoBound, PartialEqNoBound, RuntimeDebugNoBound, TypeInfo)]
+#[derive(
+    Encode,
+    Decode,
+    CloneNoBound,
+    PartialEqNoBound,
+    RuntimeDebugNoBound,
+    TypeInfo,
+    DecodeWithMemTracking,
+)]
 #[cfg_attr(
     feature = "std",
     derive(serde::Serialize, serde::Deserialize),
@@ -24,7 +32,14 @@ pub struct CheckpointUpdate<const COMMITTEE_SIZE: usize> {
 }
 
 #[derive(
-    Default, Encode, Decode, CloneNoBound, PartialEqNoBound, RuntimeDebugNoBound, TypeInfo,
+    Default,
+    Encode,
+    Decode,
+    CloneNoBound,
+    PartialEqNoBound,
+    RuntimeDebugNoBound,
+    TypeInfo,
+    DecodeWithMemTracking,
 )]
 #[cfg_attr(
     feature = "std",
@@ -54,7 +69,14 @@ pub struct Update<const COMMITTEE_SIZE: usize, const COMMITTEE_BITS_SIZE: usize>
 }
 
 #[derive(
-    Default, Encode, Decode, CloneNoBound, PartialEqNoBound, RuntimeDebugNoBound, TypeInfo,
+    Default,
+    Encode,
+    Decode,
+    CloneNoBound,
+    PartialEqNoBound,
+    RuntimeDebugNoBound,
+    TypeInfo,
+    DecodeWithMemTracking,
 )]
 #[cfg_attr(
     feature = "std",
diff --git a/operator/primitives/snowbridge/bridge-hub-common/Cargo.toml b/operator/primitives/snowbridge/bridge-hub-common/Cargo.toml
index 081868b9e..2b289ab1c 100644
--- a/operator/primitives/snowbridge/bridge-hub-common/Cargo.toml
+++ b/operator/primitives/snowbridge/bridge-hub-common/Cargo.toml
@@ -17,7 +17,6 @@ scale-info = { features = ["derive"], workspace = true }
 snowbridge-core.workspace = true
 sp-core.workspace = true
 sp-runtime.workspace = true
-sp-std.workspace = true
 xcm.workspace = true
 xcm-builder.workspace = true
 xcm-executor.workspace = true
@@ -33,7 +32,6 @@ std = [
     "snowbridge-core/std",
     "sp-core/std",
     "sp-runtime/std",
-    "sp-std/std",
     "xcm-builder/std",
     "xcm-executor/std",
     "xcm/std",
diff --git a/operator/primitives/snowbridge/bridge-hub-common/src/message_queue.rs b/operator/primitives/snowbridge/bridge-hub-common/src/message_queue.rs
index 2f0a6d09f..0b25fa8ef 100644
--- a/operator/primitives/snowbridge/bridge-hub-common/src/message_queue.rs
+++ b/operator/primitives/snowbridge/bridge-hub-common/src/message_queue.rs
@@ -13,7 +13,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 //! Runtime configuration for MessageQueue pallet
-use codec::{Decode, Encode, MaxEncodedLen};
+use codec::{Decode, DecodeWithMemTracking, Encode, MaxEncodedLen};
 use core::marker::PhantomData;
 use cumulus_primitives_core::{AggregateMessageOrigin as CumulusAggregateMessageOrigin, ParaId};
 use frame_support::{
@@ -29,7 +29,18 @@ use xcm::latest::prelude::{Junction, Location};
 /// The aggregate origin of an inbound message.
 /// This is specialized for BridgeHub, as the snowbridge-outbound-queue-pallet is also using
 /// the shared MessageQueue pallet.
-#[derive(Encode, Decode, Copy, MaxEncodedLen, Clone, Eq, PartialEq, TypeInfo, Debug)]
+#[derive(
+    Encode,
+    Decode,
+    Copy,
+    MaxEncodedLen,
+    Clone,
+    Eq,
+    PartialEq,
+    TypeInfo,
+    DecodeWithMemTracking,
+    Debug,
+)]
 pub enum AggregateMessageOrigin {
     /// The message came from the para-chain itself.
     Here,
diff --git a/operator/primitives/snowbridge/bridge-hub-common/src/xcm_version.rs b/operator/primitives/snowbridge/bridge-hub-common/src/xcm_version.rs
index be42fd73f..27bee748e 100644
--- a/operator/primitives/snowbridge/bridge-hub-common/src/xcm_version.rs
+++ b/operator/primitives/snowbridge/bridge-hub-common/src/xcm_version.rs
@@ -25,7 +25,7 @@ use xcm::{
 /// configured XCM version between the destination `dest` and the bridge hub location provided as
 /// `Get<Location>`.
 pub struct XcmVersionOfDestAndRemoteBridge<Version, RemoteBridge>(
-    sp_std::marker::PhantomData<(Version, RemoteBridge)>,
+    core::marker::PhantomData<(Version, RemoteBridge)>,
 );
 impl<Version: GetVersion, RemoteBridge: Get<Location>> GetVersion
     for XcmVersionOfDestAndRemoteBridge<Version, RemoteBridge>
@@ -35,7 +35,7 @@ impl<Version: GetVersion, RemoteBridge: Get<Location>> GetVersion
         let bridge_hub_version = Version::get_version_for(&RemoteBridge::get());
 
         match (dest_version, bridge_hub_version) {
-            (Some(dv), Some(bhv)) => Some(sp_std::cmp::min(dv, bhv)),
+            (Some(dv), Some(bhv)) => Some(core::cmp::min(dv, bhv)),
             (Some(dv), None) => Some(dv),
             (None, Some(bhv)) => Some(bhv),
             (None, None) => None,
diff --git a/operator/primitives/snowbridge/core/Cargo.toml b/operator/primitives/snowbridge/core/Cargo.toml
index f0eabf552..098959527 100644
--- a/operator/primitives/snowbridge/core/Cargo.toml
+++ b/operator/primitives/snowbridge/core/Cargo.toml
@@ -29,7 +29,6 @@ sp-arithmetic = { workspace = true }
 sp-core = { workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
-sp-std = { workspace = true }
 xcm-executor = { workspace = true }
 
 bp-relayers = { workspace = true }
@@ -62,7 +61,6 @@ std = [
     "sp-core/std",
     "sp-io/std",
     "sp-runtime/std",
-    "sp-std/std",
     "xcm-builder/std",
     "xcm-executor/std",
     "xcm/std",
diff --git a/operator/primitives/snowbridge/core/src/lib.rs b/operator/primitives/snowbridge/core/src/lib.rs
index 25e81ff67..87dc0fb59 100644
--- a/operator/primitives/snowbridge/core/src/lib.rs
+++ b/operator/primitives/snowbridge/core/src/lib.rs
@@ -4,6 +4,7 @@
 //!
 //! Common traits and types
 #![cfg_attr(not(feature = "std"), no_std)]
+extern crate alloc;
 
 #[cfg(test)]
 mod tests;
@@ -22,6 +23,8 @@ pub use polkadot_parachain_primitives::primitives::{
 pub use ringbuffer::{RingBufferMap, RingBufferMapImpl};
 pub use sp_core::U256;
 
+use alloc::vec;
+use alloc::vec::Vec;
 use codec::{Decode, DecodeWithMemTracking, Encode, MaxEncodedLen};
 use frame_support::{traits::Contains, BoundedVec};
 use hex_literal::hex;
@@ -29,7 +32,6 @@ use scale_info::TypeInfo;
 use sp_core::{ConstU32, H256};
 use sp_io::hashing::keccak_256;
 use sp_runtime::{traits::AccountIdConversion, RuntimeDebug};
-use sp_std::prelude::*;
 use xcm::latest::{Asset, Junction::Parachain, Location, Result as XcmResult, XcmContext};
 use xcm_executor::traits::TransactAsset;
 
diff --git a/operator/primitives/snowbridge/core/src/location.rs b/operator/primitives/snowbridge/core/src/location.rs
index 2816a79e5..7038ad3fc 100644
--- a/operator/primitives/snowbridge/core/src/location.rs
+++ b/operator/primitives/snowbridge/core/src/location.rs
@@ -9,9 +9,9 @@ pub use polkadot_parachain_primitives::primitives::{
 };
 pub use sp_core::U256;
 
+use alloc::vec::Vec;
 use codec::Encode;
 use sp_core::H256;
-use sp_std::prelude::*;
 use xcm::prelude::{
     AccountId32, AccountKey20, GeneralIndex, GeneralKey, GlobalConsensus, Location, PalletInstance,
 };
@@ -56,7 +56,7 @@ impl DescribeLocation for DescribeHere {
         }
     }
 }
-pub struct DescribeGlobalPrefix<DescribeInterior>(sp_std::marker::PhantomData<DescribeInterior>);
+pub struct DescribeGlobalPrefix<DescribeInterior>(core::marker::PhantomData<DescribeInterior>);
 impl<Suffix: DescribeLocation> DescribeLocation for DescribeGlobalPrefix<Suffix> {
     fn describe_location(l: &Location) -> Option<Vec<u8>> {
         match (l.parent_count(), l.first_interior()) {
diff --git a/operator/primitives/snowbridge/core/src/pricing.rs b/operator/primitives/snowbridge/core/src/pricing.rs
index eca50c667..edbe86e35 100644
--- a/operator/primitives/snowbridge/core/src/pricing.rs
+++ b/operator/primitives/snowbridge/core/src/pricing.rs
@@ -1,14 +1,15 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2023 Snowfork <hello@snowfork.com>
 
-use codec::{Decode, Encode, MaxEncodedLen};
+use codec::{Decode, DecodeWithMemTracking, Encode, MaxEncodedLen};
 use scale_info::TypeInfo;
 use sp_arithmetic::traits::{BaseArithmetic, Unsigned, Zero};
 use sp_core::U256;
 use sp_runtime::{FixedU128, RuntimeDebug};
-use sp_std::prelude::*;
 
-#[derive(Clone, Encode, Decode, PartialEq, RuntimeDebug, MaxEncodedLen, TypeInfo)]
+#[derive(
+    Clone, Encode, Decode, PartialEq, RuntimeDebug, MaxEncodedLen, DecodeWithMemTracking, TypeInfo,
+)]
 pub struct PricingParameters<Balance> {
     /// ETH/DOT exchange rate
     pub exchange_rate: FixedU128,
@@ -20,7 +21,9 @@ pub struct PricingParameters<Balance> {
     pub multiplier: FixedU128,
 }
 
-#[derive(Clone, Encode, Decode, PartialEq, RuntimeDebug, MaxEncodedLen, TypeInfo)]
+#[derive(
+    Clone, Encode, Decode, PartialEq, RuntimeDebug, MaxEncodedLen, DecodeWithMemTracking, TypeInfo,
+)]
 pub struct Rewards<Balance> {
     /// Local reward in DOT
     pub local: Balance,
diff --git a/operator/primitives/snowbridge/core/src/reward.rs b/operator/primitives/snowbridge/core/src/reward.rs
index 5b79f31cf..931dc205b 100644
--- a/operator/primitives/snowbridge/core/src/reward.rs
+++ b/operator/primitives/snowbridge/core/src/reward.rs
@@ -4,6 +4,7 @@
 extern crate alloc;
 
 use crate::reward::RewardPaymentError::{ChargeFeesFailure, XcmSendFailure};
+use core::{fmt::Debug, marker::PhantomData};
 use frame_support::dispatch::GetDispatchInfo;
 use scale_info::TypeInfo;
 use sp_runtime::{
@@ -11,7 +12,6 @@ use sp_runtime::{
     traits::Get,
     DispatchError,
 };
-use sp_std::{fmt::Debug, marker::PhantomData};
 use xcm::{
     opaque::latest::prelude::Xcm,
     prelude::{ExecuteXcm, Junction::*, Location, SendXcm, *},
diff --git a/operator/primitives/snowbridge/core/src/sparse_bitmap.rs b/operator/primitives/snowbridge/core/src/sparse_bitmap.rs
index d71926425..bea8b362a 100644
--- a/operator/primitives/snowbridge/core/src/sparse_bitmap.rs
+++ b/operator/primitives/snowbridge/core/src/sparse_bitmap.rs
@@ -1,7 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2023 Snowfork <hello@snowfork.com>
+use core::marker::PhantomData;
 use frame_support::storage::StorageMap;
-use sp_std::marker::PhantomData;
 
 /// Sparse bitmap interface.
 pub trait SparseBitmap<BitMap>
diff --git a/operator/primitives/snowbridge/ethereum/Cargo.toml b/operator/primitives/snowbridge/ethereum/Cargo.toml
index 9d49aa6de..bfa63dc13 100644
--- a/operator/primitives/snowbridge/ethereum/Cargo.toml
+++ b/operator/primitives/snowbridge/ethereum/Cargo.toml
@@ -28,7 +28,6 @@ serde-big-array = { optional = true, features = [
 
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
-sp-std = { workspace = true }
 
 ethabi = { workspace = true }
 
@@ -51,5 +50,4 @@ std = [
     "serde-big-array",
     "sp-io/std",
     "sp-runtime/std",
-    "sp-std/std",
 ]
diff --git a/operator/primitives/snowbridge/ethereum/src/header.rs b/operator/primitives/snowbridge/ethereum/src/header.rs
index 0348880c2..f9c3871ca 100644
--- a/operator/primitives/snowbridge/ethereum/src/header.rs
+++ b/operator/primitives/snowbridge/ethereum/src/header.rs
@@ -1,5 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2023 Snowfork <hello@snowfork.com>
+use alloc::boxed::Box;
+use alloc::vec::Vec;
 use codec::{Decode, Encode};
 use ethbloom::Bloom as EthBloom;
 use hex_literal::hex;
@@ -8,7 +10,6 @@ use rlp::RlpStream;
 use scale_info::TypeInfo;
 use sp_io::hashing::keccak_256;
 use sp_runtime::RuntimeDebug;
-use sp_std::prelude::*;
 
 #[cfg(feature = "std")]
 use serde::{Deserialize, Serialize};
diff --git a/operator/primitives/snowbridge/ethereum/src/lib.rs b/operator/primitives/snowbridge/ethereum/src/lib.rs
index b44ea3c6b..60bac3596 100644
--- a/operator/primitives/snowbridge/ethereum/src/lib.rs
+++ b/operator/primitives/snowbridge/ethereum/src/lib.rs
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2023 Snowfork <hello@snowfork.com>
 #![cfg_attr(not(feature = "std"), no_std)]
+extern crate alloc;
 
 pub mod header;
 pub mod log;
diff --git a/operator/primitives/snowbridge/ethereum/src/log.rs b/operator/primitives/snowbridge/ethereum/src/log.rs
index 589d928d0..5273e382a 100644
--- a/operator/primitives/snowbridge/ethereum/src/log.rs
+++ b/operator/primitives/snowbridge/ethereum/src/log.rs
@@ -1,8 +1,8 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2023 Snowfork <hello@snowfork.com>
+use alloc::vec::Vec;
 use codec::{Decode, Encode};
 use ethereum_types::{H160, H256};
-use sp_std::prelude::*;
 
 #[derive(Clone, Debug, Encode, Decode, PartialEq, Eq)]
 pub struct Log {
diff --git a/operator/primitives/snowbridge/ethereum/src/mpt.rs b/operator/primitives/snowbridge/ethereum/src/mpt.rs
index 035016aa0..e13180fcd 100644
--- a/operator/primitives/snowbridge/ethereum/src/mpt.rs
+++ b/operator/primitives/snowbridge/ethereum/src/mpt.rs
@@ -2,8 +2,9 @@
 // SPDX-FileCopyrightText: 2023 Snowfork <hello@snowfork.com>
 //! Helper types to work with Ethereum's Merkle Patricia Trie nodes
 
+use alloc::boxed::Box;
+use alloc::vec::Vec;
 use ethereum_types::H256;
-use sp_std::prelude::*;
 
 pub trait Node {
     fn contains_hash(&self, hash: H256) -> bool;
diff --git a/operator/primitives/snowbridge/ethereum/src/receipt.rs b/operator/primitives/snowbridge/ethereum/src/receipt.rs
index 3ef64e66a..267a1b8f0 100644
--- a/operator/primitives/snowbridge/ethereum/src/receipt.rs
+++ b/operator/primitives/snowbridge/ethereum/src/receipt.rs
@@ -1,9 +1,9 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2023 Snowfork <hello@snowfork.com>
 use crate::{Bloom, Log};
+use alloc::vec::Vec;
 use codec::{Decode, Encode};
 use sp_runtime::RuntimeDebug;
-use sp_std::prelude::*;
 
 #[derive(Clone, Default, Encode, Decode, PartialEq, RuntimeDebug)]
 pub struct Receipt {
diff --git a/operator/primitives/snowbridge/inbound-queue/Cargo.toml b/operator/primitives/snowbridge/inbound-queue/Cargo.toml
index b58f333a5..6069eff4b 100644
--- a/operator/primitives/snowbridge/inbound-queue/Cargo.toml
+++ b/operator/primitives/snowbridge/inbound-queue/Cargo.toml
@@ -23,7 +23,6 @@ frame-system = { 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 }
@@ -61,7 +60,6 @@ std = [
     "sp-core/std",
     "sp-io/std",
     "sp-runtime/std",
-    "sp-std/std",
     "xcm-builder/std",
     "xcm-executor/std",
     "xcm/std",
diff --git a/operator/primitives/snowbridge/inbound-queue/src/lib.rs b/operator/primitives/snowbridge/inbound-queue/src/lib.rs
index 20ff50eda..0d0f85652 100644
--- a/operator/primitives/snowbridge/inbound-queue/src/lib.rs
+++ b/operator/primitives/snowbridge/inbound-queue/src/lib.rs
@@ -2,12 +2,14 @@
 // SPDX-FileCopyrightText: 2023 Snowfork <hello@snowfork.com>
 // SPDX-FileCopyrightText: 2021-2022 Parity Technologies (UK) Ltd.
 #![cfg_attr(not(feature = "std"), no_std)]
+extern crate alloc;
+
 pub mod v1;
 pub mod v2;
 use codec::Encode;
+use core::marker::PhantomData;
 use snowbridge_beacon_primitives::BeaconHeader;
 use sp_core::{blake2_256, RuntimeDebug, H256};
-use sp_std::marker::PhantomData;
 use xcm::prelude::{AccountKey20, Ethereum, GlobalConsensus, Location};
 use xcm_executor::traits::ConvertLocation;
 
diff --git a/operator/primitives/snowbridge/inbound-queue/src/v1.rs b/operator/primitives/snowbridge/inbound-queue/src/v1.rs
index 41aa22708..c82a4b591 100644
--- a/operator/primitives/snowbridge/inbound-queue/src/v1.rs
+++ b/operator/primitives/snowbridge/inbound-queue/src/v1.rs
@@ -3,6 +3,7 @@
 //! Converts messages from Ethereum to XCM messages
 
 use crate::{CallIndex, EthereumLocationsConverterFor};
+use alloc::vec;
 use codec::{Decode, DecodeWithMemTracking, Encode};
 use core::marker::PhantomData;
 use frame_support::{traits::tokens::Balance as BalanceT, PalletError};
@@ -10,7 +11,6 @@ use scale_info::TypeInfo;
 use snowbridge_core::TokenId;
 use sp_core::{Get, RuntimeDebug, H160, H256};
 use sp_runtime::{traits::MaybeEquivalence, MultiAddress};
-use sp_std::prelude::*;
 use xcm::prelude::{Junction::AccountKey20, *};
 
 const MINIMUM_DEPOSIT: u128 = 1;
diff --git a/operator/primitives/snowbridge/inbound-queue/src/v2/converter.rs b/operator/primitives/snowbridge/inbound-queue/src/v2/converter.rs
index fd28e7a3d..3dfcf6770 100644
--- a/operator/primitives/snowbridge/inbound-queue/src/v2/converter.rs
+++ b/operator/primitives/snowbridge/inbound-queue/src/v2/converter.rs
@@ -1,9 +1,12 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2023 Snowfork <hello@snowfork.com>
 //! Converts messages from Solidity ABI-encoding to XCM
+extern crate alloc;
 
 use super::{message::*, traits::*};
 use crate::{v2::LOG_TARGET, CallIndex, EthereumLocationsConverterFor};
+use alloc::vec;
+use alloc::vec::Vec;
 use codec::{Decode, DecodeLimit, Encode};
 use core::marker::PhantomData;
 use frame_support::ensure;
@@ -11,7 +14,6 @@ use snowbridge_core::TokenId;
 use sp_core::{Get, RuntimeDebug, H160};
 use sp_io::hashing::blake2_256;
 use sp_runtime::{traits::MaybeEquivalence, MultiAddress};
-use sp_std::prelude::*;
 use xcm::{
     prelude::{Junction::*, *},
     MAX_XCM_DECODE_DEPTH,
diff --git a/operator/primitives/snowbridge/inbound-queue/src/v2/message.rs b/operator/primitives/snowbridge/inbound-queue/src/v2/message.rs
index 6e3f8fb54..299fcbe32 100644
--- a/operator/primitives/snowbridge/inbound-queue/src/v2/message.rs
+++ b/operator/primitives/snowbridge/inbound-queue/src/v2/message.rs
@@ -1,8 +1,11 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2023 Snowfork <hello@snowfork.com>
 //! Converts messages from Ethereum to XCM messages
+extern crate alloc;
 
 use crate::{v2::IGatewayV2::Payload as GatewayV2Payload, Log};
+use alloc::vec;
+use alloc::vec::Vec;
 use alloy_core::{
     primitives::B256,
     sol,
@@ -11,7 +14,6 @@ use alloy_core::{
 use codec::{Decode, Encode};
 use scale_info::TypeInfo;
 use sp_core::{RuntimeDebug, H160, H256};
-use sp_std::prelude::*;
 
 sol! {
     interface IGatewayV2 {
diff --git a/operator/primitives/snowbridge/outbound-queue/Cargo.toml b/operator/primitives/snowbridge/outbound-queue/Cargo.toml
index 636a94c84..30513acc6 100644
--- a/operator/primitives/snowbridge/outbound-queue/Cargo.toml
+++ b/operator/primitives/snowbridge/outbound-queue/Cargo.toml
@@ -28,7 +28,6 @@ sp-arithmetic = { workspace = true }
 sp-core = { workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
-sp-std = { workspace = true }
 
 alloy-core = { workspace = true, features = ["sol-types"] }
 ethabi = { workspace = true }
@@ -56,7 +55,6 @@ std = [
     "sp-core/std",
     "sp-io/std",
     "sp-runtime/std",
-    "sp-std/std",
     "xcm-builder/std",
     "xcm-executor/std",
     "xcm/std",
diff --git a/operator/primitives/snowbridge/outbound-queue/src/v1/message.rs b/operator/primitives/snowbridge/outbound-queue/src/v1/message.rs
index e218e4b03..69c2df578 100644
--- a/operator/primitives/snowbridge/outbound-queue/src/v1/message.rs
+++ b/operator/primitives/snowbridge/outbound-queue/src/v1/message.rs
@@ -1,15 +1,17 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2023 Snowfork <hello@snowfork.com>
 //! # Outbound V1 primitives
+extern crate alloc;
 
 use crate::{OperatingMode, SendError, SendMessageFeeProvider};
+use alloc::borrow::ToOwned;
+use alloc::{vec, vec::Vec};
 use codec::{Decode, DecodeWithMemTracking, Encode};
 use ethabi::Token;
 use scale_info::TypeInfo;
 use snowbridge_core::{pricing::UD60x18, ChannelId};
 use sp_arithmetic::traits::{BaseArithmetic, Unsigned};
 use sp_core::{RuntimeDebug, H160, H256, U256};
-use sp_std::{borrow::ToOwned, vec, vec::Vec};
 
 /// Enqueued outbound messages need to be versioned to prevent data corruption
 /// or loss after forkless runtime upgrades
diff --git a/operator/primitives/snowbridge/outbound-queue/src/v1/mod.rs b/operator/primitives/snowbridge/outbound-queue/src/v1/mod.rs
index f90ed90d9..746a51fd0 100644
--- a/operator/primitives/snowbridge/outbound-queue/src/v1/mod.rs
+++ b/operator/primitives/snowbridge/outbound-queue/src/v1/mod.rs
@@ -1,3 +1,5 @@
+extern crate alloc;
+
 pub mod message;
 
 pub use message::*;
diff --git a/operator/primitives/snowbridge/outbound-queue/src/v2/converter/convert.rs b/operator/primitives/snowbridge/outbound-queue/src/v2/converter/convert.rs
index 3dee18c59..3036c19bf 100644
--- a/operator/primitives/snowbridge/outbound-queue/src/v2/converter/convert.rs
+++ b/operator/primitives/snowbridge/outbound-queue/src/v2/converter/convert.rs
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2023 Snowfork <hello@snowfork.com>
 //! Converts XCM messages into InboundMessage that can be processed by the Gateway contract
+extern crate alloc;
 
 use codec::DecodeAll;
 use core::slice::Iter;
@@ -13,9 +14,10 @@ use crate::v2::{
 };
 
 use crate::v2::convert::XcmConverterError::{AssetResolutionFailed, FilterDoesNotConsumeAllAssets};
+use alloc::vec::Vec;
+use core::{iter::Peekable, marker::PhantomData};
 use sp_core::H160;
 use sp_runtime::traits::MaybeEquivalence;
-use sp_std::{iter::Peekable, marker::PhantomData, prelude::*};
 use xcm::prelude::*;
 use xcm_executor::traits::ConvertLocation;
 use XcmConverterError::*;
diff --git a/operator/primitives/snowbridge/outbound-queue/src/v2/converter/mod.rs b/operator/primitives/snowbridge/outbound-queue/src/v2/converter/mod.rs
index 3c6ca5ddf..861833ff4 100644
--- a/operator/primitives/snowbridge/outbound-queue/src/v2/converter/mod.rs
+++ b/operator/primitives/snowbridge/outbound-queue/src/v2/converter/mod.rs
@@ -1,6 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2023 Snowfork <hello@snowfork.com>
 //! Converts XCM messages into simpler commands that can be processed by the Gateway contract
+extern crate alloc;
 
 #[cfg(test)]
 mod tests;
@@ -9,7 +10,9 @@ pub mod convert;
 pub use convert::XcmConverter;
 
 use super::message::SendMessage;
+use alloc::vec::Vec;
 use codec::{Decode, Encode};
+use core::{marker::PhantomData, ops::ControlFlow};
 use frame_support::{
     ensure,
     traits::{Contains, Get, ProcessMessageError},
@@ -17,7 +20,6 @@ use frame_support::{
 use snowbridge_core::{ParaId, TokenId};
 use sp_core::H256;
 use sp_runtime::traits::MaybeEquivalence;
-use sp_std::{marker::PhantomData, ops::ControlFlow, prelude::*};
 use xcm::prelude::*;
 use xcm_builder::{CreateMatcher, ExporterFor, MatchXcm};
 use xcm_executor::traits::{ConvertLocation, ExportXcm};
diff --git a/operator/primitives/snowbridge/outbound-queue/src/v2/converter/tests.rs b/operator/primitives/snowbridge/outbound-queue/src/v2/converter/tests.rs
index aa0c48ee6..5b231fb38 100644
--- a/operator/primitives/snowbridge/outbound-queue/src/v2/converter/tests.rs
+++ b/operator/primitives/snowbridge/outbound-queue/src/v2/converter/tests.rs
@@ -6,10 +6,10 @@ use crate::{
     v2::{convert::XcmConverterError, Command, Message},
     SendError, SendMessageFeeProvider,
 };
+use core::default::Default;
 use frame_support::{parameter_types, BoundedVec};
 use hex_literal::hex;
 use snowbridge_core::{AgentIdOf, TokenIdOf};
-use sp_std::default::Default;
 use xcm::{latest::WESTEND_GENESIS_HASH, prelude::SendError as XcmSendError};
 
 parameter_types! {
diff --git a/operator/primitives/snowbridge/outbound-queue/src/v2/delivery_receipt.rs b/operator/primitives/snowbridge/outbound-queue/src/v2/delivery_receipt.rs
index 21b5f4d5d..bb393b961 100644
--- a/operator/primitives/snowbridge/outbound-queue/src/v2/delivery_receipt.rs
+++ b/operator/primitives/snowbridge/outbound-queue/src/v2/delivery_receipt.rs
@@ -1,11 +1,13 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2023 Snowfork <hello@snowfork.com>
+extern crate alloc;
+
 use crate::Log;
+use alloc::vec::Vec;
 use alloy_core::{primitives::B256, sol, sol_types::SolEvent};
 use codec::Decode;
 use frame_support::pallet_prelude::{Encode, TypeInfo};
 use sp_core::{RuntimeDebug, H160, H256};
-use sp_std::prelude::*;
 
 sol! {
     event InboundMessageDispatched(uint64 indexed nonce, bytes32 topic, bool success, bytes32 reward_address);
diff --git a/operator/primitives/snowbridge/outbound-queue/src/v2/exporter.rs b/operator/primitives/snowbridge/outbound-queue/src/v2/exporter.rs
index 44c87c2b8..529b26b84 100644
--- a/operator/primitives/snowbridge/outbound-queue/src/v2/exporter.rs
+++ b/operator/primitives/snowbridge/outbound-queue/src/v2/exporter.rs
@@ -1,8 +1,10 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2023 Snowfork <hello@snowfork.com>
+extern crate alloc;
+
+use alloc::vec::Vec;
 use core::marker::PhantomData;
 use snowbridge_core::operating_mode::ExportPausedQuery;
-use sp_std::vec::Vec;
 use xcm::{
     prelude::{Location, SendError, SendResult, SendXcm, Xcm, XcmHash},
     VersionedLocation, VersionedXcm,
diff --git a/operator/primitives/snowbridge/outbound-queue/src/v2/message.rs b/operator/primitives/snowbridge/outbound-queue/src/v2/message.rs
index 4d42e1219..9d424e714 100644
--- a/operator/primitives/snowbridge/outbound-queue/src/v2/message.rs
+++ b/operator/primitives/snowbridge/outbound-queue/src/v2/message.rs
@@ -1,12 +1,13 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2023 Snowfork <hello@snowfork.com>
 //! # Outbound V2 primitives
+extern crate alloc;
 
+use alloc::vec::Vec;
 use codec::{Decode, DecodeWithMemTracking, Encode};
 use frame_support::{pallet_prelude::ConstU32, BoundedVec};
 use scale_info::TypeInfo;
 use sp_core::{RuntimeDebug, H160, H256};
-use sp_std::vec::Vec;
 
 use crate::{OperatingMode, SendError};
 use abi::{
@@ -121,7 +122,7 @@ pub struct OutboundMessage {
 pub const MAX_COMMANDS: u32 = 8;
 
 /// A message which can be accepted by implementations of `/[`SendMessage`\]`
-#[derive(Encode, Decode, TypeInfo, PartialEq, Clone, RuntimeDebug)]
+#[derive(Encode, Decode, TypeInfo, PartialEq, Clone, RuntimeDebug, DecodeWithMemTracking)]
 pub struct Message {
     /// Origin
     pub origin: H256,
@@ -134,7 +135,7 @@ pub struct Message {
 }
 
 /// A command which is executable by the Gateway contract on Ethereum
-#[derive(Clone, Encode, Decode, PartialEq, RuntimeDebug, TypeInfo)]
+#[derive(Clone, Encode, Decode, PartialEq, RuntimeDebug, TypeInfo, DecodeWithMemTracking)]
 pub enum Command {
     /// Upgrade the Gateway contract
     Upgrade {
diff --git a/operator/primitives/snowbridge/outbound-queue/src/v2/mod.rs b/operator/primitives/snowbridge/outbound-queue/src/v2/mod.rs
index 543cb65a9..3aa4d4ea6 100644
--- a/operator/primitives/snowbridge/outbound-queue/src/v2/mod.rs
+++ b/operator/primitives/snowbridge/outbound-queue/src/v2/mod.rs
@@ -1,5 +1,7 @@
 // SPDX-License-Identifier: Apache-2.0
 // SPDX-FileCopyrightText: 2023 Snowfork <hello@snowfork.com>
+extern crate alloc;
+
 pub mod converter;
 pub mod delivery_receipt;
 pub mod exporter;
@@ -9,10 +11,10 @@ pub use converter::*;
 pub use delivery_receipt::*;
 pub use message::*;
 
+use alloc::vec::Vec;
 use codec::{Decode, Encode};
 use scale_info::TypeInfo;
 use sp_runtime::RuntimeDebug;
-use sp_std::prelude::*;
 
 /// The `XCM::Transact` payload for calling arbitrary smart contracts on Ethereum.
 /// On Ethereum, this call will be dispatched by the agent contract acting as a proxy
diff --git a/operator/primitives/snowbridge/test-utils/Cargo.toml b/operator/primitives/snowbridge/test-utils/Cargo.toml
index 9038fc707..6525434ee 100644
--- a/operator/primitives/snowbridge/test-utils/Cargo.toml
+++ b/operator/primitives/snowbridge/test-utils/Cargo.toml
@@ -24,7 +24,6 @@ scale-info = { features = [
 ], workspace = true, default-features = true }
 snowbridge-outbound-queue-primitives = { workspace = true, default-features = true }
 sp-core = { workspace = true, default-features = true }
-sp-std = { workspace = true, default-features = true }
 xcm = { workspace = true, default-features = true }
 xcm-builder = { workspace = true, default-features = true }
 xcm-executor = { workspace = true, default-features = true }
diff --git a/operator/primitives/snowbridge/test-utils/src/mock_origin.rs b/operator/primitives/snowbridge/test-utils/src/mock_origin.rs
index efced79f7..e2058549f 100644
--- a/operator/primitives/snowbridge/test-utils/src/mock_origin.rs
+++ b/operator/primitives/snowbridge/test-utils/src/mock_origin.rs
@@ -20,7 +20,17 @@ pub mod pallet_xcm_origin {
 
     // Insert this custom Origin into the aggregate RuntimeOrigin
     #[pallet::origin]
-    #[derive(PartialEq, Eq, Clone, Encode, Decode, RuntimeDebug, TypeInfo, MaxEncodedLen)]
+    #[derive(
+        PartialEq,
+        Eq,
+        Clone,
+        Encode,
+        Decode,
+        RuntimeDebug,
+        TypeInfo,
+        DecodeWithMemTracking,
+        MaxEncodedLen,
+    )]
     pub struct Origin(pub Location);
 
     impl From<Location> for Origin {
diff --git a/operator/primitives/snowbridge/verification/Cargo.toml b/operator/primitives/snowbridge/verification/Cargo.toml
index 23fea6c64..b14e11251 100644
--- a/operator/primitives/snowbridge/verification/Cargo.toml
+++ b/operator/primitives/snowbridge/verification/Cargo.toml
@@ -17,7 +17,6 @@ frame-support = { workspace = true }
 scale-info = { features = ["derive"], workspace = true }
 snowbridge-beacon-primitives = { workspace = true }
 sp-core = { workspace = true }
-sp-std = { workspace = true }
 
 [features]
 default = ["std"]
@@ -27,5 +26,4 @@ std = [
     "scale-info/std",
     "snowbridge-beacon-primitives/std",
     "sp-core/std",
-    "sp-std/std",
 ]
diff --git a/operator/primitives/snowbridge/verification/src/lib.rs b/operator/primitives/snowbridge/verification/src/lib.rs
index 2262cc570..ae2b9f8f1 100644
--- a/operator/primitives/snowbridge/verification/src/lib.rs
+++ b/operator/primitives/snowbridge/verification/src/lib.rs
@@ -2,19 +2,21 @@
 // SPDX-FileCopyrightText: 2023 Snowfork <hello@snowfork.com>
 //! Types for representing inbound messages
 #![cfg_attr(not(feature = "std"), no_std)]
-use codec::{Decode, Encode};
+extern crate alloc;
+
+use alloc::vec::Vec;
+use codec::{Decode, DecodeWithMemTracking, Encode};
 use frame_support::PalletError;
 use scale_info::TypeInfo;
 use snowbridge_beacon_primitives::{BeaconHeader, ExecutionProof};
 use sp_core::{RuntimeDebug, H160, H256};
-use sp_std::prelude::*;
 
 /// A trait for verifying inbound messages from Ethereum.
 pub trait Verifier {
     fn verify(event: &Log, proof: &Proof) -> Result<(), VerificationError>;
 }
 
-#[derive(Clone, Encode, Decode, RuntimeDebug, PalletError, TypeInfo)]
+#[derive(Clone, Encode, Decode, RuntimeDebug, PalletError, TypeInfo, DecodeWithMemTracking)]
 #[cfg_attr(feature = "std", derive(PartialEq))]
 pub enum VerificationError {
     /// Execution header is missing
@@ -30,7 +32,7 @@ pub enum VerificationError {
 }
 
 /// A bridge message from the Gateway contract on Ethereum
-#[derive(Clone, Encode, Decode, PartialEq, RuntimeDebug, TypeInfo)]
+#[derive(Clone, Encode, Decode, PartialEq, RuntimeDebug, TypeInfo, DecodeWithMemTracking)]
 pub struct EventProof {
     /// Event log emitted by Gateway contract
     pub event_log: Log,
@@ -46,7 +48,7 @@ pub enum LogValidationError {
 }
 
 /// Event log
-#[derive(Clone, Encode, Decode, PartialEq, RuntimeDebug, TypeInfo)]
+#[derive(Clone, Encode, Decode, PartialEq, RuntimeDebug, TypeInfo, DecodeWithMemTracking)]
 pub struct Log {
     pub address: H160,
     pub topics: Vec<H256>,
@@ -63,7 +65,7 @@ impl Log {
 }
 
 /// Inclusion proof for a transaction receipt
-#[derive(Clone, Encode, Decode, PartialEq, RuntimeDebug, TypeInfo)]
+#[derive(Clone, Encode, Decode, PartialEq, RuntimeDebug, TypeInfo, DecodeWithMemTracking)]
 pub struct Proof {
     // Proof keys and values (receipts tree)
     pub receipt_proof: (Vec<Vec<u8>>, Vec<Vec<u8>>),
diff --git a/operator/runtime/common/Cargo.toml b/operator/runtime/common/Cargo.toml
index 6d071a57d..164f13cad 100644
--- a/operator/runtime/common/Cargo.toml
+++ b/operator/runtime/common/Cargo.toml
@@ -32,7 +32,6 @@ snowbridge-outbound-queue-primitives = { workspace = true }
 sp-core = { workspace = true, features = ["serde"] }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true, features = ["serde"] }
-sp-std = { workspace = true }
 xcm = { workspace = true }
 
 [features]
@@ -61,7 +60,6 @@ std = [
     "sp-core/std",
     "sp-io/std",
     "sp-runtime/std",
-    "sp-std/std",
     "xcm/std",
 ]
 
diff --git a/operator/runtime/common/src/deal_with_fees.rs b/operator/runtime/common/src/deal_with_fees.rs
index 4e9948e4f..cda77e678 100644
--- a/operator/runtime/common/src/deal_with_fees.rs
+++ b/operator/runtime/common/src/deal_with_fees.rs
@@ -25,7 +25,7 @@ use sp_runtime::Perbill;
 
 /// Deal with substrate based fees and tip. This should be used with pallet_transaction_payment.
 pub struct DealWithSubstrateFeesAndTip<R, FeesTreasuryProportion>(
-    sp_std::marker::PhantomData<(R, FeesTreasuryProportion)>,
+    core::marker::PhantomData<(R, FeesTreasuryProportion)>,
 );
 impl<R, FeesTreasuryProportion> DealWithSubstrateFeesAndTip<R, FeesTreasuryProportion>
 where
@@ -74,7 +74,7 @@ where
 
 /// Deal with ethereum based fees. To handle tips/priority fees, use DealWithEthereumPriorityFees.
 pub struct DealWithEthereumBaseFees<R, FeesTreasuryProportion>(
-    sp_std::marker::PhantomData<(R, FeesTreasuryProportion)>,
+    core::marker::PhantomData<(R, FeesTreasuryProportion)>,
 );
 impl<R, FeesTreasuryProportion> OnUnbalanced<Credit<R::AccountId, pallet_balances::Pallet<R>>>
     for DealWithEthereumBaseFees<R, FeesTreasuryProportion>
@@ -93,7 +93,7 @@ where
     }
 }
 
-pub struct BlockAuthorAccountId<R>(sp_std::marker::PhantomData<R>);
+pub struct BlockAuthorAccountId<R>(core::marker::PhantomData<R>);
 impl<R> TypedGet for BlockAuthorAccountId<R>
 where
     R: frame_system::Config + pallet_authorship::Config,
@@ -106,7 +106,7 @@ where
 }
 
 /// Deal with ethereum based priority fees/tips. See DealWithEthereumBaseFees for base fees.
-pub struct DealWithEthereumPriorityFees<R>(sp_std::marker::PhantomData<R>);
+pub struct DealWithEthereumPriorityFees<R>(core::marker::PhantomData<R>);
 impl<R> OnUnbalanced<Credit<R::AccountId, pallet_balances::Pallet<R>>>
     for DealWithEthereumPriorityFees<R>
 where
diff --git a/operator/runtime/common/src/impl_on_charge_evm_transaction.rs b/operator/runtime/common/src/impl_on_charge_evm_transaction.rs
index d2e6c41b5..9977ff9bf 100644
--- a/operator/runtime/common/src/impl_on_charge_evm_transaction.rs
+++ b/operator/runtime/common/src/impl_on_charge_evm_transaction.rs
@@ -18,7 +18,7 @@
 macro_rules! impl_on_charge_evm_transaction {
 	{} => {
 		pub struct OnChargeEVMTransaction<BaseFeesOU, PriorityFeesOU>(
-			sp_std::marker::PhantomData<(BaseFeesOU, PriorityFeesOU)>
+			core::marker::PhantomData<(BaseFeesOU, PriorityFeesOU)>
 		);
 
 		impl<T, BaseFeesOU, PriorityFeesOU> OnChargeEVMTransactionT<T>
diff --git a/operator/runtime/common/src/inflation.rs b/operator/runtime/common/src/inflation.rs
index b18332bcc..e7149a3da 100644
--- a/operator/runtime/common/src/inflation.rs
+++ b/operator/runtime/common/src/inflation.rs
@@ -59,7 +59,7 @@ pub struct ExternalRewardsEraInflationProvider<
     BlocksPerSession,
     MillisecsPerBlock,
 >(
-    sp_std::marker::PhantomData<(
+    core::marker::PhantomData<(
         AnnualAmount,
         SessionsPerEra,
         BlocksPerSession,
@@ -155,7 +155,7 @@ where
 /// This struct provides a mint_inflation method that can be called from wrapper implementations
 /// in your runtime to avoid circular dependencies.
 pub struct ExternalRewardsInflationHandler<Balances, TreasuryProportion, TreasuryAccount>(
-    sp_std::marker::PhantomData<(Balances, TreasuryProportion, TreasuryAccount)>,
+    core::marker::PhantomData<(Balances, TreasuryProportion, TreasuryAccount)>,
 );
 
 impl<Balances, TreasuryProportion, TreasuryAccount>
diff --git a/operator/runtime/common/src/lib.rs b/operator/runtime/common/src/lib.rs
index d13044cda..cb29f6c56 100644
--- a/operator/runtime/common/src/lib.rs
+++ b/operator/runtime/common/src/lib.rs
@@ -15,6 +15,7 @@
 // along with Moonbeam.  If not, see <http://www.gnu.org/licenses/>.
 
 #![cfg_attr(not(feature = "std"), no_std)]
+extern crate alloc;
 
 pub mod constants;
 pub use constants::*;
diff --git a/operator/runtime/common/src/rewards_adapter.rs b/operator/runtime/common/src/rewards_adapter.rs
index 330bf4b59..d7456ef72 100644
--- a/operator/runtime/common/src/rewards_adapter.rs
+++ b/operator/runtime/common/src/rewards_adapter.rs
@@ -20,6 +20,8 @@
 //! via Snowbridge. The adapter is configurable through the [`RewardsSubmissionConfig`]
 //! trait, allowing runtimes to provide environment-specific values.
 
+use alloc::vec;
+use alloc::vec::Vec;
 use alloy_core::{
     primitives::{Address, Uint, U256},
     sol,
@@ -31,8 +33,6 @@ use snowbridge_outbound_queue_primitives::v2::{
 };
 use snowbridge_outbound_queue_primitives::SendError;
 use sp_core::{H160, H256};
-use sp_std::vec;
-use sp_std::vec::Vec;
 
 /// Default description for rewards submissions.
 pub const REWARDS_DESCRIPTION: &str = "DataHaven validator rewards";
diff --git a/operator/runtime/common/src/safe_mode.rs b/operator/runtime/common/src/safe_mode.rs
index 8849e80f5..8c3b2de38 100644
--- a/operator/runtime/common/src/safe_mode.rs
+++ b/operator/runtime/common/src/safe_mode.rs
@@ -18,10 +18,10 @@
 
 use crate::time::DAYS;
 use crate::Balance;
+use core::marker::PhantomData;
 use frame_support::{parameter_types, traits::Contains};
 use pallet_tx_pause::RuntimeCallNameOf;
 use polkadot_primitives::BlockNumber;
-use sp_std::marker::PhantomData;
 
 // Safe Mode Constants
 parameter_types! {
diff --git a/operator/runtime/common/src/slashes_adapter.rs b/operator/runtime/common/src/slashes_adapter.rs
index 74fa5c589..66fc307c2 100644
--- a/operator/runtime/common/src/slashes_adapter.rs
+++ b/operator/runtime/common/src/slashes_adapter.rs
@@ -1,3 +1,5 @@
+use alloc::vec;
+use alloc::vec::Vec;
 use alloy_core::{
     primitives::{Address, U256},
     sol,
@@ -8,8 +10,6 @@ use snowbridge_outbound_queue_primitives::v2::SendMessage;
 use snowbridge_outbound_queue_primitives::v2::{Command, Message as OutboundMessage};
 use snowbridge_outbound_queue_primitives::SendError;
 use sp_core::{H160, H256};
-use sp_std::vec;
-use sp_std::vec::Vec;
 
 use crate::AccountId;
 
diff --git a/operator/runtime/mainnet/Cargo.toml b/operator/runtime/mainnet/Cargo.toml
index 186bc7b9e..a4cadb470 100644
--- a/operator/runtime/mainnet/Cargo.toml
+++ b/operator/runtime/mainnet/Cargo.toml
@@ -18,10 +18,11 @@ bridge-hub-common = { workspace = true, optional = true }
 codec = { workspace = true, features = ["derive"] }
 datahaven-runtime-common = { workspace = true }
 dhp-bridge = { workspace = true }
+ethereum = { workspace = true }
 fp-account = { workspace = true, features = ["serde"] }
 fp-evm = { workspace = true, features = ["serde"] }
 fp-rpc = { workspace = true }
-fp-self-contained = { workspace = true, features = ["serde", "try-runtime"] }
+fp-self-contained = { workspace = true, features = ["serde"] }
 frame-benchmarking = { workspace = true, optional = true }
 frame-executive = { workspace = true }
 frame-metadata-hash-extension = { workspace = true }
@@ -120,7 +121,6 @@ sp-offchain = { workspace = true }
 sp-runtime = { workspace = true, features = ["serde"] }
 sp-session = { workspace = true }
 sp-staking = { workspace = true }
-sp-std = { workspace = true }
 sp-storage = { workspace = true }
 sp-transaction-pool = { workspace = true }
 sp-version = { workspace = true, features = ["serde"] }
@@ -190,6 +190,7 @@ default = ["std"]
 std = [
     "codec/std",
     "datahaven-runtime-common/std",
+    "ethereum/std",
     "fp-account/std",
     "fp-evm/std",
     "frame-benchmarking?/std",
@@ -282,7 +283,6 @@ std = [
     "sp-runtime/std",
     "sp-session/std",
     "sp-staking/std",
-    "sp-std/std",
     "sp-storage/std",
     "sp-transaction-pool/std",
     "sp-version/std",
diff --git a/operator/runtime/mainnet/src/benchmarks.rs b/operator/runtime/mainnet/src/benchmarks.rs
index 01d8bf966..f807eabec 100644
--- a/operator/runtime/mainnet/src/benchmarks.rs
+++ b/operator/runtime/mainnet/src/benchmarks.rs
@@ -28,8 +28,7 @@ frame_benchmarking::define_benchmarks!(
     // Substrate pallets
     [pallet_balances, Balances]
     [pallet_session, pallet_session_benchmarking::Pallet::<Runtime>]
-    // FIXME: benchmarking identity fail
-    // [pallet_identity, Identity]
+    [pallet_identity, Identity]
     [pallet_im_online, ImOnline]
     [pallet_multisig, Multisig]
     [pallet_preimage, Preimage]
diff --git a/operator/runtime/mainnet/src/configs/governance/origins.rs b/operator/runtime/mainnet/src/configs/governance/origins.rs
index 277e35a1f..b11603c2a 100644
--- a/operator/runtime/mainnet/src/configs/governance/origins.rs
+++ b/operator/runtime/mainnet/src/configs/governance/origins.rs
@@ -34,7 +34,16 @@ pub mod custom_origins {
     pub struct Pallet<T>(_);
 
     #[derive(
-        PartialEq, Eq, Clone, MaxEncodedLen, Encode, Decode, TypeInfo, RuntimeDebug, EnumString,
+        PartialEq,
+        Eq,
+        Clone,
+        MaxEncodedLen,
+        Encode,
+        Decode,
+        TypeInfo,
+        RuntimeDebug,
+        EnumString,
+        DecodeWithMemTracking,
     )]
     #[strum(serialize_all = "snake_case")]
     #[pallet::origin]
diff --git a/operator/runtime/mainnet/src/configs/governance/referenda.rs b/operator/runtime/mainnet/src/configs/governance/referenda.rs
index b4ceff702..dfc8c8414 100644
--- a/operator/runtime/mainnet/src/configs/governance/referenda.rs
+++ b/operator/runtime/mainnet/src/configs/governance/referenda.rs
@@ -57,6 +57,8 @@ impl pallet_conviction_voting::Config for Runtime {
     type MaxVotes = ConstU32<20>;
     type MaxTurnout = frame_support::traits::TotalIssuanceOf<Balances, AccountId>;
     type Polls = Referenda;
+    type BlockNumberProvider = System;
+    type VotingHooks = ();
 }
 
 impl pallet_whitelist::Config for Runtime {
@@ -79,8 +81,6 @@ impl pallet_whitelist::Config for Runtime {
     type WeightInfo = mainnet_weights::pallet_whitelist::WeightInfo<Runtime>;
 }
 
-pallet_referenda::impl_tracksinfo_get!(TracksInfo, Balance, BlockNumber);
-
 // Referenda Implementation
 impl pallet_referenda::Config for Runtime {
     type WeightInfo = mainnet_weights::pallet_referenda::WeightInfo<Runtime>;
@@ -100,4 +100,5 @@ impl pallet_referenda::Config for Runtime {
     type AlarmInterval = AlarmInterval;
     type Tracks = TracksInfo;
     type Preimages = Preimage;
+    type BlockNumberProvider = System;
 }
diff --git a/operator/runtime/mainnet/src/configs/governance/tracks.rs b/operator/runtime/mainnet/src/configs/governance/tracks.rs
index 74199f9dd..7c1937ca2 100644
--- a/operator/runtime/mainnet/src/configs/governance/tracks.rs
+++ b/operator/runtime/mainnet/src/configs/governance/tracks.rs
@@ -21,9 +21,13 @@
 
 use super::*;
 use crate::currency::{HAVE, KILOHAVE, SUPPLY_FACTOR};
+use alloc::borrow::Cow;
+use core::str::from_utf8;
+use core::str::FromStr;
 use datahaven_runtime_common::time::*;
 use pallet_referenda::Curve;
-use sp_std::str::FromStr;
+use pallet_referenda::Track;
+use sp_runtime::str_array;
 
 const fn percent(x: i32) -> sp_runtime::FixedI64 {
     sp_runtime::FixedI64::from_rational(x as u128, 100)
@@ -32,12 +36,12 @@ const fn permill(x: i32) -> sp_runtime::FixedI64 {
     sp_runtime::FixedI64::from_rational(x as u128, 1000)
 }
 
-const TRACKS_DATA: [(u16, pallet_referenda::TrackInfo<Balance, BlockNumber>); 6] = [
-    (
-        0,
-        pallet_referenda::TrackInfo {
+const TRACKS_DATA: [Track<u16, Balance, BlockNumber>; 6] = [
+    Track {
+        id: 0,
+        info: pallet_referenda::TrackInfo {
             // Name of this track.
-            name: "root",
+            name: str_array("root"),
             // A limit for the number of referenda on this track that can be being decided at once.
             // For Root origin this should generally be just one.
             max_deciding: 5,
@@ -58,11 +62,11 @@ const TRACKS_DATA: [(u16, pallet_referenda::TrackInfo<Balance, BlockNumber>); 6]
             // is needed for approval as a function of time into decision period.
             min_support: Curve::make_linear(14, 14, permill(5), percent(25)),
         },
-    ),
-    (
-        1,
-        pallet_referenda::TrackInfo {
-            name: "whitelisted_caller",
+    },
+    Track {
+        id: 1,
+        info: pallet_referenda::TrackInfo {
+            name: str_array("whitelisted_caller"),
             max_deciding: 100,
             decision_deposit: 2 * KILOHAVE * SUPPLY_FACTOR,
             prepare_period: 10 * MINUTES,
@@ -72,11 +76,11 @@ const TRACKS_DATA: [(u16, pallet_referenda::TrackInfo<Balance, BlockNumber>); 6]
             min_approval: Curve::make_reciprocal(1, 14, percent(96), percent(50), percent(100)),
             min_support: Curve::make_reciprocal(1, 14 * 24, percent(1), percent(0), percent(2)),
         },
-    ),
-    (
-        2,
-        pallet_referenda::TrackInfo {
-            name: "general_admin",
+    },
+    Track {
+        id: 2,
+        info: pallet_referenda::TrackInfo {
+            name: str_array("general_admin"),
             max_deciding: 10,
             decision_deposit: 100 * HAVE * SUPPLY_FACTOR,
             prepare_period: 1 * HOURS,
@@ -86,11 +90,11 @@ const TRACKS_DATA: [(u16, pallet_referenda::TrackInfo<Balance, BlockNumber>); 6]
             min_approval: Curve::make_reciprocal(4, 14, percent(80), percent(50), percent(100)),
             min_support: Curve::make_reciprocal(7, 14, percent(10), percent(0), percent(50)),
         },
-    ),
-    (
-        3,
-        pallet_referenda::TrackInfo {
-            name: "referendum_canceller",
+    },
+    Track {
+        id: 3,
+        info: pallet_referenda::TrackInfo {
+            name: str_array("referendum_canceller"),
             max_deciding: 20,
             decision_deposit: 2 * KILOHAVE * SUPPLY_FACTOR,
             prepare_period: 1 * HOURS,
@@ -100,11 +104,11 @@ const TRACKS_DATA: [(u16, pallet_referenda::TrackInfo<Balance, BlockNumber>); 6]
             min_approval: Curve::make_reciprocal(1, 14, percent(96), percent(50), percent(100)),
             min_support: Curve::make_reciprocal(1, 14, percent(1), percent(0), percent(10)),
         },
-    ),
-    (
-        4,
-        pallet_referenda::TrackInfo {
-            name: "referendum_killer",
+    },
+    Track {
+        id: 4,
+        info: pallet_referenda::TrackInfo {
+            name: str_array("referendum_killer"),
             max_deciding: 100,
             decision_deposit: 4 * KILOHAVE * SUPPLY_FACTOR,
             prepare_period: 1 * HOURS,
@@ -114,11 +118,11 @@ const TRACKS_DATA: [(u16, pallet_referenda::TrackInfo<Balance, BlockNumber>); 6]
             min_approval: Curve::make_reciprocal(1, 14, percent(96), percent(50), percent(100)),
             min_support: Curve::make_reciprocal(1, 14, percent(1), percent(0), percent(10)),
         },
-    ),
-    (
-        5,
-        pallet_referenda::TrackInfo {
-            name: "fast_general_admin",
+    },
+    Track {
+        id: 5,
+        info: pallet_referenda::TrackInfo {
+            name: str_array("fast_general_admin"),
             max_deciding: 10,
             decision_deposit: 100 * HAVE * SUPPLY_FACTOR,
             prepare_period: 1 * HOURS,
@@ -128,25 +132,26 @@ const TRACKS_DATA: [(u16, pallet_referenda::TrackInfo<Balance, BlockNumber>); 6]
             min_approval: Curve::make_reciprocal(4, 14, percent(80), percent(50), percent(100)),
             min_support: Curve::make_reciprocal(5, 14, percent(1), percent(0), percent(50)),
         },
-    ),
+    },
 ];
 
 pub struct TracksInfo;
 impl pallet_referenda::TracksInfo<Balance, BlockNumber> for TracksInfo {
     type Id = u16;
     type RuntimeOrigin = <RuntimeOrigin as frame_support::traits::OriginTrait>::PalletsOrigin;
-    fn tracks() -> &'static [(Self::Id, pallet_referenda::TrackInfo<Balance, BlockNumber>)] {
-        &TRACKS_DATA[..]
+
+    fn tracks() -> impl Iterator<Item = Cow<'static, Track<Self::Id, Balance, BlockNumber>>> {
+        TRACKS_DATA.iter().map(Cow::Borrowed)
     }
     fn track_for(id: &Self::RuntimeOrigin) -> Result<Self::Id, ()> {
         if let Ok(system_origin) = frame_system::RawOrigin::try_from(id.clone()) {
             match system_origin {
                 frame_system::RawOrigin::Root => {
-                    if let Some((track_id, _)) = Self::tracks()
+                    if let Some(track) = Self::tracks()
                         .into_iter()
-                        .find(|(_, track)| track.name == "root")
+                        .find(|track| track.info.name == str_array("root"))
                     {
-                        Ok(*track_id)
+                        Ok(track.id)
                     } else {
                         Err(())
                     }
@@ -154,14 +159,18 @@ impl pallet_referenda::TracksInfo<Balance, BlockNumber> for TracksInfo {
                 _ => Err(()),
             }
         } else if let Ok(custom_origin) = custom_origins::Origin::try_from(id.clone()) {
-            if let Some((track_id, _)) = Self::tracks().into_iter().find(|(_, track)| {
-                if let Ok(track_custom_origin) = custom_origins::Origin::from_str(track.name) {
+            if let Some(track) = Self::tracks().into_iter().find(|track| {
+                let Ok(track_name) = from_utf8(&track.info.name) else {
+                    return false;
+                };
+                let track_name = track_name.trim_end_matches('\0');
+                if let Ok(track_custom_origin) = custom_origins::Origin::from_str(track_name) {
                     track_custom_origin == custom_origin
                 } else {
                     false
                 }
             }) {
-                Ok(*track_id)
+                Ok(track.id)
             } else {
                 Err(())
             }
@@ -174,13 +183,15 @@ impl pallet_referenda::TracksInfo<Balance, BlockNumber> for TracksInfo {
 #[test]
 /// To ensure voters are always locked into their vote
 fn vote_locking_always_longer_than_enactment_period() {
-    for (_, track) in TRACKS_DATA {
+    for track in TRACKS_DATA {
+        let track_name = from_utf8(&track.info.name).unwrap();
+        let track_name = track_name.trim_end_matches('\0');
         assert!(
             <Runtime as pallet_conviction_voting::Config>::VoteLockingPeriod::get()
-                >= track.min_enactment_period,
+                >= track.info.min_enactment_period,
             "Track {} has enactment period {} < vote locking period {}",
-            track.name,
-            track.min_enactment_period,
+            track_name,
+            track.info.min_enactment_period,
             <Runtime as pallet_conviction_voting::Config>::VoteLockingPeriod::get(),
         );
     }
@@ -188,10 +199,12 @@ fn vote_locking_always_longer_than_enactment_period() {
 
 #[test]
 fn all_tracks_have_origins() {
-    for (_, track) in TRACKS_DATA {
+    for track in TRACKS_DATA {
+        let track_name = from_utf8(&track.info.name).unwrap();
+        let track_name = track_name.trim_end_matches('\0');
         // check name.into() is successful either converts into "root" or custom origin
-        let track_is_root = track.name == "root";
-        let track_has_custom_origin = custom_origins::Origin::from_str(track.name).is_ok();
+        let track_is_root = track_name == "root";
+        let track_has_custom_origin = custom_origins::Origin::from_str(track_name).is_ok();
         assert!(track_is_root || track_has_custom_origin);
     }
 }
diff --git a/operator/runtime/mainnet/src/configs/mod.rs b/operator/runtime/mainnet/src/configs/mod.rs
index 48f1aad9b..e7ad43bed 100644
--- a/operator/runtime/mainnet/src/configs/mod.rs
+++ b/operator/runtime/mainnet/src/configs/mod.rs
@@ -30,8 +30,9 @@ use super::{
     Signature, System, Timestamp, Treasury, TxPause, BLOCK_HASH_COUNT, EXTRINSIC_BASE_WEIGHT,
     MAXIMUM_BLOCK_WEIGHT, NORMAL_BLOCK_WEIGHT, NORMAL_DISPATCH_RATIO, SLOT_DURATION, VERSION,
 };
+use alloc::vec::Vec;
 use alloy_core::primitives::Address;
-use codec::{Decode, Encode, MaxEncodedLen};
+use codec::{Decode, DecodeWithMemTracking, Encode, MaxEncodedLen};
 use scale_info::TypeInfo;
 use sp_runtime::{traits::AccountIdConversion, RuntimeDebug};
 
@@ -48,6 +49,7 @@ use sp_runtime::{traits::AccountIdConversion, RuntimeDebug};
     Decode,
     RuntimeDebug,
     MaxEncodedLen,
+    DecodeWithMemTracking,
     TypeInfo,
     serde::Serialize,
     serde::Deserialize,
@@ -76,6 +78,7 @@ impl Default for ProxyType {
         Self::Any
     }
 }
+use core::convert::{From, Into};
 use datahaven_runtime_common::{
     deal_with_fees::{
         DealWithEthereumBaseFees, DealWithEthereumPriorityFees, DealWithSubstrateFeesAndTip,
@@ -141,10 +144,6 @@ use sp_runtime::{
     FixedPointNumber, Perbill, Perquintill,
 };
 use sp_staking::EraIndex;
-use sp_std::{
-    convert::{From, Into},
-    prelude::*,
-};
 use sp_version::RuntimeVersion;
 use xcm::latest::NetworkId;
 use xcm::prelude::*;
@@ -396,6 +395,7 @@ impl pallet_session::Config for Runtime {
     type SessionHandler = <SessionKeys as OpaqueKeys>::KeyTypeIdProviders;
     type Keys = SessionKeys;
     type WeightInfo = mainnet_weights::pallet_session::WeightInfo<Runtime>;
+    type DisablingStrategy = ();
 }
 
 parameter_types! {
@@ -593,6 +593,7 @@ impl pallet_scheduler::Config for Runtime {
     type OriginPrivilegeCmp = EqualPrivilegeOnly;
     type Preimages = Preimage;
     type WeightInfo = mainnet_weights::pallet_scheduler::WeightInfo<Runtime>;
+    type BlockNumberProvider = System;
 }
 
 parameter_types! {
@@ -656,8 +657,7 @@ impl pallet_identity::Config for Runtime {
     type UsernameDeposit = UsernameDeposit;
     type UsernameGracePeriod = UsernameGracePeriod;
 
-    // TODO: Re-enable after upgrade to Polkadot SDK stable2412-8
-    // see https://github.com/paritytech/polkadot-sdk/releases/tag/polkadot-stable2412-8
+    // TODO: Replace by Identity pallet's BenchmarkHelper when available (stable2506).
     // #[cfg(feature = "runtime-benchmarks")]
     // fn benchmark_helper(message: &[u8]) -> (Vec<u8>, Vec<u8>) {
     //     let public = sp_io::crypto::ecdsa_generate(0.into(), None);
@@ -687,6 +687,7 @@ impl pallet_multisig::Config for Runtime {
     type DepositFactor = DepositFactor;
     type MaxSignatories = MaxSignatories;
     type WeightInfo = mainnet_weights::pallet_multisig::WeightInfo<Runtime>;
+    type BlockNumberProvider = System;
 }
 
 parameter_types! {
@@ -852,6 +853,7 @@ impl pallet_proxy::Config for Runtime {
     type CallHasher = sp_runtime::traits::BlakeTwo256;
     type AnnouncementDepositBase = AnnouncementDepositBase;
     type AnnouncementDepositFactor = AnnouncementDepositFactor;
+    type BlockNumberProvider = System;
 }
 
 impl pallet_proxy_genesis_companion::Config for Runtime {
@@ -1053,6 +1055,8 @@ impl pallet_evm::Config for Runtime {
     type GasLimitPovSizeRatio = GasLimitPovSizeRatio;
     type GasLimitStorageGrowthRatio = GasLimitStorageGrowthRatio;
     type Timestamp = Timestamp;
+    type CreateOriginFilter = ();
+    type CreateInnerOriginFilter = ();
     type WeightInfo = mainnet_weights::pallet_evm::WeightInfo<Runtime>;
 }
 
diff --git a/operator/runtime/mainnet/src/configs/runtime_params.rs b/operator/runtime/mainnet/src/configs/runtime_params.rs
index 9d3cdeb3c..914381c04 100644
--- a/operator/runtime/mainnet/src/configs/runtime_params.rs
+++ b/operator/runtime/mainnet/src/configs/runtime_params.rs
@@ -15,11 +15,11 @@
 // along with DataHaven.  If not, see <http://www.gnu.org/licenses/>.
 
 use crate::Runtime;
+use alloc::vec;
 use frame_support::dynamic_params::{dynamic_pallet_params, dynamic_params};
 use hex_literal::hex;
 use sp_core::{ConstU32, H160, H256};
 use sp_runtime::{BoundedVec, Perbill};
-use sp_std::vec;
 
 use crate::configs::storagehub::{ChallengeTicksTolerance, ReplicationTargetType, SpMinDeposit};
 use crate::currency::{GIGAWEI, HAVE, SUPPLY_FACTOR};
diff --git a/operator/runtime/mainnet/src/configs/storagehub/client.rs b/operator/runtime/mainnet/src/configs/storagehub/client.rs
index 110bec9da..1e0bf3396 100644
--- a/operator/runtime/mainnet/src/configs/storagehub/client.rs
+++ b/operator/runtime/mainnet/src/configs/storagehub/client.rs
@@ -50,6 +50,7 @@ impl ExtensionOperations<crate::RuntimeCall, crate::Runtime> for crate::SignedEx
                 minimal.tip,
             ),
             frame_metadata_hash_extension::CheckMetadataHash::<crate::Runtime>::new(false),
+            frame_system::WeightReclaim::<crate::Runtime>::new(),
         )
     }
 }
diff --git a/operator/runtime/mainnet/src/configs/storagehub/mod.rs b/operator/runtime/mainnet/src/configs/storagehub/mod.rs
index 79a71b143..49b6bad6b 100644
--- a/operator/runtime/mainnet/src/configs/storagehub/mod.rs
+++ b/operator/runtime/mainnet/src/configs/storagehub/mod.rs
@@ -19,7 +19,7 @@ use super::HAVE;
 #[cfg(feature = "runtime-benchmarks")]
 use super::MICROHAVE;
 use super::{
-    AccountId, Balance, Balances, BlockNumber, Hash, RuntimeEvent, RuntimeHoldReason,
+    AccountId, Balance, Balances, BlockNumber, Hash, RuntimeEvent, RuntimeHoldReason, System,
     TreasuryAccount,
 };
 use crate::configs::runtime_params::dynamic_params::runtime_config;
@@ -27,7 +27,10 @@ use crate::{
     BucketNfts, Nfts, PaymentStreams, ProofsDealer, Providers, Runtime, Signature, WeightToFee,
     HOURS,
 };
+use alloc::{vec, vec::Vec};
+use core::convert::{From, Into};
 use core::marker::PhantomData;
+
 #[cfg(feature = "runtime-benchmarks")]
 use datahaven_runtime_common::benchmarking::StorageHubBenchmarking;
 use datahaven_runtime_common::time::{DAYS, MINUTES};
@@ -59,8 +62,6 @@ use sp_runtime::traits::Verify;
 use sp_runtime::traits::Zero;
 use sp_runtime::SaturatedConversion;
 use sp_runtime::{traits::BlakeTwo256, Perbill};
-use sp_std::convert::{From, Into};
-use sp_std::{vec, vec::Vec};
 use sp_trie::{LayoutV1, TrieConfiguration, TrieLayout};
 
 #[cfg(feature = "std")]
@@ -126,6 +127,7 @@ impl pallet_nfts::Config for Runtime {
     type OffchainPublic = <Signature as Verify>::Signer;
     type WeightInfo = crate::weights::pallet_nfts::WeightInfo<Runtime>;
     type Locker = ();
+    type BlockNumberProvider = System;
     #[cfg(feature = "runtime-benchmarks")]
     type Helper = benchmark_helpers::NftHelper;
 }
@@ -626,16 +628,16 @@ parameter_types! {
 /// "\x19Ethereum Signed Message:\n" + len(message) + message"
 pub struct Eip191Adapter;
 impl shp_traits::MessageAdapter for Eip191Adapter {
-    fn bytes_to_verify(message: &[u8]) -> Vec<u8> {
+    fn bytes_to_verify(intention: &[u8], _context: &[u8]) -> Vec<u8> {
         const PREFIX: &str = "\x19Ethereum Signed Message:\n";
-        let len = message.len();
+        let len = intention.len();
         let mut len_string_buffer = itoa::Buffer::new();
         let len_string = len_string_buffer.format(len);
 
         let mut eth_message = Vec::with_capacity(PREFIX.len() + len_string.len() + len);
         eth_message.extend_from_slice(PREFIX.as_bytes());
         eth_message.extend_from_slice(len_string.as_bytes());
-        eth_message.extend_from_slice(message);
+        eth_message.extend_from_slice(intention);
         eth_message
     }
 }
@@ -699,6 +701,8 @@ impl pallet_file_system::Config for Runtime {
     type OffchainPublicKey = <Signature as Verify>::Signer;
     type MaxFileDeletionsPerExtrinsic = ConstU32<100>;
     type IntentionMsgAdapter = Eip191Adapter;
+    type MaxBspVolunteers = ConstU32<1000>;
+    type MaxMspRespondFileKeys = ConstU32<10>;
 }
 
 impl MostlyStablePriceIndexUpdaterConfig for Runtime {
diff --git a/operator/runtime/mainnet/src/genesis_config_presets.rs b/operator/runtime/mainnet/src/genesis_config_presets.rs
index 321df0a1d..5eb01dc33 100644
--- a/operator/runtime/mainnet/src/genesis_config_presets.rs
+++ b/operator/runtime/mainnet/src/genesis_config_presets.rs
@@ -56,6 +56,7 @@ fn testnet_genesis(
                 .cloned()
                 .map(|k| (k, 1u128 << 110))
                 .collect::<Vec<_>>(),
+            dev_accounts: Default::default(),
         },
         babe: pallet_babe::GenesisConfig {
             epoch_config: BABE_GENESIS_EPOCH_CONFIG,
diff --git a/operator/runtime/mainnet/src/lib.rs b/operator/runtime/mainnet/src/lib.rs
index f295318aa..efc6df509 100644
--- a/operator/runtime/mainnet/src/lib.rs
+++ b/operator/runtime/mainnet/src/lib.rs
@@ -31,14 +31,18 @@ pub mod weights;
 pub use configs::governance;
 pub use configs::Precompiles;
 
-// TODO: Temporary workaround before upgrading to latest polkadot-sdk - fix https://github.com/paritytech/polkadot-sdk/pull/6435
+// Aliases required by define_benchmarks! for pallet_collective instances.
+// PR #6435 (in stable2503) fixes the underlying issue, so these can be removed
+// when benchmarks are regenerated and weight files renamed accordingly.
 #[allow(unused_imports)]
 use pallet_collective as pallet_collective_treasury_council;
 #[allow(unused_imports)]
 use pallet_collective as pallet_collective_technical_committee;
 
+use alloc::collections::btree_map::BTreeMap;
 use alloc::{borrow::Cow, vec::Vec};
 use codec::Encode;
+use ethereum::AuthorizationList;
 use fp_rpc::TransactionStatus;
 use frame_support::{
     genesis_builder_helper::{build_state, get_preset},
@@ -54,7 +58,7 @@ pub use frame_system::Call as SystemCall;
 pub use pallet_balances::Call as BalancesCall;
 use pallet_ethereum::{Call::transact, Transaction as EthereumTransaction};
 use pallet_evm::{Account as EVMAccount, FeeCalculator, GasWeightMapping, Runner};
-use pallet_file_system::types::StorageRequestMetadata;
+use pallet_file_system::types::{PendingStopStoringRequest, StorageRequestMetadata};
 use pallet_file_system_runtime_api::*;
 use pallet_grandpa::{fg_primitives, AuthorityId as GrandpaId};
 use pallet_payment_streams_runtime_api::*;
@@ -85,7 +89,6 @@ use sp_runtime::{
     transaction_validity::{InvalidTransaction, TransactionSource},
     ApplyExtrinsicResult, Perbill, Permill,
 };
-use sp_std::collections::btree_map::BTreeMap;
 #[cfg(feature = "std")]
 use sp_version::NativeVersion;
 use sp_version::RuntimeVersion;
@@ -193,16 +196,10 @@ pub const NORMAL_BLOCK_WEIGHT: Weight = MAXIMUM_BLOCK_WEIGHT.saturating_mul(3).s
 pub const EXTRINSIC_BASE_WEIGHT: Weight = Weight::from_parts(10000 * WEIGHT_PER_GAS, 0);
 
 // Existential deposit.
-#[cfg(not(feature = "runtime-benchmarks"))]
+// PR #7379 (included in stable2503) ensures benchmarks handle ED=0 internally.
 parameter_types! {
     pub const ExistentialDeposit: Balance = 0;
 }
-#[cfg(feature = "runtime-benchmarks")]
-parameter_types! {
-    // TODO: Change ED to 1 after upgrade to Polkadot SDK stable2503
-    // cfr. https://github.com/paritytech/polkadot-sdk/pull/7379
-    pub const ExistentialDeposit: Balance = 1;
-}
 
 /// The version information used to identify this runtime when compiled natively.
 #[cfg(feature = "std")]
@@ -227,6 +224,7 @@ pub type SignedExtra = (
     frame_system::CheckWeight<Runtime>,
     pallet_transaction_payment::ChargeTransactionPayment<Runtime>,
     frame_metadata_hash_extension::CheckMetadataHash<Runtime>,
+    frame_system::WeightReclaim<Runtime>,
 );
 
 /// Unchecked extrinsic type as expected by this runtime.
@@ -1073,6 +1071,7 @@ impl_runtime_apis! {
             nonce: Option<U256>,
             estimate: bool,
             access_list: Option<Vec<(H160, Vec<H256>)>>,
+            authorization_list: Option<AuthorizationList>,
         ) -> Result<pallet_evm::CallInfo, sp_runtime::DispatchError> {
             let config = if estimate {
                 let mut config = <Runtime as pallet_evm::Config>::config().clone();
@@ -1102,6 +1101,7 @@ impl_runtime_apis! {
                 max_priority_fee_per_gas,
                 nonce,
                 access_list.unwrap_or_default(),
+                authorization_list.unwrap_or_default(),
                 is_transactional,
                 validate,
                 Some(weight_limit),
@@ -1120,6 +1120,7 @@ impl_runtime_apis! {
             nonce: Option<U256>,
             estimate: bool,
             access_list: Option<Vec<(H160, Vec<H256>)>>,
+            authorization_list: Option<AuthorizationList>,
         ) -> Result<pallet_evm::CreateInfo, sp_runtime::DispatchError> {
             let config = if estimate {
                 let mut config = <Runtime as pallet_evm::Config>::config().clone();
@@ -1153,6 +1154,7 @@ impl_runtime_apis! {
                 max_priority_fee_per_gas,
                 nonce,
                 access_list.unwrap_or_default(),
+                authorization_list.unwrap_or_default(),
                 is_transactional,
                 validate,
                 Some(weight_limit),
@@ -1232,7 +1234,7 @@ impl_runtime_apis! {
     //║                                        STORAGEHUB APIS                                                        ║
     //╚═══════════════════════════════════════════════════════════════════════════════════════════════════════════════╝
 
-    impl pallet_file_system_runtime_api::FileSystemApi<Block, AccountId, BackupStorageProviderId<Runtime>, MainStorageProviderId<Runtime>, H256, BlockNumber, ChunkId, BucketId<Runtime>, StorageRequestMetadata<Runtime>, BucketId<Runtime>, StorageDataUnit<Runtime>, H256> for Runtime {
+    impl pallet_file_system_runtime_api::FileSystemApi<Block, AccountId, BackupStorageProviderId<Runtime>, MainStorageProviderId<Runtime>, H256, BlockNumber, ChunkId, BucketId<Runtime>, StorageRequestMetadata<Runtime>, BucketId<Runtime>, StorageDataUnit<Runtime>, H256, PendingStopStoringRequest<Runtime>> for Runtime {
         fn is_storage_request_open_to_volunteers(file_key: H256) -> Result<bool, IsStorageRequestOpenToVolunteersError> {
             FileSystem::is_storage_request_open_to_volunteers(file_key)
         }
@@ -1279,6 +1281,15 @@ impl_runtime_apis! {
         fn get_max_batch_confirm_storage_requests() -> BlockNumber {
             FileSystem::get_max_batch_confirm_storage_requests()
         }
+        fn query_min_wait_for_stop_storing() -> BlockNumber {
+            FileSystem::query_min_wait_for_stop_storing()
+        }
+        fn has_pending_stop_storing_request(bsp_id: BackupStorageProviderId<Runtime>, file_key: H256) -> bool {
+            FileSystem::has_pending_stop_storing_request(bsp_id, file_key)
+        }
+        fn pending_stop_storing_requests_by_bsp(bsp_id: BackupStorageProviderId<Runtime>) -> BTreeMap<H256, PendingStopStoringRequest<Runtime>> {
+            FileSystem::pending_stop_storing_requests_by_bsp(bsp_id)
+        }
     }
 
     impl pallet_payment_streams_runtime_api::PaymentStreamsApi<Block, ProviderIdFor<Runtime>, Balance, AccountId> for Runtime {
@@ -1414,7 +1425,7 @@ impl_runtime_apis! {
         fn compute_signed_extra_implicit(
             era: sp_runtime::generic::Era,
             enable_metadata: bool,
-        ) -> Result<sp_std::vec::Vec<u8>, sp_runtime::transaction_validity::TransactionValidityError> {
+        ) -> Result<alloc::vec::Vec<u8>, sp_runtime::transaction_validity::TransactionValidityError> {
             // Build the SignedExtra tuple with minimal values; only `era` and `enable_metadata`
             // influence the implicit. Other extensions have `()` implicit.
             let extra: SignedExtra = (
@@ -1427,6 +1438,7 @@ impl_runtime_apis! {
                 frame_system::CheckWeight::<Runtime>::new(),
                 pallet_transaction_payment::ChargeTransactionPayment::<Runtime>::from(<Balance as Default>::default()),
                 frame_metadata_hash_extension::CheckMetadataHash::<Runtime>::new(enable_metadata),
+                frame_system::WeightReclaim::<Runtime>::new(),
             );
             let implicit = <SignedExtra as sp_runtime::traits::TransactionExtension<RuntimeCall>>::implicit(&extra)?;
             Ok(implicit.encode())
diff --git a/operator/runtime/mainnet/src/weights/frame_system.rs b/operator/runtime/mainnet/src/weights/frame_system.rs
index 56f672bbd..8cfa2ed77 100644
--- a/operator/runtime/mainnet/src/weights/frame_system.rs
+++ b/operator/runtime/mainnet/src/weights/frame_system.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `frame_system`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/mainnet/src/weights/pallet_babe.rs b/operator/runtime/mainnet/src/weights/pallet_babe.rs
index d6f48f946..4392b7caa 100644
--- a/operator/runtime/mainnet/src/weights/pallet_babe.rs
+++ b/operator/runtime/mainnet/src/weights/pallet_babe.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_babe`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/mainnet/src/weights/pallet_balances.rs b/operator/runtime/mainnet/src/weights/pallet_balances.rs
index 69b60f9ee..47e0ebde9 100644
--- a/operator/runtime/mainnet/src/weights/pallet_balances.rs
+++ b/operator/runtime/mainnet/src/weights/pallet_balances.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_balances`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/mainnet/src/weights/pallet_beefy_mmr.rs b/operator/runtime/mainnet/src/weights/pallet_beefy_mmr.rs
index 1693f449d..133329571 100644
--- a/operator/runtime/mainnet/src/weights/pallet_beefy_mmr.rs
+++ b/operator/runtime/mainnet/src/weights/pallet_beefy_mmr.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_beefy_mmr`.
 pub struct WeightInfo<T>(PhantomData<T>);
@@ -90,4 +90,6 @@ impl<T: frame_system::Config> pallet_beefy_mmr::WeightInfo for WeightInfo<T> {
 			.saturating_add(Weight::from_parts(1_511_565, 0).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 	}
+
+	fn n_leafs_proof_is_optimal(_: u32) -> sp_runtime::Weight { todo!() }
 }
diff --git a/operator/runtime/mainnet/src/weights/pallet_collective_technical_committee.rs b/operator/runtime/mainnet/src/weights/pallet_collective_technical_committee.rs
index 2908a4de0..3a0afab2b 100644
--- a/operator/runtime/mainnet/src/weights/pallet_collective_technical_committee.rs
+++ b/operator/runtime/mainnet/src/weights/pallet_collective_technical_committee.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_collective_technical_committee`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/mainnet/src/weights/pallet_collective_treasury_council.rs b/operator/runtime/mainnet/src/weights/pallet_collective_treasury_council.rs
index 5dc0ea6c6..d04373b6f 100644
--- a/operator/runtime/mainnet/src/weights/pallet_collective_treasury_council.rs
+++ b/operator/runtime/mainnet/src/weights/pallet_collective_treasury_council.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_collective_treasury_council`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/mainnet/src/weights/pallet_conviction_voting.rs b/operator/runtime/mainnet/src/weights/pallet_conviction_voting.rs
index 716018196..2de9a383b 100644
--- a/operator/runtime/mainnet/src/weights/pallet_conviction_voting.rs
+++ b/operator/runtime/mainnet/src/weights/pallet_conviction_voting.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_conviction_voting`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/mainnet/src/weights/pallet_datahaven_native_transfer.rs b/operator/runtime/mainnet/src/weights/pallet_datahaven_native_transfer.rs
index 12c8125aa..6dae14ed5 100644
--- a/operator/runtime/mainnet/src/weights/pallet_datahaven_native_transfer.rs
+++ b/operator/runtime/mainnet/src/weights/pallet_datahaven_native_transfer.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_datahaven_native_transfer`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/mainnet/src/weights/pallet_evm.rs b/operator/runtime/mainnet/src/weights/pallet_evm.rs
index 21a49e584..c1efba9c5 100644
--- a/operator/runtime/mainnet/src/weights/pallet_evm.rs
+++ b/operator/runtime/mainnet/src/weights/pallet_evm.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_evm`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/mainnet/src/weights/pallet_external_validator_slashes.rs b/operator/runtime/mainnet/src/weights/pallet_external_validator_slashes.rs
index deb5261fe..757af34cf 100644
--- a/operator/runtime/mainnet/src/weights/pallet_external_validator_slashes.rs
+++ b/operator/runtime/mainnet/src/weights/pallet_external_validator_slashes.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_external_validator_slashes`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/mainnet/src/weights/pallet_external_validators.rs b/operator/runtime/mainnet/src/weights/pallet_external_validators.rs
index f14183e49..d6a4a9379 100644
--- a/operator/runtime/mainnet/src/weights/pallet_external_validators.rs
+++ b/operator/runtime/mainnet/src/weights/pallet_external_validators.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_external_validators`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/mainnet/src/weights/pallet_external_validators_rewards.rs b/operator/runtime/mainnet/src/weights/pallet_external_validators_rewards.rs
index 10854100d..764ade912 100644
--- a/operator/runtime/mainnet/src/weights/pallet_external_validators_rewards.rs
+++ b/operator/runtime/mainnet/src/weights/pallet_external_validators_rewards.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_external_validators_rewards`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/mainnet/src/weights/pallet_grandpa.rs b/operator/runtime/mainnet/src/weights/pallet_grandpa.rs
index 7250e7d11..c24365573 100644
--- a/operator/runtime/mainnet/src/weights/pallet_grandpa.rs
+++ b/operator/runtime/mainnet/src/weights/pallet_grandpa.rs
@@ -51,7 +51,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_grandpa`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/mainnet/src/weights/pallet_im_online.rs b/operator/runtime/mainnet/src/weights/pallet_im_online.rs
index 45d02cfa1..64f345adf 100644
--- a/operator/runtime/mainnet/src/weights/pallet_im_online.rs
+++ b/operator/runtime/mainnet/src/weights/pallet_im_online.rs
@@ -33,7 +33,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_im_online`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/mainnet/src/weights/pallet_message_queue.rs b/operator/runtime/mainnet/src/weights/pallet_message_queue.rs
index 4515966e8..59bae039f 100644
--- a/operator/runtime/mainnet/src/weights/pallet_message_queue.rs
+++ b/operator/runtime/mainnet/src/weights/pallet_message_queue.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_message_queue`.
 pub struct WeightInfo<T>(PhantomData<T>);
@@ -178,4 +178,8 @@ impl<T: frame_system::Config> pallet_message_queue::WeightInfo for WeightInfo<T>
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
+
+	fn set_service_head() -> Weight {
+		todo!()
+	}
 }
diff --git a/operator/runtime/mainnet/src/weights/pallet_mmr.rs b/operator/runtime/mainnet/src/weights/pallet_mmr.rs
index c4d86617f..4fd4bf9b1 100644
--- a/operator/runtime/mainnet/src/weights/pallet_mmr.rs
+++ b/operator/runtime/mainnet/src/weights/pallet_mmr.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_mmr`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/mainnet/src/weights/pallet_multisig.rs b/operator/runtime/mainnet/src/weights/pallet_multisig.rs
index e817907a6..a66d67ab8 100644
--- a/operator/runtime/mainnet/src/weights/pallet_multisig.rs
+++ b/operator/runtime/mainnet/src/weights/pallet_multisig.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_multisig`.
 pub struct WeightInfo<T>(PhantomData<T>);
@@ -169,4 +169,6 @@ impl<T: frame_system::Config> pallet_multisig::WeightInfo for WeightInfo<T> {
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
+
+	fn poke_deposit(_: u32) -> sp_runtime::Weight { todo!() }
 }
diff --git a/operator/runtime/mainnet/src/weights/pallet_nfts.rs b/operator/runtime/mainnet/src/weights/pallet_nfts.rs
index 4ffc4faf7..01c8d9472 100644
--- a/operator/runtime/mainnet/src/weights/pallet_nfts.rs
+++ b/operator/runtime/mainnet/src/weights/pallet_nfts.rs
@@ -33,7 +33,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_nfts`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/mainnet/src/weights/pallet_parameters.rs b/operator/runtime/mainnet/src/weights/pallet_parameters.rs
index bb54ca818..6a10a5b24 100644
--- a/operator/runtime/mainnet/src/weights/pallet_parameters.rs
+++ b/operator/runtime/mainnet/src/weights/pallet_parameters.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_parameters`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/mainnet/src/weights/pallet_payment_streams.rs b/operator/runtime/mainnet/src/weights/pallet_payment_streams.rs
index 3022e4da6..436712a08 100644
--- a/operator/runtime/mainnet/src/weights/pallet_payment_streams.rs
+++ b/operator/runtime/mainnet/src/weights/pallet_payment_streams.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_payment_streams`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/mainnet/src/weights/pallet_preimage.rs b/operator/runtime/mainnet/src/weights/pallet_preimage.rs
index 8acba067c..53f354114 100644
--- a/operator/runtime/mainnet/src/weights/pallet_preimage.rs
+++ b/operator/runtime/mainnet/src/weights/pallet_preimage.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_preimage`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/mainnet/src/weights/pallet_proofs_dealer.rs b/operator/runtime/mainnet/src/weights/pallet_proofs_dealer.rs
index 1d9541c82..9d9bbc1f5 100644
--- a/operator/runtime/mainnet/src/weights/pallet_proofs_dealer.rs
+++ b/operator/runtime/mainnet/src/weights/pallet_proofs_dealer.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_proofs_dealer`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/mainnet/src/weights/pallet_proxy.rs b/operator/runtime/mainnet/src/weights/pallet_proxy.rs
index 2902eccdf..30300e761 100644
--- a/operator/runtime/mainnet/src/weights/pallet_proxy.rs
+++ b/operator/runtime/mainnet/src/weights/pallet_proxy.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_proxy`.
 pub struct WeightInfo<T>(PhantomData<T>);
@@ -224,4 +224,8 @@ impl<T: frame_system::Config> pallet_proxy::WeightInfo for WeightInfo<T> {
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
+
+	fn poke_deposit() -> Weight {
+		todo!()
+	}
 }
diff --git a/operator/runtime/mainnet/src/weights/pallet_randomness.rs b/operator/runtime/mainnet/src/weights/pallet_randomness.rs
index 5f7fffcdc..aa3ca7e39 100644
--- a/operator/runtime/mainnet/src/weights/pallet_randomness.rs
+++ b/operator/runtime/mainnet/src/weights/pallet_randomness.rs
@@ -33,7 +33,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_randomness`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/mainnet/src/weights/pallet_referenda.rs b/operator/runtime/mainnet/src/weights/pallet_referenda.rs
index 2ed78f588..a0cecbec6 100644
--- a/operator/runtime/mainnet/src/weights/pallet_referenda.rs
+++ b/operator/runtime/mainnet/src/weights/pallet_referenda.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_referenda`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/mainnet/src/weights/pallet_safe_mode.rs b/operator/runtime/mainnet/src/weights/pallet_safe_mode.rs
index a6fc4eaa4..2816f5afc 100644
--- a/operator/runtime/mainnet/src/weights/pallet_safe_mode.rs
+++ b/operator/runtime/mainnet/src/weights/pallet_safe_mode.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_safe_mode`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/mainnet/src/weights/pallet_scheduler.rs b/operator/runtime/mainnet/src/weights/pallet_scheduler.rs
index ba7694926..ce780679b 100644
--- a/operator/runtime/mainnet/src/weights/pallet_scheduler.rs
+++ b/operator/runtime/mainnet/src/weights/pallet_scheduler.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_scheduler`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/mainnet/src/weights/pallet_session.rs b/operator/runtime/mainnet/src/weights/pallet_session.rs
index 19df1fa9f..cc61e16fc 100644
--- a/operator/runtime/mainnet/src/weights/pallet_session.rs
+++ b/operator/runtime/mainnet/src/weights/pallet_session.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_session`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/mainnet/src/weights/pallet_storage_providers.rs b/operator/runtime/mainnet/src/weights/pallet_storage_providers.rs
index 7ec61ac95..4119cd577 100644
--- a/operator/runtime/mainnet/src/weights/pallet_storage_providers.rs
+++ b/operator/runtime/mainnet/src/weights/pallet_storage_providers.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_storage_providers`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/mainnet/src/weights/pallet_sudo.rs b/operator/runtime/mainnet/src/weights/pallet_sudo.rs
index e9677288c..657d51d56 100644
--- a/operator/runtime/mainnet/src/weights/pallet_sudo.rs
+++ b/operator/runtime/mainnet/src/weights/pallet_sudo.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_sudo`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/mainnet/src/weights/pallet_timestamp.rs b/operator/runtime/mainnet/src/weights/pallet_timestamp.rs
index a00d76f5c..f7b75bcfc 100644
--- a/operator/runtime/mainnet/src/weights/pallet_timestamp.rs
+++ b/operator/runtime/mainnet/src/weights/pallet_timestamp.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_timestamp`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/mainnet/src/weights/pallet_transaction_payment.rs b/operator/runtime/mainnet/src/weights/pallet_transaction_payment.rs
index afa6a229a..4f09c9c7f 100644
--- a/operator/runtime/mainnet/src/weights/pallet_transaction_payment.rs
+++ b/operator/runtime/mainnet/src/weights/pallet_transaction_payment.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_transaction_payment`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/mainnet/src/weights/pallet_treasury.rs b/operator/runtime/mainnet/src/weights/pallet_treasury.rs
index 0794cf72c..9c7e4760b 100644
--- a/operator/runtime/mainnet/src/weights/pallet_treasury.rs
+++ b/operator/runtime/mainnet/src/weights/pallet_treasury.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_treasury`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/mainnet/src/weights/pallet_tx_pause.rs b/operator/runtime/mainnet/src/weights/pallet_tx_pause.rs
index 77db6715e..51f1f6772 100644
--- a/operator/runtime/mainnet/src/weights/pallet_tx_pause.rs
+++ b/operator/runtime/mainnet/src/weights/pallet_tx_pause.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_tx_pause`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/mainnet/src/weights/pallet_utility.rs b/operator/runtime/mainnet/src/weights/pallet_utility.rs
index a6247ad74..b9915e724 100644
--- a/operator/runtime/mainnet/src/weights/pallet_utility.rs
+++ b/operator/runtime/mainnet/src/weights/pallet_utility.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_utility`.
 pub struct WeightInfo<T>(PhantomData<T>);
@@ -119,4 +119,11 @@ impl<T: frame_system::Config> pallet_utility::WeightInfo for WeightInfo<T> {
 			.saturating_add(Weight::from_parts(6_595_620, 0).saturating_mul(c.into()))
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 	}
+	fn dispatch_as_fallible() -> Weight {
+		todo!()
+	}
+
+	fn if_else() -> Weight {
+		todo!()
+	}
 }
diff --git a/operator/runtime/mainnet/src/weights/pallet_whitelist.rs b/operator/runtime/mainnet/src/weights/pallet_whitelist.rs
index 2f8f78065..67e86ec93 100644
--- a/operator/runtime/mainnet/src/weights/pallet_whitelist.rs
+++ b/operator/runtime/mainnet/src/weights/pallet_whitelist.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_whitelist`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/mainnet/src/weights/snowbridge_pallet_ethereum_client.rs b/operator/runtime/mainnet/src/weights/snowbridge_pallet_ethereum_client.rs
index 68a8f967d..bde1e6b24 100644
--- a/operator/runtime/mainnet/src/weights/snowbridge_pallet_ethereum_client.rs
+++ b/operator/runtime/mainnet/src/weights/snowbridge_pallet_ethereum_client.rs
@@ -33,7 +33,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `snowbridge_pallet_ethereum_client`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/mainnet/src/weights/snowbridge_pallet_inbound_queue_v2.rs b/operator/runtime/mainnet/src/weights/snowbridge_pallet_inbound_queue_v2.rs
index 7b593575a..54ac1f1b7 100644
--- a/operator/runtime/mainnet/src/weights/snowbridge_pallet_inbound_queue_v2.rs
+++ b/operator/runtime/mainnet/src/weights/snowbridge_pallet_inbound_queue_v2.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `snowbridge_pallet_inbound_queue_v2`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/mainnet/src/weights/snowbridge_pallet_outbound_queue_v2.rs b/operator/runtime/mainnet/src/weights/snowbridge_pallet_outbound_queue_v2.rs
index 391db9a7a..5f3d3213b 100644
--- a/operator/runtime/mainnet/src/weights/snowbridge_pallet_outbound_queue_v2.rs
+++ b/operator/runtime/mainnet/src/weights/snowbridge_pallet_outbound_queue_v2.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `snowbridge_pallet_outbound_queue_v2`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/mainnet/src/weights/snowbridge_pallet_system.rs b/operator/runtime/mainnet/src/weights/snowbridge_pallet_system.rs
index d2c0af0d2..d5f334b29 100644
--- a/operator/runtime/mainnet/src/weights/snowbridge_pallet_system.rs
+++ b/operator/runtime/mainnet/src/weights/snowbridge_pallet_system.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `snowbridge_pallet_system`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/mainnet/src/weights/snowbridge_pallet_system_v2.rs b/operator/runtime/mainnet/src/weights/snowbridge_pallet_system_v2.rs
index 287f11a8e..9b0e829ad 100644
--- a/operator/runtime/mainnet/src/weights/snowbridge_pallet_system_v2.rs
+++ b/operator/runtime/mainnet/src/weights/snowbridge_pallet_system_v2.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `snowbridge_pallet_system_v2`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/mainnet/tests/common.rs b/operator/runtime/mainnet/tests/common.rs
index 1e9ecdf29..f5f1bf21a 100644
--- a/operator/runtime/mainnet/tests/common.rs
+++ b/operator/runtime/mainnet/tests/common.rs
@@ -168,9 +168,12 @@ impl ExtBuilder {
             .build_storage()
             .expect("System pallet builds valid default genesis config");
 
-        pallet_balances::GenesisConfig::<Runtime> { balances }
-            .assimilate_storage(&mut t)
-            .expect("Pallet balances storage can be assimilated");
+        pallet_balances::GenesisConfig::<Runtime> {
+            balances,
+            dev_accounts: Default::default(),
+        }
+        .assimilate_storage(&mut t)
+        .expect("Pallet balances storage can be assimilated");
 
         // Set up session keys for validators
         let session_keys: Vec<_> = validators
diff --git a/operator/runtime/mainnet/tests/governance/benchmarks.rs b/operator/runtime/mainnet/tests/governance/benchmarks.rs
index 4a27975aa..53bac8c7b 100644
--- a/operator/runtime/mainnet/tests/governance/benchmarks.rs
+++ b/operator/runtime/mainnet/tests/governance/benchmarks.rs
@@ -23,6 +23,8 @@
 #![cfg(feature = "runtime-benchmarks")]
 
 use crate::common::*;
+use alloc::vec::Vec;
+use core::str::from_utf8;
 use datahaven_mainnet_runtime::{
     configs::governance::council::{TechnicalMaxMembers, TechnicalMaxProposals},
     governance::TracksInfo,
@@ -36,7 +38,6 @@ use frame_support::{
     traits::{Get, StorePreimage},
 };
 use pallet_conviction_voting::{AccountVote, Conviction, Vote};
-use sp_std::vec::Vec;
 
 /// Benchmark council proposal creation with varying member counts
 #[test]
@@ -443,29 +444,32 @@ fn benchmark_council_maximum_load() {
 #[test]
 fn benchmark_track_operations() {
     ExtBuilder::governance().build().execute_with(|| {
-        let tracks = TracksInfo::tracks();
+        let tracks: Vec<_> = TracksInfo::tracks().collect();
 
         println!("Testing {} governance tracks", tracks.len());
 
-        for (track_id, track_info) in tracks.iter() {
+        for track in tracks.iter() {
+            let track_name = from_utf8(&track.info.name).unwrap();
+            let track_name = track_name.trim_end_matches('\0');
             let start_block = System::block_number();
 
             // Create proposal for this track
             let proposal = RuntimeCall::System(frame_system::Call::set_storage {
                 items: vec![(
-                    format!(":track:{}:{}", track_id, track_info.name).into_bytes(),
+                    format!(":track:{}:{}", track.id, track_name).into_bytes(),
                     b"test".to_vec(),
                 )],
             });
-            let proposal_hash = make_proposal_hash(&proposal);
 
             assert_ok!(Preimage::note_preimage(
                 RuntimeOrigin::signed(alice()),
                 proposal.encode()
             ));
 
+            let bounded_proposal = <Preimage as StorePreimage>::bound(proposal).unwrap();
+
             // Map track to appropriate origin
-            let origin = if *track_id == 0 {
+            let origin = if track.id == 0 {
                 frame_system::RawOrigin::Root.into()
             } else {
                 frame_system::RawOrigin::Signed(alice()).into()
@@ -474,19 +478,19 @@ fn benchmark_track_operations() {
             assert_ok!(Referenda::submit(
                 RuntimeOrigin::signed(alice()),
                 Box::new(origin),
-                DispatchTime::After(track_info.min_enactment_period),
-                Box::new(proposal_hash.into())
+                bounded_proposal,
+                DispatchTime::After(track.info.min_enactment_period),
             ));
 
             assert_ok!(Referenda::place_decision_deposit(
                 RuntimeOrigin::signed(bob()),
-                *track_id as u32
+                track.id as u32
             ));
 
             // Test voting on this track
             assert_ok!(ConvictionVoting::vote(
                 RuntimeOrigin::signed(charlie()),
-                *track_id as u32,
+                track.id as u32,
                 AccountVote::Standard {
                     vote: Vote {
                         aye: true,
@@ -500,11 +504,11 @@ fn benchmark_track_operations() {
 
             println!(
                 "Track {} ({}): processed in {} blocks (max_deciding: {}, decision_deposit: {})",
-                track_id,
-                track_info.name,
+                track.id,
+                track_name,
                 end_block - start_block,
-                track_info.max_deciding,
-                track_info.decision_deposit
+                track.info.max_deciding,
+                track.info.decision_deposit
             );
         }
     });
diff --git a/operator/runtime/mainnet/tests/governance/referenda.rs b/operator/runtime/mainnet/tests/governance/referenda.rs
index 1731f3695..e76513dda 100644
--- a/operator/runtime/mainnet/tests/governance/referenda.rs
+++ b/operator/runtime/mainnet/tests/governance/referenda.rs
@@ -21,6 +21,7 @@
 
 use crate::common::*;
 use codec::Encode;
+use core::str::from_utf8;
 use datahaven_mainnet_runtime::{
     currency::{HAVE, KILOHAVE, SUPPLY_FACTOR},
     governance::TracksInfo,
@@ -42,13 +43,16 @@ use pallet_referenda::{Event as ReferendaEvent, ReferendumInfo};
 #[test]
 fn tracks_info_configured_correctly() {
     ExtBuilder::default().build().execute_with(|| {
-        let tracks = TracksInfo::tracks();
+        let tracks: Vec<_> = TracksInfo::tracks().collect();
 
         // Should have 6 tracks as configured
         assert_eq!(tracks.len(), 6);
 
         // Verify track IDs and names
-        let track_names: Vec<&str> = tracks.iter().map(|(_, info)| info.name).collect();
+        let track_names: Vec<&str> = tracks
+            .iter()
+            .map(|track| from_utf8(&track.info.name).unwrap().trim_end_matches('\0'))
+            .collect();
         assert_eq!(
             track_names,
             vec![
@@ -62,16 +66,17 @@ fn tracks_info_configured_correctly() {
         );
 
         // Verify root track has strictest requirements
-        let (root_id, root_info) = &tracks[0];
-        assert_eq!(*root_id, 0u16);
-        assert_eq!(root_info.max_deciding, 5);
-        assert_eq!(root_info.decision_deposit, 20 * KILOHAVE * SUPPLY_FACTOR); // 20 * KILO_HAVE
+        assert_eq!(tracks[0].id, 0u16);
+        assert_eq!(tracks[0].info.max_deciding, 5);
+        assert_eq!(
+            tracks[0].info.decision_deposit,
+            20 * KILOHAVE * SUPPLY_FACTOR
+        ); // 20 * KILO_HAVE
 
         // Verify general admin track
-        let (admin_id, admin_info) = &tracks[2];
-        assert_eq!(*admin_id, 2u16);
-        assert_eq!(admin_info.max_deciding, 10);
-        assert_eq!(admin_info.decision_deposit, 100 * HAVE * SUPPLY_FACTOR);
+        assert_eq!(tracks[2].id, 2u16);
+        assert_eq!(tracks[2].info.max_deciding, 10);
+        assert_eq!(tracks[2].info.decision_deposit, 100 * HAVE * SUPPLY_FACTOR);
     });
 }
 
@@ -225,7 +230,8 @@ fn referendum_timing_works() {
         ));
 
         // Advance time through prepare period (1 DAY for root track)
-        let track_info = &TracksInfo::tracks()[0].1; // Root track
+        let tracks: Vec<_> = TracksInfo::tracks().collect();
+        let track_info = &tracks[0].info; // Root track
         advance_referendum_time(track_info.prepare_period + 1);
 
         // Place decision deposit
@@ -243,7 +249,8 @@ fn referendum_timing_works() {
         }
 
         // Advance time through decision period
-        let track_info = &TracksInfo::tracks()[0].1; // Root track
+        let tracks: Vec<_> = TracksInfo::tracks().collect();
+        let track_info = &tracks[0].info; // Root track
         advance_referendum_time(track_info.decision_period + 1);
 
         // Referendum should still exist (may have timed out)
@@ -499,7 +506,8 @@ fn referendum_insufficient_support_fails() {
         ));
 
         // Advance through the entire decision period
-        let track_info = &TracksInfo::tracks()[0].1; // Root track
+        let tracks: Vec<_> = TracksInfo::tracks().collect();
+        let track_info = &tracks[0].info; // Root track
         advance_referendum_time(track_info.decision_period + track_info.confirm_period + 1);
 
         // Should still be ongoing or rejected due to insufficient support
@@ -578,7 +586,8 @@ fn decision_deposit_mechanics_work() {
         }
 
         // Advance time through prepare period (1 DAY for root track)
-        let track_info = &TracksInfo::tracks()[0].1; // Root track
+        let tracks: Vec<_> = TracksInfo::tracks().collect();
+        let track_info = &tracks[0].info; // Root track
         advance_referendum_time(track_info.prepare_period + 1);
 
         let alice_balance_before = Balances::free_balance(&alice());
@@ -591,7 +600,8 @@ fn decision_deposit_mechanics_work() {
 
         // Alice's balance should decrease by decision deposit
         let alice_balance_after = Balances::free_balance(&alice());
-        let track_info = &TracksInfo::tracks()[0].1; // Root track
+        let tracks: Vec<_> = TracksInfo::tracks().collect();
+        let track_info = &tracks[0].info; // Root track
         assert_eq!(
             alice_balance_before - alice_balance_after,
             track_info.decision_deposit
@@ -619,7 +629,8 @@ fn decision_deposit_mechanics_work() {
 fn track_capacity_limits_enforced() {
     ExtBuilder::default().build().execute_with(|| {
         // Use root track which has max_deciding of 5 (more reasonable for testing)
-        let track_info = &TracksInfo::tracks()[0].1; // root track
+        let tracks: Vec<_> = TracksInfo::tracks().collect();
+        let track_info = &tracks[0].info; // root track
         let max_deciding = track_info.max_deciding.min(5); // Use smaller number for testing
 
         // Submit max_deciding referenda (but cap at 5 for scheduler limits)
@@ -723,7 +734,8 @@ fn insufficient_balance_for_deposits() {
         ));
 
         // Advance through prepare period
-        let track_info = &TracksInfo::tracks()[0].1;
+        let tracks: Vec<_> = TracksInfo::tracks().collect();
+        let track_info = &tracks[0].info;
         advance_referendum_time(track_info.prepare_period + 1);
 
         // Should fail to place decision deposit due to insufficient balance
@@ -753,7 +765,8 @@ fn referendum_confirmation_period_works() {
             DispatchTime::After(10)
         ));
 
-        let track_info = &TracksInfo::tracks()[0].1; // Root track
+        let tracks: Vec<_> = TracksInfo::tracks().collect();
+        let track_info = &tracks[0].info; // Root track
 
         // Advance through prepare period
         advance_referendum_time(track_info.prepare_period + 1);
@@ -821,7 +834,8 @@ fn split_votes_with_conviction() {
         ));
 
         // Place decision deposit after prepare period
-        let track_info = &TracksInfo::tracks()[0].1;
+        let tracks: Vec<_> = TracksInfo::tracks().collect();
+        let track_info = &tracks[0].info;
         advance_referendum_time(track_info.prepare_period + 1);
         assert_ok!(Referenda::place_decision_deposit(
             RuntimeOrigin::signed(alice()),
diff --git a/operator/runtime/mainnet/tests/lib.rs b/operator/runtime/mainnet/tests/lib.rs
index c9044c1dd..ff7c80b3e 100644
--- a/operator/runtime/mainnet/tests/lib.rs
+++ b/operator/runtime/mainnet/tests/lib.rs
@@ -67,6 +67,7 @@ fn validate_transaction_fails_on_filtered_call() {
                 max_priority_fee_per_gas: Some(sp_core::U256::zero()),
                 nonce: None,
                 access_list: Vec::new(),
+                authorization_list: Vec::new(),
             }
             .into(),
         );
diff --git a/operator/runtime/mainnet/tests/treasury.rs b/operator/runtime/mainnet/tests/treasury.rs
index b6195e215..cab392560 100644
--- a/operator/runtime/mainnet/tests/treasury.rs
+++ b/operator/runtime/mainnet/tests/treasury.rs
@@ -73,6 +73,7 @@ fn author_does_receive_priority_fee() {
                 max_priority_fee_per_gas: Some(U256::from(200 * MILLIHAVE)),
                 nonce: Some(U256::from(0)),
                 access_list: Vec::new(),
+                authorization_list: Vec::new(),
             })
             .dispatch(<Runtime as frame_system::Config>::RuntimeOrigin::root()));
 
@@ -115,6 +116,7 @@ fn total_issuance_after_evm_transaction_with_priority_fee() {
                 max_priority_fee_per_gas: Some(U256::from(BASE_FEE_GENESIS)),
                 nonce: Some(U256::from(0)),
                 access_list: Vec::new(),
+                authorization_list: Vec::new(),
             })
             .dispatch(<Runtime as frame_system::Config>::RuntimeOrigin::root()));
 
@@ -184,6 +186,7 @@ fn total_issuance_after_evm_transaction_without_priority_fee() {
                 max_priority_fee_per_gas: None,
                 nonce: Some(U256::from(0)),
                 access_list: Vec::new(),
+                authorization_list: Vec::new(),
             })
             .dispatch(<Runtime as frame_system::Config>::RuntimeOrigin::root()));
 
diff --git a/operator/runtime/stagenet/Cargo.toml b/operator/runtime/stagenet/Cargo.toml
index c171e4356..efd77c248 100644
--- a/operator/runtime/stagenet/Cargo.toml
+++ b/operator/runtime/stagenet/Cargo.toml
@@ -18,10 +18,11 @@ bridge-hub-common = { workspace = true, optional = true }
 codec = { workspace = true, features = ["derive"] }
 datahaven-runtime-common = { workspace = true }
 dhp-bridge = { workspace = true }
+ethereum = { workspace = true }
 fp-account = { workspace = true }
 fp-evm = { workspace = true, features = ["serde"] }
 fp-rpc = { workspace = true }
-fp-self-contained = { workspace = true, features = ["serde", "try-runtime"] }
+fp-self-contained = { workspace = true, features = ["serde"] }
 frame-benchmarking = { workspace = true, optional = true }
 frame-executive = { workspace = true }
 frame-metadata-hash-extension = { workspace = true }
@@ -120,7 +121,6 @@ sp-offchain = { workspace = true }
 sp-runtime = { workspace = true, features = ["serde"] }
 sp-session = { workspace = true }
 sp-staking = { workspace = true }
-sp-std = { workspace = true }
 sp-storage = { workspace = true }
 sp-transaction-pool = { workspace = true }
 sp-version = { workspace = true, features = ["serde"] }
@@ -191,6 +191,7 @@ std = [
     "alloy-core/std",
     "codec/std",
     "datahaven-runtime-common/std",
+    "ethereum/std",
     "fp-account/std",
     "fp-evm/std",
     "frame-benchmarking?/std",
@@ -283,7 +284,6 @@ std = [
     "sp-runtime/std",
     "sp-session/std",
     "sp-staking/std",
-    "sp-std/std",
     "sp-storage/std",
     "sp-transaction-pool/std",
     "sp-version/std",
diff --git a/operator/runtime/stagenet/src/benchmarks.rs b/operator/runtime/stagenet/src/benchmarks.rs
index 0b400badd..1cfcd0980 100644
--- a/operator/runtime/stagenet/src/benchmarks.rs
+++ b/operator/runtime/stagenet/src/benchmarks.rs
@@ -28,8 +28,7 @@ frame_benchmarking::define_benchmarks!(
     // Substrate pallets
     [pallet_balances, Balances]
     [pallet_session, pallet_session_benchmarking::Pallet::<Runtime>]
-    // FIXME: benchmarking identity fail
-    // [pallet_identity, Identity]
+    [pallet_identity, Identity]
     [pallet_im_online, ImOnline]
     [pallet_multisig, Multisig]
     [pallet_preimage, Preimage]
diff --git a/operator/runtime/stagenet/src/configs/governance/origins.rs b/operator/runtime/stagenet/src/configs/governance/origins.rs
index 0f943cf6b..be8043d8b 100644
--- a/operator/runtime/stagenet/src/configs/governance/origins.rs
+++ b/operator/runtime/stagenet/src/configs/governance/origins.rs
@@ -34,7 +34,16 @@ pub mod custom_origins {
     pub struct Pallet<T>(_);
 
     #[derive(
-        PartialEq, Eq, Clone, MaxEncodedLen, Encode, Decode, TypeInfo, RuntimeDebug, EnumString,
+        PartialEq,
+        Eq,
+        Clone,
+        MaxEncodedLen,
+        Encode,
+        Decode,
+        TypeInfo,
+        RuntimeDebug,
+        EnumString,
+        DecodeWithMemTracking,
     )]
     #[strum(serialize_all = "snake_case")]
     #[pallet::origin]
diff --git a/operator/runtime/stagenet/src/configs/governance/referenda.rs b/operator/runtime/stagenet/src/configs/governance/referenda.rs
index 1ceb8cdf6..9f8955c32 100644
--- a/operator/runtime/stagenet/src/configs/governance/referenda.rs
+++ b/operator/runtime/stagenet/src/configs/governance/referenda.rs
@@ -57,6 +57,8 @@ impl pallet_conviction_voting::Config for Runtime {
     type MaxVotes = ConstU32<20>;
     type MaxTurnout = frame_support::traits::TotalIssuanceOf<Balances, AccountId>;
     type Polls = Referenda;
+    type BlockNumberProvider = System;
+    type VotingHooks = ();
 }
 
 impl pallet_whitelist::Config for Runtime {
@@ -79,8 +81,6 @@ impl pallet_whitelist::Config for Runtime {
     type WeightInfo = stagenet_weights::pallet_whitelist::WeightInfo<Runtime>;
 }
 
-pallet_referenda::impl_tracksinfo_get!(TracksInfo, Balance, BlockNumber);
-
 // Referenda Implementation
 impl pallet_referenda::Config for Runtime {
     type WeightInfo = stagenet_weights::pallet_referenda::WeightInfo<Runtime>;
@@ -100,4 +100,5 @@ impl pallet_referenda::Config for Runtime {
     type AlarmInterval = AlarmInterval;
     type Tracks = TracksInfo;
     type Preimages = Preimage;
+    type BlockNumberProvider = System;
 }
diff --git a/operator/runtime/stagenet/src/configs/governance/tracks.rs b/operator/runtime/stagenet/src/configs/governance/tracks.rs
index 388cf0b46..2bc22f7c5 100644
--- a/operator/runtime/stagenet/src/configs/governance/tracks.rs
+++ b/operator/runtime/stagenet/src/configs/governance/tracks.rs
@@ -21,9 +21,13 @@
 
 use super::*;
 use crate::currency::{HAVE, KILOHAVE, SUPPLY_FACTOR};
+use alloc::borrow::Cow;
+use core::str::from_utf8;
+use core::str::FromStr;
 use datahaven_runtime_common::time::*;
 use pallet_referenda::Curve;
-use sp_std::str::FromStr;
+use pallet_referenda::Track;
+use sp_runtime::str_array;
 
 const fn percent(x: i32) -> sp_runtime::FixedI64 {
     sp_runtime::FixedI64::from_rational(x as u128, 100)
@@ -32,12 +36,12 @@ const fn permill(x: i32) -> sp_runtime::FixedI64 {
     sp_runtime::FixedI64::from_rational(x as u128, 1000)
 }
 
-const TRACKS_DATA: [(u16, pallet_referenda::TrackInfo<Balance, BlockNumber>); 6] = [
-    (
-        0,
-        pallet_referenda::TrackInfo {
+const TRACKS_DATA: [Track<u16, Balance, BlockNumber>; 6] = [
+    Track {
+        id: 0,
+        info: pallet_referenda::TrackInfo {
             // Name of this track.
-            name: "root",
+            name: str_array("root"),
             // A limit for the number of referenda on this track that can be being decided at once.
             // For Root origin this should generally be just one.
             max_deciding: 5,
@@ -58,11 +62,11 @@ const TRACKS_DATA: [(u16, pallet_referenda::TrackInfo<Balance, BlockNumber>); 6]
             // is needed for approval as a function of time into decision period.
             min_support: Curve::make_linear(14, 14, permill(5), percent(25)),
         },
-    ),
-    (
-        1,
-        pallet_referenda::TrackInfo {
-            name: "whitelisted_caller",
+    },
+    Track {
+        id: 1,
+        info: pallet_referenda::TrackInfo {
+            name: str_array("whitelisted_caller"),
             max_deciding: 100,
             decision_deposit: 10 * KILOHAVE * SUPPLY_FACTOR,
             prepare_period: 10 * MINUTES,
@@ -72,11 +76,11 @@ const TRACKS_DATA: [(u16, pallet_referenda::TrackInfo<Balance, BlockNumber>); 6]
             min_approval: Curve::make_reciprocal(1, 14, percent(96), percent(50), percent(100)),
             min_support: Curve::make_reciprocal(1, 14 * 24, percent(1), percent(0), percent(2)),
         },
-    ),
-    (
-        2,
-        pallet_referenda::TrackInfo {
-            name: "general_admin",
+    },
+    Track {
+        id: 2,
+        info: pallet_referenda::TrackInfo {
+            name: str_array("general_admin"),
             max_deciding: 10,
             decision_deposit: 500 * HAVE * SUPPLY_FACTOR,
             prepare_period: 1 * HOURS,
@@ -86,11 +90,11 @@ const TRACKS_DATA: [(u16, pallet_referenda::TrackInfo<Balance, BlockNumber>); 6]
             min_approval: Curve::make_reciprocal(4, 14, percent(80), percent(50), percent(100)),
             min_support: Curve::make_reciprocal(7, 14, percent(10), percent(0), percent(50)),
         },
-    ),
-    (
-        3,
-        pallet_referenda::TrackInfo {
-            name: "referendum_canceller",
+    },
+    Track {
+        id: 3,
+        info: pallet_referenda::TrackInfo {
+            name: str_array("referendum_canceller"),
             max_deciding: 20,
             decision_deposit: 10 * KILOHAVE * SUPPLY_FACTOR,
             prepare_period: 1 * HOURS,
@@ -100,11 +104,11 @@ const TRACKS_DATA: [(u16, pallet_referenda::TrackInfo<Balance, BlockNumber>); 6]
             min_approval: Curve::make_reciprocal(1, 14, percent(96), percent(50), percent(100)),
             min_support: Curve::make_reciprocal(1, 14, percent(1), percent(0), percent(50)),
         },
-    ),
-    (
-        4,
-        pallet_referenda::TrackInfo {
-            name: "referendum_killer",
+    },
+    Track {
+        id: 4,
+        info: pallet_referenda::TrackInfo {
+            name: str_array("referendum_killer"),
             max_deciding: 100,
             decision_deposit: 20 * KILOHAVE * SUPPLY_FACTOR,
             prepare_period: 1 * HOURS,
@@ -114,11 +118,11 @@ const TRACKS_DATA: [(u16, pallet_referenda::TrackInfo<Balance, BlockNumber>); 6]
             min_approval: Curve::make_reciprocal(1, 14, percent(96), percent(50), percent(100)),
             min_support: Curve::make_reciprocal(1, 14, percent(1), percent(0), percent(10)),
         },
-    ),
-    (
-        5,
-        pallet_referenda::TrackInfo {
-            name: "fast_general_admin",
+    },
+    Track {
+        id: 5,
+        info: pallet_referenda::TrackInfo {
+            name: str_array("fast_general_admin"),
             max_deciding: 10,
             decision_deposit: 500 * HAVE * SUPPLY_FACTOR,
             prepare_period: 1 * HOURS,
@@ -128,25 +132,25 @@ const TRACKS_DATA: [(u16, pallet_referenda::TrackInfo<Balance, BlockNumber>); 6]
             min_approval: Curve::make_reciprocal(4, 14, percent(80), percent(50), percent(100)),
             min_support: Curve::make_reciprocal(5, 14, percent(1), percent(0), percent(50)),
         },
-    ),
+    },
 ];
 
 pub struct TracksInfo;
 impl pallet_referenda::TracksInfo<Balance, BlockNumber> for TracksInfo {
     type Id = u16;
     type RuntimeOrigin = <RuntimeOrigin as frame_support::traits::OriginTrait>::PalletsOrigin;
-    fn tracks() -> &'static [(Self::Id, pallet_referenda::TrackInfo<Balance, BlockNumber>)] {
-        &TRACKS_DATA[..]
+    fn tracks() -> impl Iterator<Item = Cow<'static, Track<Self::Id, Balance, BlockNumber>>> {
+        TRACKS_DATA.iter().map(Cow::Borrowed)
     }
     fn track_for(id: &Self::RuntimeOrigin) -> Result<Self::Id, ()> {
         if let Ok(system_origin) = frame_system::RawOrigin::try_from(id.clone()) {
             match system_origin {
                 frame_system::RawOrigin::Root => {
-                    if let Some((track_id, _)) = Self::tracks()
+                    if let Some(track) = Self::tracks()
                         .into_iter()
-                        .find(|(_, track)| track.name == "root")
+                        .find(|track| track.info.name == str_array("root"))
                     {
-                        Ok(*track_id)
+                        Ok(track.id)
                     } else {
                         Err(())
                     }
@@ -154,14 +158,18 @@ impl pallet_referenda::TracksInfo<Balance, BlockNumber> for TracksInfo {
                 _ => Err(()),
             }
         } else if let Ok(custom_origin) = custom_origins::Origin::try_from(id.clone()) {
-            if let Some((track_id, _)) = Self::tracks().into_iter().find(|(_, track)| {
-                if let Ok(track_custom_origin) = custom_origins::Origin::from_str(track.name) {
+            if let Some(track) = Self::tracks().into_iter().find(|track| {
+                let Ok(track_name) = from_utf8(&track.info.name) else {
+                    return false;
+                };
+                let track_name = track_name.trim_end_matches('\0');
+                if let Ok(track_custom_origin) = custom_origins::Origin::from_str(track_name) {
                     track_custom_origin == custom_origin
                 } else {
                     false
                 }
             }) {
-                Ok(*track_id)
+                Ok(track.id)
             } else {
                 Err(())
             }
@@ -174,13 +182,15 @@ impl pallet_referenda::TracksInfo<Balance, BlockNumber> for TracksInfo {
 #[test]
 /// To ensure voters are always locked into their vote
 fn vote_locking_always_longer_than_enactment_period() {
-    for (_, track) in TRACKS_DATA {
+    for track in TRACKS_DATA {
+        let track_name = from_utf8(&track.info.name).unwrap();
+        let track_name = track_name.trim_end_matches('\0');
         assert!(
             <Runtime as pallet_conviction_voting::Config>::VoteLockingPeriod::get()
-                >= track.min_enactment_period,
+                >= track.info.min_enactment_period,
             "Track {} has enactment period {} < vote locking period {}",
-            track.name,
-            track.min_enactment_period,
+            track_name,
+            track.info.min_enactment_period,
             <Runtime as pallet_conviction_voting::Config>::VoteLockingPeriod::get(),
         );
     }
@@ -188,10 +198,12 @@ fn vote_locking_always_longer_than_enactment_period() {
 
 #[test]
 fn all_tracks_have_origins() {
-    for (_, track) in TRACKS_DATA {
+    for track in TRACKS_DATA {
+        let track_name = from_utf8(&track.info.name).unwrap();
+        let track_name = track_name.trim_end_matches('\0');
         // check name.into() is successful either converts into "root" or custom origin
-        let track_is_root = track.name == "root";
-        let track_has_custom_origin = custom_origins::Origin::from_str(track.name).is_ok();
+        let track_is_root = track_name == "root";
+        let track_has_custom_origin = custom_origins::Origin::from_str(track_name).is_ok();
         assert!(track_is_root || track_has_custom_origin);
     }
 }
diff --git a/operator/runtime/stagenet/src/configs/mod.rs b/operator/runtime/stagenet/src/configs/mod.rs
index 12b4a960d..a4b43eab7 100644
--- a/operator/runtime/stagenet/src/configs/mod.rs
+++ b/operator/runtime/stagenet/src/configs/mod.rs
@@ -30,8 +30,9 @@ use super::{
     Signature, System, Timestamp, Treasury, TxPause, BLOCK_HASH_COUNT, EXTRINSIC_BASE_WEIGHT,
     MAXIMUM_BLOCK_WEIGHT, NORMAL_BLOCK_WEIGHT, NORMAL_DISPATCH_RATIO, SLOT_DURATION, VERSION,
 };
+use alloc::vec::Vec;
 use alloy_core::primitives::Address;
-use codec::{Decode, Encode, MaxEncodedLen};
+use codec::{Decode, DecodeWithMemTracking, Encode, MaxEncodedLen};
 use scale_info::TypeInfo;
 use sp_runtime::{traits::AccountIdConversion, RuntimeDebug};
 
@@ -49,6 +50,7 @@ use sp_runtime::{traits::AccountIdConversion, RuntimeDebug};
     RuntimeDebug,
     MaxEncodedLen,
     TypeInfo,
+    DecodeWithMemTracking,
     serde::Serialize,
     serde::Deserialize,
 )]
@@ -76,6 +78,7 @@ impl Default for ProxyType {
         Self::Any
     }
 }
+use core::convert::{From, Into};
 use datahaven_runtime_common::{
     deal_with_fees::{
         DealWithEthereumBaseFees, DealWithEthereumPriorityFees, DealWithSubstrateFeesAndTip,
@@ -141,10 +144,6 @@ use sp_runtime::{
     FixedPointNumber, Perbill, Perquintill,
 };
 use sp_staking::EraIndex;
-use sp_std::{
-    convert::{From, Into},
-    prelude::*,
-};
 use sp_version::RuntimeVersion;
 use xcm::latest::NetworkId;
 use xcm::prelude::*;
@@ -395,6 +394,7 @@ impl pallet_session::Config for Runtime {
     type SessionHandler = <SessionKeys as OpaqueKeys>::KeyTypeIdProviders;
     type Keys = SessionKeys;
     type WeightInfo = stagenet_weights::pallet_session::WeightInfo<Runtime>;
+    type DisablingStrategy = ();
 }
 
 parameter_types! {
@@ -590,6 +590,7 @@ impl pallet_scheduler::Config for Runtime {
     type OriginPrivilegeCmp = EqualPrivilegeOnly;
     type Preimages = Preimage;
     type WeightInfo = stagenet_weights::pallet_scheduler::WeightInfo<Runtime>;
+    type BlockNumberProvider = System;
 }
 
 parameter_types! {
@@ -653,8 +654,7 @@ impl pallet_identity::Config for Runtime {
     type UsernameDeposit = UsernameDeposit;
     type UsernameGracePeriod = UsernameGracePeriod;
 
-    // TODO: Re-enable after upgrade to Polkadot SDK stable2412-8
-    // see https://github.com/paritytech/polkadot-sdk/releases/tag/polkadot-stable2412-8
+    // TODO: Replace by Identity pallet's BenchmarkHelper when available (stable2506).
     // #[cfg(feature = "runtime-benchmarks")]
     // fn benchmark_helper(message: &[u8]) -> (Vec<u8>, Vec<u8>) {
     //     let public = sp_io::crypto::ecdsa_generate(0.into(), None);
@@ -684,6 +684,7 @@ impl pallet_multisig::Config for Runtime {
     type DepositFactor = DepositFactor;
     type MaxSignatories = MaxSignatories;
     type WeightInfo = stagenet_weights::pallet_multisig::WeightInfo<Runtime>;
+    type BlockNumberProvider = System;
 }
 
 parameter_types! {
@@ -849,6 +850,7 @@ impl pallet_proxy::Config for Runtime {
     type CallHasher = sp_runtime::traits::BlakeTwo256;
     type AnnouncementDepositBase = AnnouncementDepositBase;
     type AnnouncementDepositFactor = AnnouncementDepositFactor;
+    type BlockNumberProvider = System;
 }
 
 impl pallet_proxy_genesis_companion::Config for Runtime {
@@ -1050,6 +1052,8 @@ impl pallet_evm::Config for Runtime {
     type GasLimitPovSizeRatio = GasLimitPovSizeRatio;
     type GasLimitStorageGrowthRatio = GasLimitStorageGrowthRatio;
     type Timestamp = Timestamp;
+    type CreateOriginFilter = ();
+    type CreateInnerOriginFilter = ();
     type WeightInfo = stagenet_weights::pallet_evm::WeightInfo<Runtime>;
 }
 
diff --git a/operator/runtime/stagenet/src/configs/runtime_params.rs b/operator/runtime/stagenet/src/configs/runtime_params.rs
index dcf136c92..5294fd940 100644
--- a/operator/runtime/stagenet/src/configs/runtime_params.rs
+++ b/operator/runtime/stagenet/src/configs/runtime_params.rs
@@ -15,11 +15,11 @@
 // along with DataHaven.  If not, see <http://www.gnu.org/licenses/>.
 
 use crate::Runtime;
+use alloc::vec;
 use frame_support::dynamic_params::{dynamic_pallet_params, dynamic_params};
 use hex_literal::hex;
 use sp_core::{ConstU32, H160, H256};
 use sp_runtime::{BoundedVec, Perbill};
-use sp_std::vec;
 
 use crate::configs::storagehub::{ChallengeTicksTolerance, ReplicationTargetType, SpMinDeposit};
 use crate::currency::{GIGAWEI, HAVE, SUPPLY_FACTOR};
diff --git a/operator/runtime/stagenet/src/configs/storagehub/client.rs b/operator/runtime/stagenet/src/configs/storagehub/client.rs
index 110bec9da..1e0bf3396 100644
--- a/operator/runtime/stagenet/src/configs/storagehub/client.rs
+++ b/operator/runtime/stagenet/src/configs/storagehub/client.rs
@@ -50,6 +50,7 @@ impl ExtensionOperations<crate::RuntimeCall, crate::Runtime> for crate::SignedEx
                 minimal.tip,
             ),
             frame_metadata_hash_extension::CheckMetadataHash::<crate::Runtime>::new(false),
+            frame_system::WeightReclaim::<crate::Runtime>::new(),
         )
     }
 }
diff --git a/operator/runtime/stagenet/src/configs/storagehub/mod.rs b/operator/runtime/stagenet/src/configs/storagehub/mod.rs
index 79a71b143..f5a59505e 100644
--- a/operator/runtime/stagenet/src/configs/storagehub/mod.rs
+++ b/operator/runtime/stagenet/src/configs/storagehub/mod.rs
@@ -13,13 +13,14 @@
 
 // You should have received a copy of the GNU General Public License
 // along with DataHaven.  If not, see <http://www.gnu.org/licenses/>.
+extern crate alloc;
 
 #[cfg(not(feature = "runtime-benchmarks"))]
 use super::HAVE;
 #[cfg(feature = "runtime-benchmarks")]
 use super::MICROHAVE;
 use super::{
-    AccountId, Balance, Balances, BlockNumber, Hash, RuntimeEvent, RuntimeHoldReason,
+    AccountId, Balance, Balances, BlockNumber, Hash, RuntimeEvent, RuntimeHoldReason, System,
     TreasuryAccount,
 };
 use crate::configs::runtime_params::dynamic_params::runtime_config;
@@ -27,6 +28,8 @@ use crate::{
     BucketNfts, Nfts, PaymentStreams, ProofsDealer, Providers, Runtime, Signature, WeightToFee,
     HOURS,
 };
+use alloc::{vec, vec::Vec};
+use core::convert::{From, Into};
 use core::marker::PhantomData;
 #[cfg(feature = "runtime-benchmarks")]
 use datahaven_runtime_common::benchmarking::StorageHubBenchmarking;
@@ -59,8 +62,6 @@ use sp_runtime::traits::Verify;
 use sp_runtime::traits::Zero;
 use sp_runtime::SaturatedConversion;
 use sp_runtime::{traits::BlakeTwo256, Perbill};
-use sp_std::convert::{From, Into};
-use sp_std::{vec, vec::Vec};
 use sp_trie::{LayoutV1, TrieConfiguration, TrieLayout};
 
 #[cfg(feature = "std")]
@@ -126,6 +127,7 @@ impl pallet_nfts::Config for Runtime {
     type OffchainPublic = <Signature as Verify>::Signer;
     type WeightInfo = crate::weights::pallet_nfts::WeightInfo<Runtime>;
     type Locker = ();
+    type BlockNumberProvider = System;
     #[cfg(feature = "runtime-benchmarks")]
     type Helper = benchmark_helpers::NftHelper;
 }
@@ -626,16 +628,16 @@ parameter_types! {
 /// "\x19Ethereum Signed Message:\n" + len(message) + message"
 pub struct Eip191Adapter;
 impl shp_traits::MessageAdapter for Eip191Adapter {
-    fn bytes_to_verify(message: &[u8]) -> Vec<u8> {
+    fn bytes_to_verify(intention: &[u8], _context: &[u8]) -> Vec<u8> {
         const PREFIX: &str = "\x19Ethereum Signed Message:\n";
-        let len = message.len();
+        let len = intention.len();
         let mut len_string_buffer = itoa::Buffer::new();
         let len_string = len_string_buffer.format(len);
 
         let mut eth_message = Vec::with_capacity(PREFIX.len() + len_string.len() + len);
         eth_message.extend_from_slice(PREFIX.as_bytes());
         eth_message.extend_from_slice(len_string.as_bytes());
-        eth_message.extend_from_slice(message);
+        eth_message.extend_from_slice(intention);
         eth_message
     }
 }
@@ -699,6 +701,8 @@ impl pallet_file_system::Config for Runtime {
     type OffchainPublicKey = <Signature as Verify>::Signer;
     type MaxFileDeletionsPerExtrinsic = ConstU32<100>;
     type IntentionMsgAdapter = Eip191Adapter;
+    type MaxBspVolunteers = ConstU32<1000>;
+    type MaxMspRespondFileKeys = ConstU32<10>;
 }
 
 impl MostlyStablePriceIndexUpdaterConfig for Runtime {
diff --git a/operator/runtime/stagenet/src/genesis_config_presets.rs b/operator/runtime/stagenet/src/genesis_config_presets.rs
index 0265f5a3c..671eae1c6 100644
--- a/operator/runtime/stagenet/src/genesis_config_presets.rs
+++ b/operator/runtime/stagenet/src/genesis_config_presets.rs
@@ -56,6 +56,7 @@ fn testnet_genesis(
                 .cloned()
                 .map(|k| (k, 1u128 << 80))
                 .collect::<Vec<_>>(),
+            dev_accounts: Default::default(),
         },
         babe: pallet_babe::GenesisConfig {
             epoch_config: BABE_GENESIS_EPOCH_CONFIG,
diff --git a/operator/runtime/stagenet/src/lib.rs b/operator/runtime/stagenet/src/lib.rs
index df43090fa..be11d95e9 100644
--- a/operator/runtime/stagenet/src/lib.rs
+++ b/operator/runtime/stagenet/src/lib.rs
@@ -31,14 +31,18 @@ pub mod weights;
 pub use configs::governance;
 pub use configs::Precompiles;
 
-// TODO: Temporary workaround before upgrading to latest polkadot-sdk - fix https://github.com/paritytech/polkadot-sdk/pull/6435
+// Aliases required by define_benchmarks! for pallet_collective instances.
+// PR #6435 (in stable2503) fixes the underlying issue, so these can be removed
+// when benchmarks are regenerated and weight files renamed accordingly.
 #[allow(unused_imports)]
 use pallet_collective as pallet_collective_treasury_council;
 #[allow(unused_imports)]
 use pallet_collective as pallet_collective_technical_committee;
 
+use alloc::collections::btree_map::BTreeMap;
 use alloc::{borrow::Cow, vec::Vec};
 use codec::Encode;
+use ethereum::AuthorizationList;
 use fp_rpc::TransactionStatus;
 use frame_support::{
     genesis_builder_helper::{build_state, get_preset},
@@ -51,7 +55,7 @@ pub use frame_system::Call as SystemCall;
 pub use pallet_balances::Call as BalancesCall;
 use pallet_ethereum::{Call::transact, Transaction as EthereumTransaction};
 use pallet_evm::{Account as EVMAccount, FeeCalculator, GasWeightMapping, Runner};
-use pallet_file_system::types::StorageRequestMetadata;
+use pallet_file_system::types::{PendingStopStoringRequest, StorageRequestMetadata};
 use pallet_file_system_runtime_api::*;
 use pallet_grandpa::{fg_primitives, AuthorityId as GrandpaId};
 use pallet_payment_streams_runtime_api::*;
@@ -82,7 +86,6 @@ use sp_runtime::{
     transaction_validity::{InvalidTransaction, TransactionSource},
     ApplyExtrinsicResult, Perbill, Permill,
 };
-use sp_std::collections::btree_map::BTreeMap;
 #[cfg(feature = "std")]
 use sp_version::NativeVersion;
 use sp_version::RuntimeVersion;
@@ -195,16 +198,10 @@ pub const NORMAL_BLOCK_WEIGHT: Weight = MAXIMUM_BLOCK_WEIGHT.saturating_mul(3).s
 pub const EXTRINSIC_BASE_WEIGHT: Weight = Weight::from_parts(10000 * WEIGHT_PER_GAS, 0);
 
 // Existential deposit.
-#[cfg(not(feature = "runtime-benchmarks"))]
+// PR #7379 (included in stable2503) ensures benchmarks handle ED=0 internally.
 parameter_types! {
     pub const ExistentialDeposit: Balance = 0;
 }
-#[cfg(feature = "runtime-benchmarks")]
-parameter_types! {
-    // TODO: Change ED to 1 after upgrade to Polkadot SDK stable2503
-    // cfr. https://github.com/paritytech/polkadot-sdk/pull/7379
-    pub const ExistentialDeposit: Balance = 1;
-}
 
 /// The version information used to identify this runtime when compiled natively.
 #[cfg(feature = "std")]
@@ -229,6 +226,7 @@ pub type SignedExtra = (
     frame_system::CheckWeight<Runtime>,
     pallet_transaction_payment::ChargeTransactionPayment<Runtime>,
     frame_metadata_hash_extension::CheckMetadataHash<Runtime>,
+    frame_system::WeightReclaim<Runtime>,
 );
 
 /// Unchecked extrinsic type as expected by this runtime.
@@ -1075,6 +1073,7 @@ impl_runtime_apis! {
             nonce: Option<U256>,
             estimate: bool,
             access_list: Option<Vec<(H160, Vec<H256>)>>,
+            authorization_list: Option<AuthorizationList>,
         ) -> Result<pallet_evm::CallInfo, sp_runtime::DispatchError> {
             let config = if estimate {
                 let mut config = <Runtime as pallet_evm::Config>::config().clone();
@@ -1104,6 +1103,7 @@ impl_runtime_apis! {
                 max_priority_fee_per_gas,
                 nonce,
                 access_list.unwrap_or_default(),
+                authorization_list.unwrap_or_default(),
                 is_transactional,
                 validate,
                 Some(weight_limit),
@@ -1122,6 +1122,7 @@ impl_runtime_apis! {
             nonce: Option<U256>,
             estimate: bool,
             access_list: Option<Vec<(H160, Vec<H256>)>>,
+            authorization_list: Option<AuthorizationList>,
         ) -> Result<pallet_evm::CreateInfo, sp_runtime::DispatchError> {
             let config = if estimate {
                 let mut config = <Runtime as pallet_evm::Config>::config().clone();
@@ -1155,6 +1156,7 @@ impl_runtime_apis! {
                 max_priority_fee_per_gas,
                 nonce,
                 access_list.unwrap_or_default(),
+                authorization_list.unwrap_or_default(),
                 is_transactional,
                 validate,
                 Some(weight_limit),
@@ -1235,7 +1237,7 @@ impl_runtime_apis! {
     //╚═══════════════════════════════════════════════════════════════════════════════════════════════════════════════╝
 
 
-    impl pallet_file_system_runtime_api::FileSystemApi<Block, AccountId, BackupStorageProviderId<Runtime>, MainStorageProviderId<Runtime>, H256, BlockNumber, ChunkId, BucketId<Runtime>, StorageRequestMetadata<Runtime>, BucketId<Runtime>, StorageDataUnit<Runtime>, H256> for Runtime {
+    impl pallet_file_system_runtime_api::FileSystemApi<Block, AccountId, BackupStorageProviderId<Runtime>, MainStorageProviderId<Runtime>, H256, BlockNumber, ChunkId, BucketId<Runtime>, StorageRequestMetadata<Runtime>, BucketId<Runtime>, StorageDataUnit<Runtime>, H256, PendingStopStoringRequest<Runtime>> for Runtime {
         fn is_storage_request_open_to_volunteers(file_key: H256) -> Result<bool, IsStorageRequestOpenToVolunteersError> {
             FileSystem::is_storage_request_open_to_volunteers(file_key)
         }
@@ -1282,6 +1284,15 @@ impl_runtime_apis! {
         fn get_max_batch_confirm_storage_requests() -> BlockNumber {
             FileSystem::get_max_batch_confirm_storage_requests()
         }
+        fn query_min_wait_for_stop_storing() -> BlockNumber {
+            FileSystem::query_min_wait_for_stop_storing()
+        }
+        fn has_pending_stop_storing_request(bsp_id: BackupStorageProviderId<Runtime>, file_key: H256) -> bool {
+            FileSystem::has_pending_stop_storing_request(bsp_id, file_key)
+        }
+        fn pending_stop_storing_requests_by_bsp(bsp_id: BackupStorageProviderId<Runtime>) -> BTreeMap<H256, PendingStopStoringRequest<Runtime>> {
+            FileSystem::pending_stop_storing_requests_by_bsp(bsp_id)
+        }
     }
 
     impl pallet_payment_streams_runtime_api::PaymentStreamsApi<Block, ProviderIdFor<Runtime>, Balance, AccountId> for Runtime {
@@ -1417,7 +1428,7 @@ impl_runtime_apis! {
         fn compute_signed_extra_implicit(
             era: sp_runtime::generic::Era,
             enable_metadata: bool,
-        ) -> Result<sp_std::vec::Vec<u8>, sp_runtime::transaction_validity::TransactionValidityError> {
+        ) -> Result<Vec<u8>, sp_runtime::transaction_validity::TransactionValidityError> {
             // Build the SignedExtra tuple with minimal values; only `era` and `enable_metadata`
             // influence the implicit. Other extensions have `()` implicit.
             let extra: SignedExtra = (
@@ -1430,6 +1441,7 @@ impl_runtime_apis! {
                 frame_system::CheckWeight::<Runtime>::new(),
                 pallet_transaction_payment::ChargeTransactionPayment::<Runtime>::from(<Balance as Default>::default()),
                 frame_metadata_hash_extension::CheckMetadataHash::<Runtime>::new(enable_metadata),
+                frame_system::WeightReclaim::<Runtime>::new(),
             );
             let implicit = <SignedExtra as sp_runtime::traits::TransactionExtension<RuntimeCall>>::implicit(&extra)?;
             Ok(implicit.encode())
diff --git a/operator/runtime/stagenet/src/weights/frame_system.rs b/operator/runtime/stagenet/src/weights/frame_system.rs
index 444c87c8d..ca87528b7 100644
--- a/operator/runtime/stagenet/src/weights/frame_system.rs
+++ b/operator/runtime/stagenet/src/weights/frame_system.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `frame_system`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/stagenet/src/weights/pallet_babe.rs b/operator/runtime/stagenet/src/weights/pallet_babe.rs
index 6d8f9c588..6ed6b84ca 100644
--- a/operator/runtime/stagenet/src/weights/pallet_babe.rs
+++ b/operator/runtime/stagenet/src/weights/pallet_babe.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 /// Weights for `pallet_babe`.
 pub struct WeightInfo<T>(PhantomData<T>);
 impl<T: frame_system::Config> pallet_babe::WeightInfo for WeightInfo<T> {
diff --git a/operator/runtime/stagenet/src/weights/pallet_balances.rs b/operator/runtime/stagenet/src/weights/pallet_balances.rs
index a809fcf8c..9d8baeb26 100644
--- a/operator/runtime/stagenet/src/weights/pallet_balances.rs
+++ b/operator/runtime/stagenet/src/weights/pallet_balances.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_balances`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/stagenet/src/weights/pallet_beefy_mmr.rs b/operator/runtime/stagenet/src/weights/pallet_beefy_mmr.rs
index 179b34ed3..99d4a97eb 100644
--- a/operator/runtime/stagenet/src/weights/pallet_beefy_mmr.rs
+++ b/operator/runtime/stagenet/src/weights/pallet_beefy_mmr.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_beefy_mmr`.
 pub struct WeightInfo<T>(PhantomData<T>);
@@ -90,4 +90,6 @@ impl<T: frame_system::Config> pallet_beefy_mmr::WeightInfo for WeightInfo<T> {
 			.saturating_add(Weight::from_parts(1_561_896, 0).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 	}
+
+	fn n_leafs_proof_is_optimal(_: u32) -> sp_runtime::Weight { todo!() }
 }
diff --git a/operator/runtime/stagenet/src/weights/pallet_collective_technical_committee.rs b/operator/runtime/stagenet/src/weights/pallet_collective_technical_committee.rs
index 1764a190e..94d71dcf1 100644
--- a/operator/runtime/stagenet/src/weights/pallet_collective_technical_committee.rs
+++ b/operator/runtime/stagenet/src/weights/pallet_collective_technical_committee.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_collective_technical_committee`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/stagenet/src/weights/pallet_collective_treasury_council.rs b/operator/runtime/stagenet/src/weights/pallet_collective_treasury_council.rs
index b9ad8bdb5..cc4909292 100644
--- a/operator/runtime/stagenet/src/weights/pallet_collective_treasury_council.rs
+++ b/operator/runtime/stagenet/src/weights/pallet_collective_treasury_council.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_collective_treasury_council`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/stagenet/src/weights/pallet_conviction_voting.rs b/operator/runtime/stagenet/src/weights/pallet_conviction_voting.rs
index d39df1d0f..ea69215e5 100644
--- a/operator/runtime/stagenet/src/weights/pallet_conviction_voting.rs
+++ b/operator/runtime/stagenet/src/weights/pallet_conviction_voting.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_conviction_voting`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/stagenet/src/weights/pallet_datahaven_native_transfer.rs b/operator/runtime/stagenet/src/weights/pallet_datahaven_native_transfer.rs
index effd23637..63498c9b8 100644
--- a/operator/runtime/stagenet/src/weights/pallet_datahaven_native_transfer.rs
+++ b/operator/runtime/stagenet/src/weights/pallet_datahaven_native_transfer.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_datahaven_native_transfer`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/stagenet/src/weights/pallet_evm.rs b/operator/runtime/stagenet/src/weights/pallet_evm.rs
index 950955fdc..f94d11d7d 100644
--- a/operator/runtime/stagenet/src/weights/pallet_evm.rs
+++ b/operator/runtime/stagenet/src/weights/pallet_evm.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_evm`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/stagenet/src/weights/pallet_external_validator_slashes.rs b/operator/runtime/stagenet/src/weights/pallet_external_validator_slashes.rs
index cd06db35f..39796b7e2 100644
--- a/operator/runtime/stagenet/src/weights/pallet_external_validator_slashes.rs
+++ b/operator/runtime/stagenet/src/weights/pallet_external_validator_slashes.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_external_validator_slashes`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/stagenet/src/weights/pallet_external_validators.rs b/operator/runtime/stagenet/src/weights/pallet_external_validators.rs
index 763d05b87..52338a21b 100644
--- a/operator/runtime/stagenet/src/weights/pallet_external_validators.rs
+++ b/operator/runtime/stagenet/src/weights/pallet_external_validators.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_external_validators`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/stagenet/src/weights/pallet_external_validators_rewards.rs b/operator/runtime/stagenet/src/weights/pallet_external_validators_rewards.rs
index 34d31953b..57e29ee0e 100644
--- a/operator/runtime/stagenet/src/weights/pallet_external_validators_rewards.rs
+++ b/operator/runtime/stagenet/src/weights/pallet_external_validators_rewards.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_external_validators_rewards`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/stagenet/src/weights/pallet_grandpa.rs b/operator/runtime/stagenet/src/weights/pallet_grandpa.rs
index f30c5bcfe..d148cee34 100644
--- a/operator/runtime/stagenet/src/weights/pallet_grandpa.rs
+++ b/operator/runtime/stagenet/src/weights/pallet_grandpa.rs
@@ -51,7 +51,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_grandpa`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/stagenet/src/weights/pallet_im_online.rs b/operator/runtime/stagenet/src/weights/pallet_im_online.rs
index be005d403..dfa2d9655 100644
--- a/operator/runtime/stagenet/src/weights/pallet_im_online.rs
+++ b/operator/runtime/stagenet/src/weights/pallet_im_online.rs
@@ -33,7 +33,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_im_online`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/stagenet/src/weights/pallet_message_queue.rs b/operator/runtime/stagenet/src/weights/pallet_message_queue.rs
index a3a919eb2..ec68caa23 100644
--- a/operator/runtime/stagenet/src/weights/pallet_message_queue.rs
+++ b/operator/runtime/stagenet/src/weights/pallet_message_queue.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_message_queue`.
 pub struct WeightInfo<T>(PhantomData<T>);
@@ -178,4 +178,8 @@ impl<T: frame_system::Config> pallet_message_queue::WeightInfo for WeightInfo<T>
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
+
+	fn set_service_head() -> Weight {
+		todo!()
+	}
 }
diff --git a/operator/runtime/stagenet/src/weights/pallet_mmr.rs b/operator/runtime/stagenet/src/weights/pallet_mmr.rs
index 5c74c9abd..dc6b79220 100644
--- a/operator/runtime/stagenet/src/weights/pallet_mmr.rs
+++ b/operator/runtime/stagenet/src/weights/pallet_mmr.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_mmr`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/stagenet/src/weights/pallet_multisig.rs b/operator/runtime/stagenet/src/weights/pallet_multisig.rs
index 2e0b2be6a..0623414bd 100644
--- a/operator/runtime/stagenet/src/weights/pallet_multisig.rs
+++ b/operator/runtime/stagenet/src/weights/pallet_multisig.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_multisig`.
 pub struct WeightInfo<T>(PhantomData<T>);
@@ -169,4 +169,6 @@ impl<T: frame_system::Config> pallet_multisig::WeightInfo for WeightInfo<T> {
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
+
+	fn poke_deposit(_: u32) -> sp_runtime::Weight { todo!() }
 }
diff --git a/operator/runtime/stagenet/src/weights/pallet_nfts.rs b/operator/runtime/stagenet/src/weights/pallet_nfts.rs
index 852419ffd..0dafe6b6d 100644
--- a/operator/runtime/stagenet/src/weights/pallet_nfts.rs
+++ b/operator/runtime/stagenet/src/weights/pallet_nfts.rs
@@ -33,7 +33,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_nfts`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/stagenet/src/weights/pallet_parameters.rs b/operator/runtime/stagenet/src/weights/pallet_parameters.rs
index f95cb00cc..cae74edc3 100644
--- a/operator/runtime/stagenet/src/weights/pallet_parameters.rs
+++ b/operator/runtime/stagenet/src/weights/pallet_parameters.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_parameters`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/stagenet/src/weights/pallet_payment_streams.rs b/operator/runtime/stagenet/src/weights/pallet_payment_streams.rs
index 3ac0c1d59..3c38b1ac4 100644
--- a/operator/runtime/stagenet/src/weights/pallet_payment_streams.rs
+++ b/operator/runtime/stagenet/src/weights/pallet_payment_streams.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_payment_streams`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/stagenet/src/weights/pallet_preimage.rs b/operator/runtime/stagenet/src/weights/pallet_preimage.rs
index 07cba0f56..2fc3d2d4e 100644
--- a/operator/runtime/stagenet/src/weights/pallet_preimage.rs
+++ b/operator/runtime/stagenet/src/weights/pallet_preimage.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_preimage`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/stagenet/src/weights/pallet_proofs_dealer.rs b/operator/runtime/stagenet/src/weights/pallet_proofs_dealer.rs
index 8fb40c968..860bc5a62 100644
--- a/operator/runtime/stagenet/src/weights/pallet_proofs_dealer.rs
+++ b/operator/runtime/stagenet/src/weights/pallet_proofs_dealer.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_proofs_dealer`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/stagenet/src/weights/pallet_proxy.rs b/operator/runtime/stagenet/src/weights/pallet_proxy.rs
index 7e12be9d9..ba33a80a2 100644
--- a/operator/runtime/stagenet/src/weights/pallet_proxy.rs
+++ b/operator/runtime/stagenet/src/weights/pallet_proxy.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_proxy`.
 pub struct WeightInfo<T>(PhantomData<T>);
@@ -224,4 +224,8 @@ impl<T: frame_system::Config> pallet_proxy::WeightInfo for WeightInfo<T> {
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
+
+	fn poke_deposit() -> Weight {
+		todo!()
+	}
 }
diff --git a/operator/runtime/stagenet/src/weights/pallet_randomness.rs b/operator/runtime/stagenet/src/weights/pallet_randomness.rs
index 477df36c1..b22a80207 100644
--- a/operator/runtime/stagenet/src/weights/pallet_randomness.rs
+++ b/operator/runtime/stagenet/src/weights/pallet_randomness.rs
@@ -33,7 +33,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_randomness`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/stagenet/src/weights/pallet_referenda.rs b/operator/runtime/stagenet/src/weights/pallet_referenda.rs
index dfe4de992..1e6141699 100644
--- a/operator/runtime/stagenet/src/weights/pallet_referenda.rs
+++ b/operator/runtime/stagenet/src/weights/pallet_referenda.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_referenda`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/stagenet/src/weights/pallet_safe_mode.rs b/operator/runtime/stagenet/src/weights/pallet_safe_mode.rs
index 67af1dccf..03037b9ad 100644
--- a/operator/runtime/stagenet/src/weights/pallet_safe_mode.rs
+++ b/operator/runtime/stagenet/src/weights/pallet_safe_mode.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_safe_mode`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/stagenet/src/weights/pallet_scheduler.rs b/operator/runtime/stagenet/src/weights/pallet_scheduler.rs
index 3fb00841b..1744eb108 100644
--- a/operator/runtime/stagenet/src/weights/pallet_scheduler.rs
+++ b/operator/runtime/stagenet/src/weights/pallet_scheduler.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_scheduler`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/stagenet/src/weights/pallet_session.rs b/operator/runtime/stagenet/src/weights/pallet_session.rs
index 9c65f5133..e4afaff51 100644
--- a/operator/runtime/stagenet/src/weights/pallet_session.rs
+++ b/operator/runtime/stagenet/src/weights/pallet_session.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_session`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/stagenet/src/weights/pallet_storage_providers.rs b/operator/runtime/stagenet/src/weights/pallet_storage_providers.rs
index 005a17007..acfd303c1 100644
--- a/operator/runtime/stagenet/src/weights/pallet_storage_providers.rs
+++ b/operator/runtime/stagenet/src/weights/pallet_storage_providers.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_storage_providers`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/stagenet/src/weights/pallet_sudo.rs b/operator/runtime/stagenet/src/weights/pallet_sudo.rs
index e84c4d057..8c04691dc 100644
--- a/operator/runtime/stagenet/src/weights/pallet_sudo.rs
+++ b/operator/runtime/stagenet/src/weights/pallet_sudo.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_sudo`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/stagenet/src/weights/pallet_timestamp.rs b/operator/runtime/stagenet/src/weights/pallet_timestamp.rs
index b098ca83a..b44b740b7 100644
--- a/operator/runtime/stagenet/src/weights/pallet_timestamp.rs
+++ b/operator/runtime/stagenet/src/weights/pallet_timestamp.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_timestamp`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/stagenet/src/weights/pallet_transaction_payment.rs b/operator/runtime/stagenet/src/weights/pallet_transaction_payment.rs
index ea62e0a5b..721e7e87c 100644
--- a/operator/runtime/stagenet/src/weights/pallet_transaction_payment.rs
+++ b/operator/runtime/stagenet/src/weights/pallet_transaction_payment.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_transaction_payment`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/stagenet/src/weights/pallet_treasury.rs b/operator/runtime/stagenet/src/weights/pallet_treasury.rs
index 69ffe3b27..a2caa970c 100644
--- a/operator/runtime/stagenet/src/weights/pallet_treasury.rs
+++ b/operator/runtime/stagenet/src/weights/pallet_treasury.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_treasury`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/stagenet/src/weights/pallet_tx_pause.rs b/operator/runtime/stagenet/src/weights/pallet_tx_pause.rs
index a88c0fd3f..6b7acfa98 100644
--- a/operator/runtime/stagenet/src/weights/pallet_tx_pause.rs
+++ b/operator/runtime/stagenet/src/weights/pallet_tx_pause.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_tx_pause`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/stagenet/src/weights/pallet_utility.rs b/operator/runtime/stagenet/src/weights/pallet_utility.rs
index 0b5be39c5..48517ea04 100644
--- a/operator/runtime/stagenet/src/weights/pallet_utility.rs
+++ b/operator/runtime/stagenet/src/weights/pallet_utility.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_utility`.
 pub struct WeightInfo<T>(PhantomData<T>);
@@ -119,4 +119,11 @@ impl<T: frame_system::Config> pallet_utility::WeightInfo for WeightInfo<T> {
 			.saturating_add(Weight::from_parts(6_810_676, 0).saturating_mul(c.into()))
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 	}
+	fn dispatch_as_fallible() -> Weight {
+		todo!()
+	}
+
+	fn if_else() -> Weight {
+		todo!()
+	}
 }
diff --git a/operator/runtime/stagenet/src/weights/pallet_whitelist.rs b/operator/runtime/stagenet/src/weights/pallet_whitelist.rs
index 884635522..a5ab6ab7a 100644
--- a/operator/runtime/stagenet/src/weights/pallet_whitelist.rs
+++ b/operator/runtime/stagenet/src/weights/pallet_whitelist.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_whitelist`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/stagenet/src/weights/snowbridge_pallet_ethereum_client.rs b/operator/runtime/stagenet/src/weights/snowbridge_pallet_ethereum_client.rs
index ba87788d1..71d88f12a 100644
--- a/operator/runtime/stagenet/src/weights/snowbridge_pallet_ethereum_client.rs
+++ b/operator/runtime/stagenet/src/weights/snowbridge_pallet_ethereum_client.rs
@@ -33,7 +33,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `snowbridge_pallet_ethereum_client`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/stagenet/src/weights/snowbridge_pallet_inbound_queue_v2.rs b/operator/runtime/stagenet/src/weights/snowbridge_pallet_inbound_queue_v2.rs
index 4aa69fdea..c27c9ea59 100644
--- a/operator/runtime/stagenet/src/weights/snowbridge_pallet_inbound_queue_v2.rs
+++ b/operator/runtime/stagenet/src/weights/snowbridge_pallet_inbound_queue_v2.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `snowbridge_pallet_inbound_queue_v2`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/stagenet/src/weights/snowbridge_pallet_outbound_queue_v2.rs b/operator/runtime/stagenet/src/weights/snowbridge_pallet_outbound_queue_v2.rs
index 90400a2ee..1b96e75ee 100644
--- a/operator/runtime/stagenet/src/weights/snowbridge_pallet_outbound_queue_v2.rs
+++ b/operator/runtime/stagenet/src/weights/snowbridge_pallet_outbound_queue_v2.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `snowbridge_pallet_outbound_queue_v2`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/stagenet/src/weights/snowbridge_pallet_system.rs b/operator/runtime/stagenet/src/weights/snowbridge_pallet_system.rs
index fcfc581cd..19254c3b1 100644
--- a/operator/runtime/stagenet/src/weights/snowbridge_pallet_system.rs
+++ b/operator/runtime/stagenet/src/weights/snowbridge_pallet_system.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `snowbridge_pallet_system`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/stagenet/src/weights/snowbridge_pallet_system_v2.rs b/operator/runtime/stagenet/src/weights/snowbridge_pallet_system_v2.rs
index ec6d75080..4a3fed9c7 100644
--- a/operator/runtime/stagenet/src/weights/snowbridge_pallet_system_v2.rs
+++ b/operator/runtime/stagenet/src/weights/snowbridge_pallet_system_v2.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `snowbridge_pallet_system_v2`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/stagenet/tests/common.rs b/operator/runtime/stagenet/tests/common.rs
index 9a8edc405..fa7639e49 100644
--- a/operator/runtime/stagenet/tests/common.rs
+++ b/operator/runtime/stagenet/tests/common.rs
@@ -168,9 +168,12 @@ impl ExtBuilder {
             .build_storage()
             .expect("System pallet builds valid default genesis config");
 
-        pallet_balances::GenesisConfig::<Runtime> { balances }
-            .assimilate_storage(&mut t)
-            .expect("Pallet balances storage can be assimilated");
+        pallet_balances::GenesisConfig::<Runtime> {
+            balances,
+            dev_accounts: Default::default(),
+        }
+        .assimilate_storage(&mut t)
+        .expect("Pallet balances storage can be assimilated");
 
         // Set up session keys for validators
         let session_keys: Vec<_> = validators
diff --git a/operator/runtime/stagenet/tests/governance/benchmarks.rs b/operator/runtime/stagenet/tests/governance/benchmarks.rs
index 1cf51ad2c..c40e6110b 100644
--- a/operator/runtime/stagenet/tests/governance/benchmarks.rs
+++ b/operator/runtime/stagenet/tests/governance/benchmarks.rs
@@ -23,6 +23,8 @@
 #![cfg(feature = "runtime-benchmarks")]
 
 use crate::common::*;
+use alloc::vec::Vec;
+use core::str::from_utf8;
 use datahaven_stagenet_runtime::{
     configs::governance::council::{TechnicalMaxMembers, TechnicalMaxProposals},
     governance::TracksInfo,
@@ -36,7 +38,6 @@ use frame_support::{
     traits::{Get, StorePreimage},
 };
 use pallet_conviction_voting::{AccountVote, Conviction, Vote};
-use sp_std::vec::Vec;
 
 /// Benchmark council proposal creation with varying member counts
 #[test]
@@ -443,29 +444,32 @@ fn benchmark_council_maximum_load() {
 #[test]
 fn benchmark_track_operations() {
     ExtBuilder::governance().build().execute_with(|| {
-        let tracks = TracksInfo::tracks();
+        let tracks: Vec<_> = TracksInfo::tracks().collect();
 
         println!("Testing {} governance tracks", tracks.len());
 
-        for (track_id, track_info) in tracks.iter() {
+        for track in tracks.iter() {
+            let track_name = from_utf8(&track.info.name).unwrap();
+            let track_name = track_name.trim_end_matches('\0');
             let start_block = System::block_number();
 
             // Create proposal for this track
             let proposal = RuntimeCall::System(frame_system::Call::set_storage {
                 items: vec![(
-                    format!(":track:{}:{}", track_id, track_info.name).into_bytes(),
+                    format!(":track:{}:{}", track.id, track_name).into_bytes(),
                     b"test".to_vec(),
                 )],
             });
-            let proposal_hash = make_proposal_hash(&proposal);
 
             assert_ok!(Preimage::note_preimage(
                 RuntimeOrigin::signed(alice()),
                 proposal.encode()
             ));
 
+            let bounded_proposal = <Preimage as StorePreimage>::bound(proposal).unwrap();
+
             // Map track to appropriate origin
-            let origin = if *track_id == 0 {
+            let origin = if track.id == 0 {
                 frame_system::RawOrigin::Root.into()
             } else {
                 frame_system::RawOrigin::Signed(alice()).into()
@@ -474,19 +478,19 @@ fn benchmark_track_operations() {
             assert_ok!(Referenda::submit(
                 RuntimeOrigin::signed(alice()),
                 Box::new(origin),
-                DispatchTime::After(track_info.min_enactment_period),
-                Box::new(proposal_hash.into())
+                bounded_proposal,
+                DispatchTime::After(track.info.min_enactment_period),
             ));
 
             assert_ok!(Referenda::place_decision_deposit(
                 RuntimeOrigin::signed(bob()),
-                *track_id as u32
+                track.id as u32
             ));
 
             // Test voting on this track
             assert_ok!(ConvictionVoting::vote(
                 RuntimeOrigin::signed(charlie()),
-                *track_id as u32,
+                track.id as u32,
                 AccountVote::Standard {
                     vote: Vote {
                         aye: true,
@@ -500,11 +504,11 @@ fn benchmark_track_operations() {
 
             println!(
                 "Track {} ({}): processed in {} blocks (max_deciding: {}, decision_deposit: {})",
-                track_id,
-                track_info.name,
+                track.id,
+                track_name,
                 end_block - start_block,
-                track_info.max_deciding,
-                track_info.decision_deposit
+                track.info.max_deciding,
+                track.info.decision_deposit
             );
         }
     });
diff --git a/operator/runtime/stagenet/tests/governance/referenda.rs b/operator/runtime/stagenet/tests/governance/referenda.rs
index fa8a0c8a8..00ea4ca48 100644
--- a/operator/runtime/stagenet/tests/governance/referenda.rs
+++ b/operator/runtime/stagenet/tests/governance/referenda.rs
@@ -21,6 +21,7 @@
 
 use crate::common::*;
 use codec::Encode;
+use core::str::from_utf8;
 use datahaven_stagenet_runtime::{
     currency::{HAVE, SUPPLY_FACTOR},
     governance::TracksInfo,
@@ -42,13 +43,16 @@ use pallet_referenda::{Event as ReferendaEvent, ReferendumInfo};
 #[test]
 fn tracks_info_configured_correctly() {
     ExtBuilder::default().build().execute_with(|| {
-        let tracks = TracksInfo::tracks();
+        let tracks: Vec<_> = TracksInfo::tracks().collect();
 
         // Should have 6 tracks as configured
         assert_eq!(tracks.len(), 6);
 
         // Verify track IDs and names
-        let track_names: Vec<&str> = tracks.iter().map(|(_, info)| info.name).collect();
+        let track_names: Vec<&str> = tracks
+            .iter()
+            .map(|track| from_utf8(&track.info.name).unwrap().trim_end_matches('\0'))
+            .collect();
         assert_eq!(
             track_names,
             vec![
@@ -62,16 +66,17 @@ fn tracks_info_configured_correctly() {
         );
 
         // Verify root track has strictest requirements
-        let (root_id, root_info) = &tracks[0];
-        assert_eq!(*root_id, 0u16);
-        assert_eq!(root_info.max_deciding, 5);
-        assert_eq!(root_info.decision_deposit, 100000 * HAVE * SUPPLY_FACTOR); // 100 * KILO_HAVE
+        assert_eq!(tracks[0].id, 0u16);
+        assert_eq!(tracks[0].info.max_deciding, 5);
+        assert_eq!(
+            tracks[0].info.decision_deposit,
+            100000 * HAVE * SUPPLY_FACTOR
+        ); // 100 * KILO_HAVE
 
         // Verify general admin track
-        let (admin_id, admin_info) = &tracks[2];
-        assert_eq!(*admin_id, 2u16);
-        assert_eq!(admin_info.max_deciding, 10);
-        assert_eq!(admin_info.decision_deposit, 500 * HAVE * SUPPLY_FACTOR);
+        assert_eq!(tracks[2].id, 2u16);
+        assert_eq!(tracks[2].info.max_deciding, 10);
+        assert_eq!(tracks[2].info.decision_deposit, 500 * HAVE * SUPPLY_FACTOR);
     });
 }
 
@@ -225,7 +230,8 @@ fn referendum_timing_works() {
         ));
 
         // Advance time through prepare period (1 DAY for root track)
-        let track_info = &TracksInfo::tracks()[0].1; // Root track
+        let tracks: Vec<_> = TracksInfo::tracks().collect();
+        let track_info = &tracks[0].info; // Root track
         advance_referendum_time(track_info.prepare_period + 1);
 
         // Place decision deposit
@@ -243,7 +249,8 @@ fn referendum_timing_works() {
         }
 
         // Advance time through decision period
-        let track_info = &TracksInfo::tracks()[0].1; // Root track
+        let tracks: Vec<_> = TracksInfo::tracks().collect();
+        let track_info = &tracks[0].info; // Root track
         advance_referendum_time(track_info.decision_period + 1);
 
         // Referendum should still exist (may have timed out)
@@ -499,7 +506,8 @@ fn referendum_insufficient_support_fails() {
         ));
 
         // Advance through the entire decision period
-        let track_info = &TracksInfo::tracks()[0].1; // Root track
+        let tracks: Vec<_> = TracksInfo::tracks().collect();
+        let track_info = &tracks[0].info; // Root track
         advance_referendum_time(track_info.decision_period + track_info.confirm_period + 1);
 
         // Should still be ongoing or rejected due to insufficient support
@@ -578,7 +586,8 @@ fn decision_deposit_mechanics_work() {
         }
 
         // Advance time through prepare period (1 DAY for root track)
-        let track_info = &TracksInfo::tracks()[0].1; // Root track
+        let tracks: Vec<_> = TracksInfo::tracks().collect();
+        let track_info = &tracks[0].info; // Root track
         advance_referendum_time(track_info.prepare_period + 1);
 
         let alice_balance_before = Balances::free_balance(&alice());
@@ -591,7 +600,8 @@ fn decision_deposit_mechanics_work() {
 
         // Alice's balance should decrease by decision deposit
         let alice_balance_after = Balances::free_balance(&alice());
-        let track_info = &TracksInfo::tracks()[0].1; // Root track
+        let tracks: Vec<_> = TracksInfo::tracks().collect();
+        let track_info = &tracks[0].info; // Root track
         assert_eq!(
             alice_balance_before - alice_balance_after,
             track_info.decision_deposit
@@ -619,7 +629,8 @@ fn decision_deposit_mechanics_work() {
 fn track_capacity_limits_enforced() {
     ExtBuilder::default().build().execute_with(|| {
         // Use root track which has max_deciding of 5 (more reasonable for testing)
-        let track_info = &TracksInfo::tracks()[0].1; // root track
+        let tracks: Vec<_> = TracksInfo::tracks().collect();
+        let track_info = &tracks[0].info; // root track
         let max_deciding = track_info.max_deciding.min(5); // Use smaller number for testing
 
         // Submit max_deciding referenda (but cap at 5 for scheduler limits)
@@ -723,7 +734,8 @@ fn insufficient_balance_for_deposits() {
         ));
 
         // Advance through prepare period
-        let track_info = &TracksInfo::tracks()[0].1;
+        let tracks: Vec<_> = TracksInfo::tracks().collect();
+        let track_info = &tracks[0].info;
         advance_referendum_time(track_info.prepare_period + 1);
 
         // Should fail to place decision deposit due to insufficient balance
@@ -753,7 +765,8 @@ fn referendum_confirmation_period_works() {
             DispatchTime::After(10)
         ));
 
-        let track_info = &TracksInfo::tracks()[0].1; // Root track
+        let tracks: Vec<_> = TracksInfo::tracks().collect();
+        let track_info = &tracks[0].info; // Root track
 
         // Advance through prepare period
         advance_referendum_time(track_info.prepare_period + 1);
@@ -821,7 +834,8 @@ fn split_votes_with_conviction() {
         ));
 
         // Place decision deposit after prepare period
-        let track_info = &TracksInfo::tracks()[0].1;
+        let tracks: Vec<_> = TracksInfo::tracks().collect();
+        let track_info = &tracks[0].info;
         advance_referendum_time(track_info.prepare_period + 1);
         assert_ok!(Referenda::place_decision_deposit(
             RuntimeOrigin::signed(alice()),
diff --git a/operator/runtime/stagenet/tests/lib.rs b/operator/runtime/stagenet/tests/lib.rs
index 4277d4634..93ee9058f 100644
--- a/operator/runtime/stagenet/tests/lib.rs
+++ b/operator/runtime/stagenet/tests/lib.rs
@@ -66,6 +66,7 @@ fn validate_transaction_fails_on_filtered_call() {
                 max_priority_fee_per_gas: Some(sp_core::U256::zero()),
                 nonce: None,
                 access_list: Vec::new(),
+                authorization_list: Vec::new(),
             }
             .into(),
         );
diff --git a/operator/runtime/stagenet/tests/treasury.rs b/operator/runtime/stagenet/tests/treasury.rs
index 82d3eeee4..7bf9f5027 100644
--- a/operator/runtime/stagenet/tests/treasury.rs
+++ b/operator/runtime/stagenet/tests/treasury.rs
@@ -73,6 +73,7 @@ fn author_does_receive_priority_fee() {
                 max_priority_fee_per_gas: Some(U256::from(200 * MILLIHAVE)),
                 nonce: Some(U256::from(0)),
                 access_list: Vec::new(),
+                authorization_list: Vec::new(),
             })
             .dispatch(<Runtime as frame_system::Config>::RuntimeOrigin::root()));
 
@@ -115,6 +116,7 @@ fn total_issuance_after_evm_transaction_with_priority_fee() {
                 max_priority_fee_per_gas: Some(U256::from(BASE_FEE_GENESIS)),
                 nonce: Some(U256::from(0)),
                 access_list: Vec::new(),
+                authorization_list: Vec::new(),
             })
             .dispatch(<Runtime as frame_system::Config>::RuntimeOrigin::root()));
 
@@ -184,6 +186,7 @@ fn total_issuance_after_evm_transaction_without_priority_fee() {
                 max_priority_fee_per_gas: None,
                 nonce: Some(U256::from(0)),
                 access_list: Vec::new(),
+                authorization_list: Vec::new(),
             })
             .dispatch(<Runtime as frame_system::Config>::RuntimeOrigin::root()));
 
diff --git a/operator/runtime/testnet/Cargo.toml b/operator/runtime/testnet/Cargo.toml
index 9eb0d7d0e..1675a8c2b 100644
--- a/operator/runtime/testnet/Cargo.toml
+++ b/operator/runtime/testnet/Cargo.toml
@@ -18,10 +18,11 @@ bridge-hub-common = { workspace = true, optional = true }
 codec = { workspace = true, features = ["derive"] }
 datahaven-runtime-common = { workspace = true }
 dhp-bridge = { workspace = true }
+ethereum = { workspace = true }
 fp-account = { workspace = true, features = ["serde"] }
 fp-evm = { workspace = true, features = ["serde"] }
 fp-rpc = { workspace = true }
-fp-self-contained = { workspace = true, features = ["serde", "try-runtime"] }
+fp-self-contained = { workspace = true, features = ["serde"] }
 frame-benchmarking = { workspace = true, optional = true }
 frame-executive = { workspace = true }
 frame-metadata-hash-extension = { workspace = true }
@@ -121,7 +122,6 @@ sp-offchain = { workspace = true }
 sp-runtime = { workspace = true, features = ["serde"] }
 sp-session = { workspace = true }
 sp-staking = { workspace = true }
-sp-std = { workspace = true }
 sp-storage = { workspace = true }
 sp-transaction-pool = { workspace = true }
 sp-version = { workspace = true, features = ["serde"] }
@@ -191,6 +191,7 @@ std = [
     "alloy-core/std",
     "codec/std",
     "datahaven-runtime-common/std",
+    "ethereum/std",
     "fp-account/std",
     "fp-evm/std",
     "frame-benchmarking?/std",
@@ -280,7 +281,6 @@ std = [
     "sp-runtime/std",
     "sp-session/std",
     "sp-staking/std",
-    "sp-std/std",
     "sp-storage/std",
     "sp-transaction-pool/std",
     "sp-version/std",
diff --git a/operator/runtime/testnet/src/configs/governance/origins.rs b/operator/runtime/testnet/src/configs/governance/origins.rs
index 0f943cf6b..be8043d8b 100644
--- a/operator/runtime/testnet/src/configs/governance/origins.rs
+++ b/operator/runtime/testnet/src/configs/governance/origins.rs
@@ -34,7 +34,16 @@ pub mod custom_origins {
     pub struct Pallet<T>(_);
 
     #[derive(
-        PartialEq, Eq, Clone, MaxEncodedLen, Encode, Decode, TypeInfo, RuntimeDebug, EnumString,
+        PartialEq,
+        Eq,
+        Clone,
+        MaxEncodedLen,
+        Encode,
+        Decode,
+        TypeInfo,
+        RuntimeDebug,
+        EnumString,
+        DecodeWithMemTracking,
     )]
     #[strum(serialize_all = "snake_case")]
     #[pallet::origin]
diff --git a/operator/runtime/testnet/src/configs/governance/referenda.rs b/operator/runtime/testnet/src/configs/governance/referenda.rs
index cbb68bf51..e65727d3d 100644
--- a/operator/runtime/testnet/src/configs/governance/referenda.rs
+++ b/operator/runtime/testnet/src/configs/governance/referenda.rs
@@ -57,6 +57,8 @@ impl pallet_conviction_voting::Config for Runtime {
     type MaxVotes = ConstU32<20>;
     type MaxTurnout = frame_support::traits::TotalIssuanceOf<Balances, AccountId>;
     type Polls = Referenda;
+    type BlockNumberProvider = System;
+    type VotingHooks = ();
 }
 
 impl pallet_whitelist::Config for Runtime {
@@ -79,8 +81,6 @@ impl pallet_whitelist::Config for Runtime {
     type WeightInfo = testnet_weights::pallet_whitelist::WeightInfo<Runtime>;
 }
 
-pallet_referenda::impl_tracksinfo_get!(TracksInfo, Balance, BlockNumber);
-
 // Referenda Implementation
 impl pallet_referenda::Config for Runtime {
     type WeightInfo = testnet_weights::pallet_referenda::WeightInfo<Runtime>;
@@ -100,4 +100,5 @@ impl pallet_referenda::Config for Runtime {
     type AlarmInterval = AlarmInterval;
     type Tracks = TracksInfo;
     type Preimages = Preimage;
+    type BlockNumberProvider = System;
 }
diff --git a/operator/runtime/testnet/src/configs/governance/tracks.rs b/operator/runtime/testnet/src/configs/governance/tracks.rs
index c1b8a2332..21d171b47 100644
--- a/operator/runtime/testnet/src/configs/governance/tracks.rs
+++ b/operator/runtime/testnet/src/configs/governance/tracks.rs
@@ -21,9 +21,13 @@
 
 use super::*;
 use crate::currency::{HAVE, KILOHAVE, SUPPLY_FACTOR};
+use alloc::borrow::Cow;
+use core::str::from_utf8;
+use core::str::FromStr;
 use datahaven_runtime_common::time::*;
 use pallet_referenda::Curve;
-use sp_std::str::FromStr;
+use pallet_referenda::Track;
+use sp_runtime::str_array;
 
 const fn percent(x: i32) -> sp_runtime::FixedI64 {
     sp_runtime::FixedI64::from_rational(x as u128, 100)
@@ -32,12 +36,12 @@ const fn permill(x: i32) -> sp_runtime::FixedI64 {
     sp_runtime::FixedI64::from_rational(x as u128, 1000)
 }
 
-const TRACKS_DATA: [(u16, pallet_referenda::TrackInfo<Balance, BlockNumber>); 6] = [
-    (
-        0,
-        pallet_referenda::TrackInfo {
+const TRACKS_DATA: [Track<u16, Balance, BlockNumber>; 6] = [
+    Track {
+        id: 0,
+        info: pallet_referenda::TrackInfo {
             // Name of this track.
-            name: "root",
+            name: str_array("root"),
             // A limit for the number of referenda on this track that can be being decided at once.
             // For Root origin this should generally be just one.
             max_deciding: 5,
@@ -58,11 +62,11 @@ const TRACKS_DATA: [(u16, pallet_referenda::TrackInfo<Balance, BlockNumber>); 6]
             // is needed for approval as a function of time into decision period.
             min_support: Curve::make_linear(14, 14, permill(5), percent(25)),
         },
-    ),
-    (
-        1,
-        pallet_referenda::TrackInfo {
-            name: "whitelisted_caller",
+    },
+    Track {
+        id: 1,
+        info: pallet_referenda::TrackInfo {
+            name: str_array("whitelisted_caller"),
             max_deciding: 100,
             decision_deposit: 10 * KILOHAVE * SUPPLY_FACTOR,
             prepare_period: 10 * MINUTES,
@@ -72,11 +76,11 @@ const TRACKS_DATA: [(u16, pallet_referenda::TrackInfo<Balance, BlockNumber>); 6]
             min_approval: Curve::make_reciprocal(1, 14, percent(96), percent(50), percent(100)),
             min_support: Curve::make_reciprocal(1, 14 * 24, percent(1), percent(0), percent(2)),
         },
-    ),
-    (
-        2,
-        pallet_referenda::TrackInfo {
-            name: "general_admin",
+    },
+    Track {
+        id: 2,
+        info: pallet_referenda::TrackInfo {
+            name: str_array("general_admin"),
             max_deciding: 10,
             decision_deposit: 500 * HAVE * SUPPLY_FACTOR,
             prepare_period: 1 * HOURS,
@@ -86,11 +90,11 @@ const TRACKS_DATA: [(u16, pallet_referenda::TrackInfo<Balance, BlockNumber>); 6]
             min_approval: Curve::make_reciprocal(4, 14, percent(80), percent(50), percent(100)),
             min_support: Curve::make_reciprocal(7, 14, percent(10), percent(0), percent(50)),
         },
-    ),
-    (
-        3,
-        pallet_referenda::TrackInfo {
-            name: "referendum_canceller",
+    },
+    Track {
+        id: 3,
+        info: pallet_referenda::TrackInfo {
+            name: str_array("referendum_canceller"),
             max_deciding: 20,
             decision_deposit: 10 * KILOHAVE * SUPPLY_FACTOR,
             prepare_period: 1 * HOURS,
@@ -100,11 +104,11 @@ const TRACKS_DATA: [(u16, pallet_referenda::TrackInfo<Balance, BlockNumber>); 6]
             min_approval: Curve::make_reciprocal(1, 14, percent(96), percent(50), percent(100)),
             min_support: Curve::make_reciprocal(1, 14, percent(1), percent(0), percent(10)),
         },
-    ),
-    (
-        4,
-        pallet_referenda::TrackInfo {
-            name: "referendum_killer",
+    },
+    Track {
+        id: 4,
+        info: pallet_referenda::TrackInfo {
+            name: str_array("referendum_killer"),
             max_deciding: 100,
             decision_deposit: 20 * KILOHAVE * SUPPLY_FACTOR,
             prepare_period: 1 * HOURS,
@@ -114,11 +118,11 @@ const TRACKS_DATA: [(u16, pallet_referenda::TrackInfo<Balance, BlockNumber>); 6]
             min_approval: Curve::make_reciprocal(1, 14, percent(96), percent(50), percent(100)),
             min_support: Curve::make_reciprocal(1, 14, percent(1), percent(0), percent(10)),
         },
-    ),
-    (
-        5,
-        pallet_referenda::TrackInfo {
-            name: "fast_general_admin",
+    },
+    Track {
+        id: 5,
+        info: pallet_referenda::TrackInfo {
+            name: str_array("fast_general_admin"),
             max_deciding: 10,
             decision_deposit: 500 * HAVE * SUPPLY_FACTOR,
             prepare_period: 1 * HOURS,
@@ -128,25 +132,25 @@ const TRACKS_DATA: [(u16, pallet_referenda::TrackInfo<Balance, BlockNumber>); 6]
             min_approval: Curve::make_reciprocal(4, 14, percent(80), percent(50), percent(100)),
             min_support: Curve::make_reciprocal(5, 14, percent(1), percent(0), percent(50)),
         },
-    ),
+    },
 ];
 
 pub struct TracksInfo;
 impl pallet_referenda::TracksInfo<Balance, BlockNumber> for TracksInfo {
     type Id = u16;
     type RuntimeOrigin = <RuntimeOrigin as frame_support::traits::OriginTrait>::PalletsOrigin;
-    fn tracks() -> &'static [(Self::Id, pallet_referenda::TrackInfo<Balance, BlockNumber>)] {
-        &TRACKS_DATA[..]
+    fn tracks() -> impl Iterator<Item = Cow<'static, Track<Self::Id, Balance, BlockNumber>>> {
+        TRACKS_DATA.iter().map(Cow::Borrowed)
     }
     fn track_for(id: &Self::RuntimeOrigin) -> Result<Self::Id, ()> {
         if let Ok(system_origin) = frame_system::RawOrigin::try_from(id.clone()) {
             match system_origin {
                 frame_system::RawOrigin::Root => {
-                    if let Some((track_id, _)) = Self::tracks()
+                    if let Some(track) = Self::tracks()
                         .into_iter()
-                        .find(|(_, track)| track.name == "root")
+                        .find(|track| track.info.name == str_array("root"))
                     {
-                        Ok(*track_id)
+                        Ok(track.id)
                     } else {
                         Err(())
                     }
@@ -154,14 +158,18 @@ impl pallet_referenda::TracksInfo<Balance, BlockNumber> for TracksInfo {
                 _ => Err(()),
             }
         } else if let Ok(custom_origin) = custom_origins::Origin::try_from(id.clone()) {
-            if let Some((track_id, _)) = Self::tracks().into_iter().find(|(_, track)| {
-                if let Ok(track_custom_origin) = custom_origins::Origin::from_str(track.name) {
+            if let Some(track) = Self::tracks().into_iter().find(|track| {
+                let Ok(track_name) = from_utf8(&track.info.name) else {
+                    return false;
+                };
+                let track_name = track_name.trim_end_matches('\0');
+                if let Ok(track_custom_origin) = custom_origins::Origin::from_str(track_name) {
                     track_custom_origin == custom_origin
                 } else {
                     false
                 }
             }) {
-                Ok(*track_id)
+                Ok(track.id)
             } else {
                 Err(())
             }
@@ -174,13 +182,15 @@ impl pallet_referenda::TracksInfo<Balance, BlockNumber> for TracksInfo {
 #[test]
 /// To ensure voters are always locked into their vote
 fn vote_locking_always_longer_than_enactment_period() {
-    for (_, track) in TRACKS_DATA {
+    for track in TRACKS_DATA {
+        let track_name = from_utf8(&track.info.name).unwrap();
+        let track_name = track_name.trim_end_matches('\0');
         assert!(
             <Runtime as pallet_conviction_voting::Config>::VoteLockingPeriod::get()
-                >= track.min_enactment_period,
+                >= track.info.min_enactment_period,
             "Track {} has enactment period {} < vote locking period {}",
-            track.name,
-            track.min_enactment_period,
+            track_name,
+            track.info.min_enactment_period,
             <Runtime as pallet_conviction_voting::Config>::VoteLockingPeriod::get(),
         );
     }
@@ -188,10 +198,12 @@ fn vote_locking_always_longer_than_enactment_period() {
 
 #[test]
 fn all_tracks_have_origins() {
-    for (_, track) in TRACKS_DATA {
+    for track in TRACKS_DATA {
+        let track_name = from_utf8(&track.info.name).unwrap();
+        let track_name = track_name.trim_end_matches('\0');
         // check name.into() is successful either converts into "root" or custom origin
-        let track_is_root = track.name == "root";
-        let track_has_custom_origin = custom_origins::Origin::from_str(track.name).is_ok();
+        let track_is_root = track_name == "root";
+        let track_has_custom_origin = custom_origins::Origin::from_str(track_name).is_ok();
         assert!(track_is_root || track_has_custom_origin);
     }
 }
diff --git a/operator/runtime/testnet/src/configs/mod.rs b/operator/runtime/testnet/src/configs/mod.rs
index 27dbc5384..fb73dd44d 100644
--- a/operator/runtime/testnet/src/configs/mod.rs
+++ b/operator/runtime/testnet/src/configs/mod.rs
@@ -30,8 +30,9 @@ use super::{
     Signature, System, Timestamp, Treasury, TxPause, BLOCK_HASH_COUNT, EXTRINSIC_BASE_WEIGHT,
     MAXIMUM_BLOCK_WEIGHT, NORMAL_BLOCK_WEIGHT, NORMAL_DISPATCH_RATIO, SLOT_DURATION, VERSION,
 };
+use alloc::vec::Vec;
 use alloy_core::primitives::Address;
-use codec::{Decode, Encode, MaxEncodedLen};
+use codec::{Decode, DecodeWithMemTracking, Encode, MaxEncodedLen};
 use scale_info::TypeInfo;
 use sp_runtime::{traits::AccountIdConversion, RuntimeDebug};
 
@@ -49,6 +50,7 @@ use sp_runtime::{traits::AccountIdConversion, RuntimeDebug};
     RuntimeDebug,
     MaxEncodedLen,
     TypeInfo,
+    DecodeWithMemTracking,
     serde::Serialize,
     serde::Deserialize,
 )]
@@ -76,6 +78,7 @@ impl Default for ProxyType {
         Self::Any
     }
 }
+use core::convert::{From, Into};
 use datahaven_runtime_common::{
     deal_with_fees::{
         DealWithEthereumBaseFees, DealWithEthereumPriorityFees, DealWithSubstrateFeesAndTip,
@@ -141,10 +144,6 @@ use sp_runtime::{
     FixedPointNumber, Perbill, Perquintill,
 };
 use sp_staking::EraIndex;
-use sp_std::{
-    convert::{From, Into},
-    prelude::*,
-};
 use sp_version::RuntimeVersion;
 use xcm::latest::NetworkId;
 use xcm::prelude::*;
@@ -395,6 +394,7 @@ impl pallet_session::Config for Runtime {
     type SessionHandler = <SessionKeys as OpaqueKeys>::KeyTypeIdProviders;
     type Keys = SessionKeys;
     type WeightInfo = testnet_weights::pallet_session::WeightInfo<Runtime>;
+    type DisablingStrategy = ();
 }
 
 parameter_types! {
@@ -593,6 +593,7 @@ impl pallet_scheduler::Config for Runtime {
     type OriginPrivilegeCmp = EqualPrivilegeOnly;
     type Preimages = Preimage;
     type WeightInfo = testnet_weights::pallet_scheduler::WeightInfo<Runtime>;
+    type BlockNumberProvider = System;
 }
 
 parameter_types! {
@@ -656,8 +657,7 @@ impl pallet_identity::Config for Runtime {
     type UsernameDeposit = UsernameDeposit;
     type UsernameGracePeriod = UsernameGracePeriod;
 
-    // TODO: Re-enable after upgrade to Polkadot SDK stable2412-8
-    // see https://github.com/paritytech/polkadot-sdk/releases/tag/polkadot-stable2412-8
+    // TODO: Replace by Identity pallet's BenchmarkHelper when available (stable2506).
     // #[cfg(feature = "runtime-benchmarks")]
     // fn benchmark_helper(message: &[u8]) -> (Vec<u8>, Vec<u8>) {
     //     let public = sp_io::crypto::ecdsa_generate(0.into(), None);
@@ -687,6 +687,7 @@ impl pallet_multisig::Config for Runtime {
     type DepositFactor = DepositFactor;
     type MaxSignatories = MaxSignatories;
     type WeightInfo = testnet_weights::pallet_multisig::WeightInfo<Runtime>;
+    type BlockNumberProvider = System;
 }
 
 parameter_types! {
@@ -852,6 +853,7 @@ impl pallet_proxy::Config for Runtime {
     type CallHasher = sp_runtime::traits::BlakeTwo256;
     type AnnouncementDepositBase = AnnouncementDepositBase;
     type AnnouncementDepositFactor = AnnouncementDepositFactor;
+    type BlockNumberProvider = System;
 }
 
 impl pallet_proxy_genesis_companion::Config for Runtime {
@@ -1053,6 +1055,8 @@ impl pallet_evm::Config for Runtime {
     type GasLimitPovSizeRatio = GasLimitPovSizeRatio;
     type GasLimitStorageGrowthRatio = GasLimitStorageGrowthRatio;
     type Timestamp = Timestamp;
+    type CreateOriginFilter = ();
+    type CreateInnerOriginFilter = ();
     type WeightInfo = testnet_weights::pallet_evm::WeightInfo<Runtime>;
 }
 
diff --git a/operator/runtime/testnet/src/configs/runtime_params.rs b/operator/runtime/testnet/src/configs/runtime_params.rs
index 40c891085..b0ffbfc99 100644
--- a/operator/runtime/testnet/src/configs/runtime_params.rs
+++ b/operator/runtime/testnet/src/configs/runtime_params.rs
@@ -14,11 +14,11 @@
 // You should have received a copy of the GNU General Public License
 // along with DataHaven.  If not, see <http://www.gnu.org/licenses/>.
 
+use alloc::vec;
 use frame_support::dynamic_params::{dynamic_pallet_params, dynamic_params};
 use hex_literal::hex;
 use sp_core::{ConstU32, H160, H256};
 use sp_runtime::{BoundedVec, Perbill};
-use sp_std::vec;
 
 use crate::Runtime;
 
diff --git a/operator/runtime/testnet/src/configs/storagehub/client.rs b/operator/runtime/testnet/src/configs/storagehub/client.rs
index 110bec9da..1e0bf3396 100644
--- a/operator/runtime/testnet/src/configs/storagehub/client.rs
+++ b/operator/runtime/testnet/src/configs/storagehub/client.rs
@@ -50,6 +50,7 @@ impl ExtensionOperations<crate::RuntimeCall, crate::Runtime> for crate::SignedEx
                 minimal.tip,
             ),
             frame_metadata_hash_extension::CheckMetadataHash::<crate::Runtime>::new(false),
+            frame_system::WeightReclaim::<crate::Runtime>::new(),
         )
     }
 }
diff --git a/operator/runtime/testnet/src/configs/storagehub/mod.rs b/operator/runtime/testnet/src/configs/storagehub/mod.rs
index 7717475c1..9f3eb3a3f 100644
--- a/operator/runtime/testnet/src/configs/storagehub/mod.rs
+++ b/operator/runtime/testnet/src/configs/storagehub/mod.rs
@@ -13,13 +13,14 @@
 
 // You should have received a copy of the GNU General Public License
 // along with DataHaven.  If not, see <http://www.gnu.org/licenses/>.
+extern crate alloc;
 
 #[cfg(not(feature = "runtime-benchmarks"))]
 use super::HAVE;
 #[cfg(feature = "runtime-benchmarks")]
 use super::MICROHAVE;
 use super::{
-    AccountId, Balance, Balances, BlockNumber, Hash, RuntimeEvent, RuntimeHoldReason,
+    AccountId, Balance, Balances, BlockNumber, Hash, RuntimeEvent, RuntimeHoldReason, System,
     TreasuryAccount,
 };
 use crate::configs::runtime_params::dynamic_params::runtime_config;
@@ -27,6 +28,8 @@ use crate::{
     BucketNfts, Nfts, PaymentStreams, ProofsDealer, Providers, Runtime, Signature, WeightToFee,
     HOURS,
 };
+use alloc::{vec, vec::Vec};
+use core::convert::{From, Into};
 use core::marker::PhantomData;
 #[cfg(feature = "runtime-benchmarks")]
 use datahaven_runtime_common::benchmarking::StorageHubBenchmarking;
@@ -59,8 +62,6 @@ use sp_runtime::traits::Verify;
 use sp_runtime::traits::Zero;
 use sp_runtime::SaturatedConversion;
 use sp_runtime::{traits::BlakeTwo256, Perbill};
-use sp_std::convert::{From, Into};
-use sp_std::{vec, vec::Vec};
 use sp_trie::{LayoutV1, TrieConfiguration, TrieLayout};
 
 #[cfg(feature = "std")]
@@ -126,6 +127,7 @@ impl pallet_nfts::Config for Runtime {
     type OffchainPublic = <Signature as Verify>::Signer;
     type WeightInfo = crate::weights::pallet_nfts::WeightInfo<Runtime>;
     type Locker = ();
+    type BlockNumberProvider = System;
     #[cfg(feature = "runtime-benchmarks")]
     type Helper = benchmark_helpers::NftHelper;
 }
@@ -627,16 +629,16 @@ parameter_types! {
 /// "\x19Ethereum Signed Message:\n" + len(message) + message"
 pub struct Eip191Adapter;
 impl shp_traits::MessageAdapter for Eip191Adapter {
-    fn bytes_to_verify(message: &[u8]) -> Vec<u8> {
+    fn bytes_to_verify(intention: &[u8], _context: &[u8]) -> Vec<u8> {
         const PREFIX: &str = "\x19Ethereum Signed Message:\n";
-        let len = message.len();
+        let len = intention.len();
         let mut len_string_buffer = itoa::Buffer::new();
         let len_string = len_string_buffer.format(len);
 
         let mut eth_message = Vec::with_capacity(PREFIX.len() + len_string.len() + len);
         eth_message.extend_from_slice(PREFIX.as_bytes());
         eth_message.extend_from_slice(len_string.as_bytes());
-        eth_message.extend_from_slice(message);
+        eth_message.extend_from_slice(intention);
         eth_message
     }
 }
@@ -700,6 +702,8 @@ impl pallet_file_system::Config for Runtime {
     type OffchainPublicKey = <Signature as Verify>::Signer;
     type MaxFileDeletionsPerExtrinsic = ConstU32<100>;
     type IntentionMsgAdapter = Eip191Adapter;
+    type MaxBspVolunteers = ConstU32<1000>;
+    type MaxMspRespondFileKeys = ConstU32<10>;
 }
 
 impl MostlyStablePriceIndexUpdaterConfig for Runtime {
diff --git a/operator/runtime/testnet/src/genesis_config_presets.rs b/operator/runtime/testnet/src/genesis_config_presets.rs
index e568f2665..d58757186 100644
--- a/operator/runtime/testnet/src/genesis_config_presets.rs
+++ b/operator/runtime/testnet/src/genesis_config_presets.rs
@@ -56,6 +56,7 @@ fn testnet_genesis(
                 .cloned()
                 .map(|k| (k, 1u128 << 80))
                 .collect::<Vec<_>>(),
+            dev_accounts: Default::default(),
         },
         babe: pallet_babe::GenesisConfig {
             epoch_config: BABE_GENESIS_EPOCH_CONFIG,
diff --git a/operator/runtime/testnet/src/lib.rs b/operator/runtime/testnet/src/lib.rs
index a8248dbd6..40d6345f3 100644
--- a/operator/runtime/testnet/src/lib.rs
+++ b/operator/runtime/testnet/src/lib.rs
@@ -31,14 +31,18 @@ pub mod weights;
 pub use configs::governance;
 pub use configs::Precompiles;
 
-// TODO: Temporary workaround before upgrading to latest polkadot-sdk - fix https://github.com/paritytech/polkadot-sdk/pull/6435
+// Aliases required by define_benchmarks! for pallet_collective instances.
+// PR #6435 (in stable2503) fixes the underlying issue, so these can be removed
+// when benchmarks are regenerated and weight files renamed accordingly.
 #[allow(unused_imports)]
 use pallet_collective as pallet_collective_treasury_council;
 #[allow(unused_imports)]
 use pallet_collective as pallet_collective_technical_committee;
 
+use alloc::collections::btree_map::BTreeMap;
 use alloc::{borrow::Cow, vec::Vec};
 use codec::Encode;
+use ethereum::AuthorizationList;
 use fp_rpc::TransactionStatus;
 use frame_support::{
     genesis_builder_helper::{build_state, get_preset},
@@ -54,7 +58,7 @@ pub use frame_system::Call as SystemCall;
 pub use pallet_balances::Call as BalancesCall;
 use pallet_ethereum::{Call::transact, Transaction as EthereumTransaction};
 use pallet_evm::{Account as EVMAccount, FeeCalculator, GasWeightMapping, Runner};
-use pallet_file_system::types::StorageRequestMetadata;
+use pallet_file_system::types::{PendingStopStoringRequest, StorageRequestMetadata};
 use pallet_file_system_runtime_api::*;
 use pallet_grandpa::{fg_primitives, AuthorityId as GrandpaId};
 use pallet_payment_streams_runtime_api::*;
@@ -85,7 +89,6 @@ use sp_runtime::{
     transaction_validity::{InvalidTransaction, TransactionSource},
     ApplyExtrinsicResult, Perbill, Permill,
 };
-use sp_std::collections::btree_map::BTreeMap;
 #[cfg(feature = "std")]
 use sp_version::NativeVersion;
 use sp_version::RuntimeVersion;
@@ -193,16 +196,10 @@ pub const NORMAL_BLOCK_WEIGHT: Weight = MAXIMUM_BLOCK_WEIGHT.saturating_mul(3).s
 pub const EXTRINSIC_BASE_WEIGHT: Weight = Weight::from_parts(10000 * WEIGHT_PER_GAS, 0);
 
 // Existential deposit.
-#[cfg(not(feature = "runtime-benchmarks"))]
+// PR #7379 (included in stable2503) ensures benchmarks handle ED=0 internally.
 parameter_types! {
     pub const ExistentialDeposit: Balance = 0;
 }
-#[cfg(feature = "runtime-benchmarks")]
-parameter_types! {
-    // TODO: Change ED to 1 after upgrade to Polkadot SDK stable2503
-    // cfr. https://github.com/paritytech/polkadot-sdk/pull/7379
-    pub const ExistentialDeposit: Balance = 1;
-}
 
 /// The version information used to identify this runtime when compiled natively.
 #[cfg(feature = "std")]
@@ -227,6 +224,7 @@ pub type SignedExtra = (
     frame_system::CheckWeight<Runtime>,
     pallet_transaction_payment::ChargeTransactionPayment<Runtime>,
     frame_metadata_hash_extension::CheckMetadataHash<Runtime>,
+    frame_system::WeightReclaim<Runtime>,
 );
 
 /// Unchecked extrinsic type as expected by this runtime.
@@ -1073,6 +1071,7 @@ impl_runtime_apis! {
             nonce: Option<U256>,
             estimate: bool,
             access_list: Option<Vec<(H160, Vec<H256>)>>,
+            authorization_list: Option<AuthorizationList>,
         ) -> Result<pallet_evm::CallInfo, sp_runtime::DispatchError> {
             let config = if estimate {
                 let mut config = <Runtime as pallet_evm::Config>::config().clone();
@@ -1102,6 +1101,7 @@ impl_runtime_apis! {
                 max_priority_fee_per_gas,
                 nonce,
                 access_list.unwrap_or_default(),
+                authorization_list.unwrap_or_default(),
                 is_transactional,
                 validate,
                 Some(weight_limit),
@@ -1120,6 +1120,7 @@ impl_runtime_apis! {
             nonce: Option<U256>,
             estimate: bool,
             access_list: Option<Vec<(H160, Vec<H256>)>>,
+            authorization_list: Option<AuthorizationList>,
         ) -> Result<pallet_evm::CreateInfo, sp_runtime::DispatchError> {
             let config = if estimate {
                 let mut config = <Runtime as pallet_evm::Config>::config().clone();
@@ -1153,6 +1154,7 @@ impl_runtime_apis! {
                 max_priority_fee_per_gas,
                 nonce,
                 access_list.unwrap_or_default(),
+                authorization_list.unwrap_or_default(),
                 is_transactional,
                 validate,
                 Some(weight_limit),
@@ -1232,7 +1234,7 @@ impl_runtime_apis! {
     //║                                        STORAGEHUB APIS                                                        ║
     //╚═══════════════════════════════════════════════════════════════════════════════════════════════════════════════╝
 
-    impl pallet_file_system_runtime_api::FileSystemApi<Block, AccountId, BackupStorageProviderId<Runtime>, MainStorageProviderId<Runtime>, H256, BlockNumber, ChunkId, BucketId<Runtime>, StorageRequestMetadata<Runtime>, BucketId<Runtime>, StorageDataUnit<Runtime>, H256> for Runtime {
+    impl pallet_file_system_runtime_api::FileSystemApi<Block, AccountId, BackupStorageProviderId<Runtime>, MainStorageProviderId<Runtime>, H256, BlockNumber, ChunkId, BucketId<Runtime>, StorageRequestMetadata<Runtime>, BucketId<Runtime>, StorageDataUnit<Runtime>, H256, PendingStopStoringRequest<Runtime>> for Runtime {
         fn is_storage_request_open_to_volunteers(file_key: H256) -> Result<bool, IsStorageRequestOpenToVolunteersError> {
             FileSystem::is_storage_request_open_to_volunteers(file_key)
         }
@@ -1279,6 +1281,15 @@ impl_runtime_apis! {
         fn get_max_batch_confirm_storage_requests() -> BlockNumber {
             FileSystem::get_max_batch_confirm_storage_requests()
         }
+        fn query_min_wait_for_stop_storing() -> BlockNumber {
+            FileSystem::query_min_wait_for_stop_storing()
+        }
+        fn has_pending_stop_storing_request(bsp_id: BackupStorageProviderId<Runtime>, file_key: H256) -> bool {
+            FileSystem::has_pending_stop_storing_request(bsp_id, file_key)
+        }
+        fn pending_stop_storing_requests_by_bsp(bsp_id: BackupStorageProviderId<Runtime>) -> BTreeMap<H256, PendingStopStoringRequest<Runtime>> {
+            FileSystem::pending_stop_storing_requests_by_bsp(bsp_id)
+        }
     }
 
     impl pallet_payment_streams_runtime_api::PaymentStreamsApi<Block, ProviderIdFor<Runtime>, Balance, AccountId> for Runtime {
@@ -1414,7 +1425,7 @@ impl_runtime_apis! {
         fn compute_signed_extra_implicit(
             era: sp_runtime::generic::Era,
             enable_metadata: bool,
-        ) -> Result<sp_std::vec::Vec<u8>, sp_runtime::transaction_validity::TransactionValidityError> {
+        ) -> Result<Vec<u8>, sp_runtime::transaction_validity::TransactionValidityError> {
             // Build the SignedExtra tuple with minimal values; only `era` and `enable_metadata`
             // influence the implicit. Other extensions have `()` implicit.
             let extra: SignedExtra = (
@@ -1427,6 +1438,7 @@ impl_runtime_apis! {
                 frame_system::CheckWeight::<Runtime>::new(),
                 pallet_transaction_payment::ChargeTransactionPayment::<Runtime>::from(<Balance as Default>::default()),
                 frame_metadata_hash_extension::CheckMetadataHash::<Runtime>::new(enable_metadata),
+                frame_system::WeightReclaim::<Runtime>::new(),
             );
             let implicit = <SignedExtra as sp_runtime::traits::TransactionExtension<RuntimeCall>>::implicit(&extra)?;
             Ok(implicit.encode())
diff --git a/operator/runtime/testnet/src/weights/frame_system.rs b/operator/runtime/testnet/src/weights/frame_system.rs
index 059a1edfa..f988cea88 100644
--- a/operator/runtime/testnet/src/weights/frame_system.rs
+++ b/operator/runtime/testnet/src/weights/frame_system.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `frame_system`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/testnet/src/weights/pallet_babe.rs b/operator/runtime/testnet/src/weights/pallet_babe.rs
index f8a55290e..6a33371ba 100644
--- a/operator/runtime/testnet/src/weights/pallet_babe.rs
+++ b/operator/runtime/testnet/src/weights/pallet_babe.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_babe`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/testnet/src/weights/pallet_balances.rs b/operator/runtime/testnet/src/weights/pallet_balances.rs
index 7cdcf2679..6a06a3c16 100644
--- a/operator/runtime/testnet/src/weights/pallet_balances.rs
+++ b/operator/runtime/testnet/src/weights/pallet_balances.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_balances`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/testnet/src/weights/pallet_beefy_mmr.rs b/operator/runtime/testnet/src/weights/pallet_beefy_mmr.rs
index 50120ed7e..4a536f01e 100644
--- a/operator/runtime/testnet/src/weights/pallet_beefy_mmr.rs
+++ b/operator/runtime/testnet/src/weights/pallet_beefy_mmr.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_beefy_mmr`.
 pub struct WeightInfo<T>(PhantomData<T>);
@@ -90,4 +90,6 @@ impl<T: frame_system::Config> pallet_beefy_mmr::WeightInfo for WeightInfo<T> {
 			.saturating_add(Weight::from_parts(1_513_924, 0).saturating_mul(n.into()))
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 	}
+
+	fn n_leafs_proof_is_optimal(_: u32) -> sp_runtime::Weight { todo!() }
 }
diff --git a/operator/runtime/testnet/src/weights/pallet_collective_technical_committee.rs b/operator/runtime/testnet/src/weights/pallet_collective_technical_committee.rs
index 3527a3f4b..2aeac645a 100644
--- a/operator/runtime/testnet/src/weights/pallet_collective_technical_committee.rs
+++ b/operator/runtime/testnet/src/weights/pallet_collective_technical_committee.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_collective_technical_committee`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/testnet/src/weights/pallet_collective_treasury_council.rs b/operator/runtime/testnet/src/weights/pallet_collective_treasury_council.rs
index b2cdaa065..2a2008e0f 100644
--- a/operator/runtime/testnet/src/weights/pallet_collective_treasury_council.rs
+++ b/operator/runtime/testnet/src/weights/pallet_collective_treasury_council.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_collective_treasury_council`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/testnet/src/weights/pallet_conviction_voting.rs b/operator/runtime/testnet/src/weights/pallet_conviction_voting.rs
index 22a06d01b..7fb44c66f 100644
--- a/operator/runtime/testnet/src/weights/pallet_conviction_voting.rs
+++ b/operator/runtime/testnet/src/weights/pallet_conviction_voting.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_conviction_voting`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/testnet/src/weights/pallet_datahaven_native_transfer.rs b/operator/runtime/testnet/src/weights/pallet_datahaven_native_transfer.rs
index 30942c1e6..e76d68c62 100644
--- a/operator/runtime/testnet/src/weights/pallet_datahaven_native_transfer.rs
+++ b/operator/runtime/testnet/src/weights/pallet_datahaven_native_transfer.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_datahaven_native_transfer`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/testnet/src/weights/pallet_evm.rs b/operator/runtime/testnet/src/weights/pallet_evm.rs
index a637fc673..710bb6733 100644
--- a/operator/runtime/testnet/src/weights/pallet_evm.rs
+++ b/operator/runtime/testnet/src/weights/pallet_evm.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_evm`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/testnet/src/weights/pallet_external_validator_slashes.rs b/operator/runtime/testnet/src/weights/pallet_external_validator_slashes.rs
index 85e6f04fe..5dd4c60c8 100644
--- a/operator/runtime/testnet/src/weights/pallet_external_validator_slashes.rs
+++ b/operator/runtime/testnet/src/weights/pallet_external_validator_slashes.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_external_validator_slashes`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/testnet/src/weights/pallet_external_validators.rs b/operator/runtime/testnet/src/weights/pallet_external_validators.rs
index d989bab6f..2a5559fdc 100644
--- a/operator/runtime/testnet/src/weights/pallet_external_validators.rs
+++ b/operator/runtime/testnet/src/weights/pallet_external_validators.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_external_validators`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/testnet/src/weights/pallet_external_validators_rewards.rs b/operator/runtime/testnet/src/weights/pallet_external_validators_rewards.rs
index 9b7e752d6..9fc6329ea 100644
--- a/operator/runtime/testnet/src/weights/pallet_external_validators_rewards.rs
+++ b/operator/runtime/testnet/src/weights/pallet_external_validators_rewards.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_external_validators_rewards`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/testnet/src/weights/pallet_grandpa.rs b/operator/runtime/testnet/src/weights/pallet_grandpa.rs
index 6d02ae740..ac0f4d1e1 100644
--- a/operator/runtime/testnet/src/weights/pallet_grandpa.rs
+++ b/operator/runtime/testnet/src/weights/pallet_grandpa.rs
@@ -51,7 +51,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_grandpa`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/testnet/src/weights/pallet_identity.rs b/operator/runtime/testnet/src/weights/pallet_identity.rs
index 37a46dc8a..1cba2573c 100644
--- a/operator/runtime/testnet/src/weights/pallet_identity.rs
+++ b/operator/runtime/testnet/src/weights/pallet_identity.rs
@@ -33,7 +33,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_identity`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/testnet/src/weights/pallet_im_online.rs b/operator/runtime/testnet/src/weights/pallet_im_online.rs
index bd5681245..c65dabff1 100644
--- a/operator/runtime/testnet/src/weights/pallet_im_online.rs
+++ b/operator/runtime/testnet/src/weights/pallet_im_online.rs
@@ -33,7 +33,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_im_online`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/testnet/src/weights/pallet_message_queue.rs b/operator/runtime/testnet/src/weights/pallet_message_queue.rs
index eea08550a..c9c4413c6 100644
--- a/operator/runtime/testnet/src/weights/pallet_message_queue.rs
+++ b/operator/runtime/testnet/src/weights/pallet_message_queue.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_message_queue`.
 pub struct WeightInfo<T>(PhantomData<T>);
@@ -178,4 +178,8 @@ impl<T: frame_system::Config> pallet_message_queue::WeightInfo for WeightInfo<T>
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
+
+	fn set_service_head() -> Weight {
+		todo!()
+	}
 }
diff --git a/operator/runtime/testnet/src/weights/pallet_mmr.rs b/operator/runtime/testnet/src/weights/pallet_mmr.rs
index f4b2df6a9..02c877278 100644
--- a/operator/runtime/testnet/src/weights/pallet_mmr.rs
+++ b/operator/runtime/testnet/src/weights/pallet_mmr.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_mmr`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/testnet/src/weights/pallet_multisig.rs b/operator/runtime/testnet/src/weights/pallet_multisig.rs
index 98c41959f..fff435ceb 100644
--- a/operator/runtime/testnet/src/weights/pallet_multisig.rs
+++ b/operator/runtime/testnet/src/weights/pallet_multisig.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_multisig`.
 pub struct WeightInfo<T>(PhantomData<T>);
@@ -169,4 +169,6 @@ impl<T: frame_system::Config> pallet_multisig::WeightInfo for WeightInfo<T> {
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
+
+	fn poke_deposit(_: u32) -> sp_runtime::Weight { todo!() }
 }
diff --git a/operator/runtime/testnet/src/weights/pallet_nfts.rs b/operator/runtime/testnet/src/weights/pallet_nfts.rs
index 2e594b5b9..ecc08144d 100644
--- a/operator/runtime/testnet/src/weights/pallet_nfts.rs
+++ b/operator/runtime/testnet/src/weights/pallet_nfts.rs
@@ -33,7 +33,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_nfts`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/testnet/src/weights/pallet_parameters.rs b/operator/runtime/testnet/src/weights/pallet_parameters.rs
index 612a193e5..540b96e12 100644
--- a/operator/runtime/testnet/src/weights/pallet_parameters.rs
+++ b/operator/runtime/testnet/src/weights/pallet_parameters.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_parameters`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/testnet/src/weights/pallet_payment_streams.rs b/operator/runtime/testnet/src/weights/pallet_payment_streams.rs
index d094d81d7..018bd086e 100644
--- a/operator/runtime/testnet/src/weights/pallet_payment_streams.rs
+++ b/operator/runtime/testnet/src/weights/pallet_payment_streams.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_payment_streams`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/testnet/src/weights/pallet_preimage.rs b/operator/runtime/testnet/src/weights/pallet_preimage.rs
index da320fba8..b8fcd5faf 100644
--- a/operator/runtime/testnet/src/weights/pallet_preimage.rs
+++ b/operator/runtime/testnet/src/weights/pallet_preimage.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_preimage`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/testnet/src/weights/pallet_proofs_dealer.rs b/operator/runtime/testnet/src/weights/pallet_proofs_dealer.rs
index 7ad738bfc..4480fc103 100644
--- a/operator/runtime/testnet/src/weights/pallet_proofs_dealer.rs
+++ b/operator/runtime/testnet/src/weights/pallet_proofs_dealer.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_proofs_dealer`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/testnet/src/weights/pallet_proxy.rs b/operator/runtime/testnet/src/weights/pallet_proxy.rs
index 444382778..b5e448719 100644
--- a/operator/runtime/testnet/src/weights/pallet_proxy.rs
+++ b/operator/runtime/testnet/src/weights/pallet_proxy.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_proxy`.
 pub struct WeightInfo<T>(PhantomData<T>);
@@ -224,4 +224,19 @@ impl<T: frame_system::Config> pallet_proxy::WeightInfo for WeightInfo<T> {
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
+	/// Storage: `Proxy::Proxies` (r:1 w:1)
+	/// Proof: `Proxy::Proxies` (`max_values`: None, `max_size`: Some(845), added: 3320, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:1 w:1)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(116), added: 2591, mode: `MaxEncodedLen`)
+	/// Storage: `Proxy::Announcements` (r:1 w:1)
+	/// Proof: `Proxy::Announcements` (`max_values`: None, `max_size`: Some(1837), added: 4312, mode: `MaxEncodedLen`)
+	fn poke_deposit() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `496`
+		//  Estimated: `5302`
+		// Minimum execution time: 32_000_000 picoseconds.
+		Weight::from_parts(32_000_000, 5302)
+			.saturating_add(T::DbWeight::get().reads(3_u64))
+			.saturating_add(T::DbWeight::get().writes(3_u64))
+	}
 }
diff --git a/operator/runtime/testnet/src/weights/pallet_randomness.rs b/operator/runtime/testnet/src/weights/pallet_randomness.rs
index c206ef943..c5e51f01b 100644
--- a/operator/runtime/testnet/src/weights/pallet_randomness.rs
+++ b/operator/runtime/testnet/src/weights/pallet_randomness.rs
@@ -33,7 +33,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_randomness`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/testnet/src/weights/pallet_referenda.rs b/operator/runtime/testnet/src/weights/pallet_referenda.rs
index a20ffdc71..538545d83 100644
--- a/operator/runtime/testnet/src/weights/pallet_referenda.rs
+++ b/operator/runtime/testnet/src/weights/pallet_referenda.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_referenda`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/testnet/src/weights/pallet_safe_mode.rs b/operator/runtime/testnet/src/weights/pallet_safe_mode.rs
index ab029bd61..19e693ed0 100644
--- a/operator/runtime/testnet/src/weights/pallet_safe_mode.rs
+++ b/operator/runtime/testnet/src/weights/pallet_safe_mode.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_safe_mode`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/testnet/src/weights/pallet_scheduler.rs b/operator/runtime/testnet/src/weights/pallet_scheduler.rs
index d4fcdad10..a83cdb7d4 100644
--- a/operator/runtime/testnet/src/weights/pallet_scheduler.rs
+++ b/operator/runtime/testnet/src/weights/pallet_scheduler.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_scheduler`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/testnet/src/weights/pallet_session.rs b/operator/runtime/testnet/src/weights/pallet_session.rs
index 154c1a57c..bc9f6b473 100644
--- a/operator/runtime/testnet/src/weights/pallet_session.rs
+++ b/operator/runtime/testnet/src/weights/pallet_session.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_session`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/testnet/src/weights/pallet_storage_providers.rs b/operator/runtime/testnet/src/weights/pallet_storage_providers.rs
index 663eb999d..88e584d4b 100644
--- a/operator/runtime/testnet/src/weights/pallet_storage_providers.rs
+++ b/operator/runtime/testnet/src/weights/pallet_storage_providers.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_storage_providers`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/testnet/src/weights/pallet_sudo.rs b/operator/runtime/testnet/src/weights/pallet_sudo.rs
index 769930bd3..0d1895509 100644
--- a/operator/runtime/testnet/src/weights/pallet_sudo.rs
+++ b/operator/runtime/testnet/src/weights/pallet_sudo.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_sudo`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/testnet/src/weights/pallet_timestamp.rs b/operator/runtime/testnet/src/weights/pallet_timestamp.rs
index a94add38b..c27741515 100644
--- a/operator/runtime/testnet/src/weights/pallet_timestamp.rs
+++ b/operator/runtime/testnet/src/weights/pallet_timestamp.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_timestamp`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/testnet/src/weights/pallet_transaction_payment.rs b/operator/runtime/testnet/src/weights/pallet_transaction_payment.rs
index 55b4152e0..3e9c32b58 100644
--- a/operator/runtime/testnet/src/weights/pallet_transaction_payment.rs
+++ b/operator/runtime/testnet/src/weights/pallet_transaction_payment.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_transaction_payment`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/testnet/src/weights/pallet_treasury.rs b/operator/runtime/testnet/src/weights/pallet_treasury.rs
index b78574e34..def2b2bbb 100644
--- a/operator/runtime/testnet/src/weights/pallet_treasury.rs
+++ b/operator/runtime/testnet/src/weights/pallet_treasury.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_treasury`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/testnet/src/weights/pallet_tx_pause.rs b/operator/runtime/testnet/src/weights/pallet_tx_pause.rs
index 402c72235..cd80698da 100644
--- a/operator/runtime/testnet/src/weights/pallet_tx_pause.rs
+++ b/operator/runtime/testnet/src/weights/pallet_tx_pause.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_tx_pause`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/testnet/src/weights/pallet_utility.rs b/operator/runtime/testnet/src/weights/pallet_utility.rs
index 8928dc1ea..89e069e8b 100644
--- a/operator/runtime/testnet/src/weights/pallet_utility.rs
+++ b/operator/runtime/testnet/src/weights/pallet_utility.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_utility`.
 pub struct WeightInfo<T>(PhantomData<T>);
@@ -119,4 +119,21 @@ impl<T: frame_system::Config> pallet_utility::WeightInfo for WeightInfo<T> {
 			.saturating_add(Weight::from_parts(6_535_635, 0).saturating_mul(c.into()))
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 	}
+	fn dispatch_as_fallible() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `0`
+		//  Estimated: `0`
+		// Minimum execution time: 5_000_000 picoseconds.
+		Weight::from_parts(5_000_000, 0)
+	}
+	/// Storage: `MaintenanceMode::MaintenanceMode` (r:1 w:0)
+	/// Proof: `MaintenanceMode::MaintenanceMode` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	fn if_else() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `42`
+		//  Estimated: `1527`
+		// Minimum execution time: 8_000_000 picoseconds.
+		Weight::from_parts(8_000_000, 1527)
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+	}
 }
diff --git a/operator/runtime/testnet/src/weights/pallet_whitelist.rs b/operator/runtime/testnet/src/weights/pallet_whitelist.rs
index 5bccb462d..9018d7d82 100644
--- a/operator/runtime/testnet/src/weights/pallet_whitelist.rs
+++ b/operator/runtime/testnet/src/weights/pallet_whitelist.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `pallet_whitelist`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/testnet/src/weights/snowbridge_pallet_ethereum_client.rs b/operator/runtime/testnet/src/weights/snowbridge_pallet_ethereum_client.rs
index fe2056db7..6b63e15f0 100644
--- a/operator/runtime/testnet/src/weights/snowbridge_pallet_ethereum_client.rs
+++ b/operator/runtime/testnet/src/weights/snowbridge_pallet_ethereum_client.rs
@@ -33,7 +33,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `snowbridge_pallet_ethereum_client`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/testnet/src/weights/snowbridge_pallet_inbound_queue_v2.rs b/operator/runtime/testnet/src/weights/snowbridge_pallet_inbound_queue_v2.rs
index 060c275a7..1446792cf 100644
--- a/operator/runtime/testnet/src/weights/snowbridge_pallet_inbound_queue_v2.rs
+++ b/operator/runtime/testnet/src/weights/snowbridge_pallet_inbound_queue_v2.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `snowbridge_pallet_inbound_queue_v2`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/testnet/src/weights/snowbridge_pallet_outbound_queue_v2.rs b/operator/runtime/testnet/src/weights/snowbridge_pallet_outbound_queue_v2.rs
index 7190ed815..f03e6e6f0 100644
--- a/operator/runtime/testnet/src/weights/snowbridge_pallet_outbound_queue_v2.rs
+++ b/operator/runtime/testnet/src/weights/snowbridge_pallet_outbound_queue_v2.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `snowbridge_pallet_outbound_queue_v2`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/testnet/src/weights/snowbridge_pallet_system.rs b/operator/runtime/testnet/src/weights/snowbridge_pallet_system.rs
index 4dddbeecd..7bf737cbc 100644
--- a/operator/runtime/testnet/src/weights/snowbridge_pallet_system.rs
+++ b/operator/runtime/testnet/src/weights/snowbridge_pallet_system.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `snowbridge_pallet_system`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/testnet/src/weights/snowbridge_pallet_system_v2.rs b/operator/runtime/testnet/src/weights/snowbridge_pallet_system_v2.rs
index 129b8ec4e..e68144f83 100644
--- a/operator/runtime/testnet/src/weights/snowbridge_pallet_system_v2.rs
+++ b/operator/runtime/testnet/src/weights/snowbridge_pallet_system_v2.rs
@@ -50,7 +50,7 @@
 #![allow(unused_imports)]
 
 use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use sp_std::marker::PhantomData;
+use core::marker::PhantomData;
 
 /// Weights for `snowbridge_pallet_system_v2`.
 pub struct WeightInfo<T>(PhantomData<T>);
diff --git a/operator/runtime/testnet/tests/common.rs b/operator/runtime/testnet/tests/common.rs
index b2df06ead..775509954 100644
--- a/operator/runtime/testnet/tests/common.rs
+++ b/operator/runtime/testnet/tests/common.rs
@@ -168,9 +168,12 @@ impl ExtBuilder {
             .build_storage()
             .expect("System pallet builds valid default genesis config");
 
-        pallet_balances::GenesisConfig::<Runtime> { balances }
-            .assimilate_storage(&mut t)
-            .expect("Pallet balances storage can be assimilated");
+        pallet_balances::GenesisConfig::<Runtime> {
+            balances,
+            dev_accounts: Default::default(),
+        }
+        .assimilate_storage(&mut t)
+        .expect("Pallet balances storage can be assimilated");
 
         // Set up session keys for validators
         let session_keys: Vec<_> = validators
diff --git a/operator/runtime/testnet/tests/governance/benchmarks.rs b/operator/runtime/testnet/tests/governance/benchmarks.rs
index 0bd3b2455..2b5629f46 100644
--- a/operator/runtime/testnet/tests/governance/benchmarks.rs
+++ b/operator/runtime/testnet/tests/governance/benchmarks.rs
@@ -23,6 +23,8 @@
 #![cfg(feature = "runtime-benchmarks")]
 
 use crate::common::*;
+use alloc::vec::Vec;
+use core::str::from_utf8;
 use datahaven_testnet_runtime::{
     configs::governance::council::{TechnicalMaxMembers, TechnicalMaxProposals},
     governance::TracksInfo,
@@ -36,7 +38,6 @@ use frame_support::{
     traits::{Get, StorePreimage},
 };
 use pallet_conviction_voting::{AccountVote, Conviction, Vote};
-use sp_std::vec::Vec;
 
 /// Benchmark council proposal creation with varying member counts
 #[test]
@@ -443,29 +444,32 @@ fn benchmark_council_maximum_load() {
 #[test]
 fn benchmark_track_operations() {
     ExtBuilder::governance().build().execute_with(|| {
-        let tracks = TracksInfo::tracks();
+        let tracks: Vec<_> = TracksInfo::tracks().collect();
 
         println!("Testing {} governance tracks", tracks.len());
 
-        for (track_id, track_info) in tracks.iter() {
+        for track in tracks.iter() {
+            let track_name = from_utf8(&track.info.name).unwrap();
+            let track_name = track_name.trim_end_matches('\0');
             let start_block = System::block_number();
 
             // Create proposal for this track
             let proposal = RuntimeCall::System(frame_system::Call::set_storage {
                 items: vec![(
-                    format!(":track:{}:{}", track_id, track_info.name).into_bytes(),
+                    format!(":track:{}:{}", track.id, track_name).into_bytes(),
                     b"test".to_vec(),
                 )],
             });
-            let proposal_hash = make_proposal_hash(&proposal);
 
             assert_ok!(Preimage::note_preimage(
                 RuntimeOrigin::signed(alice()),
                 proposal.encode()
             ));
 
+            let bounded_proposal = <Preimage as StorePreimage>::bound(proposal).unwrap();
+
             // Map track to appropriate origin
-            let origin = if *track_id == 0 {
+            let origin = if track.id == 0 {
                 frame_system::RawOrigin::Root.into()
             } else {
                 frame_system::RawOrigin::Signed(alice()).into()
@@ -474,19 +478,19 @@ fn benchmark_track_operations() {
             assert_ok!(Referenda::submit(
                 RuntimeOrigin::signed(alice()),
                 Box::new(origin),
-                DispatchTime::After(track_info.min_enactment_period),
-                Box::new(proposal_hash.into())
+                bounded_proposal,
+                DispatchTime::After(track.info.min_enactment_period),
             ));
 
             assert_ok!(Referenda::place_decision_deposit(
                 RuntimeOrigin::signed(bob()),
-                *track_id as u32
+                track.id as u32
             ));
 
             // Test voting on this track
             assert_ok!(ConvictionVoting::vote(
                 RuntimeOrigin::signed(charlie()),
-                *track_id as u32,
+                track.id as u32,
                 AccountVote::Standard {
                     vote: Vote {
                         aye: true,
@@ -500,11 +504,11 @@ fn benchmark_track_operations() {
 
             println!(
                 "Track {} ({}): processed in {} blocks (max_deciding: {}, decision_deposit: {})",
-                track_id,
-                track_info.name,
+                track.id,
+                track_name,
                 end_block - start_block,
-                track_info.max_deciding,
-                track_info.decision_deposit
+                track.info.max_deciding,
+                track.info.decision_deposit
             );
         }
     });
diff --git a/operator/runtime/testnet/tests/governance/referenda.rs b/operator/runtime/testnet/tests/governance/referenda.rs
index 0ff9c1e6b..9625884ba 100644
--- a/operator/runtime/testnet/tests/governance/referenda.rs
+++ b/operator/runtime/testnet/tests/governance/referenda.rs
@@ -21,6 +21,7 @@
 
 use crate::common::*;
 use codec::Encode;
+use core::str::from_utf8;
 use datahaven_testnet_runtime::{
     currency::{HAVE, SUPPLY_FACTOR},
     governance::TracksInfo,
@@ -42,13 +43,16 @@ use pallet_referenda::{Event as ReferendaEvent, ReferendumInfo};
 #[test]
 fn tracks_info_configured_correctly() {
     ExtBuilder::default().build().execute_with(|| {
-        let tracks = TracksInfo::tracks();
+        let tracks: Vec<_> = TracksInfo::tracks().collect();
 
         // Should have 6 tracks as configured
         assert_eq!(tracks.len(), 6);
 
         // Verify track IDs and names
-        let track_names: Vec<&str> = tracks.iter().map(|(_, info)| info.name).collect();
+        let track_names: Vec<&str> = tracks
+            .iter()
+            .map(|track| from_utf8(&track.info.name).unwrap().trim_end_matches('\0'))
+            .collect();
         assert_eq!(
             track_names,
             vec![
@@ -62,16 +66,17 @@ fn tracks_info_configured_correctly() {
         );
 
         // Verify root track has strictest requirements
-        let (root_id, root_info) = &tracks[0];
-        assert_eq!(*root_id, 0u16);
-        assert_eq!(root_info.max_deciding, 5);
-        assert_eq!(root_info.decision_deposit, 100000 * HAVE * SUPPLY_FACTOR); // 100 * KILO_HAVE
+        assert_eq!(tracks[0].id, 0u16);
+        assert_eq!(tracks[0].info.max_deciding, 5);
+        assert_eq!(
+            tracks[0].info.decision_deposit,
+            100000 * HAVE * SUPPLY_FACTOR
+        ); // 100 * KILO_HAVE
 
         // Verify general admin track
-        let (admin_id, admin_info) = &tracks[2];
-        assert_eq!(*admin_id, 2u16);
-        assert_eq!(admin_info.max_deciding, 10);
-        assert_eq!(admin_info.decision_deposit, 500 * HAVE * SUPPLY_FACTOR);
+        assert_eq!(tracks[2].id, 2u16);
+        assert_eq!(tracks[2].info.max_deciding, 10);
+        assert_eq!(tracks[2].info.decision_deposit, 500 * HAVE * SUPPLY_FACTOR);
     });
 }
 
@@ -225,7 +230,8 @@ fn referendum_timing_works() {
         ));
 
         // Advance time through prepare period (1 DAY for root track)
-        let track_info = &TracksInfo::tracks()[0].1; // Root track
+        let tracks: Vec<_> = TracksInfo::tracks().collect();
+        let track_info = &tracks[0].info; // Root track
         advance_referendum_time(track_info.prepare_period + 1);
 
         // Place decision deposit
@@ -243,7 +249,8 @@ fn referendum_timing_works() {
         }
 
         // Advance time through decision period
-        let track_info = &TracksInfo::tracks()[0].1; // Root track
+        let tracks: Vec<_> = TracksInfo::tracks().collect();
+        let track_info = &tracks[0].info; // Root track
         advance_referendum_time(track_info.decision_period + 1);
 
         // Referendum should still exist (may have timed out)
@@ -499,7 +506,8 @@ fn referendum_insufficient_support_fails() {
         ));
 
         // Advance through the entire decision period
-        let track_info = &TracksInfo::tracks()[0].1; // Root track
+        let tracks: Vec<_> = TracksInfo::tracks().collect();
+        let track_info = &tracks[0].info; // Root track
         advance_referendum_time(track_info.decision_period + track_info.confirm_period + 1);
 
         // Should still be ongoing or rejected due to insufficient support
@@ -578,7 +586,8 @@ fn decision_deposit_mechanics_work() {
         }
 
         // Advance time through prepare period (1 DAY for root track)
-        let track_info = &TracksInfo::tracks()[0].1; // Root track
+        let tracks: Vec<_> = TracksInfo::tracks().collect();
+        let track_info = &tracks[0].info; // Root track
         advance_referendum_time(track_info.prepare_period + 1);
 
         let alice_balance_before = Balances::free_balance(&alice());
@@ -591,7 +600,8 @@ fn decision_deposit_mechanics_work() {
 
         // Alice's balance should decrease by decision deposit
         let alice_balance_after = Balances::free_balance(&alice());
-        let track_info = &TracksInfo::tracks()[0].1; // Root track
+        let tracks: Vec<_> = TracksInfo::tracks().collect();
+        let track_info = &tracks[0].info; // Root track
         assert_eq!(
             alice_balance_before - alice_balance_after,
             track_info.decision_deposit
@@ -619,7 +629,8 @@ fn decision_deposit_mechanics_work() {
 fn track_capacity_limits_enforced() {
     ExtBuilder::default().build().execute_with(|| {
         // Use root track which has max_deciding of 5 (more reasonable for testing)
-        let track_info = &TracksInfo::tracks()[0].1; // root track
+        let tracks: Vec<_> = TracksInfo::tracks().collect();
+        let track_info = &tracks[0].info; // root track
         let max_deciding = track_info.max_deciding.min(5); // Use smaller number for testing
 
         // Submit max_deciding referenda (but cap at 5 for scheduler limits)
@@ -723,7 +734,8 @@ fn insufficient_balance_for_deposits() {
         ));
 
         // Advance through prepare period
-        let track_info = &TracksInfo::tracks()[0].1;
+        let tracks: Vec<_> = TracksInfo::tracks().collect();
+        let track_info = &tracks[0].info;
         advance_referendum_time(track_info.prepare_period + 1);
 
         // Should fail to place decision deposit due to insufficient balance
@@ -753,7 +765,8 @@ fn referendum_confirmation_period_works() {
             DispatchTime::After(10)
         ));
 
-        let track_info = &TracksInfo::tracks()[0].1; // Root track
+        let tracks: Vec<_> = TracksInfo::tracks().collect();
+        let track_info = &tracks[0].info; // Root track
 
         // Advance through prepare period
         advance_referendum_time(track_info.prepare_period + 1);
@@ -821,7 +834,8 @@ fn split_votes_with_conviction() {
         ));
 
         // Place decision deposit after prepare period
-        let track_info = &TracksInfo::tracks()[0].1;
+        let tracks: Vec<_> = TracksInfo::tracks().collect();
+        let track_info = &tracks[0].info;
         advance_referendum_time(track_info.prepare_period + 1);
         assert_ok!(Referenda::place_decision_deposit(
             RuntimeOrigin::signed(alice()),
diff --git a/operator/runtime/testnet/tests/lib.rs b/operator/runtime/testnet/tests/lib.rs
index e97fde3c7..6e1eb99f1 100644
--- a/operator/runtime/testnet/tests/lib.rs
+++ b/operator/runtime/testnet/tests/lib.rs
@@ -67,6 +67,7 @@ fn validate_transaction_fails_on_filtered_call() {
                 max_priority_fee_per_gas: Some(sp_core::U256::zero()),
                 nonce: None,
                 access_list: Vec::new(),
+                authorization_list: Vec::new(),
             }
             .into(),
         );
diff --git a/operator/runtime/testnet/tests/treasury.rs b/operator/runtime/testnet/tests/treasury.rs
index 35b3f3063..7f5dc5147 100644
--- a/operator/runtime/testnet/tests/treasury.rs
+++ b/operator/runtime/testnet/tests/treasury.rs
@@ -72,6 +72,7 @@ fn author_does_receive_priority_fee() {
                 max_priority_fee_per_gas: Some(U256::from(200 * MILLIHAVE)),
                 nonce: Some(U256::from(0)),
                 access_list: Vec::new(),
+                authorization_list: Vec::new(),
             })
             .dispatch(<Runtime as frame_system::Config>::RuntimeOrigin::root()));
 
@@ -114,6 +115,7 @@ fn total_issuance_after_evm_transaction_with_priority_fee() {
                 max_priority_fee_per_gas: Some(U256::from(BASE_FEE_GENESIS)),
                 nonce: Some(U256::from(0)),
                 access_list: Vec::new(),
+                authorization_list: Vec::new(),
             })
             .dispatch(<Runtime as frame_system::Config>::RuntimeOrigin::root()));
 
@@ -184,6 +186,7 @@ fn total_issuance_after_evm_transaction_without_priority_fee() {
                 max_priority_fee_per_gas: None,
                 nonce: Some(U256::from(0)),
                 access_list: Vec::new(),
+                authorization_list: Vec::new(),
             })
             .dispatch(<Runtime as frame_system::Config>::RuntimeOrigin::root()));
 
diff --git a/test/.papi/descriptors/package.json b/test/.papi/descriptors/package.json
index 185bc6783..aa8c9c707 100644
--- a/test/.papi/descriptors/package.json
+++ b/test/.papi/descriptors/package.json
@@ -1,5 +1,5 @@
 {
-  "version": "0.1.0-autogenerated.18139584469151706411",
+  "version": "0.1.0-autogenerated.17592112782245438099",
   "name": "@polkadot-api/descriptors",
   "files": [
     "dist"
diff --git a/test/.papi/metadata/datahaven.scale b/test/.papi/metadata/datahaven.scale
index 3f4882b21..1799b5761 100644
Binary files a/test/.papi/metadata/datahaven.scale and b/test/.papi/metadata/datahaven.scale differ
diff --git a/test/moonwall/suites/dev/stagenet/eth-tx/test-eth-tx-types.ts b/test/moonwall/suites/dev/stagenet/eth-tx/test-eth-tx-types.ts
index 021bf425f..857a00101 100644
--- a/test/moonwall/suites/dev/stagenet/eth-tx/test-eth-tx-types.ts
+++ b/test/moonwall/suites/dev/stagenet/eth-tx/test-eth-tx-types.ts
@@ -84,9 +84,7 @@ describeSuite({
           value,
           input,
           accessList,
-          oddYParity,
-          r,
-          s
+          signature
         } = extrinsic.asEip2930;
         expect(chainId.toNumber()).to.equal(DATAHAVEN_CHAIN_ID);
         expect(nonce.toNumber()).to.equal(currentNonce);
@@ -96,11 +94,11 @@ describeSuite({
         expect(value.toBigInt()).to.equal(512n);
         expect(input.toHex()).to.equal("0x");
         expect(accessList.toString()).toBe("[]");
-        expect(oddYParity.isFalse).to.be.true;
-        expect(r.toHex()).to.equal(
+        expect(signature.oddYParity.isFalse).to.be.true;
+        expect(signature.r.toHex()).to.equal(
           "0x1a703ae78b4f5bd48b04e848a0e261c195e037f39a4e1e2b2637edfe7bdf5328"
         );
-        expect(s.toHex()).to.equal(
+        expect(signature.s.toHex()).to.equal(
           "0x772b2d95acc14739bdd57565a87ce4e51fb7457724e4c42b148c544e4ae3e968"
         );
       }
@@ -141,9 +139,7 @@ describeSuite({
           value,
           input,
           accessList,
-          oddYParity,
-          r,
-          s
+          signature
         } = extrinsic.asEip1559;
         expect(chainId.toNumber()).to.equal(DATAHAVEN_CHAIN_ID);
         expect(nonce.toNumber()).to.equal(currentNonce);
@@ -154,11 +150,11 @@ describeSuite({
         expect(value.toBigInt()).to.equal(512n);
         expect(input.toHex()).to.equal("0x");
         expect(accessList.toString()).toBe("[]");
-        expect(oddYParity.isFalse).to.be.true;
-        expect(r.toHex()).to.equal(
+        expect(signature.oddYParity.isFalse).to.be.true;
+        expect(signature.r.toHex()).to.equal(
           "0x07a83a8cea51ecfc21533dbec98de47b37d7f54110395b2b9fd514a9216bb741"
         );
-        expect(s.toHex()).to.equal(
+        expect(signature.s.toHex()).to.equal(
           "0x6448665043b9a23baa7d58c3f26c8a291f0db6c38a36a7df21bcc26091f1c5aa"
         );
       }
diff --git a/test/moonwall/suites/dev/stagenet/evm/test-pallet-evm-overflow.ts b/test/moonwall/suites/dev/stagenet/evm/test-pallet-evm-overflow.ts
index 90f623462..b29b4f38c 100644
--- a/test/moonwall/suites/dev/stagenet/evm/test-pallet-evm-overflow.ts
+++ b/test/moonwall/suites/dev/stagenet/evm/test-pallet-evm-overflow.ts
@@ -29,6 +29,7 @@ describeSuite({
                   1_000_000_000n,
                   "0",
                   null,
+                  [],
                   []
                 )
             )
diff --git a/test/moonwall/suites/dev/stagenet/evm/test-pallet-evm-transfer.ts b/test/moonwall/suites/dev/stagenet/evm/test-pallet-evm-transfer.ts
index eb597495f..e2f5b4a79 100644
--- a/test/moonwall/suites/dev/stagenet/evm/test-pallet-evm-transfer.ts
+++ b/test/moonwall/suites/dev/stagenet/evm/test-pallet-evm-transfer.ts
@@ -32,6 +32,7 @@ describeSuite({
                   1_000_000_000n,
                   "0",
                   null,
+                  [],
                   []
                 )
             )
@@ -63,6 +64,7 @@ describeSuite({
                   100_000_000_000_000n,
                   "0",
                   null,
+                  [],
                   []
                 )
             )
diff --git a/test/moonwall/suites/dev/stagenet/sudo/test-sudo.ts b/test/moonwall/suites/dev/stagenet/sudo/test-sudo.ts
index b134f7cbc..161a3e750 100644
--- a/test/moonwall/suites/dev/stagenet/sudo/test-sudo.ts
+++ b/test/moonwall/suites/dev/stagenet/sudo/test-sudo.ts
@@ -79,11 +79,11 @@ describeSuite({
         const account = await context.polkadotJs().query.system.account(CHARLETH_ADDRESS);
         expect(account.data.free.toBigInt()).toBe(DEFAULT_GENESIS_BALANCE);
 
-        expect(result!.events.length === 8).to.be.true;
-        expect(context.polkadotJs().events.system.NewAccount.is(result!.events[3].event)).to.be
+        expect(result!.events.length).to.eq(7);
+        expect(context.polkadotJs().events.system.NewAccount.is(result!.events[2].event)).to.be
           .true;
-        expect(context.polkadotJs().events.balances.Endowed.is(result!.events[4].event)).to.be.true;
-        expect(context.polkadotJs().events.system.ExtrinsicFailed.is(result!.events[7].event)).to.be
+        expect(context.polkadotJs().events.balances.Endowed.is(result!.events[3].event)).to.be.true;
+        expect(context.polkadotJs().events.system.ExtrinsicFailed.is(result!.events[6].event)).to.be
           .true;
       },
     });