diff --git a/Cargo.lock b/Cargo.lock
index 868e85b89..4a50f8a12 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -2308,7 +2308,7 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 [[package]]
 name = "fork-tree"
 version = "12.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "parity-scale-codec",
 ]
@@ -2331,7 +2331,7 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa"
 [[package]]
 name = "frame-benchmarking"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "frame-support",
  "frame-support-procedural",
@@ -2347,16 +2347,16 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0)",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0)",
- "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0)",
+ "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
+ "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
  "static_assertions",
 ]
 
 [[package]]
 name = "frame-benchmarking-cli"
 version = "32.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "Inflector",
  "array-bytes 6.2.3",
@@ -2388,15 +2388,15 @@ dependencies = [
  "sp-blockchain",
  "sp-core",
  "sp-database",
- "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0)",
+ "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
  "sp-inherents",
  "sp-io",
  "sp-keystore",
  "sp-runtime",
  "sp-state-machine",
- "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0)",
+ "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
  "sp-trie",
- "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0)",
+ "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
  "thiserror",
  "thousands",
 ]
@@ -2404,7 +2404,7 @@ dependencies = [
 [[package]]
 name = "frame-executive"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "aquamarine 0.3.3",
  "frame-support",
@@ -2416,8 +2416,8 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0)",
- "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
+ "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
 ]
 
 [[package]]
@@ -2432,10 +2432,25 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "frame-metadata-hash-extension"
+version = "0.1.0"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
+dependencies = [
+ "array-bytes 6.2.3",
+ "docify",
+ "frame-support",
+ "frame-system",
+ "log",
+ "parity-scale-codec",
+ "scale-info",
+ "sp-runtime",
+]
+
 [[package]]
 name = "frame-support"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "aquamarine 0.5.0",
  "array-bytes 6.2.3",
@@ -2458,7 +2473,7 @@ dependencies = [
  "sp-arithmetic",
  "sp-core",
  "sp-crypto-hashing-proc-macro",
- "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0)",
+ "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
  "sp-genesis-builder",
  "sp-inherents",
  "sp-io",
@@ -2466,8 +2481,8 @@ dependencies = [
  "sp-runtime",
  "sp-staking",
  "sp-state-machine",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0)",
- "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
+ "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
  "sp-weights",
  "static_assertions",
  "tt-call",
@@ -2476,7 +2491,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural"
 version = "23.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "Inflector",
  "cfg-expr",
@@ -2495,7 +2510,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools"
 version = "10.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "frame-support-procedural-tools-derive",
  "proc-macro-crate 3.1.0",
@@ -2507,7 +2522,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools-derive"
 version = "11.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2517,7 +2532,7 @@ dependencies = [
 [[package]]
 name = "frame-system"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "cfg-if",
  "docify",
@@ -2529,7 +2544,7 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
  "sp-version",
  "sp-weights",
 ]
@@ -2537,7 +2552,7 @@ dependencies = [
 [[package]]
 name = "frame-system-benchmarking"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -2546,13 +2561,13 @@ dependencies = [
  "scale-info",
  "sp-core",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
 ]
 
 [[package]]
 name = "frame-system-rpc-runtime-api"
 version = "26.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -2561,13 +2576,13 @@ dependencies = [
 [[package]]
 name = "frame-try-runtime"
 version = "0.34.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
  "sp-api",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
 ]
 
 [[package]]
@@ -4334,6 +4349,20 @@ dependencies = [
  "hash-db",
 ]
 
+[[package]]
+name = "merkleized-metadata"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f313fcff1d2a4bcaa2deeaa00bf7530d77d5f7bd0467a117dde2e29a75a7a17a"
+dependencies = [
+ "array-bytes 6.2.3",
+ "blake3",
+ "frame-metadata",
+ "parity-scale-codec",
+ "scale-decode",
+ "scale-info",
+]
+
 [[package]]
 name = "merlin"
 version = "3.0.0"
@@ -4644,6 +4673,7 @@ dependencies = [
  "clap",
  "frame-benchmarking",
  "frame-benchmarking-cli",
+ "frame-metadata-hash-extension",
  "frame-system",
  "futures",
  "jsonrpsee",
@@ -4699,6 +4729,7 @@ dependencies = [
  "frame-benchmarking",
  "frame-executive",
  "frame-metadata",
+ "frame-metadata-hash-extension",
  "frame-support",
  "frame-system",
  "frame-system-benchmarking",
@@ -4739,9 +4770,9 @@ dependencies = [
  "sp-offchain",
  "sp-runtime",
  "sp-session",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0)",
- "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0)",
- "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
+ "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
+ "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
  "sp-transaction-pool",
  "sp-version",
  "substrate-wasm-builder",
@@ -4952,7 +4983,7 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0)",
+ "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
  "sp-weights",
  "substrate-fixed",
  "subtensor-macros",
@@ -4961,7 +4992,7 @@ dependencies = [
 [[package]]
 name = "pallet-aura"
 version = "27.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4972,13 +5003,13 @@ dependencies = [
  "sp-application-crypto",
  "sp-consensus-aura",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
 ]
 
 [[package]]
 name = "pallet-authorship"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4986,13 +5017,13 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
 ]
 
 [[package]]
 name = "pallet-balances"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "docify",
  "frame-benchmarking",
@@ -5002,7 +5033,7 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
 ]
 
 [[package]]
@@ -5018,7 +5049,7 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
  "subtensor-macros",
 ]
 
@@ -5036,14 +5067,14 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
  "subtensor-macros",
 ]
 
 [[package]]
 name = "pallet-grandpa"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5060,13 +5091,13 @@ dependencies = [
  "sp-runtime",
  "sp-session",
  "sp-staking",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
 ]
 
 [[package]]
 name = "pallet-insecure-randomness-collective-flip"
 version = "16.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5074,13 +5105,13 @@ dependencies = [
  "safe-mix",
  "scale-info",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
 ]
 
 [[package]]
 name = "pallet-membership"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5091,13 +5122,13 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
 ]
 
 [[package]]
 name = "pallet-multisig"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5107,13 +5138,13 @@ dependencies = [
  "scale-info",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
 ]
 
 [[package]]
 name = "pallet-preimage"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5124,13 +5155,13 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
 ]
 
 [[package]]
 name = "pallet-proxy"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5139,7 +5170,7 @@ dependencies = [
  "scale-info",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
 ]
 
 [[package]]
@@ -5155,14 +5186,14 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
  "subtensor-macros",
 ]
 
 [[package]]
 name = "pallet-safe-mode"
 version = "9.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "docify",
  "frame-benchmarking",
@@ -5175,13 +5206,13 @@ dependencies = [
  "scale-info",
  "sp-arithmetic",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
 ]
 
 [[package]]
 name = "pallet-scheduler"
 version = "29.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "docify",
  "frame-benchmarking",
@@ -5192,14 +5223,14 @@ dependencies = [
  "scale-info",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
  "sp-weights",
 ]
 
 [[package]]
 name = "pallet-session"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5214,7 +5245,7 @@ dependencies = [
  "sp-session",
  "sp-staking",
  "sp-state-machine",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
  "sp-trie",
 ]
 
@@ -5246,8 +5277,8 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0)",
- "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
+ "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
  "sp-version",
  "substrate-fixed",
  "subtensor-macros",
@@ -5256,7 +5287,7 @@ dependencies = [
 [[package]]
 name = "pallet-sudo"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "docify",
  "frame-benchmarking",
@@ -5266,13 +5297,13 @@ dependencies = [
  "scale-info",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
 ]
 
 [[package]]
 name = "pallet-timestamp"
 version = "27.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "docify",
  "frame-benchmarking",
@@ -5284,15 +5315,15 @@ dependencies = [
  "sp-inherents",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0)",
- "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
+ "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
  "sp-timestamp",
 ]
 
 [[package]]
 name = "pallet-transaction-payment"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5302,13 +5333,13 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
 ]
 
 [[package]]
 name = "pallet-transaction-payment-rpc"
 version = "30.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "jsonrpsee",
  "pallet-transaction-payment-rpc-runtime-api",
@@ -5324,7 +5355,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc-runtime-api"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "pallet-transaction-payment",
  "parity-scale-codec",
@@ -5336,7 +5367,7 @@ dependencies = [
 [[package]]
 name = "pallet-utility"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5346,7 +5377,7 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
 ]
 
 [[package]]
@@ -6684,18 +6715,18 @@ dependencies = [
 [[package]]
 name = "sc-allocator"
 version = "23.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "log",
  "sp-core",
- "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0)",
+ "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
  "thiserror",
 ]
 
 [[package]]
 name = "sc-basic-authorship"
 version = "0.34.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "futures",
  "futures-timer",
