diff --git a/Cargo.lock b/Cargo.lock
index 8bf2eea1d319..0934291480d1 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -423,7 +423,7 @@ dependencies = [
 [[package]]
 name = "beefy-gadget"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "async-trait",
  "beefy-primitives",
@@ -459,7 +459,7 @@ dependencies = [
 [[package]]
 name = "beefy-gadget-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "beefy-gadget",
  "beefy-primitives",
@@ -479,7 +479,7 @@ dependencies = [
 [[package]]
 name = "beefy-merkle-tree"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "beefy-primitives",
  "sp-api",
@@ -488,7 +488,7 @@ dependencies = [
 [[package]]
 name = "beefy-primitives"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -1983,7 +1983,7 @@ checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
 [[package]]
 name = "fork-tree"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "parity-scale-codec",
 ]
@@ -2001,7 +2001,7 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -2024,7 +2024,7 @@ dependencies = [
 [[package]]
 name = "frame-benchmarking-cli"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "Inflector",
  "chrono",
@@ -2075,7 +2075,7 @@ dependencies = [
 [[package]]
 name = "frame-election-provider-solution-type"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -2086,7 +2086,7 @@ dependencies = [
 [[package]]
 name = "frame-election-provider-support"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "frame-election-provider-solution-type",
  "frame-support",
@@ -2102,7 +2102,7 @@ dependencies = [
 [[package]]
 name = "frame-executive"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -2131,7 +2131,7 @@ dependencies = [
 [[package]]
 name = "frame-support"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "bitflags",
  "frame-metadata",
@@ -2162,7 +2162,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "Inflector",
  "cfg-expr",
@@ -2176,7 +2176,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "frame-support-procedural-tools-derive",
  "proc-macro-crate",
@@ -2188,7 +2188,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools-derive"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -2198,7 +2198,7 @@ dependencies = [
 [[package]]
 name = "frame-support-test"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "frame-support",
  "frame-support-test-pallet",
@@ -2221,7 +2221,7 @@ dependencies = [
 [[package]]
 name = "frame-support-test-pallet"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -2232,7 +2232,7 @@ dependencies = [
 [[package]]
 name = "frame-system"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "frame-support",
  "log",
@@ -2249,7 +2249,7 @@ dependencies = [
 [[package]]
 name = "frame-system-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -2264,7 +2264,7 @@ dependencies = [
 [[package]]
 name = "frame-system-rpc-runtime-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -2273,7 +2273,7 @@ dependencies = [
 [[package]]
 name = "frame-try-runtime"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
@@ -2456,7 +2456,7 @@ dependencies = [
 [[package]]
 name = "generate-bags"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "chrono",
  "frame-election-provider-support",
@@ -4829,7 +4829,7 @@ checksum = "20448fd678ec04e6ea15bbe0476874af65e98a01515d667aa49f1434dc44ebf4"
 [[package]]
 name = "pallet-assets"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4843,7 +4843,7 @@ dependencies = [
 [[package]]
 name = "pallet-authority-discovery"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4859,7 +4859,7 @@ dependencies = [
 [[package]]
 name = "pallet-authorship"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -4874,7 +4874,7 @@ dependencies = [
 [[package]]
 name = "pallet-babe"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4898,7 +4898,7 @@ dependencies = [
 [[package]]
 name = "pallet-bags-list"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -4918,7 +4918,7 @@ dependencies = [
 [[package]]
 name = "pallet-bags-list-remote-tests"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "frame-election-provider-support",
  "frame-support",
@@ -4937,7 +4937,7 @@ dependencies = [
 [[package]]
 name = "pallet-balances"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4952,7 +4952,7 @@ dependencies = [
 [[package]]
 name = "pallet-beefy"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "beefy-primitives",
  "frame-support",
@@ -4968,7 +4968,7 @@ dependencies = [
 [[package]]
 name = "pallet-beefy-mmr"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "beefy-merkle-tree",
  "beefy-primitives",
@@ -4991,7 +4991,7 @@ dependencies = [
 [[package]]
 name = "pallet-bounties"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5009,7 +5009,7 @@ dependencies = [
 [[package]]
 name = "pallet-child-bounties"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5028,7 +5028,7 @@ dependencies = [
 [[package]]
 name = "pallet-collective"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5045,7 +5045,7 @@ dependencies = [
 [[package]]
 name = "pallet-democracy"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5061,7 +5061,7 @@ dependencies = [
 [[package]]
 name = "pallet-election-provider-multi-phase"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -5084,7 +5084,7 @@ dependencies = [
 [[package]]
 name = "pallet-election-provider-support-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -5097,7 +5097,7 @@ dependencies = [
 [[package]]
 name = "pallet-elections-phragmen"
 version = "5.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5115,7 +5115,7 @@ dependencies = [
 [[package]]
 name = "pallet-gilt"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5130,7 +5130,7 @@ dependencies = [
 [[package]]
 name = "pallet-grandpa"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5153,7 +5153,7 @@ dependencies = [
 [[package]]
 name = "pallet-identity"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "enumflags2",
  "frame-benchmarking",
@@ -5169,7 +5169,7 @@ dependencies = [
 [[package]]
 name = "pallet-im-online"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5189,7 +5189,7 @@ dependencies = [
 [[package]]
 name = "pallet-indices"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5206,7 +5206,7 @@ dependencies = [
 [[package]]
 name = "pallet-membership"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5223,7 +5223,7 @@ dependencies = [
 [[package]]
 name = "pallet-mmr"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "ckb-merkle-mountain-range",
  "frame-benchmarking",
@@ -5241,7 +5241,7 @@ dependencies = [
 [[package]]
 name = "pallet-mmr-rpc"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "jsonrpsee",
  "parity-scale-codec",
@@ -5256,7 +5256,7 @@ dependencies = [
 [[package]]
 name = "pallet-multisig"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5271,7 +5271,7 @@ dependencies = [
 [[package]]
 name = "pallet-nomination-pools"
 version = "1.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5288,7 +5288,7 @@ dependencies = [
 [[package]]
 name = "pallet-nomination-pools-benchmarking"
 version = "1.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -5307,7 +5307,7 @@ dependencies = [
 [[package]]
 name = "pallet-nomination-pools-runtime-api"
 version = "1.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -5317,7 +5317,7 @@ dependencies = [
 [[package]]
 name = "pallet-offences"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5334,7 +5334,7 @@ dependencies = [
 [[package]]
 name = "pallet-offences-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -5357,7 +5357,7 @@ dependencies = [
 [[package]]
 name = "pallet-preimage"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5373,7 +5373,7 @@ dependencies = [
 [[package]]
 name = "pallet-proxy"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5388,7 +5388,7 @@ dependencies = [
 [[package]]
 name = "pallet-recovery"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5403,7 +5403,7 @@ dependencies = [
 [[package]]
 name = "pallet-scheduler"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5419,7 +5419,7 @@ dependencies = [
 [[package]]
 name = "pallet-session"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5440,7 +5440,7 @@ dependencies = [
 [[package]]
 name = "pallet-session-benchmarking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5456,7 +5456,7 @@ dependencies = [
 [[package]]
 name = "pallet-society"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5470,7 +5470,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -5493,7 +5493,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking-reward-curve"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -5504,7 +5504,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking-reward-fn"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "log",
  "sp-arithmetic",
@@ -5513,7 +5513,7 @@ dependencies = [
 [[package]]
 name = "pallet-sudo"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5527,7 +5527,7 @@ dependencies = [
 [[package]]
 name = "pallet-timestamp"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5545,7 +5545,7 @@ dependencies = [
 [[package]]
 name = "pallet-tips"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5564,7 +5564,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -5580,7 +5580,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "jsonrpsee",
  "pallet-transaction-payment-rpc-runtime-api",
@@ -5595,7 +5595,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc-runtime-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "pallet-transaction-payment",
  "parity-scale-codec",
@@ -5606,7 +5606,7 @@ dependencies = [
 [[package]]
 name = "pallet-treasury"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5623,7 +5623,7 @@ dependencies = [
 [[package]]
 name = "pallet-utility"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -5639,7 +5639,7 @@ dependencies = [
 [[package]]
 name = "pallet-vesting"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8115,7 +8115,7 @@ dependencies = [
 [[package]]
 name = "remote-externalities"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "env_logger 0.9.0",
  "jsonrpsee",
@@ -8457,7 +8457,7 @@ dependencies = [
 [[package]]
 name = "sc-allocator"
 version = "4.1.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "log",
  "sp-core",
@@ -8468,7 +8468,7 @@ dependencies = [
 [[package]]
 name = "sc-authority-discovery"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "async-trait",
  "futures",
@@ -8495,7 +8495,7 @@ dependencies = [
 [[package]]
 name = "sc-basic-authorship"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "futures",
  "futures-timer",
@@ -8518,7 +8518,7 @@ dependencies = [
 [[package]]
 name = "sc-block-builder"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "parity-scale-codec",
  "sc-client-api",
@@ -8534,7 +8534,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "impl-trait-for-tuples",
  "memmap2 0.5.0",
@@ -8551,7 +8551,7 @@ dependencies = [
 [[package]]
 name = "sc-chain-spec-derive"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -8562,7 +8562,7 @@ dependencies = [
 [[package]]
 name = "sc-cli"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "chrono",
  "clap",
@@ -8601,7 +8601,7 @@ dependencies = [
 [[package]]
 name = "sc-client-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "fnv",
  "futures",
@@ -8629,7 +8629,7 @@ dependencies = [
 [[package]]
 name = "sc-client-db"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "hash-db",
  "kvdb",
@@ -8654,7 +8654,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "async-trait",
  "futures",
@@ -8678,7 +8678,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "async-trait",
  "fork-tree",
@@ -8720,7 +8720,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe-rpc"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "futures",
  "jsonrpsee",
@@ -8742,7 +8742,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-epochs"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "fork-tree",
  "parity-scale-codec",
@@ -8755,7 +8755,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-slots"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "async-trait",
  "futures",
@@ -8780,7 +8780,7 @@ dependencies = [
 [[package]]
 name = "sc-executor"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "lazy_static",
  "lru 0.7.8",
@@ -8807,7 +8807,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-common"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "environmental",
  "parity-scale-codec",
@@ -8823,7 +8823,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmi"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -8838,7 +8838,7 @@ dependencies = [
 [[package]]
 name = "sc-executor-wasmtime"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "cfg-if 1.0.0",
  "libc",
@@ -8859,7 +8859,7 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "ahash",
  "async-trait",
@@ -8900,7 +8900,7 @@ dependencies = [
 [[package]]
 name = "sc-finality-grandpa-rpc"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "finality-grandpa",
  "futures",
@@ -8921,7 +8921,7 @@ dependencies = [
 [[package]]
 name = "sc-informant"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "ansi_term",
  "futures",
@@ -8938,7 +8938,7 @@ dependencies = [
 [[package]]
 name = "sc-keystore"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "async-trait",
  "hex",
@@ -8953,7 +8953,7 @@ dependencies = [
 [[package]]
 name = "sc-network"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "async-trait",
  "asynchronous-codec",
@@ -9002,7 +9002,7 @@ dependencies = [
 [[package]]
 name = "sc-network-common"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "async-trait",
  "bitflags",
@@ -9025,7 +9025,7 @@ dependencies = [
 [[package]]
 name = "sc-network-gossip"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "ahash",
  "futures",
@@ -9043,7 +9043,7 @@ dependencies = [
 [[package]]
 name = "sc-network-light"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "futures",
  "hex",
@@ -9064,7 +9064,7 @@ dependencies = [
 [[package]]
 name = "sc-network-sync"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "fork-tree",
  "futures",
@@ -9092,7 +9092,7 @@ dependencies = [
 [[package]]
 name = "sc-offchain"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "bytes",
  "fnv",
@@ -9122,7 +9122,7 @@ dependencies = [
 [[package]]
 name = "sc-peerset"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "futures",
  "libp2p",
@@ -9135,7 +9135,7 @@ dependencies = [
 [[package]]
 name = "sc-proposer-metrics"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "log",
  "substrate-prometheus-endpoint",
@@ -9144,7 +9144,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "futures",
  "hash-db",
@@ -9174,7 +9174,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-api"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "futures",
  "jsonrpsee",
@@ -9197,7 +9197,7 @@ dependencies = [
 [[package]]
 name = "sc-rpc-server"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "futures",
  "jsonrpsee",
@@ -9210,7 +9210,7 @@ dependencies = [
 [[package]]
 name = "sc-service"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "async-trait",
  "directories",
@@ -9277,7 +9277,7 @@ dependencies = [
 [[package]]
 name = "sc-state-db"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -9291,7 +9291,7 @@ dependencies = [
 [[package]]
 name = "sc-sync-state-rpc"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "jsonrpsee",
  "parity-scale-codec",
@@ -9310,7 +9310,7 @@ dependencies = [
 [[package]]
 name = "sc-sysinfo"
 version = "6.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "futures",
  "libc",
@@ -9329,7 +9329,7 @@ dependencies = [
 [[package]]
 name = "sc-telemetry"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "chrono",
  "futures",
@@ -9347,7 +9347,7 @@ dependencies = [
 [[package]]
 name = "sc-tracing"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "ansi_term",
  "atty",
@@ -9378,7 +9378,7 @@ dependencies = [
 [[package]]
 name = "sc-tracing-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -9389,7 +9389,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-pool"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "futures",
  "futures-timer",
@@ -9415,7 +9415,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-pool-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "futures",
  "log",
@@ -9428,7 +9428,7 @@ dependencies = [
 [[package]]
 name = "sc-utils"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "futures",
  "futures-timer",
@@ -9913,7 +9913,7 @@ dependencies = [
 [[package]]
 name = "sp-api"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "hash-db",
  "log",
@@ -9931,7 +9931,7 @@ dependencies = [
 [[package]]
 name = "sp-api-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "blake2",
  "proc-macro-crate",
@@ -9943,7 +9943,7 @@ dependencies = [
 [[package]]
 name = "sp-application-crypto"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -9956,7 +9956,7 @@ dependencies = [
 [[package]]
 name = "sp-arithmetic"
 version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "integer-sqrt",
  "num-traits",
@@ -9971,7 +9971,7 @@ dependencies = [
 [[package]]
 name = "sp-authority-discovery"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -9984,7 +9984,7 @@ dependencies = [
 [[package]]
 name = "sp-authorship"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -9996,7 +9996,7 @@ dependencies = [
 [[package]]
 name = "sp-block-builder"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -10008,7 +10008,7 @@ dependencies = [
 [[package]]
 name = "sp-blockchain"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "futures",
  "log",
@@ -10026,7 +10026,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "async-trait",
  "futures",
@@ -10045,7 +10045,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-babe"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "async-trait",
  "merlin",
@@ -10068,7 +10068,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-slots"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -10082,7 +10082,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-vrf"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -10095,7 +10095,7 @@ dependencies = [
 [[package]]
 name = "sp-core"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "base58",
  "bitflags",
@@ -10141,7 +10141,7 @@ dependencies = [
 [[package]]
 name = "sp-core-hashing"
 version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "blake2",
  "byteorder",
@@ -10155,7 +10155,7 @@ dependencies = [
 [[package]]
 name = "sp-core-hashing-proc-macro"
 version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -10166,7 +10166,7 @@ dependencies = [
 [[package]]
 name = "sp-database"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "kvdb",
  "parking_lot 0.12.1",
@@ -10175,7 +10175,7 @@ dependencies = [
 [[package]]
 name = "sp-debug-derive"
 version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -10185,7 +10185,7 @@ dependencies = [
 [[package]]
 name = "sp-externalities"
 version = "0.12.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "environmental",
  "parity-scale-codec",
@@ -10196,7 +10196,7 @@ dependencies = [
 [[package]]
 name = "sp-finality-grandpa"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "finality-grandpa",
  "log",
@@ -10214,7 +10214,7 @@ dependencies = [
 [[package]]
 name = "sp-inherents"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "async-trait",
  "impl-trait-for-tuples",
@@ -10228,7 +10228,7 @@ dependencies = [
 [[package]]
 name = "sp-io"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "bytes",
  "futures",
@@ -10254,7 +10254,7 @@ dependencies = [
 [[package]]
 name = "sp-keyring"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "lazy_static",
  "sp-core",
@@ -10265,7 +10265,7 @@ dependencies = [
 [[package]]
 name = "sp-keystore"
 version = "0.12.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "async-trait",
  "futures",
@@ -10282,7 +10282,7 @@ dependencies = [
 [[package]]
 name = "sp-maybe-compressed-blob"
 version = "4.1.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "thiserror",
  "zstd",
@@ -10291,7 +10291,7 @@ dependencies = [
 [[package]]
 name = "sp-mmr-primitives"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -10306,7 +10306,7 @@ dependencies = [
 [[package]]
 name = "sp-npos-elections"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -10320,7 +10320,7 @@ dependencies = [
 [[package]]
 name = "sp-offchain"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "sp-api",
  "sp-core",
@@ -10330,7 +10330,7 @@ dependencies = [
 [[package]]
 name = "sp-panic-handler"
 version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "backtrace",
  "lazy_static",
@@ -10340,7 +10340,7 @@ dependencies = [
 [[package]]
 name = "sp-rpc"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "rustc-hash",
  "serde",
@@ -10350,7 +10350,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "either",
  "hash256-std-hasher",
@@ -10372,7 +10372,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "bytes",
  "impl-trait-for-tuples",
@@ -10390,7 +10390,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime-interface-proc-macro"
 version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "Inflector",
  "proc-macro-crate",
@@ -10402,7 +10402,7 @@ dependencies = [
 [[package]]
 name = "sp-sandbox"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -10416,7 +10416,7 @@ dependencies = [
 [[package]]
 name = "sp-session"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -10430,7 +10430,7 @@ dependencies = [
 [[package]]
 name = "sp-staking"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -10441,7 +10441,7 @@ dependencies = [
 [[package]]
 name = "sp-state-machine"
 version = "0.12.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "hash-db",
  "log",
@@ -10463,12 +10463,12 @@ dependencies = [
 [[package]]
 name = "sp-std"
 version = "4.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 
 [[package]]
 name = "sp-storage"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -10481,7 +10481,7 @@ dependencies = [
 [[package]]
 name = "sp-tasks"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "log",
  "sp-core",
@@ -10494,7 +10494,7 @@ dependencies = [
 [[package]]
 name = "sp-timestamp"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "async-trait",
  "futures-timer",
@@ -10510,7 +10510,7 @@ dependencies = [
 [[package]]
 name = "sp-tracing"
 version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "parity-scale-codec",
  "sp-std",
@@ -10522,7 +10522,7 @@ dependencies = [
 [[package]]
 name = "sp-transaction-pool"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "sp-api",
  "sp-runtime",
@@ -10531,7 +10531,7 @@ dependencies = [
 [[package]]
 name = "sp-transaction-storage-proof"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "async-trait",
  "log",
@@ -10547,7 +10547,7 @@ dependencies = [
 [[package]]
 name = "sp-trie"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "ahash",
  "hash-db",
@@ -10570,7 +10570,7 @@ dependencies = [
 [[package]]
 name = "sp-version"
 version = "5.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -10587,7 +10587,7 @@ dependencies = [
 [[package]]
 name = "sp-version-proc-macro"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "parity-scale-codec",
  "proc-macro2",
@@ -10598,7 +10598,7 @@ dependencies = [
 [[package]]
 name = "sp-wasm-interface"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "impl-trait-for-tuples",
  "log",
@@ -10772,7 +10772,7 @@ dependencies = [
 [[package]]
 name = "substrate-build-script-utils"
 version = "3.0.0"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "platforms",
 ]
@@ -10780,7 +10780,7 @@ dependencies = [
 [[package]]
 name = "substrate-frame-rpc-system"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "frame-system-rpc-runtime-api",
  "futures",
@@ -10801,7 +10801,7 @@ dependencies = [
 [[package]]
 name = "substrate-prometheus-endpoint"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "futures-util",
  "hyper",
@@ -10814,7 +10814,7 @@ dependencies = [
 [[package]]
 name = "substrate-state-trie-migration-rpc"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "jsonrpsee",
  "log",
@@ -10835,7 +10835,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-client"
 version = "2.0.1"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "async-trait",
  "futures",
@@ -10861,7 +10861,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-utils"
 version = "4.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "futures",
  "substrate-test-utils-derive",
@@ -10871,7 +10871,7 @@ dependencies = [
 [[package]]
 name = "substrate-test-utils-derive"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "proc-macro-crate",
  "proc-macro2",
@@ -10882,7 +10882,7 @@ dependencies = [
 [[package]]
 name = "substrate-wasm-builder"
 version = "5.0.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "ansi_term",
  "build-helper",
@@ -11596,7 +11596,7 @@ checksum = "59547bce71d9c38b83d9c0e92b6066c4253371f15005def0c30d9657f50c7642"
 [[package]]
 name = "try-runtime-cli"
 version = "0.10.0-dev"
-source = "git+https://github.com/paritytech/substrate?branch=master#12b0d8e9957c6159d433cd4601d5f297b9bf4313"
+source = "git+https://github.com/paritytech/substrate?branch=master#26193945883c773f2f14f976da3c3bd11dc0eb79"
 dependencies = [
  "clap",
  "frame-try-runtime",
diff --git a/runtime/kusama/constants/src/weights/block_weights.rs b/runtime/kusama/constants/src/weights/block_weights.rs
index 608a0206ba44..a96b7bfc11de 100644
--- a/runtime/kusama/constants/src/weights/block_weights.rs
+++ b/runtime/kusama/constants/src/weights/block_weights.rs
@@ -69,8 +69,14 @@ mod test_weights {
 		let w = super::BlockExecutionWeight::get();
 
 		// At least 100 µs.
-		assert!(w >= 100u64 * constants::WEIGHT_PER_MICROS, "Weight should be at least 100 µs.");
+		assert!(
+			w.ref_time() >= 100u64 * constants::WEIGHT_PER_MICROS.ref_time(),
+			"Weight should be at least 100 µs."
+		);
 		// At most 50 ms.
-		assert!(w <= 50u64 * constants::WEIGHT_PER_MILLIS, "Weight should be at most 50 ms.");
+		assert!(
+			w.ref_time() <= 50u64 * constants::WEIGHT_PER_MILLIS.ref_time(),
+			"Weight should be at most 50 ms."
+		);
 	}
 }
diff --git a/runtime/kusama/constants/src/weights/extrinsic_weights.rs b/runtime/kusama/constants/src/weights/extrinsic_weights.rs
index 7e27196cb4b9..dfa623b6c72a 100644
--- a/runtime/kusama/constants/src/weights/extrinsic_weights.rs
+++ b/runtime/kusama/constants/src/weights/extrinsic_weights.rs
@@ -68,8 +68,14 @@ mod test_weights {
 		let w = super::ExtrinsicBaseWeight::get();
 
 		// At least 10 µs.
-		assert!(w >= 10u64 * constants::WEIGHT_PER_MICROS, "Weight should be at least 10 µs.");
+		assert!(
+			w.ref_time() >= 10u64 * constants::WEIGHT_PER_MICROS.ref_time(),
+			"Weight should be at least 10 µs."
+		);
 		// At most 1 ms.
-		assert!(w <= constants::WEIGHT_PER_MILLIS, "Weight should be at most 1 ms.");
+		assert!(
+			w.ref_time() <= constants::WEIGHT_PER_MILLIS.ref_time(),
+			"Weight should be at most 1 ms."
+		);
 	}
 }
diff --git a/runtime/kusama/constants/src/weights/paritydb_weights.rs b/runtime/kusama/constants/src/weights/paritydb_weights.rs
index 8083ccb40019..dca7d348310c 100644
--- a/runtime/kusama/constants/src/weights/paritydb_weights.rs
+++ b/runtime/kusama/constants/src/weights/paritydb_weights.rs
@@ -42,20 +42,20 @@ pub mod constants {
 		fn sane() {
 			// At least 1 µs.
 			assert!(
-				W::get().reads(1) >= constants::WEIGHT_PER_MICROS,
+				W::get().reads(1).ref_time() >= constants::WEIGHT_PER_MICROS.ref_time(),
 				"Read weight should be at least 1 µs."
 			);
 			assert!(
-				W::get().writes(1) >= constants::WEIGHT_PER_MICROS,
+				W::get().writes(1).ref_time() >= constants::WEIGHT_PER_MICROS.ref_time(),
 				"Write weight should be at least 1 µs."
 			);
 			// At most 1 ms.
 			assert!(
-				W::get().reads(1) <= constants::WEIGHT_PER_MILLIS,
+				W::get().reads(1).ref_time() <= constants::WEIGHT_PER_MILLIS.ref_time(),
 				"Read weight should be at most 1 ms."
 			);
 			assert!(
-				W::get().writes(1) <= constants::WEIGHT_PER_MILLIS,
+				W::get().writes(1).ref_time() <= constants::WEIGHT_PER_MILLIS.ref_time(),
 				"Write weight should be at most 1 ms."
 			);
 		}
diff --git a/runtime/kusama/constants/src/weights/rocksdb_weights.rs b/runtime/kusama/constants/src/weights/rocksdb_weights.rs
index 1db87f143f3c..87867ebfe177 100644
--- a/runtime/kusama/constants/src/weights/rocksdb_weights.rs
+++ b/runtime/kusama/constants/src/weights/rocksdb_weights.rs
@@ -42,20 +42,20 @@ pub mod constants {
 		fn sane() {
 			// At least 1 µs.
 			assert!(
-				W::get().reads(1) >= constants::WEIGHT_PER_MICROS,
+				W::get().reads(1).ref_time() >= constants::WEIGHT_PER_MICROS.ref_time(),
 				"Read weight should be at least 1 µs."
 			);
 			assert!(
-				W::get().writes(1) >= constants::WEIGHT_PER_MICROS,
+				W::get().writes(1).ref_time() >= constants::WEIGHT_PER_MICROS.ref_time(),
 				"Write weight should be at least 1 µs."
 			);
 			// At most 1 ms.
 			assert!(
-				W::get().reads(1) <= constants::WEIGHT_PER_MILLIS,
+				W::get().reads(1).ref_time() <= constants::WEIGHT_PER_MILLIS.ref_time(),
 				"Read weight should be at most 1 ms."
 			);
 			assert!(
-				W::get().writes(1) <= constants::WEIGHT_PER_MILLIS,
+				W::get().writes(1).ref_time() <= constants::WEIGHT_PER_MILLIS.ref_time(),
 				"Write weight should be at most 1 ms."
 			);
 		}
diff --git a/runtime/kusama/src/tests.rs b/runtime/kusama/src/tests.rs
index 1c8e3a3caeb2..49a99d864e7b 100644
--- a/runtime/kusama/src/tests.rs
+++ b/runtime/kusama/src/tests.rs
@@ -30,7 +30,7 @@ fn remove_keys_weight_is_sensible() {
 	use runtime_common::crowdloan::WeightInfo;
 	let max_weight = <Runtime as crowdloan::Config>::WeightInfo::refund(RemoveKeysLimit::get());
 	// Max remove keys limit should be no more than half the total block weight.
-	assert!(max_weight * 2 < BlockWeights::get().max_block);
+	assert!((max_weight * 2).all_lt(BlockWeights::get().max_block));
 }
 
 #[test]
@@ -40,11 +40,9 @@ fn sample_size_is_sensible() {
 	let samples: BlockNumber = EndingPeriod::get() / SampleLength::get();
 	let max_weight: Weight = RocksDbWeight::get().reads_writes(samples.into(), samples.into());
 	// Max sample cleanup should be no more than half the total block weight.
-	assert!(max_weight * 2 < BlockWeights::get().max_block);
-	assert!(
-		<Runtime as auctions::Config>::WeightInfo::on_initialize() * 2 <
-			BlockWeights::get().max_block
-	);
+	assert!((max_weight * 2).all_lt(BlockWeights::get().max_block));
+	assert!((<Runtime as auctions::Config>::WeightInfo::on_initialize() * 2)
+		.all_lt(BlockWeights::get().max_block));
 }
 
 #[test]
@@ -132,7 +130,7 @@ fn nominator_limit() {
 	};
 
 	let mut active = 1;
-	while weight_with(active) <= OffchainSolutionWeightLimit::get() || active == all_voters {
+	while weight_with(active).all_lte(OffchainSolutionWeightLimit::get()) || active == all_voters {
 		active += 1;
 	}
 
diff --git a/runtime/parachains/src/mock.rs b/runtime/parachains/src/mock.rs
index 09bc1a2b8b6c..682d7bb0697c 100644
--- a/runtime/parachains/src/mock.rs
+++ b/runtime/parachains/src/mock.rs
@@ -395,7 +395,7 @@ impl UmpSink for TestUmpSink {
 			Ok(w) => Weight::from_ref_time(w as u64),
 			Err(_) => return Ok(Weight::zero()), // same as the real `UmpSink`
 		};
-		if weight > max_weight {
+		if weight.any_gt(max_weight) {
 			let id = sp_io::hashing::blake2_256(actual_msg);
 			return Err((id, weight))
 		}
diff --git a/runtime/parachains/src/paras/mod.rs b/runtime/parachains/src/paras/mod.rs
index e87db00f7b17..da30c44b0741 100644
--- a/runtime/parachains/src/paras/mod.rs
+++ b/runtime/parachains/src/paras/mod.rs
@@ -878,16 +878,11 @@ pub mod pallet {
 		/// Includes a statement for a PVF pre-checking vote. Potentially, finalizes the vote and
 		/// enacts the results if that was the last vote before achieving the supermajority.
 		#[pallet::weight(
-			sp_std::cmp::max(
-				sp_std::cmp::max(
-					<T as Config>::WeightInfo::include_pvf_check_statement_finalize_upgrade_accept(),
-					<T as Config>::WeightInfo::include_pvf_check_statement_finalize_upgrade_reject(),
-				),
-				sp_std::cmp::max(
-					<T as Config>::WeightInfo::include_pvf_check_statement_finalize_onboarding_accept(),
-					<T as Config>::WeightInfo::include_pvf_check_statement_finalize_onboarding_reject(),
+			<T as Config>::WeightInfo::include_pvf_check_statement_finalize_upgrade_accept()
+				.max(<T as Config>::WeightInfo::include_pvf_check_statement_finalize_upgrade_reject())
+				.max(<T as Config>::WeightInfo::include_pvf_check_statement_finalize_onboarding_accept()
+					.max(<T as Config>::WeightInfo::include_pvf_check_statement_finalize_onboarding_reject())
 				)
-			)
 		)]
 		pub fn include_pvf_check_statement(
 			origin: OriginFor<T>,
diff --git a/runtime/parachains/src/paras_inherent/mod.rs b/runtime/parachains/src/paras_inherent/mod.rs
index fbc824a4491d..188a8f677979 100644
--- a/runtime/parachains/src/paras_inherent/mod.rs
+++ b/runtime/parachains/src/paras_inherent/mod.rs
@@ -373,8 +373,8 @@ impl<T: Config> Pallet<T> {
 			// the block. It's still reasonable to protect against a massive amount of disputes.
 			if candidates_weight
 				.saturating_add(bitfields_weight)
-				.saturating_add(disputes_weight) >
-				max_block_weight
+				.saturating_add(disputes_weight)
+				.any_gt(max_block_weight)
 			{
 				log::warn!("Overweight para inherent data reached the runtime {:?}", parent_hash);
 				backed_candidates.clear();
@@ -753,7 +753,7 @@ impl<T: Config> Pallet<T> {
 			&mut rng,
 		);
 
-		if actual_weight > max_block_weight {
+		if actual_weight.any_gt(max_block_weight) {
 			log::warn!(target: LOG_TARGET, "Post weight limiting weight is still too large.");
 		}
 
@@ -820,7 +820,7 @@ fn random_sel<X, F: Fn(&X) -> Weight>(
 		// preferred indices originate from outside
 		if let Some(item) = selectables.get(preferred_idx) {
 			let updated = weight_acc.saturating_add(weight_fn(item));
-			if updated > weight_limit {
+			if updated.any_gt(weight_limit) {
 				continue
 			}
 			weight_acc = updated;
@@ -833,7 +833,7 @@ fn random_sel<X, F: Fn(&X) -> Weight>(
 		let item = &selectables[idx];
 		let updated = weight_acc.saturating_add(weight_fn(item));
 
-		if updated > weight_limit {
+		if updated.any_gt(weight_limit) {
 			continue
 		}
 		weight_acc = updated;
@@ -877,7 +877,7 @@ fn apply_weight_limit<T: Config + inclusion::Config>(
 	let total = total_bitfields_weight.saturating_add(total_candidates_weight);
 
 	// candidates + bitfields fit into the block
-	if max_consumable_weight >= total {
+	if max_consumable_weight.all_gte(total) {
 		return total
 	}
 
@@ -1243,7 +1243,7 @@ fn limit_and_sanitize_disputes<
 	// The total weight if all disputes would be included
 	let disputes_weight = multi_dispute_statement_sets_weight::<T, _, _>(&disputes);
 
-	if disputes_weight > max_consumable_weight {
+	if disputes_weight.any_gt(max_consumable_weight) {
 		let mut checked_acc = Vec::<CheckedDisputeStatementSet>::with_capacity(disputes.len());
 
 		// Since the disputes array is sorted, we may use binary search to find the beginning of
@@ -1274,7 +1274,7 @@ fn limit_and_sanitize_disputes<
 				dss.statements.len() as u32,
 			);
 			let updated = weight_acc.saturating_add(dispute_weight);
-			if max_consumable_weight >= updated {
+			if max_consumable_weight.all_gte(updated) {
 				// only apply the weight if the validity check passes
 				if let Some(checked) = dispute_statement_set_valid(dss.clone()) {
 					checked_acc.push(checked);
diff --git a/runtime/parachains/src/paras_inherent/tests.rs b/runtime/parachains/src/paras_inherent/tests.rs
index d1e02837e3c1..86d2f1c10537 100644
--- a/runtime/parachains/src/paras_inherent/tests.rs
+++ b/runtime/parachains/src/paras_inherent/tests.rs
@@ -607,11 +607,9 @@ mod enter {
 			let limit_inherent_data =
 				Pallet::<Test>::create_inherent_inner(&inherent_data.clone()).unwrap();
 			assert_ne!(limit_inherent_data, expected_para_inherent_data);
-			assert!(
-				inherent_data_weight(&limit_inherent_data) <=
-					inherent_data_weight(&expected_para_inherent_data)
-			);
-			assert!(inherent_data_weight(&limit_inherent_data) <= max_block_weight());
+			assert!(inherent_data_weight(&limit_inherent_data)
+				.all_lte(inherent_data_weight(&expected_para_inherent_data)));
+			assert!(inherent_data_weight(&limit_inherent_data).all_lte(max_block_weight()));
 
 			// Three disputes is over weight (see previous test), so we expect to only see 2 disputes
 			assert_eq!(limit_inherent_data.disputes.len(), 2);
@@ -760,7 +758,7 @@ mod enter {
 			});
 
 			let expected_para_inherent_data = scenario.data.clone();
-			assert!(max_block_weight() < inherent_data_weight(&expected_para_inherent_data));
+			assert!(max_block_weight().any_lt(inherent_data_weight(&expected_para_inherent_data)));
 
 			// Check the para inherent data is as expected:
 			// * 1 bitfield per validator (5 validators per core, 2 backed candidates, 3 disputes => 5*5 = 25)
@@ -779,7 +777,7 @@ mod enter {
 			// Expect that inherent data is filtered to include only 1 backed candidate and 2 disputes
 			assert!(limit_inherent_data != expected_para_inherent_data);
 			assert!(
-				max_block_weight() >= inherent_data_weight(&limit_inherent_data),
+				max_block_weight().all_gte(inherent_data_weight(&limit_inherent_data)),
 				"Post limiting exceeded block weight: max={} vs. inherent={}",
 				max_block_weight(),
 				inherent_data_weight(&limit_inherent_data)
diff --git a/runtime/parachains/src/ump.rs b/runtime/parachains/src/ump.rs
index 1fb3d5ada90b..f9042b5e3c7e 100644
--- a/runtime/parachains/src/ump.rs
+++ b/runtime/parachains/src/ump.rs
@@ -512,7 +512,7 @@ impl<T: Config> Pallet<T> {
 		let mut queue_cache = QueueCache::new();
 
 		while let Some(dispatchee) = cursor.peek() {
-			if weight_used >= config.ump_service_total_weight {
+			if weight_used.any_gte(config.ump_service_total_weight) {
 				// Then check whether we've reached or overshoot the
 				// preferred weight for the dispatching stage.
 				//
@@ -537,7 +537,7 @@ impl<T: Config> Pallet<T> {
 						let _ = queue_cache.consume_front::<T>(dispatchee);
 					},
 					Err((id, required)) => {
-						if required > config.ump_max_individual_weight {
+						if required.any_gt(config.ump_max_individual_weight) {
 							// overweight - add to overweight queue and continue with message
 							// execution consuming the message.
 							let upward_message = queue_cache.consume_front::<T>(dispatchee).expect(
diff --git a/runtime/polkadot/constants/src/weights/block_weights.rs b/runtime/polkadot/constants/src/weights/block_weights.rs
index 3539b432e337..211cd595acba 100644
--- a/runtime/polkadot/constants/src/weights/block_weights.rs
+++ b/runtime/polkadot/constants/src/weights/block_weights.rs
@@ -69,8 +69,14 @@ mod test_weights {
 		let w = super::BlockExecutionWeight::get();
 
 		// At least 100 µs.
-		assert!(w >= 100u64 * constants::WEIGHT_PER_MICROS, "Weight should be at least 100 µs.");
+		assert!(
+			w.ref_time() >= 100u64 * constants::WEIGHT_PER_MICROS.ref_time(),
+			"Weight should be at least 100 µs."
+		);
 		// At most 50 ms.
-		assert!(w <= 50u64 * constants::WEIGHT_PER_MILLIS, "Weight should be at most 50 ms.");
+		assert!(
+			w.ref_time() <= 50u64 * constants::WEIGHT_PER_MILLIS.ref_time(),
+			"Weight should be at most 50 ms."
+		);
 	}
 }
diff --git a/runtime/polkadot/constants/src/weights/extrinsic_weights.rs b/runtime/polkadot/constants/src/weights/extrinsic_weights.rs
index c240a886c4bb..79f1e550d33f 100644
--- a/runtime/polkadot/constants/src/weights/extrinsic_weights.rs
+++ b/runtime/polkadot/constants/src/weights/extrinsic_weights.rs
@@ -68,8 +68,14 @@ mod test_weights {
 		let w = super::ExtrinsicBaseWeight::get();
 
 		// At least 10 µs.
-		assert!(w >= 10u64 * constants::WEIGHT_PER_MICROS, "Weight should be at least 10 µs.");
+		assert!(
+			w.ref_time() >= 10u64 * constants::WEIGHT_PER_MICROS.ref_time(),
+			"Weight should be at least 10 µs."
+		);
 		// At most 1 ms.
-		assert!(w <= constants::WEIGHT_PER_MILLIS, "Weight should be at most 1 ms.");
+		assert!(
+			w.ref_time() <= constants::WEIGHT_PER_MILLIS.ref_time(),
+			"Weight should be at most 1 ms."
+		);
 	}
 }
diff --git a/runtime/polkadot/constants/src/weights/paritydb_weights.rs b/runtime/polkadot/constants/src/weights/paritydb_weights.rs
index f3ae898e07b4..9695b7bc7800 100644
--- a/runtime/polkadot/constants/src/weights/paritydb_weights.rs
+++ b/runtime/polkadot/constants/src/weights/paritydb_weights.rs
@@ -88,20 +88,20 @@ pub mod constants {
 		fn bound() {
 			// At least 1 µs.
 			assert!(
-				W::get().reads(1) >= constants::WEIGHT_PER_MICROS,
+				W::get().reads(1).ref_time() >= constants::WEIGHT_PER_MICROS.ref_time(),
 				"Read weight should be at least 1 µs."
 			);
 			assert!(
-				W::get().writes(1) >= constants::WEIGHT_PER_MICROS,
+				W::get().writes(1).ref_time() >= constants::WEIGHT_PER_MICROS.ref_time(),
 				"Write weight should be at least 1 µs."
 			);
 			// At most 1 ms.
 			assert!(
-				W::get().reads(1) <= constants::WEIGHT_PER_MILLIS,
+				W::get().reads(1).ref_time() <= constants::WEIGHT_PER_MILLIS.ref_time(),
 				"Read weight should be at most 1 ms."
 			);
 			assert!(
-				W::get().writes(1) <= constants::WEIGHT_PER_MILLIS,
+				W::get().writes(1).ref_time() <= constants::WEIGHT_PER_MILLIS.ref_time(),
 				"Write weight should be at most 1 ms."
 			);
 		}
diff --git a/runtime/polkadot/constants/src/weights/rocksdb_weights.rs b/runtime/polkadot/constants/src/weights/rocksdb_weights.rs
index f6e7b5463b32..1ed70431b9e3 100644
--- a/runtime/polkadot/constants/src/weights/rocksdb_weights.rs
+++ b/runtime/polkadot/constants/src/weights/rocksdb_weights.rs
@@ -87,20 +87,20 @@ pub mod constants {
 		fn bound() {
 			// At least 1 µs.
 			assert!(
-				W::get().reads(1) >= constants::WEIGHT_PER_MICROS,
+				W::get().reads(1).ref_time() >= constants::WEIGHT_PER_MICROS.ref_time(),
 				"Read weight should be at least 1 µs."
 			);
 			assert!(
-				W::get().writes(1) >= constants::WEIGHT_PER_MICROS,
+				W::get().writes(1).ref_time() >= constants::WEIGHT_PER_MICROS.ref_time(),
 				"Write weight should be at least 1 µs."
 			);
 			// At most 1 ms.
 			assert!(
-				W::get().reads(1) <= constants::WEIGHT_PER_MILLIS,
+				W::get().reads(1).ref_time() <= constants::WEIGHT_PER_MILLIS.ref_time(),
 				"Read weight should be at most 1 ms."
 			);
 			assert!(
-				W::get().writes(1) <= constants::WEIGHT_PER_MILLIS,
+				W::get().writes(1).ref_time() <= constants::WEIGHT_PER_MILLIS.ref_time(),
 				"Write weight should be at most 1 ms."
 			);
 		}
diff --git a/runtime/polkadot/src/lib.rs b/runtime/polkadot/src/lib.rs
index 4e8665319283..76fec6ae12c0 100644
--- a/runtime/polkadot/src/lib.rs
+++ b/runtime/polkadot/src/lib.rs
@@ -2203,7 +2203,7 @@ mod test_fees {
 			)
 		};
 
-		while weight_with(voters) <= BlockWeights::get().max_block {
+		while weight_with(voters).all_lte(BlockWeights::get().max_block) {
 			voters += 1;
 		}
 
@@ -2237,7 +2237,9 @@ mod test_fees {
 		};
 
 		let mut active = target_voters;
-		while weight_with(active) <= OffchainSolutionWeightLimit::get() || active == target_voters {
+		while weight_with(active).all_lte(OffchainSolutionWeightLimit::get()) ||
+			active == target_voters
+		{
 			active += 1;
 		}
 
diff --git a/runtime/rococo/constants/src/weights/block_weights.rs b/runtime/rococo/constants/src/weights/block_weights.rs
index 1404cca69582..c33546f80a94 100644
--- a/runtime/rococo/constants/src/weights/block_weights.rs
+++ b/runtime/rococo/constants/src/weights/block_weights.rs
@@ -69,8 +69,14 @@ mod test_weights {
 		let w = super::BlockExecutionWeight::get();
 
 		// At least 100 µs.
-		assert!(w >= 100u64 * constants::WEIGHT_PER_MICROS, "Weight should be at least 100 µs.");
+		assert!(
+			w.ref_time() >= 100u64 * constants::WEIGHT_PER_MICROS.ref_time(),
+			"Weight should be at least 100 µs."
+		);
 		// At most 50 ms.
-		assert!(w <= 50u64 * constants::WEIGHT_PER_MILLIS, "Weight should be at most 50 ms.");
+		assert!(
+			w.ref_time() <= 50u64 * constants::WEIGHT_PER_MILLIS.ref_time(),
+			"Weight should be at most 50 ms."
+		);
 	}
 }
diff --git a/runtime/rococo/constants/src/weights/extrinsic_weights.rs b/runtime/rococo/constants/src/weights/extrinsic_weights.rs
index cb51fa619d32..53255ef6e8b0 100644
--- a/runtime/rococo/constants/src/weights/extrinsic_weights.rs
+++ b/runtime/rococo/constants/src/weights/extrinsic_weights.rs
@@ -68,8 +68,14 @@ mod test_weights {
 		let w = super::ExtrinsicBaseWeight::get();
 
 		// At least 10 µs.
-		assert!(w >= 10u64 * constants::WEIGHT_PER_MICROS, "Weight should be at least 10 µs.");
+		assert!(
+			w.ref_time() >= 10u64 * constants::WEIGHT_PER_MICROS.ref_time(),
+			"Weight should be at least 10 µs."
+		);
 		// At most 1 ms.
-		assert!(w <= constants::WEIGHT_PER_MILLIS, "Weight should be at most 1 ms.");
+		assert!(
+			w.ref_time() <= constants::WEIGHT_PER_MILLIS.ref_time(),
+			"Weight should be at most 1 ms."
+		);
 	}
 }
diff --git a/runtime/rococo/constants/src/weights/paritydb_weights.rs b/runtime/rococo/constants/src/weights/paritydb_weights.rs
index 8083ccb40019..dca7d348310c 100644
--- a/runtime/rococo/constants/src/weights/paritydb_weights.rs
+++ b/runtime/rococo/constants/src/weights/paritydb_weights.rs
@@ -42,20 +42,20 @@ pub mod constants {
 		fn sane() {
 			// At least 1 µs.
 			assert!(
-				W::get().reads(1) >= constants::WEIGHT_PER_MICROS,
+				W::get().reads(1).ref_time() >= constants::WEIGHT_PER_MICROS.ref_time(),
 				"Read weight should be at least 1 µs."
 			);
 			assert!(
-				W::get().writes(1) >= constants::WEIGHT_PER_MICROS,
+				W::get().writes(1).ref_time() >= constants::WEIGHT_PER_MICROS.ref_time(),
 				"Write weight should be at least 1 µs."
 			);
 			// At most 1 ms.
 			assert!(
-				W::get().reads(1) <= constants::WEIGHT_PER_MILLIS,
+				W::get().reads(1).ref_time() <= constants::WEIGHT_PER_MILLIS.ref_time(),
 				"Read weight should be at most 1 ms."
 			);
 			assert!(
-				W::get().writes(1) <= constants::WEIGHT_PER_MILLIS,
+				W::get().writes(1).ref_time() <= constants::WEIGHT_PER_MILLIS.ref_time(),
 				"Write weight should be at most 1 ms."
 			);
 		}
diff --git a/runtime/rococo/constants/src/weights/rocksdb_weights.rs b/runtime/rococo/constants/src/weights/rocksdb_weights.rs
index 1db87f143f3c..87867ebfe177 100644
--- a/runtime/rococo/constants/src/weights/rocksdb_weights.rs
+++ b/runtime/rococo/constants/src/weights/rocksdb_weights.rs
@@ -42,20 +42,20 @@ pub mod constants {
 		fn sane() {
 			// At least 1 µs.
 			assert!(
-				W::get().reads(1) >= constants::WEIGHT_PER_MICROS,
+				W::get().reads(1).ref_time() >= constants::WEIGHT_PER_MICROS.ref_time(),
 				"Read weight should be at least 1 µs."
 			);
 			assert!(
-				W::get().writes(1) >= constants::WEIGHT_PER_MICROS,
+				W::get().writes(1).ref_time() >= constants::WEIGHT_PER_MICROS.ref_time(),
 				"Write weight should be at least 1 µs."
 			);
 			// At most 1 ms.
 			assert!(
-				W::get().reads(1) <= constants::WEIGHT_PER_MILLIS,
+				W::get().reads(1).ref_time() <= constants::WEIGHT_PER_MILLIS.ref_time(),
 				"Read weight should be at most 1 ms."
 			);
 			assert!(
-				W::get().writes(1) <= constants::WEIGHT_PER_MILLIS,
+				W::get().writes(1).ref_time() <= constants::WEIGHT_PER_MILLIS.ref_time(),
 				"Write weight should be at most 1 ms."
 			);
 		}
diff --git a/runtime/test-runtime/constants/src/weights/block_weights.rs b/runtime/test-runtime/constants/src/weights/block_weights.rs
index 7d4a931bd125..c004307336d9 100644
--- a/runtime/test-runtime/constants/src/weights/block_weights.rs
+++ b/runtime/test-runtime/constants/src/weights/block_weights.rs
@@ -39,11 +39,14 @@ pub mod constants {
 
 			// At least 100 µs.
 			assert!(
-				w >= 100u64 * constants::WEIGHT_PER_MICROS,
+				w.ref_time() >= 100u64 * constants::WEIGHT_PER_MICROS.ref_time(),
 				"Weight should be at least 100 µs."
 			);
 			// At most 50 ms.
-			assert!(w <= 50u64 * constants::WEIGHT_PER_MILLIS, "Weight should be at most 50 ms.");
+			assert!(
+				w.ref_time() <= 50u64 * constants::WEIGHT_PER_MILLIS.ref_time(),
+				"Weight should be at most 50 ms."
+			);
 		}
 	}
 }
diff --git a/runtime/test-runtime/constants/src/weights/extrinsic_weights.rs b/runtime/test-runtime/constants/src/weights/extrinsic_weights.rs
index 6c6b4a497d89..3ce6b73d5844 100644
--- a/runtime/test-runtime/constants/src/weights/extrinsic_weights.rs
+++ b/runtime/test-runtime/constants/src/weights/extrinsic_weights.rs
@@ -38,9 +38,15 @@ pub mod constants {
 			let w = super::constants::ExtrinsicBaseWeight::get();
 
 			// At least 10 µs.
-			assert!(w >= 10u64 * constants::WEIGHT_PER_MICROS, "Weight should be at least 10 µs.");
+			assert!(
+				w.ref_time() >= 10u64 * constants::WEIGHT_PER_MICROS.ref_time(),
+				"Weight should be at least 10 µs."
+			);
 			// At most 1 ms.
-			assert!(w <= constants::WEIGHT_PER_MILLIS, "Weight should be at most 1 ms.");
+			assert!(
+				w.ref_time() <= constants::WEIGHT_PER_MILLIS.ref_time(),
+				"Weight should be at most 1 ms."
+			);
 		}
 	}
 }
diff --git a/runtime/test-runtime/constants/src/weights/paritydb_weights.rs b/runtime/test-runtime/constants/src/weights/paritydb_weights.rs
index 8083ccb40019..dca7d348310c 100644
--- a/runtime/test-runtime/constants/src/weights/paritydb_weights.rs
+++ b/runtime/test-runtime/constants/src/weights/paritydb_weights.rs
@@ -42,20 +42,20 @@ pub mod constants {
 		fn sane() {
 			// At least 1 µs.
 			assert!(
-				W::get().reads(1) >= constants::WEIGHT_PER_MICROS,
+				W::get().reads(1).ref_time() >= constants::WEIGHT_PER_MICROS.ref_time(),
 				"Read weight should be at least 1 µs."
 			);
 			assert!(
-				W::get().writes(1) >= constants::WEIGHT_PER_MICROS,
+				W::get().writes(1).ref_time() >= constants::WEIGHT_PER_MICROS.ref_time(),
 				"Write weight should be at least 1 µs."
 			);
 			// At most 1 ms.
 			assert!(
-				W::get().reads(1) <= constants::WEIGHT_PER_MILLIS,
+				W::get().reads(1).ref_time() <= constants::WEIGHT_PER_MILLIS.ref_time(),
 				"Read weight should be at most 1 ms."
 			);
 			assert!(
-				W::get().writes(1) <= constants::WEIGHT_PER_MILLIS,
+				W::get().writes(1).ref_time() <= constants::WEIGHT_PER_MILLIS.ref_time(),
 				"Write weight should be at most 1 ms."
 			);
 		}
diff --git a/runtime/test-runtime/constants/src/weights/rocksdb_weights.rs b/runtime/test-runtime/constants/src/weights/rocksdb_weights.rs
index 1db87f143f3c..87867ebfe177 100644
--- a/runtime/test-runtime/constants/src/weights/rocksdb_weights.rs
+++ b/runtime/test-runtime/constants/src/weights/rocksdb_weights.rs
@@ -42,20 +42,20 @@ pub mod constants {
 		fn sane() {
 			// At least 1 µs.
 			assert!(
-				W::get().reads(1) >= constants::WEIGHT_PER_MICROS,
+				W::get().reads(1).ref_time() >= constants::WEIGHT_PER_MICROS.ref_time(),
 				"Read weight should be at least 1 µs."
 			);
 			assert!(
-				W::get().writes(1) >= constants::WEIGHT_PER_MICROS,
+				W::get().writes(1).ref_time() >= constants::WEIGHT_PER_MICROS.ref_time(),
 				"Write weight should be at least 1 µs."
 			);
 			// At most 1 ms.
 			assert!(
-				W::get().reads(1) <= constants::WEIGHT_PER_MILLIS,
+				W::get().reads(1).ref_time() <= constants::WEIGHT_PER_MILLIS.ref_time(),
 				"Read weight should be at most 1 ms."
 			);
 			assert!(
-				W::get().writes(1) <= constants::WEIGHT_PER_MILLIS,
+				W::get().writes(1).ref_time() <= constants::WEIGHT_PER_MILLIS.ref_time(),
 				"Write weight should be at most 1 ms."
 			);
 		}
diff --git a/runtime/westend/constants/src/weights/block_weights.rs b/runtime/westend/constants/src/weights/block_weights.rs
index 25fc1f8af8c3..a1bcebc89654 100644
--- a/runtime/westend/constants/src/weights/block_weights.rs
+++ b/runtime/westend/constants/src/weights/block_weights.rs
@@ -69,8 +69,14 @@ mod test_weights {
 		let w = super::BlockExecutionWeight::get();
 
 		// At least 100 µs.
-		assert!(w >= 100u64 * constants::WEIGHT_PER_MICROS, "Weight should be at least 100 µs.");
+		assert!(
+			w.ref_time() >= 100u64 * constants::WEIGHT_PER_MICROS.ref_time(),
+			"Weight should be at least 100 µs."
+		);
 		// At most 50 ms.
-		assert!(w <= 50u64 * constants::WEIGHT_PER_MILLIS, "Weight should be at most 50 ms.");
+		assert!(
+			w.ref_time() <= 50u64 * constants::WEIGHT_PER_MILLIS.ref_time(),
+			"Weight should be at most 50 ms."
+		);
 	}
 }
diff --git a/runtime/westend/constants/src/weights/extrinsic_weights.rs b/runtime/westend/constants/src/weights/extrinsic_weights.rs
index c097df593a54..9feca5255c82 100644
--- a/runtime/westend/constants/src/weights/extrinsic_weights.rs
+++ b/runtime/westend/constants/src/weights/extrinsic_weights.rs
@@ -68,8 +68,14 @@ mod test_weights {
 		let w = super::ExtrinsicBaseWeight::get();
 
 		// At least 10 µs.
-		assert!(w >= 10u64 * constants::WEIGHT_PER_MICROS, "Weight should be at least 10 µs.");
+		assert!(
+			w.ref_time() >= 10u64 * constants::WEIGHT_PER_MICROS.ref_time(),
+			"Weight should be at least 10 µs."
+		);
 		// At most 1 ms.
-		assert!(w <= constants::WEIGHT_PER_MILLIS, "Weight should be at most 1 ms.");
+		assert!(
+			w.ref_time() <= constants::WEIGHT_PER_MILLIS.ref_time(),
+			"Weight should be at most 1 ms."
+		);
 	}
 }
diff --git a/runtime/westend/constants/src/weights/paritydb_weights.rs b/runtime/westend/constants/src/weights/paritydb_weights.rs
index 8083ccb40019..dca7d348310c 100644
--- a/runtime/westend/constants/src/weights/paritydb_weights.rs
+++ b/runtime/westend/constants/src/weights/paritydb_weights.rs
@@ -42,20 +42,20 @@ pub mod constants {
 		fn sane() {
 			// At least 1 µs.
 			assert!(
-				W::get().reads(1) >= constants::WEIGHT_PER_MICROS,
+				W::get().reads(1).ref_time() >= constants::WEIGHT_PER_MICROS.ref_time(),
 				"Read weight should be at least 1 µs."
 			);
 			assert!(
-				W::get().writes(1) >= constants::WEIGHT_PER_MICROS,
+				W::get().writes(1).ref_time() >= constants::WEIGHT_PER_MICROS.ref_time(),
 				"Write weight should be at least 1 µs."
 			);
 			// At most 1 ms.
 			assert!(
-				W::get().reads(1) <= constants::WEIGHT_PER_MILLIS,
+				W::get().reads(1).ref_time() <= constants::WEIGHT_PER_MILLIS.ref_time(),
 				"Read weight should be at most 1 ms."
 			);
 			assert!(
-				W::get().writes(1) <= constants::WEIGHT_PER_MILLIS,
+				W::get().writes(1).ref_time() <= constants::WEIGHT_PER_MILLIS.ref_time(),
 				"Write weight should be at most 1 ms."
 			);
 		}
diff --git a/runtime/westend/constants/src/weights/rocksdb_weights.rs b/runtime/westend/constants/src/weights/rocksdb_weights.rs
index 1db87f143f3c..87867ebfe177 100644
--- a/runtime/westend/constants/src/weights/rocksdb_weights.rs
+++ b/runtime/westend/constants/src/weights/rocksdb_weights.rs
@@ -42,20 +42,20 @@ pub mod constants {
 		fn sane() {
 			// At least 1 µs.
 			assert!(
-				W::get().reads(1) >= constants::WEIGHT_PER_MICROS,
+				W::get().reads(1).ref_time() >= constants::WEIGHT_PER_MICROS.ref_time(),
 				"Read weight should be at least 1 µs."
 			);
 			assert!(
-				W::get().writes(1) >= constants::WEIGHT_PER_MICROS,
+				W::get().writes(1).ref_time() >= constants::WEIGHT_PER_MICROS.ref_time(),
 				"Write weight should be at least 1 µs."
 			);
 			// At most 1 ms.
 			assert!(
-				W::get().reads(1) <= constants::WEIGHT_PER_MILLIS,
+				W::get().reads(1).ref_time() <= constants::WEIGHT_PER_MILLIS.ref_time(),
 				"Read weight should be at most 1 ms."
 			);
 			assert!(
-				W::get().writes(1) <= constants::WEIGHT_PER_MILLIS,
+				W::get().writes(1).ref_time() <= constants::WEIGHT_PER_MILLIS.ref_time(),
 				"Write weight should be at most 1 ms."
 			);
 		}
diff --git a/runtime/westend/src/tests.rs b/runtime/westend/src/tests.rs
index 32a8e42e0043..0257be0529a0 100644
--- a/runtime/westend/src/tests.rs
+++ b/runtime/westend/src/tests.rs
@@ -24,7 +24,7 @@ fn remove_keys_weight_is_sensible() {
 	use runtime_common::crowdloan::WeightInfo;
 	let max_weight = <Runtime as crowdloan::Config>::WeightInfo::refund(RemoveKeysLimit::get());
 	// Max remove keys limit should be no more than half the total block weight.
-	assert!(max_weight * 2 < BlockWeights::get().max_block);
+	assert!((max_weight * 2).all_lt(BlockWeights::get().max_block));
 }
 
 #[test]
@@ -35,11 +35,9 @@ fn sample_size_is_sensible() {
 	let max_weight: frame_support::weights::Weight =
 		RocksDbWeight::get().reads_writes(samples.into(), samples.into());
 	// Max sample cleanup should be no more than half the total block weight.
-	assert!(max_weight * 2 < BlockWeights::get().max_block);
-	assert!(
-		<Runtime as auctions::Config>::WeightInfo::on_initialize() * 2 <
-			BlockWeights::get().max_block
-	);
+	assert!((max_weight * 2).all_lt(BlockWeights::get().max_block));
+	assert!((<Runtime as auctions::Config>::WeightInfo::on_initialize() * 2)
+		.all_lt(BlockWeights::get().max_block));
 }
 
 #[test]
@@ -67,5 +65,5 @@ fn sanity_check_teleport_assets_weight() {
 	.get_dispatch_info()
 	.weight;
 
-	assert!(weight * 50 < BlockWeights::get().max_block);
+	assert!((weight * 50).all_lt(BlockWeights::get().max_block));
 }
diff --git a/xcm/pallet-xcm/src/lib.rs b/xcm/pallet-xcm/src/lib.rs
index d9c69997dc86..dd075c69424d 100644
--- a/xcm/pallet-xcm/src/lib.rs
+++ b/xcm/pallet-xcm/src/lib.rs
@@ -908,7 +908,7 @@ pub mod pallet {
 							SupportedVersion::<T>::insert(XCM_VERSION, new_key, value);
 						}
 						weight_used.saturating_accrue(todo_sv_migrate_weight);
-						if weight_used >= weight_cutoff {
+						if weight_used.any_gte(weight_cutoff) {
 							return (weight_used, Some(stage))
 						}
 					}
@@ -922,7 +922,7 @@ pub mod pallet {
 							VersionNotifiers::<T>::insert(XCM_VERSION, new_key, value);
 						}
 						weight_used.saturating_accrue(todo_vn_migrate_weight);
-						if weight_used >= weight_cutoff {
+						if weight_used.any_gte(weight_cutoff) {
 							return (weight_used, Some(stage))
 						}
 					}
@@ -963,7 +963,7 @@ pub mod pallet {
 					};
 					Self::deposit_event(event);
 					weight_used.saturating_accrue(todo_vnt_notify_weight);
-					if weight_used >= weight_cutoff {
+					if weight_used.any_gte(weight_cutoff) {
 						let last = Some(iter.last_raw_key().into());
 						return (weight_used, Some(NotifyCurrentTargets(last)))
 					}
@@ -981,7 +981,7 @@ pub mod pallet {
 									old_key, value.0,
 								));
 								weight_used.saturating_accrue(todo_vnt_migrate_fail_weight);
-								if weight_used >= weight_cutoff {
+								if weight_used.any_gte(weight_cutoff) {
 									return (weight_used, Some(stage))
 								}
 								continue
@@ -1011,7 +1011,7 @@ pub mod pallet {
 							Self::deposit_event(event);
 							weight_used.saturating_accrue(todo_vnt_notify_migrate_weight);
 						}
-						if weight_used >= weight_cutoff {
+						if weight_used.any_gte(weight_cutoff) {
 							return (weight_used, Some(stage))
 						}
 					}
@@ -1405,7 +1405,7 @@ pub mod pallet {
 								Queries::<T>::remove(query_id);
 								let weight = call.get_dispatch_info().weight;
 								let max_weight = Weight::from_ref_time(max_weight);
-								if weight > max_weight {
+								if weight.any_gt(max_weight) {
 									let e = Event::NotifyOverweight(
 										query_id,
 										pallet_index,