@@ -6717,7 +6748,7 @@ dependencies = [
 [[package]]
 name = "sc-block-builder"
 version = "0.33.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -6732,7 +6763,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec"
 version = "27.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "array-bytes 6.2.3",
  "docify",
@@ -6758,7 +6789,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec-derive"
 version = "11.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "proc-macro-crate 3.1.0",
  "proc-macro2",
@@ -6769,7 +6800,7 @@ dependencies = [
 [[package]]
 name = "sc-cli"
 version = "0.36.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "array-bytes 6.2.3",
  "chrono",
@@ -6810,7 +6841,7 @@ dependencies = [
 [[package]]
 name = "sc-client-api"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "fnv",
  "futures",
@@ -6825,11 +6856,11 @@ dependencies = [
  "sp-consensus",
  "sp-core",
  "sp-database",
- "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0)",
+ "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
  "sp-runtime",
  "sp-state-machine",
  "sp-statement-store",
- "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0)",
+ "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
  "sp-trie",
  "substrate-prometheus-endpoint",
 ]
@@ -6837,7 +6868,7 @@ dependencies = [
 [[package]]
 name = "sc-client-db"
 version = "0.35.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "hash-db",
  "kvdb",
@@ -6863,7 +6894,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus"
 version = "0.33.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "async-trait",
  "futures",
@@ -6888,7 +6919,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-aura"
 version = "0.34.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "async-trait",
  "futures",
@@ -6917,7 +6948,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-grandpa"
 version = "0.19.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "ahash 0.8.11",
  "array-bytes 6.2.3",
@@ -6960,7 +6991,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-grandpa-rpc"
 version = "0.19.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "finality-grandpa",
  "futures",
@@ -6980,7 +7011,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-slots"
 version = "0.33.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "async-trait",
  "futures",
@@ -7003,7 +7034,7 @@ dependencies = [
 [[package]]
 name = "sc-executor"
 version = "0.32.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "parity-scale-codec",
  "parking_lot 0.12.3",
@@ -7013,25 +7044,25 @@ dependencies = [
  "schnellru",
  "sp-api",
  "sp-core",
- "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0)",
+ "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
  "sp-io",
  "sp-panic-handler",
- "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0)",
+ "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
  "sp-trie",
  "sp-version",
- "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0)",
+ "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
  "tracing",
 ]
 
 [[package]]
 name = "sc-executor-common"
 version = "0.29.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "polkavm",
  "sc-allocator",
  "sp-maybe-compressed-blob",
- "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0)",
+ "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
  "thiserror",
  "wasm-instrument",
 ]
@@ -7039,18 +7070,18 @@ dependencies = [
 [[package]]
 name = "sc-executor-polkavm"
 version = "0.29.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "log",
  "polkavm",
  "sc-executor-common",
- "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0)",
+ "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
 ]
 
 [[package]]
 name = "sc-executor-wasmtime"
 version = "0.29.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "anyhow",
  "cfg-if",
@@ -7060,15 +7091,15 @@ dependencies = [
  "rustix 0.36.17",
  "sc-allocator",
  "sc-executor-common",
- "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0)",
- "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0)",
+ "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
+ "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
  "wasmtime",
 ]
 
 [[package]]
 name = "sc-informant"
 version = "0.33.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "ansi_term",
  "futures",
@@ -7085,7 +7116,7 @@ dependencies = [
 [[package]]
 name = "sc-keystore"
 version = "25.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "array-bytes 6.2.3",
  "parking_lot 0.12.3",
@@ -7099,7 +7130,7 @@ dependencies = [
 [[package]]
 name = "sc-mixnet"
 version = "0.4.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "array-bytes 4.2.0",
  "arrayvec",
@@ -7128,7 +7159,7 @@ dependencies = [
 [[package]]
 name = "sc-network"
 version = "0.34.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "array-bytes 6.2.3",
  "async-channel",
@@ -7171,7 +7202,7 @@ dependencies = [
 [[package]]
 name = "sc-network-bitswap"
 version = "0.33.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "async-channel",
  "cid",
@@ -7191,7 +7222,7 @@ dependencies = [
 [[package]]
 name = "sc-network-common"
 version = "0.33.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "async-trait",
  "bitflags 1.3.2",
@@ -7208,7 +7239,7 @@ dependencies = [
 [[package]]
 name = "sc-network-gossip"
 version = "0.34.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "ahash 0.8.11",
  "futures",
@@ -7227,7 +7258,7 @@ dependencies = [
 [[package]]
 name = "sc-network-light"
 version = "0.33.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "array-bytes 6.2.3",
  "async-channel",
@@ -7248,7 +7279,7 @@ dependencies = [
 [[package]]
 name = "sc-network-sync"
 version = "0.33.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "array-bytes 6.2.3",
  "async-channel",
@@ -7284,7 +7315,7 @@ dependencies = [
 [[package]]
 name = "sc-network-transactions"
 version = "0.33.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "array-bytes 6.2.3",
  "futures",
@@ -7303,7 +7334,7 @@ dependencies = [
 [[package]]
 name = "sc-offchain"
 version = "29.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "array-bytes 6.2.3",
  "bytes",
@@ -7326,7 +7357,7 @@ dependencies = [
  "sc-utils",
  "sp-api",
  "sp-core",
- "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0)",
+ "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
  "sp-keystore",
  "sp-offchain",
  "sp-runtime",
@@ -7337,7 +7368,7 @@ dependencies = [
 [[package]]
 name = "sc-proposer-metrics"
 version = "0.17.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "log",
  "substrate-prometheus-endpoint",
@@ -7346,7 +7377,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc"
 version = "29.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "futures",
  "jsonrpsee",
@@ -7378,7 +7409,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-api"
 version = "0.33.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "jsonrpsee",
  "parity-scale-codec",
@@ -7398,7 +7429,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-server"
 version = "11.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "futures",
  "governor",
@@ -7416,7 +7447,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-spec-v2"
 version = "0.34.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "array-bytes 6.2.3",
  "futures",
@@ -7447,7 +7478,7 @@ dependencies = [
 [[package]]
 name = "sc-service"
 version = "0.35.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "async-trait",
  "directories",
@@ -7489,12 +7520,12 @@ dependencies = [
  "sp-blockchain",
  "sp-consensus",
  "sp-core",
- "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0)",
+ "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
  "sp-keystore",
  "sp-runtime",
  "sp-session",
  "sp-state-machine",
- "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0)",
+ "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
  "sp-transaction-pool",
  "sp-transaction-storage-proof",
  "sp-trie",
@@ -7511,7 +7542,7 @@ dependencies = [
 [[package]]
 name = "sc-state-db"
 version = "0.30.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -7522,7 +7553,7 @@ dependencies = [
 [[package]]
 name = "sc-sysinfo"
 version = "27.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "derive_more",
  "futures",
@@ -7537,13 +7568,13 @@ dependencies = [
  "sp-core",
  "sp-crypto-hashing",
  "sp-io",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
 ]
 
 [[package]]
 name = "sc-telemetry"
 version = "15.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "chrono",
  "futures",
@@ -7562,7 +7593,7 @@ dependencies = [
 [[package]]
 name = "sc-tracing"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "ansi_term",
  "chrono",
@@ -7582,7 +7613,7 @@ dependencies = [
  "sp-core",
  "sp-rpc",
  "sp-runtime",
- "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0)",
+ "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
  "thiserror",
  "tracing",
  "tracing-log 0.1.4",
@@ -7592,7 +7623,7 @@ dependencies = [
 [[package]]
 name = "sc-tracing-proc-macro"
 version = "11.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "proc-macro-crate 3.1.0",
  "proc-macro2",
@@ -7603,7 +7634,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-pool"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "async-trait",
  "futures",
@@ -7621,7 +7652,7 @@ dependencies = [
  "sp-core",
  "sp-crypto-hashing",
  "sp-runtime",
- "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0)",
+ "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
  "sp-transaction-pool",
  "substrate-prometheus-endpoint",
  "thiserror",
@@ -7630,7 +7661,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-pool-api"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "async-trait",
  "futures",
@@ -7646,7 +7677,7 @@ dependencies = [
 [[package]]
 name = "sc-utils"
 version = "14.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "async-channel",
  "futures",
@@ -7658,6 +7689,29 @@ dependencies = [
  "sp-arithmetic",
 ]
 
+[[package]]
+name = "scale-bits"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e57b1e7f6b65ed1f04e79a85a57d755ad56d76fdf1e9bddcc9ae14f71fcdcf54"
+dependencies = [
+ "parity-scale-codec",
+ "scale-type-resolver",
+]
+
+[[package]]
+name = "scale-decode"
+version = "0.13.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e98f3262c250d90e700bb802eb704e1f841e03331c2eb815e46516c4edbf5b27"
+dependencies = [
+ "derive_more",
+ "parity-scale-codec",
+ "scale-bits",
+ "scale-type-resolver",
+ "smallvec",
+]
+
 [[package]]
 name = "scale-info"
 version = "2.11.3"
@@ -7684,6 +7738,12 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "scale-type-resolver"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f0cded6518aa0bd6c1be2b88ac81bf7044992f0f154bfbabd5ad34f43512abcb"
+
 [[package]]
 name = "schannel"
 version = "0.1.23"
@@ -8129,7 +8189,7 @@ dependencies = [
 [[package]]
 name = "sp-api"
 version = "26.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "hash-db",
  "log",
@@ -8137,12 +8197,12 @@ dependencies = [
  "scale-info",
  "sp-api-proc-macro",
  "sp-core",
- "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0)",
+ "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
  "sp-metadata-ir",
  "sp-runtime",
- "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0)",
+ "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
  "sp-state-machine",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
  "sp-trie",
  "sp-version",
  "thiserror",
@@ -8151,7 +8211,7 @@ dependencies = [
 [[package]]
 name = "sp-api-proc-macro"
 version = "15.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "Inflector",
  "blake2 0.10.6",
@@ -8165,20 +8225,20 @@ dependencies = [
 [[package]]
 name = "sp-application-crypto"
 version = "30.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
  "serde",
  "sp-core",
  "sp-io",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
 ]
 
 [[package]]
 name = "sp-arithmetic"
 version = "23.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "docify",
  "integer-sqrt",
@@ -8186,7 +8246,7 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "serde",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
  "static_assertions",
 ]
 
@@ -8211,7 +8271,7 @@ dependencies = [
 [[package]]
 name = "sp-block-builder"
 version = "26.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "sp-api",
  "sp-inherents",
@@ -8221,7 +8281,7 @@ dependencies = [
 [[package]]
 name = "sp-blockchain"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "futures",
  "log",
@@ -8239,7 +8299,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus"
 version = "0.32.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "async-trait",
  "futures",
@@ -8254,7 +8314,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-aura"
 version = "0.32.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -8270,7 +8330,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-grandpa"
 version = "13.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "finality-grandpa",
  "log",
@@ -8287,7 +8347,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-slots"
 version = "0.32.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -8298,7 +8358,7 @@ dependencies = [
 [[package]]
 name = "sp-core"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "array-bytes 6.2.3",
  "bandersnatch_vrfs",
@@ -8329,11 +8389,11 @@ dependencies = [
  "secrecy",
  "serde",
  "sp-crypto-hashing",
- "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0)",
- "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0)",
- "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0)",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0)",
- "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0)",
+ "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
+ "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
+ "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
+ "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
  "ss58-registry",
  "substrate-bip39",
  "thiserror",
@@ -8365,7 +8425,7 @@ dependencies = [
 [[package]]
 name = "sp-crypto-hashing"
 version = "0.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "blake2b_simd",
  "byteorder",
@@ -8378,7 +8438,7 @@ dependencies = [
 [[package]]
 name = "sp-crypto-hashing-proc-macro"
 version = "0.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "quote",
  "sp-crypto-hashing",
@@ -8388,7 +8448,7 @@ dependencies = [
 [[package]]
 name = "sp-database"
 version = "10.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "kvdb",
  "parking_lot 0.12.3",
@@ -8397,7 +8457,7 @@ dependencies = [
 [[package]]
 name = "sp-debug-derive"
 version = "14.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -8417,11 +8477,11 @@ dependencies = [
 [[package]]
 name = "sp-externalities"
 version = "0.25.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "environmental",
  "parity-scale-codec",
- "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0)",
+ "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
 ]
 
 [[package]]
@@ -8437,7 +8497,7 @@ dependencies = [
 [[package]]
 name = "sp-genesis-builder"
 version = "0.7.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "serde_json",
  "sp-api",
@@ -8447,7 +8507,7 @@ dependencies = [
 [[package]]
 name = "sp-inherents"
 version = "26.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "async-trait",
  "impl-trait-for-tuples",
@@ -8460,7 +8520,7 @@ dependencies = [
 [[package]]
 name = "sp-io"
 version = "30.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "bytes",
  "ed25519-dalek",
@@ -8472,12 +8532,12 @@ dependencies = [
  "secp256k1",
  "sp-core",
  "sp-crypto-hashing",
- "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0)",
+ "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
  "sp-keystore",
- "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0)",
+ "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
  "sp-state-machine",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0)",
- "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
+ "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
  "sp-trie",
  "tracing",
  "tracing-core",
@@ -8486,7 +8546,7 @@ dependencies = [
 [[package]]
 name = "sp-keyring"
 version = "31.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "sp-core",
  "sp-runtime",
@@ -8496,18 +8556,18 @@ dependencies = [
 [[package]]
 name = "sp-keystore"
 version = "0.34.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "parity-scale-codec",
  "parking_lot 0.12.3",
  "sp-core",
- "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0)",
+ "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
 ]
 
 [[package]]
 name = "sp-maybe-compressed-blob"
 version = "11.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "thiserror",
  "zstd 0.12.4",
@@ -8516,7 +8576,7 @@ dependencies = [
 [[package]]
 name = "sp-metadata-ir"
 version = "0.6.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "frame-metadata",
  "parity-scale-codec",
@@ -8526,7 +8586,7 @@ dependencies = [
 [[package]]
 name = "sp-mixnet"
 version = "0.4.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -8537,7 +8597,7 @@ dependencies = [
 [[package]]
 name = "sp-offchain"
 version = "26.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "sp-api",
  "sp-core",
@@ -8547,7 +8607,7 @@ dependencies = [
 [[package]]
 name = "sp-panic-handler"
 version = "13.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "backtrace",
  "lazy_static",
@@ -8557,7 +8617,7 @@ dependencies = [
 [[package]]
 name = "sp-rpc"
 version = "26.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "rustc-hash",
  "serde",
@@ -8567,7 +8627,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime"
 version = "31.0.1"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "docify",
  "either",
@@ -8584,26 +8644,26 @@ dependencies = [
  "sp-arithmetic",
  "sp-core",
  "sp-io",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
  "sp-weights",
 ]
 
 [[package]]
 name = "sp-runtime-interface"
 version = "24.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "bytes",
  "impl-trait-for-tuples",
  "parity-scale-codec",
  "polkavm-derive",
  "primitive-types",
- "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0)",
- "sp-runtime-interface-proc-macro 17.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0)",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0)",
- "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0)",
- "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0)",
- "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0)",
+ "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
+ "sp-runtime-interface-proc-macro 17.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
+ "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
+ "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
+ "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
  "static_assertions",
 ]
 
@@ -8629,7 +8689,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface-proc-macro"
 version = "17.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "Inflector",
  "expander",
@@ -8655,7 +8715,7 @@ dependencies = [
 [[package]]
 name = "sp-session"
 version = "27.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -8669,7 +8729,7 @@ dependencies = [
 [[package]]
 name = "sp-staking"
 version = "26.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -8682,7 +8742,7 @@ dependencies = [
 [[package]]
 name = "sp-state-machine"
 version = "0.35.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "hash-db",
  "log",
@@ -8691,7 +8751,7 @@ dependencies = [
  "rand",
  "smallvec",
  "sp-core",
- "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0)",
+ "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
  "sp-panic-handler",
  "sp-trie",
  "thiserror",
@@ -8702,7 +8762,7 @@ dependencies = [
 [[package]]
 name = "sp-statement-store"
 version = "10.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "aes-gcm",
  "curve25519-dalek 4.1.3",
@@ -8716,9 +8776,9 @@ dependencies = [
  "sp-application-crypto",
  "sp-core",
  "sp-crypto-hashing",
- "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0)",
+ "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
  "sp-runtime",
- "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0)",
+ "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
  "thiserror",
  "x25519-dalek 2.0.1",
 ]
@@ -8726,7 +8786,7 @@ dependencies = [
 [[package]]
 name = "sp-std"
 version = "14.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 
 [[package]]
 name = "sp-std"
@@ -8736,13 +8796,13 @@ source = "git+https://github.com/paritytech/polkadot-sdk#c4b3c1c6c6e492c4196e06f
 [[package]]
 name = "sp-storage"
 version = "19.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
  "ref-cast",
  "serde",
- "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0)",
+ "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
 ]
 
 [[package]]
@@ -8760,7 +8820,7 @@ dependencies = [
 [[package]]
 name = "sp-timestamp"
 version = "26.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -8772,7 +8832,7 @@ dependencies = [
 [[package]]
 name = "sp-tracing"
 version = "16.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "parity-scale-codec",
  "tracing",
@@ -8794,7 +8854,7 @@ dependencies = [
 [[package]]
 name = "sp-transaction-pool"
 version = "26.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "sp-api",
  "sp-runtime",
@@ -8803,7 +8863,7 @@ dependencies = [
 [[package]]
 name = "sp-transaction-storage-proof"
 version = "26.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -8817,7 +8877,7 @@ dependencies = [
 [[package]]
 name = "sp-trie"
 version = "29.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "ahash 0.8.11",
  "hash-db",
@@ -8830,7 +8890,7 @@ dependencies = [
  "scale-info",
  "schnellru",
  "sp-core",
- "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0)",
+ "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
  "thiserror",
  "tracing",
  "trie-db",
@@ -8840,7 +8900,7 @@ dependencies = [
 [[package]]
 name = "sp-version"
 version = "29.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -8849,7 +8909,7 @@ dependencies = [
  "serde",
  "sp-crypto-hashing-proc-macro",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
  "sp-version-proc-macro",
  "thiserror",
 ]
@@ -8857,7 +8917,7 @@ dependencies = [
 [[package]]
 name = "sp-version-proc-macro"
 version = "13.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "parity-scale-codec",
  "proc-macro2",
@@ -8868,7 +8928,7 @@ dependencies = [
 [[package]]
 name = "sp-wasm-interface"
 version = "20.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "anyhow",
  "impl-trait-for-tuples",
@@ -8890,7 +8950,7 @@ dependencies = [
 [[package]]
 name = "sp-weights"
 version = "27.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "bounded-collections",
  "parity-scale-codec",
@@ -8898,7 +8958,7 @@ dependencies = [
  "serde",
  "smallvec",
  "sp-arithmetic",
- "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0)",
+ "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
 ]
 
 [[package]]
@@ -9037,7 +9097,7 @@ dependencies = [
 [[package]]
 name = "substrate-bip39"
 version = "0.4.7"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "hmac 0.12.1",
  "pbkdf2",
@@ -9049,7 +9109,7 @@ dependencies = [
 [[package]]
 name = "substrate-build-script-utils"
 version = "11.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 
 [[package]]
 name = "substrate-fixed"
@@ -9065,7 +9125,7 @@ dependencies = [
 [[package]]
 name = "substrate-frame-rpc-system"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "frame-system-rpc-runtime-api",
  "futures",
@@ -9084,7 +9144,7 @@ dependencies = [
 [[package]]
 name = "substrate-prometheus-endpoint"
 version = "0.17.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
  "hyper",
  "log",
@@ -9096,15 +9156,24 @@ dependencies = [
 [[package]]
 name = "substrate-wasm-builder"
 version = "17.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=polkadot-v1.10.0#7049c3c98836b3e9253f6aaa69b6bf3d622e3962"
+source = "git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3#8d2f55dfe06bae13e9f47ccf587acfd3fb9cd923"
 dependencies = [
+ "array-bytes 6.2.3",
  "build-helper",
  "cargo_metadata",
  "console",
  "filetime",
+ "frame-metadata",
+ "merkleized-metadata",
+ "parity-scale-codec",
  "parity-wasm",
  "polkavm-linker",
+ "sc-executor",
+ "sp-core",
+ "sp-io",
  "sp-maybe-compressed-blob",
+ "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk.git?tag=v1.10.0-rc3)",
+ "sp-version",
  "strum 0.26.2",
  "tempfile",
  "toml 0.8.14",
diff --git a/Cargo.toml b/Cargo.toml
index 8d9eff122..4a7565a01 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -39,80 +39,81 @@ litep2p = { git = "https://github.com/paritytech/litep2p", branch = "master" }
 
 subtensor-macros = { path = "support/macros" }
 
-frame-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-v1.10.0", default-features = false }
-frame-benchmarking-cli = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-v1.10.0" }
-frame-executive = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-v1.10.0", default-features = false }
-frame-support = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-v1.10.0", default-features = false }
-frame-system = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-v1.10.0", default-features = false }
-frame-system-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-v1.10.0", default-features = false }
-frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-v1.10.0", default-features = false }
-frame-try-runtime = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-v1.10.0", default-features = false }
+frame-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.10.0-rc3", default-features = false }
+frame-benchmarking-cli = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.10.0-rc3" }
+frame-executive = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.10.0-rc3", default-features = false }
+frame-metadata-hash-extension = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.10.0-rc3" , default-features = false }
+frame-support = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.10.0-rc3", default-features = false }
+frame-system = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.10.0-rc3", default-features = false }
+frame-system-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.10.0-rc3", default-features = false }
+frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.10.0-rc3", default-features = false }
+frame-try-runtime = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.10.0-rc3", default-features = false }
 
-pallet-aura = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-v1.10.0", default-features = false }
-pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-v1.10.0", default-features = false }
-pallet-grandpa = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-v1.10.0", default-features = false }
-pallet-insecure-randomness-collective-flip = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-v1.10.0", default-features = false }
-pallet-membership = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-v1.10.0", default-features = false }
-pallet-multisig = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-v1.10.0", default-features = false }
-pallet-preimage = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-v1.10.0", default-features = false }
-pallet-proxy = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-v1.10.0", default-features = false }
-pallet-safe-mode = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-v1.10.0", default-features = false }
-pallet-scheduler = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-v1.10.0", default-features = false }
-pallet-sudo = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-v1.10.0", default-features = false }
-pallet-timestamp = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-v1.10.0", default-features = false }
-pallet-transaction-payment = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-v1.10.0", default-features = false }
-pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-v1.10.0" }
-pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-v1.10.0", default-features = false }
-pallet-utility = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-v1.10.0", default-features = false }
+pallet-aura = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.10.0-rc3", default-features = false }
+pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.10.0-rc3", default-features = false }
+pallet-grandpa = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.10.0-rc3", default-features = false }
+pallet-insecure-randomness-collective-flip = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.10.0-rc3", default-features = false }
+pallet-membership = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.10.0-rc3", default-features = false }
+pallet-multisig = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.10.0-rc3", default-features = false }
+pallet-preimage = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.10.0-rc3", default-features = false }
+pallet-proxy = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.10.0-rc3", default-features = false }
+pallet-safe-mode = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.10.0-rc3", default-features = false }
+pallet-scheduler = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.10.0-rc3", default-features = false }
+pallet-sudo = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.10.0-rc3", default-features = false }
+pallet-timestamp = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.10.0-rc3", default-features = false }
+pallet-transaction-payment = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.10.0-rc3", default-features = false }
+pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.10.0-rc3" }
+pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.10.0-rc3", default-features = false }
+pallet-utility = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.10.0-rc3", default-features = false }
 
-sc-basic-authorship = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-v1.10.0" }
-sc-cli = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-v1.10.0" }
-sc-client-api = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-v1.10.0" }
-sc-consensus = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-v1.10.0" }
-sc-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-v1.10.0" }
-sc-consensus-grandpa = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-v1.10.0" }
-sc-consensus-grandpa-rpc = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-v1.10.0" }
-sc-chain-spec-derive = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-v1.10.0" }
-sc-chain-spec = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-v1.10.0" }
-sc-consensus-slots = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-v1.10.0" }
-sc-executor = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-v1.10.0" }
-sc-keystore = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-v1.10.0" }
-sc-network = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-v1.10.0" }
-sc-offchain = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-v1.10.0" }
-sc-rpc = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-v1.10.0" }
-sc-rpc-api = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-v1.10.0" }
-sc-service = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-v1.10.0" }
-sc-telemetry = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-v1.10.0" }
-sc-transaction-pool = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-v1.10.0" }
-sc-transaction-pool-api = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-v1.10.0" }
+sc-basic-authorship = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.10.0-rc3" }
+sc-cli = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.10.0-rc3" }
+sc-client-api = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.10.0-rc3" }
+sc-consensus = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.10.0-rc3" }
+sc-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.10.0-rc3" }
+sc-consensus-grandpa = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.10.0-rc3" }
+sc-consensus-grandpa-rpc = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.10.0-rc3" }
+sc-chain-spec-derive = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.10.0-rc3" }
+sc-chain-spec = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.10.0-rc3" }
+sc-consensus-slots = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.10.0-rc3" }
+sc-executor = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.10.0-rc3" }
+sc-keystore = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.10.0-rc3" }
+sc-network = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.10.0-rc3" }
+sc-offchain = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.10.0-rc3" }
+sc-rpc = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.10.0-rc3" }
+sc-rpc-api = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.10.0-rc3" }
+sc-service = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.10.0-rc3" }
+sc-telemetry = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.10.0-rc3" }
+sc-transaction-pool = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.10.0-rc3" }
+sc-transaction-pool-api = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.10.0-rc3" }
 
-sp-api = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-v1.10.0", default-features = false }
-sp-block-builder = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-v1.10.0", default-features = false }
-sp-blockchain = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-v1.10.0", default-features = false }
-sp-consensus = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-v1.10.0" }
-sp-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-v1.10.0", default-features = false }
-sp-consensus-grandpa = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-v1.10.0" }
-sp-genesis-builder = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-v1.10.0", default-features = false }
-sp-core = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-v1.10.0", default-features = false }
-sp-inherents = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-v1.10.0", default-features = false }
-sp-io = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-v1.10.0", default-features = false }
-sp-keyring = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-v1.10.0" }
-sp-offchain = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-v1.10.0", default-features = false }
-sp-rpc = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-v1.10.0", default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-v1.10.0", default-features = false }
-sp-session = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-v1.10.0", default-features = false }
-sp-std = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-v1.10.0", default-features = false }
-sp-storage = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-v1.10.0", default-features = false }
-sp-timestamp = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-v1.10.0" }
-sp-tracing = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-v1.10.0", default-features = false }
-sp-transaction-pool = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-v1.10.0", default-features = false }
-sp-version = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-v1.10.0", default-features = false }
-sp-weights = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-v1.10.0", default-features = false }
+sp-api = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.10.0-rc3", default-features = false }
+sp-block-builder = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.10.0-rc3", default-features = false }
+sp-blockchain = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.10.0-rc3", default-features = false }
+sp-consensus = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.10.0-rc3" }
+sp-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.10.0-rc3", default-features = false }
+sp-consensus-grandpa = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.10.0-rc3" }
+sp-genesis-builder = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.10.0-rc3", default-features = false }
+sp-core = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.10.0-rc3", default-features = false }
+sp-inherents = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.10.0-rc3", default-features = false }
+sp-io = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.10.0-rc3", default-features = false }
+sp-keyring = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.10.0-rc3" }
+sp-offchain = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.10.0-rc3", default-features = false }
+sp-rpc = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.10.0-rc3", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.10.0-rc3", default-features = false }
+sp-session = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.10.0-rc3", default-features = false }
+sp-std = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.10.0-rc3", default-features = false }
+sp-storage = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.10.0-rc3", default-features = false }
+sp-timestamp = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.10.0-rc3" }
+sp-tracing = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.10.0-rc3", default-features = false }
+sp-transaction-pool = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.10.0-rc3", default-features = false }
+sp-version = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.10.0-rc3", default-features = false }
+sp-weights = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.10.0-rc3", default-features = false }
 
-substrate-build-script-utils = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-v1.10.0" }
+substrate-build-script-utils = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.10.0-rc3" }
 substrate-fixed = { git = "https://github.com/encointer/substrate-fixed.git", tag = "v0.5.9" }
-substrate-frame-rpc-system = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-v1.10.0" }
-substrate-wasm-builder = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "polkadot-v1.10.0" }
+substrate-frame-rpc-system = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.10.0-rc3" }
+substrate-wasm-builder = { git = "https://github.com/paritytech/polkadot-sdk.git", tag = "v1.10.0-rc3" }
 frame-metadata = "16"
 
 [profile.release]
diff --git a/justfile b/justfile
index e33fdf685..f99f3913a 100644
--- a/justfile
+++ b/justfile
@@ -47,4 +47,8 @@ lint:
   @echo "Running cargo clippy with automatic fixes on potentially dirty code..."
   just clippy-fix
   @echo "Running cargo clippy..."
-  just clippy
\ No newline at end of file
+  just clippy
+
+production:
+  @echo "Running cargo build with metadata-hash generation..."
+  cargo +{{RUSTV}} build --profile production --features="runtime-benchmarks metadata-hash"
diff --git a/node/Cargo.toml b/node/Cargo.toml
index 7fc6eff48..0e1a418a3 100644
--- a/node/Cargo.toml
+++ b/node/Cargo.toml
@@ -54,6 +54,7 @@ sp-io = { workspace = true }
 sp-timestamp = { workspace = true }
 sp-inherents = { workspace = true }
 sp-keyring = { workspace = true }
+frame-metadata-hash-extension = { workspace = true }
 frame-system = { workspace = true }
 pallet-transaction-payment = { workspace = true }
 pallet-commitments = { path = "../pallets/commitments" }
diff --git a/node/src/benchmarking.rs b/node/src/benchmarking.rs
index ba176e15f..cf48df62f 100644
--- a/node/src/benchmarking.rs
+++ b/node/src/benchmarking.rs
@@ -136,6 +136,7 @@ pub fn create_benchmark_extrinsic(
         pallet_transaction_payment::ChargeTransactionPayment::<runtime::Runtime>::from(0),
         pallet_subtensor::SubtensorSignedExtension::<runtime::Runtime>::new(),
         pallet_commitments::CommitmentsSignedExtension::<runtime::Runtime>::new(),
+        frame_metadata_hash_extension::CheckMetadataHash::<runtime::Runtime>::new(true),
     );
 
     let raw_payload = runtime::SignedPayload::from_raw(
@@ -152,6 +153,7 @@ pub fn create_benchmark_extrinsic(
             (),
             (),
             (),
+            None,
         ),
     );
     let signature = raw_payload.using_encoded(|e| sender.sign(e));
diff --git a/pallets/subtensor/src/benchmarks.rs b/pallets/subtensor/src/benchmarks.rs
index 03e087a92..c6c9ac481 100644
--- a/pallets/subtensor/src/benchmarks.rs
+++ b/pallets/subtensor/src/benchmarks.rs
@@ -80,7 +80,7 @@ benchmarks! {
     // This is a whitelisted caller who can make transaction without weights.
     let caller: T::AccountId = whitelisted_caller::<AccountIdOf<T>>();
     let caller_origin = <T as frame_system::Config>::RuntimeOrigin::from(RawOrigin::Signed(caller.clone()));
-    let netuid: u16 = 1;
+    let netuid: u16 = 0;
     let version_key: u64 = 1;
     let tempo: u16 = 1;
     let modality: u16 = 0;
diff --git a/pallets/subtensor/src/epoch.rs b/pallets/subtensor/src/epoch.rs
index 12c407efa..24ba3c784 100644
--- a/pallets/subtensor/src/epoch.rs
+++ b/pallets/subtensor/src/epoch.rs
@@ -188,8 +188,6 @@ impl<T: Config> Pallet<T> {
         // =================================
 
         // Compute emission scores.
-
-        // Compute normalized emission scores. range: I32F32(0, 1)
         // Compute normalized emission scores. range: I32F32(0, 1)
         let combined_emission: Vec<I32F32> = incentive
             .iter()
diff --git a/pallets/subtensor/src/lib.rs b/pallets/subtensor/src/lib.rs
index f7824e2a3..d65a3b1a4 100644
--- a/pallets/subtensor/src/lib.rs
+++ b/pallets/subtensor/src/lib.rs
@@ -45,6 +45,7 @@ mod root;
 mod serving;
 mod staking;
 mod swap;
+mod swap_hotkey;
 mod uids;
 mod utils;
 mod weights;
@@ -272,7 +273,7 @@ pub mod pallet {
     }
 
     #[pallet::storage]
-    pub(super) type SenateRequiredStakePercentage<T> =
+    pub type SenateRequiredStakePercentage<T> =
         StorageValue<_, u64, ValueQuery, DefaultSenateRequiredStakePercentage<T>>;
 
     /// ============================
@@ -367,7 +368,7 @@ pub mod pallet {
     pub type TotalColdkeyStake<T: Config> =
         StorageMap<_, Identity, T::AccountId, u64, ValueQuery, DefaultAccountTake<T>>;
     #[pallet::storage]
-    ///  MAP (hot, cold) --> stake | Returns a tuple (u64: stakes, u64: block_number)
+    ///  MAP (hot, cold) --> u64, u64) | Returns a tuple (u64: stakes, u64: block_number)
     pub type TotalHotkeyColdkeyStakesThisInterval<T: Config> = StorageDoubleMap<
         _,
         Identity,
@@ -796,15 +797,15 @@ pub mod pallet {
     }
 
     #[pallet::storage] // --- ITEM ( tx_rate_limit )
-    pub(super) type TxRateLimit<T> = StorageValue<_, u64, ValueQuery, DefaultTxRateLimit<T>>;
+    pub type TxRateLimit<T> = StorageValue<_, u64, ValueQuery, DefaultTxRateLimit<T>>;
     #[pallet::storage] // --- ITEM ( tx_rate_limit )
-    pub(super) type TxDelegateTakeRateLimit<T> =
+    pub type TxDelegateTakeRateLimit<T> =
         StorageValue<_, u64, ValueQuery, DefaultTxDelegateTakeRateLimit<T>>;
     #[pallet::storage] // --- MAP ( key ) --> last_block
     pub type LastTxBlock<T: Config> =
         StorageMap<_, Identity, T::AccountId, u64, ValueQuery, DefaultLastTxBlock<T>>;
     #[pallet::storage] // --- MAP ( key ) --> last_block
-    pub(super) type LastTxBlockDelegateTake<T: Config> =
+    pub type LastTxBlockDelegateTake<T: Config> =
         StorageMap<_, Identity, T::AccountId, u64, ValueQuery, DefaultLastTxBlock<T>>;
 
     /// Default value for serving rate limit.
@@ -1084,41 +1085,39 @@ pub mod pallet {
         StorageMap<_, Identity, u16, Vec<(T::AccountId, u64, u64)>, OptionQuery>;
 
     #[pallet::storage] // --- DMAP ( netuid ) --> active
-    pub(super) type Active<T: Config> =
+    pub type Active<T: Config> =
         StorageMap<_, Identity, u16, Vec<bool>, ValueQuery, EmptyBoolVec<T>>;
     #[pallet::storage] // --- DMAP ( netuid ) --> rank
-    pub(super) type Rank<T: Config> =
-        StorageMap<_, Identity, u16, Vec<u16>, ValueQuery, EmptyU16Vec<T>>;
+    pub type Rank<T: Config> = StorageMap<_, Identity, u16, Vec<u16>, ValueQuery, EmptyU16Vec<T>>;
     #[pallet::storage] // --- DMAP ( netuid ) --> trust
-    pub(super) type Trust<T: Config> =
-        StorageMap<_, Identity, u16, Vec<u16>, ValueQuery, EmptyU16Vec<T>>;
+    pub type Trust<T: Config> = StorageMap<_, Identity, u16, Vec<u16>, ValueQuery, EmptyU16Vec<T>>;
     #[pallet::storage] // --- DMAP ( netuid ) --> consensus
-    pub(super) type Consensus<T: Config> =
+    pub type Consensus<T: Config> =
         StorageMap<_, Identity, u16, Vec<u16>, ValueQuery, EmptyU16Vec<T>>;
     #[pallet::storage] // --- DMAP ( netuid ) --> incentive
-    pub(super) type Incentive<T: Config> =
+    pub type Incentive<T: Config> =
         StorageMap<_, Identity, u16, Vec<u16>, ValueQuery, EmptyU16Vec<T>>;
     #[pallet::storage] // --- DMAP ( netuid ) --> dividends
-    pub(super) type Dividends<T: Config> =
+    pub type Dividends<T: Config> =
         StorageMap<_, Identity, u16, Vec<u16>, ValueQuery, EmptyU16Vec<T>>;
     #[pallet::storage] // --- DMAP ( netuid ) --> emission
-    pub(super) type Emission<T: Config> =
+    pub type Emission<T: Config> =
         StorageMap<_, Identity, u16, Vec<u64>, ValueQuery, EmptyU64Vec<T>>;
     #[pallet::storage] // --- DMAP ( netuid ) --> last_update
-    pub(super) type LastUpdate<T: Config> =
+    pub type LastUpdate<T: Config> =
         StorageMap<_, Identity, u16, Vec<u64>, ValueQuery, EmptyU64Vec<T>>;
     #[pallet::storage] // --- DMAP ( netuid ) --> validator_trust
-    pub(super) type ValidatorTrust<T: Config> =
+    pub type ValidatorTrust<T: Config> =
         StorageMap<_, Identity, u16, Vec<u16>, ValueQuery, EmptyU16Vec<T>>;
     #[pallet::storage] // --- DMAP ( netuid ) --> pruning_scores
-    pub(super) type PruningScores<T: Config> =
+    pub type PruningScores<T: Config> =
         StorageMap<_, Identity, u16, Vec<u16>, ValueQuery, EmptyU16Vec<T>>;
     #[pallet::storage] // --- DMAP ( netuid ) --> validator_permit
-    pub(super) type ValidatorPermit<T: Config> =
+    pub type ValidatorPermit<T: Config> =
         StorageMap<_, Identity, u16, Vec<bool>, ValueQuery, EmptyBoolVec<T>>;
 
     #[pallet::storage] // --- DMAP ( netuid, uid ) --> weights
-    pub(super) type Weights<T: Config> = StorageDoubleMap<
+    pub type Weights<T: Config> = StorageDoubleMap<
         _,
         Identity,
         u16,
@@ -1129,7 +1128,7 @@ pub mod pallet {
         DefaultWeights<T>,
     >;
     #[pallet::storage] // --- DMAP ( netuid, uid ) --> bonds
-    pub(super) type Bonds<T: Config> = StorageDoubleMap<
+    pub type Bonds<T: Config> = StorageDoubleMap<
         _,
         Identity,
         u16,
@@ -2045,9 +2044,10 @@ pub mod pallet {
 
         /// Attempt to adjust the senate membership to include a hotkey
         #[pallet::call_index(63)]
-        #[pallet::weight((Weight::from_parts(0, 0)
-		.saturating_add(T::DbWeight::get().reads(0))
-		.saturating_add(T::DbWeight::get().writes(0)), DispatchClass::Normal, Pays::Yes))]
+        #[pallet::weight((Weight::from_parts(50_000_000, 0)
+        .saturating_add(Weight::from_parts(0, 4632))
+        .saturating_add(T::DbWeight::get().reads(5))
+        .saturating_add(T::DbWeight::get().writes(1)), DispatchClass::Normal, Pays::Yes))]
         pub fn adjust_senate(origin: OriginFor<T>, hotkey: T::AccountId) -> DispatchResult {
             Self::do_adjust_senate(origin, hotkey)
         }
diff --git a/pallets/subtensor/src/math.rs b/pallets/subtensor/src/math.rs
index 1abc9ed9b..9aab2c4b5 100644
--- a/pallets/subtensor/src/math.rs
+++ b/pallets/subtensor/src/math.rs
@@ -889,59 +889,48 @@ pub fn weighted_median(
     score: &[I32F32],
     partition_idx: &[usize],
     minority: I32F32,
-    partition_lo: I32F32,
-    partition_hi: I32F32,
+    mut partition_lo: I32F32,
+    mut partition_hi: I32F32,
 ) -> I32F32 {
-    let n = partition_idx.len();
-    if n == 0 {
-        return I32F32::from_num(0);
-    }
-    if n == 1 {
-        return score[partition_idx[0]];
-    }
-    assert!(stake.len() == score.len());
-    let mid_idx: usize = n.saturating_div(2);
-    let pivot: I32F32 = score[partition_idx[mid_idx]];
-    let mut lo_stake: I32F32 = I32F32::from_num(0);
-    let mut hi_stake: I32F32 = I32F32::from_num(0);
-    let mut lower: Vec<usize> = vec![];
-    let mut upper: Vec<usize> = vec![];
-    for &idx in partition_idx {
-        if score[idx] == pivot {
-            continue;
+    let mut current_partition_idx = partition_idx.to_vec();
+    while !current_partition_idx.is_empty() {
+        let n = current_partition_idx.len();
+        if n == 1 {
+            return score[current_partition_idx[0]];
+        }
+        let mid_idx: usize = n.saturating_div(2);
+        let pivot: I32F32 = score[current_partition_idx[mid_idx]];
+        let mut lo_stake: I32F32 = I32F32::from_num(0);
+        let mut hi_stake: I32F32 = I32F32::from_num(0);
+        let mut lower: Vec<usize> = vec![];
+        let mut upper: Vec<usize> = vec![];
+        for &idx in &current_partition_idx {
+            if score[idx] == pivot {
+                continue;
+            }
+            if score[idx] < pivot {
+                lo_stake = lo_stake.saturating_add(stake[idx]);
+                lower.push(idx);
+            } else {
+                hi_stake = hi_stake.saturating_add(stake[idx]);
+                upper.push(idx);
+            }
         }
-        if score[idx] < pivot {
-            lo_stake = lo_stake.saturating_add(stake[idx]);
-            lower.push(idx);
+        if partition_lo.saturating_add(lo_stake) <= minority
+            && minority < partition_hi.saturating_sub(hi_stake)
+        {
+            return pivot;
+        } else if (minority < partition_lo.saturating_add(lo_stake)) && (!lower.is_empty()) {
+            current_partition_idx = lower;
+            partition_hi = partition_lo.saturating_add(lo_stake);
+        } else if (partition_hi.saturating_sub(hi_stake) <= minority) && (!upper.is_empty()) {
+            current_partition_idx = upper;
+            partition_lo = partition_hi.saturating_sub(hi_stake);
         } else {
-            hi_stake = hi_stake.saturating_add(stake[idx]);
-            upper.push(idx);
+            return pivot;
         }
     }
-    if (partition_lo.saturating_add(lo_stake) <= minority)
-        && (minority < partition_hi.saturating_sub(hi_stake))
-    {
-        return pivot;
-    } else if (minority < partition_lo.saturating_add(lo_stake)) && (!lower.is_empty()) {
-        return weighted_median(
-            stake,
-            score,
-            &lower,
-            minority,
-            partition_lo,
-            partition_lo.saturating_add(lo_stake),
-        );
-    } else if (partition_hi.saturating_sub(hi_stake) <= minority) && (!upper.is_empty()) {
-        return weighted_median(
-            stake,
-            score,
-            &upper,
-            minority,
-            partition_hi.saturating_sub(hi_stake),
-            partition_hi,
-        );
-    }
-    pivot
+    I32F32::from_num(0)
 }
 
 /// Column-wise weighted median, e.g. stake-weighted median scores per server (column) over all validators (rows).
diff --git a/pallets/subtensor/src/swap.rs b/pallets/subtensor/src/swap.rs
index 8e4ca5cc9..7271a5011 100644
--- a/pallets/subtensor/src/swap.rs
+++ b/pallets/subtensor/src/swap.rs
@@ -6,101 +6,6 @@ use frame_support::{storage::IterableStorageDoubleMap, weights::Weight};
 use sp_core::{Get, U256};
 
 impl<T: Config> Pallet<T> {
-    /// Swaps the hotkey of a coldkey account.
-    ///
-    /// # Arguments
-    ///
-    /// * `origin` - The origin of the transaction, and also the coldkey account.
-    /// * `old_hotkey` - The old hotkey to be swapped.
-    /// * `new_hotkey` - The new hotkey to replace the old one.
-    ///
-    /// # Returns
-    ///
-    /// * `DispatchResultWithPostInfo` - The result of the dispatch.
-    ///
-    /// # Errors
-    ///
-    /// * `NonAssociatedColdKey` - If the coldkey does not own the old hotkey.
-    /// * `HotKeySetTxRateLimitExceeded` - If the transaction rate limit is exceeded.
-    /// * `NewHotKeyIsSameWithOld` - If the new hotkey is the same as the old hotkey.
-    /// * `HotKeyAlreadyRegisteredInSubNet` - If the new hotkey is already registered in the subnet.
-    /// * `NotEnoughBalanceToPaySwapHotKey` - If there is not enough balance to pay for the swap.
-    pub fn do_swap_hotkey(
-        origin: T::RuntimeOrigin,
-        old_hotkey: &T::AccountId,
-        new_hotkey: &T::AccountId,
-    ) -> DispatchResultWithPostInfo {
-        let coldkey = ensure_signed(origin)?;
-
-        ensure!(
-            !Self::coldkey_in_arbitration(&coldkey),
-            Error::<T>::ColdkeyIsInArbitration
-        );
-
-        let mut weight = T::DbWeight::get().reads(2);
-
-        ensure!(old_hotkey != new_hotkey, Error::<T>::NewHotKeyIsSameWithOld);
-        ensure!(
-            !Self::is_hotkey_registered_on_any_network(new_hotkey),
-            Error::<T>::HotKeyAlreadyRegisteredInSubNet
-        );
-
-        weight.saturating_accrue(T::DbWeight::get().reads_writes(2, 0));
-        ensure!(
-            Self::coldkey_owns_hotkey(&coldkey, old_hotkey),
-            Error::<T>::NonAssociatedColdKey
-        );
-
-        let block: u64 = Self::get_current_block_as_u64();
-        ensure!(
-            !Self::exceeds_tx_rate_limit(Self::get_last_tx_block(&coldkey), block),
-            Error::<T>::HotKeySetTxRateLimitExceeded
-        );
-
-        weight.saturating_accrue(
-            T::DbWeight::get().reads((TotalNetworks::<T>::get().saturating_add(1u16)) as u64),
-        );
-
-        let swap_cost = Self::get_key_swap_cost();
-        log::debug!("Swap cost: {:?}", swap_cost);
-
-        ensure!(
-            Self::can_remove_balance_from_coldkey_account(&coldkey, swap_cost),
-            Error::<T>::NotEnoughBalanceToPaySwapHotKey
-        );
-        let actual_burn_amount = Self::remove_balance_from_coldkey_account(&coldkey, swap_cost)?;
-        Self::burn_tokens(actual_burn_amount);
-
-        Self::swap_owner(old_hotkey, new_hotkey, &coldkey, &mut weight);
-        Self::swap_total_hotkey_stake(old_hotkey, new_hotkey, &mut weight);
-        Self::swap_delegates(old_hotkey, new_hotkey, &mut weight);
-        Self::swap_stake(old_hotkey, new_hotkey, &mut weight);
-
-        // Store the value of is_network_member for the old key
-        let netuid_is_member: Vec<u16> = Self::get_netuid_is_member(old_hotkey, &mut weight);
-
-        Self::swap_is_network_member(old_hotkey, new_hotkey, &netuid_is_member, &mut weight);
-        Self::swap_axons(old_hotkey, new_hotkey, &netuid_is_member, &mut weight);
-        Self::swap_keys(old_hotkey, new_hotkey, &netuid_is_member, &mut weight);
-        Self::swap_loaded_emission(old_hotkey, new_hotkey, &netuid_is_member, &mut weight);
-        Self::swap_uids(old_hotkey, new_hotkey, &netuid_is_member, &mut weight);
-        Self::swap_prometheus(old_hotkey, new_hotkey, &netuid_is_member, &mut weight);
-        Self::swap_senate_member(old_hotkey, new_hotkey, &mut weight)?;
-
-        Self::swap_total_hotkey_coldkey_stakes_this_interval(old_hotkey, new_hotkey, &mut weight);
-
-        Self::set_last_tx_block(&coldkey, block);
-        weight.saturating_accrue(T::DbWeight::get().writes(1));
-
-        Self::deposit_event(Event::HotkeySwapped {
-            coldkey,
-            old_hotkey: old_hotkey.clone(),
-            new_hotkey: new_hotkey.clone(),
-        });
-
-        Ok(Some(weight).into())
-    }
-
     /// Swaps the coldkey associated with a set of hotkeys from an old coldkey to a new coldkey.
     ///
     /// # Arguments
@@ -472,317 +377,6 @@ impl<T: Config> Pallet<T> {
         netuid_is_member
     }
 
-    /// Swaps the owner of the hotkey.
-    ///
-    /// # Arguments
-    ///
-    /// * `old_hotkey` - The old hotkey.
-    /// * `new_hotkey` - The new hotkey.
-    /// * `coldkey` - The coldkey owning the hotkey.
-    /// * `weight` - The weight of the transaction.
-    ///
-    pub fn swap_owner(
-        old_hotkey: &T::AccountId,
-        new_hotkey: &T::AccountId,
-        coldkey: &T::AccountId,
-        weight: &mut Weight,
-    ) {
-        Owner::<T>::remove(old_hotkey);
-        Owner::<T>::insert(new_hotkey, coldkey.clone());
-
-        // Update OwnedHotkeys map
-        let mut hotkeys = OwnedHotkeys::<T>::get(coldkey);
-        if !hotkeys.contains(new_hotkey) {
-            hotkeys.push(new_hotkey.clone());
-        }
-        hotkeys.retain(|hk| *hk != *old_hotkey);
-        OwnedHotkeys::<T>::insert(coldkey, hotkeys);
-
-        weight.saturating_accrue(T::DbWeight::get().writes(2));
-    }
-
-    /// Swaps the total stake of the hotkey.
-    ///
-    /// # Arguments
-    ///
-    /// * `old_hotkey` - The old hotkey.
-    /// * `new_hotkey` - The new hotkey.
-    /// * `weight` - The weight of the transaction.
-    ///
-    /// # Weight Calculation
-    ///
-    /// * Reads: 1 if the old hotkey exists, otherwise 1 for the failed read.
-    /// * Writes: 2 if the old hotkey exists (one for removal and one for insertion).
-    pub fn swap_total_hotkey_stake(
-        old_hotkey: &T::AccountId,
-        new_hotkey: &T::AccountId,
-        weight: &mut Weight,
-    ) {
-        if let Ok(total_hotkey_stake) = TotalHotkeyStake::<T>::try_get(old_hotkey) {
-            TotalHotkeyStake::<T>::remove(old_hotkey);
-            TotalHotkeyStake::<T>::insert(new_hotkey, total_hotkey_stake);
-            weight.saturating_accrue(T::DbWeight::get().reads_writes(1, 2));
-        } else {
-            weight.saturating_accrue(T::DbWeight::get().reads(1));
-        }
-    }
-
-    /// Swaps the delegates of the hotkey.
-    ///
-    /// # Arguments
-    ///
-    /// * `old_hotkey` - The old hotkey.
-    /// * `new_hotkey` - The new hotkey.
-    /// * `weight` - The weight of the transaction.
-    ///
-    /// # Weight Calculation
-    ///
-    /// * Reads: 1 if the old hotkey exists, otherwise 1 for the failed read.
-    /// * Writes: 2 if the old hotkey exists (one for removal and one for insertion).
-    pub fn swap_delegates(
-        old_hotkey: &T::AccountId,
-        new_hotkey: &T::AccountId,
-        weight: &mut Weight,
-    ) {
-        if let Ok(delegate_take) = Delegates::<T>::try_get(old_hotkey) {
-            Delegates::<T>::remove(old_hotkey);
-            Delegates::<T>::insert(new_hotkey, delegate_take);
-            weight.saturating_accrue(T::DbWeight::get().reads_writes(1, 2));
-        } else {
-            weight.saturating_accrue(T::DbWeight::get().reads(1));
-        }
-    }
-
-    /// Swaps the stake of the hotkey.
-    ///
-    /// # Arguments
-    ///
-    /// * `old_hotkey` - The old hotkey.
-    /// * `new_hotkey` - The new hotkey.
-    /// * `weight` - The weight of the transaction.
-    pub fn swap_stake(old_hotkey: &T::AccountId, new_hotkey: &T::AccountId, weight: &mut Weight) {
-        let mut writes: u64 = 0;
-        let stakes: Vec<(T::AccountId, u64)> = Stake::<T>::iter_prefix(old_hotkey).collect();
-        let stake_count = stakes.len() as u32;
-
-        for (coldkey, stake_amount) in stakes {
-            Stake::<T>::insert(new_hotkey, &coldkey, stake_amount);
-            writes = writes.saturating_add(1u64); // One write for insert
-
-            // Update StakingHotkeys map
-            let mut staking_hotkeys = StakingHotkeys::<T>::get(&coldkey);
-            if !staking_hotkeys.contains(new_hotkey) {
-                staking_hotkeys.push(new_hotkey.clone());
-                writes = writes.saturating_add(1u64); // One write for insert
-            }
-            if let Some(pos) = staking_hotkeys.iter().position(|x| x == old_hotkey) {
-                staking_hotkeys.remove(pos);
-                writes = writes.saturating_add(1u64); // One write for remove
-            }
-            StakingHotkeys::<T>::insert(coldkey.clone(), staking_hotkeys);
-            writes = writes.saturating_add(1u64); // One write for insert
-        }
-
-        // Clear the prefix for the old hotkey after transferring all stakes
-        let _ = Stake::<T>::clear_prefix(old_hotkey, stake_count, None);
-        writes = writes.saturating_add(1); // One write for insert; // One write for clear_prefix
-
-        // TODO: Remove all entries for old hotkey from StakingHotkeys map
-
-        weight.saturating_accrue(T::DbWeight::get().writes(writes));
-    }
-
-    /// Swaps the network membership status of the hotkey.
-    ///
-    /// # Arguments
-    ///
-    /// * `old_hotkey` - The old hotkey.
-    /// * `new_hotkey` - The new hotkey.
-    /// * `netuid_is_member` - A vector of network IDs where the hotkey is a member.
-    /// * `weight` - The weight of the transaction.
-    pub fn swap_is_network_member(
-        old_hotkey: &T::AccountId,
-        new_hotkey: &T::AccountId,
-        netuid_is_member: &[u16],
-        weight: &mut Weight,
-    ) {
-        let _ = IsNetworkMember::<T>::clear_prefix(old_hotkey, netuid_is_member.len() as u32, None);
-        weight.saturating_accrue(T::DbWeight::get().writes(netuid_is_member.len() as u64));
-        for netuid in netuid_is_member.iter() {
-            IsNetworkMember::<T>::insert(new_hotkey, netuid, true);
-            weight.saturating_accrue(T::DbWeight::get().writes(1));
-        }
-    }
-
-    /// Swaps the axons of the hotkey.
-    ///
-    /// # Arguments
-    ///
-    /// * `old_hotkey` - The old hotkey.
-    /// * `new_hotkey` - The new hotkey.
-    /// * `netuid_is_member` - A vector of network IDs where the hotkey is a member.
-    /// * `weight` - The weight of the transaction.
-    ///
-    /// # Weight Calculation
-    ///
-    /// * Reads: 1 for each network ID if the old hotkey exists in that network.
-    /// * Writes: 2 for each network ID if the old hotkey exists in that network (one for removal and one for insertion).
-    pub fn swap_axons(
-        old_hotkey: &T::AccountId,
-        new_hotkey: &T::AccountId,
-        netuid_is_member: &[u16],
-        weight: &mut Weight,
-    ) {
-        for netuid in netuid_is_member.iter() {
-            if let Ok(axon_info) = Axons::<T>::try_get(netuid, old_hotkey) {
-                Axons::<T>::remove(netuid, old_hotkey);
-                Axons::<T>::insert(netuid, new_hotkey, axon_info);
-                weight.saturating_accrue(T::DbWeight::get().reads_writes(1, 2));
-            } else {
-                weight.saturating_accrue(T::DbWeight::get().reads(1));
-            }
-        }
-    }
-
-    /// Swaps the references in the keys storage map of the hotkey.
-    ///
-    /// # Arguments
-    ///
-    /// * `old_hotkey` - The old hotkey.
-    /// * `new_hotkey` - The new hotkey.
-    /// * `netuid_is_member` - A vector of network IDs where the hotkey is a member.
-    /// * `weight` - The weight of the transaction.
-    pub fn swap_keys(
-        old_hotkey: &T::AccountId,
-        new_hotkey: &T::AccountId,
-        netuid_is_member: &[u16],
-        weight: &mut Weight,
-    ) {
-        let mut writes: u64 = 0;
-        for netuid in netuid_is_member {
-            let keys: Vec<(u16, T::AccountId)> = Keys::<T>::iter_prefix(netuid).collect();
-            for (uid, key) in keys {
-                if key == *old_hotkey {
-                    log::info!("old hotkey found: {:?}", old_hotkey);
-                    Keys::<T>::insert(netuid, uid, new_hotkey.clone());
-                }
-                writes = writes.saturating_add(2u64);
-            }
-        }
-        log::info!("writes: {:?}", writes);
-        weight.saturating_accrue(T::DbWeight::get().writes(writes));
-    }
-
-    /// Swaps the loaded emission of the hotkey.
-    ///
-    /// # Arguments
-    ///
-    /// * `old_hotkey` - The old hotkey.
-    /// * `new_hotkey` - The new hotkey.
-    /// * `netuid_is_member` - A vector of network IDs where the hotkey is a member.
-    /// * `weight` - The weight of the transaction.
-    ///
-    pub fn swap_loaded_emission(
-        old_hotkey: &T::AccountId,
-        new_hotkey: &T::AccountId,
-        netuid_is_member: &[u16],
-        weight: &mut Weight,
-    ) {
-        for netuid in netuid_is_member {
-            if let Some(mut emissions) = LoadedEmission::<T>::get(netuid) {
-                for emission in emissions.iter_mut() {
-                    if emission.0 == *old_hotkey {
-                        emission.0 = new_hotkey.clone();
-                    }
-                }
-                LoadedEmission::<T>::insert(netuid, emissions);
-            }
-        }
-        weight.saturating_accrue(T::DbWeight::get().writes(netuid_is_member.len() as u64));
-    }
-
-    /// Swaps the UIDs of the hotkey.
-    ///
-    /// # Arguments
-    ///
-    /// * `old_hotkey` - The old hotkey.
-    /// * `new_hotkey` - The new hotkey.
-    /// * `netuid_is_member` - A vector of network IDs where the hotkey is a member.
-    /// * `weight` - The weight of the transaction.
-    ///
-    pub fn swap_uids(
-        old_hotkey: &T::AccountId,
-        new_hotkey: &T::AccountId,
-        netuid_is_member: &[u16],
-        weight: &mut Weight,
-    ) {
-        for netuid in netuid_is_member.iter() {
-            if let Ok(uid) = Uids::<T>::try_get(netuid, old_hotkey) {
-                Uids::<T>::remove(netuid, old_hotkey);
-                Uids::<T>::insert(netuid, new_hotkey, uid);
-                weight.saturating_accrue(T::DbWeight::get().writes(2));
-            }
-        }
-    }
-
-    /// Swaps the Prometheus data of the hotkey.
-    ///
-    /// # Arguments
-    ///
-    /// * `old_hotkey` - The old hotkey.
-    /// * `new_hotkey` - The new hotkey.
-    /// * `netuid_is_member` - A vector of network IDs where the hotkey is a member.
-    /// * `weight` - The weight of the transaction.
-    ///
-    /// # Weight Calculation
-    ///
-    /// * Reads: 1 for each network ID if the old hotkey exists in that network.
-    /// * Writes: 2 for each network ID if the old hotkey exists in that network (one for removal and one for insertion).
-    pub fn swap_prometheus(
-        old_hotkey: &T::AccountId,
-        new_hotkey: &T::AccountId,
-        netuid_is_member: &[u16],
-        weight: &mut Weight,
-    ) {
-        for netuid in netuid_is_member.iter() {
-            if let Ok(prometheus_info) = Prometheus::<T>::try_get(netuid, old_hotkey) {
-                Prometheus::<T>::remove(netuid, old_hotkey);
-                Prometheus::<T>::insert(netuid, new_hotkey, prometheus_info);
-                weight.saturating_accrue(T::DbWeight::get().reads_writes(1, 2));
-            } else {
-                weight.saturating_accrue(T::DbWeight::get().reads(1));
-            }
-        }
-    }
-
-    /// Swaps the total hotkey-coldkey stakes for the current interval.
-    ///
-    /// # Arguments
-    ///
-    /// * `old_hotkey` - The old hotkey.
-    /// * `new_hotkey` - The new hotkey.
-    /// * `weight` - The weight of the transaction.
-    ///
-    pub fn swap_total_hotkey_coldkey_stakes_this_interval(
-        old_hotkey: &T::AccountId,
-        new_hotkey: &T::AccountId,
-        weight: &mut Weight,
-    ) {
-        let stakes: Vec<(T::AccountId, (u64, u64))> =
-            TotalHotkeyColdkeyStakesThisInterval::<T>::iter_prefix(old_hotkey).collect();
-        log::info!("Stakes to swap: {:?}", stakes);
-        for (coldkey, stake) in stakes {
-            log::info!(
-                "Swapping stake for coldkey: {:?}, stake: {:?}",
-                coldkey,
-                stake
-            );
-            TotalHotkeyColdkeyStakesThisInterval::<T>::insert(new_hotkey, &coldkey, stake);
-            TotalHotkeyColdkeyStakesThisInterval::<T>::remove(old_hotkey, &coldkey);
-            weight.saturating_accrue(T::DbWeight::get().writes(2)); // One write for insert and one for remove
-        }
-    }
-
     /// Swaps the total stake associated with a coldkey from the old coldkey to the new coldkey.
     ///
     /// # Arguments
diff --git a/pallets/subtensor/src/swap_hotkey.rs b/pallets/subtensor/src/swap_hotkey.rs
new file mode 100644
index 000000000..5c3fecbba
--- /dev/null
+++ b/pallets/subtensor/src/swap_hotkey.rs
@@ -0,0 +1,332 @@
+use super::*;
+use frame_support::weights::Weight;
+use sp_core::Get;
+
+impl<T: Config> Pallet<T> {
+    /// Swaps the hotkey of a coldkey account.
+    ///
+    /// # Arguments
+    ///
+    /// * `origin` - The origin of the transaction, and also the coldkey account.
+    /// * `old_hotkey` - The old hotkey to be swapped.
+    /// * `new_hotkey` - The new hotkey to replace the old one.
+    ///
+    /// # Returns
+    ///
+    /// * `DispatchResultWithPostInfo` - The result of the dispatch.
+    ///
+    /// # Errors
+    ///
+    /// * `NonAssociatedColdKey` - If the coldkey does not own the old hotkey.
+    /// * `HotKeySetTxRateLimitExceeded` - If the transaction rate limit is exceeded.
+    /// * `NewHotKeyIsSameWithOld` - If the new hotkey is the same as the old hotkey.
+    /// * `HotKeyAlreadyRegisteredInSubNet` - If the new hotkey is already registered in the subnet.
+    /// * `NotEnoughBalanceToPaySwapHotKey` - If there is not enough balance to pay for the swap.
+    pub fn do_swap_hotkey(
+        origin: T::RuntimeOrigin,
+        old_hotkey: &T::AccountId,
+        new_hotkey: &T::AccountId,
+    ) -> DispatchResultWithPostInfo {
+        // 1. Ensure the origin is signed and get the coldkey
+        let coldkey = ensure_signed(origin)?;
+
+        // 2. Check if the coldkey is in arbitration
+        ensure!(
+            !Self::coldkey_in_arbitration(&coldkey),
+            Error::<T>::ColdkeyIsInArbitration
+        );
+
+        // 3. Initialize the weight for this operation
+        let mut weight = T::DbWeight::get().reads(2);
+
+        // 4. Ensure the new hotkey is different from the old one
+        ensure!(old_hotkey != new_hotkey, Error::<T>::NewHotKeyIsSameWithOld);
+
+        // 5. Ensure the new hotkey is not already registered on any network
+        ensure!(
+            !Self::is_hotkey_registered_on_any_network(new_hotkey),
+            Error::<T>::HotKeyAlreadyRegisteredInSubNet
+        );
+
+        // 6. Update the weight for the checks above
+        weight.saturating_accrue(T::DbWeight::get().reads_writes(2, 0));
+
+        // 7. Ensure the coldkey owns the old hotkey
+        ensure!(
+            Self::coldkey_owns_hotkey(&coldkey, old_hotkey),
+            Error::<T>::NonAssociatedColdKey
+        );
+
+        // 8. Get the current block number
+        let block: u64 = Self::get_current_block_as_u64();
+
+        // 9. Ensure the transaction rate limit is not exceeded
+        ensure!(
+            !Self::exceeds_tx_rate_limit(Self::get_last_tx_block(&coldkey), block),
+            Error::<T>::HotKeySetTxRateLimitExceeded
+        );
+
+        // 10. Update the weight for reading the total networks
+        weight.saturating_accrue(
+            T::DbWeight::get().reads((TotalNetworks::<T>::get().saturating_add(1u16)) as u64),
+        );
+
+        // 11. Get the cost for swapping the key
+        let swap_cost = Self::get_key_swap_cost();
+        log::debug!("Swap cost: {:?}", swap_cost);
+
+        // 12. Ensure the coldkey has enough balance to pay for the swap
+        ensure!(
+            Self::can_remove_balance_from_coldkey_account(&coldkey, swap_cost),
+            Error::<T>::NotEnoughBalanceToPaySwapHotKey
+        );
+
+        // 13. Remove the swap cost from the coldkey's account
+        let actual_burn_amount = Self::remove_balance_from_coldkey_account(&coldkey, swap_cost)?;
+
+        // 14. Burn the tokens
+        Self::burn_tokens(actual_burn_amount);
+
+        // 15. Perform the hotkey swap
+        let _ = Self::perform_hotkey_swap(old_hotkey, new_hotkey, &coldkey, &mut weight);
+
+        // 16. Update the last transaction block for the coldkey
+        Self::set_last_tx_block(&coldkey, block);
+        weight.saturating_accrue(T::DbWeight::get().writes(1));
+
+        // 17. Emit an event for the hotkey swap
+        Self::deposit_event(Event::HotkeySwapped {
+            coldkey,
+            old_hotkey: old_hotkey.clone(),
+            new_hotkey: new_hotkey.clone(),
+        });
+
+        // 18. Return the weight of the operation
+        Ok(Some(weight).into())
+    }
+
+    /// Performs the hotkey swap operation, transferring all associated data and state from the old hotkey to the new hotkey.
+    ///
+    /// This function executes a series of steps to ensure a complete transfer of all relevant information:
+    /// 1. Swaps the owner of the hotkey.
+    /// 2. Updates the list of owned hotkeys for the coldkey.
+    /// 3. Transfers the total hotkey stake.
+    /// 4. Moves all stake-related data for the interval.
+    /// 5. Updates the last transaction block for the new hotkey.
+    /// 6. Transfers the delegate take information.
+    /// 7. Swaps Senate membership if applicable.
+    /// 8. Updates delegate information.
+    /// 9. For each subnet:
+    ///    - Updates network membership status.
+    ///    - Transfers UID and key information.
+    ///    - Moves Prometheus data.
+    ///    - Updates axon information.
+    ///    - Transfers weight commits.
+    ///    - Updates loaded emission data.
+    /// 10. Transfers all stake information, including updating staking hotkeys for each coldkey.
+    ///
+    /// Throughout the process, the function accumulates the computational weight of operations performed.
+    ///
+    /// # Arguments
+    /// * `old_hotkey` - The AccountId of the current hotkey to be replaced.
+    /// * `new_hotkey` - The AccountId of the new hotkey to replace the old one.
+    /// * `coldkey` - The AccountId of the coldkey that owns both hotkeys.
+    /// * `weight` - A mutable reference to the Weight, updated as operations are performed.
+    ///
+    /// # Returns
+    /// * `DispatchResult` - Ok(()) if the swap was successful, or an error if any operation failed.
+    ///
+    /// # Note
+    /// This function performs extensive storage reads and writes, which can be computationally expensive.
+    /// The accumulated weight should be carefully considered in the context of block limits.
+    pub fn perform_hotkey_swap(
+        old_hotkey: &T::AccountId,
+        new_hotkey: &T::AccountId,
+        coldkey: &T::AccountId,
+        weight: &mut Weight,
+    ) -> DispatchResult {
+        // 1. Swap owner.
+        // Owner( hotkey ) -> coldkey -- the coldkey that owns the hotkey.
+        Owner::<T>::remove(old_hotkey);
+        Owner::<T>::insert(new_hotkey, coldkey.clone());
+        weight.saturating_accrue(T::DbWeight::get().reads_writes(1, 1));
+
+        // 2. Swap OwnedHotkeys.
+        // OwnedHotkeys( coldkey ) -> Vec<hotkey> -- the hotkeys that the coldkey owns.
+        let mut hotkeys = OwnedHotkeys::<T>::get(coldkey);
+        // Add the new key if needed.
+        if !hotkeys.contains(new_hotkey) {
+            hotkeys.push(new_hotkey.clone());
+        }
+        // Remove the old key.
+        hotkeys.retain(|hk| *hk != *old_hotkey);
+        OwnedHotkeys::<T>::insert(coldkey, hotkeys);
+        weight.saturating_accrue(T::DbWeight::get().reads_writes(1, 1));
+
+        // 3. Swap total hotkey stake.
+        // TotalHotkeyStake( hotkey ) -> stake -- the total stake that the hotkey has across all delegates.
+        let old_total_hotkey_stake = TotalHotkeyStake::<T>::get(old_hotkey); // Get the old total hotkey stake.
+        let new_total_hotkey_stake = TotalHotkeyStake::<T>::get(new_hotkey); // Get the new total hotkey stake.
+        TotalHotkeyStake::<T>::remove(old_hotkey); // Remove the old total hotkey stake.
+        TotalHotkeyStake::<T>::insert(
+            new_hotkey,
+            old_total_hotkey_stake.saturating_add(new_total_hotkey_stake),
+        ); // Insert the new total hotkey stake via the addition.
+        weight.saturating_accrue(T::DbWeight::get().reads_writes(2, 2));
+
+        // 4. Swap total hotkey stakes.
+        // TotalHotkeyColdkeyStakesThisInterval( hotkey ) --> (u64: stakes, u64: block_number)
+        let stake_tuples: Vec<(T::AccountId, (u64, u64))> =
+            TotalHotkeyColdkeyStakesThisInterval::<T>::iter_prefix(old_hotkey).collect();
+        for (coldkey, stake_tup) in stake_tuples {
+            // NOTE: You could use this to increase your allowed stake operations but this would cost.
+            TotalHotkeyColdkeyStakesThisInterval::<T>::insert(new_hotkey, &coldkey, stake_tup);
+            TotalHotkeyColdkeyStakesThisInterval::<T>::remove(old_hotkey, &coldkey);
+            weight.saturating_accrue(T::DbWeight::get().reads_writes(1, 2));
+        }
+
+        // 5. Swap LastTxBlock
+        // LastTxBlock( hotkey ) --> u64 -- the last transaction block for the hotkey.
+        LastTxBlock::<T>::remove(old_hotkey);
+        LastTxBlock::<T>::insert(new_hotkey, Self::get_current_block_as_u64());
+        weight.saturating_accrue(T::DbWeight::get().reads_writes(0, 2));
+
+        // 6. Swap LastTxBlockDelegateTake
+        // LastTxBlockDelegateTake( hotkey ) --> u64 -- the last transaction block for the hotkey delegate take.
+        LastTxBlockDelegateTake::<T>::remove(old_hotkey);
+        LastTxBlockDelegateTake::<T>::insert(new_hotkey, Self::get_current_block_as_u64());
+        weight.saturating_accrue(T::DbWeight::get().reads_writes(1, 2));
+
+        // 7. Swap Senate members.
+        // Senate( hotkey ) --> ?
+        if T::SenateMembers::is_member(old_hotkey) {
+            T::SenateMembers::swap_member(old_hotkey, new_hotkey).map_err(|e| e.error)?;
+            weight.saturating_accrue(T::DbWeight::get().reads_writes(1, 2));
+        }
+
+        // 8. Swap delegates.
+        // Delegates( hotkey ) -> take value -- the hotkey delegate take value.
+        let old_delegate_take = Delegates::<T>::get(old_hotkey);
+        Delegates::<T>::remove(old_hotkey); // Remove the old delegate take.
+        Delegates::<T>::insert(new_hotkey, old_delegate_take); // Insert the new delegate take.
+        weight.saturating_accrue(T::DbWeight::get().reads_writes(1, 2));
+
+        // 9. Swap all subnet specific info.
+        let all_netuids: Vec<u16> = Self::get_all_subnet_netuids();
+        for netuid in all_netuids {
+            // 9.1 Remove the previous hotkey and insert the new hotkey from membership.
+            // IsNetworkMember( hotkey, netuid ) -> bool -- is the hotkey a subnet member.
+            let is_network_member: bool = IsNetworkMember::<T>::get(old_hotkey, netuid);
+            IsNetworkMember::<T>::remove(old_hotkey, netuid);
+            IsNetworkMember::<T>::insert(new_hotkey, netuid, is_network_member);
+            weight.saturating_accrue(T::DbWeight::get().reads_writes(1, 2));
+
+            // 9.2 Swap Uids + Keys.
+            // Keys( netuid, hotkey ) -> uid -- the uid the hotkey has in the network if it is a member.
+            // Uids( netuid, hotkey ) -> uid -- the uids that the hotkey has.
+            if is_network_member {
+                // 9.2.1 Swap the UIDS
+                if let Ok(old_uid) = Uids::<T>::try_get(netuid, old_hotkey) {
+                    Uids::<T>::remove(netuid, old_hotkey);
+                    Uids::<T>::insert(netuid, new_hotkey, old_uid);
+                    weight.saturating_accrue(T::DbWeight::get().reads_writes(1, 2));
+
+                    // 9.2.2 Swap the keys.
+                    Keys::<T>::insert(netuid, old_uid, new_hotkey.clone());
+                    weight.saturating_accrue(T::DbWeight::get().reads_writes(0, 1));
+                }
+            }
+
+            // 9.3 Swap Prometheus.
+            // Prometheus( netuid, hotkey ) -> prometheus -- the prometheus data that a hotkey has in the network.
+            if is_network_member {
+                if let Ok(old_prometheus_info) = Prometheus::<T>::try_get(netuid, old_hotkey) {
+                    Prometheus::<T>::remove(netuid, old_hotkey);
+                    Prometheus::<T>::insert(netuid, new_hotkey, old_prometheus_info);
+                    weight.saturating_accrue(T::DbWeight::get().reads_writes(1, 2));
+                }
+            }
+
+            // 9.4. Swap axons.
+            // Axons( netuid, hotkey ) -> axon -- the axon that the hotkey has.
+            if is_network_member {
+                if let Ok(old_axon_info) = Axons::<T>::try_get(netuid, old_hotkey) {
+                    Axons::<T>::remove(netuid, old_hotkey);
+                    Axons::<T>::insert(netuid, new_hotkey, old_axon_info);
+                    weight.saturating_accrue(T::DbWeight::get().reads_writes(1, 2));
+                }
+            }
+
+            // 9.5 Swap WeightCommits
+            // WeightCommits( hotkey ) --> Vec<u64> -- the weight commits for the hotkey.
+            if is_network_member {
+                if let Ok(old_weight_commits) = WeightCommits::<T>::try_get(netuid, old_hotkey) {
+                    WeightCommits::<T>::remove(netuid, old_hotkey);
+                    WeightCommits::<T>::insert(netuid, new_hotkey, old_weight_commits);
+                    weight.saturating_accrue(T::DbWeight::get().reads_writes(1, 2));
+                }
+            }
+
+            // 9.6. Swap the subnet loaded emission.
+            // LoadedEmission( netuid ) --> Vec<(hotkey, u64)> -- the loaded emission for the subnet.
+            if is_network_member {
+                if let Some(mut old_loaded_emission) = LoadedEmission::<T>::get(netuid) {
+                    for emission in old_loaded_emission.iter_mut() {
+                        if emission.0 == *old_hotkey {
+                            emission.0 = new_hotkey.clone();
+                        }
+                    }
+                    LoadedEmission::<T>::remove(netuid);
+                    LoadedEmission::<T>::insert(netuid, old_loaded_emission);
+                    weight.saturating_accrue(T::DbWeight::get().reads_writes(1, 2));
+                }
+            }
+        }
+
+        // 10. Swap Stake.
+        // Stake( hotkey, coldkey ) -> stake -- the stake that the hotkey controls on behalf of the coldkey.
+        let stakes: Vec<(T::AccountId, u64)> = Stake::<T>::iter_prefix(old_hotkey).collect();
+        // Clear the entire old prefix here.
+        let _ = Stake::<T>::clear_prefix(old_hotkey, stakes.len() as u32, None);
+        // Iterate over all the staking rows and insert them into the new hotkey.
+        for (coldkey, old_stake_amount) in stakes {
+            weight.saturating_accrue(T::DbWeight::get().reads(1));
+
+            // Swap Stake value
+            // Stake( hotkey, coldkey ) -> stake -- the stake that the hotkey controls on behalf of the coldkey.
+            // Get the new stake value.
+            let new_stake_value: u64 = Stake::<T>::get(new_hotkey, &coldkey);
+            // Insert the new stake value.
+            Stake::<T>::insert(
+                new_hotkey,
+                &coldkey,
+                new_stake_value.saturating_add(old_stake_amount),
+            );
+            weight.saturating_accrue(T::DbWeight::get().reads_writes(1, 1));
+
+            // Swap StakingHotkeys.
+            // StakingHotkeys( coldkey ) --> Vec<hotkey> -- the hotkeys that the coldkey stakes.
+            let mut staking_hotkeys = StakingHotkeys::<T>::get(&coldkey);
+            staking_hotkeys.retain(|hk| *hk != *old_hotkey && *hk != *new_hotkey);
+            staking_hotkeys.push(new_hotkey.clone());
+            StakingHotkeys::<T>::insert(coldkey.clone(), staking_hotkeys);
+            weight.saturating_accrue(T::DbWeight::get().reads_writes(1, 1));
+        }
+
+        // Return successful after swapping all the relevant terms.
+        Ok(())
+    }
+
+    pub fn swap_senate_member(
+        old_hotkey: &T::AccountId,
+        new_hotkey: &T::AccountId,
+        weight: &mut Weight,
+    ) -> DispatchResult {
+        weight.saturating_accrue(T::DbWeight::get().reads(1));
+        if T::SenateMembers::is_member(old_hotkey) {
+            T::SenateMembers::swap_member(old_hotkey, new_hotkey).map_err(|e| e.error)?;
+            weight.saturating_accrue(T::DbWeight::get().reads_writes(1, 2));
+        }
+        Ok(())
+    }
+}
diff --git a/pallets/subtensor/tests/mock.rs b/pallets/subtensor/tests/mock.rs
index fc784f46f..aa2c4ad30 100644
--- a/pallets/subtensor/tests/mock.rs
+++ b/pallets/subtensor/tests/mock.rs
@@ -1,12 +1,13 @@
 #![allow(clippy::arithmetic_side_effects, clippy::unwrap_used)]
-use frame_support::derive_impl;
-use frame_support::dispatch::DispatchResultWithPostInfo;
-use frame_support::weights::constants::RocksDbWeight;
+
 // use frame_support::weights::constants::WEIGHT_PER_SECOND;
 use frame_support::weights::Weight;
 use frame_support::{
-    assert_ok, parameter_types,
+    assert_ok, derive_impl,
+    dispatch::DispatchResultWithPostInfo,
+    parameter_types,
     traits::{Everything, Hooks},
+    weights::constants::RocksDbWeight,
 };
 use frame_system as system;
 use frame_system::{limits, EnsureNever, EnsureRoot, RawOrigin};
diff --git a/pallets/subtensor/tests/swap.rs b/pallets/subtensor/tests/swap.rs
index 21c3a983a..0a3a85dff 100644
--- a/pallets/subtensor/tests/swap.rs
+++ b/pallets/subtensor/tests/swap.rs
@@ -9,1070 +9,6 @@ use mock::*;
 use pallet_subtensor::*;
 use sp_core::U256;
 
-#[test]
-fn test_do_swap_hotkey_ok() {
-    new_test_ext(1).execute_with(|| {
-        let netuid: u16 = 1;
-        let tempo: u16 = 13;
-        let old_hotkey = U256::from(1);
-        let new_hotkey = U256::from(2);
-        let coldkey = U256::from(3);
-        let swap_cost = 1_000_000_000u64;
-
-        // Setup initial state
-        add_network(netuid, tempo, 0);
-        register_ok_neuron(netuid, old_hotkey, coldkey, 0);
-        SubtensorModule::add_balance_to_coldkey_account(&coldkey, swap_cost);
-
-        // Perform the swap
-        assert_ok!(SubtensorModule::do_swap_hotkey(
-            <<Test as Config>::RuntimeOrigin>::signed(coldkey),
-            &old_hotkey,
-            &new_hotkey
-        ));
-
-        // Verify the swap
-        assert_eq!(
-            SubtensorModule::get_owning_coldkey_for_hotkey(&new_hotkey),
-            coldkey
-        );
-        assert_ne!(
-            SubtensorModule::get_owning_coldkey_for_hotkey(&old_hotkey),
-            coldkey
-        );
-
-        // Verify other storage changes
-        assert_eq!(
-            SubtensorModule::get_total_stake_for_hotkey(&new_hotkey),
-            SubtensorModule::get_total_stake_for_hotkey(&old_hotkey)
-        );
-        assert_eq!(
-            SubtensorModule::get_delegate(new_hotkey.encode()),
-            SubtensorModule::get_delegate(old_hotkey.encode())
-        );
-        assert_eq!(
-            SubtensorModule::get_last_tx_block(&new_hotkey),
-            SubtensorModule::get_last_tx_block(&old_hotkey)
-        );
-
-        // Verify raw storage maps
-        // Stake
-        for (coldkey, stake_amount) in Stake::<Test>::iter_prefix(old_hotkey) {
-            assert_eq!(Stake::<Test>::get(new_hotkey, coldkey), stake_amount);
-        }
-
-        let mut weight = Weight::zero();
-        // UIDs
-        for netuid in SubtensorModule::get_netuid_is_member(&old_hotkey, &mut weight) {
-            assert_eq!(
-                Uids::<Test>::get(netuid, new_hotkey),
-                Uids::<Test>::get(netuid, old_hotkey)
-            );
-        }
-
-        // Prometheus
-        for netuid in SubtensorModule::get_netuid_is_member(&old_hotkey, &mut weight) {
-            assert_eq!(
-                Prometheus::<Test>::get(netuid, new_hotkey),
-                Prometheus::<Test>::get(netuid, old_hotkey)
-            );
-        }
-
-        // LoadedEmission
-        for netuid in SubtensorModule::get_netuid_is_member(&old_hotkey, &mut weight) {
-            assert_eq!(
-                LoadedEmission::<Test>::get(netuid).unwrap(),
-                LoadedEmission::<Test>::get(netuid).unwrap()
-            );
-        }
-
-        // IsNetworkMember
-        for netuid in SubtensorModule::get_netuid_is_member(&old_hotkey, &mut weight) {
-            assert!(IsNetworkMember::<Test>::contains_key(new_hotkey, netuid));
-            assert!(!IsNetworkMember::<Test>::contains_key(old_hotkey, netuid));
-        }
-
-        // Owner
-        assert_eq!(Owner::<Test>::get(new_hotkey), coldkey);
-
-        // TotalHotkeyStake
-        assert_eq!(
-            TotalHotkeyStake::<Test>::get(new_hotkey),
-            TotalHotkeyStake::<Test>::get(old_hotkey)
-        );
-
-        // Delegates
-        assert_eq!(
-            Delegates::<Test>::get(new_hotkey),
-            Delegates::<Test>::get(old_hotkey)
-        );
-
-        // LastTxBlock
-        assert_eq!(
-            LastTxBlock::<Test>::get(new_hotkey),
-            LastTxBlock::<Test>::get(old_hotkey)
-        );
-
-        // Axons
-        for netuid in SubtensorModule::get_netuid_is_member(&old_hotkey, &mut weight) {
-            assert_eq!(
-                Axons::<Test>::get(netuid, new_hotkey),
-                Axons::<Test>::get(netuid, old_hotkey)
-            );
-        }
-
-        // TotalHotkeyColdkeyStakesThisInterval
-        assert_eq!(
-            TotalHotkeyColdkeyStakesThisInterval::<Test>::get(new_hotkey, coldkey),
-            TotalHotkeyColdkeyStakesThisInterval::<Test>::get(old_hotkey, coldkey)
-        );
-    });
-}
-
-#[test]
-fn test_do_swap_hotkey_ok_robust() {
-    new_test_ext(1).execute_with(|| {
-        let num_subnets: u16 = 10;
-        let tempo: u16 = 13;
-        let swap_cost = 1_000_000_000u64;
-
-        // Create 10 sets of keys
-        let mut old_hotkeys = vec![];
-        let mut new_hotkeys = vec![];
-        let mut coldkeys = vec![];
-
-        for i in 0..10 {
-            old_hotkeys.push(U256::from(i * 2 + 1));
-            new_hotkeys.push(U256::from(i * 2 + 2));
-            coldkeys.push(U256::from(i * 2 + 11));
-        }
-
-        // Setup initial state
-        for netuid in 1..=num_subnets {
-            add_network(netuid, tempo, 0);
-            SubtensorModule::set_max_registrations_per_block(netuid, 20);
-            SubtensorModule::set_target_registrations_per_interval(netuid, 1000);
-            log::info!(
-                "Registrations this interval for netuid {:?} is {:?}",
-                netuid,
-                SubtensorModule::get_target_registrations_per_interval(netuid)
-            );
-            for i in 0..10 {
-                register_ok_neuron(netuid, old_hotkeys[i], coldkeys[i], 0);
-            }
-        }
-
-        // Add balance to coldkeys for swap cost
-        for coldkey in coldkeys.iter().take(10) {
-            SubtensorModule::add_balance_to_coldkey_account(coldkey, swap_cost);
-        }
-
-        // Add old_hotkeys[0] and old_hotkeys[1] to Senate
-        assert_ok!(SenateMembers::add_member(
-            RawOrigin::Root.into(),
-            old_hotkeys[0]
-        ));
-        assert_ok!(SenateMembers::add_member(
-            RawOrigin::Root.into(),
-            old_hotkeys[1]
-        ));
-
-        // Verify initial Senate membership
-        assert!(Senate::is_member(&old_hotkeys[0]));
-        assert!(Senate::is_member(&old_hotkeys[1]));
-        assert!(!Senate::is_member(&new_hotkeys[0]));
-        assert!(!Senate::is_member(&new_hotkeys[1]));
-
-        // Perform the swaps for only two hotkeys
-        assert_ok!(SubtensorModule::do_swap_hotkey(
-            <<Test as Config>::RuntimeOrigin>::signed(coldkeys[0]),
-            &old_hotkeys[0],
-            &new_hotkeys[0]
-        ));
-        assert_ok!(SubtensorModule::do_swap_hotkey(
-            <<Test as Config>::RuntimeOrigin>::signed(coldkeys[1]),
-            &old_hotkeys[1],
-            &new_hotkeys[1]
-        ));
-
-        // Verify the swaps
-        for netuid in 1..=num_subnets {
-            for i in 0..10 {
-                if i == 0 || i == 1 {
-                    assert_eq!(
-                        SubtensorModule::get_owning_coldkey_for_hotkey(&new_hotkeys[i]),
-                        coldkeys[i]
-                    );
-                    assert_ne!(
-                        SubtensorModule::get_owning_coldkey_for_hotkey(&old_hotkeys[i]),
-                        coldkeys[i]
-                    );
-
-                    // Verify other storage changes
-                    assert_eq!(
-                        SubtensorModule::get_total_stake_for_hotkey(&new_hotkeys[i]),
-                        SubtensorModule::get_total_stake_for_hotkey(&old_hotkeys[i])
-                    );
-
-                    assert_eq!(
-                        SubtensorModule::get_delegate(new_hotkeys[i].encode()),
-                        SubtensorModule::get_delegate(old_hotkeys[i].encode())
-                    );
-
-                    assert_eq!(
-                        SubtensorModule::get_last_tx_block(&new_hotkeys[i]),
-                        SubtensorModule::get_last_tx_block(&old_hotkeys[i])
-                    );
-
-                    // Verify raw storage maps
-                    // Stake
-                    for (coldkey, stake_amount) in Stake::<Test>::iter_prefix(old_hotkeys[i]) {
-                        assert_eq!(Stake::<Test>::get(new_hotkeys[i], coldkey), stake_amount);
-                    }
-
-                    let mut weight = Weight::zero();
-                    // UIDs
-                    for netuid in
-                        SubtensorModule::get_netuid_is_member(&old_hotkeys[i], &mut weight)
-                    {
-                        assert_eq!(
-                            Uids::<Test>::get(netuid, new_hotkeys[i]),
-                            Uids::<Test>::get(netuid, old_hotkeys[i])
-                        );
-                    }
-
-                    // Prometheus
-                    for netuid in
-                        SubtensorModule::get_netuid_is_member(&old_hotkeys[i], &mut weight)
-                    {
-                        assert_eq!(
-                            Prometheus::<Test>::get(netuid, new_hotkeys[i]),
-                            Prometheus::<Test>::get(netuid, old_hotkeys[i])
-                        );
-                    }
-
-                    // LoadedEmission
-                    for netuid in
-                        SubtensorModule::get_netuid_is_member(&old_hotkeys[i], &mut weight)
-                    {
-                        assert_eq!(
-                            LoadedEmission::<Test>::get(netuid).unwrap(),
-                            LoadedEmission::<Test>::get(netuid).unwrap()
-                        );
-                    }
-
-                    // IsNetworkMember
-                    for netuid in
-                        SubtensorModule::get_netuid_is_member(&old_hotkeys[i], &mut weight)
-                    {
-                        assert!(IsNetworkMember::<Test>::contains_key(
-                            new_hotkeys[i],
-                            netuid
-                        ));
-                        assert!(!IsNetworkMember::<Test>::contains_key(
-                            old_hotkeys[i],
-                            netuid
-                        ));
-                    }
-
-                    // Owner
-                    assert_eq!(Owner::<Test>::get(new_hotkeys[i]), coldkeys[i]);
-
-                    // Keys
-                    for (uid, hotkey) in Keys::<Test>::iter_prefix(netuid) {
-                        if hotkey == old_hotkeys[i] {
-                            assert_eq!(Keys::<Test>::get(netuid, uid), new_hotkeys[i]);
-                        }
-                    }
-
-                    // Verify Senate membership swap
-                    assert!(!Senate::is_member(&old_hotkeys[i]));
-                    assert!(Senate::is_member(&new_hotkeys[i]));
-                } else {
-                    // Ensure other hotkeys remain unchanged
-                    assert_eq!(
-                        SubtensorModule::get_owning_coldkey_for_hotkey(&old_hotkeys[i]),
-                        coldkeys[i]
-                    );
-                    assert_ne!(
-                        SubtensorModule::get_owning_coldkey_for_hotkey(&new_hotkeys[i]),
-                        coldkeys[i]
-                    );
-
-                    // Verify Senate membership remains unchanged for other hotkeys
-                    assert!(!Senate::is_member(&old_hotkeys[i]));
-                    assert!(!Senate::is_member(&new_hotkeys[i]));
-                }
-            }
-        }
-    });
-}
-
-#[test]
-fn test_swap_hotkey_tx_rate_limit_exceeded() {
-    new_test_ext(1).execute_with(|| {
-        let netuid: u16 = 1;
-        let tempo: u16 = 13;
-        let old_hotkey = U256::from(1);
-        let new_hotkey_1 = U256::from(2);
-        let new_hotkey_2 = U256::from(4);
-        let coldkey = U256::from(3);
-        let swap_cost = 1_000_000_000u64 * 2;
-
-        let tx_rate_limit = 1;
-
-        // Get the current transaction rate limit
-        let current_tx_rate_limit = SubtensorModule::get_tx_rate_limit();
-        log::info!("current_tx_rate_limit: {:?}", current_tx_rate_limit);
-
-        // Set the transaction rate limit
-        SubtensorModule::set_tx_rate_limit(tx_rate_limit);
-        // assert the rate limit is set to 1000 blocks
-        assert_eq!(SubtensorModule::get_tx_rate_limit(), tx_rate_limit);
-
-        // Setup initial state
-        add_network(netuid, tempo, 0);
-        register_ok_neuron(netuid, old_hotkey, coldkey, 0);
-        SubtensorModule::add_balance_to_coldkey_account(&coldkey, swap_cost);
-
-        // Perform the first swap
-        assert_ok!(SubtensorModule::do_swap_hotkey(
-            <<Test as Config>::RuntimeOrigin>::signed(coldkey),
-            &old_hotkey,
-            &new_hotkey_1
-        ));
-
-        // Attempt to perform another swap immediately, which should fail due to rate limit
-        assert_err!(
-            SubtensorModule::do_swap_hotkey(
-                <<Test as Config>::RuntimeOrigin>::signed(coldkey),
-                &new_hotkey_1,
-                &new_hotkey_2
-            ),
-            Error::<Test>::HotKeySetTxRateLimitExceeded
-        );
-
-        // move in time past the rate limit
-        step_block(1001);
-        assert_ok!(SubtensorModule::do_swap_hotkey(
-            <<Test as Config>::RuntimeOrigin>::signed(coldkey),
-            &new_hotkey_1,
-            &new_hotkey_2
-        ));
-    });
-}
-
-#[test]
-fn test_do_swap_hotkey_err_not_owner() {
-    new_test_ext(1).execute_with(|| {
-        let netuid: u16 = 1;
-        let tempo: u16 = 13;
-        let old_hotkey = U256::from(1);
-        let new_hotkey = U256::from(2);
-        let coldkey = U256::from(3);
-        let not_owner_coldkey = U256::from(4);
-        let swap_cost = 1_000_000_000u64;
-
-        // Setup initial state
-        add_network(netuid, tempo, 0);
-        register_ok_neuron(netuid, old_hotkey, coldkey, 0);
-        SubtensorModule::add_balance_to_coldkey_account(&not_owner_coldkey, swap_cost);
-
-        // Attempt the swap with a non-owner coldkey
-        assert_err!(
-            SubtensorModule::do_swap_hotkey(
-                <<Test as Config>::RuntimeOrigin>::signed(not_owner_coldkey),
-                &old_hotkey,
-                &new_hotkey
-            ),
-            Error::<Test>::NonAssociatedColdKey
-        );
-    });
-}
-
-#[test]
-fn test_swap_owner_success() {
-    new_test_ext(1).execute_with(|| {
-        let old_hotkey = U256::from(1);
-        let new_hotkey = U256::from(2);
-        let coldkey = U256::from(3);
-        let mut weight = Weight::zero();
-
-        // Initialize Owner for old_hotkey
-        Owner::<Test>::insert(old_hotkey, coldkey);
-
-        // Perform the swap
-        SubtensorModule::swap_owner(&old_hotkey, &new_hotkey, &coldkey, &mut weight);
-
-        // Verify the swap
-        assert_eq!(Owner::<Test>::get(new_hotkey), coldkey);
-        assert!(!Owner::<Test>::contains_key(old_hotkey));
-    });
-}
-
-#[test]
-fn test_swap_owner_old_hotkey_not_exist() {
-    new_test_ext(1).execute_with(|| {
-        let old_hotkey = U256::from(1);
-        let new_hotkey = U256::from(2);
-        let coldkey = U256::from(3);
-        let mut weight = Weight::zero();
-
-        // Ensure old_hotkey does not exist
-        assert!(!Owner::<Test>::contains_key(old_hotkey));
-
-        // Perform the swap
-        SubtensorModule::swap_owner(&old_hotkey, &new_hotkey, &coldkey, &mut weight);
-
-        // Verify the swap
-        assert_eq!(Owner::<Test>::get(new_hotkey), coldkey);
-        assert!(!Owner::<Test>::contains_key(old_hotkey));
-    });
-}
-
-#[test]
-fn test_swap_owner_new_hotkey_already_exists() {
-    new_test_ext(1).execute_with(|| {
-        let old_hotkey = U256::from(1);
-        let new_hotkey = U256::from(2);
-        let coldkey = U256::from(3);
-        let another_coldkey = U256::from(4);
-        let mut weight = Weight::zero();
-
-        // Initialize Owner for old_hotkey and new_hotkey
-        Owner::<Test>::insert(old_hotkey, coldkey);
-        Owner::<Test>::insert(new_hotkey, another_coldkey);
-
-        // Perform the swap
-        SubtensorModule::swap_owner(&old_hotkey, &new_hotkey, &coldkey, &mut weight);
-
-        // Verify the swap
-        assert_eq!(Owner::<Test>::get(new_hotkey), coldkey);
-        assert!(!Owner::<Test>::contains_key(old_hotkey));
-    });
-}
-
-#[test]
-fn test_swap_owner_weight_update() {
-    new_test_ext(1).execute_with(|| {
-        let old_hotkey = U256::from(1);
-        let new_hotkey = U256::from(2);
-        let coldkey = U256::from(3);
-        let mut weight = Weight::zero();
-
-        // Initialize Owner for old_hotkey
-        Owner::<Test>::insert(old_hotkey, coldkey);
-
-        // Perform the swap
-        SubtensorModule::swap_owner(&old_hotkey, &new_hotkey, &coldkey, &mut weight);
-
-        // Verify the weight update
-        let expected_weight = <Test as frame_system::Config>::DbWeight::get().writes(2);
-        assert_eq!(weight, expected_weight);
-    });
-}
-
-#[test]
-fn test_swap_total_hotkey_stake_success() {
-    new_test_ext(1).execute_with(|| {
-        let old_hotkey = U256::from(1);
-        let new_hotkey = U256::from(2);
-        let total_stake = 1000u64;
-        let mut weight = Weight::zero();
-
-        // Initialize TotalHotkeyStake for old_hotkey
-        TotalHotkeyStake::<Test>::insert(old_hotkey, total_stake);
-
-        // Perform the swap
-        SubtensorModule::swap_total_hotkey_stake(&old_hotkey, &new_hotkey, &mut weight);
-
-        // Verify the swap
-        assert_eq!(TotalHotkeyStake::<Test>::get(new_hotkey), total_stake);
-        assert!(!TotalHotkeyStake::<Test>::contains_key(old_hotkey));
-    });
-}
-
-#[test]
-fn test_swap_total_hotkey_stake_old_hotkey_not_exist() {
-    new_test_ext(1).execute_with(|| {
-        let old_hotkey = U256::from(1);
-        let new_hotkey = U256::from(2);
-        let mut weight = Weight::zero();
-
-        // Ensure old_hotkey does not exist
-        assert!(!TotalHotkeyStake::<Test>::contains_key(old_hotkey));
-
-        // Perform the swap
-        SubtensorModule::swap_total_hotkey_stake(&old_hotkey, &new_hotkey, &mut weight);
-
-        // Verify that new_hotkey does not have a stake
-        assert!(!TotalHotkeyStake::<Test>::contains_key(new_hotkey));
-    });
-}
-
-#[test]
-fn test_swap_total_hotkey_stake_weight_update() {
-    new_test_ext(1).execute_with(|| {
-        let old_hotkey = U256::from(1);
-        let new_hotkey = U256::from(2);
-        let total_stake = 1000u64;
-        let mut weight = Weight::zero();
-
-        // Initialize TotalHotkeyStake for old_hotkey
-        TotalHotkeyStake::<Test>::insert(old_hotkey, total_stake);
-
-        // Perform the swap
-        SubtensorModule::swap_total_hotkey_stake(&old_hotkey, &new_hotkey, &mut weight);
-
-        // Verify the weight update
-        let expected_weight = <Test as frame_system::Config>::DbWeight::get().reads_writes(1, 2);
-        assert_eq!(weight, expected_weight);
-    });
-}
-
-#[test]
-fn test_swap_delegates_success() {
-    new_test_ext(1).execute_with(|| {
-        let old_hotkey = U256::from(1);
-        let new_hotkey = U256::from(2);
-        let delegate_take = 10u16;
-        let mut weight = Weight::zero();
-
-        // Initialize Delegates for old_hotkey
-        Delegates::<Test>::insert(old_hotkey, delegate_take);
-
-        // Perform the swap
-        SubtensorModule::swap_delegates(&old_hotkey, &new_hotkey, &mut weight);
-
-        // Verify the swap
-        assert_eq!(Delegates::<Test>::get(new_hotkey), delegate_take);
-        assert!(!Delegates::<Test>::contains_key(old_hotkey));
-    });
-}
-
-#[test]
-fn test_swap_delegates_old_hotkey_not_exist() {
-    new_test_ext(1).execute_with(|| {
-        let old_hotkey = U256::from(1);
-        let new_hotkey = U256::from(2);
-        let mut weight = Weight::zero();
-
-        // Ensure old_hotkey does not exist
-        assert!(!Delegates::<Test>::contains_key(old_hotkey));
-
-        // Perform the swap
-        SubtensorModule::swap_delegates(&old_hotkey, &new_hotkey, &mut weight);
-
-        // Verify that new_hotkey does not have a delegate
-        assert!(!Delegates::<Test>::contains_key(new_hotkey));
-    });
-}
-
-#[test]
-fn test_swap_delegates_weight_update() {
-    new_test_ext(1).execute_with(|| {
-        let old_hotkey = U256::from(1);
-        let new_hotkey = U256::from(2);
-        let delegate_take = 10u16;
-        let mut weight = Weight::zero();
-
-        // Initialize Delegates for old_hotkey
-        Delegates::<Test>::insert(old_hotkey, delegate_take);
-
-        // Perform the swap
-        SubtensorModule::swap_delegates(&old_hotkey, &new_hotkey, &mut weight);
-
-        // Verify the weight update
-        let expected_weight = <Test as frame_system::Config>::DbWeight::get().reads_writes(1, 2);
-        assert_eq!(weight, expected_weight);
-    });
-}
-
-#[test]
-fn test_swap_stake_success() {
-    new_test_ext(1).execute_with(|| {
-        let old_hotkey = U256::from(1);
-        let new_hotkey = U256::from(2);
-        let coldkey = U256::from(3);
-        let stake_amount = 1000u64;
-        let mut weight = Weight::zero();
-
-        // Initialize Stake for old_hotkey
-        Stake::<Test>::insert(old_hotkey, coldkey, stake_amount);
-
-        // Perform the swap
-        SubtensorModule::swap_stake(&old_hotkey, &new_hotkey, &mut weight);
-
-        // Verify the swap
-        assert_eq!(Stake::<Test>::get(new_hotkey, coldkey), stake_amount);
-        assert!(!Stake::<Test>::contains_key(old_hotkey, coldkey));
-    });
-}
-
-#[test]
-fn test_swap_stake_old_hotkey_not_exist() {
-    new_test_ext(1).execute_with(|| {
-        let old_hotkey = U256::from(1);
-        let new_hotkey = U256::from(2);
-        let coldkey = U256::from(3);
-        let stake_amount = 1000u64;
-        let mut weight = Weight::zero();
-
-        // Initialize Stake for old_hotkey
-        Stake::<Test>::insert(old_hotkey, coldkey, stake_amount);
-
-        // Ensure old_hotkey has a stake
-        assert!(Stake::<Test>::contains_key(old_hotkey, coldkey));
-
-        // Perform the swap
-        SubtensorModule::swap_stake(&old_hotkey, &new_hotkey, &mut weight);
-
-        // Verify that new_hotkey has the stake and old_hotkey does not
-        assert!(Stake::<Test>::contains_key(new_hotkey, coldkey));
-        assert!(!Stake::<Test>::contains_key(old_hotkey, coldkey));
-    });
-}
-
-#[test]
-fn test_swap_stake_weight_update() {
-    new_test_ext(1).execute_with(|| {
-        let old_hotkey = U256::from(1);
-        let new_hotkey = U256::from(2);
-        let coldkey = U256::from(3);
-        let stake_amount = 1000u64;
-        let mut weight = Weight::zero();
-
-        // Initialize Stake for old_hotkey
-        Stake::<Test>::insert(old_hotkey, coldkey, stake_amount);
-
-        // Perform the swap
-        SubtensorModule::swap_stake(&old_hotkey, &new_hotkey, &mut weight);
-
-        // Verify the weight update
-        let expected_weight = <Test as frame_system::Config>::DbWeight::get().writes(4);
-        assert_eq!(weight, expected_weight);
-    });
-}
-
-#[test]
-fn test_swap_is_network_member_success() {
-    new_test_ext(1).execute_with(|| {
-        let old_hotkey = U256::from(1);
-        let new_hotkey = U256::from(2);
-        let netuid_is_member = vec![1u16, 2u16];
-        let mut weight = Weight::zero();
-
-        // Initialize IsNetworkMember for old_hotkey
-        for netuid in &netuid_is_member {
-            IsNetworkMember::<Test>::insert(old_hotkey, netuid, true);
-        }
-
-        // Perform the swap
-        SubtensorModule::swap_is_network_member(
-            &old_hotkey,
-            &new_hotkey,
-            &netuid_is_member,
-            &mut weight,
-        );
-
-        // Verify the swap
-        for netuid in &netuid_is_member {
-            assert!(IsNetworkMember::<Test>::contains_key(new_hotkey, netuid));
-            assert!(!IsNetworkMember::<Test>::contains_key(old_hotkey, netuid));
-        }
-    });
-}
-
-#[test]
-fn test_swap_is_network_member_weight_update() {
-    new_test_ext(1).execute_with(|| {
-        let old_hotkey = U256::from(1);
-        let new_hotkey = U256::from(2);
-        let netuid_is_member = vec![1u16, 2u16];
-        let mut weight = Weight::zero();
-
-        // Initialize IsNetworkMember for old_hotkey
-        for netuid in &netuid_is_member {
-            IsNetworkMember::<Test>::insert(old_hotkey, netuid, true);
-        }
-
-        // Perform the swap
-        SubtensorModule::swap_is_network_member(
-            &old_hotkey,
-            &new_hotkey,
-            &netuid_is_member,
-            &mut weight,
-        );
-
-        // Verify the weight update
-        let expected_weight = <Test as frame_system::Config>::DbWeight::get().writes(4);
-        assert_eq!(weight, expected_weight);
-    });
-}
-
-#[test]
-fn test_swap_axons_success() {
-    new_test_ext(1).execute_with(|| {
-        let old_hotkey = U256::from(1);
-        let new_hotkey = U256::from(2);
-        let netuid_is_member = vec![1u16, 2u16];
-        let axon_info = AxonInfo {
-            block: 100,
-            version: 1,
-            ip: 0x1234567890abcdef,
-            port: 8080,
-            ip_type: 4,
-            protocol: 1,
-            placeholder1: 0,
-            placeholder2: 0,
-        };
-        let mut weight = Weight::zero();
-
-        // Initialize Axons for old_hotkey
-        for netuid in &netuid_is_member {
-            Axons::<Test>::insert(netuid, old_hotkey, axon_info.clone());
-        }
-
-        // Perform the swap
-        SubtensorModule::swap_axons(&old_hotkey, &new_hotkey, &netuid_is_member, &mut weight);
-
-        // Verify the swap
-        for netuid in &netuid_is_member {
-            assert_eq!(Axons::<Test>::get(netuid, new_hotkey).unwrap(), axon_info);
-            assert!(!Axons::<Test>::contains_key(netuid, old_hotkey));
-        }
-    });
-}
-
-#[test]
-fn test_swap_axons_weight_update() {
-    new_test_ext(1).execute_with(|| {
-        let old_hotkey = U256::from(1);
-        let new_hotkey = U256::from(2);
-        let netuid_is_member = vec![1u16, 2u16];
-        let axon_info = AxonInfo {
-            block: 100,
-            version: 1,
-            ip: 0x1234567890abcdef,
-            port: 8080,
-            ip_type: 4,
-            protocol: 1,
-            placeholder1: 0,
-            placeholder2: 0,
-        };
-        let mut weight = Weight::zero();
-
-        // Initialize Axons for old_hotkey
-        for netuid in &netuid_is_member {
-            Axons::<Test>::insert(netuid, old_hotkey, axon_info.clone());
-        }
-
-        // Perform the swap
-        SubtensorModule::swap_axons(&old_hotkey, &new_hotkey, &netuid_is_member, &mut weight);
-
-        // Verify the weight update
-        let expected_weight = netuid_is_member.len() as u64
-            * <Test as frame_system::Config>::DbWeight::get().reads_writes(1, 2);
-        assert_eq!(weight, expected_weight);
-    });
-}
-
-#[test]
-fn test_swap_keys_success() {
-    new_test_ext(1).execute_with(|| {
-        let old_hotkey = U256::from(1);
-        let new_hotkey = U256::from(2);
-        let netuid_is_member = vec![1u16, 2u16];
-        let uid = 42u16;
-        let mut weight = Weight::zero();
-
-        // Initialize Keys for old_hotkey
-        for netuid in &netuid_is_member {
-            log::info!("Inserting old_hotkey:{:?} netuid:{:?}", old_hotkey, netuid);
-            Keys::<Test>::insert(*netuid, uid, old_hotkey);
-        }
-
-        // Perform the swap
-        SubtensorModule::swap_keys(&old_hotkey, &new_hotkey, &netuid_is_member, &mut weight);
-
-        // Verify the swap
-        for netuid in &netuid_is_member {
-            log::info!(
-                "neutuid, uid, hotkey: {:?}, {:?}, {:?}",
-                netuid,
-                uid,
-                new_hotkey
-            );
-            assert_eq!(Keys::<Test>::get(netuid, uid), new_hotkey);
-        }
-    });
-}
-
-#[test]
-fn test_swap_keys_weight_update() {
-    new_test_ext(1).execute_with(|| {
-        let old_hotkey = U256::from(1);
-        let new_hotkey = U256::from(2);
-        let netuid_is_member = vec![1u16, 2u16];
-        let uid = 42u16;
-        let mut weight = Weight::zero();
-
-        // Initialize Keys for old_hotkey
-        for netuid in &netuid_is_member {
-            Keys::<Test>::insert(*netuid, uid, old_hotkey);
-        }
-
-        // Perform the swap
-        SubtensorModule::swap_keys(&old_hotkey, &new_hotkey, &netuid_is_member, &mut weight);
-
-        // Verify the weight update
-        let expected_weight = <Test as frame_system::Config>::DbWeight::get().writes(4);
-        assert_eq!(weight, expected_weight);
-    });
-}
-
-#[test]
-fn test_swap_loaded_emission_success() {
-    new_test_ext(1).execute_with(|| {
-        let old_hotkey = U256::from(1);
-        let new_hotkey = U256::from(2);
-        let netuid_is_member = vec![1u16, 2u16];
-        let se = 100u64;
-        let ve = 200u64;
-        let mut weight = Weight::zero();
-
-        // Initialize LoadedEmission for old_hotkey
-        for netuid in &netuid_is_member {
-            LoadedEmission::<Test>::mutate(netuid, |emission_exists| {
-                if let Some(emissions) = emission_exists {
-                    emissions.push((old_hotkey, se, ve));
-                } else {
-                    *emission_exists = Some(vec![(old_hotkey, se, ve)]);
-                }
-            });
-        }
-
-        // Perform the swap
-        SubtensorModule::swap_loaded_emission(
-            &old_hotkey,
-            &new_hotkey,
-            &netuid_is_member,
-            &mut weight,
-        );
-
-        // Verify the swap
-        for netuid in &netuid_is_member {
-            let emissions = LoadedEmission::<Test>::get(netuid).unwrap();
-            assert!(emissions.iter().any(|(hk, _, _)| hk == &new_hotkey));
-            assert!(!emissions.iter().any(|(hk, _, _)| hk == &old_hotkey));
-        }
-    });
-}
-
-#[test]
-fn test_swap_loaded_emission_weight_update() {
-    new_test_ext(1).execute_with(|| {
-        let old_hotkey = U256::from(1);
-        let new_hotkey = U256::from(2);
-        let netuid_is_member = vec![1u16, 2u16];
-        // let uid = 42u64;
-        let se = 100u64;
-        let ve = 200u64;
-        let mut weight = Weight::zero();
-
-        // Initialize LoadedEmission for old_hotkey
-        for netuid in &netuid_is_member {
-            LoadedEmission::<Test>::mutate(netuid, |emission_exists| {
-                if let Some(emissions) = emission_exists {
-                    emissions.push((old_hotkey, se, ve));
-                } else {
-                    *emission_exists = Some(vec![(old_hotkey, se, ve)]);
-                }
-            });
-        }
-
-        // Perform the swap
-        SubtensorModule::swap_loaded_emission(
-            &old_hotkey,
-            &new_hotkey,
-            &netuid_is_member,
-            &mut weight,
-        );
-
-        // Verify the weight update
-        let expected_weight = <Test as frame_system::Config>::DbWeight::get().writes(2);
-        assert_eq!(weight, expected_weight);
-    });
-}
-
-#[test]
-fn test_swap_uids_success() {
-    new_test_ext(1).execute_with(|| {
-        let old_hotkey = U256::from(1);
-        let new_hotkey = U256::from(2);
-        let netuid_is_member = vec![1u16, 2u16];
-        let uid = 42u16;
-        let mut weight = Weight::zero();
-
-        // Initialize Uids for old_hotkey
-        for netuid in &netuid_is_member {
-            Uids::<Test>::insert(netuid, old_hotkey, uid);
-        }
-
-        // Perform the swap
-        SubtensorModule::swap_uids(&old_hotkey, &new_hotkey, &netuid_is_member, &mut weight);
-
-        // Verify the swap
-        for netuid in &netuid_is_member {
-            assert_eq!(Uids::<Test>::get(netuid, new_hotkey).unwrap(), uid);
-            assert!(!Uids::<Test>::contains_key(netuid, old_hotkey));
-        }
-    });
-}
-
-#[test]
-fn test_swap_uids_weight_update() {
-    new_test_ext(1).execute_with(|| {
-        let old_hotkey = U256::from(1);
-        let new_hotkey = U256::from(2);
-        let netuid_is_member = vec![1u16, 2u16];
-        let uid = 42u16;
-        let mut weight = Weight::zero();
-
-        // Initialize Uids for old_hotkey
-        for netuid in &netuid_is_member {
-            Uids::<Test>::insert(netuid, old_hotkey, uid);
-        }
-
-        // Perform the swap
-        SubtensorModule::swap_uids(&old_hotkey, &new_hotkey, &netuid_is_member, &mut weight);
-
-        // Verify the weight update
-        let expected_weight = <Test as frame_system::Config>::DbWeight::get().writes(4);
-        assert_eq!(weight, expected_weight);
-    });
-}
-
-#[test]
-fn test_swap_prometheus_success() {
-    new_test_ext(1).execute_with(|| {
-        let old_hotkey = U256::from(1);
-        let new_hotkey = U256::from(2);
-        let netuid_is_member = vec![1u16, 2u16];
-        let prometheus_info = PrometheusInfo {
-            block: 100,
-            version: 1,
-            ip: 0x1234567890abcdef,
-            port: 8080,
-            ip_type: 4,
-        };
-        let mut weight = Weight::zero();
-
-        // Initialize Prometheus for old_hotkey
-        for netuid in &netuid_is_member {
-            Prometheus::<Test>::insert(netuid, old_hotkey, prometheus_info.clone());
-        }
-
-        // Perform the swap
-        SubtensorModule::swap_prometheus(&old_hotkey, &new_hotkey, &netuid_is_member, &mut weight);
-
-        // Verify the swap
-        for netuid in &netuid_is_member {
-            assert_eq!(
-                Prometheus::<Test>::get(netuid, new_hotkey).unwrap(),
-                prometheus_info
-            );
-            assert!(!Prometheus::<Test>::contains_key(netuid, old_hotkey));
-        }
-    });
-}
-
-#[test]
-fn test_swap_prometheus_weight_update() {
-    new_test_ext(1).execute_with(|| {
-        let old_hotkey = U256::from(1);
-        let new_hotkey = U256::from(2);
-        let netuid_is_member = vec![1u16, 2u16];
-        let prometheus_info = PrometheusInfo {
-            block: 100,
-            version: 1,
-            ip: 0x1234567890abcdef,
-            port: 8080,
-            ip_type: 4,
-        };
-        let mut weight = Weight::zero();
-
-        // Initialize Prometheus for old_hotkey
-        for netuid in &netuid_is_member {
-            Prometheus::<Test>::insert(netuid, old_hotkey, prometheus_info.clone());
-        }
-
-        // Perform the swap
-        SubtensorModule::swap_prometheus(&old_hotkey, &new_hotkey, &netuid_is_member, &mut weight);
-
-        // Verify the weight update
-        let expected_weight = netuid_is_member.len() as u64
-            * <Test as frame_system::Config>::DbWeight::get().reads_writes(1, 2);
-        assert_eq!(weight, expected_weight);
-    });
-}
-
-#[test]
-fn test_swap_total_hotkey_coldkey_stakes_this_interval_success() {
-    new_test_ext(1).execute_with(|| {
-        let old_hotkey = U256::from(1);
-        let new_hotkey = U256::from(2);
-        let coldkey = U256::from(3);
-        let stake = (1000u64, 42u64); // Example tuple value
-        let mut weight = Weight::zero();
-
-        // Initialize TotalHotkeyColdkeyStakesThisInterval for old_hotkey
-        TotalHotkeyColdkeyStakesThisInterval::<Test>::insert(old_hotkey, coldkey, stake);
-
-        // Perform the swap
-        SubtensorModule::swap_total_hotkey_coldkey_stakes_this_interval(
-            &old_hotkey,
-            &new_hotkey,
-            &mut weight,
-        );
-
-        // Verify the swap
-        assert_eq!(
-            TotalHotkeyColdkeyStakesThisInterval::<Test>::get(new_hotkey, coldkey),
-            stake
-        );
-        assert!(!TotalHotkeyColdkeyStakesThisInterval::<Test>::contains_key(
-            old_hotkey, coldkey
-        ));
-    });
-}
-
-#[test]
-fn test_swap_total_hotkey_coldkey_stakes_this_interval_weight_update() {
-    new_test_ext(1).execute_with(|| {
-        let old_hotkey = U256::from(1);
-        let new_hotkey = U256::from(2);
-        let coldkey = U256::from(3);
-        let stake = (1000u64, 42u64);
-        let mut weight = Weight::zero();
-
-        // Initialize TotalHotkeyColdkeyStakesThisInterval for old_hotkey
-        TotalHotkeyColdkeyStakesThisInterval::<Test>::insert(old_hotkey, coldkey, stake);
-
-        // Perform the swap
-
-        SubtensorModule::swap_total_hotkey_coldkey_stakes_this_interval(
-            &old_hotkey,
-            &new_hotkey,
-            &mut weight,
-        );
-
-        // Verify the weight update
-        let expected_weight = <Test as frame_system::Config>::DbWeight::get().writes(2);
-        assert_eq!(weight, expected_weight);
-    });
-}
-
 #[test]
 fn test_do_swap_coldkey_success() {
     new_test_ext(1).execute_with(|| {
diff --git a/pallets/subtensor/tests/swap_hotkey.rs b/pallets/subtensor/tests/swap_hotkey.rs
new file mode 100644
index 000000000..68f4ec49c
--- /dev/null
+++ b/pallets/subtensor/tests/swap_hotkey.rs
@@ -0,0 +1,965 @@
+#![allow(unused, clippy::indexing_slicing, clippy::panic, clippy::unwrap_used)]
+
+use codec::Encode;
+use frame_support::weights::Weight;
+use frame_support::{assert_err, assert_noop, assert_ok};
+use frame_system::{Config, RawOrigin};
+mod mock;
+use mock::*;
+use pallet_subtensor::*;
+use sp_core::H256;
+use sp_core::U256;
+
+// SKIP_WASM_BUILD=1 RUST_LOG=debug cargo test --test swap_hotkey -- test_swap_owner --exact --nocapture
+#[test]
+fn test_swap_owner() {
+    new_test_ext(1).execute_with(|| {
+        let old_hotkey = U256::from(1);
+        let new_hotkey = U256::from(2);
+        let coldkey = U256::from(3);
+        let mut weight = Weight::zero();
+
+        Owner::<Test>::insert(&old_hotkey, &coldkey);
+        assert_ok!(SubtensorModule::perform_hotkey_swap(
+            &old_hotkey,
+            &new_hotkey,
+            &coldkey,
+            &mut weight
+        ));
+
+        assert!(!Owner::<Test>::contains_key(&old_hotkey));
+        assert_eq!(Owner::<Test>::get(&new_hotkey), coldkey);
+    });
+}
+
+// SKIP_WASM_BUILD=1 RUST_LOG=debug cargo test --test swap_hotkey -- test_swap_owned_hotkeys --exact --nocapture
+#[test]
+fn test_swap_owned_hotkeys() {
+    new_test_ext(1).execute_with(|| {
+        let old_hotkey = U256::from(1);
+        let new_hotkey = U256::from(2);
+        let coldkey = U256::from(3);
+        let mut weight = Weight::zero();
+
+        OwnedHotkeys::<Test>::insert(&coldkey, vec![old_hotkey]);
+        assert_ok!(SubtensorModule::perform_hotkey_swap(
+            &old_hotkey,
+            &new_hotkey,
+            &coldkey,
+            &mut weight
+        ));
+
+        let hotkeys = OwnedHotkeys::<Test>::get(&coldkey);
+        assert!(!hotkeys.contains(&old_hotkey));
+        assert!(hotkeys.contains(&new_hotkey));
+    });
+}
+
+// SKIP_WASM_BUILD=1 RUST_LOG=debug cargo test --test swap_hotkey -- test_swap_total_hotkey_stake --exact --nocapture
+#[test]
+fn test_swap_total_hotkey_stake() {
+    new_test_ext(1).execute_with(|| {
+        let old_hotkey = U256::from(1);
+        let new_hotkey = U256::from(2);
+        let coldkey = U256::from(3);
+        let mut weight = Weight::zero();
+
+        TotalHotkeyStake::<Test>::insert(&old_hotkey, 100);
+        TotalHotkeyStake::<Test>::insert(&new_hotkey, 50);
+        assert_ok!(SubtensorModule::perform_hotkey_swap(
+            &old_hotkey,
+            &new_hotkey,
+            &coldkey,
+            &mut weight
+        ));
+
+        assert!(!TotalHotkeyStake::<Test>::contains_key(&old_hotkey));
+        assert_eq!(TotalHotkeyStake::<Test>::get(&new_hotkey), 150);
+    });
+}
+
+// SKIP_WASM_BUILD=1 RUST_LOG=debug cargo test --test swap_hotkey -- test_swap_total_hotkey_coldkey_stakes_this_interval --exact --nocapture
+#[test]
+fn test_swap_total_hotkey_coldkey_stakes_this_interval() {
+    new_test_ext(1).execute_with(|| {
+        let old_hotkey = U256::from(1);
+        let new_hotkey = U256::from(2);
+        let coldkey = U256::from(3);
+        let mut weight = Weight::zero();
+
+        TotalHotkeyColdkeyStakesThisInterval::<Test>::insert(&old_hotkey, &coldkey, (100, 1000));
+        assert_ok!(SubtensorModule::perform_hotkey_swap(
+            &old_hotkey,
+            &new_hotkey,
+            &coldkey,
+            &mut weight
+        ));
+
+        assert!(!TotalHotkeyColdkeyStakesThisInterval::<Test>::contains_key(
+            &old_hotkey,
+            &coldkey
+        ));
+        assert_eq!(
+            TotalHotkeyColdkeyStakesThisInterval::<Test>::get(&new_hotkey, &coldkey),
+            (100, 1000)
+        );
+    });
+}
+
+// SKIP_WASM_BUILD=1 RUST_LOG=debug cargo test --test swap_hotkey -- test_swap_last_tx_block --exact --nocapture
+#[test]
+fn test_swap_last_tx_block() {
+    new_test_ext(1).execute_with(|| {
+        let old_hotkey = U256::from(1);
+        let new_hotkey = U256::from(2);
+        let coldkey = U256::from(3);
+        let mut weight = Weight::zero();
+
+        LastTxBlock::<Test>::insert(&old_hotkey, 1000);
+        assert_ok!(SubtensorModule::perform_hotkey_swap(
+            &old_hotkey,
+            &new_hotkey,
+            &coldkey,
+            &mut weight
+        ));
+
+        assert!(!LastTxBlock::<Test>::contains_key(&old_hotkey));
+        assert_eq!(
+            LastTxBlock::<Test>::get(&new_hotkey),
+            SubtensorModule::get_current_block_as_u64()
+        );
+    });
+}
+
+// SKIP_WASM_BUILD=1 RUST_LOG=debug cargo test --test swap_hotkey -- test_swap_last_tx_block_delegate_take --exact --nocapture
+#[test]
+fn test_swap_last_tx_block_delegate_take() {
+    new_test_ext(1).execute_with(|| {
+        let old_hotkey = U256::from(1);
+        let new_hotkey = U256::from(2);
+        let coldkey = U256::from(3);
+        let mut weight = Weight::zero();
+
+        pallet_subtensor::LastTxBlockDelegateTake::<Test>::insert(&old_hotkey, 1000);
+        assert_ok!(SubtensorModule::perform_hotkey_swap(
+            &old_hotkey,
+            &new_hotkey,
+            &coldkey,
+            &mut weight
+        ));
+
+        assert!(!LastTxBlockDelegateTake::<Test>::contains_key(&old_hotkey));
+        assert_eq!(
+            LastTxBlockDelegateTake::<Test>::get(&new_hotkey),
+            SubtensorModule::get_current_block_as_u64()
+        );
+    });
+}
+
+// SKIP_WASM_BUILD=1 RUST_LOG=debug cargo test --test swap_hotkey -- test_swap_senate_members --exact --nocapture
+#[test]
+fn test_swap_senate_members() {
+    new_test_ext(1).execute_with(|| {
+        let old_hotkey = U256::from(1);
+        let new_hotkey = U256::from(2);
+        let coldkey = U256::from(3);
+        let mut weight = Weight::zero();
+
+        // Assuming there's a way to add a member to the senate
+        // SenateMembers::add_member(&old_hotkey);
+        assert_ok!(SubtensorModule::perform_hotkey_swap(
+            &old_hotkey,
+            &new_hotkey,
+            &coldkey,
+            &mut weight
+        ));
+
+        // Assert that the old_hotkey is no longer a member and new_hotkey is now a member
+        // assert!(!SenateMembers::is_member(&old_hotkey));
+        // assert!(SenateMembers::is_member(&new_hotkey));
+    });
+}
+
+// SKIP_WASM_BUILD=1 RUST_LOG=debug cargo test --test swap_hotkey -- test_swap_delegates --exact --nocapture
+#[test]
+fn test_swap_delegates() {
+    new_test_ext(1).execute_with(|| {
+        let old_hotkey = U256::from(1);
+        let new_hotkey = U256::from(2);
+        let coldkey = U256::from(3);
+        let mut weight = Weight::zero();
+
+        Delegates::<Test>::insert(&old_hotkey, 100);
+        assert_ok!(SubtensorModule::perform_hotkey_swap(
+            &old_hotkey,
+            &new_hotkey,
+            &coldkey,
+            &mut weight
+        ));
+
+        assert!(!Delegates::<Test>::contains_key(&old_hotkey));
+        assert_eq!(Delegates::<Test>::get(&new_hotkey), 100);
+    });
+}
+
+// SKIP_WASM_BUILD=1 RUST_LOG=debug cargo test --test swap_hotkey -- test_swap_subnet_membership --exact --nocapture
+#[test]
+fn test_swap_subnet_membership() {
+    new_test_ext(1).execute_with(|| {
+        let old_hotkey = U256::from(1);
+        let new_hotkey = U256::from(2);
+        let coldkey = U256::from(3);
+        let netuid = 0u16;
+        let mut weight = Weight::zero();
+
+        add_network(netuid, 0, 1);
+        IsNetworkMember::<Test>::insert(&old_hotkey, netuid, true);
+        assert_ok!(SubtensorModule::perform_hotkey_swap(
+            &old_hotkey,
+            &new_hotkey,
+            &coldkey,
+            &mut weight
+        ));
+
+        assert!(!IsNetworkMember::<Test>::contains_key(&old_hotkey, netuid));
+        assert!(IsNetworkMember::<Test>::get(&new_hotkey, netuid));
+    });
+}
+
+// SKIP_WASM_BUILD=1 RUST_LOG=debug cargo test --test swap_hotkey -- test_swap_uids_and_keys --exact --nocapture
+#[test]
+fn test_swap_uids_and_keys() {
+    new_test_ext(1).execute_with(|| {
+        let old_hotkey = U256::from(1);
+        let new_hotkey = U256::from(2);
+        let coldkey = U256::from(3);
+        let netuid = 0u16;
+        let uid = 5u16;
+        let mut weight = Weight::zero();
+
+        add_network(netuid, 0, 1);
+        IsNetworkMember::<Test>::insert(&old_hotkey, netuid, true);
+        Uids::<Test>::insert(netuid, &old_hotkey, uid);
+        Keys::<Test>::insert(netuid, uid, old_hotkey);
+
+        assert_ok!(SubtensorModule::perform_hotkey_swap(
+            &old_hotkey,
+            &new_hotkey,
+            &coldkey,
+            &mut weight
+        ));
+
+        assert_eq!(Uids::<Test>::get(netuid, &old_hotkey), None);
+        assert_eq!(Uids::<Test>::get(netuid, &new_hotkey), Some(uid));
+        assert_eq!(Keys::<Test>::get(netuid, uid), new_hotkey);
+    });
+}
+
+// SKIP_WASM_BUILD=1 RUST_LOG=debug cargo test --test swap_hotkey -- test_swap_prometheus --exact --nocapture
+#[test]
+fn test_swap_prometheus() {
+    new_test_ext(1).execute_with(|| {
+        let old_hotkey = U256::from(1);
+        let new_hotkey = U256::from(2);
+        let coldkey = U256::from(3);
+        let netuid = 0u16;
+        let prometheus_info = PrometheusInfo::default();
+        let mut weight = Weight::zero();
+
+        add_network(netuid, 0, 1);
+        IsNetworkMember::<Test>::insert(&old_hotkey, netuid, true);
+        Prometheus::<Test>::insert(netuid, &old_hotkey, prometheus_info.clone());
+
+        assert_ok!(SubtensorModule::perform_hotkey_swap(
+            &old_hotkey,
+            &new_hotkey,
+            &coldkey,
+            &mut weight
+        ));
+
+        assert!(!Prometheus::<Test>::contains_key(netuid, &old_hotkey));
+        assert_eq!(
+            Prometheus::<Test>::get(netuid, &new_hotkey),
+            Some(prometheus_info)
+        );
+    });
+}
+
+// SKIP_WASM_BUILD=1 RUST_LOG=debug cargo test --test swap_hotkey -- test_swap_axons --exact --nocapture
+#[test]
+fn test_swap_axons() {
+    new_test_ext(1).execute_with(|| {
+        let old_hotkey = U256::from(1);
+        let new_hotkey = U256::from(2);
+        let coldkey = U256::from(3);
+        let netuid = 0u16;
+        let axon_info = AxonInfo::default();
+        let mut weight = Weight::zero();
+
+        add_network(netuid, 0, 1);
+        IsNetworkMember::<Test>::insert(&old_hotkey, netuid, true);
+        Axons::<Test>::insert(netuid, &old_hotkey, axon_info.clone());
+
+        assert_ok!(SubtensorModule::perform_hotkey_swap(
+            &old_hotkey,
+            &new_hotkey,
+            &coldkey,
+            &mut weight
+        ));
+
+        assert!(!Axons::<Test>::contains_key(netuid, &old_hotkey));
+        assert_eq!(Axons::<Test>::get(netuid, &new_hotkey), Some(axon_info));
+    });
+}
+
+// SKIP_WASM_BUILD=1 RUST_LOG=debug cargo test --test swap_hotkey -- test_swap_weight_commits --exact --nocapture
+#[test]
+fn test_swap_weight_commits() {
+    new_test_ext(1).execute_with(|| {
+        let old_hotkey = U256::from(1);
+        let new_hotkey = U256::from(2);
+        let coldkey = U256::from(3);
+        let netuid = 0u16;
+        let weight_commits = (H256::from_low_u64_be(100), 200);
+        let mut weight = Weight::zero();
+
+        add_network(netuid, 0, 1);
+        IsNetworkMember::<Test>::insert(&old_hotkey, netuid, true);
+        WeightCommits::<Test>::insert(netuid, &old_hotkey, weight_commits.clone());
+
+        assert_ok!(SubtensorModule::perform_hotkey_swap(
+            &old_hotkey,
+            &new_hotkey,
+            &coldkey,
+            &mut weight
+        ));
+
+        assert!(!WeightCommits::<Test>::contains_key(netuid, &old_hotkey));
+        assert_eq!(
+            WeightCommits::<Test>::get(netuid, &new_hotkey),
+            Some(weight_commits)
+        );
+    });
+}
+
+// SKIP_WASM_BUILD=1 RUST_LOG=debug cargo test --test swap_hotkey -- test_swap_loaded_emission --exact --nocapture
+#[test]
+fn test_swap_loaded_emission() {
+    new_test_ext(1).execute_with(|| {
+        let old_hotkey = U256::from(1);
+        let new_hotkey = U256::from(2);
+        let coldkey = U256::from(3);
+        let netuid = 0u16;
+        let server_emission = 1000u64;
+        let validator_emission = 1000u64;
+        let mut weight = Weight::zero();
+
+        add_network(netuid, 0, 1);
+        IsNetworkMember::<Test>::insert(&old_hotkey, netuid, true);
+        LoadedEmission::<Test>::insert(
+            netuid,
+            vec![(old_hotkey, server_emission, validator_emission)],
+        );
+
+        assert_ok!(SubtensorModule::perform_hotkey_swap(
+            &old_hotkey,
+            &new_hotkey,
+            &coldkey,
+            &mut weight
+        ));
+
+        let new_loaded_emission = LoadedEmission::<Test>::get(netuid);
+        assert_eq!(
+            new_loaded_emission,
+            Some(vec![(new_hotkey, server_emission, validator_emission)])
+        );
+    });
+}
+
+// SKIP_WASM_BUILD=1 RUST_LOG=debug cargo test --test swap_hotkey -- test_swap_stake --exact --nocapture
+#[test]
+fn test_swap_stake() {
+    new_test_ext(1).execute_with(|| {
+        let old_hotkey = U256::from(1);
+        let new_hotkey = U256::from(2);
+        let coldkey = U256::from(3);
+        let stake_amount = 100u64;
+        let mut weight = Weight::zero();
+
+        Stake::<Test>::insert(&old_hotkey, &coldkey, stake_amount);
+
+        assert_ok!(SubtensorModule::perform_hotkey_swap(
+            &old_hotkey,
+            &new_hotkey,
+            &coldkey,
+            &mut weight
+        ));
+
+        assert!(!Stake::<Test>::contains_key(&old_hotkey, &coldkey));
+        assert_eq!(Stake::<Test>::get(&new_hotkey, &coldkey), stake_amount);
+    });
+}
+
+// SKIP_WASM_BUILD=1 RUST_LOG=debug cargo test --test swap_hotkey -- test_swap_staking_hotkeys --exact --nocapture
+#[test]
+fn test_swap_staking_hotkeys() {
+    new_test_ext(1).execute_with(|| {
+        let old_hotkey = U256::from(1);
+        let new_hotkey = U256::from(2);
+        let coldkey = U256::from(3);
+        let mut weight = Weight::zero();
+
+        Stake::<Test>::insert(&old_hotkey, &coldkey, 100);
+        StakingHotkeys::<Test>::insert(&coldkey, vec![old_hotkey]);
+
+        assert_ok!(SubtensorModule::perform_hotkey_swap(
+            &old_hotkey,
+            &new_hotkey,
+            &coldkey,
+            &mut weight
+        ));
+
+        let staking_hotkeys = StakingHotkeys::<Test>::get(&coldkey);
+        assert!(!staking_hotkeys.contains(&old_hotkey));
+        assert!(staking_hotkeys.contains(&new_hotkey));
+    });
+}
+
+// SKIP_WASM_BUILD=1 RUST_LOG=debug cargo test --test swap_hotkey -- test_swap_hotkey_with_multiple_coldkeys --exact --nocapture
+#[test]
+fn test_swap_hotkey_with_multiple_coldkeys() {
+    new_test_ext(1).execute_with(|| {
+        let old_hotkey = U256::from(1);
+        let new_hotkey = U256::from(2);
+        let coldkey1 = U256::from(3);
+        let coldkey2 = U256::from(4);
+        let mut weight = Weight::zero();
+
+        Stake::<Test>::insert(&old_hotkey, &coldkey1, 100);
+        Stake::<Test>::insert(&old_hotkey, &coldkey2, 200);
+        StakingHotkeys::<Test>::insert(&coldkey1, vec![old_hotkey]);
+        StakingHotkeys::<Test>::insert(&coldkey2, vec![old_hotkey]);
+
+        assert_ok!(SubtensorModule::perform_hotkey_swap(
+            &old_hotkey,
+            &new_hotkey,
+            &coldkey1,
+            &mut weight
+        ));
+
+        assert_eq!(Stake::<Test>::get(&new_hotkey, &coldkey1), 100);
+        assert_eq!(Stake::<Test>::get(&new_hotkey, &coldkey2), 200);
+        assert!(StakingHotkeys::<Test>::get(&coldkey1).contains(&new_hotkey));
+        assert!(StakingHotkeys::<Test>::get(&coldkey2).contains(&new_hotkey));
+    });
+}
+
+// SKIP_WASM_BUILD=1 RUST_LOG=debug cargo test --test swap_hotkey -- test_swap_hotkey_with_existing_stake --exact --nocapture
+#[test]
+fn test_swap_hotkey_with_existing_stake() {
+    new_test_ext(1).execute_with(|| {
+        let old_hotkey = U256::from(1);
+        let new_hotkey = U256::from(2);
+        let coldkey = U256::from(3);
+        let mut weight = Weight::zero();
+
+        Stake::<Test>::insert(&old_hotkey, &coldkey, 100);
+        Stake::<Test>::insert(&new_hotkey, &coldkey, 50);
+
+        assert_ok!(SubtensorModule::perform_hotkey_swap(
+            &old_hotkey,
+            &new_hotkey,
+            &coldkey,
+            &mut weight
+        ));
+
+        assert_eq!(Stake::<Test>::get(&new_hotkey, &coldkey), 150);
+    });
+}
+
+// SKIP_WASM_BUILD=1 RUST_LOG=debug cargo test --test swap_hotkey -- test_swap_hotkey_with_multiple_subnets --exact --nocapture
+#[test]
+fn test_swap_hotkey_with_multiple_subnets() {
+    new_test_ext(1).execute_with(|| {
+        let old_hotkey = U256::from(1);
+        let new_hotkey = U256::from(2);
+        let coldkey = U256::from(3);
+        let netuid1 = 0;
+        let netuid2 = 1;
+        let mut weight = Weight::zero();
+
+        add_network(netuid1, 0, 1);
+        add_network(netuid2, 0, 1);
+        IsNetworkMember::<Test>::insert(&old_hotkey, netuid1, true);
+        IsNetworkMember::<Test>::insert(&old_hotkey, netuid2, true);
+
+        assert_ok!(SubtensorModule::perform_hotkey_swap(
+            &old_hotkey,
+            &new_hotkey,
+            &coldkey,
+            &mut weight
+        ));
+
+        assert!(IsNetworkMember::<Test>::get(&new_hotkey, netuid1));
+        assert!(IsNetworkMember::<Test>::get(&new_hotkey, netuid2));
+        assert!(!IsNetworkMember::<Test>::get(&old_hotkey, netuid1));
+        assert!(!IsNetworkMember::<Test>::get(&old_hotkey, netuid2));
+    });
+}
+
+// SKIP_WASM_BUILD=1 RUST_LOG=debug cargo test --test swap_hotkey -- test_swap_staking_hotkeys_multiple_coldkeys --exact --nocapture
+#[test]
+fn test_swap_staking_hotkeys_multiple_coldkeys() {
+    new_test_ext(1).execute_with(|| {
+        let old_hotkey = U256::from(1);
+        let new_hotkey = U256::from(2);
+        let coldkey1 = U256::from(3);
+        let coldkey2 = U256::from(4);
+        let mut weight = Weight::zero();
+
+        // Set up initial state
+        Stake::<Test>::insert(&old_hotkey, &coldkey1, 100);
+        Stake::<Test>::insert(&old_hotkey, &coldkey2, 200);
+        StakingHotkeys::<Test>::insert(&coldkey1, vec![old_hotkey]);
+        StakingHotkeys::<Test>::insert(&coldkey2, vec![old_hotkey, U256::from(5)]);
+
+        assert_ok!(SubtensorModule::perform_hotkey_swap(
+            &old_hotkey,
+            &new_hotkey,
+            &coldkey1,
+            &mut weight
+        ));
+
+        // Check if new_hotkey replaced old_hotkey in StakingHotkeys
+        assert!(StakingHotkeys::<Test>::get(&coldkey1).contains(&new_hotkey));
+        assert!(!StakingHotkeys::<Test>::get(&coldkey1).contains(&old_hotkey));
+
+        // Check if new_hotkey replaced old_hotkey for coldkey2 as well
+        assert!(StakingHotkeys::<Test>::get(&coldkey2).contains(&new_hotkey));
+        assert!(!StakingHotkeys::<Test>::get(&coldkey2).contains(&old_hotkey));
+        assert!(StakingHotkeys::<Test>::get(&coldkey2).contains(&U256::from(5)));
+        // Other hotkeys should remain
+    });
+}
+
+// SKIP_WASM_BUILD=1 RUST_LOG=debug cargo test --test swap_hotkey -- test_swap_hotkey_with_no_stake --exact --nocapture
+#[test]
+fn test_swap_hotkey_with_no_stake() {
+    new_test_ext(1).execute_with(|| {
+        let old_hotkey = U256::from(1);
+        let new_hotkey = U256::from(2);
+        let coldkey = U256::from(3);
+        let mut weight = Weight::zero();
+
+        // Set up initial state with no stake
+        Owner::<Test>::insert(&old_hotkey, &coldkey);
+
+        assert_ok!(SubtensorModule::perform_hotkey_swap(
+            &old_hotkey,
+            &new_hotkey,
+            &coldkey,
+            &mut weight
+        ));
+
+        // Check if ownership transferred
+        assert!(!Owner::<Test>::contains_key(&old_hotkey));
+        assert_eq!(Owner::<Test>::get(&new_hotkey), coldkey);
+
+        // Ensure no unexpected changes in Stake
+        assert!(!Stake::<Test>::contains_key(&old_hotkey, &coldkey));
+        assert!(!Stake::<Test>::contains_key(&new_hotkey, &coldkey));
+    });
+}
+
+// SKIP_WASM_BUILD=1 RUST_LOG=debug cargo test --test swap_hotkey -- test_swap_hotkey_with_multiple_coldkeys_and_subnets --exact --nocapture
+#[test]
+fn test_swap_hotkey_with_multiple_coldkeys_and_subnets() {
+    new_test_ext(1).execute_with(|| {
+        let old_hotkey = U256::from(1);
+        let new_hotkey = U256::from(2);
+        let coldkey1 = U256::from(3);
+        let coldkey2 = U256::from(4);
+        let netuid1 = 0;
+        let netuid2 = 1;
+        let mut weight = Weight::zero();
+
+        // Set up initial state
+        add_network(netuid1, 0, 1);
+        add_network(netuid2, 0, 1);
+        Owner::<Test>::insert(&old_hotkey, &coldkey1);
+        Stake::<Test>::insert(&old_hotkey, &coldkey1, 100);
+        Stake::<Test>::insert(&old_hotkey, &coldkey2, 200);
+        IsNetworkMember::<Test>::insert(&old_hotkey, netuid1, true);
+        IsNetworkMember::<Test>::insert(&old_hotkey, netuid2, true);
+        TotalHotkeyStake::<Test>::insert(&old_hotkey, 300);
+
+        assert_ok!(SubtensorModule::perform_hotkey_swap(
+            &old_hotkey,
+            &new_hotkey,
+            &coldkey1,
+            &mut weight
+        ));
+
+        // Check ownership transfer
+        assert!(!Owner::<Test>::contains_key(&old_hotkey));
+        assert_eq!(Owner::<Test>::get(&new_hotkey), coldkey1);
+
+        // Check stake transfer
+        assert_eq!(Stake::<Test>::get(&new_hotkey, &coldkey1), 100);
+        assert_eq!(Stake::<Test>::get(&new_hotkey, &coldkey2), 200);
+        assert!(!Stake::<Test>::contains_key(&old_hotkey, &coldkey1));
+        assert!(!Stake::<Test>::contains_key(&old_hotkey, &coldkey2));
+
+        // Check subnet membership transfer
+        assert!(IsNetworkMember::<Test>::get(&new_hotkey, netuid1));
+        assert!(IsNetworkMember::<Test>::get(&new_hotkey, netuid2));
+        assert!(!IsNetworkMember::<Test>::get(&old_hotkey, netuid1));
+        assert!(!IsNetworkMember::<Test>::get(&old_hotkey, netuid2));
+
+        // Check total stake transfer
+        assert_eq!(TotalHotkeyStake::<Test>::get(&new_hotkey), 300);
+        assert!(!TotalHotkeyStake::<Test>::contains_key(&old_hotkey));
+    });
+}
+
+// SKIP_WASM_BUILD=1 RUST_LOG=debug cargo test --test swap_hotkey -- test_swap_hotkey_tx_rate_limit_exceeded --exact --nocapture
+#[test]
+fn test_swap_hotkey_tx_rate_limit_exceeded() {
+    new_test_ext(1).execute_with(|| {
+        let netuid: u16 = 1;
+        let tempo: u16 = 13;
+        let old_hotkey = U256::from(1);
+        let new_hotkey_1 = U256::from(2);
+        let new_hotkey_2 = U256::from(4);
+        let coldkey = U256::from(3);
+        let swap_cost = 1_000_000_000u64 * 2;
+
+        let tx_rate_limit = 1;
+
+        // Get the current transaction rate limit
+        let current_tx_rate_limit = SubtensorModule::get_tx_rate_limit();
+        log::info!("current_tx_rate_limit: {:?}", current_tx_rate_limit);
+
+        // Set the transaction rate limit
+        SubtensorModule::set_tx_rate_limit(tx_rate_limit);
+        // assert the rate limit is set to 1000 blocks
+        assert_eq!(SubtensorModule::get_tx_rate_limit(), tx_rate_limit);
+
+        // Setup initial state
+        add_network(netuid, tempo, 0);
+        register_ok_neuron(netuid, old_hotkey, coldkey, 0);
+        SubtensorModule::add_balance_to_coldkey_account(&coldkey, swap_cost);
+
+        // Perform the first swap
+        assert_ok!(SubtensorModule::do_swap_hotkey(
+            <<Test as Config>::RuntimeOrigin>::signed(coldkey),
+            &old_hotkey,
+            &new_hotkey_1
+        ));
+
+        // Attempt to perform another swap immediately, which should fail due to rate limit
+        assert_err!(
+            SubtensorModule::do_swap_hotkey(
+                <<Test as Config>::RuntimeOrigin>::signed(coldkey),
+                &new_hotkey_1,
+                &new_hotkey_2
+            ),
+            Error::<Test>::HotKeySetTxRateLimitExceeded
+        );
+
+        // move in time past the rate limit
+        step_block(1001);
+        assert_ok!(SubtensorModule::do_swap_hotkey(
+            <<Test as Config>::RuntimeOrigin>::signed(coldkey),
+            &new_hotkey_1,
+            &new_hotkey_2
+        ));
+    });
+}
+
+// SKIP_WASM_BUILD=1 RUST_LOG=debug cargo test --test swap_hotkey -- test_do_swap_hotkey_err_not_owner --exact --nocapture
+#[test]
+fn test_do_swap_hotkey_err_not_owner() {
+    new_test_ext(1).execute_with(|| {
+        let netuid: u16 = 1;
+        let tempo: u16 = 13;
+        let old_hotkey = U256::from(1);
+        let new_hotkey = U256::from(2);
+        let coldkey = U256::from(3);
+        let not_owner_coldkey = U256::from(4);
+        let swap_cost = 1_000_000_000u64;
+
+        // Setup initial state
+        add_network(netuid, tempo, 0);
+        register_ok_neuron(netuid, old_hotkey, coldkey, 0);
+        SubtensorModule::add_balance_to_coldkey_account(&not_owner_coldkey, swap_cost);
+
+        // Attempt the swap with a non-owner coldkey
+        assert_err!(
+            SubtensorModule::do_swap_hotkey(
+                <<Test as Config>::RuntimeOrigin>::signed(not_owner_coldkey),
+                &old_hotkey,
+                &new_hotkey
+            ),
+            Error::<Test>::NonAssociatedColdKey
+        );
+    });
+}
+
+// SKIP_WASM_BUILD=1 RUST_LOG=debug cargo test --test swap_hotkey -- test_swap_owner_success --exact --nocapture
+#[test]
+fn test_swap_owner_success() {
+    new_test_ext(1).execute_with(|| {
+        let old_hotkey = U256::from(1);
+        let new_hotkey = U256::from(2);
+        let coldkey = U256::from(3);
+        let mut weight = Weight::zero();
+
+        // Initialize Owner for old_hotkey
+        Owner::<Test>::insert(old_hotkey, coldkey);
+
+        // Perform the swap
+        SubtensorModule::perform_hotkey_swap(&old_hotkey, &new_hotkey, &coldkey, &mut weight);
+
+        // Verify the swap
+        assert_eq!(Owner::<Test>::get(new_hotkey), coldkey);
+        assert!(!Owner::<Test>::contains_key(old_hotkey));
+    });
+}
+
+// SKIP_WASM_BUILD=1 RUST_LOG=debug cargo test --test swap_hotkey -- test_swap_owner_old_hotkey_not_exist --exact --nocapture
+#[test]
+fn test_swap_owner_old_hotkey_not_exist() {
+    new_test_ext(1).execute_with(|| {
+        let old_hotkey = U256::from(1);
+        let new_hotkey = U256::from(2);
+        let coldkey = U256::from(3);
+        let mut weight = Weight::zero();
+
+        // Ensure old_hotkey does not exist
+        assert!(!Owner::<Test>::contains_key(old_hotkey));
+
+        // Perform the swap
+        SubtensorModule::perform_hotkey_swap(&old_hotkey, &new_hotkey, &coldkey, &mut weight);
+
+        // Verify the swap
+        assert_eq!(Owner::<Test>::get(new_hotkey), coldkey);
+        assert!(!Owner::<Test>::contains_key(old_hotkey));
+    });
+}
+
+// SKIP_WASM_BUILD=1 RUST_LOG=debug cargo test --test swap_hotkey -- test_swap_owner_new_hotkey_already_exists --exact --nocapture
+#[test]
+fn test_swap_owner_new_hotkey_already_exists() {
+    new_test_ext(1).execute_with(|| {
+        let old_hotkey = U256::from(1);
+        let new_hotkey = U256::from(2);
+        let coldkey = U256::from(3);
+        let another_coldkey = U256::from(4);
+        let mut weight = Weight::zero();
+
+        // Initialize Owner for old_hotkey and new_hotkey
+        Owner::<Test>::insert(old_hotkey, coldkey);
+        Owner::<Test>::insert(new_hotkey, another_coldkey);
+
+        // Perform the swap
+        SubtensorModule::perform_hotkey_swap(&old_hotkey, &new_hotkey, &coldkey, &mut weight);
+
+        // Verify the swap
+        assert_eq!(Owner::<Test>::get(new_hotkey), coldkey);
+        assert!(!Owner::<Test>::contains_key(old_hotkey));
+    });
+}
+
+// SKIP_WASM_BUILD=1 RUST_LOG=debug cargo test --test swap_hotkey -- test_swap_total_hotkey_stake_success --exact --nocapture
+#[test]
+fn test_swap_total_hotkey_stake_success() {
+    new_test_ext(1).execute_with(|| {
+        let old_hotkey = U256::from(1);
+        let new_hotkey = U256::from(2);
+        let coldkey = U256::from(3);
+        let total_stake = 1000u64;
+        let mut weight = Weight::zero();
+
+        // Initialize TotalHotkeyStake for old_hotkey
+        TotalHotkeyStake::<Test>::insert(old_hotkey, total_stake);
+
+        // Perform the swap
+        SubtensorModule::perform_hotkey_swap(&old_hotkey, &new_hotkey, &coldkey, &mut weight);
+
+        // Verify the swap
+        assert_eq!(TotalHotkeyStake::<Test>::get(new_hotkey), total_stake);
+        assert!(!TotalHotkeyStake::<Test>::contains_key(old_hotkey));
+    });
+}
+
+// SKIP_WASM_BUILD=1 RUST_LOG=debug cargo test --test swap_hotkey -- test_swap_delegates_success --exact --nocapture
+#[test]
+fn test_swap_delegates_success() {
+    new_test_ext(1).execute_with(|| {
+        let old_hotkey = U256::from(1);
+        let new_hotkey = U256::from(2);
+        let coldkey = U256::from(3);
+        let delegate_take = 10u16;
+        let mut weight = Weight::zero();
+
+        // Initialize Delegates for old_hotkey
+        Delegates::<Test>::insert(old_hotkey, delegate_take);
+
+        // Perform the swap
+        SubtensorModule::perform_hotkey_swap(&old_hotkey, &new_hotkey, &coldkey, &mut weight);
+
+        // Verify the swap
+        assert_eq!(Delegates::<Test>::get(new_hotkey), delegate_take);
+        assert!(!Delegates::<Test>::contains_key(old_hotkey));
+    });
+}
+
+// SKIP_WASM_BUILD=1 RUST_LOG=debug cargo test --test swap_hotkey -- test_swap_stake_success --exact --nocapture
+#[test]
+fn test_swap_stake_success() {
+    new_test_ext(1).execute_with(|| {
+        let old_hotkey = U256::from(1);
+        let new_hotkey = U256::from(2);
+        let coldkey = U256::from(3);
+        let stake_amount = 1000u64;
+        let mut weight = Weight::zero();
+
+        // Initialize Stake for old_hotkey
+        Stake::<Test>::insert(old_hotkey, coldkey, stake_amount);
+
+        // Perform the swap
+        SubtensorModule::perform_hotkey_swap(&old_hotkey, &new_hotkey, &coldkey, &mut weight);
+
+        // Verify the swap
+        assert_eq!(Stake::<Test>::get(new_hotkey, coldkey), stake_amount);
+        assert!(!Stake::<Test>::contains_key(old_hotkey, coldkey));
+    });
+}
+
+// SKIP_WASM_BUILD=1 RUST_LOG=debug cargo test --test swap_hotkey -- test_swap_stake_old_hotkey_not_exist --exact --nocapture
+#[test]
+fn test_swap_stake_old_hotkey_not_exist() {
+    new_test_ext(1).execute_with(|| {
+        let old_hotkey = U256::from(1);
+        let new_hotkey = U256::from(2);
+        let coldkey = U256::from(3);
+        let stake_amount = 1000u64;
+        let mut weight = Weight::zero();
+
+        // Initialize Stake for old_hotkey
+        Stake::<Test>::insert(old_hotkey, coldkey, stake_amount);
+
+        // Ensure old_hotkey has a stake
+        assert!(Stake::<Test>::contains_key(old_hotkey, coldkey));
+
+        // Perform the swap
+        SubtensorModule::perform_hotkey_swap(&old_hotkey, &new_hotkey, &coldkey, &mut weight);
+
+        // Verify that new_hotkey has the stake and old_hotkey does not
+        assert!(Stake::<Test>::contains_key(new_hotkey, coldkey));
+        assert!(!Stake::<Test>::contains_key(old_hotkey, coldkey));
+    });
+}
+
+// SKIP_WASM_BUILD=1 RUST_LOG=debug cargo test --test swap_hotkey -- test_swap_total_hotkey_coldkey_stakes_this_interval_success --exact --nocapture
+#[test]
+fn test_swap_total_hotkey_coldkey_stakes_this_interval_success() {
+    new_test_ext(1).execute_with(|| {
+        let old_hotkey = U256::from(1);
+        let new_hotkey = U256::from(2);
+        let coldkey = U256::from(3);
+        let stake = (1000u64, 42u64); // Example tuple value
+        let mut weight = Weight::zero();
+
+        // Initialize TotalHotkeyColdkeyStakesThisInterval for old_hotkey
+        TotalHotkeyColdkeyStakesThisInterval::<Test>::insert(old_hotkey, coldkey, stake);
+
+        // Perform the swap
+        SubtensorModule::perform_hotkey_swap(&old_hotkey, &new_hotkey, &coldkey, &mut weight);
+
+        // Verify the swap
+        assert_eq!(
+            TotalHotkeyColdkeyStakesThisInterval::<Test>::get(new_hotkey, coldkey),
+            stake
+        );
+        assert!(!TotalHotkeyColdkeyStakesThisInterval::<Test>::contains_key(
+            old_hotkey, coldkey
+        ));
+    });
+}
+
+// SKIP_WASM_BUILD=1 RUST_LOG=debug cargo test --test swap_hotkey -- test_swap_hotkey_error_cases --exact --nocapture
+#[test]
+fn test_swap_hotkey_error_cases() {
+    new_test_ext(1).execute_with(|| {
+        let old_hotkey = U256::from(1);
+        let new_hotkey = U256::from(2);
+        let coldkey = U256::from(3);
+        let wrong_coldkey = U256::from(4);
+
+        // Set up initial state
+        Owner::<Test>::insert(&old_hotkey, &coldkey);
+        TotalNetworks::<Test>::put(1);
+        LastTxBlock::<Test>::insert(&coldkey, 0);
+
+        // Test not enough balance
+        let swap_cost = SubtensorModule::get_key_swap_cost();
+        assert_noop!(
+            SubtensorModule::do_swap_hotkey(
+                RuntimeOrigin::signed(coldkey),
+                &old_hotkey,
+                &new_hotkey
+            ),
+            Error::<Test>::NotEnoughBalanceToPaySwapHotKey
+        );
+
+        let initial_balance = SubtensorModule::get_key_swap_cost() + 1000;
+        SubtensorModule::add_balance_to_coldkey_account(&coldkey, initial_balance);
+
+        // Test new hotkey same as old
+        assert_noop!(
+            SubtensorModule::do_swap_hotkey(
+                RuntimeOrigin::signed(coldkey),
+                &old_hotkey,
+                &old_hotkey
+            ),
+            Error::<Test>::NewHotKeyIsSameWithOld
+        );
+
+        // Test new hotkey already registered
+        IsNetworkMember::<Test>::insert(&new_hotkey, 0, true);
+        assert_noop!(
+            SubtensorModule::do_swap_hotkey(
+                RuntimeOrigin::signed(coldkey),
+                &old_hotkey,
+                &new_hotkey
+            ),
+            Error::<Test>::HotKeyAlreadyRegisteredInSubNet
+        );
+        IsNetworkMember::<Test>::remove(&new_hotkey, 0);
+
+        // Test non-associated coldkey
+        assert_noop!(
+            SubtensorModule::do_swap_hotkey(
+                RuntimeOrigin::signed(wrong_coldkey),
+                &old_hotkey,
+                &new_hotkey
+            ),
+            Error::<Test>::NonAssociatedColdKey
+        );
+
+        // Run the successful swap
+        assert_ok!(SubtensorModule::do_swap_hotkey(
+            RuntimeOrigin::signed(coldkey),
+            &old_hotkey,
+            &new_hotkey
+        ));
+
+        // Check balance after swap
+        assert_eq!(
+            Balances::free_balance(&coldkey),
+            initial_balance - swap_cost
+        );
+    });
+}
diff --git a/runtime/Cargo.toml b/runtime/Cargo.toml
index fcb02a24c..042d0337c 100644
--- a/runtime/Cargo.toml
+++ b/runtime/Cargo.toml
@@ -41,6 +41,7 @@ pallet-timestamp = { workspace = true }
 pallet-transaction-payment = { workspace = true }
 pallet-utility = { workspace = true }
 frame-executive = { workspace = true }
+frame-metadata-hash-extension = { workspace = true }
 sp-api = { workspace = true }
 sp-block-builder = { workspace = true }
 sp-consensus-aura = { workspace = true }
@@ -111,6 +112,7 @@ std = [
 	"codec/std",
 	"scale-info/std",
 	"frame-executive/std",
+	"frame-metadata-hash-extension/std",
 	"frame-support/std",
 	"frame-system-rpc-runtime-api/std",
 	"frame-system/std",
@@ -204,3 +206,4 @@ try-runtime = [
 	"pallet-commitments/try-runtime",
 	"pallet-registry/try-runtime"
 ]
+metadata-hash = ["substrate-wasm-builder/metadata-hash"]
diff --git a/runtime/build.rs b/runtime/build.rs
index 8f021e838..c0fa0405b 100644
--- a/runtime/build.rs
+++ b/runtime/build.rs
@@ -1,5 +1,5 @@
 fn main() {
-    #[cfg(feature = "std")]
+    #[cfg(all(feature = "std", not(feature = "metadata-hash")))]
     {
         substrate_wasm_builder::WasmBuilder::new()
             .with_current_project()
@@ -7,4 +7,13 @@ fn main() {
             .import_memory()
             .build();
     }
+    #[cfg(all(feature = "std", feature = "metadata-hash"))]
+    {
+        substrate_wasm_builder::WasmBuilder::new()
+            .with_current_project()
+            .export_heap_base()
+            .import_memory()
+            .enable_metadata_hash("TAO", 9)
+            .build();
+    }
 }
diff --git a/runtime/src/lib.rs b/runtime/src/lib.rs
index a4abd124f..2b9bb2595 100644
--- a/runtime/src/lib.rs
+++ b/runtime/src/lib.rs
@@ -139,7 +139,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
     //   `spec_version`, and `authoring_version` are the same between Wasm and native.
     // This value is set to 100 to notify Polkadot-JS App (https://polkadot.js.org/apps) to use
     //   the compatible custom types.
-    spec_version: 165,
+    spec_version: 188,
     impl_version: 1,
     apis: RUNTIME_API_VERSIONS,
     transaction_version: 1,
@@ -1282,6 +1282,7 @@ pub type SignedExtra = (
     pallet_transaction_payment::ChargeTransactionPayment<Runtime>,
     pallet_subtensor::SubtensorSignedExtension<Runtime>,
     pallet_commitments::CommitmentsSignedExtension<Runtime>,
+    frame_metadata_hash_extension::CheckMetadataHash<Runtime>,
 );
 
 type Migrations = pallet_grandpa::migrations::MigrateV4ToV5<Runtime>;
diff --git a/scripts/build.sh b/scripts/build.sh
index 548af664b..3f588a1cc 100755
--- a/scripts/build.sh
+++ b/scripts/build.sh
@@ -1,2 +1,2 @@
-cargo build --profile production --features runtime-benchmarks
+cargo build --profile production --features "runtime-benchmarks metadata-hash"