diff --git a/.maintain/bench-check/hydradx-bench-data.json b/.maintain/bench-check/hydradx-bench-data.json
deleted file mode 100644
index 42a5ec735..000000000
--- a/.maintain/bench-check/hydradx-bench-data.json
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-    "pallet-claims": {
-        "claim": 189.0
-    }
-}
\ No newline at end of file
diff --git a/.maintain/pallet-weight-template.hbs b/.maintain/pallet-weight-template.hbs
deleted file mode 100644
index cd42ab63e..000000000
--- a/.maintain/pallet-weight-template.hbs
+++ /dev/null
@@ -1,138 +0,0 @@
-// This file is part of HydraDX.
-
-// Copyright (C) 2020-2023  Intergalactic, Limited (GIB).
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-{{header}}
-//! Autogenerated weights for `{{pallet}}`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION {{version}}
-//! DATE: {{date}}, STEPS: `{{cmd.steps}}`, REPEAT: `{{cmd.repeat}}`, LOW RANGE: `{{cmd.lowest_range_values}}`, HIGH RANGE: `{{cmd.highest_range_values}}`
-//! WORST CASE MAP SIZE: `{{cmd.worst_case_map_values}}`
-//! HOSTNAME: `{{hostname}}`, CPU: `{{cpuname}}`
-//! WASM-EXECUTION: `{{cmd.wasm_execution}}`, CHAIN: `{{cmd.chain}}`, DB CACHE: `{{cmd.db_cache}}`
-
-// Executed Command:
-{{#each args as |arg|}}
-// {{arg}}
-{{/each}}
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
-use core::marker::PhantomData;
-
-/// Weight functions needed for `{{pallet}}`.
-pub trait WeightInfo {
-	{{#each benchmarks as |benchmark|}}
-	fn {{benchmark.name~}}
-	(
-		{{~#each benchmark.components as |c| ~}}
-		{{c.name}}: u32, {{/each~}}
-	) -> Weight;
-	{{/each}}
-}
-
-/// Weights for `{{pallet}}` using the HydraDX node and recommended hardware.
-pub struct HydraWeight<T>(PhantomData<T>);
-{{#if (eq pallet "frame_system")}}
-impl<T: crate::Config> WeightInfo for HydraWeight<T> {
-{{else}}
-impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
-{{/if}}
-	{{#each benchmarks as |benchmark|}}
-	{{#each benchmark.comments as |comment|}}
-	/// {{comment}}
-	{{/each}}
-	{{#each benchmark.component_ranges as |range|}}
-	/// The range of component `{{range.name}}` is `[{{range.min}}, {{range.max}}]`.
-	{{/each}}
-	fn {{benchmark.name~}}
-	(
-		{{~#each benchmark.components as |c| ~}}
-		{{~#if (not c.is_used)}}_{{/if}}{{c.name}}: u32, {{/each~}}
-	) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `{{benchmark.base_recorded_proof_size}}{{#each benchmark.component_recorded_proof_size as |cp|}} + {{cp.name}} * ({{cp.slope}} ±{{underscore cp.error}}){{/each}}`
-		//  Estimated: `{{benchmark.base_calculated_proof_size}}{{#each benchmark.component_calculated_proof_size as |cp|}} + {{cp.name}} * ({{cp.slope}} ±{{underscore cp.error}}){{/each}}`
-		// Minimum execution time: {{underscore benchmark.min_execution_time}}_000 picoseconds.
-		Weight::from_parts({{underscore benchmark.base_weight}}, {{benchmark.base_calculated_proof_size}})
-			{{#each benchmark.component_weight as |cw|}}
-			// Standard Error: {{underscore cw.error}}
-			.saturating_add(Weight::from_parts({{underscore cw.slope}}, 0).saturating_mul({{cw.name}}.into()))
-			{{/each}}
-			{{#if (ne benchmark.base_reads "0")}}
-			.saturating_add(T::DbWeight::get().reads({{benchmark.base_reads}}_u64))
-			{{/if}}
-			{{#each benchmark.component_reads as |cr|}}
-			.saturating_add(T::DbWeight::get().reads(({{cr.slope}}_u64).saturating_mul({{cr.name}}.into())))
-			{{/each}}
-			{{#if (ne benchmark.base_writes "0")}}
-			.saturating_add(T::DbWeight::get().writes({{benchmark.base_writes}}_u64))
-			{{/if}}
-			{{#each benchmark.component_writes as |cw|}}
-			.saturating_add(T::DbWeight::get().writes(({{cw.slope}}_u64).saturating_mul({{cw.name}}.into())))
-			{{/each}}
-			{{#each benchmark.component_calculated_proof_size as |cp|}}
-			.saturating_add(Weight::from_parts(0, {{cp.slope}}).saturating_mul({{cp.name}}.into()))
-			{{/each}}
-	}
-	{{/each}}
-}
-
-// For backwards compatibility and tests.
-impl WeightInfo for () {
-	{{#each benchmarks as |benchmark|}}
-	{{#each benchmark.comments as |comment|}}
-	/// {{comment}}
-	{{/each}}
-	{{#each benchmark.component_ranges as |range|}}
-	/// The range of component `{{range.name}}` is `[{{range.min}}, {{range.max}}]`.
-	{{/each}}
-	fn {{benchmark.name~}}
-	(
-		{{~#each benchmark.components as |c| ~}}
-		{{~#if (not c.is_used)}}_{{/if}}{{c.name}}: u32, {{/each~}}
-	) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `{{benchmark.base_recorded_proof_size}}{{#each benchmark.component_recorded_proof_size as |cp|}} + {{cp.name}} * ({{cp.slope}} ±{{underscore cp.error}}){{/each}}`
-		//  Estimated: `{{benchmark.base_calculated_proof_size}}{{#each benchmark.component_calculated_proof_size as |cp|}} + {{cp.name}} * ({{cp.slope}} ±{{underscore cp.error}}){{/each}}`
-		// Minimum execution time: {{underscore benchmark.min_execution_time}}_000 picoseconds.
-		Weight::from_parts({{underscore benchmark.base_weight}}, {{benchmark.base_calculated_proof_size}})
-			{{#each benchmark.component_weight as |cw|}}
-			// Standard Error: {{underscore cw.error}}
-			.saturating_add(Weight::from_parts({{underscore cw.slope}}, 0).saturating_mul({{cw.name}}.into()))
-			{{/each}}
-			{{#if (ne benchmark.base_reads "0")}}
-			.saturating_add(RocksDbWeight::get().reads({{benchmark.base_reads}}_u64))
-			{{/if}}
-			{{#each benchmark.component_reads as |cr|}}
-			.saturating_add(RocksDbWeight::get().reads(({{cr.slope}}_u64).saturating_mul({{cr.name}}.into())))
-			{{/each}}
-			{{#if (ne benchmark.base_writes "0")}}
-			.saturating_add(RocksDbWeight::get().writes({{benchmark.base_writes}}_u64))
-			{{/if}}
-			{{#each benchmark.component_writes as |cw|}}
-			.saturating_add(RocksDbWeight::get().writes(({{cw.slope}}_u64).saturating_mul({{cw.name}}.into())))
-			{{/each}}
-			{{#each benchmark.component_calculated_proof_size as |cp|}}
-			.saturating_add(Weight::from_parts(0, {{cp.slope}}).saturating_mul({{cp.name}}.into()))
-			{{/each}}
-	}
-	{{/each}}
-}
diff --git a/.maintain/run_benchmarks.sh b/.maintain/run_benchmarks.sh
deleted file mode 100644
index 3ce0c5ffb..000000000
--- a/.maintain/run_benchmarks.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-cargo run --release --features=runtime-benchmarks -- benchmark --chain=local --steps=5 --repeat=20  --execution=wasm --wasm-execution=compiled --heap-pages=4096 --template=.maintain/pallet-weight-template-no-back.hbs  --pallet=pallet_asset_registry  --output=asset_registry.rs --extrinsic="*"
-cargo run --release --features=runtime-benchmarks -- benchmark --chain=local --steps=5 --repeat=20  --execution=wasm --wasm-execution=compiled --heap-pages=4096 --template=.maintain/pallet-weight-template-no-back.hbs  --pallet=pallet_claims --output=claims.rs --extrinsic="*"
-cargo run --release --features=runtime-benchmarks -- benchmark --chain=local --steps=5 --repeat=20  --execution=wasm --wasm-execution=compiled --heap-pages=4096 --template=.maintain/pallet-weight-template-no-back.hbs  --pallet=orml_currencies --output=currencies.rs --extrinsic="*"
-cargo run --release --features=runtime-benchmarks -- benchmark --chain=local --steps=5 --repeat=20  --execution=wasm --wasm-execution=compiled --heap-pages=4096 --template=.maintain/pallet-weight-template-no-back.hbs  --pallet=orml_tokens --output=tokens.rs --extrinsic="*"
-cargo run --release --features=runtime-benchmarks -- benchmark --chain=local --steps=5 --repeat=20  --execution=wasm --wasm-execution=compiled --heap-pages=4096 --template=.maintain/pallet-weight-template-no-back.hbs  --pallet=orml_vesting --output=vesting.rs --extrinsic="*"
-cargo run --release --features=runtime-benchmarks -- benchmark --chain=local --steps=5 --repeat=20  --execution=wasm --wasm-execution=compiled --heap-pages=4096 --template=.maintain/pallet-weight-template-no-back.hbs  --pallet=pallet_transaction_multi_payment --output=transaction_multi_payment.rs --extrinsic="*"
-cargo run --release --features=runtime-benchmarks -- benchmark --chain=local --steps=5 --repeat=20  --execution=wasm --wasm-execution=compiled --heap-pages=4096 --template=.maintain/pallet-weight-template-no-back.hbs  --pallet=pallet_balances --output=balances.rs --extrinsic="*"
-cargo run --release --features=runtime-benchmarks -- benchmark --chain=local --steps=5 --repeat=20  --execution=wasm --wasm-execution=compiled --heap-pages=4096 --template=.maintain/pallet-weight-template-no-back.hbs  --pallet=pallet_collator_selection --output=collator_selection.rs --extrinsic="*"
-cargo run --release --features=runtime-benchmarks -- benchmark --chain=local --steps=5 --repeat=20  --execution=wasm --wasm-execution=compiled --heap-pages=4096 --template=.maintain/pallet-weight-template-no-back.hbs  --pallet=pallet_timestamp --output=timestamp.rs --extrinsic="*"
-cargo run --release --features=runtime-benchmarks -- benchmark --chain=local --steps=5 --repeat=20  --execution=wasm --wasm-execution=compiled --heap-pages=4096 --template=.maintain/pallet-weight-template-no-back.hbs  --pallet=pallet_treasury --output=treasury.rs --extrinsic="*"
-cargo run --release --features=runtime-benchmarks -- benchmark --chain=local --steps=5 --repeat=20  --execution=wasm --wasm-execution=compiled --heap-pages=4096 --template=.maintain/pallet-weight-template-no-back.hbs  --pallet=pallet_preimage --output=preimage.rs --extrinsic="*"
-cargo run --release --features=runtime-benchmarks -- benchmark --chain=local --steps=5 --repeat=20  --execution=wasm --wasm-execution=compiled --heap-pages=4096 --template=.maintain/pallet-weight-template-no-back.hbs  --pallet=pallet_scheduler --output=scheduler.rs --extrinsic="*"
-cargo run --release --features=runtime-benchmarks -- benchmark --chain=local --steps=5 --repeat=20  --execution=wasm --wasm-execution=compiled --heap-pages=4096 --template=.maintain/pallet-weight-template-no-back.hbs  --pallet=pallet_identity --output=identity.rs --extrinsic="*"
-cargo run --release --features=runtime-benchmarks -- benchmark --chain=local --steps=5 --repeat=20  --execution=wasm --wasm-execution=compiled --heap-pages=4096 --template=.maintain/pallet-weight-template-no-back.hbs  --pallet=pallet_proxy --output=proxy.rs --extrinsic="*"
-cargo run --release --features=runtime-benchmarks -- benchmark --chain=local --steps=5 --repeat=20  --execution=wasm --wasm-execution=compiled --heap-pages=4096 --template=.maintain/pallet-weight-template-no-back.hbs  --pallet=pallet_utility --output=utility.rs --extrinsic="*"
-cargo run --release --features=runtime-benchmarks -- benchmark --chain=local --steps=5 --repeat=20  --execution=wasm --wasm-execution=compiled --heap-pages=4096 --template=.maintain/pallet-weight-template-no-back.hbs  --pallet=pallet_democracy --output=democracy.rs --extrinsic="*"
-cargo run --release --features=runtime-benchmarks -- benchmark --chain=local --steps=5 --repeat=20  --execution=wasm --wasm-execution=compiled --heap-pages=4096 --template=.maintain/pallet-weight-template-no-back.hbs  --pallet=pallet_tips --output=tips.rs --extrinsic="*"
-cargo run --release --features=runtime-benchmarks -- benchmark --chain=local --steps=5 --repeat=20  --execution=wasm --wasm-execution=compiled --heap-pages=4096 --template=.maintain/pallet-weight-template-no-back.hbs  --pallet=tech  --output=technical_comittee.rs --extrinsic="*"
-cargo run --release --features=runtime-benchmarks -- benchmark --chain=local --steps=5 --repeat=20  --execution=wasm --wasm-execution=compiled --heap-pages=4096 --template=.maintain/pallet-weight-template-no-back.hbs  --pallet=council--output=council.rs --extrinsic="*"
-cargo run --release --features=runtime-benchmarks -- benchmark --chain=local --steps=5 --repeat=20  --execution=wasm --wasm-execution=compiled --heap-pages=4096 --template=.maintain/pallet-weight-template-no-back.hbs  --pallet=frame_system--output=system.rs --extrinsic="*"
diff --git a/Cargo.lock b/Cargo.lock
index bd31e2029..6ab21d65e 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -53,7 +53,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ac1f845298e95f983ff1944b728ae08b8cebab80d684f0a832ed0fc74dfa27e2"
 dependencies = [
  "cfg-if",
- "cipher",
+ "cipher 0.4.4",
  "cpufeatures",
 ]
 
@@ -65,10 +65,10 @@ checksum = "831010a0f742e1209b3bcea8fab6a8e149051ba6099432c8cb2cc117dec3ead1"
 dependencies = [
  "aead",
  "aes",
- "cipher",
+ "cipher 0.4.4",
  "ctr",
  "ghash",
- "subtle",
+ "subtle 2.4.1",
 ]
 
 [[package]]
@@ -157,15 +157,16 @@ dependencies = [
 
 [[package]]
 name = "anstream"
-version = "0.6.5"
+version = "0.6.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d664a92ecae85fd0a7392615844904654d1d5f5514837f471ddef4a057aba1b6"
+checksum = "418c75fa768af9c03be99d17643f93f79bbba589895012a80e3452a19ddda15b"
 dependencies = [
  "anstyle",
  "anstyle-parse",
  "anstyle-query",
  "anstyle-wincon",
  "colorchoice",
+ "is_terminal_polyfill",
  "utf8parse",
 ]
 
@@ -220,16 +221,39 @@ dependencies = [
 
 [[package]]
 name = "aquamarine"
-version = "0.3.3"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d1da02abba9f9063d786eab1509833ebb2fac0f966862ca59439c76b9c566760"
+checksum = "21cc1548309245035eb18aa7f0967da6bc65587005170c56e6ef2788a4cf3f4e"
 dependencies = [
  "include_dir",
  "itertools 0.10.5",
  "proc-macro-error",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.61",
+]
+
+[[package]]
+name = "ark-bls12-377"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fb00293ba84f51ce3bd026bd0de55899c4e68f0a39a5728cebae3a73ffdc0a4f"
+dependencies = [
+ "ark-ec",
+ "ark-ff",
+ "ark-std",
+]
+
+[[package]]
+name = "ark-bls12-377-ext"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "20c7021f180a0cbea0380eba97c2af3c57074cdaffe0eef7e840e1c9f2841e55"
+dependencies = [
+ "ark-bls12-377",
+ "ark-ec",
+ "ark-models-ext",
+ "ark-std",
 ]
 
 [[package]]
@@ -244,6 +268,45 @@ dependencies = [
  "ark-std",
 ]
 
+[[package]]
+name = "ark-bls12-381-ext"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b1dc4b3d08f19e8ec06e949712f95b8361e43f1391d94f65e4234df03480631c"
+dependencies = [
+ "ark-bls12-381",
+ "ark-ec",
+ "ark-ff",
+ "ark-models-ext",
+ "ark-serialize",
+ "ark-std",
+]
+
+[[package]]
+name = "ark-bw6-761"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e0605daf0cc5aa2034b78d008aaf159f56901d92a52ee4f6ecdfdac4f426700"
+dependencies = [
+ "ark-bls12-377",
+ "ark-ec",
+ "ark-ff",
+ "ark-std",
+]
+
+[[package]]
+name = "ark-bw6-761-ext"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ccee5fba47266f460067588ee1bf070a9c760bf2050c1c509982c5719aadb4f2"
+dependencies = [
+ "ark-bw6-761",
+ "ark-ec",
+ "ark-ff",
+ "ark-models-ext",
+ "ark-std",
+]
+
 [[package]]
 name = "ark-ec"
 version = "0.4.2"
@@ -258,9 +321,35 @@ dependencies = [
  "hashbrown 0.13.2",
  "itertools 0.10.5",
  "num-traits",
+ "rayon",
  "zeroize",
 ]
 
+[[package]]
+name = "ark-ed-on-bls12-377"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b10d901b9ac4b38f9c32beacedfadcdd64e46f8d7f8e88c1ae1060022cf6f6c6"
+dependencies = [
+ "ark-bls12-377",
+ "ark-ec",
+ "ark-ff",
+ "ark-std",
+]
+
+[[package]]
+name = "ark-ed-on-bls12-377-ext"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "524a4fb7540df2e1a8c2e67a83ba1d1e6c3947f4f9342cc2359fc2e789ad731d"
+dependencies = [
+ "ark-ec",
+ "ark-ed-on-bls12-377",
+ "ark-ff",
+ "ark-models-ext",
+ "ark-std",
+]
+
 [[package]]
 name = "ark-ed-on-bls12-381-bandersnatch"
 version = "0.4.0"
@@ -273,6 +362,19 @@ dependencies = [
  "ark-std",
 ]
 
+[[package]]
+name = "ark-ed-on-bls12-381-bandersnatch-ext"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d15185f1acb49a07ff8cbe5f11a1adc5a93b19e211e325d826ae98e98e124346"
+dependencies = [
+ "ark-ec",
+ "ark-ed-on-bls12-381-bandersnatch",
+ "ark-ff",
+ "ark-models-ext",
+ "ark-std",
+]
+
 [[package]]
 name = "ark-ff"
 version = "0.4.2"
@@ -317,29 +419,29 @@ dependencies = [
 ]
 
 [[package]]
-name = "ark-poly"
-version = "0.4.2"
+name = "ark-models-ext"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d320bfc44ee185d899ccbadfa8bc31aab923ce1558716e1997a1e74057fe86bf"
+checksum = "3e9eab5d4b5ff2f228b763d38442adc9b084b0a465409b059fac5c2308835ec2"
 dependencies = [
+ "ark-ec",
  "ark-ff",
  "ark-serialize",
  "ark-std",
  "derivative",
- "hashbrown 0.13.2",
 ]
 
 [[package]]
-name = "ark-scale"
-version = "0.0.10"
+name = "ark-poly"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "49b08346a3e38e2be792ef53ee168623c9244d968ff00cd70fb9932f6fe36393"
+checksum = "d320bfc44ee185d899ccbadfa8bc31aab923ce1558716e1997a1e74057fe86bf"
 dependencies = [
- "ark-ec",
  "ark-ff",
  "ark-serialize",
  "ark-std",
- "parity-scale-codec",
+ "derivative",
+ "hashbrown 0.13.2",
 ]
 
 [[package]]
@@ -359,7 +461,7 @@ dependencies = [
 [[package]]
 name = "ark-secret-scalar"
 version = "0.0.2"
-source = "git+https://github.com/w3f/ring-vrf?rev=3119f51#3119f51b54b69308abfb0671f6176cb125ae1bf1"
+source = "git+https://github.com/w3f/ring-vrf?rev=e9782f9#e9782f938629c90f3adb3fff2358bc8d1386af3e"
 dependencies = [
  "ark-ec",
  "ark-ff",
@@ -367,7 +469,7 @@ dependencies = [
  "ark-std",
  "ark-transcript",
  "digest 0.10.7",
- "rand_core 0.6.4",
+ "getrandom_or_panic",
  "zeroize",
 ]
 
@@ -401,13 +503,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94893f1e0c6eeab764ade8dc4c0db24caf4fe7cbbaafc0eba0a9030f447b5185"
 dependencies = [
  "num-traits",
- "rand 0.8.5",
+ "rand",
+ "rayon",
 ]
 
 [[package]]
 name = "ark-transcript"
 version = "0.0.2"
-source = "git+https://github.com/w3f/ring-vrf?rev=3119f51#3119f51b54b69308abfb0671f6176cb125ae1bf1"
+source = "git+https://github.com/w3f/ring-vrf?rev=e9782f9#e9782f938629c90f3adb3fff2358bc8d1386af3e"
 dependencies = [
  "ark-ff",
  "ark-serialize",
@@ -417,6 +520,12 @@ dependencies = [
  "sha3",
 ]
 
+[[package]]
+name = "array-bytes"
+version = "4.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f52f63c5c1316a16a4b35eaac8b76a98248961a533f061684cb2a7cb0eafb6c6"
+
 [[package]]
 name = "array-bytes"
 version = "6.2.2"
@@ -632,17 +741,6 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
-[[package]]
-name = "async-recursion"
-version = "1.0.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5fd55a5ba1179988837d24ab4c7cc8ed6efdeff578ede0416b4225a5fca35bd0"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.42",
-]
-
 [[package]]
 name = "async-signal"
 version = "0.2.5"
@@ -675,7 +773,7 @@ checksum = "fdf6721fb0140e4f897002dd086c06f6c27775df19cfe1fccb21181a48fd2c98"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.42",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -755,14 +853,13 @@ dependencies = [
 
 [[package]]
 name = "bandersnatch_vrfs"
-version = "0.0.1"
-source = "git+https://github.com/w3f/ring-vrf?rev=3119f51#3119f51b54b69308abfb0671f6176cb125ae1bf1"
+version = "0.0.4"
+source = "git+https://github.com/w3f/ring-vrf?rev=e9782f9#e9782f938629c90f3adb3fff2358bc8d1386af3e"
 dependencies = [
  "ark-bls12-381",
  "ark-ec",
  "ark-ed-on-bls12-381-bandersnatch",
  "ark-ff",
- "ark-scale 0.0.12",
  "ark-serialize",
  "ark-std",
  "dleq_vrf",
@@ -772,6 +869,8 @@ dependencies = [
  "rand_core 0.6.4",
  "ring 0.1.0",
  "sha2 0.10.8",
+ "sp-ark-bls12-381",
+ "sp-ark-ed-on-bls12-381-bandersnatch",
  "zeroize",
 ]
 
@@ -825,8 +924,8 @@ dependencies = [
 
 [[package]]
 name = "binary-merkle-tree"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "13.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "hash-db 0.16.0",
  "log",
@@ -859,7 +958,7 @@ dependencies = [
  "regex",
  "rustc-hash",
  "shlex",
- "syn 2.0.42",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -869,6 +968,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "93f2635620bf0b9d4576eb7bb9a38a55df78bd1205d26fa994b25911a69f212f"
 dependencies = [
  "bitcoin_hashes",
+ "rand",
+ "rand_core 0.6.4",
+ "serde",
+ "unicode-normalization",
 ]
 
 [[package]]
@@ -912,10 +1015,23 @@ checksum = "1bc2832c24239b0141d5674bb9174f9d68a8b5b3f2753311927c172ca46f7e9c"
 dependencies = [
  "funty",
  "radium",
+ "serde",
  "tap",
  "wyz",
 ]
 
+[[package]]
+name = "blake2"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "94cb07b0da6a73955f8fb85d24c466778e70cda767a568229b104f0264089330"
+dependencies = [
+ "byte-tools",
+ "crypto-mac 0.7.0",
+ "digest 0.8.1",
+ "opaque-debug 0.2.3",
+]
+
 [[package]]
 name = "blake2"
 version = "0.10.6"
@@ -1027,9 +1143,9 @@ dependencies = [
 
 [[package]]
 name = "bounded-collections"
-version = "0.1.9"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca548b6163b872067dc5eb82fd130c56881435e30367d2073594a3d9744120dd"
+checksum = "d32385ecb91a31bddaf908e8dcf4a15aef1bcd3913cc03ebfad02ff6d568abc1"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -1046,6 +1162,17 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "bp-xcm-bridge-hub-router"
+version = "0.6.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
+dependencies = [
+ "parity-scale-codec",
+ "scale-info",
+ "sp-core",
+ "sp-runtime",
+]
+
 [[package]]
 name = "bs58"
 version = "0.4.0"
@@ -1138,6 +1265,16 @@ dependencies = [
  "pkg-config",
 ]
 
+[[package]]
+name = "c2-chacha"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d27dae93fe7b1e0424dc57179ac396908c26b035a87234809f5c4dfd1b47dc80"
+dependencies = [
+ "cipher 0.2.5",
+ "ppv-lite86",
+]
+
 [[package]]
 name = "camino"
 version = "1.1.6"
@@ -1234,6 +1371,16 @@ version = "0.1.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fd16c4719339c4530435d38e511904438d07cce7950afa3718a84ac36c10e89e"
 
+[[package]]
+name = "chacha"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ddf3c081b5fba1e5615640aae998e0fbd10c24cbd897ee39ed754a77601a4862"
+dependencies = [
+ "byteorder",
+ "keystream",
+]
+
 [[package]]
 name = "chacha20"
 version = "0.9.1"
@@ -1241,7 +1388,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c3613f74bd2eac03dad61bd53dbe620703d4371614fe0bc3b9f04dd36fe4e818"
 dependencies = [
  "cfg-if",
- "cipher",
+ "cipher 0.4.4",
  "cpufeatures",
 ]
 
@@ -1253,7 +1400,7 @@ checksum = "10cd79432192d1c0f4e1a0fef9527696cc039165d729fb41b3f4f4f354c2dc35"
 dependencies = [
  "aead",
  "chacha20",
- "cipher",
+ "cipher 0.4.4",
  "poly1305",
  "zeroize",
 ]
@@ -1307,11 +1454,20 @@ checksum = "b9b68e3193982cd54187d71afdb2a271ad4cf8af157858e9cb911b91321de143"
 dependencies = [
  "core2",
  "multibase",
- "multihash",
+ "multihash 0.17.0",
  "serde",
  "unsigned-varint",
 ]
 
+[[package]]
+name = "cipher"
+version = "0.2.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "12f8e7987cbd042a63249497f41aed09f8e65add917ea6566effbc56578d6801"
+dependencies = [
+ "generic-array 0.14.7",
+]
+
 [[package]]
 name = "cipher"
 version = "0.4.4"
@@ -1355,31 +1511,32 @@ dependencies = [
  "clap_lex 0.2.4",
  "indexmap 1.9.3",
  "once_cell",
- "strsim",
+ "strsim 0.10.0",
  "termcolor",
  "textwrap",
 ]
 
 [[package]]
 name = "clap"
-version = "4.4.11"
+version = "4.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bfaff671f6b22ca62406885ece523383b9b64022e341e53e009a62ebc47a45f2"
+checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0"
 dependencies = [
  "clap_builder",
- "clap_derive 4.4.7",
+ "clap_derive 4.5.4",
 ]
 
 [[package]]
 name = "clap_builder"
-version = "4.4.11"
+version = "4.5.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a216b506622bb1d316cd51328dce24e07bdff4a6128a47c7e7fad11878d5adbb"
+checksum = "ae129e2e766ae0ec03484e609954119f123cc1fe650337e155d03b022f24f7b4"
 dependencies = [
  "anstream",
  "anstyle",
- "clap_lex 0.6.0",
- "strsim",
+ "clap_lex 0.7.0",
+ "strsim 0.11.1",
+ "terminal_size",
 ]
 
 [[package]]
@@ -1388,7 +1545,7 @@ version = "3.2.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ae6371b8bdc8b7d3959e9cf7b22d4435ef3e79e138688421ec654acf8c81b008"
 dependencies = [
- "heck",
+ "heck 0.4.1",
  "proc-macro-error",
  "proc-macro2",
  "quote",
@@ -1397,14 +1554,14 @@ dependencies = [
 
 [[package]]
 name = "clap_derive"
-version = "4.4.7"
+version = "4.5.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf9804afaaf59a91e75b022a30fb7229a7901f60c755489cc61c9b423b836442"
+checksum = "528131438037fd55894f62d6e9f068b8f45ac57ffa77517819645d10aed04f64"
 dependencies = [
- "heck",
+ "heck 0.5.0",
  "proc-macro2",
  "quote",
- "syn 2.0.42",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -1418,9 +1575,9 @@ dependencies = [
 
 [[package]]
 name = "clap_lex"
-version = "0.6.0"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "702fc72eb24e5a1e48ce58027a675bc24edd52096d5397d4aea7c6dd9eca0bd1"
+checksum = "98cc8fbded0c607b7ba9dd60cd98df59af97e84d24e49c8557331cfc26d301ce"
 
 [[package]]
 name = "coarsetime"
@@ -1464,7 +1621,7 @@ dependencies = [
 [[package]]
 name = "common"
 version = "0.1.0"
-source = "git+https://github.com/w3f/ring-proof?rev=0e948f3#0e948f3c28cbacecdd3020403c4841c0eb339213"
+source = "git+https://github.com/w3f/ring-proof#b273d33f9981e2bb3375ab45faeb537f7ee35224"
 dependencies = [
  "ark-ec",
  "ark-ff",
@@ -1472,7 +1629,9 @@ dependencies = [
  "ark-serialize",
  "ark-std",
  "fflonk",
+ "getrandom_or_panic",
  "merlin 3.0.0",
+ "rand_chacha 0.3.1",
 ]
 
 [[package]]
@@ -1492,15 +1651,15 @@ dependencies = [
 
 [[package]]
 name = "console"
-version = "0.15.7"
+version = "0.15.8"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c926e00cc70edefdc64d3a5ff31cc65bb97a3460097762bd23afb4d8145fccf8"
+checksum = "0e1f83fc076bd6dd27517eacdf25fef6c4dfe5f1d7448bafaaf3a26f13b5e4eb"
 dependencies = [
  "encode_unicode",
  "lazy_static",
  "libc",
  "unicode-width",
- "windows-sys 0.45.0",
+ "windows-sys 0.52.0",
 ]
 
 [[package]]
@@ -1541,6 +1700,12 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f7144d30dcf0fafbce74250a3963025d8d52177934239851c917d29f1df280c2"
 
+[[package]]
+name = "constcat"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cd7e35aee659887cbfb97aaf227ac12cad1a9d7c71e55ff3376839ed4e282d08"
+
 [[package]]
 name = "convert_case"
 version = "0.4.0"
@@ -1805,7 +1970,7 @@ checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76"
 dependencies = [
  "generic-array 0.14.7",
  "rand_core 0.6.4",
- "subtle",
+ "subtle 2.4.1",
  "zeroize",
 ]
 
@@ -1820,6 +1985,16 @@ dependencies = [
  "typenum",
 ]
 
+[[package]]
+name = "crypto-mac"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4434400df11d95d556bac068ddfedd482915eb18fe8bea89bc80b6e4b1c179e5"
+dependencies = [
+ "generic-array 0.12.4",
+ "subtle 1.0.0",
+]
+
 [[package]]
 name = "crypto-mac"
 version = "0.8.0"
@@ -1827,7 +2002,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab"
 dependencies = [
  "generic-array 0.14.7",
- "subtle",
+ "subtle 2.4.1",
 ]
 
 [[package]]
@@ -1837,7 +2012,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714"
 dependencies = [
  "generic-array 0.14.7",
- "subtle",
+ "subtle 2.4.1",
 ]
 
 [[package]]
@@ -1846,20 +2021,21 @@ version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0369ee1ad671834580515889b80f2ea915f23b8be8d0daa4bbaf2ac5c7590835"
 dependencies = [
- "cipher",
+ "cipher 0.4.4",
 ]
 
 [[package]]
 name = "cumulus-client-cli"
-version = "0.1.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "0.7.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
- "clap 4.4.11",
+ "clap 4.5.4",
  "parity-scale-codec",
  "sc-chain-spec",
  "sc-cli",
  "sc-client-api",
  "sc-service",
+ "sp-blockchain",
  "sp-core",
  "sp-runtime",
  "url",
@@ -1867,8 +2043,8 @@ dependencies = [
 
 [[package]]
 name = "cumulus-client-collator"
-version = "0.1.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "0.7.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "cumulus-client-consensus-common",
  "cumulus-client-network",
@@ -1890,16 +2066,16 @@ dependencies = [
 
 [[package]]
 name = "cumulus-client-consensus-aura"
-version = "0.1.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "0.7.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "async-trait",
  "cumulus-client-collator",
  "cumulus-client-consensus-common",
  "cumulus-client-consensus-proposer",
+ "cumulus-client-parachain-inherent",
  "cumulus-primitives-aura",
  "cumulus-primitives-core",
- "cumulus-primitives-parachain-inherent",
  "cumulus-relay-chain-interface",
  "futures",
  "parity-scale-codec",
@@ -1924,7 +2100,7 @@ dependencies = [
  "sp-inherents",
  "sp-keystore",
  "sp-runtime",
- "sp-state-machine 0.28.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)",
+ "sp-state-machine",
  "sp-timestamp",
  "substrate-prometheus-endpoint",
  "tracing",
@@ -1932,8 +2108,8 @@ dependencies = [
 
 [[package]]
 name = "cumulus-client-consensus-common"
-version = "0.1.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "0.7.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "async-trait",
  "cumulus-client-pov-recovery",
@@ -1961,8 +2137,8 @@ dependencies = [
 
 [[package]]
 name = "cumulus-client-consensus-proposer"
-version = "0.1.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "0.7.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -1970,14 +2146,14 @@ dependencies = [
  "sp-consensus",
  "sp-inherents",
  "sp-runtime",
- "sp-state-machine 0.28.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)",
+ "sp-state-machine",
  "thiserror",
 ]
 
 [[package]]
 name = "cumulus-client-network"
-version = "0.1.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "0.7.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "async-trait",
  "cumulus-relay-chain-interface",
@@ -1993,14 +2169,38 @@ dependencies = [
  "sp-consensus",
  "sp-core",
  "sp-runtime",
- "sp-state-machine 0.28.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)",
+ "sp-state-machine",
  "tracing",
 ]
 
 [[package]]
-name = "cumulus-client-pov-recovery"
+name = "cumulus-client-parachain-inherent"
 version = "0.1.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
+dependencies = [
+ "async-trait",
+ "cumulus-primitives-core",
+ "cumulus-primitives-parachain-inherent",
+ "cumulus-relay-chain-interface",
+ "cumulus-test-relay-sproof-builder",
+ "parity-scale-codec",
+ "sc-client-api",
+ "scale-info",
+ "sp-api",
+ "sp-crypto-hashing",
+ "sp-inherents",
+ "sp-runtime",
+ "sp-state-machine",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-trie",
+ "tracing",
+]
+
+[[package]]
+name = "cumulus-client-pov-recovery"
+version = "0.7.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "async-trait",
  "cumulus-primitives-core",
@@ -2012,7 +2212,7 @@ dependencies = [
  "polkadot-node-subsystem",
  "polkadot-overseer",
  "polkadot-primitives",
- "rand 0.8.5",
+ "rand",
  "sc-client-api",
  "sc-consensus",
  "sp-consensus",
@@ -2023,8 +2223,8 @@ dependencies = [
 
 [[package]]
 name = "cumulus-client-service"
-version = "0.1.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "0.7.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "cumulus-client-cli",
  "cumulus-client-collator",
@@ -2032,6 +2232,7 @@ dependencies = [
  "cumulus-client-network",
  "cumulus-client-pov-recovery",
  "cumulus-primitives-core",
+ "cumulus-primitives-proof-size-hostfunction",
  "cumulus-relay-chain-inprocess-interface",
  "cumulus-relay-chain-interface",
  "cumulus-relay-chain-minimal-node",
@@ -2058,8 +2259,8 @@ dependencies = [
 
 [[package]]
 name = "cumulus-pallet-aura-ext"
-version = "0.1.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "0.7.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "cumulus-pallet-parachain-system",
  "frame-support",
@@ -2071,71 +2272,58 @@ dependencies = [
  "sp-application-crypto",
  "sp-consensus-aura",
  "sp-runtime",
- "sp-std",
-]
-
-[[package]]
-name = "cumulus-pallet-dmp-queue"
-version = "0.1.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
-dependencies = [
- "cumulus-primitives-core",
- "frame-support",
- "frame-system",
- "log",
- "parity-scale-codec",
- "scale-info",
- "sp-io",
- "sp-runtime",
- "sp-std",
- "staging-xcm",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "cumulus-pallet-parachain-system"
-version = "0.1.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "0.7.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "bytes",
  "cumulus-pallet-parachain-system-proc-macro",
  "cumulus-primitives-core",
  "cumulus-primitives-parachain-inherent",
+ "cumulus-primitives-proof-size-hostfunction",
  "environmental",
+ "frame-benchmarking",
  "frame-support",
  "frame-system",
  "impl-trait-for-tuples",
  "log",
+ "pallet-message-queue",
  "parity-scale-codec",
  "polkadot-parachain-primitives",
+ "polkadot-runtime-parachains",
  "scale-info",
  "sp-core",
- "sp-externalities",
+ "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-inherents",
  "sp-io",
  "sp-runtime",
- "sp-state-machine 0.28.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)",
- "sp-std",
+ "sp-state-machine",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-trie",
  "sp-version",
  "staging-xcm",
- "trie-db 0.27.1",
+ "trie-db",
 ]
 
 [[package]]
 name = "cumulus-pallet-parachain-system-proc-macro"
-version = "0.1.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "0.6.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
- "proc-macro-crate 1.3.1",
+ "proc-macro-crate 3.1.0",
  "proc-macro2",
  "quote",
- "syn 2.0.42",
+ "syn 2.0.61",
 ]
 
 [[package]]
 name = "cumulus-pallet-xcm"
-version = "0.1.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "0.7.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "cumulus-primitives-core",
  "frame-support",
@@ -2144,36 +2332,39 @@ dependencies = [
  "scale-info",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "staging-xcm",
 ]
 
 [[package]]
 name = "cumulus-pallet-xcmp-queue"
-version = "0.1.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "0.7.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
+ "bounded-collections",
+ "bp-xcm-bridge-hub-router",
  "cumulus-primitives-core",
  "frame-benchmarking",
  "frame-support",
  "frame-system",
  "log",
+ "pallet-message-queue",
  "parity-scale-codec",
  "polkadot-runtime-common",
- "rand_chacha 0.3.1",
+ "polkadot-runtime-parachains",
  "scale-info",
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "staging-xcm",
  "staging-xcm-executor",
 ]
 
 [[package]]
 name = "cumulus-primitives-aura"
-version = "0.1.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "0.7.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "parity-scale-codec",
  "polkadot-core-primitives",
@@ -2181,13 +2372,13 @@ dependencies = [
  "sp-api",
  "sp-consensus-aura",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "cumulus-primitives-core"
-version = "0.1.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "0.7.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "parity-scale-codec",
  "polkadot-core-primitives",
@@ -2196,60 +2387,65 @@ dependencies = [
  "scale-info",
  "sp-api",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-trie",
  "staging-xcm",
 ]
 
 [[package]]
 name = "cumulus-primitives-parachain-inherent"
-version = "0.1.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "0.7.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "async-trait",
  "cumulus-primitives-core",
- "cumulus-relay-chain-interface",
- "cumulus-test-relay-sproof-builder",
  "parity-scale-codec",
- "sc-client-api",
  "scale-info",
- "sp-api",
  "sp-core",
  "sp-inherents",
- "sp-runtime",
- "sp-state-machine 0.28.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)",
- "sp-std",
- "sp-storage",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-trie",
- "tracing",
 ]
 
 [[package]]
-name = "cumulus-primitives-timestamp"
-version = "0.1.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+name = "cumulus-primitives-proof-size-hostfunction"
+version = "0.2.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
+dependencies = [
+ "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-trie",
+]
+
+[[package]]
+name = "cumulus-primitives-timestamp"
+version = "0.7.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "cumulus-primitives-core",
  "futures",
  "parity-scale-codec",
  "sp-inherents",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-timestamp",
 ]
 
 [[package]]
 name = "cumulus-primitives-utility"
-version = "0.1.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "0.7.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "cumulus-primitives-core",
  "frame-support",
  "log",
+ "pallet-asset-conversion",
+ "pallet-xcm-benchmarks",
  "parity-scale-codec",
  "polkadot-runtime-common",
+ "polkadot-runtime-parachains",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "staging-xcm",
  "staging-xcm-builder",
  "staging-xcm-executor",
@@ -2257,8 +2453,8 @@ dependencies = [
 
 [[package]]
 name = "cumulus-relay-chain-inprocess-interface"
-version = "0.1.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "0.7.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "async-trait",
  "cumulus-primitives-core",
@@ -2276,66 +2472,72 @@ dependencies = [
  "sp-consensus",
  "sp-core",
  "sp-runtime",
- "sp-state-machine 0.28.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)",
+ "sp-state-machine",
 ]
 
 [[package]]
 name = "cumulus-relay-chain-interface"
-version = "0.1.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "0.7.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "async-trait",
  "cumulus-primitives-core",
  "futures",
- "jsonrpsee-core 0.16.3",
+ "jsonrpsee-core 0.20.3",
  "parity-scale-codec",
  "polkadot-overseer",
  "sc-client-api",
  "sp-api",
  "sp-blockchain",
- "sp-state-machine 0.28.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)",
+ "sp-state-machine",
  "thiserror",
 ]
 
 [[package]]
 name = "cumulus-relay-chain-minimal-node"
-version = "0.1.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "0.7.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
- "array-bytes",
+ "array-bytes 6.2.2",
  "async-trait",
  "cumulus-primitives-core",
  "cumulus-relay-chain-interface",
  "cumulus-relay-chain-rpc-interface",
  "futures",
+ "parking_lot 0.12.1",
  "polkadot-availability-recovery",
  "polkadot-collator-protocol",
  "polkadot-core-primitives",
  "polkadot-network-bridge",
  "polkadot-node-collation-generation",
+ "polkadot-node-core-chain-api",
+ "polkadot-node-core-prospective-parachains",
  "polkadot-node-core-runtime-api",
  "polkadot-node-network-protocol",
  "polkadot-node-subsystem-util",
  "polkadot-overseer",
  "polkadot-primitives",
  "sc-authority-discovery",
+ "sc-client-api",
  "sc-network",
  "sc-network-common",
  "sc-service",
  "sc-tracing",
  "sc-utils",
- "schnellru",
  "sp-api",
+ "sp-blockchain",
  "sp-consensus",
  "sp-consensus-babe",
  "sp-runtime",
+ "substrate-prometheus-endpoint",
+ "tokio",
  "tracing",
 ]
 
 [[package]]
 name = "cumulus-relay-chain-rpc-interface"
-version = "0.1.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "0.7.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "async-trait",
  "cumulus-primitives-core",
@@ -2343,11 +2545,11 @@ dependencies = [
  "either",
  "futures",
  "futures-timer",
- "jsonrpsee 0.16.3",
+ "jsonrpsee 0.20.3",
  "parity-scale-codec",
  "pin-project",
  "polkadot-overseer",
- "rand 0.8.5",
+ "rand",
  "sc-client-api",
  "sc-rpc-api",
  "sc-service",
@@ -2361,8 +2563,9 @@ dependencies = [
  "sp-consensus-babe",
  "sp-core",
  "sp-runtime",
- "sp-state-machine 0.28.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)",
- "sp-storage",
+ "sp-state-machine",
+ "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-version",
  "thiserror",
  "tokio",
  "tokio-util",
@@ -2372,15 +2575,15 @@ dependencies = [
 
 [[package]]
 name = "cumulus-test-relay-sproof-builder"
-version = "0.1.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "0.7.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "cumulus-primitives-core",
  "parity-scale-codec",
  "polkadot-primitives",
  "sp-runtime",
- "sp-state-machine 0.28.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)",
- "sp-std",
+ "sp-state-machine",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-trie",
 ]
 
@@ -2393,7 +2596,7 @@ dependencies = [
  "byteorder",
  "digest 0.8.1",
  "rand_core 0.5.1",
- "subtle",
+ "subtle 2.4.1",
  "zeroize",
 ]
 
@@ -2406,7 +2609,7 @@ dependencies = [
  "byteorder",
  "digest 0.9.0",
  "rand_core 0.5.1",
- "subtle",
+ "subtle 2.4.1",
  "zeroize",
 ]
 
@@ -2423,7 +2626,7 @@ dependencies = [
  "fiat-crypto",
  "platforms 3.2.0",
  "rustc_version",
- "subtle",
+ "subtle 2.4.1",
  "zeroize",
 ]
 
@@ -2435,7 +2638,7 @@ checksum = "f46882e17999c6cc590af592290432be3bce0428cb0d5f8b6715e4dc7b383eb3"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.42",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -2475,7 +2678,7 @@ dependencies = [
  "proc-macro2",
  "quote",
  "scratch",
- "syn 2.0.42",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -2492,7 +2695,7 @@ checksum = "5c6888cd161769d65134846d4d4981d5a6654307cc46ec83fb917e530aea5f84"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.42",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -2628,14 +2831,14 @@ dependencies = [
  "block-buffer 0.10.4",
  "const-oid",
  "crypto-common",
- "subtle",
+ "subtle 2.4.1",
 ]
 
 [[package]]
 name = "directories"
-version = "4.0.1"
+version = "5.0.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f51c5d4ddabd36886dd3e1438cb358cdcb0d7c499cb99cb4ac2e38e18b5cb210"
+checksum = "9a49173b84e034382284f27f1af4dcbbd231ffa358c0fe316541a7337f376a35"
 dependencies = [
  "dirs-sys",
 ]
@@ -2652,13 +2855,14 @@ dependencies = [
 
 [[package]]
 name = "dirs-sys"
-version = "0.3.7"
+version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1b1d1d91c932ef41c0f2663aa8b0ca0342d444d842c06914aa0a7e352d0bada6"
+checksum = "520f05a5cbd335fae5a99ff7a6ab8627577660ee5cfd6a94a6a929b52ff0321c"
 dependencies = [
  "libc",
+ "option-ext",
  "redox_users",
- "winapi",
+ "windows-sys 0.48.0",
 ]
 
 [[package]]
@@ -2680,23 +2884,22 @@ checksum = "487585f4d0c6655fe74905e2504d8ad6908e4db67f744eb140876906c2f3175d"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.42",
+ "syn 2.0.61",
 ]
 
 [[package]]
 name = "dleq_vrf"
 version = "0.0.2"
-source = "git+https://github.com/w3f/ring-vrf?rev=3119f51#3119f51b54b69308abfb0671f6176cb125ae1bf1"
+source = "git+https://github.com/w3f/ring-vrf?rev=e9782f9#e9782f938629c90f3adb3fff2358bc8d1386af3e"
 dependencies = [
  "ark-ec",
  "ark-ff",
- "ark-scale 0.0.10",
+ "ark-scale",
  "ark-secret-scalar",
  "ark-serialize",
  "ark-std",
  "ark-transcript",
  "arrayvec 0.7.4",
- "rand_core 0.6.4",
  "zeroize",
 ]
 
@@ -2721,9 +2924,9 @@ dependencies = [
  "proc-macro2",
  "quote",
  "regex",
- "syn 2.0.42",
+ "syn 2.0.61",
  "termcolor",
- "toml 0.8.2",
+ "toml 0.8.12",
  "walkdir",
 ]
 
@@ -2807,7 +3010,7 @@ dependencies = [
  "rand_core 0.6.4",
  "serde",
  "sha2 0.10.8",
- "subtle",
+ "subtle 2.4.1",
  "zeroize",
 ]
 
@@ -2861,7 +3064,7 @@ dependencies = [
  "pkcs8",
  "rand_core 0.6.4",
  "sec1",
- "subtle",
+ "subtle 2.4.1",
  "zeroize",
 ]
 
@@ -2877,7 +3080,7 @@ version = "0.5.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c9720bba047d567ffc8a3cba48bf19126600e249ab7f128e9233e6376976a116"
 dependencies = [
- "heck",
+ "heck 0.4.1",
  "proc-macro2",
  "quote",
  "syn 1.0.109",
@@ -2900,7 +3103,7 @@ checksum = "f95e2801cd355d4a1a3e3953ce6ee5ae9603a5c833455343a8bfe3f44d418246"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.42",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -2911,20 +3114,7 @@ checksum = "c2ad8cef1d801a4686bfd8919f0b30eac4c8e48968c437a6405ded4fb5272d2b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.42",
-]
-
-[[package]]
-name = "env_logger"
-version = "0.9.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a12e6657c4c97ebab115a42dcee77225f7f482cdd841cf7088c657a42e9e00e7"
-dependencies = [
- "atty",
- "humantime",
- "log",
- "regex",
- "termcolor",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -3006,6 +3196,24 @@ dependencies = [
  "triehash",
 ]
 
+[[package]]
+name = "ethereum"
+version = "0.15.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e04d24d20b8ff2235cffbf242d5092de3aa45f77c5270ddbfadd2778ca13fea"
+dependencies = [
+ "bytes",
+ "ethereum-types",
+ "hash-db 0.16.0",
+ "hash256-std-hasher",
+ "parity-scale-codec",
+ "rlp",
+ "scale-info",
+ "serde",
+ "sha3",
+ "trie-root",
+]
+
 [[package]]
 name = "ethereum-types"
 version = "0.14.1"
@@ -3067,7 +3275,7 @@ source = "git+https://github.com/rust-blockchain/evm?rev=13240a8a551586fdef0b502
 dependencies = [
  "auto_impl",
  "environmental",
- "ethereum",
+ "ethereum 0.14.0",
  "evm-core 0.36.0",
  "evm-gasometer 0.36.0",
  "evm-runtime 0.36.0",
@@ -3082,15 +3290,15 @@ dependencies = [
 
 [[package]]
 name = "evm"
-version = "0.39.1"
-source = "git+https://github.com/moonbeam-foundation/evm?rev=a33ac87ad7462b7e7029d12c385492b2a8311d1c#a33ac87ad7462b7e7029d12c385492b2a8311d1c"
+version = "0.41.1"
+source = "git+https://github.com/moonbeam-foundation/evm?branch=moonbeam-polkadot-v1.7.2#d8991ec727ad0fb64fe9957a3cd307387a6701e4"
 dependencies = [
  "auto_impl",
  "environmental",
- "ethereum",
- "evm-core 0.39.0",
- "evm-gasometer 0.39.0",
- "evm-runtime 0.39.0",
+ "ethereum 0.15.0",
+ "evm-core 0.41.0",
+ "evm-gasometer 0.41.0",
+ "evm-runtime 0.41.0",
  "log",
  "parity-scale-codec",
  "primitive-types",
@@ -3113,8 +3321,8 @@ dependencies = [
 
 [[package]]
 name = "evm-core"
-version = "0.39.0"
-source = "git+https://github.com/moonbeam-foundation/evm?rev=a33ac87ad7462b7e7029d12c385492b2a8311d1c#a33ac87ad7462b7e7029d12c385492b2a8311d1c"
+version = "0.41.0"
+source = "git+https://github.com/moonbeam-foundation/evm?branch=moonbeam-polkadot-v1.7.2#d8991ec727ad0fb64fe9957a3cd307387a6701e4"
 dependencies = [
  "parity-scale-codec",
  "primitive-types",
@@ -3135,12 +3343,12 @@ dependencies = [
 
 [[package]]
 name = "evm-gasometer"
-version = "0.39.0"
-source = "git+https://github.com/moonbeam-foundation/evm?rev=a33ac87ad7462b7e7029d12c385492b2a8311d1c#a33ac87ad7462b7e7029d12c385492b2a8311d1c"
+version = "0.41.0"
+source = "git+https://github.com/moonbeam-foundation/evm?branch=moonbeam-polkadot-v1.7.2#d8991ec727ad0fb64fe9957a3cd307387a6701e4"
 dependencies = [
  "environmental",
- "evm-core 0.39.0",
- "evm-runtime 0.39.0",
+ "evm-core 0.41.0",
+ "evm-runtime 0.41.0",
  "primitive-types",
 ]
 
@@ -3158,12 +3366,12 @@ dependencies = [
 
 [[package]]
 name = "evm-runtime"
-version = "0.39.0"
-source = "git+https://github.com/moonbeam-foundation/evm?rev=a33ac87ad7462b7e7029d12c385492b2a8311d1c#a33ac87ad7462b7e7029d12c385492b2a8311d1c"
+version = "0.41.0"
+source = "git+https://github.com/moonbeam-foundation/evm?branch=moonbeam-polkadot-v1.7.2#d8991ec727ad0fb64fe9957a3cd307387a6701e4"
 dependencies = [
  "auto_impl",
  "environmental",
- "evm-core 0.39.0",
+ "evm-core 0.41.0",
  "primitive-types",
  "sha3",
 ]
@@ -3189,29 +3397,17 @@ dependencies = [
  "quote",
 ]
 
-[[package]]
-name = "expander"
-version = "0.0.6"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3774182a5df13c3d1690311ad32fbe913feef26baba609fa2dd5f72042bd2ab6"
-dependencies = [
- "blake2",
- "fs-err",
- "proc-macro2",
- "quote",
-]
-
 [[package]]
 name = "expander"
 version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "5f86a749cf851891866c10515ef6c299b5c69661465e9c3bbe7e07a2b77fb0f7"
 dependencies = [
- "blake2",
+ "blake2 0.10.6",
  "fs-err",
  "proc-macro2",
  "quote",
- "syn 2.0.42",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -3272,10 +3468,22 @@ dependencies = [
  "thiserror",
 ]
 
+[[package]]
+name = "fc-api"
+version = "1.0.0-dev"
+source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.2#91f1c7a447f987d732f87f86c3e02d506d426a99"
+dependencies = [
+ "async-trait",
+ "fp-storage",
+ "parity-scale-codec",
+ "sp-core",
+ "sp-runtime",
+]
+
 [[package]]
 name = "fc-consensus"
 version = "2.0.0-dev"
-source = "git+https://github.com/moonbeam-foundation/frontier?rev=bf5885a982041cc744ecbb62a2afc13d56d464dc#bf5885a982041cc744ecbb62a2afc13d56d464dc"
+source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.2#91f1c7a447f987d732f87f86c3e02d506d426a99"
 dependencies = [
  "async-trait",
  "fp-consensus",
@@ -3291,9 +3499,10 @@ dependencies = [
 [[package]]
 name = "fc-db"
 version = "2.0.0-dev"
-source = "git+https://github.com/moonbeam-foundation/frontier?rev=bf5885a982041cc744ecbb62a2afc13d56d464dc#bf5885a982041cc744ecbb62a2afc13d56d464dc"
+source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.2#91f1c7a447f987d732f87f86c3e02d506d426a99"
 dependencies = [
  "async-trait",
+ "fc-api",
  "fp-storage",
  "kvdb-rocksdb",
  "log",
@@ -3311,7 +3520,7 @@ dependencies = [
 [[package]]
 name = "fc-mapping-sync"
 version = "2.0.0-dev"
-source = "git+https://github.com/moonbeam-foundation/frontier?rev=bf5885a982041cc744ecbb62a2afc13d56d464dc#bf5885a982041cc744ecbb62a2afc13d56d464dc"
+source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.2#91f1c7a447f987d732f87f86c3e02d506d426a99"
 dependencies = [
  "fc-db",
  "fc-storage",
@@ -3332,28 +3541,27 @@ dependencies = [
 [[package]]
 name = "fc-rpc"
 version = "2.0.0-dev"
-source = "git+https://github.com/moonbeam-foundation/frontier?rev=bf5885a982041cc744ecbb62a2afc13d56d464dc#bf5885a982041cc744ecbb62a2afc13d56d464dc"
+source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.2#91f1c7a447f987d732f87f86c3e02d506d426a99"
 dependencies = [
- "ethereum",
+ "ethereum 0.15.0",
  "ethereum-types",
- "evm 0.39.1",
- "fc-db",
+ "evm 0.41.1",
+ "fc-api",
  "fc-mapping-sync",
  "fc-rpc-core",
  "fc-storage",
- "fp-ethereum",
  "fp-evm",
  "fp-rpc",
  "fp-storage",
  "futures",
  "hex",
- "jsonrpsee 0.16.3",
+ "jsonrpsee 0.20.3",
  "libsecp256k1",
  "log",
  "pallet-evm",
  "parity-scale-codec",
  "prometheus",
- "rand 0.8.5",
+ "rand",
  "rlp",
  "sc-client-api",
  "sc-consensus-aura",
@@ -3373,11 +3581,12 @@ dependencies = [
  "sp-consensus",
  "sp-consensus-aura",
  "sp-core",
+ "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-inherents",
  "sp-io",
  "sp-runtime",
- "sp-state-machine 0.28.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)",
- "sp-storage",
+ "sp-state-machine",
+ "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-timestamp",
  "substrate-prometheus-endpoint",
  "thiserror",
@@ -3387,22 +3596,24 @@ dependencies = [
 [[package]]
 name = "fc-rpc-core"
 version = "1.1.0-dev"
-source = "git+https://github.com/moonbeam-foundation/frontier?rev=bf5885a982041cc744ecbb62a2afc13d56d464dc#bf5885a982041cc744ecbb62a2afc13d56d464dc"
+source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.2#91f1c7a447f987d732f87f86c3e02d506d426a99"
 dependencies = [
- "ethereum",
+ "ethereum 0.15.0",
  "ethereum-types",
- "jsonrpsee 0.16.3",
+ "jsonrpsee 0.20.3",
+ "rlp",
  "rustc-hex",
  "serde",
  "serde_json",
+ "sp-core-hashing",
 ]
 
 [[package]]
 name = "fc-storage"
 version = "1.0.0-dev"
-source = "git+https://github.com/moonbeam-foundation/frontier?rev=bf5885a982041cc744ecbb62a2afc13d56d464dc#bf5885a982041cc744ecbb62a2afc13d56d464dc"
+source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.2#91f1c7a447f987d732f87f86c3e02d506d426a99"
 dependencies = [
- "ethereum",
+ "ethereum 0.15.0",
  "ethereum-types",
  "fp-rpc",
  "fp-storage",
@@ -3412,16 +3623,17 @@ dependencies = [
  "sp-blockchain",
  "sp-io",
  "sp-runtime",
- "sp-storage",
+ "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "fdlimit"
-version = "0.2.1"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2c4c9e43643f5a3be4ca5b67d26b98031ff9db6806c3440ae32e02e3ceac3f1b"
+checksum = "e182f7dbc2ef73d9ef67351c5fbbea084729c48362d3ce9dd44c28e32e277fe5"
 dependencies = [
  "libc",
+ "thiserror",
 ]
 
 [[package]]
@@ -3431,7 +3643,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449"
 dependencies = [
  "rand_core 0.6.4",
- "subtle",
+ "subtle 2.4.1",
 ]
 
 [[package]]
@@ -3459,7 +3671,7 @@ version = "0.1.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "84f2e425d9790201ba4af4630191feac6dcc98765b118d4d18e91d23c2353866"
 dependencies = [
- "env_logger 0.10.1",
+ "env_logger",
  "log",
 ]
 
@@ -3511,7 +3723,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "835c052cb0c08c1acf6ffd71c022172e18723949c8282f2b9f27efbc51e64534"
 dependencies = [
  "byteorder",
- "rand 0.8.5",
+ "rand",
  "rustc-hex",
  "static_assertions",
 ]
@@ -3550,8 +3762,8 @@ checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
 [[package]]
 name = "fork-tree"
-version = "3.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "12.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "parity-scale-codec",
 ]
@@ -3568,7 +3780,7 @@ dependencies = [
 [[package]]
 name = "fp-account"
 version = "1.0.0-dev"
-source = "git+https://github.com/moonbeam-foundation/frontier?rev=bf5885a982041cc744ecbb62a2afc13d56d464dc#bf5885a982041cc744ecbb62a2afc13d56d464dc"
+source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.2#91f1c7a447f987d732f87f86c3e02d506d426a99"
 dependencies = [
  "hex",
  "impl-serde",
@@ -3580,57 +3792,57 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-runtime-interface",
- "sp-std",
+ "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "fp-consensus"
 version = "2.0.0-dev"
-source = "git+https://github.com/moonbeam-foundation/frontier?rev=bf5885a982041cc744ecbb62a2afc13d56d464dc#bf5885a982041cc744ecbb62a2afc13d56d464dc"
+source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.2#91f1c7a447f987d732f87f86c3e02d506d426a99"
 dependencies = [
- "ethereum",
+ "ethereum 0.15.0",
  "parity-scale-codec",
  "sp-core",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "fp-ethereum"
 version = "1.0.0-dev"
-source = "git+https://github.com/moonbeam-foundation/frontier?rev=bf5885a982041cc744ecbb62a2afc13d56d464dc#bf5885a982041cc744ecbb62a2afc13d56d464dc"
+source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.2#91f1c7a447f987d732f87f86c3e02d506d426a99"
 dependencies = [
- "ethereum",
+ "ethereum 0.15.0",
  "ethereum-types",
  "fp-evm",
  "frame-support",
- "num_enum 0.6.1",
  "parity-scale-codec",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "fp-evm"
 version = "3.0.0-dev"
-source = "git+https://github.com/moonbeam-foundation/frontier?rev=bf5885a982041cc744ecbb62a2afc13d56d464dc#bf5885a982041cc744ecbb62a2afc13d56d464dc"
+source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.2#91f1c7a447f987d732f87f86c3e02d506d426a99"
 dependencies = [
- "evm 0.39.1",
+ "evm 0.41.1",
  "frame-support",
+ "num_enum 0.7.2",
  "parity-scale-codec",
  "scale-info",
  "serde",
  "sp-core",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "fp-rpc"
 version = "3.0.0-dev"
-source = "git+https://github.com/moonbeam-foundation/frontier?rev=bf5885a982041cc744ecbb62a2afc13d56d464dc#bf5885a982041cc744ecbb62a2afc13d56d464dc"
+source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.2#91f1c7a447f987d732f87f86c3e02d506d426a99"
 dependencies = [
- "ethereum",
+ "ethereum 0.15.0",
  "ethereum-types",
  "fp-evm",
  "parity-scale-codec",
@@ -3638,14 +3850,14 @@ dependencies = [
  "sp-api",
  "sp-core",
  "sp-runtime",
- "sp-state-machine 0.28.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)",
- "sp-std",
+ "sp-state-machine",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "fp-self-contained"
 version = "1.0.0-dev"
-source = "git+https://github.com/moonbeam-foundation/frontier?rev=bf5885a982041cc744ecbb62a2afc13d56d464dc#bf5885a982041cc744ecbb62a2afc13d56d464dc"
+source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.2#91f1c7a447f987d732f87f86c3e02d506d426a99"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
@@ -3657,7 +3869,7 @@ dependencies = [
 [[package]]
 name = "fp-storage"
 version = "2.0.0"
-source = "git+https://github.com/moonbeam-foundation/frontier?rev=bf5885a982041cc744ecbb62a2afc13d56d464dc#bf5885a982041cc744ecbb62a2afc13d56d464dc"
+source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.2#91f1c7a447f987d732f87f86c3e02d506d426a99"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -3671,8 +3883,8 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa"
 
 [[package]]
 name = "frame-benchmarking"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "frame-support",
  "frame-support-procedural",
@@ -3688,21 +3900,21 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-runtime-interface",
- "sp-std",
- "sp-storage",
+ "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "static_assertions",
 ]
 
 [[package]]
 name = "frame-benchmarking-cli"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "32.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "Inflector",
- "array-bytes",
+ "array-bytes 6.2.2",
  "chrono",
- "clap 4.4.11",
+ "clap 4.5.4",
  "comfy-table",
  "frame-benchmarking",
  "frame-support",
@@ -3714,7 +3926,7 @@ dependencies = [
  "linked-hash-map",
  "log",
  "parity-scale-codec",
- "rand 0.8.5",
+ "rand",
  "rand_pcg",
  "sc-block-builder",
  "sc-cli",
@@ -3729,34 +3941,34 @@ dependencies = [
  "sp-blockchain",
  "sp-core",
  "sp-database",
- "sp-externalities",
+ "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-inherents",
  "sp-io",
  "sp-keystore",
  "sp-runtime",
- "sp-state-machine 0.28.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)",
- "sp-storage",
+ "sp-state-machine",
+ "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-trie",
- "sp-wasm-interface",
+ "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "thiserror",
  "thousands",
 ]
 
 [[package]]
 name = "frame-election-provider-solution-type"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "13.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
- "proc-macro-crate 1.3.1",
+ "proc-macro-crate 3.1.0",
  "proc-macro2",
  "quote",
- "syn 2.0.42",
+ "syn 2.0.61",
 ]
 
 [[package]]
 name = "frame-election-provider-support"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "frame-election-provider-solution-type",
  "frame-support",
@@ -3767,13 +3979,13 @@ dependencies = [
  "sp-core",
  "sp-npos-elections",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "frame-executive"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -3784,8 +3996,8 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
- "sp-tracing",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
@@ -3802,20 +4014,20 @@ dependencies = [
 
 [[package]]
 name = "frame-remote-externalities"
-version = "0.10.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "0.35.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
- "async-recursion",
  "futures",
  "indicatif",
- "jsonrpsee 0.16.3",
+ "jsonrpsee 0.20.3",
  "log",
  "parity-scale-codec",
  "serde",
  "sp-core",
+ "sp-crypto-hashing",
  "sp-io",
  "sp-runtime",
- "sp-state-machine 0.28.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)",
+ "sp-state-machine",
  "spinners",
  "substrate-rpc-client",
  "tokio",
@@ -3824,10 +4036,11 @@ dependencies = [
 
 [[package]]
 name = "frame-support"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "aquamarine",
+ "array-bytes 6.2.2",
  "bitflags 1.3.2",
  "docify",
  "environmental",
@@ -3846,26 +4059,26 @@ dependencies = [
  "sp-api",
  "sp-arithmetic",
  "sp-core",
- "sp-core-hashing-proc-macro",
- "sp-debug-derive 8.0.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)",
+ "sp-crypto-hashing-proc-macro",
+ "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-genesis-builder",
  "sp-inherents",
  "sp-io",
  "sp-metadata-ir",
  "sp-runtime",
  "sp-staking",
- "sp-state-machine 0.28.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)",
- "sp-std",
- "sp-tracing",
- "sp-weights 20.0.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)",
+ "sp-state-machine",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-weights",
  "static_assertions",
  "tt-call",
 ]
 
 [[package]]
 name = "frame-support-procedural"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "23.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "Inflector",
  "cfg-expr",
@@ -3877,37 +4090,39 @@ dependencies = [
  "proc-macro-warning",
  "proc-macro2",
  "quote",
- "syn 2.0.42",
+ "sp-crypto-hashing",
+ "syn 2.0.61",
 ]
 
 [[package]]
 name = "frame-support-procedural-tools"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "10.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "frame-support-procedural-tools-derive",
- "proc-macro-crate 1.3.1",
+ "proc-macro-crate 3.1.0",
  "proc-macro2",
  "quote",
- "syn 2.0.42",
+ "syn 2.0.61",
 ]
 
 [[package]]
 name = "frame-support-procedural-tools-derive"
-version = "3.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "11.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.42",
+ "syn 2.0.61",
 ]
 
 [[package]]
 name = "frame-system"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "cfg-if",
+ "docify",
  "frame-support",
  "log",
  "parity-scale-codec",
@@ -3916,15 +4131,15 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-version",
- "sp-weights 20.0.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)",
+ "sp-weights",
 ]
 
 [[package]]
 name = "frame-system-benchmarking"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -3933,13 +4148,13 @@ dependencies = [
  "scale-info",
  "sp-core",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "frame-system-rpc-runtime-api"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "26.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -3947,14 +4162,14 @@ dependencies = [
 
 [[package]]
 name = "frame-try-runtime"
-version = "0.10.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "0.34.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
  "sp-api",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
@@ -3978,9 +4193,9 @@ dependencies = [
 
 [[package]]
 name = "fs4"
-version = "0.6.6"
+version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2eeb4ed9e12f43b7fa0baae3f9cdda28352770132ef2e09a23760c29cae8bd47"
+checksum = "29f9df8a11882c4e3335eb2d18a0137c505d9ca927470b0cac9c6f0ae07d28f7"
 dependencies = [
  "rustix 0.38.28",
  "windows-sys 0.48.0",
@@ -3994,9 +4209,9 @@ checksum = "e6d5a32815ae3f33302d95fdcb2ce17862f8c65363dcfd29360480ba1001fc9c"
 
 [[package]]
 name = "futures"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da0290714b38af9b4a7b094b8a37086d1b4e61f2df9122c3cad2577669145335"
+checksum = "645c6916888f6cb6350d2550b80fb63e734897a8498abe35cfb732b6487804b0"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -4009,9 +4224,9 @@ dependencies = [
 
 [[package]]
 name = "futures-channel"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ff4dd66668b557604244583e3e1e1eada8c5c2e96a6d0d6653ede395b78bbacb"
+checksum = "eac8f7d7865dcb88bd4373ab671c8cf4508703796caa2b1985a9ca867b3fcb78"
 dependencies = [
  "futures-core",
  "futures-sink",
@@ -4019,15 +4234,15 @@ dependencies = [
 
 [[package]]
 name = "futures-core"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb1d22c66e66d9d72e1758f0bd7d4fd0bee04cad842ee34587d68c07e45d088c"
+checksum = "dfc6580bb841c5a68e9ef15c77ccc837b40a7504914d52e47b8b0e9bbda25a1d"
 
 [[package]]
 name = "futures-executor"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0f4fb8693db0cf099eadcca0efe2a5a22e4550f98ed16aba6c48700da29597bc"
+checksum = "a576fc72ae164fca6b9db127eaa9a9dda0d61316034f33a0a0d4eda41f02b01d"
 dependencies = [
  "futures-core",
  "futures-task",
@@ -4037,9 +4252,9 @@ dependencies = [
 
 [[package]]
 name = "futures-io"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bf34a163b5c4c52d0478a4d757da8fb65cabef42ba90515efee0f6f9fa45aaa"
+checksum = "a44623e20b9681a318efdd71c299b6b222ed6f231972bfe2f224ebad6311f0c1"
 
 [[package]]
 name = "futures-lite"
@@ -4071,13 +4286,13 @@ dependencies = [
 
 [[package]]
 name = "futures-macro"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "53b153fd91e4b0147f4aced87be237c98248656bb01050b96bf3ee89220a8ddb"
+checksum = "87750cf4b7a4c0625b1529e4c543c2182106e4dedc60a2a6455e00d212c489ac"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.42",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -4093,15 +4308,15 @@ dependencies = [
 
 [[package]]
 name = "futures-sink"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e36d3378ee38c2a36ad710c5d30c2911d752cb941c00c72dbabfb786a7970817"
+checksum = "9fb8e00e87438d937621c1c6269e53f536c14d3fbd6a042bb24879e57d474fb5"
 
 [[package]]
 name = "futures-task"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "efd193069b0ddadc69c46389b740bbccdd97203899b48d09c5f7969591d6bae2"
+checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
 
 [[package]]
 name = "futures-timer"
@@ -4111,9 +4326,9 @@ checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c"
 
 [[package]]
 name = "futures-util"
-version = "0.3.29"
+version = "0.3.30"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a19526d624e703a3179b3d322efec918b6246ea0fa51d41124525f00f1cc8104"
+checksum = "3d6401deb83407ab3da39eba7e33987a73c3df0c82b4bb5813ee871c19c41d48"
 dependencies = [
  "futures-channel",
  "futures-core",
@@ -4188,6 +4403,16 @@ dependencies = [
  "wasi 0.11.0+wasi-snapshot-preview1",
 ]
 
+[[package]]
+name = "getrandom_or_panic"
+version = "0.0.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6ea1015b5a70616b688dc230cfe50c8af89d972cb132d5a622814d29773b10b9"
+dependencies = [
+ "rand",
+ "rand_core 0.6.4",
+]
+
 [[package]]
 name = "ghash"
 version = "0.5.0"
@@ -4252,7 +4477,7 @@ checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63"
 dependencies = [
  "ff",
  "rand_core 0.6.4",
- "subtle",
+ "subtle 2.4.1",
 ]
 
 [[package]]
@@ -4344,12 +4569,27 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "hashlink"
+version = "0.8.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e8094feaf31ff591f651a2664fb9cfd92bba7a60ce3197265e9482ebe753c8f7"
+dependencies = [
+ "hashbrown 0.14.3",
+]
+
 [[package]]
 name = "heck"
 version = "0.4.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "95505c38b4572b2d910cecb0281560f54b440a19336cbbcb27bf6ce6adc6f5a8"
 
+[[package]]
+name = "heck"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
+
 [[package]]
 name = "hermit-abi"
 version = "0.1.19"
@@ -4517,22 +4757,22 @@ dependencies = [
  "parity-scale-codec",
  "primitive-types",
  "proptest",
- "rand 0.8.5",
+ "rand",
  "rand_xoshiro",
  "rug",
  "scale-info",
  "serde",
  "sp-arithmetic",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "test-case 2.2.2",
 ]
 
 [[package]]
 name = "hydradx"
-version = "12.3.0"
+version = "13.1.0"
 dependencies = [
  "async-trait",
- "clap 4.4.11",
+ "clap 4.5.4",
  "cumulus-client-cli",
  "cumulus-client-collator",
  "cumulus-client-consensus-aura",
@@ -4562,7 +4802,7 @@ dependencies = [
  "hex-literal 0.3.4",
  "hydra-dx-build-script-utils",
  "hydradx-runtime",
- "jsonrpsee 0.16.3",
+ "jsonrpsee 0.20.3",
  "log",
  "pallet-transaction-payment-rpc",
  "pallet-transaction-payment-rpc-runtime-api",
@@ -4608,20 +4848,21 @@ dependencies = [
  "sp-offchain",
  "sp-runtime",
  "sp-session",
- "sp-state-machine 0.28.0 (git+https://github.com/paritytech/polkadot-sdk?rev=c8d2251cafadc108ba2f1f8a3208dc547ff38901)",
- "sp-storage",
+ "sp-state-machine",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-timestamp",
  "sp-transaction-pool",
  "sp-trie",
  "substrate-frame-rpc-system",
  "substrate-prometheus-endpoint",
  "substrate-state-trie-migration-rpc",
- "trie-db 0.28.0",
+ "trie-db",
 ]
 
 [[package]]
 name = "hydradx-adapters"
-version = "1.3.3"
+version = "1.3.4"
 dependencies = [
  "cumulus-pallet-parachain-system",
  "cumulus-primitives-core",
@@ -4650,7 +4891,7 @@ dependencies = [
  "pallet-referrals",
  "pallet-route-executor",
  "pallet-stableswap",
- "pallet-staking 3.1.0",
+ "pallet-staking 3.1.1",
  "pallet-transaction-multi-payment",
  "pallet-uniques",
  "pallet-xyk",
@@ -4663,7 +4904,7 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "staging-xcm",
  "staging-xcm-builder",
  "staging-xcm-executor",
@@ -4671,10 +4912,9 @@ dependencies = [
 
 [[package]]
 name = "hydradx-runtime"
-version = "241.0.0"
+version = "243.0.0"
 dependencies = [
  "cumulus-pallet-aura-ext",
- "cumulus-pallet-dmp-queue",
  "cumulus-pallet-parachain-system",
  "cumulus-pallet-xcm",
  "cumulus-pallet-xcmp-queue",
@@ -4683,7 +4923,7 @@ dependencies = [
  "cumulus-primitives-timestamp",
  "cumulus-primitives-utility",
  "ethabi",
- "evm 0.39.1",
+ "evm 0.41.1",
  "fp-evm",
  "fp-rpc",
  "fp-self-contained",
@@ -4722,7 +4962,7 @@ dependencies = [
  "pallet-collective",
  "pallet-currencies",
  "pallet-dca",
- "pallet-democracy 4.2.0",
+ "pallet-democracy 4.2.1",
  "pallet-duster",
  "pallet-dynamic-evm-fee",
  "pallet-dynamic-fees",
@@ -4743,6 +4983,7 @@ dependencies = [
  "pallet-identity",
  "pallet-lbp",
  "pallet-liquidity-mining",
+ "pallet-message-queue",
  "pallet-multisig",
  "pallet-omnipool",
  "pallet-omnipool-liquidity-mining",
@@ -4755,7 +4996,7 @@ dependencies = [
  "pallet-scheduler",
  "pallet-session",
  "pallet-stableswap",
- "pallet-staking 3.1.0",
+ "pallet-staking 3.1.1",
  "pallet-state-trie-migration",
  "pallet-timestamp",
  "pallet-tips",
@@ -4767,12 +5008,12 @@ dependencies = [
  "pallet-uniques",
  "pallet-utility",
  "pallet-xcm",
- "pallet-xcm-rate-limiter",
  "pallet-xyk",
  "pallet-xyk-liquidity-mining",
- "parachain-info",
+ "parachains-common",
  "parity-scale-codec",
  "polkadot-parachain-primitives",
+ "polkadot-runtime-common",
  "precompile-utils",
  "primitive-types",
  "primitives",
@@ -4783,17 +5024,19 @@ dependencies = [
  "sp-block-builder",
  "sp-consensus-aura",
  "sp-core",
- "sp-externalities",
+ "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-genesis-builder",
  "sp-inherents",
  "sp-io",
  "sp-offchain",
  "sp-runtime",
  "sp-session",
  "sp-staking",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-transaction-pool",
  "sp-trie",
  "sp-version",
+ "staging-parachain-info",
  "staging-xcm",
  "staging-xcm-builder",
  "staging-xcm-executor",
@@ -4810,7 +5053,7 @@ dependencies = [
  "scale-info",
  "serde",
  "sp-arithmetic",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
@@ -4851,7 +5094,6 @@ dependencies = [
  "rustls-native-certs",
  "tokio",
  "tokio-rustls",
- "webpki-roots 0.25.3",
 ]
 
 [[package]]
@@ -5112,6 +5354,12 @@ dependencies = [
  "winapi",
 ]
 
+[[package]]
+name = "is_terminal_polyfill"
+version = "1.70.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f8478577c03552c21db0e2724ffb8986a5ce7af88107e6be5d2ee6e158c12800"
+
 [[package]]
 name = "itertools"
 version = "0.10.5"
@@ -5170,29 +5418,29 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee"
-version = "0.16.3"
+version = "0.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "367a292944c07385839818bb71c8d76611138e2dedb0677d035b8da21d29c78b"
+checksum = "affdc52f7596ccb2d7645231fc6163bb314630c989b64998f3699a28b4d5d4dc"
 dependencies = [
- "jsonrpsee-core 0.16.3",
+ "jsonrpsee-core 0.20.3",
  "jsonrpsee-http-client",
- "jsonrpsee-proc-macros 0.16.3",
+ "jsonrpsee-proc-macros 0.20.3",
  "jsonrpsee-server",
- "jsonrpsee-types 0.16.3",
+ "jsonrpsee-types 0.20.3",
  "jsonrpsee-ws-client",
+ "tokio",
  "tracing",
 ]
 
 [[package]]
 name = "jsonrpsee-client-transport"
-version = "0.16.3"
+version = "0.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8b3815d9f5d5de348e5f162b316dc9cdf4548305ebb15b4eb9328e66cf27d7a"
+checksum = "b5b005c793122d03217da09af68ba9383363caa950b90d3436106df8cabce935"
 dependencies = [
  "futures-util",
  "http",
- "jsonrpsee-core 0.16.3",
- "jsonrpsee-types 0.16.3",
+ "jsonrpsee-core 0.20.3",
  "pin-project",
  "rustls-native-certs",
  "soketto",
@@ -5201,7 +5449,7 @@ dependencies = [
  "tokio-rustls",
  "tokio-util",
  "tracing",
- "webpki-roots 0.25.3",
+ "url",
 ]
 
 [[package]]
@@ -5222,7 +5470,7 @@ dependencies = [
  "jsonrpsee-types 0.15.1",
  "lazy_static",
  "parking_lot 0.12.1",
- "rand 0.8.5",
+ "rand",
  "rustc-hash",
  "serde",
  "serde_json",
@@ -5235,23 +5483,20 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-core"
-version = "0.16.3"
+version = "0.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2b5dde66c53d6dcdc8caea1874a45632ec0fcf5b437789f1e45766a1512ce803"
+checksum = "da2327ba8df2fdbd5e897e2b5ed25ce7f299d345b9736b6828814c3dbd1fd47b"
 dependencies = [
  "anyhow",
- "arrayvec 0.7.4",
  "async-lock 2.8.0",
  "async-trait",
  "beef",
- "futures-channel",
  "futures-timer",
  "futures-util",
- "globset",
  "hyper",
- "jsonrpsee-types 0.16.3",
+ "jsonrpsee-types 0.20.3",
  "parking_lot 0.12.1",
- "rand 0.8.5",
+ "rand",
  "rustc-hash",
  "serde",
  "serde_json",
@@ -5263,21 +5508,22 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-http-client"
-version = "0.16.3"
+version = "0.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e5f9fabdd5d79344728521bb65e3106b49ec405a78b66fbff073b72b389fa43"
+checksum = "5f80c17f62c7653ce767e3d7288b793dfec920f97067ceb189ebdd3570f2bc20"
 dependencies = [
  "async-trait",
  "hyper",
  "hyper-rustls",
- "jsonrpsee-core 0.16.3",
- "jsonrpsee-types 0.16.3",
- "rustc-hash",
+ "jsonrpsee-core 0.20.3",
+ "jsonrpsee-types 0.20.3",
  "serde",
  "serde_json",
  "thiserror",
  "tokio",
+ "tower",
  "tracing",
+ "url",
 ]
 
 [[package]]
@@ -5312,11 +5558,11 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-proc-macros"
-version = "0.16.3"
+version = "0.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "44e8ab85614a08792b9bff6c8feee23be78c98d0182d4c622c05256ab553892a"
+checksum = "29110019693a4fa2dbda04876499d098fa16d70eba06b1e6e2b3f1b251419515"
 dependencies = [
- "heck",
+ "heck 0.4.1",
  "proc-macro-crate 1.3.1",
  "proc-macro2",
  "quote",
@@ -5325,19 +5571,20 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-server"
-version = "0.16.3"
+version = "0.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "cf4d945a6008c9b03db3354fb3c83ee02d2faa9f2e755ec1dfb69c3551b8f4ba"
+checksum = "82c39a00449c9ef3f50b84fc00fc4acba20ef8f559f07902244abf4c15c5ab9c"
 dependencies = [
- "futures-channel",
  "futures-util",
  "http",
  "hyper",
- "jsonrpsee-core 0.16.3",
- "jsonrpsee-types 0.16.3",
+ "jsonrpsee-core 0.20.3",
+ "jsonrpsee-types 0.20.3",
+ "route-recognizer",
  "serde",
  "serde_json",
  "soketto",
+ "thiserror",
  "tokio",
  "tokio-stream",
  "tokio-util",
@@ -5361,9 +5608,9 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-types"
-version = "0.16.3"
+version = "0.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "245ba8e5aa633dd1c1e4fae72bce06e71f42d34c14a2767c6b4d173b57bee5e5"
+checksum = "5be0be325642e850ed0bdff426674d2e66b2b7117c9be23a7caef68a2902b7d9"
 dependencies = [
  "anyhow",
  "beef",
@@ -5375,14 +5622,15 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-ws-client"
-version = "0.16.3"
+version = "0.20.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e1b3975ed5d73f456478681a417128597acd6a2487855fdb7b4a3d4d195bf5e"
+checksum = "bca9cb3933ccae417eb6b08c3448eb1cb46e39834e5b503e395e5e5bd08546c0"
 dependencies = [
  "http",
  "jsonrpsee-client-transport",
- "jsonrpsee-core 0.16.3",
- "jsonrpsee-types 0.16.3",
+ "jsonrpsee-core 0.20.3",
+ "jsonrpsee-types 0.20.3",
+ "url",
 ]
 
 [[package]]
@@ -5428,18 +5676,10 @@ dependencies = [
 ]
 
 [[package]]
-name = "kusama-runtime-constants"
+name = "keystream"
 version = "1.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
-dependencies = [
- "frame-support",
- "polkadot-primitives",
- "polkadot-runtime-common",
- "smallvec",
- "sp-core",
- "sp-runtime",
- "sp-weights 20.0.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)",
-]
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c33070833c9ee02266356de0c43f723152bd38bd96ddf52c82b3af10c9138b28"
 
 [[package]]
 name = "kvdb"
@@ -5476,9 +5716,9 @@ dependencies = [
 
 [[package]]
 name = "landlock"
-version = "0.2.0"
+version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "520baa32708c4e957d2fc3a186bc5bd8d26637c33137f399ddfc202adb240068"
+checksum = "9baa9eeb6e315942429397e617a190f4fdc696ef1ee0342939d641029cbb4ea7"
 dependencies = [
  "enumflags2",
  "libc",
@@ -5502,9 +5742,9 @@ checksum = "830d08ce1d1d941e6b30645f1a0eb5643013d835ce3779a5fc208261dbe10f55"
 
 [[package]]
 name = "libc"
-version = "0.2.151"
+version = "0.2.154"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "302d7ab3130588088d277783b1e2d2e10c9e9e4a16dd9050e6ec93fb3e7048f4"
+checksum = "ae743338b92ff9146ce83992f766a31066a91a8c84a45e0e9f21e7cf6de6d346"
 
 [[package]]
 name = "libloading"
@@ -5593,13 +5833,13 @@ dependencies = [
  "libp2p-identity",
  "log",
  "multiaddr",
- "multihash",
+ "multihash 0.17.0",
  "multistream-select",
  "once_cell",
  "parking_lot 0.12.1",
  "pin-project",
  "quick-protobuf",
- "rand 0.8.5",
+ "rand",
  "rw-stream-sink",
  "smallvec",
  "thiserror",
@@ -5653,9 +5893,9 @@ dependencies = [
  "ed25519-dalek",
  "log",
  "multiaddr",
- "multihash",
+ "multihash 0.17.0",
  "quick-protobuf",
- "rand 0.8.5",
+ "rand",
  "sha2 0.10.8",
  "thiserror",
  "zeroize",
@@ -5680,7 +5920,7 @@ dependencies = [
  "libp2p-swarm",
  "log",
  "quick-protobuf",
- "rand 0.8.5",
+ "rand",
  "sha2 0.10.8",
  "smallvec",
  "thiserror",
@@ -5702,7 +5942,7 @@ dependencies = [
  "libp2p-identity",
  "libp2p-swarm",
  "log",
- "rand 0.8.5",
+ "rand",
  "smallvec",
  "socket2 0.4.10",
  "tokio",
@@ -5738,7 +5978,7 @@ dependencies = [
  "log",
  "once_cell",
  "quick-protobuf",
- "rand 0.8.5",
+ "rand",
  "sha2 0.10.8",
  "snow",
  "static_assertions",
@@ -5760,7 +6000,7 @@ dependencies = [
  "libp2p-core",
  "libp2p-swarm",
  "log",
- "rand 0.8.5",
+ "rand",
  "void",
 ]
 
@@ -5780,7 +6020,7 @@ dependencies = [
  "log",
  "parking_lot 0.12.1",
  "quinn-proto",
- "rand 0.8.5",
+ "rand",
  "rustls 0.20.9",
  "thiserror",
  "tokio",
@@ -5798,7 +6038,7 @@ dependencies = [
  "libp2p-core",
  "libp2p-identity",
  "libp2p-swarm",
- "rand 0.8.5",
+ "rand",
  "smallvec",
 ]
 
@@ -5817,7 +6057,7 @@ dependencies = [
  "libp2p-identity",
  "libp2p-swarm-derive",
  "log",
- "rand 0.8.5",
+ "rand",
  "smallvec",
  "tokio",
  "void",
@@ -5829,7 +6069,7 @@ version = "0.32.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0fba456131824ab6acd4c7bf61e9c0f0a3014b5fc9868ccb8e10d344594cdc4f"
 dependencies = [
- "heck",
+ "heck 0.4.1",
  "quote",
  "syn 1.0.109",
 ]
@@ -5899,7 +6139,7 @@ dependencies = [
  "rw-stream-sink",
  "soketto",
  "url",
- "webpki-roots 0.22.6",
+ "webpki-roots",
 ]
 
 [[package]]
@@ -5954,7 +6194,7 @@ dependencies = [
  "libsecp256k1-core",
  "libsecp256k1-gen-ecmult",
  "libsecp256k1-gen-genmult",
- "rand 0.8.5",
+ "rand",
  "serde",
  "sha2 0.9.9",
  "typenum",
@@ -5968,7 +6208,7 @@ checksum = "5be9b9bb642d8522a44d533eab56c16c738301965504753b03ad1de3425d5451"
 dependencies = [
  "crunchy",
  "digest 0.9.0",
- "subtle",
+ "subtle 2.4.1",
 ]
 
 [[package]]
@@ -6051,6 +6291,18 @@ version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "c4cd1a83af159aa67994778be9070f0ae1bd732942279cabb14f86f986a21456"
 
+[[package]]
+name = "lioness"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4ae926706ba42c425c9457121178330d75e273df2e82e28b758faf3de3a9acb9"
+dependencies = [
+ "arrayref",
+ "blake2 0.8.1",
+ "chacha",
+ "keystream",
+]
+
 [[package]]
 name = "lock_api"
 version = "0.4.11"
@@ -6063,9 +6315,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.20"
+version = "0.4.21"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5e6163cb8c49088c2c36f57875e58ccd8c87c7427f7fbd50ea6710b2f3f2e8f"
+checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
 
 [[package]]
 name = "lru"
@@ -6122,50 +6374,50 @@ dependencies = [
 
 [[package]]
 name = "macro_magic"
-version = "0.4.2"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aee866bfee30d2d7e83835a4574aad5b45adba4cc807f2a3bbba974e5d4383c9"
+checksum = "e03844fc635e92f3a0067e25fa4bf3e3dbf3f2927bf3aa01bb7bc8f1c428949d"
 dependencies = [
  "macro_magic_core",
  "macro_magic_macros",
  "quote",
- "syn 2.0.42",
+ "syn 2.0.61",
 ]
 
 [[package]]
 name = "macro_magic_core"
-version = "0.4.2"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7e766a20fd9c72bab3e1e64ed63f36bd08410e75803813df210d1ce297d7ad00"
+checksum = "468155613a44cfd825f1fb0ffa532b018253920d404e6fca1e8d43155198a46d"
 dependencies = [
  "const-random",
  "derive-syn-parse",
  "macro_magic_core_macros",
  "proc-macro2",
  "quote",
- "syn 2.0.42",
+ "syn 2.0.61",
 ]
 
 [[package]]
 name = "macro_magic_core_macros"
-version = "0.4.3"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d710e1214dffbab3b5dacb21475dde7d6ed84c69ff722b3a47a782668d44fbac"
+checksum = "9ea73aa640dc01d62a590d48c0c3521ed739d53b27f919b25c3551e233481654"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.42",
+ "syn 2.0.61",
 ]
 
 [[package]]
 name = "macro_magic_macros"
-version = "0.4.2"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b8fb85ec1620619edf2984a7693497d4ec88a9665d8b87e942856884c92dbf2a"
+checksum = "ef9d79ae96aaba821963320eb2b6e34d17df1e5a83d8a1985c29cc5be59577b3"
 dependencies = [
  "macro_magic_core",
  "quote",
- "syn 2.0.42",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -6181,7 +6433,7 @@ dependencies = [
  "serde",
  "serde_derive",
  "serde_json",
- "syn 2.0.42",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -6205,6 +6457,15 @@ dependencies = [
  "regex-automata 0.1.10",
 ]
 
+[[package]]
+name = "matchers"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
+dependencies = [
+ "regex-automata 0.1.10",
+]
+
 [[package]]
 name = "matches"
 version = "0.1.10"
@@ -6245,6 +6506,15 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "memmap2"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fe751422e4a8caa417e13c3ea66452215d7d63e19e604f4980461212f3ae1322"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "memoffset"
 version = "0.8.0"
@@ -6303,7 +6573,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "69672161530e8aeca1d1400fbf3f1a1747ff60ea604265a4e906c2442df20532"
 dependencies = [
  "futures",
- "rand 0.8.5",
+ "rand",
  "thrift",
 ]
 
@@ -6333,10 +6603,35 @@ dependencies = [
  "windows-sys 0.48.0",
 ]
 
+[[package]]
+name = "mixnet"
+version = "0.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "daa3eb39495d8e2e2947a1d862852c90cc6a4a8845f8b41c8829cb9fcc047f4a"
+dependencies = [
+ "arrayref",
+ "arrayvec 0.7.4",
+ "bitflags 1.3.2",
+ "blake2 0.10.6",
+ "c2-chacha",
+ "curve25519-dalek 4.1.1",
+ "either",
+ "hashlink",
+ "lioness",
+ "log",
+ "parking_lot 0.12.1",
+ "rand",
+ "rand_chacha 0.3.1",
+ "rand_distr",
+ "subtle 2.4.1",
+ "thiserror",
+ "zeroize",
+]
+
 [[package]]
 name = "mmr-gadget"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "29.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "futures",
  "log",
@@ -6354,11 +6649,10 @@ dependencies = [
 
 [[package]]
 name = "mmr-rpc"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
- "anyhow",
- "jsonrpsee 0.16.3",
+ "jsonrpsee 0.20.3",
  "parity-scale-codec",
  "serde",
  "sp-api",
@@ -6399,12 +6693,12 @@ dependencies = [
 name = "module-evm-utility"
 version = "2.21.0"
 dependencies = [
- "ethereum",
+ "ethereum 0.14.0",
  "evm 0.36.0",
  "evm-gasometer 0.36.0",
  "evm-runtime 0.36.0",
  "sha3",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
@@ -6428,7 +6722,7 @@ dependencies = [
  "data-encoding",
  "log",
  "multibase",
- "multihash",
+ "multihash 0.17.0",
  "percent-encoding",
  "serde",
  "static_assertions",
@@ -6458,12 +6752,55 @@ dependencies = [
  "blake3",
  "core2",
  "digest 0.10.7",
- "multihash-derive",
+ "multihash-derive 0.8.0",
  "sha2 0.10.8",
  "sha3",
  "unsigned-varint",
 ]
 
+[[package]]
+name = "multihash"
+version = "0.18.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cfd8a792c1694c6da4f68db0a9d707c72bd260994da179e6030a5dcee00bb815"
+dependencies = [
+ "core2",
+ "digest 0.10.7",
+ "multihash-derive 0.8.0",
+ "sha2 0.10.8",
+ "unsigned-varint",
+]
+
+[[package]]
+name = "multihash"
+version = "0.19.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "076d548d76a0e2a0d4ab471d0b1c36c577786dfc4471242035d97a12a735c492"
+dependencies = [
+ "core2",
+ "unsigned-varint",
+]
+
+[[package]]
+name = "multihash-codetable"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6d815ecb3c8238d00647f8630ede7060a642c9f704761cd6082cb4028af6935"
+dependencies = [
+ "blake2b_simd",
+ "blake2s_simd",
+ "blake3",
+ "core2",
+ "digest 0.10.7",
+ "multihash-derive 0.9.0",
+ "ripemd",
+ "serde",
+ "sha1",
+ "sha2 0.10.8",
+ "sha3",
+ "strobe-rs",
+]
+
 [[package]]
 name = "multihash-derive"
 version = "0.8.0"
@@ -6479,11 +6816,36 @@ dependencies = [
 ]
 
 [[package]]
-name = "multimap"
-version = "0.8.3"
+name = "multihash-derive"
+version = "0.9.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a"
-
+checksum = "890e72cb7396cb99ed98c1246a97b243cc16394470d94e0bc8b0c2c11d84290e"
+dependencies = [
+ "core2",
+ "multihash 0.19.1",
+ "multihash-derive-impl",
+]
+
+[[package]]
+name = "multihash-derive-impl"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d38685e08adb338659871ecfc6ee47ba9b22dcc8abcf6975d379cc49145c3040"
+dependencies = [
+ "proc-macro-crate 1.3.1",
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+ "synstructure",
+]
+
+[[package]]
+name = "multimap"
+version = "0.8.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e5ce46fe64a9d73be07dcbe690a38ce1b293be448fd8ce1e6c1b8062c9f72c6a"
+
 [[package]]
 name = "multistream-select"
 version = "0.12.1"
@@ -6527,11 +6889,11 @@ dependencies = [
 
 [[package]]
 name = "names"
-version = "0.13.0"
+version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e7d66043b25d4a6cccb23619d10c19c25304b355a7dccd4a8e11423dd2382146"
+checksum = "7bddcd3bf5144b6392de80e04c347cd7fab2508f6df16a85fc496ecd5cec39bc"
 dependencies = [
- "rand 0.8.5",
+ "rand",
 ]
 
 [[package]]
@@ -6617,6 +6979,17 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "nix"
+version = "0.27.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2eb04e9c688eff1c89d72b407f168cf79bb9e867a9d3323ed6c01519eb9cc053"
+dependencies = [
+ "bitflags 2.4.1",
+ "cfg-if",
+ "libc",
+]
+
 [[package]]
 name = "no-std-net"
 version = "0.6.0"
@@ -6651,6 +7024,16 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be"
 
+[[package]]
+name = "nu-ansi-term"
+version = "0.46.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "77a8165726e8236064dbb45459242600304b42a5ea24ee2948e18e023bf7ba84"
+dependencies = [
+ "overload",
+ "winapi",
+]
+
 [[package]]
 name = "num"
 version = "0.4.1"
@@ -6759,11 +7142,11 @@ dependencies = [
 
 [[package]]
 name = "num_enum"
-version = "0.6.1"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7a015b430d3c108a207fd776d2e2196aaf8b1cf8cf93253e3a097ff3085076a1"
+checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845"
 dependencies = [
- "num_enum_derive 0.6.1",
+ "num_enum_derive 0.7.2",
 ]
 
 [[package]]
@@ -6779,14 +7162,14 @@ dependencies = [
 
 [[package]]
 name = "num_enum_derive"
-version = "0.6.1"
+version = "0.7.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "96667db765a921f7b295ffee8b60472b686a51d4f21c2ee4ffdb94c7013b65a6"
+checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b"
 dependencies = [
  "proc-macro-crate 1.3.1",
  "proc-macro2",
  "quote",
- "syn 2.0.42",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -6855,11 +7238,17 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
+[[package]]
+name = "option-ext"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04744f49eae99ab78e0d5c0b603ab218f515ea8cfe5a456d7629ad883a3b6e7d"
+
 [[package]]
 name = "orchestra"
-version = "0.0.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "227585216d05ba65c7ab0a0450a3cf2cbd81a98862a54c4df8e14d5ac6adb015"
+checksum = "92829eef0328a3d1cd22a02c0e51deb92a5362df3e7d21a4e9bdc38934694e66"
 dependencies = [
  "async-trait",
  "dyn-clonable",
@@ -6874,14 +7263,15 @@ dependencies = [
 
 [[package]]
 name = "orchestra-proc-macro"
-version = "0.0.5"
+version = "0.3.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2871aadd82a2c216ee68a69837a526dfe788ecbe74c4c5038a6acdbff6653066"
+checksum = "1344346d5af32c95bbddea91b18a88cc83eac394192d20ef2fc4c40a74332355"
 dependencies = [
- "expander 0.0.6",
- "itertools 0.10.5",
+ "expander 2.0.0",
+ "indexmap 2.1.0",
+ "itertools 0.11.0",
  "petgraph",
- "proc-macro-crate 1.3.1",
+ "proc-macro-crate 3.1.0",
  "proc-macro2",
  "quote",
  "syn 1.0.109",
@@ -6898,8 +7288,8 @@ dependencies = [
 
 [[package]]
 name = "orml-benchmarking"
-version = "0.4.1-dev"
-source = "git+https://github.com/galacticcouncil/open-runtime-module-library?rev=f36a0abefd8e6b929bee3cc2420f7c4fbe459c99#f36a0abefd8e6b929bee3cc2420f7c4fbe459c99"
+version = "0.8.0"
+source = "git+https://github.com/galacticcouncil/open-runtime-module-library?branch=polkadot-v1.7.2#43629abf084fe6d9eae8b3013e13544e00ad912f"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -6911,15 +7301,15 @@ dependencies = [
  "sp-api",
  "sp-io",
  "sp-runtime",
- "sp-runtime-interface",
- "sp-std",
- "sp-storage",
+ "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "orml-tokens"
-version = "0.4.2-dev"
-source = "git+https://github.com/galacticcouncil/open-runtime-module-library?rev=f36a0abefd8e6b929bee3cc2420f7c4fbe459c99#f36a0abefd8e6b929bee3cc2420f7c4fbe459c99"
+version = "0.8.1"
+source = "git+https://github.com/galacticcouncil/open-runtime-module-library?branch=polkadot-v1.7.2#43629abf084fe6d9eae8b3013e13544e00ad912f"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -6930,13 +7320,13 @@ dependencies = [
  "serde",
  "sp-arithmetic",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "orml-traits"
-version = "0.4.1-dev"
-source = "git+https://github.com/galacticcouncil/open-runtime-module-library?rev=f36a0abefd8e6b929bee3cc2420f7c4fbe459c99#f36a0abefd8e6b929bee3cc2420f7c4fbe459c99"
+version = "0.8.0"
+source = "git+https://github.com/galacticcouncil/open-runtime-module-library?branch=polkadot-v1.7.2#43629abf084fe6d9eae8b3013e13544e00ad912f"
 dependencies = [
  "frame-support",
  "impl-trait-for-tuples",
@@ -6949,14 +7339,14 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "staging-xcm",
 ]
 
 [[package]]
 name = "orml-unknown-tokens"
-version = "0.4.1-dev"
-source = "git+https://github.com/galacticcouncil/open-runtime-module-library?rev=f36a0abefd8e6b929bee3cc2420f7c4fbe459c99#f36a0abefd8e6b929bee3cc2420f7c4fbe459c99"
+version = "0.8.0"
+source = "git+https://github.com/galacticcouncil/open-runtime-module-library?branch=polkadot-v1.7.2#43629abf084fe6d9eae8b3013e13544e00ad912f"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -6964,14 +7354,14 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "serde",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "staging-xcm",
 ]
 
 [[package]]
 name = "orml-utilities"
-version = "0.4.1-dev"
-source = "git+https://github.com/galacticcouncil/open-runtime-module-library?rev=f36a0abefd8e6b929bee3cc2420f7c4fbe459c99#f36a0abefd8e6b929bee3cc2420f7c4fbe459c99"
+version = "0.8.0"
+source = "git+https://github.com/galacticcouncil/open-runtime-module-library?branch=polkadot-v1.7.2#43629abf084fe6d9eae8b3013e13544e00ad912f"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
@@ -6980,13 +7370,13 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "orml-vesting"
-version = "0.4.1-dev"
-source = "git+https://github.com/galacticcouncil/open-runtime-module-library?rev=f36a0abefd8e6b929bee3cc2420f7c4fbe459c99#f36a0abefd8e6b929bee3cc2420f7c4fbe459c99"
+version = "0.8.0"
+source = "git+https://github.com/galacticcouncil/open-runtime-module-library?branch=polkadot-v1.7.2#43629abf084fe6d9eae8b3013e13544e00ad912f"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -6995,43 +7385,42 @@ dependencies = [
  "serde",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "orml-xcm"
-version = "0.4.1-dev"
-source = "git+https://github.com/galacticcouncil/open-runtime-module-library?rev=f36a0abefd8e6b929bee3cc2420f7c4fbe459c99#f36a0abefd8e6b929bee3cc2420f7c4fbe459c99"
+version = "0.8.0"
+source = "git+https://github.com/galacticcouncil/open-runtime-module-library?branch=polkadot-v1.7.2#43629abf084fe6d9eae8b3013e13544e00ad912f"
 dependencies = [
  "frame-support",
  "frame-system",
  "pallet-xcm",
  "parity-scale-codec",
  "scale-info",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "staging-xcm",
 ]
 
 [[package]]
 name = "orml-xcm-support"
-version = "0.4.1-dev"
-source = "git+https://github.com/galacticcouncil/open-runtime-module-library?rev=f36a0abefd8e6b929bee3cc2420f7c4fbe459c99#f36a0abefd8e6b929bee3cc2420f7c4fbe459c99"
+version = "0.8.0"
+source = "git+https://github.com/galacticcouncil/open-runtime-module-library?branch=polkadot-v1.7.2#43629abf084fe6d9eae8b3013e13544e00ad912f"
 dependencies = [
  "frame-support",
  "orml-traits",
  "parity-scale-codec",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "staging-xcm",
  "staging-xcm-executor",
 ]
 
 [[package]]
 name = "orml-xtokens"
-version = "0.4.1-dev"
-source = "git+https://github.com/galacticcouncil/open-runtime-module-library?rev=f36a0abefd8e6b929bee3cc2420f7c4fbe459c99#f36a0abefd8e6b929bee3cc2420f7c4fbe459c99"
+version = "0.8.0"
+source = "git+https://github.com/galacticcouncil/open-runtime-module-library?branch=polkadot-v1.7.2#43629abf084fe6d9eae8b3013e13544e00ad912f"
 dependencies = [
- "cumulus-primitives-core",
  "frame-support",
  "frame-system",
  "log",
@@ -7043,7 +7432,7 @@ dependencies = [
  "serde",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "staging-xcm",
  "staging-xcm-executor",
 ]
@@ -7054,9 +7443,48 @@ version = "6.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e2355d85b9a3786f481747ced0e0ff2ba35213a1f9bd406ed906554d7af805a1"
 
+[[package]]
+name = "overload"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b15813163c1d831bf4a13c3610c05c0d03b39feb07f7e09fa234dac9b15aaf39"
+
+[[package]]
+name = "pallet-asset-conversion"
+version = "10.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
+dependencies = [
+ "frame-benchmarking",
+ "frame-support",
+ "frame-system",
+ "parity-scale-codec",
+ "scale-info",
+ "sp-api",
+ "sp-arithmetic",
+ "sp-core",
+ "sp-io",
+ "sp-runtime",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+]
+
+[[package]]
+name = "pallet-asset-rate"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
+dependencies = [
+ "frame-benchmarking",
+ "frame-support",
+ "frame-system",
+ "parity-scale-codec",
+ "scale-info",
+ "sp-core",
+ "sp-runtime",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+]
+
 [[package]]
 name = "pallet-asset-registry"
-version = "3.2.3"
+version = "3.2.4"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -7075,7 +7503,7 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "staging-xcm",
  "substrate-wasm-builder",
  "test-utils",
@@ -7083,8 +7511,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-asset-tx-payment"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -7096,13 +7524,13 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-assets"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "29.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -7112,13 +7540,13 @@ dependencies = [
  "scale-info",
  "sp-core",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-aura"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "27.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -7129,13 +7557,13 @@ dependencies = [
  "sp-application-crypto",
  "sp-consensus-aura",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-authority-discovery"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -7145,13 +7573,13 @@ dependencies = [
  "sp-application-crypto",
  "sp-authority-discovery",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-authorship"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -7159,13 +7587,13 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-babe"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -7183,13 +7611,13 @@ dependencies = [
  "sp-runtime",
  "sp-session",
  "sp-staking",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-bags-list"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "27.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "aquamarine",
  "docify",
@@ -7204,15 +7632,16 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
- "sp-tracing",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-balances"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
+ "docify",
  "frame-benchmarking",
  "frame-support",
  "frame-system",
@@ -7220,13 +7649,13 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-beefy"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -7240,15 +7669,15 @@ dependencies = [
  "sp-runtime",
  "sp-session",
  "sp-staking",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-beefy-mmr"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
- "array-bytes",
+ "array-bytes 6.2.2",
  "binary-merkle-tree",
  "frame-support",
  "frame-system",
@@ -7264,13 +7693,13 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-state-machine 0.28.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)",
- "sp-std",
+ "sp-state-machine",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-bonds"
-version = "2.2.2"
+version = "2.2.3"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -7288,14 +7717,14 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
- "sp-tracing",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-bounties"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "27.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -7307,13 +7736,30 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+]
+
+[[package]]
+name = "pallet-broker"
+version = "0.6.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
+dependencies = [
+ "bitvec",
+ "frame-benchmarking",
+ "frame-support",
+ "frame-system",
+ "parity-scale-codec",
+ "scale-info",
+ "sp-arithmetic",
+ "sp-core",
+ "sp-runtime",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-child-bounties"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "27.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -7326,12 +7772,12 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-circuit-breaker"
-version = "1.1.24"
+version = "1.1.25"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -7349,14 +7795,14 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "test-case 3.3.1",
  "test-utils",
 ]
 
 [[package]]
 name = "pallet-claims"
-version = "3.4.8"
+version = "3.4.9"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -7373,12 +7819,12 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-collator-rewards"
-version = "1.0.7"
+version = "1.0.8"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -7396,14 +7842,14 @@ dependencies = [
  "sp-io",
  "sp-runtime",
  "sp-staking",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "substrate-wasm-builder",
 ]
 
 [[package]]
 name = "pallet-collator-selection"
-version = "3.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "9.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -7412,17 +7858,17 @@ dependencies = [
  "pallet-authorship",
  "pallet-session",
  "parity-scale-codec",
- "rand 0.8.5",
+ "rand",
  "scale-info",
  "sp-runtime",
  "sp-staking",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-collective"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -7433,13 +7879,13 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-conviction-voting"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "assert_matches",
  "frame-benchmarking",
@@ -7450,12 +7896,12 @@ dependencies = [
  "serde",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-currencies"
-version = "2.1.0"
+version = "2.1.1"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -7469,12 +7915,12 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-dca"
-version = "1.4.7"
+version = "1.4.8"
 dependencies = [
  "cumulus-pallet-parachain-system",
  "cumulus-primitives-core",
@@ -7497,60 +7943,60 @@ dependencies = [
  "pretty_assertions",
  "primitive-types",
  "primitives",
- "rand 0.8.5",
+ "rand",
  "scale-info",
  "smallvec",
  "sp-api",
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
- "sp-tracing",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "test-case 2.2.2",
  "test-utils",
 ]
 
 [[package]]
 name = "pallet-democracy"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "4.2.1"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
  "frame-system",
  "log",
+ "pallet-balances",
+ "pallet-preimage",
+ "pallet-scheduler",
  "parity-scale-codec",
  "scale-info",
  "serde",
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-democracy"
-version = "4.2.0"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
  "frame-system",
  "log",
- "pallet-balances",
- "pallet-preimage",
- "pallet-scheduler",
  "parity-scale-codec",
  "scale-info",
  "serde",
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-duster"
-version = "3.2.4"
+version = "3.2.5"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -7568,13 +8014,13 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "substrate-wasm-builder",
 ]
 
 [[package]]
 name = "pallet-dynamic-evm-fee"
-version = "1.0.1"
+version = "1.0.2"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -7595,13 +8041,13 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "test-utils",
 ]
 
 [[package]]
 name = "pallet-dynamic-fees"
-version = "1.0.3"
+version = "1.0.4"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -7615,13 +8061,13 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-election-provider-multi-phase"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "27.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -7630,21 +8076,21 @@ dependencies = [
  "log",
  "pallet-election-provider-support-benchmarking",
  "parity-scale-codec",
- "rand 0.8.5",
+ "rand",
  "scale-info",
  "sp-arithmetic",
  "sp-core",
  "sp-io",
  "sp-npos-elections",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "strum 0.24.1",
 ]
 
 [[package]]
 name = "pallet-election-provider-support-benchmarking"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "27.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -7652,13 +8098,13 @@ dependencies = [
  "parity-scale-codec",
  "sp-npos-elections",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-elections-phragmen"
-version = "5.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "29.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -7671,12 +8117,12 @@ dependencies = [
  "sp-npos-elections",
  "sp-runtime",
  "sp-staking",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-ema-oracle"
-version = "1.3.1"
+version = "1.3.2"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -7694,19 +8140,19 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "test-utils",
 ]
 
 [[package]]
 name = "pallet-ethereum"
 version = "4.0.0-dev"
-source = "git+https://github.com/moonbeam-foundation/frontier?rev=bf5885a982041cc744ecbb62a2afc13d56d464dc#bf5885a982041cc744ecbb62a2afc13d56d464dc"
+source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.2#91f1c7a447f987d732f87f86c3e02d506d426a99"
 dependencies = [
  "environmental",
- "ethereum",
+ "ethereum 0.15.0",
  "ethereum-types",
- "evm 0.39.1",
+ "evm 0.41.1",
  "fp-consensus",
  "fp-ethereum",
  "fp-evm",
@@ -7719,21 +8165,22 @@ dependencies = [
  "scale-info",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-evm"
 version = "6.0.0-dev"
-source = "git+https://github.com/moonbeam-foundation/frontier?rev=bf5885a982041cc744ecbb62a2afc13d56d464dc#bf5885a982041cc744ecbb62a2afc13d56d464dc"
+source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.2#91f1c7a447f987d732f87f86c3e02d506d426a99"
 dependencies = [
  "environmental",
- "evm 0.39.1",
+ "evm 0.41.1",
  "fp-account",
  "fp-evm",
  "frame-benchmarking",
  "frame-support",
  "frame-system",
+ "hash-db 0.16.0",
  "hex",
  "hex-literal 0.4.1",
  "impl-trait-for-tuples",
@@ -7744,12 +8191,12 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-evm-accounts"
-version = "1.1.1"
+version = "1.1.2"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -7762,7 +8209,7 @@ dependencies = [
  "scale-info",
  "sp-core",
  "sp-io",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "test-utils",
 ]
 
@@ -7777,19 +8224,18 @@ dependencies = [
 [[package]]
 name = "pallet-evm-chain-id"
 version = "1.0.0-dev"
-source = "git+https://github.com/moonbeam-foundation/frontier?rev=bf5885a982041cc744ecbb62a2afc13d56d464dc#bf5885a982041cc744ecbb62a2afc13d56d464dc"
+source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.2#91f1c7a447f987d732f87f86c3e02d506d426a99"
 dependencies = [
  "frame-support",
  "frame-system",
  "parity-scale-codec",
  "scale-info",
- "sp-runtime",
 ]
 
 [[package]]
 name = "pallet-evm-precompile-blake2"
 version = "2.0.0-dev"
-source = "git+https://github.com/moonbeam-foundation/frontier?rev=bf5885a982041cc744ecbb62a2afc13d56d464dc#bf5885a982041cc744ecbb62a2afc13d56d464dc"
+source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.2#91f1c7a447f987d732f87f86c3e02d506d426a99"
 dependencies = [
  "fp-evm",
 ]
@@ -7797,7 +8243,7 @@ dependencies = [
 [[package]]
 name = "pallet-evm-precompile-bn128"
 version = "2.0.0-dev"
-source = "git+https://github.com/moonbeam-foundation/frontier?rev=bf5885a982041cc744ecbb62a2afc13d56d464dc#bf5885a982041cc744ecbb62a2afc13d56d464dc"
+source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.2#91f1c7a447f987d732f87f86c3e02d506d426a99"
 dependencies = [
  "fp-evm",
  "sp-core",
@@ -7806,10 +8252,10 @@ dependencies = [
 
 [[package]]
 name = "pallet-evm-precompile-call-permit"
-version = "0.1.0"
+version = "0.1.1"
 dependencies = [
  "derive_more",
- "evm 0.39.1",
+ "evm 0.41.1",
  "fp-evm",
  "frame-support",
  "frame-system",
@@ -7830,13 +8276,13 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-evm-precompile-dispatch"
 version = "2.0.0-dev"
-source = "git+https://github.com/moonbeam-foundation/frontier?rev=bf5885a982041cc744ecbb62a2afc13d56d464dc#bf5885a982041cc744ecbb62a2afc13d56d464dc"
+source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.2#91f1c7a447f987d732f87f86c3e02d506d426a99"
 dependencies = [
  "fp-evm",
  "frame-support",
@@ -7848,7 +8294,7 @@ dependencies = [
 [[package]]
 name = "pallet-evm-precompile-modexp"
 version = "2.0.0-dev"
-source = "git+https://github.com/moonbeam-foundation/frontier?rev=bf5885a982041cc744ecbb62a2afc13d56d464dc#bf5885a982041cc744ecbb62a2afc13d56d464dc"
+source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.2#91f1c7a447f987d732f87f86c3e02d506d426a99"
 dependencies = [
  "fp-evm",
  "num",
@@ -7857,7 +8303,7 @@ dependencies = [
 [[package]]
 name = "pallet-evm-precompile-simple"
 version = "2.0.0-dev"
-source = "git+https://github.com/moonbeam-foundation/frontier?rev=bf5885a982041cc744ecbb62a2afc13d56d464dc#bf5885a982041cc744ecbb62a2afc13d56d464dc"
+source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.2#91f1c7a447f987d732f87f86c3e02d506d426a99"
 dependencies = [
  "fp-evm",
  "ripemd",
@@ -7866,8 +8312,8 @@ dependencies = [
 
 [[package]]
 name = "pallet-fast-unstake"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "27.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "docify",
  "frame-benchmarking",
@@ -7880,12 +8326,12 @@ dependencies = [
  "sp-io",
  "sp-runtime",
  "sp-staking",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-genesis-history"
-version = "2.1.1"
+version = "2.1.2"
 dependencies = [
  "derive_more",
  "frame-support",
@@ -7898,13 +8344,13 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-grandpa"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -7921,29 +8367,30 @@ dependencies = [
  "sp-runtime",
  "sp-session",
  "sp-staking",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-identity"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "enumflags2",
  "frame-benchmarking",
  "frame-support",
  "frame-system",
+ "log",
  "parity-scale-codec",
  "scale-info",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-im-online"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "27.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -7957,13 +8404,13 @@ dependencies = [
  "sp-io",
  "sp-runtime",
  "sp-staking",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-indices"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -7974,12 +8421,12 @@ dependencies = [
  "sp-io",
  "sp-keyring",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-lbp"
-version = "4.8.2"
+version = "4.8.3"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -7997,14 +8444,14 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "substrate-wasm-builder",
  "test-utils",
 ]
 
 [[package]]
 name = "pallet-liquidity-mining"
-version = "4.3.3"
+version = "4.3.4"
 dependencies = [
  "fixed",
  "frame-support",
@@ -8017,20 +8464,20 @@ dependencies = [
  "parity-scale-codec",
  "pretty_assertions",
  "proptest",
- "rand 0.8.5",
+ "rand",
  "scale-info",
  "sp-arithmetic",
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "test-utils",
 ]
 
 [[package]]
 name = "pallet-membership"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8041,14 +8488,15 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-message-queue"
-version = "7.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "31.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
+ "environmental",
  "frame-benchmarking",
  "frame-support",
  "frame-system",
@@ -8059,14 +8507,14 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
- "sp-weights 20.0.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-weights",
 ]
 
 [[package]]
 name = "pallet-mmr"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "27.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8078,13 +8526,13 @@ dependencies = [
  "sp-io",
  "sp-mmr-primitives",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-multisig"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8094,12 +8542,12 @@ dependencies = [
  "scale-info",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-nft"
-version = "7.1.3"
+version = "7.1.4"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8114,13 +8562,13 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-nis"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8130,13 +8578,13 @@ dependencies = [
  "sp-arithmetic",
  "sp-core",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-nomination-pools"
-version = "1.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "25.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -8148,14 +8596,14 @@ dependencies = [
  "sp-io",
  "sp-runtime",
  "sp-staking",
- "sp-std",
- "sp-tracing",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-nomination-pools-benchmarking"
-version = "1.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "26.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -8163,30 +8611,30 @@ dependencies = [
  "frame-system",
  "pallet-bags-list",
  "pallet-nomination-pools",
- "pallet-staking 4.0.0-dev",
+ "pallet-staking 28.0.0",
  "parity-scale-codec",
  "scale-info",
  "sp-runtime",
- "sp-runtime-interface",
+ "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-staking",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-nomination-pools-runtime-api"
-version = "1.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "23.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "pallet-nomination-pools",
  "parity-scale-codec",
  "sp-api",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-offences"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "27.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -8197,13 +8645,13 @@ dependencies = [
  "serde",
  "sp-runtime",
  "sp-staking",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-offences-benchmarking"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -8216,17 +8664,17 @@ dependencies = [
  "pallet-im-online",
  "pallet-offences",
  "pallet-session",
- "pallet-staking 4.0.0-dev",
+ "pallet-staking 28.0.0",
  "parity-scale-codec",
  "scale-info",
  "sp-runtime",
  "sp-staking",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-omnipool"
-version = "4.3.0"
+version = "4.3.1"
 dependencies = [
  "bitflags 1.3.2",
  "frame-benchmarking",
@@ -8247,13 +8695,13 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
- "sp-tracing",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-omnipool-liquidity-mining"
-version = "2.1.7"
+version = "2.1.8"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8275,12 +8723,12 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-otc"
-version = "1.1.3"
+version = "1.1.4"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8296,14 +8744,14 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "test-utils",
 ]
 
 [[package]]
 name = "pallet-preimage"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8314,13 +8762,13 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-proxy"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8329,17 +8777,18 @@ dependencies = [
  "scale-info",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-ranked-collective"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
  "frame-system",
+ "impl-trait-for-tuples",
  "log",
  "parity-scale-codec",
  "scale-info",
@@ -8347,13 +8796,13 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-recovery"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8362,13 +8811,13 @@ dependencies = [
  "scale-info",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-referenda"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "assert_matches",
  "frame-benchmarking",
@@ -8381,12 +8830,12 @@ dependencies = [
  "sp-arithmetic",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-referrals"
-version = "1.2.4"
+version = "1.2.5"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8402,8 +8851,8 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
- "sp-tracing",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
@@ -8417,12 +8866,27 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-api",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+]
+
+[[package]]
+name = "pallet-root-testing"
+version = "4.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
+dependencies = [
+ "frame-support",
+ "frame-system",
+ "parity-scale-codec",
+ "scale-info",
+ "sp-core",
+ "sp-io",
+ "sp-runtime",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-route-executor"
-version = "2.3.2"
+version = "2.3.3"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8441,14 +8905,14 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "test-utils",
 ]
 
 [[package]]
 name = "pallet-scheduler"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "29.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "docify",
  "frame-benchmarking",
@@ -8459,14 +8923,14 @@ dependencies = [
  "scale-info",
  "sp-io",
  "sp-runtime",
- "sp-std",
- "sp-weights 20.0.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-weights",
 ]
 
 [[package]]
 name = "pallet-session"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -8480,32 +8944,32 @@ dependencies = [
  "sp-runtime",
  "sp-session",
  "sp-staking",
- "sp-state-machine 0.28.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)",
- "sp-std",
+ "sp-state-machine",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-trie",
 ]
 
 [[package]]
 name = "pallet-session-benchmarking"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
  "frame-system",
  "pallet-session",
- "pallet-staking 4.0.0-dev",
+ "pallet-staking 28.0.0",
  "parity-scale-codec",
- "rand 0.8.5",
+ "rand",
  "sp-runtime",
  "sp-session",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-society"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8517,12 +8981,12 @@ dependencies = [
  "sp-arithmetic",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-stableswap"
-version = "3.6.2"
+version = "3.6.3"
 dependencies = [
  "bitflags 1.3.2",
  "frame-benchmarking",
@@ -8540,14 +9004,14 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
- "sp-tracing",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "test-utils",
 ]
 
 [[package]]
 name = "pallet-staking"
-version = "3.1.0"
+version = "3.1.1"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8557,7 +9021,7 @@ dependencies = [
  "orml-tokens",
  "orml-traits",
  "pallet-balances",
- "pallet-democracy 4.2.0",
+ "pallet-democracy 4.2.1",
  "pallet-uniques",
  "parity-scale-codec",
  "pretty_assertions",
@@ -8566,13 +9030,13 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-staking"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -8589,24 +9053,24 @@ dependencies = [
  "sp-io",
  "sp-runtime",
  "sp-staking",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-staking-reward-curve"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "11.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
- "proc-macro-crate 1.3.1",
+ "proc-macro-crate 3.1.0",
  "proc-macro2",
  "quote",
- "syn 2.0.42",
+ "syn 2.0.61",
 ]
 
 [[package]]
 name = "pallet-staking-reward-fn"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "19.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "log",
  "sp-arithmetic",
@@ -8614,17 +9078,18 @@ dependencies = [
 
 [[package]]
 name = "pallet-staking-runtime-api"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "14.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
+ "sp-staking",
 ]
 
 [[package]]
 name = "pallet-state-trie-migration"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "29.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8635,14 +9100,15 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-sudo"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
+ "docify",
  "frame-benchmarking",
  "frame-support",
  "frame-system",
@@ -8650,14 +9116,15 @@ dependencies = [
  "scale-info",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-timestamp"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "27.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
+ "docify",
  "frame-benchmarking",
  "frame-support",
  "frame-system",
@@ -8667,15 +9134,15 @@ dependencies = [
  "sp-inherents",
  "sp-io",
  "sp-runtime",
- "sp-std",
- "sp-storage",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-timestamp",
 ]
 
 [[package]]
 name = "pallet-tips"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "27.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8688,12 +9155,12 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-transaction-multi-payment"
-version = "10.0.3"
+version = "10.0.4"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -8714,13 +9181,13 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "test-utils",
 ]
 
 [[package]]
 name = "pallet-transaction-pause"
-version = "1.0.2"
+version = "1.0.3"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8736,13 +9203,13 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-transaction-payment"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -8752,15 +9219,15 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-transaction-payment-rpc"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "30.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
- "jsonrpsee 0.16.3",
+ "jsonrpsee 0.20.3",
  "pallet-transaction-payment-rpc-runtime-api",
  "parity-scale-codec",
  "sp-api",
@@ -8768,26 +9235,27 @@ dependencies = [
  "sp-core",
  "sp-rpc",
  "sp-runtime",
- "sp-weights 20.0.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)",
+ "sp-weights",
 ]
 
 [[package]]
 name = "pallet-transaction-payment-rpc-runtime-api"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "pallet-transaction-payment",
  "parity-scale-codec",
  "sp-api",
  "sp-runtime",
- "sp-weights 20.0.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)",
+ "sp-weights",
 ]
 
 [[package]]
 name = "pallet-treasury"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "27.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
+ "docify",
  "frame-benchmarking",
  "frame-support",
  "frame-system",
@@ -8796,14 +9264,15 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "serde",
+ "sp-core",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-uniques"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8812,13 +9281,13 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-utility"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8828,13 +9297,13 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-vesting"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8843,13 +9312,13 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-whitelist"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "27.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8858,34 +9327,36 @@ dependencies = [
  "scale-info",
  "sp-api",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-xcm"
-version = "1.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "bounded-collections",
  "frame-benchmarking",
  "frame-support",
  "frame-system",
  "log",
+ "pallet-balances",
  "parity-scale-codec",
  "scale-info",
  "serde",
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "staging-xcm",
+ "staging-xcm-builder",
  "staging-xcm-executor",
 ]
 
 [[package]]
 name = "pallet-xcm-benchmarks"
-version = "1.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8895,42 +9366,15 @@ dependencies = [
  "scale-info",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "staging-xcm",
  "staging-xcm-builder",
  "staging-xcm-executor",
 ]
 
-[[package]]
-name = "pallet-xcm-rate-limiter"
-version = "0.1.8"
-dependencies = [
- "cumulus-pallet-xcmp-queue",
- "frame-benchmarking",
- "frame-support",
- "frame-system",
- "hydra-dx-math",
- "hydradx-traits",
- "orml-tokens",
- "orml-traits",
- "pallet-balances",
- "pallet-omnipool",
- "parity-scale-codec",
- "polkadot-core-primitives",
- "polkadot-parachain-primitives",
- "pretty_assertions",
- "scale-info",
- "serde",
- "sp-core",
- "sp-io",
- "sp-runtime",
- "sp-std",
- "staging-xcm",
-]
-
 [[package]]
 name = "pallet-xyk"
-version = "6.4.2"
+version = "6.4.3"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8950,13 +9394,13 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "substrate-wasm-builder",
 ]
 
 [[package]]
 name = "pallet-xyk-liquidity-mining"
-version = "1.1.10"
+version = "1.1.11"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -8975,57 +9419,38 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
-name = "parachain-info"
-version = "0.1.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
-dependencies = [
- "cumulus-primitives-core",
- "frame-support",
- "frame-system",
- "parity-scale-codec",
- "scale-info",
- "sp-runtime",
- "sp-std",
-]
-
-[[package]]
-name = "parachains-common"
-version = "1.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+name = "parachains-common"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "cumulus-primitives-core",
  "cumulus-primitives-utility",
  "frame-support",
  "frame-system",
- "kusama-runtime-constants",
  "log",
- "num-traits",
  "pallet-asset-tx-payment",
  "pallet-assets",
  "pallet-authorship",
  "pallet-balances",
  "pallet-collator-selection",
+ "pallet-message-queue",
+ "pallet-xcm",
  "parity-scale-codec",
- "polkadot-core-primitives",
  "polkadot-primitives",
- "polkadot-runtime-constants",
- "rococo-runtime-constants",
  "scale-info",
- "smallvec",
  "sp-consensus-aura",
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "staging-parachain-info",
  "staging-xcm",
- "staging-xcm-builder",
  "staging-xcm-executor",
  "substrate-wasm-builder",
- "westend-runtime-constants",
 ]
 
 [[package]]
@@ -9034,16 +9459,16 @@ version = "0.4.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "59e9ab494af9e6e813c72170f0d3c1de1500990d62c97cc05cc7576f91aa402f"
 dependencies = [
- "blake2",
+ "blake2 0.10.6",
  "crc32fast",
  "fs2",
  "hex",
  "libc",
  "log",
  "lz4",
- "memmap2",
+ "memmap2 0.5.10",
  "parking_lot 0.12.1",
- "rand 0.8.5",
+ "rand",
  "siphasher",
  "snap",
 ]
@@ -9069,7 +9494,7 @@ version = "3.6.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "be30eaf4b0a9fba5336683b38de57bb86d179a35862ba6bfcf57625d006bde5b"
 dependencies = [
- "proc-macro-crate 2.0.1",
+ "proc-macro-crate 2.0.0",
  "proc-macro2",
  "quote",
  "syn 1.0.109",
@@ -9162,15 +9587,6 @@ dependencies = [
  "crypto-mac 0.11.1",
 ]
 
-[[package]]
-name = "pbkdf2"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83a0692ec44e4cf1ef28ca317f14f8f07da2d95ec3fa01f86e4467b725e60917"
-dependencies = [
- "digest 0.10.7",
-]
-
 [[package]]
 name = "pbkdf2"
 version = "0.12.2"
@@ -9232,7 +9648,7 @@ dependencies = [
  "pest_meta",
  "proc-macro2",
  "quote",
- "syn 2.0.42",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -9273,7 +9689,7 @@ checksum = "4359fd9c9171ec6e8c62926d6faaf553a8dc3f64e1507e76da7911b4f6a04405"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.42",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -9363,11 +9779,13 @@ dependencies = [
 
 [[package]]
 name = "polkadot-approval-distribution"
-version = "1.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
+ "bitvec",
  "futures",
  "futures-timer",
+ "itertools 0.10.5",
  "polkadot-node-jaeger",
  "polkadot-node-metrics",
  "polkadot-node-network-protocol",
@@ -9375,14 +9793,14 @@ dependencies = [
  "polkadot-node-subsystem",
  "polkadot-node-subsystem-util",
  "polkadot-primitives",
- "rand 0.8.5",
+ "rand",
  "tracing-gum",
 ]
 
 [[package]]
 name = "polkadot-availability-bitfield-distribution"
-version = "1.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "always-assert",
  "futures",
@@ -9391,14 +9809,14 @@ dependencies = [
  "polkadot-node-subsystem",
  "polkadot-node-subsystem-util",
  "polkadot-primitives",
- "rand 0.8.5",
+ "rand",
  "tracing-gum",
 ]
 
 [[package]]
 name = "polkadot-availability-distribution"
-version = "1.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "derive_more",
  "fatality",
@@ -9410,7 +9828,7 @@ dependencies = [
  "polkadot-node-subsystem",
  "polkadot-node-subsystem-util",
  "polkadot-primitives",
- "rand 0.8.5",
+ "rand",
  "schnellru",
  "sp-core",
  "sp-keystore",
@@ -9420,9 +9838,10 @@ dependencies = [
 
 [[package]]
 name = "polkadot-availability-recovery"
-version = "1.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
+ "async-trait",
  "fatality",
  "futures",
  "parity-scale-codec",
@@ -9432,24 +9851,26 @@ dependencies = [
  "polkadot-node-subsystem",
  "polkadot-node-subsystem-util",
  "polkadot-primitives",
- "rand 0.8.5",
+ "rand",
  "sc-network",
  "schnellru",
  "thiserror",
+ "tokio",
  "tracing-gum",
 ]
 
 [[package]]
 name = "polkadot-cli"
-version = "1.1.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
- "clap 4.4.11",
+ "cfg-if",
+ "clap 4.5.4",
  "frame-benchmarking-cli",
  "futures",
  "log",
  "polkadot-node-metrics",
- "polkadot-performance-test",
+ "polkadot-node-primitives",
  "polkadot-service",
  "sc-cli",
  "sc-executor",
@@ -9468,8 +9889,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-collator-protocol"
-version = "1.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "bitvec",
  "fatality",
@@ -9490,26 +9911,26 @@ dependencies = [
 
 [[package]]
 name = "polkadot-core-primitives"
-version = "1.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-core",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "polkadot-dispute-distribution"
-version = "1.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "derive_more",
  "fatality",
  "futures",
  "futures-timer",
- "indexmap 1.9.3",
+ "indexmap 2.1.0",
  "parity-scale-codec",
  "polkadot-erasure-coding",
  "polkadot-node-network-protocol",
@@ -9527,8 +9948,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-erasure-coding"
-version = "1.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "parity-scale-codec",
  "polkadot-node-primitives",
@@ -9541,8 +9962,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-gossip-support"
-version = "1.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "futures",
  "futures-timer",
@@ -9550,20 +9971,21 @@ dependencies = [
  "polkadot-node-subsystem",
  "polkadot-node-subsystem-util",
  "polkadot-primitives",
- "rand 0.8.5",
+ "rand",
  "rand_chacha 0.3.1",
  "sc-network",
  "sc-network-common",
  "sp-application-crypto",
  "sp-core",
+ "sp-crypto-hashing",
  "sp-keystore",
  "tracing-gum",
 ]
 
 [[package]]
 name = "polkadot-network-bridge"
-version = "1.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "always-assert",
  "async-trait",
@@ -9585,8 +10007,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-collation-generation"
-version = "1.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "futures",
  "parity-scale-codec",
@@ -9603,15 +10025,16 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-approval-voting"
-version = "1.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "bitvec",
  "derive_more",
  "futures",
  "futures-timer",
+ "itertools 0.10.5",
  "kvdb",
- "merlin 2.0.1",
+ "merlin 3.0.0",
  "parity-scale-codec",
  "polkadot-node-jaeger",
  "polkadot-node-primitives",
@@ -9619,9 +10042,12 @@ dependencies = [
  "polkadot-node-subsystem-util",
  "polkadot-overseer",
  "polkadot-primitives",
+ "rand",
+ "rand_chacha 0.3.1",
+ "rand_core 0.6.4",
  "sc-keystore",
  "schnellru",
- "schnorrkel 0.9.1",
+ "schnorrkel 0.11.4",
  "sp-application-crypto",
  "sp-consensus",
  "sp-consensus-slots",
@@ -9632,8 +10058,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-av-store"
-version = "1.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "bitvec",
  "futures",
@@ -9654,8 +10080,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-backing"
-version = "1.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "bitvec",
  "fatality",
@@ -9666,6 +10092,7 @@ dependencies = [
  "polkadot-node-subsystem-util",
  "polkadot-primitives",
  "polkadot-statement-table",
+ "schnellru",
  "sp-keystore",
  "thiserror",
  "tracing-gum",
@@ -9673,8 +10100,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-bitfield-signing"
-version = "1.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "futures",
  "polkadot-node-subsystem",
@@ -9688,8 +10115,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-candidate-validation"
-version = "1.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "async-trait",
  "futures",
@@ -9709,23 +10136,22 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-chain-api"
-version = "1.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "futures",
  "polkadot-node-metrics",
  "polkadot-node-subsystem",
- "polkadot-primitives",
+ "polkadot-node-subsystem-types",
  "sc-client-api",
  "sc-consensus-babe",
- "sp-blockchain",
  "tracing-gum",
 ]
 
 [[package]]
 name = "polkadot-node-core-chain-selection"
-version = "1.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "futures",
  "futures-timer",
@@ -9741,8 +10167,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-dispute-coordinator"
-version = "1.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "fatality",
  "futures",
@@ -9760,8 +10186,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-parachains-inherent"
-version = "1.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "async-trait",
  "futures",
@@ -9777,8 +10203,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-prospective-parachains"
-version = "1.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "6.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "bitvec",
  "fatality",
@@ -9794,8 +10220,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-provisioner"
-version = "1.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "bitvec",
  "fatality",
@@ -9811,12 +10237,16 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-pvf"
-version = "1.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "always-assert",
+ "array-bytes 6.2.2",
+ "blake3",
+ "cfg-if",
  "futures",
  "futures-timer",
+ "is_executable",
  "libc",
  "parity-scale-codec",
  "pin-project",
@@ -9824,23 +10254,24 @@ dependencies = [
  "polkadot-node-core-pvf-common",
  "polkadot-node-metrics",
  "polkadot-node-primitives",
+ "polkadot-node-subsystem",
  "polkadot-parachain-primitives",
  "polkadot-primitives",
- "rand 0.8.5",
+ "rand",
  "slotmap",
  "sp-core",
  "sp-maybe-compressed-blob",
- "sp-wasm-interface",
- "substrate-build-script-utils",
+ "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "tempfile",
+ "thiserror",
  "tokio",
  "tracing-gum",
 ]
 
 [[package]]
 name = "polkadot-node-core-pvf-checker"
-version = "1.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "futures",
  "polkadot-node-primitives",
@@ -9855,54 +10286,35 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-core-pvf-common"
-version = "1.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
+ "cfg-if",
  "cpu-time",
  "futures",
  "landlock",
  "libc",
+ "nix 0.27.1",
  "parity-scale-codec",
  "polkadot-parachain-primitives",
  "polkadot-primitives",
  "sc-executor",
  "sc-executor-common",
  "sc-executor-wasmtime",
+ "seccompiler",
  "sp-core",
- "sp-externalities",
+ "sp-crypto-hashing",
+ "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-io",
- "sp-tracing",
- "tokio",
- "tracing-gum",
-]
-
-[[package]]
-name = "polkadot-node-core-pvf-prepare-worker"
-version = "1.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
-dependencies = [
- "futures",
- "libc",
- "parity-scale-codec",
- "polkadot-node-core-pvf-common",
- "polkadot-parachain-primitives",
- "polkadot-primitives",
- "rayon",
- "sc-executor",
- "sc-executor-common",
- "sc-executor-wasmtime",
- "sp-io",
- "sp-maybe-compressed-blob",
- "sp-tracing",
- "tikv-jemalloc-ctl",
- "tokio",
+ "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "thiserror",
  "tracing-gum",
 ]
 
 [[package]]
 name = "polkadot-node-core-runtime-api"
-version = "1.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "futures",
  "polkadot-node-metrics",
@@ -9916,8 +10328,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-jaeger"
-version = "1.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "lazy_static",
  "log",
@@ -9934,8 +10346,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-metrics"
-version = "1.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "bs58 0.5.0",
  "futures",
@@ -9953,8 +10365,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-network-protocol"
-version = "1.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "async-channel 1.9.0",
  "async-trait",
@@ -9967,7 +10379,7 @@ dependencies = [
  "polkadot-node-jaeger",
  "polkadot-node-primitives",
  "polkadot-primitives",
- "rand 0.8.5",
+ "rand",
  "sc-authority-discovery",
  "sc-network",
  "strum 0.24.1",
@@ -9977,15 +10389,16 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-primitives"
-version = "1.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
+ "bitvec",
  "bounded-vec",
  "futures",
  "parity-scale-codec",
  "polkadot-parachain-primitives",
  "polkadot-primitives",
- "schnorrkel 0.9.1",
+ "schnorrkel 0.11.4",
  "serde",
  "sp-application-crypto",
  "sp-consensus-babe",
@@ -9999,8 +10412,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-subsystem"
-version = "1.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "polkadot-node-jaeger",
  "polkadot-node-subsystem-types",
@@ -10009,10 +10422,11 @@ dependencies = [
 
 [[package]]
 name = "polkadot-node-subsystem-types"
-version = "1.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "async-trait",
+ "bitvec",
  "derive_more",
  "futures",
  "orchestra",
@@ -10021,20 +10435,23 @@ dependencies = [
  "polkadot-node-primitives",
  "polkadot-primitives",
  "polkadot-statement-table",
+ "sc-client-api",
  "sc-network",
  "sc-transaction-pool-api",
  "smallvec",
  "sp-api",
  "sp-authority-discovery",
+ "sp-blockchain",
  "sp-consensus-babe",
+ "sp-runtime",
  "substrate-prometheus-endpoint",
  "thiserror",
 ]
 
 [[package]]
 name = "polkadot-node-subsystem-util"
-version = "1.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -10045,17 +10462,19 @@ dependencies = [
  "kvdb",
  "parity-db",
  "parity-scale-codec",
- "parking_lot 0.11.2",
+ "parking_lot 0.12.1",
  "pin-project",
  "polkadot-node-jaeger",
  "polkadot-node-metrics",
  "polkadot-node-network-protocol",
  "polkadot-node-primitives",
  "polkadot-node-subsystem",
+ "polkadot-node-subsystem-types",
  "polkadot-overseer",
  "polkadot-primitives",
  "prioritized-metered-channel",
- "rand 0.8.5",
+ "rand",
+ "sc-client-api",
  "schnellru",
  "sp-application-crypto",
  "sp-core",
@@ -10066,8 +10485,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-overseer"
-version = "1.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "async-trait",
  "futures",
@@ -10080,7 +10499,6 @@ dependencies = [
  "polkadot-node-subsystem-types",
  "polkadot-primitives",
  "sc-client-api",
- "schnellru",
  "sp-api",
  "sp-core",
  "tikv-jemalloc-ctl",
@@ -10089,46 +10507,29 @@ dependencies = [
 
 [[package]]
 name = "polkadot-parachain-primitives"
-version = "1.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "6.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "bounded-collections",
  "derive_more",
- "frame-support",
  "parity-scale-codec",
  "polkadot-core-primitives",
  "scale-info",
  "serde",
  "sp-core",
  "sp-runtime",
- "sp-std",
-]
-
-[[package]]
-name = "polkadot-performance-test"
-version = "1.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
-dependencies = [
- "env_logger 0.9.3",
- "log",
- "polkadot-erasure-coding",
- "polkadot-node-core-pvf-prepare-worker",
- "polkadot-node-primitives",
- "polkadot-primitives",
- "quote",
- "sc-executor-common",
- "sp-maybe-compressed-blob",
- "staging-kusama-runtime",
- "thiserror",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-weights",
 ]
 
 [[package]]
 name = "polkadot-primitives"
-version = "1.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "bitvec",
  "hex-literal 0.4.1",
+ "log",
  "parity-scale-codec",
  "polkadot-core-primitives",
  "polkadot-parachain-primitives",
@@ -10145,15 +10546,15 @@ dependencies = [
  "sp-keystore",
  "sp-runtime",
  "sp-staking",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "polkadot-rpc"
-version = "1.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
- "jsonrpsee 0.16.3",
+ "jsonrpsee 0.20.3",
  "mmr-rpc",
  "pallet-transaction-payment-rpc",
  "polkadot-primitives",
@@ -10167,6 +10568,7 @@ dependencies = [
  "sc-consensus-grandpa",
  "sc-consensus-grandpa-rpc",
  "sc-rpc",
+ "sc-rpc-spec-v2",
  "sc-sync-state-rpc",
  "sc-transaction-pool-api",
  "sp-api",
@@ -10180,107 +10582,10 @@ dependencies = [
  "substrate-state-trie-migration-rpc",
 ]
 
-[[package]]
-name = "polkadot-runtime"
-version = "1.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
-dependencies = [
- "bitvec",
- "frame-benchmarking",
- "frame-election-provider-support",
- "frame-executive",
- "frame-support",
- "frame-system",
- "frame-system-benchmarking",
- "frame-system-rpc-runtime-api",
- "frame-try-runtime",
- "hex-literal 0.4.1",
- "log",
- "pallet-authority-discovery",
- "pallet-authorship",
- "pallet-babe",
- "pallet-bags-list",
- "pallet-balances",
- "pallet-bounties",
- "pallet-child-bounties",
- "pallet-collective",
- "pallet-conviction-voting",
- "pallet-democracy 4.0.0-dev",
- "pallet-election-provider-multi-phase",
- "pallet-election-provider-support-benchmarking",
- "pallet-elections-phragmen",
- "pallet-fast-unstake",
- "pallet-grandpa",
- "pallet-identity",
- "pallet-im-online",
- "pallet-indices",
- "pallet-membership",
- "pallet-message-queue",
- "pallet-multisig",
- "pallet-nomination-pools",
- "pallet-nomination-pools-benchmarking",
- "pallet-nomination-pools-runtime-api",
- "pallet-offences",
- "pallet-offences-benchmarking",
- "pallet-preimage",
- "pallet-proxy",
- "pallet-referenda",
- "pallet-scheduler",
- "pallet-session",
- "pallet-session-benchmarking",
- "pallet-staking 4.0.0-dev",
- "pallet-staking-reward-curve",
- "pallet-staking-runtime-api",
- "pallet-timestamp",
- "pallet-tips",
- "pallet-transaction-payment",
- "pallet-transaction-payment-rpc-runtime-api",
- "pallet-treasury",
- "pallet-utility",
- "pallet-vesting",
- "pallet-whitelist",
- "pallet-xcm",
- "pallet-xcm-benchmarks",
- "parity-scale-codec",
- "polkadot-primitives",
- "polkadot-runtime-common",
- "polkadot-runtime-constants",
- "polkadot-runtime-parachains",
- "rustc-hex",
- "scale-info",
- "serde",
- "serde_derive",
- "smallvec",
- "sp-api",
- "sp-arithmetic",
- "sp-authority-discovery",
- "sp-block-builder",
- "sp-consensus-babe",
- "sp-consensus-beefy",
- "sp-core",
- "sp-inherents",
- "sp-io",
- "sp-mmr-primitives",
- "sp-npos-elections",
- "sp-offchain",
- "sp-runtime",
- "sp-session",
- "sp-staking",
- "sp-std",
- "sp-storage",
- "sp-transaction-pool",
- "sp-version",
- "staging-xcm",
- "staging-xcm-builder",
- "staging-xcm-executor",
- "static_assertions",
- "substrate-wasm-builder",
-]
-
 [[package]]
 name = "polkadot-runtime-common"
-version = "1.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "bitvec",
  "frame-benchmarking",
@@ -10290,18 +10595,22 @@ dependencies = [
  "impl-trait-for-tuples",
  "libsecp256k1",
  "log",
+ "pallet-asset-rate",
  "pallet-authorship",
  "pallet-babe",
  "pallet-balances",
+ "pallet-broker",
  "pallet-election-provider-multi-phase",
  "pallet-fast-unstake",
+ "pallet-identity",
  "pallet-session",
- "pallet-staking 4.0.0-dev",
+ "pallet-staking 28.0.0",
  "pallet-staking-reward-fn",
  "pallet-timestamp",
  "pallet-transaction-payment",
  "pallet-treasury",
  "pallet-vesting",
+ "pallet-xcm-benchmarks",
  "parity-scale-codec",
  "polkadot-primitives",
  "polkadot-runtime-parachains",
@@ -10318,42 +10627,30 @@ dependencies = [
  "sp-runtime",
  "sp-session",
  "sp-staking",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "staging-xcm",
+ "staging-xcm-builder",
+ "staging-xcm-executor",
  "static_assertions",
 ]
 
-[[package]]
-name = "polkadot-runtime-constants"
-version = "1.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
-dependencies = [
- "frame-support",
- "polkadot-primitives",
- "polkadot-runtime-common",
- "smallvec",
- "sp-core",
- "sp-runtime",
- "sp-weights 20.0.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)",
-]
-
 [[package]]
 name = "polkadot-runtime-metrics"
-version = "1.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "bs58 0.5.0",
  "frame-benchmarking",
  "parity-scale-codec",
  "polkadot-primitives",
- "sp-std",
- "sp-tracing",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "polkadot-runtime-parachains"
-version = "1.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "bitflags 1.3.2",
  "bitvec",
@@ -10367,22 +10664,25 @@ dependencies = [
  "pallet-authorship",
  "pallet-babe",
  "pallet-balances",
+ "pallet-broker",
  "pallet-message-queue",
  "pallet-session",
- "pallet-staking 4.0.0-dev",
+ "pallet-staking 28.0.0",
  "pallet-timestamp",
  "pallet-vesting",
  "parity-scale-codec",
+ "polkadot-core-primitives",
  "polkadot-parachain-primitives",
  "polkadot-primitives",
  "polkadot-runtime-metrics",
- "rand 0.8.5",
+ "rand",
  "rand_chacha 0.3.1",
  "rustc-hex",
  "scale-info",
  "serde",
  "sp-api",
  "sp-application-crypto",
+ "sp-arithmetic",
  "sp-core",
  "sp-inherents",
  "sp-io",
@@ -10390,7 +10690,7 @@ dependencies = [
  "sp-runtime",
  "sp-session",
  "sp-staking",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "staging-xcm",
  "staging-xcm-executor",
  "static_assertions",
@@ -10398,8 +10698,8 @@ dependencies = [
 
 [[package]]
 name = "polkadot-service"
-version = "1.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "async-trait",
  "frame-benchmarking",
@@ -10416,11 +10716,12 @@ dependencies = [
  "mmr-gadget",
  "pallet-babe",
  "pallet-im-online",
- "pallet-staking 4.0.0-dev",
+ "pallet-staking 28.0.0",
  "pallet-transaction-payment",
  "pallet-transaction-payment-rpc-runtime-api",
  "parity-db",
  "parity-scale-codec",
+ "parking_lot 0.12.1",
  "polkadot-approval-distribution",
  "polkadot-availability-bitfield-distribution",
  "polkadot-availability-distribution",
@@ -10454,8 +10755,6 @@ dependencies = [
  "polkadot-parachain-primitives",
  "polkadot-primitives",
  "polkadot-rpc",
- "polkadot-runtime",
- "polkadot-runtime-common",
  "polkadot-runtime-parachains",
  "polkadot-statement-distribution",
  "rococo-runtime",
@@ -10502,13 +10801,12 @@ dependencies = [
  "sp-offchain",
  "sp-runtime",
  "sp-session",
- "sp-state-machine 0.28.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)",
- "sp-storage",
+ "sp-state-machine",
+ "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-timestamp",
  "sp-transaction-pool",
  "sp-version",
- "sp-weights 20.0.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)",
- "staging-kusama-runtime",
+ "sp-weights",
  "substrate-prometheus-endpoint",
  "thiserror",
  "tracing-gum",
@@ -10517,20 +10815,19 @@ dependencies = [
 
 [[package]]
 name = "polkadot-statement-distribution"
-version = "1.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "arrayvec 0.7.4",
  "bitvec",
  "fatality",
  "futures",
  "futures-timer",
- "indexmap 1.9.3",
+ "indexmap 2.1.0",
  "parity-scale-codec",
  "polkadot-node-network-protocol",
  "polkadot-node-primitives",
  "polkadot-node-subsystem",
- "polkadot-node-subsystem-types",
  "polkadot-node-subsystem-util",
  "polkadot-primitives",
  "sp-keystore",
@@ -10541,12 +10838,50 @@ dependencies = [
 
 [[package]]
 name = "polkadot-statement-table"
-version = "1.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "parity-scale-codec",
  "polkadot-primitives",
  "sp-core",
+ "tracing-gum",
+]
+
+[[package]]
+name = "polkavm-common"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d9428a5cfcc85c5d7b9fc4b6a18c4b802d0173d768182a51cc7751640f08b92"
+
+[[package]]
+name = "polkavm-derive"
+version = "0.9.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ae8c4bea6f3e11cd89bb18bcdddac10bd9a24015399bd1c485ad68a985a19606"
+dependencies = [
+ "polkavm-derive-impl-macro",
+]
+
+[[package]]
+name = "polkavm-derive-impl"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5c4fdfc49717fb9a196e74a5d28e0bc764eb394a2c803eb11133a31ac996c60c"
+dependencies = [
+ "polkavm-common",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.61",
+]
+
+[[package]]
+name = "polkavm-derive-impl-macro"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8ba81f7b5faac81e528eb6158a6f3c9e0bb1008e0ffa19653bc8dea925ecb429"
+dependencies = [
+ "polkavm-derive-impl",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -10622,12 +10957,12 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
 
 [[package]]
 name = "precompile-utils"
-version = "0.1.0"
+version = "0.1.1"
 dependencies = [
  "affix",
  "derive_more",
  "environmental",
- "evm 0.39.1",
+ "evm 0.41.1",
  "fp-evm",
  "frame-support",
  "frame-system",
@@ -10647,8 +10982,8 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
- "sp-weights 20.0.0 (git+https://github.com/paritytech/polkadot-sdk?rev=c8d2251cafadc108ba2f1f8a3208dc547ff38901)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-weights",
  "staging-xcm",
 ]
 
@@ -10667,7 +11002,7 @@ dependencies = [
  "quote",
  "sha3",
  "sp-core",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "syn 1.0.109",
  "trybuild",
 ]
@@ -10729,7 +11064,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ae005bd773ab59b4725093fd7df83fd7892f7d8eafb48dbd7de6e024e4215f9d"
 dependencies = [
  "proc-macro2",
- "syn 2.0.42",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -10748,7 +11083,7 @@ dependencies = [
 
 [[package]]
 name = "primitives"
-version = "6.0.2"
+version = "6.0.3"
 dependencies = [
  "frame-support",
  "hex-literal 0.3.4",
@@ -10757,15 +11092,15 @@ dependencies = [
  "scale-info",
  "serde",
  "sp-core",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "static_assertions",
 ]
 
 [[package]]
 name = "prioritized-metered-channel"
-version = "0.2.0"
+version = "0.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "382698e48a268c832d0b181ed438374a6bb708a82a8ca273bb0f61c74cf209c4"
+checksum = "a172e6cc603231f2cf004232eabcecccc0da53ba576ab286ef7baa0cfc7927ad"
 dependencies = [
  "coarsetime",
  "crossbeam-queue",
@@ -10789,14 +11124,22 @@ dependencies = [
 
 [[package]]
 name = "proc-macro-crate"
-version = "2.0.1"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "97dc5fea232fc28d2f597b37c4876b348a40e33f3b02cc975c8d006d78d94b1a"
+checksum = "7e8366a6159044a37876a2b9817124296703c586a5c92e2c53751fa06d8d43e8"
 dependencies = [
- "toml_datetime",
  "toml_edit 0.20.2",
 ]
 
+[[package]]
+name = "proc-macro-crate"
+version = "3.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6d37c51ca738a55da99dc0c4a34860fd675453b8b36209178c2249bb13651284"
+dependencies = [
+ "toml_edit 0.21.1",
+]
+
 [[package]]
 name = "proc-macro-error"
 version = "1.0.4"
@@ -10823,20 +11166,20 @@ dependencies = [
 
 [[package]]
 name = "proc-macro-warning"
-version = "0.4.2"
+version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d1eaa7fa0aa1929ffdf7eeb6eac234dde6268914a14ad44d23521ab6a9b258e"
+checksum = "834da187cfe638ae8abb0203f0b33e5ccdb02a28e7199f2f47b3e2754f50edca"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.42",
+ "syn 2.0.61",
 ]
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.71"
+version = "1.0.82"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "75cb1540fadbd5b8fbccc4dddad2734eba435053f725621c070711a14bb5f4b8"
+checksum = "8ad3d49ab951a01fbaafe34f2ec74122942fe18a3f9814c3268f1bb72042131b"
 dependencies = [
  "unicode-ident",
 ]
@@ -10875,7 +11218,7 @@ checksum = "440f724eba9f6996b75d63681b0a92b06947f1457076d503a4d2e2c8f56442b8"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.42",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -10889,7 +11232,7 @@ dependencies = [
  "bitflags 2.4.1",
  "lazy_static",
  "num-traits",
- "rand 0.8.5",
+ "rand",
  "rand_chacha 0.3.1",
  "rand_xorshift",
  "regex-syntax 0.8.2",
@@ -10905,7 +11248,17 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0b82eaa1d779e9a4bc1c3217db8ffbeabaae1dca241bf70183242128d48681cd"
 dependencies = [
  "bytes",
- "prost-derive",
+ "prost-derive 0.11.9",
+]
+
+[[package]]
+name = "prost"
+version = "0.12.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d0f5d036824e4761737860779c906171497f6d55681139d8312388f8fe398922"
+dependencies = [
+ "bytes",
+ "prost-derive 0.12.5",
 ]
 
 [[package]]
@@ -10915,14 +11268,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "119533552c9a7ffacc21e099c24a0ac8bb19c2a2a3f363de84cd9b844feab270"
 dependencies = [
  "bytes",
- "heck",
+ "heck 0.4.1",
  "itertools 0.10.5",
  "lazy_static",
  "log",
  "multimap",
  "petgraph",
  "prettyplease 0.1.25",
- "prost",
+ "prost 0.11.9",
  "prost-types",
  "regex",
  "syn 1.0.109",
@@ -10943,13 +11296,26 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "prost-derive"
+version = "0.12.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9554e3ab233f0a932403704f1a1d08c30d5ccd931adfdfa1e8b5a19b52c1d55a"
+dependencies = [
+ "anyhow",
+ "itertools 0.11.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.61",
+]
+
 [[package]]
 name = "prost-types"
 version = "0.11.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "213622a1460818959ac1181aaeb2dc9c7f63df720db7d788b3e24eacd1983e13"
 dependencies = [
- "prost",
+ "prost 0.11.9",
 ]
 
 [[package]]
@@ -11007,7 +11373,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94b0b33c13a79f669c85defaf4c275dc86a0c0372807d0ca3d78e0bb87274863"
 dependencies = [
  "bytes",
- "rand 0.8.5",
+ "rand",
  "ring 0.16.20",
  "rustc-hash",
  "rustls 0.20.9",
@@ -11020,9 +11386,9 @@ dependencies = [
 
 [[package]]
 name = "quote"
-version = "1.0.33"
+version = "1.0.36"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5267fca4496028628a95160fc423a33e8b2e6af8a5302579e322e4b520293cae"
+checksum = "0fa76aaf39101c457836aec0ce2316dbdc3ab723cdda1c6bd4e6ad4208acaca7"
 dependencies = [
  "proc-macro2",
 ]
@@ -11033,19 +11399,6 @@ version = "0.7.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "dc33ff2d4973d518d823d61aa239014831e521c75da58e3df4840d3f47749d09"
 
-[[package]]
-name = "rand"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6a6b1679d49b24bbfe0c803429aa1874472f50d9b363131f0e89fc356b544d03"
-dependencies = [
- "getrandom 0.1.16",
- "libc",
- "rand_chacha 0.2.2",
- "rand_core 0.5.1",
- "rand_hc",
-]
-
 [[package]]
 name = "rand"
 version = "0.8.5"
@@ -11096,12 +11449,13 @@ dependencies = [
 ]
 
 [[package]]
-name = "rand_hc"
-version = "0.2.0"
+name = "rand_distr"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
+checksum = "32cb0b9bc82b0a0876c2dd994a7e7a2683d3e7390ca40e6886785ef0c7e3ee31"
 dependencies = [
- "rand_core 0.5.1",
+ "num-traits",
+ "rand",
 ]
 
 [[package]]
@@ -11200,13 +11554,12 @@ dependencies = [
 
 [[package]]
 name = "reed-solomon-novelpoly"
-version = "1.0.2"
+version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58130877ca403ab42c864fbac74bb319a0746c07a634a92a5cfc7f54af272582"
+checksum = "87413ebb313323d431e85d0afc5a68222aaed972843537cbfe5f061cf1b4bcab"
 dependencies = [
  "derive_more",
  "fs-err",
- "itertools 0.11.0",
  "static_init",
  "thiserror",
 ]
@@ -11228,7 +11581,7 @@ checksum = "2566c4bf6845f2c2e83b27043c3f5dfcd5ba8f2937d6c00dc009bfb51a079dc4"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.42",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -11304,19 +11657,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2"
 dependencies = [
  "hmac 0.12.1",
- "subtle",
+ "subtle 2.4.1",
 ]
 
 [[package]]
 name = "ring"
 version = "0.1.0"
-source = "git+https://github.com/w3f/ring-proof?rev=0e948f3#0e948f3c28cbacecdd3020403c4841c0eb339213"
+source = "git+https://github.com/w3f/ring-proof#b273d33f9981e2bb3375ab45faeb537f7ee35224"
 dependencies = [
  "ark-ec",
  "ark-ff",
  "ark-poly",
  "ark-serialize",
  "ark-std",
+ "blake2 0.10.6",
  "common",
  "fflonk",
  "merlin 3.0.0",
@@ -11394,8 +11748,8 @@ dependencies = [
 
 [[package]]
 name = "rococo-runtime"
-version = "1.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "binary-merkle-tree",
  "frame-benchmarking",
@@ -11407,6 +11761,7 @@ dependencies = [
  "frame-try-runtime",
  "hex-literal 0.4.1",
  "log",
+ "pallet-asset-rate",
  "pallet-authority-discovery",
  "pallet-authorship",
  "pallet-babe",
@@ -11416,7 +11771,8 @@ dependencies = [
  "pallet-bounties",
  "pallet-child-bounties",
  "pallet-collective",
- "pallet-democracy 4.0.0-dev",
+ "pallet-conviction-voting",
+ "pallet-democracy 28.0.0",
  "pallet-elections-phragmen",
  "pallet-grandpa",
  "pallet-identity",
@@ -11430,11 +11786,14 @@ dependencies = [
  "pallet-offences",
  "pallet-preimage",
  "pallet-proxy",
+ "pallet-ranked-collective",
  "pallet-recovery",
+ "pallet-referenda",
+ "pallet-root-testing",
  "pallet-scheduler",
  "pallet-session",
  "pallet-society",
- "pallet-staking 4.0.0-dev",
+ "pallet-staking 28.0.0",
  "pallet-state-trie-migration",
  "pallet-sudo",
  "pallet-timestamp",
@@ -11444,6 +11803,7 @@ dependencies = [
  "pallet-treasury",
  "pallet-utility",
  "pallet-vesting",
+ "pallet-whitelist",
  "pallet-xcm",
  "pallet-xcm-benchmarks",
  "parity-scale-codec",
@@ -11457,11 +11817,13 @@ dependencies = [
  "serde_derive",
  "smallvec",
  "sp-api",
+ "sp-arithmetic",
  "sp-authority-discovery",
  "sp-block-builder",
  "sp-consensus-babe",
  "sp-consensus-beefy",
  "sp-core",
+ "sp-genesis-builder",
  "sp-inherents",
  "sp-io",
  "sp-mmr-primitives",
@@ -11469,8 +11831,8 @@ dependencies = [
  "sp-runtime",
  "sp-session",
  "sp-staking",
- "sp-std",
- "sp-storage",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-transaction-pool",
  "sp-version",
  "staging-xcm",
@@ -11482,8 +11844,8 @@ dependencies = [
 
 [[package]]
 name = "rococo-runtime-constants"
-version = "1.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "frame-support",
  "polkadot-primitives",
@@ -11491,9 +11853,17 @@ dependencies = [
  "smallvec",
  "sp-core",
  "sp-runtime",
- "sp-weights 20.0.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)",
+ "sp-weights",
+ "staging-xcm",
+ "staging-xcm-builder",
 ]
 
+[[package]]
+name = "route-recognizer"
+version = "0.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "afab94fb28594581f62d981211a9a4d53cc8130bbcbbb89a0440d9b8e81a7746"
+
 [[package]]
 name = "rpassword"
 version = "7.3.1"
@@ -11515,7 +11885,7 @@ dependencies = [
  "log",
  "netlink-packet-route",
  "netlink-proto",
- "nix",
+ "nix 0.24.3",
  "thiserror",
  "tokio",
 ]
@@ -11545,10 +11915,9 @@ dependencies = [
 
 [[package]]
 name = "runtime-integration-tests"
-version = "1.21.8"
+version = "1.22.4"
 dependencies = [
  "cumulus-pallet-aura-ext",
- "cumulus-pallet-dmp-queue",
  "cumulus-pallet-parachain-system",
  "cumulus-pallet-xcm",
  "cumulus-pallet-xcmp-queue",
@@ -11588,7 +11957,7 @@ dependencies = [
  "pallet-collective",
  "pallet-currencies",
  "pallet-dca",
- "pallet-democracy 4.2.0",
+ "pallet-democracy 4.2.1",
  "pallet-duster",
  "pallet-dynamic-evm-fee",
  "pallet-dynamic-fees",
@@ -11609,7 +11978,7 @@ dependencies = [
  "pallet-scheduler",
  "pallet-session",
  "pallet-stableswap",
- "pallet-staking 3.1.0",
+ "pallet-staking 3.1.1",
  "pallet-timestamp",
  "pallet-tips",
  "pallet-transaction-multi-payment",
@@ -11622,15 +11991,14 @@ dependencies = [
  "pallet-xcm",
  "pallet-xyk",
  "pallet-xyk-liquidity-mining",
- "parachain-info",
  "polkadot-parachain-primitives",
  "polkadot-primitives",
- "polkadot-runtime",
  "polkadot-runtime-parachains",
  "polkadot-service",
  "precompile-utils",
  "pretty_assertions",
  "primitives",
+ "rococo-runtime",
  "sc-consensus-grandpa",
  "scraper",
  "sp-api",
@@ -11638,18 +12006,20 @@ dependencies = [
  "sp-block-builder",
  "sp-consensus-aura",
  "sp-consensus-babe",
+ "sp-consensus-beefy",
  "sp-core",
- "sp-externalities",
+ "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-inherents",
  "sp-io",
  "sp-offchain",
  "sp-runtime",
  "sp-session",
  "sp-staking",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-transaction-pool",
  "sp-trie",
  "sp-version",
+ "staging-parachain-info",
  "staging-xcm",
  "staging-xcm-builder",
  "staging-xcm-executor",
@@ -11670,7 +12040,7 @@ dependencies = [
  "pallet-asset-registry",
  "pallet-omnipool",
  "pallet-stableswap",
- "pallet-staking 3.1.0",
+ "pallet-staking 3.1.1",
  "primitives",
  "scraper",
  "serde",
@@ -11879,19 +12249,19 @@ dependencies = [
 
 [[package]]
 name = "sc-allocator"
-version = "4.1.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "23.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "log",
  "sp-core",
- "sp-wasm-interface",
+ "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "thiserror",
 ]
 
 [[package]]
 name = "sc-authority-discovery"
-version = "0.10.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "0.34.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "async-trait",
  "futures",
@@ -11899,11 +12269,12 @@ dependencies = [
  "ip_network",
  "libp2p",
  "log",
- "multihash",
+ "multihash 0.18.1",
+ "multihash-codetable",
  "parity-scale-codec",
- "prost",
+ "prost 0.12.4",
  "prost-build",
- "rand 0.8.5",
+ "rand",
  "sc-client-api",
  "sc-network",
  "sp-api",
@@ -11918,15 +12289,14 @@ dependencies = [
 
 [[package]]
 name = "sc-basic-authorship"
-version = "0.10.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "0.34.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "futures",
  "futures-timer",
  "log",
  "parity-scale-codec",
  "sc-block-builder",
- "sc-client-api",
  "sc-proposer-metrics",
  "sc-telemetry",
  "sc-transaction-pool-api",
@@ -11941,25 +12311,29 @@ dependencies = [
 
 [[package]]
 name = "sc-block-builder"
-version = "0.10.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "0.33.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "parity-scale-codec",
- "sc-client-api",
  "sp-api",
  "sp-block-builder",
  "sp-blockchain",
  "sp-core",
  "sp-inherents",
  "sp-runtime",
+ "sp-trie",
 ]
 
 [[package]]
 name = "sc-chain-spec"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "27.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
- "memmap2",
+ "array-bytes 6.2.2",
+ "docify",
+ "log",
+ "memmap2 0.9.4",
+ "parity-scale-codec",
  "sc-chain-spec-derive",
  "sc-client-api",
  "sc-executor",
@@ -11969,41 +12343,47 @@ dependencies = [
  "serde_json",
  "sp-blockchain",
  "sp-core",
+ "sp-crypto-hashing",
+ "sp-genesis-builder",
+ "sp-io",
  "sp-runtime",
- "sp-state-machine 0.28.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)",
+ "sp-state-machine",
 ]
 
 [[package]]
 name = "sc-chain-spec-derive"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "11.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
- "proc-macro-crate 1.3.1",
+ "proc-macro-crate 3.1.0",
  "proc-macro2",
  "quote",
- "syn 2.0.42",
+ "syn 2.0.61",
 ]
 
 [[package]]
 name = "sc-cli"
-version = "0.10.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "0.36.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
- "array-bytes",
+ "array-bytes 6.2.2",
+ "bip39",
  "chrono",
- "clap 4.4.11",
+ "clap 4.5.4",
  "fdlimit",
  "futures",
+ "itertools 0.10.5",
  "libp2p-identity",
  "log",
  "names",
  "parity-scale-codec",
- "rand 0.8.5",
+ "rand",
  "regex",
  "rpassword",
  "sc-client-api",
  "sc-client-db",
  "sc-keystore",
+ "sc-mixnet",
  "sc-network",
  "sc-service",
  "sc-telemetry",
@@ -12019,14 +12399,13 @@ dependencies = [
  "sp-runtime",
  "sp-version",
  "thiserror",
- "tiny-bip39",
  "tokio",
 ]
 
 [[package]]
 name = "sc-client-api"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "fnv",
  "futures",
@@ -12041,18 +12420,19 @@ dependencies = [
  "sp-consensus",
  "sp-core",
  "sp-database",
- "sp-externalities",
+ "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-runtime",
- "sp-state-machine 0.28.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)",
+ "sp-state-machine",
  "sp-statement-store",
- "sp-storage",
+ "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-trie",
  "substrate-prometheus-endpoint",
 ]
 
 [[package]]
 name = "sc-client-db"
-version = "0.10.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "0.35.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "hash-db 0.16.0",
  "kvdb",
@@ -12071,14 +12451,14 @@ dependencies = [
  "sp-core",
  "sp-database",
  "sp-runtime",
- "sp-state-machine 0.28.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)",
+ "sp-state-machine",
  "sp-trie",
 ]
 
 [[package]]
 name = "sc-consensus"
-version = "0.10.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "0.33.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "async-trait",
  "futures",
@@ -12095,15 +12475,15 @@ dependencies = [
  "sp-consensus",
  "sp-core",
  "sp-runtime",
- "sp-state-machine 0.28.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)",
+ "sp-state-machine",
  "substrate-prometheus-endpoint",
  "thiserror",
 ]
 
 [[package]]
 name = "sc-consensus-aura"
-version = "0.10.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "0.34.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "async-trait",
  "futures",
@@ -12131,8 +12511,8 @@ dependencies = [
 
 [[package]]
 name = "sc-consensus-babe"
-version = "0.10.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "0.34.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "async-trait",
  "fork-tree",
@@ -12149,7 +12529,6 @@ dependencies = [
  "sc-consensus-slots",
  "sc-telemetry",
  "sc-transaction-pool-api",
- "scale-info",
  "sp-api",
  "sp-application-crypto",
  "sp-block-builder",
@@ -12158,6 +12537,7 @@ dependencies = [
  "sp-consensus-babe",
  "sp-consensus-slots",
  "sp-core",
+ "sp-crypto-hashing",
  "sp-inherents",
  "sp-keystore",
  "sp-runtime",
@@ -12167,11 +12547,11 @@ dependencies = [
 
 [[package]]
 name = "sc-consensus-babe-rpc"
-version = "0.10.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "0.34.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "futures",
- "jsonrpsee 0.16.3",
+ "jsonrpsee 0.20.3",
  "sc-consensus-babe",
  "sc-consensus-epochs",
  "sc-rpc-api",
@@ -12189,10 +12569,10 @@ dependencies = [
 
 [[package]]
 name = "sc-consensus-beefy"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "13.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
- "array-bytes",
+ "array-bytes 6.2.2",
  "async-channel 1.9.0",
  "async-trait",
  "fnv",
@@ -12213,21 +12593,23 @@ dependencies = [
  "sp-consensus",
  "sp-consensus-beefy",
  "sp-core",
+ "sp-crypto-hashing",
  "sp-keystore",
  "sp-mmr-primitives",
  "sp-runtime",
  "substrate-prometheus-endpoint",
  "thiserror",
+ "tokio",
  "wasm-timer",
 ]
 
 [[package]]
 name = "sc-consensus-beefy-rpc"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "13.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "futures",
- "jsonrpsee 0.16.3",
+ "jsonrpsee 0.20.3",
  "log",
  "parity-scale-codec",
  "parking_lot 0.12.1",
@@ -12242,8 +12624,8 @@ dependencies = [
 
 [[package]]
 name = "sc-consensus-epochs"
-version = "0.10.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "0.33.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "fork-tree",
  "parity-scale-codec",
@@ -12255,11 +12637,11 @@ dependencies = [
 
 [[package]]
 name = "sc-consensus-grandpa"
-version = "0.10.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "0.19.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "ahash 0.8.6",
- "array-bytes",
+ "array-bytes 6.2.2",
  "async-trait",
  "dyn-clone",
  "finality-grandpa",
@@ -12269,7 +12651,7 @@ dependencies = [
  "log",
  "parity-scale-codec",
  "parking_lot 0.12.1",
- "rand 0.8.5",
+ "rand",
  "sc-block-builder",
  "sc-chain-spec",
  "sc-client-api",
@@ -12277,6 +12659,7 @@ dependencies = [
  "sc-network",
  "sc-network-common",
  "sc-network-gossip",
+ "sc-network-sync",
  "sc-telemetry",
  "sc-transaction-pool-api",
  "sc-utils",
@@ -12288,6 +12671,7 @@ dependencies = [
  "sp-consensus",
  "sp-consensus-grandpa",
  "sp-core",
+ "sp-crypto-hashing",
  "sp-keystore",
  "sp-runtime",
  "substrate-prometheus-endpoint",
@@ -12296,12 +12680,12 @@ dependencies = [
 
 [[package]]
 name = "sc-consensus-grandpa-rpc"
-version = "0.10.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "0.19.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "finality-grandpa",
  "futures",
- "jsonrpsee 0.16.3",
+ "jsonrpsee 0.20.3",
  "log",
  "parity-scale-codec",
  "sc-client-api",
@@ -12316,8 +12700,8 @@ dependencies = [
 
 [[package]]
 name = "sc-consensus-slots"
-version = "0.10.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "0.33.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "async-trait",
  "futures",
@@ -12334,13 +12718,13 @@ dependencies = [
  "sp-core",
  "sp-inherents",
  "sp-runtime",
- "sp-state-machine 0.28.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)",
+ "sp-state-machine",
 ]
 
 [[package]]
 name = "sc-executor"
-version = "0.10.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "0.32.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "parity-scale-codec",
  "parking_lot 0.12.1",
@@ -12349,49 +12733,50 @@ dependencies = [
  "schnellru",
  "sp-api",
  "sp-core",
- "sp-externalities",
+ "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-io",
  "sp-panic-handler",
- "sp-runtime-interface",
+ "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-trie",
  "sp-version",
- "sp-wasm-interface",
+ "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "tracing",
 ]
 
 [[package]]
 name = "sc-executor-common"
-version = "0.10.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "0.29.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "sc-allocator",
  "sp-maybe-compressed-blob",
- "sp-wasm-interface",
+ "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "thiserror",
  "wasm-instrument",
 ]
 
 [[package]]
 name = "sc-executor-wasmtime"
-version = "0.10.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "0.29.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "anyhow",
  "cfg-if",
  "libc",
  "log",
+ "parking_lot 0.12.1",
  "rustix 0.36.17",
  "sc-allocator",
  "sc-executor-common",
- "sp-runtime-interface",
- "sp-wasm-interface",
+ "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "wasmtime",
 ]
 
 [[package]]
 name = "sc-informant"
-version = "0.10.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "0.33.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "ansi_term",
  "futures",
@@ -12400,30 +12785,60 @@ dependencies = [
  "sc-client-api",
  "sc-network",
  "sc-network-common",
+ "sc-network-sync",
  "sp-blockchain",
  "sp-runtime",
 ]
 
 [[package]]
 name = "sc-keystore"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "25.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
- "array-bytes",
+ "array-bytes 6.2.2",
+ "parking_lot 0.12.1",
+ "serde_json",
+ "sp-application-crypto",
+ "sp-core",
+ "sp-keystore",
+ "thiserror",
+]
+
+[[package]]
+name = "sc-mixnet"
+version = "0.4.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
+dependencies = [
+ "array-bytes 4.2.0",
+ "arrayvec 0.7.4",
+ "blake2 0.10.6",
+ "bytes",
+ "futures",
+ "futures-timer",
+ "libp2p-identity",
+ "log",
+ "mixnet",
+ "multiaddr",
+ "parity-scale-codec",
  "parking_lot 0.12.1",
- "serde_json",
- "sp-application-crypto",
+ "sc-client-api",
+ "sc-network",
+ "sc-transaction-pool-api",
+ "sp-api",
+ "sp-consensus",
  "sp-core",
  "sp-keystore",
+ "sp-mixnet",
+ "sp-runtime",
  "thiserror",
 ]
 
 [[package]]
 name = "sc-network"
-version = "0.10.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "0.34.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
- "array-bytes",
+ "array-bytes 6.2.2",
  "async-channel 1.9.0",
  "async-trait",
  "asynchronous-codec",
@@ -12441,7 +12856,7 @@ dependencies = [
  "parking_lot 0.12.1",
  "partial_sort",
  "pin-project",
- "rand 0.8.5",
+ "rand",
  "sc-client-api",
  "sc-network-common",
  "sc-utils",
@@ -12454,6 +12869,8 @@ dependencies = [
  "sp-runtime",
  "substrate-prometheus-endpoint",
  "thiserror",
+ "tokio",
+ "tokio-stream",
  "unsigned-varint",
  "wasm-timer",
  "zeroize",
@@ -12461,15 +12878,15 @@ dependencies = [
 
 [[package]]
 name = "sc-network-bitswap"
-version = "0.10.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "0.33.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "async-channel 1.9.0",
  "cid",
  "futures",
  "libp2p-identity",
  "log",
- "prost",
+ "prost 0.12.4",
  "prost-build",
  "sc-client-api",
  "sc-network",
@@ -12481,8 +12898,8 @@ dependencies = [
 
 [[package]]
 name = "sc-network-common"
-version = "0.10.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "0.33.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "async-trait",
  "bitflags 1.3.2",
@@ -12498,8 +12915,8 @@ dependencies = [
 
 [[package]]
 name = "sc-network-gossip"
-version = "0.10.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "0.34.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "ahash 0.8.6",
  "futures",
@@ -12508,6 +12925,7 @@ dependencies = [
  "log",
  "sc-network",
  "sc-network-common",
+ "sc-network-sync",
  "schnellru",
  "sp-runtime",
  "substrate-prometheus-endpoint",
@@ -12516,16 +12934,16 @@ dependencies = [
 
 [[package]]
 name = "sc-network-light"
-version = "0.10.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "0.33.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
- "array-bytes",
+ "array-bytes 6.2.2",
  "async-channel 1.9.0",
  "futures",
  "libp2p-identity",
  "log",
  "parity-scale-codec",
- "prost",
+ "prost 0.12.4",
  "prost-build",
  "sc-client-api",
  "sc-network",
@@ -12537,10 +12955,10 @@ dependencies = [
 
 [[package]]
 name = "sc-network-sync"
-version = "0.10.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "0.33.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
- "array-bytes",
+ "array-bytes 6.2.2",
  "async-channel 1.9.0",
  "async-trait",
  "fork-tree",
@@ -12550,7 +12968,7 @@ dependencies = [
  "log",
  "mockall",
  "parity-scale-codec",
- "prost",
+ "prost 0.12.4",
  "prost-build",
  "sc-client-api",
  "sc-consensus",
@@ -12567,20 +12985,23 @@ dependencies = [
  "sp-runtime",
  "substrate-prometheus-endpoint",
  "thiserror",
+ "tokio",
+ "tokio-stream",
 ]
 
 [[package]]
 name = "sc-network-transactions"
-version = "0.10.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "0.33.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
- "array-bytes",
+ "array-bytes 6.2.2",
  "futures",
  "libp2p",
  "log",
  "parity-scale-codec",
  "sc-network",
  "sc-network-common",
+ "sc-network-sync",
  "sc-utils",
  "sp-consensus",
  "sp-runtime",
@@ -12589,10 +13010,10 @@ dependencies = [
 
 [[package]]
 name = "sc-offchain"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "29.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
- "array-bytes",
+ "array-bytes 6.2.2",
  "bytes",
  "fnv",
  "futures",
@@ -12605,7 +13026,7 @@ dependencies = [
  "once_cell",
  "parity-scale-codec",
  "parking_lot 0.12.1",
- "rand 0.8.5",
+ "rand",
  "sc-client-api",
  "sc-network",
  "sc-network-common",
@@ -12613,7 +13034,7 @@ dependencies = [
  "sc-utils",
  "sp-api",
  "sp-core",
- "sp-externalities",
+ "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-keystore",
  "sp-offchain",
  "sp-runtime",
@@ -12623,8 +13044,8 @@ dependencies = [
 
 [[package]]
 name = "sc-proposer-metrics"
-version = "0.10.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "0.17.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "log",
  "substrate-prometheus-endpoint",
@@ -12632,17 +13053,18 @@ dependencies = [
 
 [[package]]
 name = "sc-rpc"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "29.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "futures",
- "jsonrpsee 0.16.3",
+ "jsonrpsee 0.20.3",
  "log",
  "parity-scale-codec",
  "parking_lot 0.12.1",
  "sc-block-builder",
  "sc-chain-spec",
  "sc-client-api",
+ "sc-mixnet",
  "sc-rpc-api",
  "sc-tracing",
  "sc-transaction-pool-api",
@@ -12663,12 +13085,13 @@ dependencies = [
 
 [[package]]
 name = "sc-rpc-api"
-version = "0.10.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "0.33.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
- "jsonrpsee 0.16.3",
+ "jsonrpsee 0.20.3",
  "parity-scale-codec",
  "sc-chain-spec",
+ "sc-mixnet",
  "sc-transaction-pool-api",
  "scale-info",
  "serde",
@@ -12682,11 +13105,11 @@ dependencies = [
 
 [[package]]
 name = "sc-rpc-server"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "11.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "http",
- "jsonrpsee 0.16.3",
+ "jsonrpsee 0.20.3",
  "log",
  "serde_json",
  "substrate-prometheus-endpoint",
@@ -12697,25 +13120,27 @@ dependencies = [
 
 [[package]]
 name = "sc-rpc-spec-v2"
-version = "0.10.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "0.34.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
- "array-bytes",
+ "array-bytes 6.2.2",
  "futures",
  "futures-util",
  "hex",
- "jsonrpsee 0.16.3",
+ "jsonrpsee 0.20.3",
  "log",
  "parity-scale-codec",
  "parking_lot 0.12.1",
  "sc-chain-spec",
  "sc-client-api",
+ "sc-rpc",
  "sc-transaction-pool-api",
  "sc-utils",
  "serde",
  "sp-api",
  "sp-blockchain",
  "sp-core",
+ "sp-rpc",
  "sp-runtime",
  "sp-version",
  "thiserror",
@@ -12725,21 +13150,20 @@ dependencies = [
 
 [[package]]
 name = "sc-service"
-version = "0.10.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "0.35.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "async-trait",
  "directories",
  "exit-future",
  "futures",
  "futures-timer",
- "jsonrpsee 0.16.3",
+ "jsonrpsee 0.20.3",
  "log",
  "parity-scale-codec",
  "parking_lot 0.12.1",
  "pin-project",
- "rand 0.8.5",
- "sc-block-builder",
+ "rand",
  "sc-chain-spec",
  "sc-client-api",
  "sc-client-db",
@@ -12768,12 +13192,12 @@ dependencies = [
  "sp-blockchain",
  "sp-consensus",
  "sp-core",
- "sp-externalities",
+ "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-keystore",
  "sp-runtime",
  "sp-session",
- "sp-state-machine 0.28.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)",
- "sp-storage",
+ "sp-state-machine",
+ "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-transaction-pool",
  "sp-transaction-storage-proof",
  "sp-trie",
@@ -12789,8 +13213,8 @@ dependencies = [
 
 [[package]]
 name = "sc-state-db"
-version = "0.10.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "0.30.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "log",
  "parity-scale-codec",
@@ -12800,13 +13224,12 @@ dependencies = [
 
 [[package]]
 name = "sc-storage-monitor"
-version = "0.1.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "0.16.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
- "clap 4.4.11",
+ "clap 4.5.4",
  "fs4",
  "log",
- "sc-client-db",
  "sp-core",
  "thiserror",
  "tokio",
@@ -12814,10 +13237,10 @@ dependencies = [
 
 [[package]]
 name = "sc-sync-state-rpc"
-version = "0.10.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "0.34.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
- "jsonrpsee 0.16.3",
+ "jsonrpsee 0.20.3",
  "parity-scale-codec",
  "sc-chain-spec",
  "sc-client-api",
@@ -12833,27 +13256,29 @@ dependencies = [
 
 [[package]]
 name = "sc-sysinfo"
-version = "6.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "27.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
+ "derive_more",
  "futures",
  "libc",
  "log",
- "rand 0.8.5",
+ "rand",
  "rand_pcg",
  "regex",
  "sc-telemetry",
  "serde",
  "serde_json",
  "sp-core",
+ "sp-crypto-hashing",
  "sp-io",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "sc-telemetry"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "15.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "chrono",
  "futures",
@@ -12861,7 +13286,7 @@ dependencies = [
  "log",
  "parking_lot 0.12.1",
  "pin-project",
- "rand 0.8.5",
+ "rand",
  "sc-utils",
  "serde",
  "serde_json",
@@ -12871,15 +13296,16 @@ dependencies = [
 
 [[package]]
 name = "sc-tracing"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "ansi_term",
- "atty",
  "chrono",
+ "is-terminal",
  "lazy_static",
  "libc",
  "log",
+ "parity-scale-codec",
  "parking_lot 0.12.1",
  "regex",
  "rustc-hash",
@@ -12891,28 +13317,28 @@ dependencies = [
  "sp-core",
  "sp-rpc",
  "sp-runtime",
- "sp-tracing",
+ "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "thiserror",
  "tracing",
- "tracing-log",
- "tracing-subscriber",
+ "tracing-log 0.1.4",
+ "tracing-subscriber 0.2.25",
 ]
 
 [[package]]
 name = "sc-tracing-proc-macro"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "11.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
- "proc-macro-crate 1.3.1",
+ "proc-macro-crate 3.1.0",
  "proc-macro2",
  "quote",
- "syn 2.0.42",
+ "syn 2.0.61",
 ]
 
 [[package]]
 name = "sc-transaction-pool"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "async-trait",
  "futures",
@@ -12928,8 +13354,9 @@ dependencies = [
  "sp-api",
  "sp-blockchain",
  "sp-core",
+ "sp-crypto-hashing",
  "sp-runtime",
- "sp-tracing",
+ "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-transaction-pool",
  "substrate-prometheus-endpoint",
  "thiserror",
@@ -12937,8 +13364,8 @@ dependencies = [
 
 [[package]]
 name = "sc-transaction-pool-api"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "async-trait",
  "futures",
@@ -12953,8 +13380,8 @@ dependencies = [
 
 [[package]]
 name = "sc-utils"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "14.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "async-channel 1.9.0",
  "futures",
@@ -13021,12 +13448,10 @@ dependencies = [
  "arrayref",
  "arrayvec 0.5.2",
  "curve25519-dalek 2.1.3",
- "getrandom 0.1.16",
  "merlin 2.0.1",
- "rand 0.7.3",
  "rand_core 0.5.1",
  "sha2 0.8.2",
- "subtle",
+ "subtle 2.4.1",
  "zeroize",
 ]
 
@@ -13046,6 +13471,25 @@ dependencies = [
  "zeroize",
 ]
 
+[[package]]
+name = "schnorrkel"
+version = "0.11.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8de18f6d8ba0aad7045f5feae07ec29899c1112584a38509a84ad7b04451eaa0"
+dependencies = [
+ "aead",
+ "arrayref",
+ "arrayvec 0.7.4",
+ "curve25519-dalek 4.1.1",
+ "getrandom_or_panic",
+ "merlin 3.0.0",
+ "rand_core 0.6.4",
+ "serde_bytes",
+ "sha2 0.10.8",
+ "subtle 2.4.1",
+ "zeroize",
+]
+
 [[package]]
 name = "scopeguard"
 version = "1.2.0"
@@ -13054,7 +13498,7 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "scraper"
-version = "1.2.3"
+version = "1.2.4"
 dependencies = [
  "clap 3.2.25",
  "frame-remote-externalities",
@@ -13098,24 +13542,33 @@ dependencies = [
  "der",
  "generic-array 0.14.7",
  "pkcs8",
- "subtle",
+ "subtle 2.4.1",
  "zeroize",
 ]
 
+[[package]]
+name = "seccompiler"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "345a3e4dddf721a478089d4697b83c6c0a8f5bf16086f6c13397e4534eb6e2e5"
+dependencies = [
+ "libc",
+]
+
 [[package]]
 name = "secp256k1"
-version = "0.24.3"
+version = "0.28.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6b1629c9c557ef9b293568b338dddfc8208c98a18c59d722a9d53f859d9c9b62"
+checksum = "d24b59d129cdadea20aea4fb2352fa053712e5d713eee47d700cd4b2bc002f10"
 dependencies = [
  "secp256k1-sys",
 ]
 
 [[package]]
 name = "secp256k1-sys"
-version = "0.6.1"
+version = "0.9.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83080e2c2fc1006e625be82e5d1eb6a43b7fd9578b617fcc55814daf286bba4b"
+checksum = "e5d1746aae42c19d583c3c1a8c646bfad910498e2051c551a7f2e3c0c9fbb7eb"
 dependencies = [
  "cc",
 ]
@@ -13178,29 +13631,38 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"
 
 [[package]]
 name = "serde"
-version = "1.0.193"
+version = "1.0.201"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "25dd9975e68d0cb5aa1120c288333fc98731bd1dd12f561e468ea4728c042b89"
+checksum = "780f1cebed1629e4753a1a38a3c72d30b97ec044f0aef68cb26650a3c5cf363c"
 dependencies = [
  "serde_derive",
 ]
 
+[[package]]
+name = "serde_bytes"
+version = "0.11.14"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b8497c313fd43ab992087548117643f6fcd935cbf36f176ffda0aacf9591734"
+dependencies = [
+ "serde",
+]
+
 [[package]]
 name = "serde_derive"
-version = "1.0.193"
+version = "1.0.201"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "43576ca501357b9b071ac53cdc7da8ef0cbd9493d8df094cd821777ea6e894d3"
+checksum = "c5e405930b9796f1c00bee880d03fc7e0bb4b9a11afc776885ffe84320da2865"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.42",
+ "syn 2.0.61",
 ]
 
 [[package]]
 name = "serde_json"
-version = "1.0.108"
+version = "1.0.117"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3d1c7e3eac408d115102c4c24ad393e0821bb3a5df4d506a80f85f7a742a526b"
+checksum = "455182ea6142b14f93f4bc5320a2b31c1f266b66a4a5c858b013302a5d8cbfc3"
 dependencies = [
  "itoa",
  "ryu",
@@ -13229,6 +13691,17 @@ dependencies = [
  "opaque-debug 0.3.0",
 ]
 
+[[package]]
+name = "sha1"
+version = "0.10.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e3bf829a2d51ab4a5ddf1352d8470c140cadc8301b2ae1789db023f01cedd6ba"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest 0.10.7",
+]
+
 [[package]]
 name = "sha2"
 version = "0.8.2"
@@ -13342,6 +13815,11 @@ dependencies = [
  "similar",
 ]
 
+[[package]]
+name = "simple-mermaid"
+version = "0.1.0"
+source = "git+https://github.com/kianenigma/simple-mermaid.git?rev=e48b187bcfd5cc75111acd9d241f1bd36604344b#e48b187bcfd5cc75111acd9d241f1bd36604344b"
+
 [[package]]
 name = "siphasher"
 version = "0.3.11"
@@ -13377,14 +13855,14 @@ dependencies = [
 
 [[package]]
 name = "slot-range-helper"
-version = "1.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "enumn",
  "parity-scale-codec",
  "paste",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
@@ -13398,9 +13876,9 @@ dependencies = [
 
 [[package]]
 name = "smallvec"
-version = "1.11.2"
+version = "1.13.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4dccd0940a2dcdf68d092b8cbab7dc0ad8fa938bf95787e1b916b0e3d0e8e970"
+checksum = "3c5e1a9a646d36c3599cd173a41282daf47c44583ad367b8e6837255952e5c67"
 
 [[package]]
 name = "smol"
@@ -13455,7 +13933,7 @@ dependencies = [
  "pbkdf2 0.12.2",
  "pin-project",
  "poly1305",
- "rand 0.8.5",
+ "rand",
  "rand_chacha 0.3.1",
  "ruzstd",
  "schnorrkel 0.10.2",
@@ -13498,7 +13976,7 @@ dependencies = [
  "no-std-net",
  "parking_lot 0.12.1",
  "pin-project",
- "rand 0.8.5",
+ "rand",
  "rand_chacha 0.3.1",
  "serde",
  "serde_json",
@@ -13522,14 +14000,14 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "58021967fd0a5eeeb23b08df6cc244a4d4a5b4aec1d27c9e02fad1a58b4cd74e"
 dependencies = [
  "aes-gcm",
- "blake2",
+ "blake2 0.10.6",
  "chacha20poly1305",
  "curve25519-dalek 4.1.1",
  "rand_core 0.6.4",
  "ring 0.17.7",
  "rustc_version",
  "sha2 0.10.8",
- "subtle",
+ "subtle 2.4.1",
 ]
 
 [[package]]
@@ -13565,14 +14043,14 @@ dependencies = [
  "http",
  "httparse",
  "log",
- "rand 0.8.5",
+ "rand",
  "sha-1",
 ]
 
 [[package]]
 name = "sp-api"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "26.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "hash-db 0.16.0",
  "log",
@@ -13580,11 +14058,11 @@ dependencies = [
  "scale-info",
  "sp-api-proc-macro",
  "sp-core",
- "sp-externalities",
+ "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-metadata-ir",
  "sp-runtime",
- "sp-state-machine 0.28.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)",
- "sp-std",
+ "sp-state-machine",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-trie",
  "sp-version",
  "thiserror",
@@ -13592,73 +14070,91 @@ dependencies = [
 
 [[package]]
 name = "sp-api-proc-macro"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "15.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "Inflector",
- "blake2",
+ "blake2 0.10.6",
  "expander 2.0.0",
- "proc-macro-crate 1.3.1",
+ "proc-macro-crate 3.1.0",
  "proc-macro2",
  "quote",
- "syn 2.0.42",
+ "syn 2.0.61",
 ]
 
 [[package]]
 name = "sp-application-crypto"
-version = "23.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "30.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
  "serde",
  "sp-core",
  "sp-io",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "sp-arithmetic"
-version = "16.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "23.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "integer-sqrt",
  "num-traits",
  "parity-scale-codec",
  "scale-info",
  "serde",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "static_assertions",
 ]
 
+[[package]]
+name = "sp-ark-bls12-381"
+version = "0.4.2"
+source = "git+https://github.com/paritytech/arkworks-substrate#caa2eed74beb885dd07c7db5f916f2281dad818f"
+dependencies = [
+ "ark-bls12-381-ext",
+ "sp-crypto-ec-utils",
+]
+
+[[package]]
+name = "sp-ark-ed-on-bls12-381-bandersnatch"
+version = "0.4.2"
+source = "git+https://github.com/paritytech/arkworks-substrate#caa2eed74beb885dd07c7db5f916f2281dad818f"
+dependencies = [
+ "ark-ed-on-bls12-381-bandersnatch-ext",
+ "sp-crypto-ec-utils",
+]
+
 [[package]]
 name = "sp-authority-discovery"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "26.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-api",
  "sp-application-crypto",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "sp-block-builder"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "26.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "sp-api",
  "sp-inherents",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "sp-blockchain"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "futures",
  "log",
@@ -13669,14 +14165,14 @@ dependencies = [
  "sp-consensus",
  "sp-database",
  "sp-runtime",
- "sp-state-machine 0.28.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)",
+ "sp-state-machine",
  "thiserror",
 ]
 
 [[package]]
 name = "sp-consensus"
-version = "0.10.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "0.32.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "async-trait",
  "futures",
@@ -13684,14 +14180,14 @@ dependencies = [
  "sp-core",
  "sp-inherents",
  "sp-runtime",
- "sp-state-machine 0.28.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)",
+ "sp-state-machine",
  "thiserror",
 ]
 
 [[package]]
 name = "sp-consensus-aura"
-version = "0.10.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "0.32.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -13701,14 +14197,14 @@ dependencies = [
  "sp-consensus-slots",
  "sp-inherents",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-timestamp",
 ]
 
 [[package]]
 name = "sp-consensus-babe"
-version = "0.10.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "0.32.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -13720,14 +14216,14 @@ dependencies = [
  "sp-core",
  "sp-inherents",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-timestamp",
 ]
 
 [[package]]
 name = "sp-consensus-beefy"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "13.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "lazy_static",
  "parity-scale-codec",
@@ -13736,17 +14232,18 @@ dependencies = [
  "sp-api",
  "sp-application-crypto",
  "sp-core",
+ "sp-crypto-hashing",
  "sp-io",
  "sp-mmr-primitives",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "strum 0.24.1",
 ]
 
 [[package]]
 name = "sp-consensus-grandpa"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "13.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "finality-grandpa",
  "log",
@@ -13758,31 +14255,31 @@ dependencies = [
  "sp-core",
  "sp-keystore",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "sp-consensus-slots"
-version = "0.10.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "0.32.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
  "serde",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-timestamp",
 ]
 
 [[package]]
 name = "sp-core"
-version = "21.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
- "array-bytes",
- "arrayvec 0.7.4",
+ "array-bytes 6.2.2",
  "bandersnatch_vrfs",
+ "bip39",
  "bitflags 1.3.2",
- "blake2",
+ "blake2 0.10.6",
  "bounded-collections",
  "bs58 0.5.0",
  "dyn-clonable",
@@ -13791,39 +14288,66 @@ dependencies = [
  "hash-db 0.16.0",
  "hash256-std-hasher",
  "impl-serde",
- "lazy_static",
+ "itertools 0.10.5",
  "libsecp256k1",
  "log",
- "merlin 2.0.1",
+ "merlin 3.0.0",
  "parity-scale-codec",
  "parking_lot 0.12.1",
  "paste",
  "primitive-types",
- "rand 0.8.5",
- "regex",
+ "rand",
  "scale-info",
- "schnorrkel 0.9.1",
+ "schnorrkel 0.11.4",
  "secp256k1",
  "secrecy",
  "serde",
- "sp-core-hashing",
- "sp-debug-derive 8.0.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)",
- "sp-externalities",
- "sp-runtime-interface",
- "sp-std",
- "sp-storage",
+ "sp-crypto-hashing",
+ "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "ss58-registry",
  "substrate-bip39",
  "thiserror",
- "tiny-bip39",
  "tracing",
+ "w3f-bls",
  "zeroize",
 ]
 
 [[package]]
 name = "sp-core-hashing"
-version = "9.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "15.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
+dependencies = [
+ "sp-crypto-hashing",
+]
+
+[[package]]
+name = "sp-crypto-ec-utils"
+version = "0.10.0"
+source = "git+https://github.com/paritytech/polkadot-sdk#d37719da022879b4e2ef7947f5c9d2187f666ae7"
+dependencies = [
+ "ark-bls12-377",
+ "ark-bls12-377-ext",
+ "ark-bls12-381",
+ "ark-bls12-381-ext",
+ "ark-bw6-761",
+ "ark-bw6-761-ext",
+ "ark-ec",
+ "ark-ed-on-bls12-377",
+ "ark-ed-on-bls12-377-ext",
+ "ark-ed-on-bls12-381-bandersnatch",
+ "ark-ed-on-bls12-381-bandersnatch-ext",
+ "ark-scale",
+ "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk)",
+]
+
+[[package]]
+name = "sp-crypto-hashing"
+version = "0.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "blake2b_simd",
  "byteorder",
@@ -13834,19 +14358,19 @@ dependencies = [
 ]
 
 [[package]]
-name = "sp-core-hashing-proc-macro"
-version = "9.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+name = "sp-crypto-hashing-proc-macro"
+version = "0.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "quote",
- "sp-core-hashing",
- "syn 2.0.42",
+ "sp-crypto-hashing",
+ "syn 2.0.61",
 ]
 
 [[package]]
 name = "sp-database"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "10.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "kvdb",
  "parking_lot 0.12.1",
@@ -13854,64 +14378,74 @@ dependencies = [
 
 [[package]]
 name = "sp-debug-derive"
-version = "8.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "14.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.42",
+ "syn 2.0.61",
 ]
 
 [[package]]
 name = "sp-debug-derive"
-version = "8.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?rev=c8d2251cafadc108ba2f1f8a3208dc547ff38901#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "14.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk#d37719da022879b4e2ef7947f5c9d2187f666ae7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.42",
+ "syn 2.0.61",
 ]
 
 [[package]]
 name = "sp-externalities"
-version = "0.19.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "0.25.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "environmental",
  "parity-scale-codec",
- "sp-std",
- "sp-storage",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+]
+
+[[package]]
+name = "sp-externalities"
+version = "0.25.0"
+source = "git+https://github.com/paritytech/polkadot-sdk#d37719da022879b4e2ef7947f5c9d2187f666ae7"
+dependencies = [
+ "environmental",
+ "parity-scale-codec",
+ "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk)",
 ]
 
 [[package]]
 name = "sp-genesis-builder"
-version = "0.1.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "0.7.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "serde_json",
  "sp-api",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "sp-inherents"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "26.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "async-trait",
  "impl-trait-for-tuples",
  "parity-scale-codec",
  "scale-info",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "thiserror",
 ]
 
 [[package]]
 name = "sp-io"
-version = "23.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "30.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "bytes",
  "ed25519-dalek",
@@ -13921,12 +14455,13 @@ dependencies = [
  "rustversion",
  "secp256k1",
  "sp-core",
- "sp-externalities",
+ "sp-crypto-hashing",
+ "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-keystore",
- "sp-runtime-interface",
- "sp-state-machine 0.28.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)",
- "sp-std",
- "sp-tracing",
+ "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-state-machine",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-trie",
  "tracing",
  "tracing-core",
@@ -13934,10 +14469,9 @@ dependencies = [
 
 [[package]]
 name = "sp-keyring"
-version = "24.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "31.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
- "lazy_static",
  "sp-core",
  "sp-runtime",
  "strum 0.24.1",
@@ -13945,20 +14479,20 @@ dependencies = [
 
 [[package]]
 name = "sp-keystore"
-version = "0.27.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "0.34.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "parity-scale-codec",
  "parking_lot 0.12.1",
  "sp-core",
- "sp-externalities",
+ "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "thiserror",
 ]
 
 [[package]]
 name = "sp-maybe-compressed-blob"
-version = "4.1.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "11.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "thiserror",
  "zstd 0.12.4",
@@ -13966,19 +14500,31 @@ dependencies = [
 
 [[package]]
 name = "sp-metadata-ir"
-version = "0.1.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "0.6.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "frame-metadata",
  "parity-scale-codec",
  "scale-info",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+]
+
+[[package]]
+name = "sp-mixnet"
+version = "0.4.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
+dependencies = [
+ "parity-scale-codec",
+ "scale-info",
+ "sp-api",
+ "sp-application-crypto",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "sp-mmr-primitives"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "26.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "ckb-merkle-mountain-range",
  "log",
@@ -13987,16 +14533,16 @@ dependencies = [
  "serde",
  "sp-api",
  "sp-core",
- "sp-debug-derive 8.0.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)",
+ "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "thiserror",
 ]
 
 [[package]]
 name = "sp-npos-elections"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "26.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -14004,13 +14550,13 @@ dependencies = [
  "sp-arithmetic",
  "sp-core",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "sp-offchain"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "26.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "sp-api",
  "sp-core",
@@ -14019,8 +14565,8 @@ dependencies = [
 
 [[package]]
 name = "sp-panic-handler"
-version = "8.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "13.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "backtrace",
  "lazy_static",
@@ -14029,8 +14575,8 @@ dependencies = [
 
 [[package]]
 name = "sp-rpc"
-version = "6.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "26.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "rustc-hash",
  "serde",
@@ -14039,60 +14585,95 @@ dependencies = [
 
 [[package]]
 name = "sp-runtime"
-version = "24.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "31.0.1"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
+ "docify",
  "either",
  "hash256-std-hasher",
  "impl-trait-for-tuples",
  "log",
  "parity-scale-codec",
  "paste",
- "rand 0.8.5",
+ "rand",
  "scale-info",
  "serde",
+ "simple-mermaid",
  "sp-application-crypto",
  "sp-arithmetic",
  "sp-core",
  "sp-io",
- "sp-std",
- "sp-weights 20.0.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-weights",
 ]
 
 [[package]]
 name = "sp-runtime-interface"
-version = "17.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "24.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
+dependencies = [
+ "bytes",
+ "impl-trait-for-tuples",
+ "parity-scale-codec",
+ "primitive-types",
+ "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-runtime-interface-proc-macro 17.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "static_assertions",
+]
+
+[[package]]
+name = "sp-runtime-interface"
+version = "24.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk#d37719da022879b4e2ef7947f5c9d2187f666ae7"
 dependencies = [
  "bytes",
  "impl-trait-for-tuples",
  "parity-scale-codec",
+ "polkavm-derive",
  "primitive-types",
- "sp-externalities",
- "sp-runtime-interface-proc-macro",
- "sp-std",
- "sp-storage",
- "sp-tracing",
- "sp-wasm-interface",
+ "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk)",
+ "sp-runtime-interface-proc-macro 17.0.0 (git+https://github.com/paritytech/polkadot-sdk)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk)",
+ "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk)",
+ "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk)",
+ "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk)",
  "static_assertions",
 ]
 
 [[package]]
 name = "sp-runtime-interface-proc-macro"
-version = "11.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "17.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "Inflector",
- "proc-macro-crate 1.3.1",
+ "expander 2.0.0",
+ "proc-macro-crate 3.1.0",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.61",
+]
+
+[[package]]
+name = "sp-runtime-interface-proc-macro"
+version = "17.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk#d37719da022879b4e2ef7947f5c9d2187f666ae7"
+dependencies = [
+ "Inflector",
+ "expander 2.0.0",
+ "proc-macro-crate 3.1.0",
  "proc-macro2",
  "quote",
- "syn 2.0.42",
+ "syn 2.0.61",
 ]
 
 [[package]]
 name = "sp-session"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "27.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -14101,13 +14682,13 @@ dependencies = [
  "sp-keystore",
  "sp-runtime",
  "sp-staking",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "sp-staking"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "26.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -14115,117 +14696,130 @@ dependencies = [
  "serde",
  "sp-core",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "sp-state-machine"
-version = "0.28.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "0.35.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "hash-db 0.16.0",
  "log",
  "parity-scale-codec",
  "parking_lot 0.12.1",
- "rand 0.8.5",
+ "rand",
  "smallvec",
  "sp-core",
- "sp-externalities",
+ "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-panic-handler",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-trie",
  "thiserror",
  "tracing",
- "trie-db 0.27.1",
-]
-
-[[package]]
-name = "sp-state-machine"
-version = "0.28.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?rev=c8d2251cafadc108ba2f1f8a3208dc547ff38901#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
-dependencies = [
- "hash-db 0.16.0",
- "log",
- "parity-scale-codec",
- "smallvec",
- "sp-core",
- "sp-externalities",
- "sp-std",
- "sp-trie",
- "trie-db 0.27.1",
+ "trie-db",
 ]
 
 [[package]]
 name = "sp-statement-store"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "10.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "aes-gcm",
  "curve25519-dalek 4.1.1",
  "ed25519-dalek",
  "hkdf",
  "parity-scale-codec",
- "rand 0.8.5",
+ "rand",
  "scale-info",
  "sha2 0.10.8",
  "sp-api",
  "sp-application-crypto",
  "sp-core",
- "sp-externalities",
+ "sp-crypto-hashing",
+ "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-runtime",
- "sp-runtime-interface",
- "sp-std",
+ "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "thiserror",
  "x25519-dalek 2.0.0",
 ]
 
 [[package]]
 name = "sp-std"
-version = "8.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "14.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
+
+[[package]]
+name = "sp-std"
+version = "14.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk#d37719da022879b4e2ef7947f5c9d2187f666ae7"
 
 [[package]]
 name = "sp-storage"
-version = "13.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "19.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
+dependencies = [
+ "impl-serde",
+ "parity-scale-codec",
+ "ref-cast",
+ "serde",
+ "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+]
+
+[[package]]
+name = "sp-storage"
+version = "19.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk#d37719da022879b4e2ef7947f5c9d2187f666ae7"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
  "ref-cast",
  "serde",
- "sp-debug-derive 8.0.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)",
- "sp-std",
+ "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk)",
 ]
 
 [[package]]
 name = "sp-timestamp"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "26.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
  "sp-inherents",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "thiserror",
 ]
 
 [[package]]
 name = "sp-tracing"
-version = "10.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "16.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
+dependencies = [
+ "parity-scale-codec",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "tracing",
+ "tracing-core",
+ "tracing-subscriber 0.2.25",
+]
+
+[[package]]
+name = "sp-tracing"
+version = "16.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk#d37719da022879b4e2ef7947f5c9d2187f666ae7"
 dependencies = [
  "parity-scale-codec",
- "sp-std",
  "tracing",
  "tracing-core",
- "tracing-subscriber",
+ "tracing-subscriber 0.3.18",
 ]
 
 [[package]]
 name = "sp-transaction-pool"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "26.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "sp-api",
  "sp-runtime",
@@ -14233,8 +14827,8 @@ dependencies = [
 
 [[package]]
 name = "sp-transaction-storage-proof"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "26.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -14242,101 +14836,98 @@ dependencies = [
  "sp-core",
  "sp-inherents",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-trie",
 ]
 
 [[package]]
 name = "sp-trie"
-version = "22.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "29.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "ahash 0.8.6",
  "hash-db 0.16.0",
- "hashbrown 0.13.2",
  "lazy_static",
  "memory-db",
  "nohash-hasher",
  "parity-scale-codec",
  "parking_lot 0.12.1",
+ "rand",
  "scale-info",
  "schnellru",
  "sp-core",
- "sp-std",
+ "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "thiserror",
  "tracing",
- "trie-db 0.27.1",
+ "trie-db",
  "trie-root",
 ]
 
 [[package]]
 name = "sp-version"
-version = "22.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "29.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
  "parity-wasm",
  "scale-info",
  "serde",
- "sp-core-hashing-proc-macro",
+ "sp-crypto-hashing-proc-macro",
  "sp-runtime",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-version-proc-macro",
  "thiserror",
 ]
 
 [[package]]
 name = "sp-version-proc-macro"
-version = "8.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "13.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "parity-scale-codec",
  "proc-macro2",
  "quote",
- "syn 2.0.42",
+ "syn 2.0.61",
 ]
 
 [[package]]
 name = "sp-wasm-interface"
-version = "14.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "20.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "anyhow",
  "impl-trait-for-tuples",
  "log",
  "parity-scale-codec",
- "sp-std",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "wasmtime",
 ]
 
 [[package]]
-name = "sp-weights"
+name = "sp-wasm-interface"
 version = "20.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+source = "git+https://github.com/paritytech/polkadot-sdk#d37719da022879b4e2ef7947f5c9d2187f666ae7"
 dependencies = [
+ "impl-trait-for-tuples",
+ "log",
  "parity-scale-codec",
- "scale-info",
- "serde",
- "smallvec",
- "sp-arithmetic",
- "sp-core",
- "sp-debug-derive 8.0.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)",
- "sp-std",
 ]
 
 [[package]]
 name = "sp-weights"
-version = "20.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?rev=c8d2251cafadc108ba2f1f8a3208dc547ff38901#c8d2251cafadc108ba2f1f8a3208dc547ff38901"
+version = "27.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
+ "bounded-collections",
  "parity-scale-codec",
  "scale-info",
+ "serde",
  "smallvec",
  "sp-arithmetic",
- "sp-core",
- "sp-debug-derive 8.0.0 (git+https://github.com/paritytech/polkadot-sdk?rev=c8d2251cafadc108ba2f1f8a3208dc547ff38901)",
- "sp-std",
+ "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
@@ -14394,116 +14985,25 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
 
 [[package]]
-name = "staging-kusama-runtime"
-version = "1.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+name = "staging-parachain-info"
+version = "0.7.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
- "binary-merkle-tree",
- "bitvec",
- "frame-benchmarking",
- "frame-election-provider-support",
- "frame-executive",
+ "cumulus-primitives-core",
  "frame-support",
  "frame-system",
- "frame-system-benchmarking",
- "frame-system-rpc-runtime-api",
- "frame-try-runtime",
- "hex-literal 0.4.1",
- "kusama-runtime-constants",
- "log",
- "pallet-authority-discovery",
- "pallet-authorship",
- "pallet-babe",
- "pallet-bags-list",
- "pallet-balances",
- "pallet-beefy",
- "pallet-beefy-mmr",
- "pallet-bounties",
- "pallet-child-bounties",
- "pallet-collective",
- "pallet-conviction-voting",
- "pallet-democracy 4.0.0-dev",
- "pallet-election-provider-multi-phase",
- "pallet-election-provider-support-benchmarking",
- "pallet-elections-phragmen",
- "pallet-fast-unstake",
- "pallet-grandpa",
- "pallet-identity",
- "pallet-im-online",
- "pallet-indices",
- "pallet-membership",
- "pallet-message-queue",
- "pallet-mmr",
- "pallet-multisig",
- "pallet-nis",
- "pallet-nomination-pools",
- "pallet-nomination-pools-benchmarking",
- "pallet-nomination-pools-runtime-api",
- "pallet-offences",
- "pallet-offences-benchmarking",
- "pallet-preimage",
- "pallet-proxy",
- "pallet-ranked-collective",
- "pallet-recovery",
- "pallet-referenda",
- "pallet-scheduler",
- "pallet-session",
- "pallet-session-benchmarking",
- "pallet-society",
- "pallet-staking 4.0.0-dev",
- "pallet-staking-runtime-api",
- "pallet-state-trie-migration",
- "pallet-timestamp",
- "pallet-tips",
- "pallet-transaction-payment",
- "pallet-transaction-payment-rpc-runtime-api",
- "pallet-treasury",
- "pallet-utility",
- "pallet-vesting",
- "pallet-whitelist",
- "pallet-xcm",
- "pallet-xcm-benchmarks",
  "parity-scale-codec",
- "polkadot-primitives",
- "polkadot-runtime-common",
- "polkadot-runtime-parachains",
- "rustc-hex",
  "scale-info",
- "serde",
- "serde_derive",
- "smallvec",
- "sp-api",
- "sp-application-crypto",
- "sp-arithmetic",
- "sp-authority-discovery",
- "sp-block-builder",
- "sp-consensus-babe",
- "sp-consensus-beefy",
- "sp-core",
- "sp-inherents",
- "sp-io",
- "sp-mmr-primitives",
- "sp-npos-elections",
- "sp-offchain",
  "sp-runtime",
- "sp-session",
- "sp-staking",
- "sp-std",
- "sp-storage",
- "sp-transaction-pool",
- "sp-version",
- "staging-xcm",
- "staging-xcm-builder",
- "staging-xcm-executor",
- "static_assertions",
- "substrate-wasm-builder",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "staging-xcm"
-version = "1.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
+ "array-bytes 6.2.2",
  "bounded-collections",
  "derivative",
  "environmental",
@@ -14512,14 +15012,14 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "serde",
- "sp-weights 20.0.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)",
+ "sp-weights",
  "xcm-procedural",
 ]
 
 [[package]]
 name = "staging-xcm-builder"
-version = "1.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -14532,16 +15032,16 @@ dependencies = [
  "sp-arithmetic",
  "sp-io",
  "sp-runtime",
- "sp-std",
- "sp-weights 20.0.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-weights",
  "staging-xcm",
  "staging-xcm-executor",
 ]
 
 [[package]]
 name = "staging-xcm-executor"
-version = "1.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "environmental",
  "frame-benchmarking",
@@ -14549,12 +15049,13 @@ dependencies = [
  "impl-trait-for-tuples",
  "log",
  "parity-scale-codec",
+ "scale-info",
  "sp-arithmetic",
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std",
- "sp-weights 20.0.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-weights",
  "staging-xcm",
 ]
 
@@ -14592,12 +15093,31 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "strobe-rs"
+version = "0.8.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fabb238a1cccccfa4c4fb703670c0d157e1256c1ba695abf1b93bd2bb14bab2d"
+dependencies = [
+ "bitflags 1.3.2",
+ "byteorder",
+ "keccak",
+ "subtle 2.4.1",
+ "zeroize",
+]
+
 [[package]]
 name = "strsim"
 version = "0.10.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
 
+[[package]]
+name = "strsim"
+version = "0.11.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
+
 [[package]]
 name = "strum"
 version = "0.24.1"
@@ -14619,7 +15139,7 @@ version = "0.24.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e385be0d24f186b4ce2f9982191e7101bb737312ad61c1f2f984f34bcf85d59"
 dependencies = [
- "heck",
+ "heck 0.4.1",
  "proc-macro2",
  "quote",
  "rustversion",
@@ -14632,11 +15152,11 @@ version = "0.25.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "23dc1fa9ac9c169a78ba62f0b841814b7abae11bdd047b9c58f893439e309ea0"
 dependencies = [
- "heck",
+ "heck 0.4.1",
  "proc-macro2",
  "quote",
  "rustversion",
- "syn 2.0.42",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -14661,23 +15181,23 @@ dependencies = [
  "byteorder",
  "crunchy",
  "lazy_static",
- "rand 0.8.5",
+ "rand",
  "rustc-hex",
 ]
 
 [[package]]
 name = "substrate-build-script-utils"
-version = "3.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "11.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 
 [[package]]
 name = "substrate-frame-rpc-system"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "28.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "frame-system-rpc-runtime-api",
  "futures",
- "jsonrpsee 0.16.3",
+ "jsonrpsee 0.20.3",
  "log",
  "parity-scale-codec",
  "sc-rpc-api",
@@ -14691,8 +15211,8 @@ dependencies = [
 
 [[package]]
 name = "substrate-prometheus-endpoint"
-version = "0.10.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "0.17.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "hyper",
  "log",
@@ -14703,11 +15223,11 @@ dependencies = [
 
 [[package]]
 name = "substrate-rpc-client"
-version = "0.10.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "0.33.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "async-trait",
- "jsonrpsee 0.16.3",
+ "jsonrpsee 0.20.3",
  "log",
  "sc-rpc-api",
  "serde",
@@ -14716,39 +15236,45 @@ dependencies = [
 
 [[package]]
 name = "substrate-state-trie-migration-rpc"
-version = "4.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "27.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
- "jsonrpsee 0.16.3",
+ "jsonrpsee 0.20.3",
  "parity-scale-codec",
  "sc-client-api",
  "sc-rpc-api",
  "serde",
  "sp-core",
  "sp-runtime",
- "sp-state-machine 0.28.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)",
+ "sp-state-machine",
  "sp-trie",
- "trie-db 0.27.1",
+ "trie-db",
 ]
 
 [[package]]
 name = "substrate-wasm-builder"
-version = "5.0.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "17.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
- "ansi_term",
  "build-helper",
  "cargo_metadata",
+ "console",
  "filetime",
  "parity-wasm",
  "sp-maybe-compressed-blob",
  "strum 0.24.1",
  "tempfile",
- "toml 0.7.8",
+ "toml 0.8.12",
  "walkdir",
  "wasm-opt",
 ]
 
+[[package]]
+name = "subtle"
+version = "1.0.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee"
+
 [[package]]
 name = "subtle"
 version = "2.4.1"
@@ -14774,9 +15300,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.42"
+version = "2.0.61"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5b7d0a2c048d661a1a59fcd7355baa232f7ed34e0ee4df2eef3c1c1c0d3852d8"
+checksum = "c993ed8ccba56ae856363b1845da7266a7cb78e1d146c8a32d54b45a8b831fc9"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -14850,6 +15376,16 @@ dependencies = [
  "winapi-util",
 ]
 
+[[package]]
+name = "terminal_size"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "21bebf2b7c9e0a515f6e0f8c51dc0f8e4696391e6f1ff30379559f8365fb0df7"
+dependencies = [
+ "rustix 0.38.28",
+ "windows-sys 0.48.0",
+]
+
 [[package]]
 name = "termtree"
 version = "0.4.1"
@@ -14883,7 +15419,7 @@ dependencies = [
  "cfg-if",
  "proc-macro2",
  "quote",
- "syn 2.0.42",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -14907,7 +15443,7 @@ checksum = "5c89e72a01ed4c579669add59014b9a524d609c0c88c6a585ce37485879f6ffb"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.42",
+ "syn 2.0.61",
  "test-case-core",
 ]
 
@@ -14951,7 +15487,7 @@ checksum = "e4c60d69f36615a077cc7663b9cb8e42275722d23e58a7fa3d2c7f2915d09d04"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.42",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -14962,7 +15498,7 @@ checksum = "01742297787513b79cf8e29d1056ede1313e2420b7b3b15d0a768b4921f549df"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.42",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -15053,25 +15589,6 @@ dependencies = [
  "time-core",
 ]
 
-[[package]]
-name = "tiny-bip39"
-version = "1.0.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "62cc94d358b5a1e84a5cb9109f559aa3c4d634d2b1b4de3d0fa4adc7c78e2861"
-dependencies = [
- "anyhow",
- "hmac 0.12.1",
- "once_cell",
- "pbkdf2 0.11.0",
- "rand 0.8.5",
- "rustc-hash",
- "sha2 0.10.8",
- "thiserror",
- "unicode-normalization",
- "wasm-bindgen",
- "zeroize",
-]
-
 [[package]]
 name = "tiny-keccak"
 version = "2.0.2"
@@ -15108,9 +15625,9 @@ checksum = "1f3ccbac311fea05f86f61904b462b55fb3df8837a366dfc601a0161d0532f20"
 
 [[package]]
 name = "tokio"
-version = "1.35.1"
+version = "1.37.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c89b4efa943be685f629b149f53829423f8f5531ea21249408e8e2f8671ec104"
+checksum = "1adbebffeca75fcfd058afa480fb6c0b81e165a0323f9c9d39c9697e37c46787"
 dependencies = [
  "backtrace",
  "bytes",
@@ -15133,7 +15650,7 @@ checksum = "5b8a1e28f2deaa14e508979454cb3a223b10b938b45af148bc0986de36f1923b"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.42",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -15143,7 +15660,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f57eb36ecbe0fc510036adff84824dd3c24bb781e21bfa67b69d556aa85214f"
 dependencies = [
  "pin-project",
- "rand 0.8.5",
+ "rand",
  "tokio",
 ]
 
@@ -15207,21 +15724,21 @@ dependencies = [
 
 [[package]]
 name = "toml"
-version = "0.8.2"
+version = "0.8.12"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "185d8ab0dfbb35cf1399a6344d8484209c088f75f8f68230da55d48d95d43e3d"
+checksum = "e9dd1545e8208b4a5af1aa9bbd0b4cf7e9ea08fabc5d0a5c67fcaafa17433aa3"
 dependencies = [
  "serde",
  "serde_spanned",
  "toml_datetime",
- "toml_edit 0.20.2",
+ "toml_edit 0.22.12",
 ]
 
 [[package]]
 name = "toml_datetime"
-version = "0.6.3"
+version = "0.6.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7cda73e2f1397b1262d6dfdcef8aafae14d1de7748d66822d3bfeeb6d03e5e4b"
+checksum = "3550f4e9685620ac18a50ed434eb3aec30db8ba93b0287467bca5826ea25baf1"
 dependencies = [
  "serde",
 ]
@@ -15236,7 +15753,7 @@ dependencies = [
  "serde",
  "serde_spanned",
  "toml_datetime",
- "winnow",
+ "winnow 0.5.30",
 ]
 
 [[package]]
@@ -15244,12 +15761,34 @@ name = "toml_edit"
 version = "0.20.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "396e4d48bbb2b7554c944bde63101b5ae446cff6ec4a24227428f15eb72ef338"
+dependencies = [
+ "indexmap 2.1.0",
+ "toml_datetime",
+ "winnow 0.5.30",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.21.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6a8534fd7f78b5405e860340ad6575217ce99f38d4d5c8f2442cb5ecb50090e1"
+dependencies = [
+ "indexmap 2.1.0",
+ "toml_datetime",
+ "winnow 0.5.30",
+]
+
+[[package]]
+name = "toml_edit"
+version = "0.22.12"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d3328d4f68a705b2a4498da1d580585d39a6510f98318a2cec3018a7ec61ddef"
 dependencies = [
  "indexmap 2.1.0",
  "serde",
  "serde_spanned",
  "toml_datetime",
- "winnow",
+ "winnow 0.6.8",
 ]
 
 [[package]]
@@ -15258,6 +15797,10 @@ version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b8fa9be0de6cf49e536ce1851f987bd21a43b771b09473c3549a6c853db37c1c"
 dependencies = [
+ "futures-core",
+ "futures-util",
+ "pin-project",
+ "pin-project-lite 0.2.13",
  "tower-layer",
  "tower-service",
  "tracing",
@@ -15313,7 +15856,7 @@ checksum = "34704c8d6ebcbc939824180af020566b01a7c01f80641264eba0999f6c2b6be7"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.42",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -15338,11 +15881,10 @@ dependencies = [
 
 [[package]]
 name = "tracing-gum"
-version = "1.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "coarsetime",
- "polkadot-node-jaeger",
  "polkadot-primitives",
  "tracing",
  "tracing-gum-proc-macro",
@@ -15350,14 +15892,14 @@ dependencies = [
 
 [[package]]
 name = "tracing-gum-proc-macro"
-version = "1.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "5.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "expander 2.0.0",
- "proc-macro-crate 1.3.1",
+ "proc-macro-crate 3.1.0",
  "proc-macro2",
  "quote",
- "syn 2.0.42",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -15371,6 +15913,17 @@ dependencies = [
  "tracing-core",
 ]
 
+[[package]]
+name = "tracing-log"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3"
+dependencies = [
+ "log",
+ "once_cell",
+ "tracing-core",
+]
+
 [[package]]
 name = "tracing-serde"
 version = "0.1.3"
@@ -15390,7 +15943,7 @@ dependencies = [
  "ansi_term",
  "chrono",
  "lazy_static",
- "matchers",
+ "matchers 0.0.1",
  "parking_lot 0.11.2",
  "regex",
  "serde",
@@ -15400,21 +15953,26 @@ dependencies = [
  "thread_local",
  "tracing",
  "tracing-core",
- "tracing-log",
+ "tracing-log 0.1.4",
  "tracing-serde",
 ]
 
 [[package]]
-name = "trie-db"
-version = "0.27.1"
+name = "tracing-subscriber"
+version = "0.3.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "767abe6ffed88a1889671a102c2861ae742726f52e0a5a425b92c9fbfa7e9c85"
+checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b"
 dependencies = [
- "hash-db 0.16.0",
- "hashbrown 0.13.2",
- "log",
- "rustc-hex",
+ "matchers 0.1.0",
+ "nu-ansi-term",
+ "once_cell",
+ "regex",
+ "sharded-slab",
  "smallvec",
+ "thread_local",
+ "tracing",
+ "tracing-core",
+ "tracing-log 0.2.0",
 ]
 
 [[package]]
@@ -15465,7 +16023,7 @@ dependencies = [
  "idna 0.2.3",
  "ipnet",
  "lazy_static",
- "rand 0.8.5",
+ "rand",
  "smallvec",
  "socket2 0.4.10",
  "thiserror",
@@ -15503,11 +16061,11 @@ checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 
 [[package]]
 name = "try-runtime-cli"
-version = "0.10.0-dev"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "0.38.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "async-trait",
- "clap 4.4.11",
+ "clap 4.5.4",
  "frame-remote-externalities",
  "hex",
  "log",
@@ -15520,18 +16078,18 @@ dependencies = [
  "sp-consensus-aura",
  "sp-consensus-babe",
  "sp-core",
- "sp-debug-derive 8.0.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)",
- "sp-externalities",
+ "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-inherents",
  "sp-io",
  "sp-keystore",
  "sp-rpc",
  "sp-runtime",
- "sp-state-machine 0.28.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)",
+ "sp-state-machine",
  "sp-timestamp",
  "sp-transaction-storage-proof",
  "sp-version",
- "sp-weights 20.0.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)",
+ "sp-weights",
  "substrate-rpc-client",
  "zstd 0.12.4",
 ]
@@ -15565,7 +16123,7 @@ checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675"
 dependencies = [
  "cfg-if",
  "digest 0.10.7",
- "rand 0.8.5",
+ "rand",
  "static_assertions",
 ]
 
@@ -15654,7 +16212,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea"
 dependencies = [
  "crypto-common",
- "subtle",
+ "subtle 2.4.1",
 ]
 
 [[package]]
@@ -15722,6 +16280,30 @@ version = "1.0.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6a02e4885ed3bc0f2de90ea6dd45ebcbb66dacffe03547fadbb0eeae2770887d"
 
+[[package]]
+name = "w3f-bls"
+version = "0.1.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7335e4c132c28cc43caef6adb339789e599e39adbe78da0c4d547fad48cbc331"
+dependencies = [
+ "ark-bls12-377",
+ "ark-bls12-381",
+ "ark-ec",
+ "ark-ff",
+ "ark-serialize",
+ "ark-serialize-derive",
+ "arrayref",
+ "constcat",
+ "digest 0.10.7",
+ "rand",
+ "rand_chacha 0.3.1",
+ "rand_core 0.6.4",
+ "sha2 0.10.8",
+ "sha3",
+ "thiserror",
+ "zeroize",
+]
+
 [[package]]
 name = "wait-timeout"
 version = "0.2.0"
@@ -15789,7 +16371,7 @@ dependencies = [
  "once_cell",
  "proc-macro2",
  "quote",
- "syn 2.0.42",
+ "syn 2.0.61",
  "wasm-bindgen-shared",
 ]
 
@@ -15823,7 +16405,7 @@ checksum = "f0eb82fcb7930ae6219a7ecfd55b217f5f0893484b7a13022ebb2b2bf20b5283"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.42",
+ "syn 2.0.61",
  "wasm-bindgen-backend",
  "wasm-bindgen-shared",
 ]
@@ -15836,18 +16418,18 @@ checksum = "7ab9b36309365056cd639da3134bf87fa8f3d86008abf99e612384a6eecd459f"
 
 [[package]]
 name = "wasm-instrument"
-version = "0.3.0"
+version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "aa1dafb3e60065305741e83db35c6c2584bb3725b692b5b66148a38d72ace6cd"
+checksum = "2a47ecb37b9734d1085eaa5ae1a81e60801fd8c28d4cabdd8aedb982021918bc"
 dependencies = [
  "parity-wasm",
 ]
 
 [[package]]
 name = "wasm-opt"
-version = "0.114.2"
+version = "0.116.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "effbef3bd1dde18acb401f73e740a6f3d4a1bc651e9773bddc512fe4d8d68f67"
+checksum = "2fd87a4c135535ffed86123b6fb0f0a5a0bc89e50416c942c5f0662c645f679c"
 dependencies = [
  "anyhow",
  "libc",
@@ -15861,9 +16443,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-opt-cxx-sys"
-version = "0.114.2"
+version = "0.116.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c09e24eb283919ace2ed5733bda4842a59ce4c8de110ef5c6d98859513d17047"
+checksum = "8c57b28207aa724318fcec6575fe74803c23f6f266fce10cbc9f3f116762f12e"
 dependencies = [
  "anyhow",
  "cxx",
@@ -15873,9 +16455,9 @@ dependencies = [
 
 [[package]]
 name = "wasm-opt-sys"
-version = "0.114.2"
+version = "0.116.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "36f2f817bed2e8d65eb779fa37317e74de15585751f903c9118342d1970703a4"
+checksum = "8a1cce564dc768dacbdb718fc29df2dba80bd21cb47d8f77ae7e3d95ceb98cbe"
 dependencies = [
  "anyhow",
  "cc",
@@ -16123,7 +16705,7 @@ dependencies = [
  "memfd",
  "memoffset 0.8.0",
  "paste",
- "rand 0.8.5",
+ "rand",
  "rustix 0.36.17",
  "wasmtime-asm-macros",
  "wasmtime-environ",
@@ -16172,16 +16754,10 @@ dependencies = [
  "webpki",
 ]
 
-[[package]]
-name = "webpki-roots"
-version = "0.25.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1778a42e8b3b90bff8d0f5032bf22250792889a5cdc752aa0020c84abe3aaf10"
-
 [[package]]
 name = "westend-runtime"
-version = "1.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "binary-merkle-tree",
  "bitvec",
@@ -16195,6 +16771,7 @@ dependencies = [
  "frame-try-runtime",
  "hex-literal 0.4.1",
  "log",
+ "pallet-asset-rate",
  "pallet-authority-discovery",
  "pallet-authorship",
  "pallet-babe",
@@ -16203,7 +16780,8 @@ dependencies = [
  "pallet-beefy",
  "pallet-beefy-mmr",
  "pallet-collective",
- "pallet-democracy 4.0.0-dev",
+ "pallet-conviction-voting",
+ "pallet-democracy 28.0.0",
  "pallet-election-provider-multi-phase",
  "pallet-election-provider-support-benchmarking",
  "pallet-elections-phragmen",
@@ -16224,11 +16802,13 @@ dependencies = [
  "pallet-preimage",
  "pallet-proxy",
  "pallet-recovery",
+ "pallet-referenda",
+ "pallet-root-testing",
  "pallet-scheduler",
  "pallet-session",
  "pallet-session-benchmarking",
  "pallet-society",
- "pallet-staking 4.0.0-dev",
+ "pallet-staking 28.0.0",
  "pallet-staking-reward-curve",
  "pallet-staking-runtime-api",
  "pallet-state-trie-migration",
@@ -16239,6 +16819,7 @@ dependencies = [
  "pallet-treasury",
  "pallet-utility",
  "pallet-vesting",
+ "pallet-whitelist",
  "pallet-xcm",
  "pallet-xcm-benchmarks",
  "parity-scale-codec",
@@ -16253,11 +16834,13 @@ dependencies = [
  "smallvec",
  "sp-api",
  "sp-application-crypto",
+ "sp-arithmetic",
  "sp-authority-discovery",
  "sp-block-builder",
  "sp-consensus-babe",
  "sp-consensus-beefy",
  "sp-core",
+ "sp-genesis-builder",
  "sp-inherents",
  "sp-io",
  "sp-mmr-primitives",
@@ -16266,8 +16849,8 @@ dependencies = [
  "sp-runtime",
  "sp-session",
  "sp-staking",
- "sp-std",
- "sp-storage",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-transaction-pool",
  "sp-version",
  "staging-xcm",
@@ -16279,8 +16862,8 @@ dependencies = [
 
 [[package]]
 name = "westend-runtime-constants"
-version = "1.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "frame-support",
  "polkadot-primitives",
@@ -16288,7 +16871,9 @@ dependencies = [
  "smallvec",
  "sp-core",
  "sp-runtime",
- "sp-weights 20.0.0 (git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3)",
+ "sp-weights",
+ "staging-xcm",
+ "staging-xcm-builder",
 ]
 
 [[package]]
@@ -16591,6 +17176,15 @@ dependencies = [
  "memchr",
 ]
 
+[[package]]
+name = "winnow"
+version = "0.6.8"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c3c52e9c97a68071b23e836c9380edae937f17b9c4667bd021973efc689f618d"
+dependencies = [
+ "memchr",
+]
+
 [[package]]
 name = "winreg"
 version = "0.50.0"
@@ -16653,10 +17247,11 @@ dependencies = [
 
 [[package]]
 name = "xcm-emulator"
-version = "0.1.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "0.5.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "cumulus-pallet-parachain-system",
+ "cumulus-pallet-xcmp-queue",
  "cumulus-primitives-core",
  "cumulus-primitives-parachain-inherent",
  "cumulus-test-relay-sproof-builder",
@@ -16675,23 +17270,24 @@ dependencies = [
  "polkadot-runtime-parachains",
  "sp-arithmetic",
  "sp-core",
+ "sp-crypto-hashing",
  "sp-io",
  "sp-runtime",
- "sp-std",
- "sp-tracing",
+ "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "staging-xcm",
  "staging-xcm-executor",
 ]
 
 [[package]]
 name = "xcm-procedural"
-version = "1.0.0"
-source = "git+https://github.com/galacticcouncil/polkadot-sdk?rev=062d92eae0f3bb9908faf2d4e241eef17368b9d3#062d92eae0f3bb9908faf2d4e241eef17368b9d3"
+version = "7.0.0"
+source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#0d7ca59fd4b4d15f9400971f32bc6a51b2fe837f"
 dependencies = [
  "Inflector",
  "proc-macro2",
  "quote",
- "syn 2.0.42",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -16704,7 +17300,7 @@ dependencies = [
  "log",
  "nohash-hasher",
  "parking_lot 0.12.1",
- "rand 0.8.5",
+ "rand",
  "static_assertions",
 ]
 
@@ -16740,7 +17336,7 @@ checksum = "9ce1b18ccd8e73a9321186f97e46f9f04b778851177567b1975109d26a08d2a6"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.42",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -16760,7 +17356,7 @@ checksum = "ce36e65b0d2999d2aafac989fb249189a141aee1f53c612c1f37d72631959f69"
 dependencies = [
  "proc-macro2",
  "quote",
- "syn 2.0.42",
+ "syn 2.0.61",
 ]
 
 [[package]]
diff --git a/Cargo.toml b/Cargo.toml
index 9888f3642..521aef709 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -11,7 +11,6 @@ members = [
   'utils/build-script-utils',
   'integration-tests',
   'pallets/circuit-breaker',
-  'pallets/xcm-rate-limiter',
   'pallets/omnipool-liquidity-mining',
   'scraper',
   'traits',
@@ -95,15 +94,14 @@ pallet-transaction-multi-payment = { path = "pallets/transaction-multi-payment",
 pallet-transaction-pause = { path = "pallets/transaction-pause", default-features = false }
 pallet-staking = { path = "pallets/staking", default-features = false }
 pallet-democracy= { path = "pallets/democracy", default-features = false }
-pallet-xcm-rate-limiter = { path = "pallets/xcm-rate-limiter", default-features = false }
 warehouse-liquidity-mining = { package = "pallet-liquidity-mining", path = "pallets/liquidity-mining", default-features = false }
 pallet-bonds = { path = "pallets/bonds", default-features = false}
 pallet-lbp = { path = "pallets/lbp", default-features = false}
 pallet-xyk = { path = "pallets/xyk", default-features = false}
+pallet-xyk-liquidity-mining = { path = "pallets/xyk-liquidity-mining", default-features = false}
 pallet-referrals = { path = "pallets/referrals", default-features = false}
 pallet-evm-accounts = { path = "pallets/evm-accounts", default-features = false}
 pallet-evm-accounts-rpc-runtime-api = { path = "pallets/evm-accounts/rpc/runtime-api", default-features = false}
-pallet-xyk-liquidity-mining = { path = "pallets/xyk-liquidity-mining", default-features = false }
 
 hydra-dx-build-script-utils = { path = "utils/build-script-utils", default-features = false }
 scraper = { path = "scraper", default-features = false }
@@ -121,491 +119,369 @@ scale-info = { version = "2.1.2", default-features = false, features = ["derive"
 primitive-types = { version = "0.12.0", default-features = false }
 
 # Frame
-frame-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-frame-benchmarking-cli = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-frame-executive = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-frame-remote-externalities = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-frame-support = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false, features = ["tuples-96"] }
-frame-system = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-frame-system-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-frame-try-runtime = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-sp-api = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-sp-arithmetic = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-sp-authority-discovery = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-sp-block-builder = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-sp-blockchain = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-sp-consensus = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-sp-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-sp-consensus-babe = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-sp-core = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-sp-externalities = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-sp-inherents = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-sp-io = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-sp-keystore = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-sp-npos-elections = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-sp-offchain = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-sc-offchain = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-sp-rpc = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-sp-session = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-sp-staking = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-sp-std = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-sp-storage = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-sp-state-machine = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-sp-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-sp-tracing = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-sp-transaction-pool = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-sp-trie = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-sp-version = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-sc-basic-authorship = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-sc-chain-spec = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-sc-cli = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-sc-client-api = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-sc-client-db = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-sc-consensus = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-sc-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-sc-consensus-grandpa = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-sc-executor = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-sc-keystore = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-sc-network = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-sc-network-sync = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-sc-network-common = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-sc-rpc = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-sc-rpc-api = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-sc-service = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-sc-telemetry = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-sc-tracing = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-sc-transaction-pool = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-sc-transaction-pool-api = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-sc-sysinfo = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-sp-weights = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
+frame-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+frame-benchmarking-cli = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+frame-executive = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+frame-remote-externalities = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false , features = ["tuples-96"]}
+frame-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+frame-system-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+frame-try-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sp-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sp-arithmetic = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sp-authority-discovery = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sp-block-builder = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sp-genesis-builder = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sp-blockchain = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sp-consensus = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sp-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sp-consensus-babe = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sp-consensus-beefy = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sp-externalities = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sp-inherents = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sp-keystore = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sp-npos-elections = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sp-offchain = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sc-offchain = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sp-rpc = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sp-runtime-interface = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sp-runtime-interface-proc-macro = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sp-session = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sp-staking = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sp-std = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sp-storage = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sp-state-machine = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sp-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sp-tracing = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sp-transaction-pool = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sp-trie = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sp-version = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sp-weights = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sp-crypto-hashing= {  git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sp-crypto-ec-utils= {   git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sp-core-hashing = {   git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sp-wasm-interface= {   git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+
+
+sc-basic-authorship = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sc-chain-spec = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sc-cli = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sc-client-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sc-client-db = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sc-consensus = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sc-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sc-consensus-grandpa = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sc-executor = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sc-keystore = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sc-network = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sc-network-sync = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sc-network-common = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sc-rpc = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sc-rpc-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sc-service = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sc-telemetry = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sc-tracing = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sc-transaction-pool = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sc-transaction-pool-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+sc-sysinfo = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
 
 # Substrate Pallets
-pallet-aura = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-pallet-authorship = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-pallet-bags-list = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-pallet-collective = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-pallet-elections-phragmen = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-pallet-identity = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-pallet-multisig = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-pallet-preimage = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-pallet-proxy = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-pallet-scheduler = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-pallet-session = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-pallet-sudo = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-pallet-state-trie-migration = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-substrate-state-trie-migration-rpc = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901" }
-pallet-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-pallet-tips = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-pallet-transaction-payment = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-pallet-treasury = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-pallet-uniques = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-pallet-utility = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-pallet-im-online = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-
-substrate-build-script-utils = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-substrate-frame-rpc-system = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-substrate-prometheus-endpoint = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-substrate-rpc-client = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-substrate-wasm-builder = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
+pallet-aura = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+pallet-authorship = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+pallet-bags-list = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+pallet-collective = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+pallet-elections-phragmen = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+pallet-identity = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+pallet-multisig = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+pallet-preimage = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+pallet-proxy = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+pallet-scheduler = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+pallet-session = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+pallet-sudo = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+pallet-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+pallet-tips = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+pallet-transaction-payment = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+pallet-treasury = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+pallet-uniques = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+pallet-utility = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+pallet-im-online = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+pallet-message-queue = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+pallet-state-trie-migration = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+
+substrate-build-script-utils = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+substrate-frame-rpc-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+substrate-prometheus-endpoint = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+substrate-rpc-client = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+substrate-wasm-builder = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+substrate-state-trie-migration-rpc = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
 
 #TODO: We use our custom ORML as it contains the fix of bug for reducible_balance check, for Preserve mode. Once the official ORML pushes a new version with the fix, we can use that again
 # ORML dependencies
-orml-benchmarking = { git = "https://github.com/galacticcouncil/open-runtime-module-library", rev = "f36a0abefd8e6b929bee3cc2420f7c4fbe459c99", default-features = false }
-orml-currencies = { git = "https://github.com/galacticcouncil/open-runtime-module-library", rev = "f36a0abefd8e6b929bee3cc2420f7c4fbe459c99", default-features = false }
-orml-tokens = { git = "https://github.com/galacticcouncil/open-runtime-module-library", rev = "f36a0abefd8e6b929bee3cc2420f7c4fbe459c99", default-features = false }
-orml-traits = { git = "https://github.com/galacticcouncil/open-runtime-module-library", rev = "f36a0abefd8e6b929bee3cc2420f7c4fbe459c99", default-features = false }
-orml-utilities = { git = "https://github.com/galacticcouncil/open-runtime-module-library", rev = "f36a0abefd8e6b929bee3cc2420f7c4fbe459c99", default-features = false }
-orml-vesting = { git = "https://github.com/galacticcouncil/open-runtime-module-library", rev = "f36a0abefd8e6b929bee3cc2420f7c4fbe459c99", default-features = false }
+orml-benchmarking = { git = "https://github.com/galacticcouncil/open-runtime-module-library", branch = "polkadot-v1.7.2", default-features = false }
+orml-currencies = { git = "https://github.com/galacticcouncil/open-runtime-module-library", branch = "polkadot-v1.7.2", default-features = false }
+orml-tokens = { git = "https://github.com/galacticcouncil/open-runtime-module-library", branch = "polkadot-v1.7.2", default-features = false }
+orml-traits = { git = "https://github.com/galacticcouncil/open-runtime-module-library", branch = "polkadot-v1.7.2", default-features = false }
+orml-utilities = { git = "https://github.com/galacticcouncil/open-runtime-module-library", branch = "polkadot-v1.7.2", default-features = false }
+orml-vesting = { git = "https://github.com/galacticcouncil/open-runtime-module-library", branch = "polkadot-v1.7.2", default-features = false }
 
 # orml XCM support
-orml-unknown-tokens = { git = "https://github.com/galacticcouncil/open-runtime-module-library", rev = "f36a0abefd8e6b929bee3cc2420f7c4fbe459c99", default-features = false }
-orml-xcm = { git = "https://github.com/galacticcouncil/open-runtime-module-library", rev = "f36a0abefd8e6b929bee3cc2420f7c4fbe459c99", default-features = false }
-orml-xcm-support = { git = "https://github.com/galacticcouncil/open-runtime-module-library", rev = "f36a0abefd8e6b929bee3cc2420f7c4fbe459c99", default-features = false }
-orml-xtokens = { git = "https://github.com/galacticcouncil/open-runtime-module-library", rev = "f36a0abefd8e6b929bee3cc2420f7c4fbe459c99", default-features = false }
+orml-unknown-tokens = { git = "https://github.com/galacticcouncil/open-runtime-module-library", branch = "polkadot-v1.7.2", default-features = false }
+orml-xcm = { git = "https://github.com/galacticcouncil/open-runtime-module-library", branch = "polkadot-v1.7.2", default-features = false }
+orml-xcm-support = { git = "https://github.com/galacticcouncil/open-runtime-module-library", branch = "polkadot-v1.7.2", default-features = false }
+orml-xtokens = { git = "https://github.com/galacticcouncil/open-runtime-module-library", branch = "polkadot-v1.7.2", default-features = false }
 
 # Cumulus dependencies
-cumulus-client-cli = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-cumulus-client-collator = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-cumulus-client-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-cumulus-client-consensus-common = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-cumulus-client-consensus-proposer = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-cumulus-client-network = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-cumulus-client-service = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-cumulus-pallet-dmp-queue = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-cumulus-pallet-xcm = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-cumulus-primitives-core = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-cumulus-primitives-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-cumulus-primitives-utility = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-cumulus-relay-chain-interface = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-cumulus-relay-chain-minimal-node = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-pallet-collator-selection = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-parachain-info = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-xcm-emulator = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
+cumulus-client-cli = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+cumulus-client-collator = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+cumulus-client-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+cumulus-client-consensus-common = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+cumulus-client-consensus-proposer = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+cumulus-client-network = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+cumulus-client-service = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+cumulus-pallet-xcm = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+cumulus-primitives-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+cumulus-primitives-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+cumulus-primitives-utility = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+cumulus-relay-chain-interface = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+cumulus-relay-chain-minimal-node = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+pallet-collator-selection = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+staging-parachain-info = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+xcm-emulator = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+parachains-common = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
 
 # Frontier
-fc-consensus = { git = "https://github.com/moonbeam-foundation/frontier", rev = "bf5885a982041cc744ecbb62a2afc13d56d464dc", default-features = false }
-fc-db = { git = "https://github.com/moonbeam-foundation/frontier", rev = "bf5885a982041cc744ecbb62a2afc13d56d464dc", default-features = false }
-fc-mapping-sync = { git = "https://github.com/moonbeam-foundation/frontier", rev = "bf5885a982041cc744ecbb62a2afc13d56d464dc", default-features = false }
-fc-rpc = { git = "https://github.com/moonbeam-foundation/frontier", rev = "bf5885a982041cc744ecbb62a2afc13d56d464dc", default-features = false }
-fc-rpc-core = { git = "https://github.com/moonbeam-foundation/frontier", rev = "bf5885a982041cc744ecbb62a2afc13d56d464dc", default-features = false }
-
-fp-consensus = { git = "https://github.com/moonbeam-foundation/frontier", rev = "bf5885a982041cc744ecbb62a2afc13d56d464dc", default-features = false }
-fp-evm = { git = "https://github.com/moonbeam-foundation/frontier", rev = "bf5885a982041cc744ecbb62a2afc13d56d464dc", default-features = false }
-fp-rpc = { git = "https://github.com/moonbeam-foundation/frontier", rev = "bf5885a982041cc744ecbb62a2afc13d56d464dc", default-features = false }
-fp-self-contained = { git = "https://github.com/moonbeam-foundation/frontier", rev = "bf5885a982041cc744ecbb62a2afc13d56d464dc", default-features = false }
-fp-storage = { git = "https://github.com/moonbeam-foundation/frontier", rev = "bf5885a982041cc744ecbb62a2afc13d56d464dc", default-features = false }
-
-pallet-ethereum = { git = "https://github.com/moonbeam-foundation/frontier", rev = "bf5885a982041cc744ecbb62a2afc13d56d464dc", default-features = false }
-pallet-evm = { git = "https://github.com/moonbeam-foundation/frontier", rev = "bf5885a982041cc744ecbb62a2afc13d56d464dc", default-features = false }
-pallet-evm-chain-id = { git = "https://github.com/moonbeam-foundation/frontier", rev = "bf5885a982041cc744ecbb62a2afc13d56d464dc", default-features = false }
-pallet-evm-precompile-dispatch = { git = "https://github.com/moonbeam-foundation/frontier", rev = "bf5885a982041cc744ecbb62a2afc13d56d464dc", default-features = false }
-pallet-evm-precompile-simple = { git = "https://github.com/moonbeam-foundation/frontier", rev = "bf5885a982041cc744ecbb62a2afc13d56d464dc", default-features = false }
-pallet-evm-precompile-modexp = { git = "https://github.com/moonbeam-foundation/frontier", rev = "bf5885a982041cc744ecbb62a2afc13d56d464dc", default-features = false }
-pallet-evm-precompile-bn128 = { git = "https://github.com/moonbeam-foundation/frontier", rev = "bf5885a982041cc744ecbb62a2afc13d56d464dc", default-features = false }
-pallet-evm-precompile-blake2 = { git = "https://github.com/moonbeam-foundation/frontier", rev = "bf5885a982041cc744ecbb62a2afc13d56d464dc", default-features = false }
-evm = { git = "https://github.com/moonbeam-foundation/evm", rev = "a33ac87ad7462b7e7029d12c385492b2a8311d1c", default-features = false }
-
+fc-consensus = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v1.7.2", default-features = false }
+fc-db = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v1.7.2", default-features = false }
+fc-mapping-sync = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v1.7.2", default-features = false }
+fc-rpc = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v1.7.2", default-features = false }
+fc-rpc-core = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v1.7.2", default-features = false }
+
+fp-consensus = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v1.7.2", default-features = false }
+fp-evm = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v1.7.2", default-features = false }
+fp-rpc = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v1.7.2", default-features = false }
+fp-self-contained = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v1.7.2", default-features = false }
+fp-storage = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v1.7.2", default-features = false }
+
+pallet-ethereum = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v1.7.2", default-features = false }
+pallet-evm = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v1.7.2", default-features = false }
+pallet-evm-chain-id = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v1.7.2", default-features = false }
+pallet-evm-precompile-dispatch = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v1.7.2", default-features = false }
+pallet-evm-precompile-simple = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v1.7.2", default-features = false }
+pallet-evm-precompile-modexp = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v1.7.2", default-features = false }
+pallet-evm-precompile-bn128 = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v1.7.2", default-features = false }
+pallet-evm-precompile-blake2 = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v1.7.2", default-features = false }
+evm = { git = "https://github.com/moonbeam-foundation/evm", branch = "moonbeam-polkadot-v1.7.2", default-features = false }
 
 # EVM from acala
 module-evm-utility-macro = { path = "runtime/hydradx/src/evm/evm-utility/macro", default-features = false}
 
 # Polkadot dependencies
-pallet-xcm = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-polkadot-cli = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901" }
-polkadot-core-primitives = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-polkadot-parachain = { package = "polkadot-parachain-primitives", git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false, features =  [
+pallet-xcm = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+polkadot-cli = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+polkadot-core-primitives = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+polkadot-parachain = { package = "polkadot-parachain-primitives", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false, features =  [
   "wasm-api",
 ]}
-polkadot-primitives = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-polkadot-runtime = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-polkadot-service = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-polkadot-xcm = { package = "staging-xcm", git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-xcm = { package = "staging-xcm", git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-xcm-builder = { package = "staging-xcm-builder", git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-xcm-executor = { package = "staging-xcm-executor", git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901", default-features = false }
-
-kusama-runtime = { package = "staging-kusama-runtime", git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901" }
-polkadot-client = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901" }
-polkadot-node-core-pvf = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901" }
-polkadot-node-network-protocol = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901" }
-polkadot-node-primitives = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901" }
-polkadot-node-subsystem = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901" }
-polkadot-node-subsystem-util = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901" }
-polkadot-overseer = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901" }
-polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901" }
-polkadot-statement-table = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901" }
-rococo-runtime = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901" }
-westend-runtime = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901" }
-
-cumulus-client-pov-recovery = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901" }
-cumulus-pallet-parachain-system-proc-macro = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901" }
-cumulus-relay-chain-rpc-interface = { git = "https://github.com/paritytech/polkadot-sdk", rev = "c8d2251cafadc108ba2f1f8a3208dc547ff38901" }
-
-[patch."https://github.com/paritytech/polkadot-sdk"]
-frame-benchmarking = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-frame-benchmarking-cli = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-frame-executive = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-frame-remote-externalities = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-frame-support = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-frame-system = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-frame-system-benchmarking = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-frame-system-rpc-runtime-api = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-frame-try-runtime = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sp-api = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sp-arithmetic = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sp-authority-discovery = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sp-block-builder = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sp-blockchain = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sp-consensus = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sp-consensus-aura = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sp-consensus-babe = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sp-core = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sp-externalities = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sp-inherents = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sp-io = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sp-keystore = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sp-npos-elections = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sp-offchain = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sc-offchain = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sp-rpc = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sp-runtime = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sp-runtime-interface = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sp-runtime-interface-proc-macro = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sp-wasm-interface = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sp-session = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sp-staking = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sp-std = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sp-storage = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sp-timestamp = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sp-tracing = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sp-transaction-pool = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sp-trie = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sp-version = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sc-basic-authorship = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sc-chain-spec = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sc-cli = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sc-client-api = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sc-client-db = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sc-consensus = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sc-consensus-aura = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sc-consensus-grandpa = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sc-executor = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sc-keystore = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sc-network = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sc-network-sync = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sc-network-common = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sc-rpc = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sc-rpc-api = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sc-service = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sc-telemetry = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sc-tracing = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sc-transaction-pool = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sc-transaction-pool-api = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sc-sysinfo = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-
-# Substrate Pallets
-pallet-aura = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-pallet-authorship = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-pallet-bags-list = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-pallet-balances = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-pallet-collective = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-pallet-elections-phragmen = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-pallet-identity = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-pallet-multisig = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-pallet-preimage = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-pallet-proxy = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-pallet-scheduler = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-pallet-session = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-pallet-state-trie-migration = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-substrate-state-trie-migration-rpc = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-pallet-sudo = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-pallet-timestamp = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-pallet-tips = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-pallet-transaction-payment = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-pallet-transaction-payment-rpc = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-pallet-treasury = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-pallet-uniques = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-pallet-utility = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-pallet-im-online = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-
-substrate-build-script-utils = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-substrate-frame-rpc-system = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-substrate-prometheus-endpoint = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-substrate-rpc-client = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-substrate-wasm-builder = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-
-# Cumulus dependencies
-cumulus-client-cli = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-cumulus-client-collator = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-cumulus-client-consensus-aura = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-cumulus-client-consensus-common = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-cumulus-client-consensus-proposer = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-cumulus-client-network = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-cumulus-client-service = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-cumulus-pallet-aura-ext = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-cumulus-pallet-dmp-queue = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-cumulus-pallet-parachain-system = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-cumulus-pallet-xcm = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-cumulus-pallet-xcmp-queue = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-cumulus-primitives-core = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-cumulus-primitives-parachain-inherent = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-cumulus-primitives-timestamp = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-cumulus-primitives-utility = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-cumulus-relay-chain-inprocess-interface = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-cumulus-relay-chain-interface = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-cumulus-relay-chain-minimal-node = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-cumulus-test-relay-sproof-builder = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-pallet-collator-selection = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-parachain-info = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-xcm-emulator = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-
-# Polkadot dependencies
-pallet-xcm = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-polkadot-cli = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-polkadot-core-primitives = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-polkadot-parachain = { package = "polkadot-parachain-primitives", git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3"}
-polkadot-primitives = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-polkadot-runtime = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-polkadot-runtime-parachains = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-polkadot-service = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-xcm = { package = "staging-xcm", git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-xcm-builder = { package = "staging-xcm-builder", git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-xcm-executor = { package = "staging-xcm-executor", git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3"  }
-
-kusama-runtime = { package = "staging-kusama-runtime", git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-polkadot-node-core-pvf = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-polkadot-node-network-protocol = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-polkadot-node-primitives = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-polkadot-node-subsystem = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-polkadot-node-subsystem-util = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-polkadot-overseer = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-polkadot-runtime-common = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-polkadot-statement-table = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-rococo-runtime = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-westend-runtime = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-
-cumulus-client-pov-recovery = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-cumulus-pallet-parachain-system-proc-macro = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-cumulus-relay-chain-rpc-interface = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
+polkadot-primitives = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+polkadot-service = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+polkadot-xcm = { package = "staging-xcm", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+xcm = { package = "staging-xcm", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+xcm-builder = { package = "staging-xcm-builder", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+xcm-executor = { package = "staging-xcm-executor", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2", default-features = false }
+
+polkadot-client = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+polkadot-node-core-pvf = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+polkadot-node-network-protocol = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+polkadot-node-primitives = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+polkadot-node-subsystem = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+polkadot-node-subsystem-util = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+polkadot-overseer = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" , default-features = false}
+polkadot-statement-table = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+rococo-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+westend-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+
+cumulus-client-pov-recovery = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+cumulus-pallet-parachain-system-proc-macro = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+cumulus-relay-chain-rpc-interface = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+
+
+[patch."https://github.com/moonbeam-foundation/open-runtime-module-library"]
+# ORML dependencies
+orml-benchmarking = { git = "https://github.com/galacticcouncil/open-runtime-module-library", branch = "polkadot-v1.7.2"}
+orml-tokens = { git = "https://github.com/galacticcouncil/open-runtime-module-library", branch = "polkadot-v1.7.2"}
+orml-traits = { git = "https://github.com/galacticcouncil/open-runtime-module-library", branch = "polkadot-v1.7.2"}
+orml-utilities = { git = "https://github.com/galacticcouncil/open-runtime-module-library", branch = "polkadot-v1.7.2"}
+orml-vesting = { git = "https://github.com/galacticcouncil/open-runtime-module-library", branch = "polkadot-v1.7.2"}
+orml-unknown-tokens = { git = "https://github.com/galacticcouncil/open-runtime-module-library", branch = "polkadot-v1.7.2"}
+orml-xcm = { git = "https://github.com/galacticcouncil/open-runtime-module-library", branch = "polkadot-v1.7.2"}
+orml-xcm-support = { git = "https://github.com/galacticcouncil/open-runtime-module-library", branch = "polkadot-v1.7.2"}
+orml-xtokens = { git = "https://github.com/galacticcouncil/open-runtime-module-library", branch = "polkadot-v1.7.2"}
 
 [patch."https://github.com/moonbeam-foundation/polkadot-sdk"]
-frame-benchmarking = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-frame-benchmarking-cli = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-frame-executive = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-frame-remote-externalities = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-frame-support = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-frame-system = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-frame-system-benchmarking = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-frame-system-rpc-runtime-api = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-frame-try-runtime = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sp-api = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sp-arithmetic = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sp-authority-discovery = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sp-block-builder = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sp-blockchain = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sp-consensus = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sp-consensus-aura = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sp-consensus-babe = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sp-core = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sp-externalities = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sp-inherents = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sp-io = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sp-keystore = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sp-npos-elections = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sp-offchain = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sc-offchain = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sp-rpc = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sp-runtime = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sp-runtime-interface = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sp-runtime-interface-proc-macro = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sp-wasm-interface = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sp-panic-handler = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sp-database = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sp-session = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sp-staking = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sp-std = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sp-storage = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sp-timestamp = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sp-tracing = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sp-transaction-pool = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sp-trie = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sp-version = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sc-basic-authorship = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sc-chain-spec = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sc-cli = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sc-client-api = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sc-client-db = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sc-consensus = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sc-consensus-aura = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sc-consensus-grandpa = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sc-executor = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sc-keystore = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sc-network = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sc-network-sync = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sc-network-common = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sc-rpc = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sc-rpc-api = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sc-service = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sc-telemetry = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sc-tracing = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sc-transaction-pool = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sc-transaction-pool-api = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sc-sysinfo = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sc-utils = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-sp-state-machine = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
+frame-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+frame-benchmarking-cli = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+frame-executive = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+frame-remote-externalities = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+frame-support = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+frame-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+frame-system-benchmarking = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+frame-system-rpc-runtime-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+frame-try-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sp-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sp-arithmetic = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sp-authority-discovery = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sp-block-builder = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sp-genesis-builder = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sp-blockchain = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sp-consensus = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sp-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sp-consensus-babe = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sp-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sp-externalities = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sp-inherents = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sp-io = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sp-keystore = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sp-npos-elections = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sp-offchain = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sc-offchain = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sp-rpc = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sp-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sp-runtime-interface = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sp-runtime-interface-proc-macro = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sp-wasm-interface = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sp-panic-handler = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sp-database = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sp-session = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sp-staking = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sp-std = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sp-storage = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sp-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sp-tracing = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sp-transaction-pool = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sp-trie = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sp-version = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sc-basic-authorship = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sc-chain-spec = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sc-cli = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sc-client-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sc-client-db = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sc-consensus = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sc-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sc-consensus-grandpa = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sc-executor = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sc-keystore = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sc-network = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sc-network-sync = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sc-network-common = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sc-rpc = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sc-rpc-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sc-service = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sc-telemetry = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sc-tracing = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sc-transaction-pool = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sc-transaction-pool-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sc-sysinfo = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sc-utils = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sp-state-machine = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+sp-weights = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2"}
+sp-crypto-hashing= {  git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2"}
+sp-core-hashing = {   git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2"}
 
 # Substrate Pallets
-pallet-aura = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-pallet-authorship = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-pallet-balances = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-pallet-collective = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-pallet-elections-phragmen = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-pallet-identity = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-pallet-multisig = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-pallet-preimage = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-pallet-proxy = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-pallet-scheduler = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-pallet-session = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-pallet-sudo = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-pallet-timestamp = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-pallet-tips = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-pallet-transaction-payment = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-pallet-transaction-payment-rpc = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-pallet-treasury = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-pallet-uniques = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-pallet-utility = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-pallet-im-online = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-
-substrate-build-script-utils = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-substrate-frame-rpc-system = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-substrate-prometheus-endpoint = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-substrate-rpc-client = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-substrate-wasm-builder = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
+pallet-aura = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+pallet-authorship = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+pallet-balances = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+pallet-collective = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+pallet-elections-phragmen = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+pallet-identity = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+pallet-multisig = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+pallet-preimage = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+pallet-proxy = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+pallet-scheduler = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+pallet-session = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+pallet-sudo = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+pallet-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+pallet-tips = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+pallet-transaction-payment = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+pallet-transaction-payment-rpc = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+pallet-treasury = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+pallet-uniques = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+pallet-utility = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+pallet-im-online = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+pallet-message-queue = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2"}
+pallet-state-trie-migration = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2"}
+
+substrate-build-script-utils = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+substrate-frame-rpc-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+substrate-prometheus-endpoint = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+substrate-rpc-client = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+substrate-wasm-builder = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+substrate-state-trie-migration-rpc = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
 
 # Cumulus dependencies
-cumulus-client-cli = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-cumulus-client-collator = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-cumulus-client-consensus-aura = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-cumulus-client-consensus-common = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-cumulus-client-consensus-proposer = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-cumulus-client-network = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-cumulus-client-service = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-cumulus-pallet-aura-ext = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-cumulus-pallet-dmp-queue = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-cumulus-pallet-parachain-system = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-cumulus-pallet-xcm = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-cumulus-pallet-xcmp-queue = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-cumulus-primitives-core = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-cumulus-primitives-parachain-inherent = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-cumulus-primitives-timestamp = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-cumulus-primitives-utility = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-cumulus-relay-chain-inprocess-interface = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-cumulus-relay-chain-interface = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-cumulus-relay-chain-minimal-node = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-cumulus-test-relay-sproof-builder = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-pallet-collator-selection = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-parachain-info = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-xcm-emulator = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
+cumulus-client-cli = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+cumulus-client-collator = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+cumulus-client-consensus-aura = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+cumulus-client-consensus-common = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+cumulus-client-consensus-proposer = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+cumulus-client-network = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+cumulus-client-service = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+cumulus-pallet-aura-ext = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+cumulus-pallet-parachain-system = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+cumulus-pallet-xcm = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+cumulus-pallet-xcmp-queue = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+cumulus-primitives-core = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+cumulus-primitives-parachain-inherent = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+cumulus-primitives-timestamp = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+cumulus-primitives-utility = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+cumulus-relay-chain-inprocess-interface = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+cumulus-relay-chain-interface = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+cumulus-relay-chain-minimal-node = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+cumulus-test-relay-sproof-builder = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+pallet-collator-selection = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+staging-parachain-info = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+xcm-emulator = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+parachains-common = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2"}
 
 # Polkadot dependencies
-pallet-xcm = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-polkadot-cli = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-polkadot-core-primitives = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-polkadot-parachain = { package = "polkadot-parachain-primitives", git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3"}
-polkadot-primitives = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-polkadot-runtime = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-polkadot-runtime-parachains = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-polkadot-service = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-xcm = { package = "staging-xcm", git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-xcm-builder = { package = "staging-xcm-builder", git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-xcm-executor = { package = "staging-xcm-executor", git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3"  }
-
-kusama-runtime = { package = "staging-kusama-runtime", git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-polkadot-node-core-pvf = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-polkadot-node-network-protocol = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-polkadot-node-primitives = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-polkadot-node-subsystem = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-polkadot-node-subsystem-util = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-polkadot-overseer = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-polkadot-runtime-common = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-polkadot-statement-table = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-rococo-runtime = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-westend-runtime = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-
-cumulus-client-pov-recovery = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-cumulus-pallet-parachain-system-proc-macro = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
-cumulus-relay-chain-rpc-interface = { git = "https://github.com/galacticcouncil/polkadot-sdk", rev = "062d92eae0f3bb9908faf2d4e241eef17368b9d3" }
\ No newline at end of file
+pallet-xcm = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+polkadot-cli = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+polkadot-core-primitives = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+polkadot-parachain = { package = "polkadot-parachain-primitives", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2"}
+polkadot-primitives = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+polkadot-runtime-parachains = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+polkadot-service = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+xcm = { package = "staging-xcm", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+xcm-builder = { package = "staging-xcm-builder", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+xcm-executor = { package = "staging-xcm-executor", git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2"  }
+
+polkadot-node-core-pvf = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+polkadot-node-network-protocol = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+polkadot-node-primitives = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+polkadot-node-subsystem = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+polkadot-node-subsystem-util = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+polkadot-overseer = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+polkadot-runtime-common = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+polkadot-statement-table = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+rococo-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+westend-runtime = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+
+cumulus-client-pov-recovery = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+cumulus-pallet-parachain-system-proc-macro = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+cumulus-relay-chain-rpc-interface = { git = "https://github.com/paritytech/polkadot-sdk", branch = "release-polkadot-v1.7.2" }
diff --git a/integration-tests/Cargo.toml b/integration-tests/Cargo.toml
index a33f3996e..490fc62d0 100644
--- a/integration-tests/Cargo.toml
+++ b/integration-tests/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "runtime-integration-tests"
-version = "1.21.8"
+version = "1.22.4"
 description = "Integration tests"
 authors = ["GalacticCouncil"]
 edition = "2021"
@@ -75,12 +75,11 @@ cumulus-pallet-aura-ext = { workspace = true }
 cumulus-pallet-parachain-system = { workspace = true }
 cumulus-pallet-xcm = { workspace = true }
 cumulus-pallet-xcmp-queue = { workspace = true }
-cumulus-pallet-dmp-queue = { workspace = true }
 cumulus-primitives-core = { workspace = true }
 cumulus-primitives-utility = { workspace = true }
 cumulus-primitives-parachain-inherent = { workspace = true }
 cumulus-primitives-timestamp = { workspace = true }
-parachain-info = { workspace = true }
+staging-parachain-info = { workspace = true }
 cumulus-test-relay-sproof-builder = { workspace = true }
 
 # Polkadot dependencies
@@ -123,13 +122,14 @@ sp-staking = { workspace = true }
 sp-trie = { workspace = true }
 sp-io = { workspace = true }
 sp-consensus-babe = { workspace = true }
+sp-consensus-beefy = { workspace = true }
 sp-authority-discovery = { workspace = true }
 sc-consensus-grandpa = { workspace = true }
 
 polkadot-primitives = { workspace = true }
 polkadot-service = { workspace = true, features = ["full-node"] }
 polkadot-runtime-parachains = { workspace = true }
-polkadot-runtime = { workspace = true }
+rococo-runtime = { workspace = true }
 
 [dev-dependencies]
 pretty_assertions = "1.2.1"
@@ -162,7 +162,7 @@ std = [
     "xcm-builder/std",
     "xcm-executor/std",
     "pallet-xcm/std",
-    "parachain-info/std",
+    "staging-parachain-info/std",
     "pallet-asset-registry/std",
     "pallet-aura/std",
     "pallet-balances/std",
@@ -180,6 +180,7 @@ std = [
     "sp-block-builder/std",
     "sp-consensus-aura/std",
     "sp-consensus-babe/std",
+    "sp-consensus-beefy/std",
     "sp-core/std",
     "sp-io/std",
     "sp-inherents/std",
@@ -200,8 +201,8 @@ std = [
     "pallet-authorship/std",
     "hydradx-traits/std",
     "pallet-relaychain-info/std",
-    "polkadot-runtime/std",
     "hydradx-runtime/std",
+    "rococo-runtime/std",
     "pallet-staking/std",
     "scraper/std",
     "pallet-dynamic-evm-fee/std",
@@ -212,8 +213,7 @@ std = [
 # we don't include integration tests when benchmarking feature is enabled
 runtime-benchmarks = [
     "hydradx-runtime/runtime-benchmarks",
-    "polkadot-runtime/runtime-benchmarks",
+    "rococo-runtime/runtime-benchmarks",
 ]
 try-runtime = [
-    "polkadot-runtime/try-runtime",
 ]
diff --git a/integration-tests/src/call_filter.rs b/integration-tests/src/call_filter.rs
index 3563f15ea..419a6353d 100644
--- a/integration-tests/src/call_filter.rs
+++ b/integration-tests/src/call_filter.rs
@@ -7,7 +7,7 @@ use frame_support::{
 	traits::Contains,
 	weights::Weight,
 };
-use polkadot_xcm::latest::prelude::*;
+use polkadot_xcm::v3::prelude::*;
 use polkadot_xcm::VersionedXcm;
 use xcm_emulator::TestExt;
 
@@ -35,11 +35,11 @@ fn transfer_should_not_work_when_transfering_omnipool_assets_to_omnipool_account
 
 		// Balances::transfer
 		// transfer to Alice should not be filtered
-		let successful_call = hydradx_runtime::RuntimeCall::Balances(pallet_balances::Call::transfer {
+		let successful_call = hydradx_runtime::RuntimeCall::Balances(pallet_balances::Call::transfer_allow_death {
 			dest: ALICE.into(),
 			value: 10 * UNITS,
 		});
-		let filtered_call = hydradx_runtime::RuntimeCall::Balances(pallet_balances::Call::transfer {
+		let filtered_call = hydradx_runtime::RuntimeCall::Balances(pallet_balances::Call::transfer_allow_death {
 			dest: omnipool_account.clone(),
 			value: 10 * UNITS,
 		});
@@ -230,7 +230,7 @@ fn calling_pallet_xcm_send_extrinsic_should_not_be_filtered_by_call_filter() {
 	Hydra::execute_with(|| {
 		// the values here don't need to make sense, all we need is a valid Call
 		let call = hydradx_runtime::RuntimeCall::PolkadotXcm(pallet_xcm::Call::send {
-			dest: Box::new(MultiLocation::parent().into()),
+			dest: Box::new(MultiLocation::parent().into_versioned()),
 			message: Box::new(VersionedXcm::from(Xcm(vec![]))),
 		});
 
@@ -260,7 +260,7 @@ fn calling_orml_xcm_extrinsic_should_be_filtered_by_call_filter() {
 	Hydra::execute_with(|| {
 		// the values here don't need to make sense, all we need is a valid Call
 		let call = hydradx_runtime::RuntimeCall::OrmlXcm(orml_xcm::Call::send_as_sovereign {
-			dest: Box::new(MultiLocation::parent().into()),
+			dest: Box::new(MultiLocation::parent().into_versioned()),
 			message: Box::new(VersionedXcm::from(Xcm(vec![]))),
 		});
 
diff --git a/integration-tests/src/cross_chain_transfer.rs b/integration-tests/src/cross_chain_transfer.rs
index 8cebd24a6..6863567fd 100644
--- a/integration-tests/src/cross_chain_transfer.rs
+++ b/integration-tests/src/cross_chain_transfer.rs
@@ -1,43 +1,40 @@
 #![cfg(test)]
+use crate::polkadot_test_net::Rococo;
 use crate::polkadot_test_net::*;
 
 use frame_support::{assert_noop, assert_ok};
 
-use polkadot_xcm::{latest::prelude::*, v3::WeightLimit, VersionedMultiAssets, VersionedXcm};
+use polkadot_xcm::{v4::prelude::*, VersionedAssets, VersionedXcm};
 
 use cumulus_primitives_core::ParaId;
 use frame_support::dispatch::GetDispatchInfo;
 use frame_support::storage::with_transaction;
 use frame_support::traits::OnInitialize;
 use frame_support::weights::Weight;
-use hex_literal::hex;
 use hydradx_runtime::AssetRegistry;
-use hydradx_traits::registry::Mutate;
-use hydradx_traits::AssetKind;
-use hydradx_traits::Create;
+use hydradx_traits::{registry::Mutate, AssetKind, Create};
 use orml_traits::currency::MultiCurrency;
+use polkadot_xcm::opaque::v3::{
+	Junction,
+	Junctions::{X1, X2},
+	MultiLocation, NetworkId,
+};
 use pretty_assertions::assert_eq;
 use primitives::AccountId;
-use sp_core::Decode;
-use sp_core::H256;
-use sp_runtime::traits::ConstU32;
-use sp_runtime::traits::{AccountIdConversion, BlakeTwo256, Hash};
-use sp_runtime::DispatchResult;
-use sp_runtime::FixedU128;
-use sp_runtime::TransactionOutcome;
+use sp_core::{Decode, H256};
+use sp_runtime::traits::{AccountIdConversion, BlakeTwo256, ConstU32, Hash};
+use sp_runtime::{DispatchResult, FixedU128, TransactionOutcome};
+use sp_std::sync::Arc;
 use xcm_emulator::TestExt;
 
 // Determine the hash for assets expected to be have been trapped.
-fn determine_hash<M>(origin: &MultiLocation, assets: M) -> H256
-where
-	M: Into<MultiAssets>,
-{
-	let versioned = VersionedMultiAssets::from(assets.into());
+fn determine_hash(origin: &MultiLocation, assets: Vec<Asset>) -> H256 {
+	let versioned = VersionedAssets::from(Assets::from(assets));
 	BlakeTwo256::hash_of(&(origin, &versioned))
 }
 
 #[test]
-fn hydra_should_receive_asset_when_transferred_from_polkadot_relay_chain() {
+fn hydra_should_receive_asset_when_transferred_from_rococo_relay_chain() {
 	//Arrange
 	Hydra::execute_with(|| {
 		assert_ok!(hydradx_runtime::AssetRegistry::set_location(
@@ -46,19 +43,19 @@ fn hydra_should_receive_asset_when_transferred_from_polkadot_relay_chain() {
 		));
 	});
 
-	PolkadotRelay::execute_with(|| {
+	Rococo::execute_with(|| {
 		//Act
-		assert_ok!(polkadot_runtime::XcmPallet::reserve_transfer_assets(
-			polkadot_runtime::RuntimeOrigin::signed(ALICE.into()),
+		assert_ok!(rococo_runtime::XcmPallet::reserve_transfer_assets(
+			rococo_runtime::RuntimeOrigin::signed(ALICE.into()),
 			Box::new(Parachain(HYDRA_PARA_ID).into_versioned()),
-			Box::new(Junction::AccountId32 { id: BOB, network: None }.into()),
+			Box::new(Junction::AccountId32 { id: BOB, network: None }.into_versioned()),
 			Box::new((Here, 300 * UNITS).into()),
 			0,
 		));
 
 		//Assert
 		assert_eq!(
-			polkadot_runtime::Balances::free_balance(AccountIdConversion::<AccountId>::into_account_truncating(
+			rococo_runtime::Balances::free_balance(AccountIdConversion::<AccountId>::into_account_truncating(
 				&ParaId::from(HYDRA_PARA_ID)
 			)),
 			310 * UNITS
@@ -77,9 +74,9 @@ fn hydra_should_receive_asset_when_transferred_from_polkadot_relay_chain() {
 }
 
 #[test]
-fn polkadot_should_receive_asset_when_sent_from_hydra() {
+fn rococo_should_receive_asset_when_sent_from_hydra() {
 	//Arrange
-	PolkadotRelay::execute_with(|| {
+	Rococo::execute_with(|| {
 		assert_eq!(hydradx_runtime::Balances::free_balance(AccountId::from(BOB)), 0);
 	});
 
@@ -94,7 +91,7 @@ fn polkadot_should_receive_asset_when_sent_from_hydra() {
 			hydradx_runtime::RuntimeOrigin::signed(ALICE.into()),
 			1,
 			3 * UNITS,
-			Box::new(MultiLocation::new(1, X1(Junction::AccountId32 { id: BOB, network: None })).into()),
+			Box::new(MultiLocation::new(1, X1(Junction::AccountId32 { id: BOB, network: None })).into_versioned()),
 			WeightLimit::Unlimited,
 		));
 
@@ -105,10 +102,10 @@ fn polkadot_should_receive_asset_when_sent_from_hydra() {
 		);
 	});
 
-	PolkadotRelay::execute_with(|| {
+	Rococo::execute_with(|| {
 		assert_eq!(
 			hydradx_runtime::Balances::free_balance(AccountId::from(BOB)),
-			2999978937205 // 3 * HDX - fee
+			2_999_989_698_923 // 3 * HDX - fee
 		);
 	});
 }
@@ -121,7 +118,10 @@ fn hydra_should_receive_asset_when_transferred_from_acala() {
 	Hydra::execute_with(|| {
 		assert_ok!(hydradx_runtime::AssetRegistry::set_location(
 			ACA,
-			hydradx_runtime::AssetLocation(MultiLocation::new(1, X2(Parachain(ACALA_PARA_ID), GeneralIndex(0))))
+			hydradx_runtime::AssetLocation(MultiLocation::new(
+				1,
+				X2(Junction::Parachain(ACALA_PARA_ID), Junction::GeneralIndex(0))
+			))
 		));
 	});
 
@@ -139,7 +139,7 @@ fn hydra_should_receive_asset_when_transferred_from_acala() {
 						Junction::AccountId32 { id: BOB, network: None }
 					)
 				)
-				.into()
+				.into_versioned()
 			),
 			WeightLimit::Limited(Weight::from_parts(399_600_000_000, 0))
 		));
@@ -153,7 +153,7 @@ fn hydra_should_receive_asset_when_transferred_from_acala() {
 
 	Hydra::execute_with(|| {
 		let fee = hydradx_runtime::Tokens::free_balance(ACA, &hydradx_runtime::Treasury::account_id());
-		assert!(fee > 0, "Fees is not sent to treasury");
+		assert!(fee > 0, "Fee is not sent to treasury");
 		assert_eq!(
 			hydradx_runtime::Tokens::free_balance(ACA, &AccountId::from(BOB)),
 			30 * UNITS - fee
@@ -169,7 +169,10 @@ fn hydra_should_receive_asset_when_transferred_from_acala_to_eth_address() {
 	Hydra::execute_with(|| {
 		assert_ok!(hydradx_runtime::AssetRegistry::set_location(
 			ACA,
-			hydradx_runtime::AssetLocation(MultiLocation::new(1, X2(Parachain(ACALA_PARA_ID), GeneralIndex(0))))
+			hydradx_runtime::AssetLocation(MultiLocation::new(
+				1,
+				X2(Junction::Parachain(ACALA_PARA_ID), Junction::GeneralIndex(0))
+			))
 		));
 	});
 
@@ -191,7 +194,7 @@ fn hydra_should_receive_asset_when_transferred_from_acala_to_eth_address() {
 						}
 					)
 				)
-				.into()
+				.into_versioned()
 			),
 			WeightLimit::Limited(Weight::from_parts(399_600_000_000, 0))
 		));
@@ -220,7 +223,10 @@ fn hydra_should_receive_asset_when_transferred_from_acala_to_same_address_repres
 	Hydra::execute_with(|| {
 		assert_ok!(hydradx_runtime::AssetRegistry::set_location(
 			ACA,
-			hydradx_runtime::AssetLocation(MultiLocation::new(1, X2(Parachain(ACALA_PARA_ID), GeneralIndex(0))))
+			hydradx_runtime::AssetLocation(MultiLocation::new(
+				1,
+				X2(Junction::Parachain(ACALA_PARA_ID), Junction::GeneralIndex(0))
+			))
 		));
 	});
 
@@ -242,7 +248,7 @@ fn hydra_should_receive_asset_when_transferred_from_acala_to_same_address_repres
 						}
 					)
 				)
-				.into()
+				.into_versioned()
 			),
 			WeightLimit::Limited(Weight::from_parts(399_600_000_000, 0))
 		));
@@ -263,7 +269,7 @@ fn hydra_should_receive_asset_when_transferred_from_acala_to_same_address_repres
 						}
 					)
 				)
-				.into()
+				.into_versioned()
 			),
 			WeightLimit::Limited(Weight::from_parts(399_600_000_000, 0))
 		));
@@ -292,7 +298,10 @@ fn transfer_from_acala_should_fail_when_transferring_insufficient_amount() {
 	Hydra::execute_with(|| {
 		assert_ok!(hydradx_runtime::AssetRegistry::set_location(
 			1,
-			hydradx_runtime::AssetLocation(MultiLocation::new(1, X2(Parachain(ACALA_PARA_ID), GeneralIndex(0))))
+			hydradx_runtime::AssetLocation(MultiLocation::new(
+				1,
+				X2(Junction::Parachain(ACALA_PARA_ID), Junction::GeneralIndex(0))
+			))
 		));
 	});
 
@@ -310,7 +319,7 @@ fn transfer_from_acala_should_fail_when_transferring_insufficient_amount() {
 							Junction::AccountId32 { id: BOB, network: None }
 						)
 					)
-					.into()
+					.into_versioned()
 				),
 				WeightLimit::Limited(Weight::from_parts(399_600_000_000, 0))
 			),
@@ -342,7 +351,10 @@ fn hydra_treasury_should_receive_asset_when_transferred_to_protocol_account() {
 
 		assert_ok!(hydradx_runtime::AssetRegistry::set_location(
 			DAI, // we pretend that the incoming tokens are DAI
-			hydradx_runtime::AssetLocation(MultiLocation::new(1, X2(Parachain(ACALA_PARA_ID), GeneralIndex(0))))
+			hydradx_runtime::AssetLocation(MultiLocation::new(
+				1,
+				X2(Junction::Parachain(ACALA_PARA_ID), Junction::GeneralIndex(0))
+			))
 		));
 
 		assert_eq!(
@@ -368,7 +380,7 @@ fn hydra_treasury_should_receive_asset_when_transferred_to_protocol_account() {
 						}
 					)
 				)
-				.into()
+				.into_versioned()
 			),
 			WeightLimit::Limited(Weight::from_parts(399_600_000_000, 0))
 		));
@@ -409,7 +421,7 @@ fn assets_should_be_trapped_when_assets_are_unknown() {
 						Junction::AccountId32 { id: BOB, network: None }
 					)
 				)
-				.into()
+				.into_versioned()
 			),
 			WeightLimit::Limited(Weight::from_parts(399_600_000_000, 0))
 		));
@@ -420,25 +432,29 @@ fn assets_should_be_trapped_when_assets_are_unknown() {
 	});
 
 	Hydra::execute_with(|| {
-		expect_hydra_events(vec![
-			cumulus_pallet_xcmp_queue::Event::Fail {
-				message_hash: hex!["30291d1dfb68ae6f66d4c841facb78f44e7611ab2a25c84f4fb7347f448d2944"],
-				message_id: hex!["30291d1dfb68ae6f66d4c841facb78f44e7611ab2a25c84f4fb7347f448d2944"],
-				error: XcmError::AssetNotFound,
-				weight: Weight::from_parts(300_000_000, 0),
-			}
-			.into(),
-			pallet_relaychain_info::Event::CurrentBlockNumbers {
-				parachain_block_number: 3,
-				relaychain_block_number: 8,
-			}
-			.into(),
-		]);
-		let origin = MultiLocation::new(1, X1(Parachain(ACALA_PARA_ID)));
-		let loc = MultiLocation::new(1, X2(Parachain(ACALA_PARA_ID), GeneralIndex(0)));
-		let asset: MultiAsset = (loc, 30 * UNITS).into();
-		let hash = determine_hash(&origin, vec![asset]);
+		assert_xcm_message_processing_failed();
+		let origin = MultiLocation::new(1, X1(Junction::Parachain(ACALA_PARA_ID)));
+		let asset: Asset = Asset {
+			id: cumulus_primitives_core::AssetId(Location::new(
+				1,
+				cumulus_primitives_core::Junctions::X2(Arc::new([
+					cumulus_primitives_core::Junction::Parachain(ACALA_PARA_ID),
+					cumulus_primitives_core::Junction::GeneralIndex(0),
+				])),
+			)),
+			fun: Fungible(30 * UNITS),
+		};
+		let hash = determine_hash(&origin, vec![asset.clone()]);
+
 		assert_eq!(hydradx_runtime::PolkadotXcm::asset_trap(hash), 1);
+
+		expect_hydra_events(vec![hydradx_runtime::RuntimeEvent::PolkadotXcm(
+			pallet_xcm::Event::AssetsTrapped {
+				hash,
+				origin: origin.try_into().unwrap(),
+				assets: vec![asset].into(),
+			},
+		)]);
 	});
 }
 
@@ -453,11 +469,22 @@ fn claim_trapped_asset_should_work() {
 	Hydra::execute_with(|| {
 		assert_ok!(hydradx_runtime::AssetRegistry::set_location(
 			1,
-			hydradx_runtime::AssetLocation(MultiLocation::new(1, X2(Parachain(ACALA_PARA_ID), GeneralIndex(0))))
+			hydradx_runtime::AssetLocation(MultiLocation::new(
+				1,
+				X2(Junction::Parachain(ACALA_PARA_ID), Junction::GeneralIndex(0))
+			))
 		));
 	});
 
-	claim_asset(asset.clone(), BOB);
+	let bob_loc = Location::new(
+		0,
+		cumulus_primitives_core::Junctions::X1(Arc::new([cumulus_primitives_core::Junction::AccountId32 {
+			id: BOB,
+			network: None,
+		}])),
+	);
+
+	claim_asset(asset.clone(), bob_loc);
 
 	Hydra::execute_with(|| {
 		assert_eq!(
@@ -465,7 +492,7 @@ fn claim_trapped_asset_should_work() {
 			1_029_939_717_395_149 //1000 * UNITS + 30 * UNITS - fee
 		);
 
-		let origin = MultiLocation::new(1, X1(Parachain(ACALA_PARA_ID)));
+		let origin = MultiLocation::new(1, X1(Junction::Parachain(ACALA_PARA_ID)));
 		let hash = determine_hash(&origin, vec![asset]);
 		assert_eq!(hydradx_runtime::PolkadotXcm::asset_trap(hash), 0);
 	});
@@ -498,15 +525,23 @@ fn transfer_foreign_asset_from_asset_hub_to_hydra_should_work() {
 			3000 * UNITS
 		));
 
-		let foreign_asset = MultiAsset::from((
-			MultiLocation {
-				parents: 2,
-				interior: Junctions::X1(GlobalConsensus(NetworkId::BitcoinCash)),
-			},
-			100 * UNITS,
-		));
+		let foreign_asset: Asset = Asset {
+			id: cumulus_primitives_core::AssetId(Location::new(
+				2,
+				cumulus_primitives_core::Junctions::X1(Arc::new([cumulus_primitives_core::Junction::GlobalConsensus(
+					cumulus_primitives_core::NetworkId::BitcoinCash,
+				)])),
+			)),
+			fun: Fungible(100 * UNITS),
+		};
 
-		let bob_beneficiary: MultiLocation = Junction::AccountId32 { id: BOB, network: None }.into();
+		let bob_beneficiary = Location::new(
+			0,
+			cumulus_primitives_core::Junctions::X1(Arc::new([cumulus_primitives_core::Junction::AccountId32 {
+				id: BOB,
+				network: None,
+			}])),
+		);
 
 		let xcm =
 			xcm_for_deposit_reserve_asset_to_hydra::<hydradx_runtime::RuntimeCall>(foreign_asset, bob_beneficiary);
@@ -529,12 +564,8 @@ fn transfer_foreign_asset_from_asset_hub_to_hydra_should_work() {
 
 	//Assert
 	Hydra::execute_with(|| {
-		assert!(matches!(
-			last_hydra_events(2).first(),
-			Some(hydradx_runtime::RuntimeEvent::XcmpQueue(
-				cumulus_pallet_xcmp_queue::Event::Success { .. }
-			))
-		));
+		assert_xcm_message_processing_passed();
+
 		let fee = hydradx_runtime::Tokens::free_balance(FOREIGN_ASSET, &hydradx_runtime::Treasury::account_id());
 		assert!(fee > 0, "treasury should have received fees");
 
@@ -573,15 +604,23 @@ fn transfer_foreign_asset_from_acala_to_hydra_should_not_work() {
 			3000 * UNITS
 		));
 
-		let foreign_asset = MultiAsset::from((
-			MultiLocation {
-				parents: 2,
-				interior: Junctions::X1(GlobalConsensus(NetworkId::BitcoinCash)),
-			},
-			100 * UNITS,
-		));
+		let foreign_asset: Asset = Asset {
+			id: cumulus_primitives_core::AssetId(Location::new(
+				2,
+				cumulus_primitives_core::Junctions::X1(Arc::new([cumulus_primitives_core::Junction::GlobalConsensus(
+					cumulus_primitives_core::NetworkId::BitcoinCash,
+				)])),
+			)),
+			fun: Fungible(100 * UNITS),
+		};
 
-		let bob_beneficiary: MultiLocation = Junction::AccountId32 { id: BOB, network: None }.into();
+		let bob_beneficiary = Location::new(
+			0,
+			cumulus_primitives_core::Junctions::X1(Arc::new([cumulus_primitives_core::Junction::AccountId32 {
+				id: BOB,
+				network: None,
+			}])),
+		);
 
 		let xcm =
 			xcm_for_deposit_reserve_asset_to_hydra::<hydradx_runtime::RuntimeCall>(foreign_asset, bob_beneficiary);
@@ -604,12 +643,7 @@ fn transfer_foreign_asset_from_acala_to_hydra_should_not_work() {
 
 	//Assert
 	Hydra::execute_with(|| {
-		assert!(matches!(
-			last_hydra_events(2).first(),
-			Some(hydradx_runtime::RuntimeEvent::XcmpQueue(
-				cumulus_pallet_xcmp_queue::Event::Fail { .. }
-			))
-		));
+		assert_xcm_message_processing_failed();
 	});
 }
 
@@ -623,7 +657,7 @@ fn transfer_dot_reserve_from_asset_hub_to_hydra_should_not_work() {
 			register_foreign_asset();
 			assert_ok!(hydradx_runtime::AssetRegistry::set_location(
 				DOT,
-				hydradx_runtime::AssetLocation(MultiLocation::new(1, Here))
+				hydradx_runtime::AssetLocation(MultiLocation::new(1, polkadot_xcm::opaque::v3::Junctions::Here))
 			));
 
 			add_currency_price(FOREIGN_ASSET, FixedU128::from(1));
@@ -652,15 +686,18 @@ fn transfer_dot_reserve_from_asset_hub_to_hydra_should_not_work() {
 			3000 * UNITS
 		));
 
-		let dot = MultiAsset::from((
-			MultiLocation {
-				parents: 1,
-				interior: Junctions::Here,
-			},
-			100 * UNITS,
-		));
+		let dot: Asset = Asset {
+			id: cumulus_primitives_core::AssetId(Location::new(1, cumulus_primitives_core::Junctions::Here)),
+			fun: Fungible(100 * UNITS),
+		};
 
-		let bob_beneficiary: MultiLocation = Junction::AccountId32 { id: BOB, network: None }.into();
+		let bob_beneficiary = Location::new(
+			0,
+			cumulus_primitives_core::Junctions::X1(Arc::new([cumulus_primitives_core::Junction::AccountId32 {
+				id: BOB,
+				network: None,
+			}])),
+		);
 
 		let xcm = xcm_for_deposit_reserve_asset_to_hydra::<hydradx_runtime::RuntimeCall>(dot, bob_beneficiary);
 
@@ -682,12 +719,7 @@ fn transfer_dot_reserve_from_asset_hub_to_hydra_should_not_work() {
 
 	//Assert
 	Hydra::execute_with(|| {
-		assert!(matches!(
-			last_hydra_events(2).first(),
-			Some(hydradx_runtime::RuntimeEvent::XcmpQueue(
-				cumulus_pallet_xcmp_queue::Event::Fail { .. }
-			))
-		));
+		assert_xcm_message_processing_failed();
 	});
 }
 
@@ -701,7 +733,7 @@ fn transfer_dot_reserve_from_non_asset_hub_chain_to_hydra_should_not_work() {
 			register_foreign_asset();
 			assert_ok!(hydradx_runtime::AssetRegistry::set_location(
 				DOT,
-				hydradx_runtime::AssetLocation(MultiLocation::new(1, Here))
+				hydradx_runtime::AssetLocation(MultiLocation::new(1, polkadot_xcm::opaque::v3::Junctions::Here))
 			));
 
 			add_currency_price(FOREIGN_ASSET, FixedU128::from(1));
@@ -730,15 +762,18 @@ fn transfer_dot_reserve_from_non_asset_hub_chain_to_hydra_should_not_work() {
 			3000 * UNITS
 		));
 
-		let dot = MultiAsset::from((
-			MultiLocation {
-				parents: 1,
-				interior: Junctions::Here,
-			},
-			100 * UNITS,
-		));
+		let dot: Asset = Asset {
+			id: cumulus_primitives_core::AssetId(Location::new(1, cumulus_primitives_core::Junctions::Here)),
+			fun: Fungible(100 * UNITS),
+		};
 
-		let bob_beneficiary: MultiLocation = Junction::AccountId32 { id: BOB, network: None }.into();
+		let bob_beneficiary = Location::new(
+			0,
+			cumulus_primitives_core::Junctions::X1(Arc::new([cumulus_primitives_core::Junction::AccountId32 {
+				id: BOB,
+				network: None,
+			}])),
+		);
 
 		let xcm = xcm_for_deposit_reserve_asset_to_hydra::<hydradx_runtime::RuntimeCall>(dot, bob_beneficiary);
 
@@ -760,30 +795,31 @@ fn transfer_dot_reserve_from_non_asset_hub_chain_to_hydra_should_not_work() {
 
 	//Assert
 	Hydra::execute_with(|| {
-		assert!(matches!(
-			last_hydra_events(2).first(),
-			Some(hydradx_runtime::RuntimeEvent::XcmpQueue(
-				cumulus_pallet_xcmp_queue::Event::Fail { .. }
-			))
-		));
+		assert_xcm_message_processing_failed();
 	});
 }
 
 fn xcm_for_deposit_reserve_asset_to_hydra<RC: Decode + GetDispatchInfo>(
-	assets: MultiAsset,
-	beneficiary: MultiLocation,
+	assets: Asset,
+	beneficiary: Location,
 ) -> VersionedXcm<RC> {
-	use polkadot_runtime::xcm_config::BaseXcmWeight;
+	use rococo_runtime::xcm_config::BaseXcmWeight;
 	use xcm_builder::FixedWeightBounds;
 	use xcm_executor::traits::WeightBounds;
 
 	type Weigher<RC> = FixedWeightBounds<BaseXcmWeight, RC, ConstU32<100>>;
 
-	let dest = MultiLocation::new(1, Parachain(HYDRA_PARA_ID));
+	let dest = Location::new(
+		1,
+		cumulus_primitives_core::Junctions::X1(Arc::new([cumulus_primitives_core::Junction::Parachain(HYDRA_PARA_ID)])),
+	);
 
-	let context = X2(GlobalConsensus(NetworkId::Polkadot), Parachain(ACALA_PARA_ID));
+	let context = cumulus_primitives_core::Junctions::X2(Arc::new([
+		cumulus_primitives_core::Junction::GlobalConsensus(cumulus_primitives_core::NetworkId::Polkadot),
+		cumulus_primitives_core::Junction::Parachain(ACALA_PARA_ID),
+	]));
 
-	let fee_asset = assets.clone().reanchored(&dest, context).expect("should reanchor");
+	let fee_asset = assets.clone().reanchored(&dest, &context).expect("should reanchor");
 	let weight_limit = {
 		let fees = fee_asset.clone();
 		let mut remote_message = Xcm(vec![
@@ -795,7 +831,7 @@ fn xcm_for_deposit_reserve_asset_to_hydra<RC: Decode + GetDispatchInfo>(
 			},
 			DepositAsset {
 				assets: Definite(assets.clone().into()),
-				beneficiary,
+				beneficiary: beneficiary.clone(),
 			},
 		]);
 		// use local weight for remote message and hope for the best.
@@ -823,7 +859,7 @@ fn xcm_for_deposit_reserve_asset_to_hydra<RC: Decode + GetDispatchInfo>(
 		},
 	]);
 
-	VersionedXcm::V3(message)
+	VersionedXcm::from(message)
 }
 
 fn register_foreign_asset() {
@@ -836,7 +872,7 @@ fn register_foreign_asset() {
 		None,
 		Some(hydradx_runtime::AssetLocation(MultiLocation::new(
 			2,
-			X1(GlobalConsensus(NetworkId::BitcoinCash))
+			X1(Junction::GlobalConsensus(NetworkId::BitcoinCash))
 		))),
 		None,
 	));
@@ -850,7 +886,10 @@ fn register_dot() {
 		1_000_000,
 		None,
 		None,
-		Some(hydradx_runtime::AssetLocation(MultiLocation::new(1, Here))),
+		Some(hydradx_runtime::AssetLocation(MultiLocation::new(
+			1,
+			polkadot_xcm::opaque::v3::Junctions::Here
+		))),
 		None,
 	));
 }
@@ -866,7 +905,7 @@ fn add_currency_price(asset_id: u32, price: FixedU128) {
 	hydradx_runtime::MultiTransactionPayment::on_initialize(hydradx_runtime::System::block_number());
 }
 
-fn trap_asset() -> MultiAsset {
+fn trap_asset() -> Asset {
 	Acala::execute_with(|| {
 		assert_eq!(
 			hydradx_runtime::Balances::free_balance(AccountId::from(ALICE)),
@@ -884,7 +923,7 @@ fn trap_asset() -> MultiAsset {
 						Junction::AccountId32 { id: BOB, network: None }
 					)
 				)
-				.into()
+				.into_versioned()
 			),
 			WeightLimit::Limited(Weight::from_parts(399_600_000_000, 0))
 		));
@@ -894,43 +933,30 @@ fn trap_asset() -> MultiAsset {
 		);
 	});
 
-	let loc = MultiLocation::new(1, X2(Parachain(ACALA_PARA_ID), GeneralIndex(0)));
-	let asset: MultiAsset = (loc, 30 * UNITS).into();
+	let asset: Asset = Asset {
+		id: cumulus_primitives_core::AssetId(Location::new(
+			1,
+			cumulus_primitives_core::Junctions::X2(Arc::new([
+				cumulus_primitives_core::Junction::Parachain(ACALA_PARA_ID),
+				cumulus_primitives_core::Junction::GeneralIndex(0),
+			])),
+		)),
+		fun: Fungible(30 * UNITS),
+	};
 
 	Hydra::execute_with(|| {
-		expect_hydra_events(vec![
-			cumulus_pallet_xcmp_queue::Event::Fail {
-				message_hash: hex!["30291d1dfb68ae6f66d4c841facb78f44e7611ab2a25c84f4fb7347f448d2944"],
-				message_id: hex!["30291d1dfb68ae6f66d4c841facb78f44e7611ab2a25c84f4fb7347f448d2944"],
-				error: XcmError::AssetNotFound,
-				weight: Weight::from_parts(300_000_000, 0),
-			}
-			.into(),
-			pallet_relaychain_info::Event::CurrentBlockNumbers {
-				parachain_block_number: 3,
-				relaychain_block_number: 8,
-			}
-			.into(),
-		]);
-		let origin = MultiLocation::new(1, X1(Parachain(ACALA_PARA_ID)));
-		let loc = MultiLocation::new(1, X2(Parachain(ACALA_PARA_ID), GeneralIndex(0)));
-		let asset: MultiAsset = (loc, 30 * UNITS).into();
-		let hash = determine_hash(&origin, vec![asset]);
+		assert_xcm_message_processing_failed();
+		let origin = MultiLocation::new(1, X1(Junction::Parachain(ACALA_PARA_ID)));
+		let hash = determine_hash(&origin, vec![asset.clone()]);
+
 		assert_eq!(hydradx_runtime::PolkadotXcm::asset_trap(hash), 1);
 	});
 
 	asset
 }
 
-fn claim_asset(asset: MultiAsset, recipient: [u8; 32]) {
+fn claim_asset(asset: Asset, recipient: Location) {
 	Acala::execute_with(|| {
-		let recipient = MultiLocation::new(
-			0,
-			X1(Junction::AccountId32 {
-				network: None,
-				id: recipient,
-			}),
-		);
 		let xcm_msg = Xcm(vec![
 			ClaimAsset {
 				assets: vec![asset.clone()].into(),
@@ -947,28 +973,40 @@ fn claim_asset(asset: MultiAsset, recipient: [u8; 32]) {
 		]);
 		assert_ok!(hydradx_runtime::PolkadotXcm::send(
 			hydradx_runtime::RuntimeOrigin::root(),
-			Box::new(MultiLocation::new(1, X1(Parachain(HYDRA_PARA_ID))).into()),
+			Box::new(MultiLocation::new(1, X1(Junction::Parachain(HYDRA_PARA_ID))).into_versioned()),
 			Box::new(VersionedXcm::from(xcm_msg))
 		));
 	});
 }
 
 #[test]
-fn polkadot_xcm_execute_extrinsic_should_be_allowed() {
+fn rococo_xcm_execute_extrinsic_should_be_allowed() {
 	TestNet::reset();
 
 	Hydra::execute_with(|| {
-		let message = VersionedXcm::V3(Xcm(vec![
-			WithdrawAsset((Here, 410000000000u128).into()),
+		let hdx_loc = Location::new(
+			1,
+			cumulus_primitives_core::Junctions::X2(Arc::new([
+				cumulus_primitives_core::Junction::Parachain(HYDRA_PARA_ID),
+				cumulus_primitives_core::Junction::GeneralIndex(0),
+			])),
+		);
+		let asset_to_withdraw: Asset = Asset {
+			id: cumulus_primitives_core::AssetId(hdx_loc.clone()),
+			fun: Fungible(410000000000u128),
+		};
+
+		let message = Xcm(vec![
+			WithdrawAsset(asset_to_withdraw.into()),
 			BuyExecution {
 				fees: (Here, 400000000000u128).into(),
 				weight_limit: Unlimited,
 			},
-		]));
+		]);
 
 		assert_ok!(hydradx_runtime::PolkadotXcm::execute(
 			hydradx_runtime::RuntimeOrigin::signed(ALICE.into()),
-			Box::new(message),
+			Box::new(VersionedXcm::from(message)),
 			Weight::from_parts(400_000_000_000, 0)
 		),);
 	});
diff --git a/integration-tests/src/dca.rs b/integration-tests/src/dca.rs
index 21b97398e..6d146769f 100644
--- a/integration-tests/src/dca.rs
+++ b/integration-tests/src/dca.rs
@@ -64,7 +64,7 @@ mod omnipool {
 			let next_block_id = block_id + 1;
 			let schedule = DCA::schedule_ids_per_block(next_block_id);
 			assert!(!schedule.is_empty());
-			expect_hydra_events(vec![pallet_dca::Event::Scheduled {
+			expect_hydra_last_events(vec![pallet_dca::Event::Scheduled {
 				id: 0,
 				who: ALICE.into(),
 				period: schedule1.period,
@@ -519,7 +519,7 @@ mod omnipool {
 				BOB.into(),
 			));
 
-			polkadot_run_to_block(11);
+			rococo_run_to_block(11);
 
 			let alice_init_hdx_balance = 5000 * UNITS;
 			assert_ok!(Balances::force_set_balance(
@@ -565,7 +565,7 @@ mod omnipool {
 				ETH,
 				BOB.into(),
 			));
-			polkadot_run_to_block(12);
+			rococo_run_to_block(12);
 
 			//Assert
 			let schedule_id = 0;
diff --git a/integration-tests/src/dust.rs b/integration-tests/src/dust.rs
index 54153ece9..f04794924 100644
--- a/integration-tests/src/dust.rs
+++ b/integration-tests/src/dust.rs
@@ -30,7 +30,7 @@ fn balance_should_be_dusted_when_native_balance_is_below_ed() {
 			hdx_ed,
 		));
 
-		assert_ok!(Balances::transfer(
+		assert_ok!(Balances::transfer_allow_death(
 			hydradx_runtime::RuntimeOrigin::signed(ALICE.into()),
 			BOB.into(),
 			transfer_amount,
@@ -42,7 +42,7 @@ fn balance_should_be_dusted_when_native_balance_is_below_ed() {
 			hdx_ed.checked_add(1).unwrap()
 		);
 
-		expect_hydra_events(vec![
+		expect_hydra_last_events(vec![
 			pallet_balances::Event::DustLost {
 				account: ALICE.into(),
 				amount: 1,
@@ -96,7 +96,7 @@ fn balance_should_be_dusted_when_token_balance_is_below_ed() {
 		// Treasury is whitelisted in Tokens
 		assert_eq!(hydradx_runtime::Tokens::free_balance(DAI, &Treasury::account_id()), 1);
 
-		expect_hydra_events(vec![
+		expect_hydra_last_events(vec![
 			pallet_currencies::Event::Transferred {
 				currency_id: DAI,
 				from: ALICE.into(),
diff --git a/integration-tests/src/evm.rs b/integration-tests/src/evm.rs
index 2ad85b01d..31b6f1973 100644
--- a/integration-tests/src/evm.rs
+++ b/integration-tests/src/evm.rs
@@ -322,6 +322,7 @@ mod account_conversion {
 
 mod standard_precompiles {
 	use super::*;
+	use frame_support::assert_ok;
 	use pretty_assertions::assert_eq;
 	use sp_runtime::traits::UniqueSaturatedInto;
 
@@ -329,6 +330,13 @@ mod standard_precompiles {
 		to: EvmAddress,
 		data: Vec<u8>,
 	) -> Result<CallInfo, RunnerError<pallet_evm::Error<hydradx_runtime::Runtime>>> {
+		assert_ok!(Tokens::set_balance(
+			RawOrigin::Root.into(),
+			evm_account(),
+			WETH,
+			to_ether(1_000),
+			0,
+		));
 		<hydradx_runtime::Runtime as pallet_evm::Config>::Runner::call(
 			evm_address(),
 			to,
@@ -1140,9 +1148,9 @@ fn dispatch_should_work_with_buying_insufficient_asset() {
 		)));
 
 		//Create inssufficient asset
-		let shitcoin = with_transaction::<u32, DispatchError, _>(|| {
-			let name = b"SHITCO".to_vec();
-			let shitcoin = AssetRegistry::register_insufficient_asset(
+		let altcoin = with_transaction::<u32, DispatchError, _>(|| {
+			let name = b"ALTTKN".to_vec();
+			let altcoin = AssetRegistry::register_insufficient_asset(
 				None,
 				Some(name.try_into().unwrap()),
 				AssetKind::External,
@@ -1154,11 +1162,11 @@ fn dispatch_should_work_with_buying_insufficient_asset() {
 			)
 			.unwrap();
 
-			TransactionOutcome::Commit(Ok(shitcoin))
+			TransactionOutcome::Commit(Ok(altcoin))
 		})
 		.unwrap();
 
-		create_xyk_pool_with_amounts(shitcoin, 1000000 * UNITS, HDX, 1000000 * UNITS);
+		create_xyk_pool_with_amounts(altcoin, 1000000 * UNITS, HDX, 1000000 * UNITS);
 		init_omnipool_with_oracle_for_block_10();
 
 		assert_ok!(hydradx_runtime::Currencies::update_balance(
@@ -1181,12 +1189,12 @@ fn dispatch_should_work_with_buying_insufficient_asset() {
 			Trade {
 				pool: PoolType::XYK,
 				asset_in: HDX,
-				asset_out: shitcoin,
+				asset_out: altcoin,
 			},
 		];
 		let router_swap = RuntimeCall::Router(pallet_route_executor::Call::buy {
 			asset_in: WETH,
-			asset_out: shitcoin,
+			asset_out: altcoin,
 			amount_out: UNITS,
 			max_amount_in: u128::MAX,
 			route: swap_route,
@@ -1198,7 +1206,7 @@ fn dispatch_should_work_with_buying_insufficient_asset() {
 
 		hydradx_finalize_block(); //We do this to simulate that we don't have any prices in multi-payment-pallet, but the prices can be still calculated based on onchain route
 
-		let init_balance = Tokens::free_balance(shitcoin, &currency_precompile::alice_substrate_evm_addr());
+		let init_balance = Tokens::free_balance(altcoin, &currency_precompile::alice_substrate_evm_addr());
 		assert_eq!(init_balance, 0);
 
 		// Act
@@ -1216,8 +1224,8 @@ fn dispatch_should_work_with_buying_insufficient_asset() {
 		));
 
 		//EVM call passes even when the substrate tx fails, so we need to check if the tx is executed
-		expect_hydra_events(vec![pallet_evm::Event::Executed { address: DISPATCH_ADDR }.into()]);
-		let new_balance = Tokens::free_balance(shitcoin, &currency_precompile::alice_substrate_evm_addr());
+		expect_hydra_last_events(vec![pallet_evm::Event::Executed { address: DISPATCH_ADDR }.into()]);
+		let new_balance = Tokens::free_balance(altcoin, &currency_precompile::alice_substrate_evm_addr());
 		assert_eq!(new_balance, UNITS);
 	});
 }
diff --git a/integration-tests/src/evm_permit.rs b/integration-tests/src/evm_permit.rs
index 06e87d45f..0ec3d0da1 100644
--- a/integration-tests/src/evm_permit.rs
+++ b/integration-tests/src/evm_permit.rs
@@ -746,7 +746,7 @@ fn evm_permit_set_currency_dispatch_should_pay_evm_fee_in_chosen_currency() {
 		let user_dai_balance = user_acc.balance(DAI);
 		assert!(user_dai_balance < initial_user_dai_balance);
 		let dai_diff = initial_user_dai_balance - user_dai_balance;
-		assert_eq!(dai_diff, 1_651_665_230_644_991);
+		assert_eq!(dai_diff, 1_636_422_440_118_273);
 	})
 }
 
@@ -1141,7 +1141,7 @@ fn dispatch_permit_should_increase_account_nonce_correctly() {
 
 		let hdx_balance = user_acc.balance(HDX);
 		let tx_fee = initial_user_hdx_balance - hdx_balance;
-		assert_eq!(tx_fee, 1_798_512_789_698);
+		assert_eq!(tx_fee, 1_797_526_858_553);
 	})
 }
 
diff --git a/integration-tests/src/exchange_asset.rs b/integration-tests/src/exchange_asset.rs
index 650aa10f0..686e287b4 100644
--- a/integration-tests/src/exchange_asset.rs
+++ b/integration-tests/src/exchange_asset.rs
@@ -11,13 +11,15 @@ use hydradx_runtime::AssetRegistry;
 use hydradx_traits::AssetKind;
 use hydradx_traits::Create;
 use orml_traits::currency::MultiCurrency;
-use polkadot_xcm::{latest::prelude::*, VersionedXcm};
+use polkadot_xcm::opaque::v3::{Junction, Junctions::X2, MultiLocation};
+use polkadot_xcm::{v4::prelude::*, VersionedXcm};
 use pretty_assertions::assert_eq;
 use primitives::constants::chain::CORE_ASSET_ID;
 use primitives::AccountId;
 use sp_runtime::traits::{Convert, Zero};
 use sp_runtime::DispatchResult;
 use sp_runtime::{FixedU128, Permill, TransactionOutcome};
+use sp_std::sync::Arc;
 use xcm_emulator::TestExt;
 
 pub const SELL: bool = true;
@@ -26,6 +28,9 @@ pub const BUY: bool = false;
 pub const ACA: u32 = 1234;
 pub const GLMR: u32 = 4567;
 pub const IBTC: u32 = 7890;
+pub const ZTG: u32 = 5001;
+
+pub const HDX_ON_OTHER_PARACHAIN: u32 = 5002;
 
 #[test]
 fn hydra_should_swap_assets_when_receiving_from_acala_with_sell() {
@@ -60,11 +65,29 @@ fn hydra_should_swap_assets_when_receiving_from_acala_with_sell() {
 	});
 
 	Acala::execute_with(|| {
-		let xcm = craft_exchange_asset_xcm::<_, hydradx_runtime::RuntimeCall>(
-			MultiAsset::from((GeneralIndex(0), 50 * UNITS)),
-			MultiAsset::from((GeneralIndex(CORE_ASSET_ID.into()), 300 * UNITS)),
-			SELL,
-		);
+		let give = Asset::from((
+			Location::new(
+				1,
+				cumulus_primitives_core::Junctions::X2(Arc::new([
+					cumulus_primitives_core::Junction::Parachain(ACALA_PARA_ID),
+					cumulus_primitives_core::Junction::GeneralIndex(0),
+				])),
+			),
+			50 * UNITS,
+		));
+
+		let want = Asset::from((
+			Location::new(
+				1,
+				cumulus_primitives_core::Junctions::X2(Arc::new([
+					cumulus_primitives_core::Junction::Parachain(HYDRA_PARA_ID),
+					cumulus_primitives_core::Junction::GeneralIndex(0),
+				])),
+			),
+			300 * UNITS,
+		));
+
+		let xcm = craft_exchange_asset_xcm::<hydradx_runtime::RuntimeCall>(give, want, SELL);
 		//Act
 		let res = hydradx_runtime::PolkadotXcm::execute(
 			hydradx_runtime::RuntimeOrigin::signed(ALICE.into()),
@@ -129,12 +152,31 @@ fn hydra_should_swap_assets_when_receiving_from_acala_with_buy() {
 		});
 	});
 
+	let amount_out = 300 * UNITS;
 	Acala::execute_with(|| {
-		let xcm = craft_exchange_asset_xcm::<_, hydradx_runtime::RuntimeCall>(
-			MultiAsset::from((GeneralIndex(0), 50 * UNITS)),
-			MultiAsset::from((GeneralIndex(CORE_ASSET_ID.into()), 300 * UNITS)),
-			BUY,
-		);
+		let give = Asset::from((
+			Location::new(
+				1,
+				cumulus_primitives_core::Junctions::X2(Arc::new([
+					cumulus_primitives_core::Junction::Parachain(ACALA_PARA_ID),
+					cumulus_primitives_core::Junction::GeneralIndex(0),
+				])),
+			),
+			50 * UNITS,
+		));
+
+		let want = Asset::from((
+			Location::new(
+				1,
+				cumulus_primitives_core::Junctions::X2(Arc::new([
+					cumulus_primitives_core::Junction::Parachain(HYDRA_PARA_ID),
+					cumulus_primitives_core::Junction::GeneralIndex(0),
+				])),
+			),
+			amount_out,
+		));
+
+		let xcm = craft_exchange_asset_xcm::<hydradx_runtime::RuntimeCall>(give, want, BUY);
 		//Act
 		let res = hydradx_runtime::PolkadotXcm::execute(
 			hydradx_runtime::RuntimeOrigin::signed(ALICE.into()),
@@ -157,23 +199,17 @@ fn hydra_should_swap_assets_when_receiving_from_acala_with_buy() {
 		));
 	});
 
-	let swapped = 361693915942; // HDX is super cheap in our setup
 	Hydra::execute_with(|| {
 		let fees = hydradx_runtime::Tokens::free_balance(ACA, &hydradx_runtime::Treasury::account_id());
 		assert!(fees > 0, "treasury should have received fees");
-		assert_eq!(
-			hydradx_runtime::Tokens::free_balance(ACA, &AccountId::from(BOB)),
-			100 * UNITS - swapped - fees
-		);
 		assert_eq!(
 			hydradx_runtime::Balances::free_balance(AccountId::from(BOB)),
-			BOB_INITIAL_NATIVE_BALANCE + 300 * UNITS
+			BOB_INITIAL_NATIVE_BALANCE + amount_out
 		);
 	});
 }
 
 //We swap GLMR for iBTC, sent from ACALA and executed on Hydradx, resultin in 4 hops
-#[ignore]
 #[test]
 fn transfer_and_swap_should_work_with_4_hops() {
 	//Arrange
@@ -256,8 +292,8 @@ fn transfer_and_swap_should_work_with_4_hops() {
 
 			//Act
 			let give_amount = 1000 * UNITS;
-			let give = MultiAsset::from((hydradx_runtime::CurrencyIdConvert::convert(GLMR).unwrap(), give_amount));
-			let want = MultiAsset::from((hydradx_runtime::CurrencyIdConvert::convert(IBTC).unwrap(), 550 * UNITS));
+			let give = Asset::from((hydradx_runtime::CurrencyIdConvert::convert(GLMR).unwrap(), give_amount));
+			let want = Asset::from((hydradx_runtime::CurrencyIdConvert::convert(IBTC).unwrap(), 550 * UNITS));
 
 			let xcm = craft_transfer_and_swap_xcm_with_4_hops::<hydradx_runtime::RuntimeCall>(give, want, SELL);
 			assert_ok!(hydradx_runtime::PolkadotXcm::execute(
@@ -284,21 +320,695 @@ fn transfer_and_swap_should_work_with_4_hops() {
 		});
 	});
 
-	let fees = 400641025641;
+	//We need these executions to trigger the processing of horizontal messages of each parachain
+	Moonbeam::execute_with(|| {});
+	Hydra::execute_with(|| {});
+	Interlay::execute_with(|| {});
+
 	Acala::execute_with(|| {
 		//hydradx_run_to_block(5);
 
 		assert_eq!(
 			hydradx_runtime::Currencies::free_balance(IBTC, &AccountId::from(BOB)),
-			549198717948718
-		);
-		assert_eq!(
-			hydradx_runtime::Tokens::free_balance(IBTC, &hydradx_runtime::Treasury::account_id()),
-			fees
+			549839246387064
 		);
+		let fee = hydradx_runtime::Tokens::free_balance(IBTC, &hydradx_runtime::Treasury::account_id());
+
+		assert!(fee > 0, "treasury should have received fees, but it didn't");
 	});
 }
 
+pub mod zeitgeist_use_cases {
+	use super::*;
+	use frame_support::traits::tokens::Precision;
+	use polkadot_xcm::latest::{NetworkId, Parent};
+	use polkadot_xcm::prelude::Parachain;
+	use std::sync::Arc;
+
+	use primitives::constants::chain::CORE_ASSET_ID;
+
+	#[test]
+	fn remote_swap_sell_native_ztg_for_native_hdx_on_hydra() {
+		//Register tokens and init omnipool on hydra
+		Hydra::execute_with(|| {
+			let _ = with_transaction(|| {
+				crate::exchange_asset::register_ztg();
+				crate::exchange_asset::add_currency_price(crate::exchange_asset::ZTG, FixedU128::from(1));
+
+				init_omnipool();
+				let omnipool_account = hydradx_runtime::Omnipool::protocol_account();
+
+				let token_price = FixedU128::from_float(1.0);
+				assert_ok!(hydradx_runtime::Tokens::deposit(
+					ZTG,
+					&omnipool_account,
+					1000000 * UNITS
+				));
+
+				assert_ok!(hydradx_runtime::Omnipool::add_token(
+					hydradx_runtime::RuntimeOrigin::root(),
+					ZTG,
+					token_price,
+					Permill::from_percent(100),
+					AccountId::from(BOB),
+				));
+
+				TransactionOutcome::Commit(DispatchResult::Ok(()))
+			});
+		});
+
+		//Construct and send XCM zeitgeist -> hydra
+		Zeitgeist::execute_with(|| {
+			let _ = with_transaction(|| {
+				crate::exchange_asset::register_hdx_in_sibling_chain();
+				crate::exchange_asset::add_currency_price(HDX_ON_OTHER_PARACHAIN, FixedU128::from(1));
+
+				TransactionOutcome::Commit(DispatchResult::Ok(()))
+			});
+
+			pretty_assertions::assert_eq!(
+				hydradx_runtime::Tokens::free_balance(HDX_ON_OTHER_PARACHAIN, &AccountId::from(ALICE)),
+				0
+			);
+
+			let give_reserve_chain = Location::new(
+				1,
+				cumulus_primitives_core::Junctions::X1(Arc::new([cumulus_primitives_core::Junction::Parachain(
+					ZEITGEIST_PARA_ID,
+				)])),
+			);
+			let swap_chain = Location::new(
+				1,
+				cumulus_primitives_core::Junctions::X1(Arc::new([cumulus_primitives_core::Junction::Parachain(
+					HYDRA_PARA_ID,
+				)])),
+			);
+			let want_reserve_chain = swap_chain.clone();
+			let dest = give_reserve_chain.clone();
+
+			let beneficiary = Location::new(
+				0,
+				cumulus_primitives_core::Junctions::X1(Arc::new([cumulus_primitives_core::Junction::AccountId32 {
+					id: ALICE,
+					network: None,
+				}])),
+			);
+			let assets: Assets = Asset {
+				id: cumulus_primitives_core::AssetId(Location::new(
+					0,
+					cumulus_primitives_core::Junctions::X1(Arc::new([
+						cumulus_primitives_core::Junction::GeneralIndex(0),
+					])),
+				)),
+				fun: Fungible(100 * UNITS),
+			}
+			.into();
+			let max_assets = assets.len() as u32 + 1;
+
+			let give_amount = 10 * UNITS;
+			let give_asset = Asset::from((hydradx_runtime::CurrencyIdConvert::convert(0).unwrap(), give_amount));
+			let want_asset = Asset::from((
+				Location::new(
+					1,
+					cumulus_primitives_core::Junctions::X2(Arc::new([
+						cumulus_primitives_core::Junction::Parachain(HYDRA_PARA_ID),
+						cumulus_primitives_core::Junction::GeneralIndex(0),
+					])),
+				),
+				100 * UNITS,
+			));
+
+			let want: Assets = want_asset.clone().into();
+
+			let fees = give_asset
+				.clone()
+				.reanchored(&swap_chain, &give_reserve_chain.interior)
+				.expect("should reanchor");
+
+			let destination_fee = want_asset
+				.reanchored(&dest, &want_reserve_chain.interior)
+				.expect("should reanchor");
+
+			let weight_limit = Limited(Weight::from_parts(u64::MAX, u64::MAX));
+
+			// executed on local (zeitgeist)
+			let message = Xcm(vec![
+				WithdrawAsset(give_asset.clone().into()),
+				DepositReserveAsset {
+					assets: AllCounted(max_assets).into(),
+					dest: swap_chain,
+					// executed on remote (on hydra)
+					xcm: Xcm(vec![
+						BuyExecution {
+							fees: crate::exchange_asset::half(&fees),
+							weight_limit: weight_limit.clone(),
+						},
+						ExchangeAsset {
+							give: give_asset.into(),
+							want: want.clone(),
+							maximal: true,
+						},
+						DepositReserveAsset {
+							assets: Wild(AllCounted(max_assets)),
+							dest,
+							xcm: Xcm(vec![
+								//Executed on Zeitgeist
+								BuyExecution {
+									fees: crate::exchange_asset::half(&destination_fee),
+									weight_limit: weight_limit.clone(),
+								},
+								DepositAsset {
+									assets: Wild(AllCounted(max_assets)),
+									beneficiary,
+								},
+							]),
+						},
+					]),
+				},
+			]);
+			let xcm = VersionedXcm::from(message);
+
+			assert_ok!(hydradx_runtime::PolkadotXcm::execute(
+				hydradx_runtime::RuntimeOrigin::signed(ALICE.into()),
+				Box::new(xcm),
+				Weight::from_parts(899_600_000_000, 0),
+			));
+
+			//Assert
+			pretty_assertions::assert_eq!(
+				hydradx_runtime::Currencies::free_balance(CORE_ASSET_ID, &AccountId::from(ALICE)),
+				1000 * UNITS - give_amount
+			);
+
+			assert!(matches!(
+				last_hydra_events(2).first(),
+				Some(hydradx_runtime::RuntimeEvent::XcmpQueue(
+					cumulus_pallet_xcmp_queue::Event::XcmpMessageSent { .. }
+				))
+			));
+		});
+
+		//Trigger the processing of horizontal xcm messages
+		Hydra::execute_with(|| {});
+
+		//Assert that swap amount out is sent back to Zeitgeist
+		Zeitgeist::execute_with(|| {
+			pretty_assertions::assert_eq!(
+				hydradx_runtime::Tokens::free_balance(HDX_ON_OTHER_PARACHAIN, &AccountId::from(ALICE)),
+				8142821444432895
+			);
+		});
+	}
+
+	#[test]
+	fn remote_swap_sell_native_ztg_for_nonnative_ibtc_on_hydra() {
+		//Register tokens and init omnipool on hydra
+		Hydra::execute_with(|| {
+			let _ = with_transaction(|| {
+				crate::exchange_asset::register_ztg();
+				register_ibtc();
+				crate::exchange_asset::add_currency_price(crate::exchange_asset::ZTG, FixedU128::from(1));
+
+				init_omnipool();
+				let omnipool_account = hydradx_runtime::Omnipool::protocol_account();
+
+				let token_price = FixedU128::from_float(1.0);
+				assert_ok!(hydradx_runtime::Tokens::deposit(ZTG, &omnipool_account, 100000 * UNITS));
+				assert_ok!(hydradx_runtime::Tokens::deposit(
+					IBTC,
+					&omnipool_account,
+					100000 * UNITS
+				));
+				assert_ok!(hydradx_runtime::Omnipool::add_token(
+					hydradx_runtime::RuntimeOrigin::root(),
+					IBTC,
+					token_price,
+					Permill::from_percent(100),
+					AccountId::from(BOB),
+				));
+
+				assert_ok!(hydradx_runtime::Omnipool::add_token(
+					hydradx_runtime::RuntimeOrigin::root(),
+					ZTG,
+					token_price,
+					Permill::from_percent(100),
+					AccountId::from(BOB),
+				));
+
+				TransactionOutcome::Commit(DispatchResult::Ok(()))
+			});
+		});
+
+		//Deposit IBTC reserve for hydra
+		Interlay::execute_with(|| {
+			//set_zero_reward_for_referrals(IBTC);
+			use xcm_executor::traits::ConvertLocation;
+			let para_account =
+				hydradx_runtime::LocationToAccountId::convert_location(&(Parent, Parachain(HYDRA_PARA_ID)).into())
+					.unwrap();
+			let _ = hydradx_runtime::Balances::deposit(&para_account, 1000 * UNITS, Precision::Exact)
+				.expect("Failed to deposit");
+		});
+
+		//Construct and send XCM zeitgeist -> hydra
+		Zeitgeist::execute_with(|| {
+			let _ = with_transaction(|| {
+				crate::exchange_asset::register_hdx_in_sibling_chain();
+				register_ibtc();
+				TransactionOutcome::Commit(DispatchResult::Ok(()))
+			});
+
+			crate::exchange_asset::add_currency_price(HDX_ON_OTHER_PARACHAIN, FixedU128::from(1));
+			crate::exchange_asset::add_currency_price(IBTC, FixedU128::from(1));
+
+			pretty_assertions::assert_eq!(hydradx_runtime::Tokens::free_balance(IBTC, &AccountId::from(ALICE)), 0);
+
+			let give_reserve_chain = Location::new(
+				1,
+				cumulus_primitives_core::Junctions::X1(Arc::new([cumulus_primitives_core::Junction::Parachain(
+					ZEITGEIST_PARA_ID,
+				)])),
+			);
+			let swap_chain = Location::new(
+				1,
+				cumulus_primitives_core::Junctions::X1(Arc::new([cumulus_primitives_core::Junction::Parachain(
+					HYDRA_PARA_ID,
+				)])),
+			);
+			let want_reserve_chain = Location::new(
+				1,
+				cumulus_primitives_core::Junctions::X1(Arc::new([cumulus_primitives_core::Junction::Parachain(
+					INTERLAY_PARA_ID,
+				)])),
+			);
+			let dest = give_reserve_chain.clone();
+
+			let beneficiary = Location::new(
+				0,
+				cumulus_primitives_core::Junctions::X1(Arc::new([cumulus_primitives_core::Junction::AccountId32 {
+					id: ALICE,
+					network: None,
+				}])),
+			);
+			let assets: Assets = Asset {
+				id: cumulus_primitives_core::AssetId(Location::new(
+					0,
+					cumulus_primitives_core::Junctions::X1(Arc::new([
+						cumulus_primitives_core::Junction::GeneralIndex(0),
+					])),
+				)),
+				fun: Fungible(10 * UNITS),
+			}
+			.into();
+			let max_assets = assets.len() as u32 + 1;
+
+			let give_amount = 100 * UNITS;
+			let give_asset = Asset::from((hydradx_runtime::CurrencyIdConvert::convert(0).unwrap(), give_amount));
+			let want_asset = Asset::from((
+				Location::new(
+					1,
+					cumulus_primitives_core::Junctions::X2(Arc::new([
+						cumulus_primitives_core::Junction::Parachain(INTERLAY_PARA_ID),
+						cumulus_primitives_core::Junction::GeneralIndex(0),
+					])),
+				),
+				10 * UNITS,
+			));
+
+			let want: Assets = want_asset.clone().into();
+
+			let fees = give_asset
+				.clone()
+				.reanchored(&swap_chain, &give_reserve_chain.interior)
+				.expect("should reanchor");
+
+			let destination_fee = want_asset
+				.clone()
+				.reanchored(&dest, &want_reserve_chain.interior)
+				.expect("should reanchor");
+
+			let reserve_fees = want_asset
+				.clone()
+				.reanchored(&want_reserve_chain, &swap_chain.interior)
+				.expect("should reanchor");
+
+			let weight_limit = Limited(Weight::from_parts(u64::MAX, u64::MAX));
+
+			// executed on local (zeitgeist)
+			let message = Xcm(vec![
+				WithdrawAsset(give_asset.clone().into()),
+				DepositReserveAsset {
+					assets: AllCounted(max_assets).into(),
+					dest: swap_chain,
+					// executed on remote (on hydra)
+					xcm: Xcm(vec![
+						BuyExecution {
+							fees: crate::exchange_asset::half(&fees),
+							weight_limit: weight_limit.clone(),
+						},
+						ExchangeAsset {
+							give: give_asset.into(),
+							want: want.clone(),
+							maximal: true,
+						},
+						InitiateReserveWithdraw {
+							assets: want.into(),
+							reserve: want_reserve_chain,
+							xcm: Xcm(vec![
+								//Executed on interlay
+								BuyExecution {
+									fees: half(&reserve_fees),
+									weight_limit: weight_limit.clone(),
+								},
+								DepositReserveAsset {
+									assets: Wild(AllCounted(max_assets)),
+									dest,
+									xcm: Xcm(vec![
+										//Executed on acala
+										BuyExecution {
+											fees: half(&destination_fee),
+											weight_limit: weight_limit.clone(),
+										},
+										DepositAsset {
+											assets: Wild(AllCounted(max_assets)),
+											beneficiary,
+										},
+									]),
+								},
+							]),
+						},
+					]),
+				},
+			]);
+			let xcm = VersionedXcm::from(message);
+
+			assert_ok!(hydradx_runtime::PolkadotXcm::execute(
+				hydradx_runtime::RuntimeOrigin::signed(ALICE.into()),
+				Box::new(xcm),
+				Weight::from_parts(899_600_000_000, 0),
+			));
+
+			//Assert
+			pretty_assertions::assert_eq!(
+				hydradx_runtime::Currencies::free_balance(CORE_ASSET_ID, &AccountId::from(ALICE)),
+				1000 * UNITS - give_amount
+			);
+
+			assert!(matches!(
+				last_hydra_events(2).first(),
+				Some(hydradx_runtime::RuntimeEvent::XcmpQueue(
+					cumulus_pallet_xcmp_queue::Event::XcmpMessageSent { .. }
+				))
+			));
+		});
+
+		//Trigger the processing of horizontal xcm messages
+		Hydra::execute_with(|| {});
+		Interlay::execute_with(|| {});
+
+		//Assert that swap amount out of IBTC is sent back to Zeitgeist
+		Zeitgeist::execute_with(|| {
+			pretty_assertions::assert_eq!(
+				hydradx_runtime::Tokens::free_balance(IBTC, &AccountId::from(ALICE)),
+				9839246387064
+			);
+		});
+	}
+
+	#[test]
+	fn remote_swap_sell_nonnative_glmr_for_nonnative_ibtc_on_hydra() {
+		//Register tokens and init omnipool on hydra
+		Hydra::execute_with(|| {
+			let _ = with_transaction(|| {
+				crate::exchange_asset::register_ztg();
+
+				register_ibtc();
+				crate::exchange_asset::add_currency_price(crate::exchange_asset::ZTG, FixedU128::from(1));
+
+				register_glmr();
+				crate::exchange_asset::add_currency_price(crate::exchange_asset::GLMR, FixedU128::from(1));
+
+				init_omnipool();
+				let omnipool_account = hydradx_runtime::Omnipool::protocol_account();
+
+				let token_price = FixedU128::from_float(1.0);
+				assert_ok!(hydradx_runtime::Tokens::deposit(
+					GLMR,
+					&omnipool_account,
+					100000 * UNITS
+				));
+				assert_ok!(hydradx_runtime::Tokens::deposit(
+					IBTC,
+					&omnipool_account,
+					100000 * UNITS
+				));
+				assert_ok!(hydradx_runtime::Omnipool::add_token(
+					hydradx_runtime::RuntimeOrigin::root(),
+					IBTC,
+					token_price,
+					Permill::from_percent(100),
+					AccountId::from(BOB),
+				));
+
+				assert_ok!(hydradx_runtime::Omnipool::add_token(
+					hydradx_runtime::RuntimeOrigin::root(),
+					GLMR,
+					token_price,
+					Permill::from_percent(100),
+					AccountId::from(BOB),
+				));
+
+				TransactionOutcome::Commit(DispatchResult::Ok(()))
+			});
+		});
+
+		//Deposit IBTC reserve for hydra
+		Interlay::execute_with(|| {
+			//set_zero_reward_for_referrals(IBTC);
+			use xcm_executor::traits::ConvertLocation;
+			let para_account =
+				hydradx_runtime::LocationToAccountId::convert_location(&(Parent, Parachain(HYDRA_PARA_ID)).into())
+					.unwrap();
+			let _ = hydradx_runtime::Balances::deposit(&para_account, 1000 * UNITS, Precision::Exact)
+				.expect("Failed to deposit");
+		});
+
+		//Deposit GLMR reserve for Zeitgeist
+		Moonbeam::execute_with(|| {
+			use xcm_executor::traits::ConvertLocation;
+			let para_account =
+				hydradx_runtime::LocationToAccountId::convert_location(&(Parent, Parachain(ZEITGEIST_PARA_ID)).into())
+					.unwrap();
+			let _ = hydradx_runtime::Balances::deposit(&para_account, 1000 * UNITS, Precision::Exact)
+				.expect("Failed to deposit");
+		});
+
+		//Construct and send XCM zeitgeist -> hydra
+		Zeitgeist::execute_with(|| {
+			let _ = with_transaction(|| {
+				crate::exchange_asset::register_hdx_in_sibling_chain();
+				register_ibtc();
+				register_glmr();
+				TransactionOutcome::Commit(DispatchResult::Ok(()))
+			});
+
+			crate::exchange_asset::add_currency_price(IBTC, FixedU128::from(1));
+			crate::exchange_asset::add_currency_price(GLMR, FixedU128::from(1));
+			let alice_init_glmr_balance = 3000 * UNITS;
+			assert_ok!(hydradx_runtime::Tokens::deposit(
+				GLMR,
+				&ALICE.into(),
+				alice_init_glmr_balance
+			));
+
+			let give_reserve_chain = Location::new(
+				1,
+				cumulus_primitives_core::Junctions::X1(Arc::new([cumulus_primitives_core::Junction::Parachain(
+					MOONBEAM_PARA_ID,
+				)])),
+			);
+			let swap_chain = Location::new(
+				1,
+				cumulus_primitives_core::Junctions::X1(Arc::new([cumulus_primitives_core::Junction::Parachain(
+					HYDRA_PARA_ID,
+				)])),
+			);
+			let want_reserve_chain = Location::new(
+				1,
+				cumulus_primitives_core::Junctions::X1(Arc::new([cumulus_primitives_core::Junction::Parachain(
+					INTERLAY_PARA_ID,
+				)])),
+			);
+			let dest = Location::new(
+				1,
+				cumulus_primitives_core::Junctions::X1(Arc::new([cumulus_primitives_core::Junction::Parachain(
+					ZEITGEIST_PARA_ID,
+				)])),
+			);
+
+			let beneficiary = Location::new(
+				0,
+				cumulus_primitives_core::Junctions::X1(Arc::new([cumulus_primitives_core::Junction::AccountId32 {
+					id: ALICE,
+					network: None,
+				}])),
+			);
+			let assets: Assets = Asset {
+				id: cumulus_primitives_core::AssetId(Location::new(
+					0,
+					cumulus_primitives_core::Junctions::X1(Arc::new([
+						cumulus_primitives_core::Junction::GeneralIndex(0),
+					])),
+				)),
+				fun: Fungible(10 * UNITS),
+			}
+			.into();
+			let max_assets = assets.len() as u32 + 1;
+
+			let give_amount = 100 * UNITS;
+			let give_asset = Asset::from((
+				Location::new(
+					1,
+					cumulus_primitives_core::Junctions::X2(Arc::new([
+						cumulus_primitives_core::Junction::Parachain(MOONBEAM_PARA_ID),
+						cumulus_primitives_core::Junction::GeneralIndex(0),
+					])),
+				),
+				give_amount,
+			));
+			let want_asset = Asset::from((
+				Location::new(
+					1,
+					cumulus_primitives_core::Junctions::X2(Arc::new([
+						cumulus_primitives_core::Junction::Parachain(INTERLAY_PARA_ID),
+						cumulus_primitives_core::Junction::GeneralIndex(0),
+					])),
+				),
+				10 * UNITS,
+			));
+
+			let want: Assets = want_asset.clone().into();
+
+			let fees = give_asset
+				.clone()
+				.reanchored(&swap_chain, &give_reserve_chain.interior)
+				.expect("should reanchor");
+
+			let destination_fee = want_asset
+				.clone()
+				.reanchored(&dest, &want_reserve_chain.interior)
+				.expect("should reanchor");
+
+			let origin_context = cumulus_primitives_core::Junctions::X2(Arc::new([
+				cumulus_primitives_core::Junction::GlobalConsensus(NetworkId::Polkadot),
+				cumulus_primitives_core::Junction::Parachain(ZEITGEIST_PARA_ID),
+			]));
+			let give_reserve_fees = give_asset
+				.clone()
+				.reanchored(&give_reserve_chain, &origin_context)
+				.expect("should reanchor");
+
+			let reserve_fees = want_asset
+				.clone()
+				.reanchored(&want_reserve_chain, &swap_chain.interior)
+				.expect("should reanchor");
+
+			let weight_limit = Limited(Weight::from_parts(u64::MAX, u64::MAX));
+
+			// executed on local (zeitgeist)
+			let message = Xcm(vec![
+				WithdrawAsset(give_asset.clone().into()),
+				InitiateReserveWithdraw {
+					assets: All.into(),
+					reserve: give_reserve_chain,
+					xcm: Xcm(vec![
+						//Executed on moonbeam
+						BuyExecution {
+							fees: half(&give_reserve_fees),
+							weight_limit: weight_limit.clone(),
+						},
+						DepositReserveAsset {
+							assets: AllCounted(max_assets).into(),
+							dest: swap_chain,
+							// executed on remote (on hydra)
+							xcm: Xcm(vec![
+								BuyExecution {
+									fees: crate::exchange_asset::half(&fees),
+									weight_limit: weight_limit.clone(),
+								},
+								ExchangeAsset {
+									give: give_asset.into(),
+									want: want.clone(),
+									maximal: true,
+								},
+								InitiateReserveWithdraw {
+									assets: want.into(),
+									reserve: want_reserve_chain,
+									xcm: Xcm(vec![
+										//Executed on interlay
+										BuyExecution {
+											fees: half(&reserve_fees),
+											weight_limit: weight_limit.clone(),
+										},
+										DepositReserveAsset {
+											assets: Wild(AllCounted(max_assets)),
+											dest,
+											xcm: Xcm(vec![
+												//Executed on zetigeist
+												BuyExecution {
+													fees: half(&destination_fee),
+													weight_limit: weight_limit.clone(),
+												},
+												DepositAsset {
+													assets: Wild(AllCounted(max_assets)),
+													beneficiary,
+												},
+											]),
+										},
+									]),
+								},
+							]),
+						},
+					]),
+				},
+			]);
+			let xcm = VersionedXcm::from(message);
+
+			assert_ok!(hydradx_runtime::PolkadotXcm::execute(
+				hydradx_runtime::RuntimeOrigin::signed(ALICE.into()),
+				Box::new(xcm),
+				Weight::from_parts(899_600_000_000, 0),
+			));
+
+			//Assert
+			pretty_assertions::assert_eq!(
+				hydradx_runtime::Currencies::free_balance(GLMR, &AccountId::from(ALICE)),
+				alice_init_glmr_balance - give_amount
+			);
+
+			assert!(matches!(
+				last_hydra_events(2).first(),
+				Some(hydradx_runtime::RuntimeEvent::XcmpQueue(
+					cumulus_pallet_xcmp_queue::Event::XcmpMessageSent { .. }
+				))
+			));
+		});
+
+		//Trigger the processing of horizontal xcm messages
+		Moonbeam::execute_with(|| {});
+		Hydra::execute_with(|| {});
+		Interlay::execute_with(|| {});
+
+		//Assert that swap amount out of IBTC is sent back to Zeitgeist
+		Zeitgeist::execute_with(|| {
+			pretty_assertions::assert_eq!(
+				hydradx_runtime::Tokens::free_balance(IBTC, &AccountId::from(ALICE)),
+				9839246387064
+			);
+		});
+	}
+}
+
 fn register_glmr() {
 	assert_ok!(AssetRegistry::register_sufficient_asset(
 		Some(GLMR),
@@ -309,7 +1019,7 @@ fn register_glmr() {
 		None,
 		Some(hydradx_runtime::AssetLocation(MultiLocation::new(
 			1,
-			X2(Parachain(MOONBEAM_PARA_ID), GeneralIndex(0))
+			X2(Junction::Parachain(MOONBEAM_PARA_ID), Junction::GeneralIndex(0))
 		))),
 		None,
 	));
@@ -325,7 +1035,7 @@ fn register_aca() {
 		None,
 		Some(hydradx_runtime::AssetLocation(MultiLocation::new(
 			1,
-			X2(Parachain(ACALA_PARA_ID), GeneralIndex(0))
+			X2(Junction::Parachain(ACALA_PARA_ID), Junction::GeneralIndex(0))
 		))),
 		None,
 	));
@@ -341,7 +1051,39 @@ fn register_ibtc() {
 		None,
 		Some(hydradx_runtime::AssetLocation(MultiLocation::new(
 			1,
-			X2(Parachain(INTERLAY_PARA_ID), GeneralIndex(0))
+			X2(Junction::Parachain(INTERLAY_PARA_ID), Junction::GeneralIndex(0))
+		))),
+		None,
+	));
+}
+
+fn register_ztg() {
+	assert_ok!(AssetRegistry::register_sufficient_asset(
+		Some(ZTG),
+		Some(b"ZTG".to_vec().try_into().unwrap()),
+		AssetKind::Token,
+		1_000_000,
+		None,
+		None,
+		Some(hydradx_runtime::AssetLocation(MultiLocation::new(
+			1,
+			X2(Junction::Parachain(ZEITGEIST_PARA_ID), Junction::GeneralIndex(0))
+		))),
+		None,
+	));
+}
+
+fn register_hdx_in_sibling_chain() {
+	assert_ok!(AssetRegistry::register_sufficient_asset(
+		Some(HDX_ON_OTHER_PARACHAIN),
+		Some(b"vHDX".to_vec().try_into().unwrap()),
+		AssetKind::Token,
+		1_000_000,
+		None,
+		None,
+		Some(hydradx_runtime::AssetLocation(MultiLocation::new(
+			1,
+			X2(Junction::Parachain(HYDRA_PARA_ID), Junction::GeneralIndex(0))
 		))),
 		None,
 	));
@@ -359,7 +1101,7 @@ fn add_currency_price(asset_id: u32, price: FixedU128) {
 }
 
 /// Returns amount if `asset` is fungible, or zero.
-fn fungible_amount(asset: &MultiAsset) -> u128 {
+fn fungible_amount(asset: &Asset) -> u128 {
 	if let Fungible(amount) = &asset.fun {
 		*amount
 	} else {
@@ -367,54 +1109,85 @@ fn fungible_amount(asset: &MultiAsset) -> u128 {
 	}
 }
 
-fn half(asset: &MultiAsset) -> MultiAsset {
+fn half(asset: &Asset) -> Asset {
 	let half_amount = fungible_amount(asset)
 		.checked_div(2)
 		.expect("div 2 can't overflow; qed");
-	MultiAsset {
+	Asset {
 		fun: Fungible(half_amount),
-		id: asset.id,
+		id: asset.clone().id,
 	}
 }
+use rococo_runtime::xcm_config::BaseXcmWeight;
+use xcm_builder::FixedWeightBounds;
+use xcm_executor::traits::WeightBounds;
 
 fn craft_transfer_and_swap_xcm_with_4_hops<RC: Decode + GetDispatchInfo>(
-	give_asset: MultiAsset,
-	want_asset: MultiAsset,
+	give_asset: Asset,
+	want_asset: Asset,
 	is_sell: bool,
 ) -> VersionedXcm<RC> {
-	use polkadot_runtime::xcm_config::BaseXcmWeight;
-	use xcm_builder::FixedWeightBounds;
-	use xcm_executor::traits::WeightBounds;
-
 	type Weigher<RC> = FixedWeightBounds<BaseXcmWeight, RC, ConstU32<100>>;
 
-	let give_reserve_chain = MultiLocation::new(1, Parachain(MOONBEAM_PARA_ID));
-	let want_reserve_chain = MultiLocation::new(1, Parachain(INTERLAY_PARA_ID));
-	let swap_chain = MultiLocation::new(1, Parachain(HYDRA_PARA_ID));
-	let dest = MultiLocation::new(1, Parachain(ACALA_PARA_ID));
-	let beneficiary = Junction::AccountId32 { id: BOB, network: None }.into();
-	let assets: MultiAssets = MultiAsset::from((GeneralIndex(0), 100 * UNITS)).into(); // hardcoded
+	let give_reserve_chain = Location::new(
+		1,
+		cumulus_primitives_core::Junctions::X1(Arc::new([cumulus_primitives_core::Junction::Parachain(
+			MOONBEAM_PARA_ID,
+		)])),
+	);
+	let want_reserve_chain = Location::new(
+		1,
+		cumulus_primitives_core::Junctions::X1(Arc::new([cumulus_primitives_core::Junction::Parachain(
+			INTERLAY_PARA_ID,
+		)])),
+	);
+	let swap_chain = Location::new(
+		1,
+		cumulus_primitives_core::Junctions::X1(Arc::new([cumulus_primitives_core::Junction::Parachain(HYDRA_PARA_ID)])),
+	);
+	let dest = Location::new(
+		1,
+		cumulus_primitives_core::Junctions::X1(Arc::new([cumulus_primitives_core::Junction::Parachain(ACALA_PARA_ID)])),
+	);
+	let beneficiary = Location::new(
+		0,
+		cumulus_primitives_core::Junctions::X1(Arc::new([cumulus_primitives_core::Junction::AccountId32 {
+			id: BOB,
+			network: None,
+		}])),
+	);
+	let assets: Assets = Asset {
+		id: cumulus_primitives_core::AssetId(Location::new(
+			0,
+			cumulus_primitives_core::Junctions::X1(Arc::new([cumulus_primitives_core::Junction::GeneralIndex(0)])),
+		)),
+		fun: Fungible(100 * UNITS),
+	}
+	.into();
 	let max_assets = assets.len() as u32 + 1;
-	let origin_context = X2(GlobalConsensus(NetworkId::Polkadot), Parachain(ACALA_PARA_ID));
+	let origin_context = cumulus_primitives_core::Junctions::X2(Arc::new([
+		cumulus_primitives_core::Junction::GlobalConsensus(NetworkId::Polkadot),
+		cumulus_primitives_core::Junction::Parachain(ACALA_PARA_ID),
+	]));
 	let give = give_asset
 		.clone()
-		.reanchored(&dest, origin_context)
+		.reanchored(&dest, &origin_context)
 		.expect("should reanchor give");
-	let give: MultiAssetFilter = Definite(give.into());
-	let want: MultiAssets = want_asset.clone().into();
+	let give: AssetFilter = Definite(give.into());
+	let want: Assets = want_asset.clone().into();
 
 	let fees = give_asset
 		.clone()
-		.reanchored(&swap_chain, give_reserve_chain.interior)
+		.reanchored(&swap_chain, &give_reserve_chain.interior)
 		.expect("should reanchor");
 
 	let reserve_fees = want_asset
 		.clone()
-		.reanchored(&want_reserve_chain, swap_chain.interior)
+		.reanchored(&want_reserve_chain, &swap_chain.interior)
 		.expect("should reanchor");
 
 	let destination_fee = want_asset
-		.reanchored(&dest, want_reserve_chain.interior)
+		.reanchored(&dest, &want_reserve_chain.interior)
 		.expect("should reanchor");
 
 	let weight_limit = {
@@ -433,7 +1206,7 @@ fn craft_transfer_and_swap_xcm_with_4_hops<RC: Decode + GetDispatchInfo>(
 			},
 			InitiateReserveWithdraw {
 				assets: want.clone().into(),
-				reserve: want_reserve_chain,
+				reserve: want_reserve_chain.clone(),
 				xcm: Xcm(vec![
 					BuyExecution {
 						fees: reserve_fees.clone(), //reserve fee
@@ -441,7 +1214,7 @@ fn craft_transfer_and_swap_xcm_with_4_hops<RC: Decode + GetDispatchInfo>(
 					},
 					DepositReserveAsset {
 						assets: Wild(AllCounted(max_assets)),
-						dest,
+						dest: dest.clone(),
 						xcm: Xcm(vec![
 							BuyExecution {
 								fees: destination_fee.clone(), //destination fee
@@ -449,7 +1222,7 @@ fn craft_transfer_and_swap_xcm_with_4_hops<RC: Decode + GetDispatchInfo>(
 							},
 							DepositAsset {
 								assets: Wild(AllCounted(max_assets)),
-								beneficiary,
+								beneficiary: beneficiary.clone(),
 							},
 						]),
 					},
@@ -502,7 +1275,7 @@ fn craft_transfer_and_swap_xcm_with_4_hops<RC: Decode + GetDispatchInfo>(
 
 	let give_reserve_fees = give_asset
 		.clone()
-		.reanchored(&give_reserve_chain, origin_context)
+		.reanchored(&give_reserve_chain, &origin_context)
 		.expect("should reanchor");
 
 	// executed on local (acala)
@@ -525,57 +1298,44 @@ fn craft_transfer_and_swap_xcm_with_4_hops<RC: Decode + GetDispatchInfo>(
 			]),
 		},
 	]);
-	VersionedXcm::V3(message)
+	VersionedXcm::from(message)
 }
 
-fn craft_exchange_asset_xcm<M: Into<MultiAssets>, RC: Decode + GetDispatchInfo>(
-	give: MultiAsset,
-	want: M,
-	is_sell: bool,
-) -> VersionedXcm<RC> {
-	use polkadot_runtime::xcm_config::BaseXcmWeight;
-	use xcm_builder::FixedWeightBounds;
-	use xcm_executor::traits::WeightBounds;
-
-	type Weigher<RC> = FixedWeightBounds<BaseXcmWeight, RC, ConstU32<100>>;
-
-	let dest = MultiLocation::new(1, Parachain(HYDRA_PARA_ID));
-	let beneficiary = Junction::AccountId32 { id: BOB, network: None }.into();
-	let assets: MultiAssets = MultiAsset::from((GeneralIndex(0), 100 * UNITS)).into(); // hardcoded
+fn craft_exchange_asset_xcm<RC: Decode + GetDispatchInfo>(give: Asset, want: Asset, is_sell: bool) -> VersionedXcm<RC> {
+	let dest = Location::new(
+		1,
+		cumulus_primitives_core::Junctions::X1(Arc::new([cumulus_primitives_core::Junction::Parachain(HYDRA_PARA_ID)])),
+	);
+	let beneficiary = Location::new(
+		0,
+		cumulus_primitives_core::Junctions::X1(Arc::new([cumulus_primitives_core::Junction::AccountId32 {
+			id: BOB,
+			network: None,
+		}])),
+	);
+	let assets: Assets = Asset {
+		id: cumulus_primitives_core::AssetId(Location::new(
+			0,
+			cumulus_primitives_core::Junctions::X1(Arc::new([cumulus_primitives_core::Junction::GeneralIndex(0)])),
+		)),
+		fun: Fungible(100 * UNITS),
+	}
+	.into();
 	let max_assets = assets.len() as u32 + 1;
-	let context = X2(GlobalConsensus(NetworkId::Polkadot), Parachain(ACALA_PARA_ID));
+	let context = cumulus_primitives_core::Junctions::X2(Arc::new([
+		cumulus_primitives_core::Junction::GlobalConsensus(NetworkId::Polkadot),
+		cumulus_primitives_core::Junction::Parachain(ACALA_PARA_ID),
+	]));
 	let fees = assets
 		.get(0)
 		.expect("should have at least 1 asset")
 		.clone()
-		.reanchored(&dest, context)
+		.reanchored(&dest, &context)
 		.expect("should reanchor");
-	let give = give.reanchored(&dest, context).expect("should reanchor give");
-	let give: MultiAssetFilter = Definite(give.into());
+	let give: AssetFilter = Definite(give.into());
 	let want = want.into();
-	let weight_limit = {
-		let fees = fees.clone();
-		let mut remote_message = Xcm(vec![
-			ReserveAssetDeposited::<RC>(assets.clone()),
-			ClearOrigin,
-			BuyExecution {
-				fees,
-				weight_limit: Limited(Weight::zero()),
-			},
-			ExchangeAsset {
-				give: give.clone(),
-				want: want.clone(),
-				maximal: is_sell,
-			},
-			DepositAsset {
-				assets: Wild(AllCounted(max_assets)),
-				beneficiary,
-			},
-		]);
-		// use local weight for remote message and hope for the best.
-		let remote_weight = Weigher::weight(&mut remote_message).expect("weighing should not fail");
-		Limited(remote_weight)
-	};
+	let weight_limit = Limited(Weight::from_parts(u64::MAX, u64::MAX));
+
 	// executed on remote (on hydra)
 	let xcm = Xcm(vec![
 		BuyExecution { fees, weight_limit },
@@ -594,5 +1354,5 @@ fn craft_exchange_asset_xcm<M: Into<MultiAssets>, RC: Decode + GetDispatchInfo>(
 		SetFeesMode { jit_withdraw: true },
 		TransferReserveAsset { assets, dest, xcm },
 	]);
-	VersionedXcm::V3(message)
+	VersionedXcm::from(message)
 }
diff --git a/integration-tests/src/global_account_derivation.rs b/integration-tests/src/global_account_derivation.rs
index 954037063..94c28931b 100644
--- a/integration-tests/src/global_account_derivation.rs
+++ b/integration-tests/src/global_account_derivation.rs
@@ -6,31 +6,34 @@ use sp_runtime::codec::Encode;
 
 use frame_support::dispatch::GetDispatchInfo;
 use orml_traits::MultiCurrency;
-use polkadot_xcm::latest::prelude::*;
+use polkadot_xcm::v4::prelude::*;
+use sp_std::sync::Arc;
 use xcm_builder::DescribeAllTerminal;
 use xcm_builder::DescribeFamily;
 use xcm_builder::HashedDescription;
 use xcm_emulator::ConvertLocation;
 use xcm_emulator::TestExt;
+
 #[test]
 fn other_chain_remote_account_should_work_on_hydra() {
 	// Arrange
 	TestNet::reset();
 
-	let xcm_interior_at_acala = X1(Junction::AccountId32 {
-		network: None,
-		id: evm_account().into(),
-	});
+	let xcm_interior_at_acala =
+		cumulus_primitives_core::Junctions::X1(Arc::new([cumulus_primitives_core::Junction::AccountId32 {
+			network: None,
+			id: evm_account().into(),
+		}]));
 
-	let xcm_origin_at_hydra = MultiLocation {
+	let xcm_origin_at_hydra = Location {
 		parents: 1,
-		interior: X2(
-			Junction::Parachain(ACALA_PARA_ID),
-			Junction::AccountId32 {
+		interior: cumulus_primitives_core::Junctions::X2(Arc::new([
+			cumulus_primitives_core::Junction::Parachain(ACALA_PARA_ID),
+			cumulus_primitives_core::Junction::AccountId32 {
 				network: None,
 				id: evm_account().into(),
 			},
-		),
+		])),
 	};
 
 	let acala_account_id_at_hydra: AccountId =
@@ -40,7 +43,7 @@ fn other_chain_remote_account_should_work_on_hydra() {
 	Hydra::execute_with(|| {
 		init_omnipool();
 
-		assert_ok!(hydradx_runtime::Balances::transfer(
+		assert_ok!(hydradx_runtime::Balances::transfer_allow_death(
 			hydradx_runtime::RuntimeOrigin::signed(ALICE.into()),
 			acala_account_id_at_hydra.clone(),
 			1_000 * UNITS,
@@ -62,26 +65,26 @@ fn other_chain_remote_account_should_work_on_hydra() {
 				min_buy_amount: 0,
 			});
 
+		let hdx_loc = Location::new(
+			1,
+			cumulus_primitives_core::Junctions::X2(Arc::new([
+				cumulus_primitives_core::Junction::Parachain(HYDRA_PARA_ID),
+				cumulus_primitives_core::Junction::GeneralIndex(0),
+			])),
+		);
+		let asset_to_withdraw: Asset = Asset {
+			id: cumulus_primitives_core::AssetId(hdx_loc.clone()),
+			fun: Fungible(900 * UNITS),
+		};
+		let asset_for_buy_execution: Asset = Asset {
+			id: cumulus_primitives_core::AssetId(hdx_loc),
+			fun: Fungible(800 * UNITS),
+		};
+
 		let message = Xcm(vec![
-			WithdrawAsset(
-				(
-					MultiLocation {
-						parents: 1,
-						interior: X2(Parachain(HYDRA_PARA_ID), GeneralIndex(0)),
-					},
-					900 * UNITS,
-				)
-					.into(),
-			),
+			WithdrawAsset(asset_to_withdraw.into()),
 			BuyExecution {
-				fees: (
-					MultiLocation {
-						parents: 1,
-						interior: X2(Parachain(HYDRA_PARA_ID), GeneralIndex(0)),
-					},
-					800 * UNITS,
-				)
-					.into(),
+				fees: asset_for_buy_execution,
 				weight_limit: Unlimited,
 			},
 			Transact {
@@ -93,7 +96,7 @@ fn other_chain_remote_account_should_work_on_hydra() {
 			RefundSurplus,
 			DepositAsset {
 				assets: All.into(),
-				beneficiary: Junction::AccountId32 {
+				beneficiary: cumulus_primitives_core::Junction::AccountId32 {
 					id: acala_account_id_at_hydra.clone().into(),
 					network: None,
 				}
@@ -101,19 +104,23 @@ fn other_chain_remote_account_should_work_on_hydra() {
 			},
 		]);
 
+		let dest_hydradx = Location::new(
+			1,
+			cumulus_primitives_core::Junctions::X1(Arc::new([cumulus_primitives_core::Junction::Parachain(
+				HYDRA_PARA_ID,
+			)])),
+		);
+
 		assert_ok!(hydradx_runtime::PolkadotXcm::send_xcm(
 			xcm_interior_at_acala,
-			MultiLocation::new(1, X1(Parachain(HYDRA_PARA_ID))),
+			dest_hydradx,
 			message
 		));
 	});
 
 	// Assert
 	Hydra::execute_with(|| {
-		assert!(hydradx_runtime::System::events().iter().any(|r| matches!(
-			r.event,
-			hydradx_runtime::RuntimeEvent::XcmpQueue(cumulus_pallet_xcmp_queue::Event::Success { .. })
-		)));
+		assert_xcm_message_processing_passed();
 
 		let dai_balance = hydradx_runtime::Currencies::free_balance(DAI, &AccountId::from(acala_account_id_at_hydra));
 		assert!(
diff --git a/integration-tests/src/lib.rs b/integration-tests/src/lib.rs
index 7cfd7ad31..3f51f63ed 100644
--- a/integration-tests/src/lib.rs
+++ b/integration-tests/src/lib.rs
@@ -28,8 +28,6 @@ mod staking;
 mod transact_call_filter;
 mod utils;
 mod vesting;
-mod xcm_defer;
-mod xcm_rate_limiter;
 mod xyk;
 mod xyk_liquidity_mining;
 
diff --git a/integration-tests/src/polkadot_test_net.rs b/integration-tests/src/polkadot_test_net.rs
index bd0432f1c..6f2559a50 100644
--- a/integration-tests/src/polkadot_test_net.rs
+++ b/integration-tests/src/polkadot_test_net.rs
@@ -18,12 +18,13 @@ use hex_literal::hex;
 use hydradx_runtime::{evm::WETH_ASSET_LOCATION, Referrals, RuntimeOrigin};
 pub use hydradx_traits::{evm::InspectEvmAccounts, registry::Mutate};
 use pallet_referrals::{FeeDistribution, Level};
-pub use polkadot_primitives::v5::{BlockNumber, MAX_CODE_SIZE, MAX_POV_SIZE};
+pub use polkadot_primitives::v6::{BlockNumber, MAX_CODE_SIZE, MAX_POV_SIZE};
 use polkadot_runtime_parachains::configuration::HostConfiguration;
+use sp_consensus_beefy::ecdsa_crypto::AuthorityId as BeefyId;
 use sp_core::storage::Storage;
 use sp_core::H160;
 pub use xcm_emulator::Network;
-use xcm_emulator::{decl_test_networks, decl_test_parachains, decl_test_relay_chains, DefaultMessageProcessor};
+use xcm_emulator::{decl_test_networks, decl_test_parachains, decl_test_relay_chains};
 
 pub const ALICE: [u8; 32] = [4u8; 32];
 pub const BOB: [u8; 32] = [5u8; 32];
@@ -65,6 +66,7 @@ pub const ACALA_PARA_ID: u32 = 2_000;
 pub const HYDRA_PARA_ID: u32 = 2_034;
 pub const MOONBEAM_PARA_ID: u32 = 2_004;
 pub const INTERLAY_PARA_ID: u32 = 2_032;
+pub const ZEITGEIST_PARA_ID: u32 = 2_092;
 
 pub const ALICE_INITIAL_NATIVE_BALANCE: Balance = 1_000 * UNITS;
 pub const ALICE_INITIAL_DAI_BALANCE: Balance = 2_000 * UNITS;
@@ -94,28 +96,50 @@ pub const INSUFFICIENT_ASSET: AssetId = 500;
 
 pub const NOW: Moment = 1689844300000; // unix time in milliseconds
 
+pub type Rococo = RococoRelayChain<TestNet>;
+pub type Hydra = HydraParachain<TestNet>;
+pub type Acala = AcalaParachain<TestNet>;
+pub type Moonbeam = MoonbeamParachain<TestNet>;
+pub type Interlay = InterlayParachain<TestNet>;
+pub type AssetHub = AssetHubParachain<TestNet>;
+pub type Zeitgeist = ZeitgeistParachain<TestNet>;
+
+decl_test_networks! {
+	pub struct TestNet {
+		relay_chain = RococoRelayChain,
+		parachains = vec![
+			HydraParachain,
+			AcalaParachain,
+			MoonbeamParachain,
+			InterlayParachain,
+			AssetHubParachain,
+			ZeitgeistParachain,
+		],
+		bridge = ()
+	},
+}
+
 decl_test_relay_chains! {
-	#[api_version(5)]
-	pub struct PolkadotRelay {
-		genesis = polkadot::genesis(),
+	#[api_version(10)]
+	pub struct RococoRelayChain {
+		genesis = rococo::genesis(),
 		on_init = {
-			polkadot_runtime::System::set_block_number(1);
+			rococo_runtime::System::set_block_number(1);
 		},
-		runtime = polkadot_runtime,
+		runtime = rococo_runtime,
 		core = {
-			MessageProcessor: DefaultMessageProcessor<PolkadotRelay>,
-			SovereignAccountOf: polkadot_runtime::xcm_config::SovereignAccountOf,
+			SovereignAccountOf: rococo_runtime::xcm_config::LocationConverter,
 		},
 		pallets = {
-			XcmPallet: polkadot_runtime::XcmPallet,
-			Balances: polkadot_runtime::Balances,
-			Hrmp: polkadot_runtime::Hrmp,
+			XcmPallet: rococo_runtime::XcmPallet,
+			Balances: rococo_runtime::Balances,
+			Hrmp: rococo_runtime::Hrmp,
 		}
 	}
 }
 
 decl_test_parachains! {
-	pub struct Hydra {
+	pub struct HydraParachain {
 		genesis = hydra::genesis(),
 		on_init = {
 			hydradx_runtime::System::set_block_number(1);
@@ -127,16 +151,16 @@ decl_test_parachains! {
 		runtime = hydradx_runtime,
 		core = {
 			XcmpMessageHandler: hydradx_runtime::XcmpQueue,
-			DmpMessageHandler: hydradx_runtime::DmpQueue,
 			LocationToAccountId: hydradx_runtime::xcm::LocationToAccountId,
 			ParachainInfo: hydradx_runtime::ParachainInfo,
+			MessageOrigin: cumulus_primitives_core::AggregateMessageOrigin,
 		},
 		pallets = {
 			PolkadotXcm: hydradx_runtime::PolkadotXcm,
 			Balances: hydradx_runtime::Balances,
 		}
 	},
-	pub struct Acala {
+	pub struct AcalaParachain {
 		genesis = para::genesis(ACALA_PARA_ID),
 		on_init = {
 			hydradx_runtime::System::set_block_number(1);
@@ -144,16 +168,16 @@ decl_test_parachains! {
 		runtime = hydradx_runtime,
 		core = {
 			XcmpMessageHandler: hydradx_runtime::XcmpQueue,
-			DmpMessageHandler: hydradx_runtime::DmpQueue,
 			LocationToAccountId: hydradx_runtime::xcm::LocationToAccountId,
 			ParachainInfo: hydradx_runtime::ParachainInfo,
+			MessageOrigin: cumulus_primitives_core::AggregateMessageOrigin,
 		},
 		pallets = {
 			PolkadotXcm: hydradx_runtime::PolkadotXcm,
 			Balances: hydradx_runtime::Balances,
 		}
 	},
-	pub struct Moonbeam {
+	pub struct MoonbeamParachain {
 		genesis = para::genesis(MOONBEAM_PARA_ID),
 		on_init = {
 			hydradx_runtime::System::set_block_number(1);
@@ -161,16 +185,16 @@ decl_test_parachains! {
 		runtime = hydradx_runtime,
 		core = {
 			XcmpMessageHandler: hydradx_runtime::XcmpQueue,
-			DmpMessageHandler: hydradx_runtime::DmpQueue,
 			LocationToAccountId: hydradx_runtime::xcm::LocationToAccountId,
 			ParachainInfo: hydradx_runtime::ParachainInfo,
+			MessageOrigin: cumulus_primitives_core::AggregateMessageOrigin,
 		},
 		pallets = {
 			PolkadotXcm: hydradx_runtime::PolkadotXcm,
 			Balances: hydradx_runtime::Balances,
 		}
 	},
-	pub struct Interlay {
+	pub struct InterlayParachain {
 		genesis = para::genesis(INTERLAY_PARA_ID),
 		on_init = {
 			hydradx_runtime::System::set_block_number(1);
@@ -178,16 +202,16 @@ decl_test_parachains! {
 		runtime = hydradx_runtime,
 		core = {
 			XcmpMessageHandler: hydradx_runtime::XcmpQueue,
-			DmpMessageHandler: hydradx_runtime::DmpQueue,
 			LocationToAccountId: hydradx_runtime::xcm::LocationToAccountId,
 			ParachainInfo: hydradx_runtime::ParachainInfo,
+			MessageOrigin: cumulus_primitives_core::AggregateMessageOrigin,
 		},
 		pallets = {
 			PolkadotXcm: hydradx_runtime::PolkadotXcm,
 			Balances: hydradx_runtime::Balances,
 		}
 	},
-	pub struct AssetHub {
+	pub struct AssetHubParachain {
 		genesis = para::genesis(ASSET_HUB_PARA_ID),
 		on_init = {
 			hydradx_runtime::System::set_block_number(1);
@@ -195,32 +219,35 @@ decl_test_parachains! {
 		runtime = hydradx_runtime,
 		core = {
 			XcmpMessageHandler: hydradx_runtime::XcmpQueue,
-			DmpMessageHandler: hydradx_runtime::DmpQueue,
 			LocationToAccountId: hydradx_runtime::xcm::LocationToAccountId,
 			ParachainInfo: hydradx_runtime::ParachainInfo,
+			MessageOrigin: cumulus_primitives_core::AggregateMessageOrigin,
 		},
 		pallets = {
 			PolkadotXcm: hydradx_runtime::PolkadotXcm,
 			Balances: hydradx_runtime::Balances,
 		}
 	},
+	pub struct ZeitgeistParachain {
+		genesis = para::genesis(ZEITGEIST_PARA_ID),
+		on_init = {
+			hydradx_runtime::System::set_block_number(1);
+		},
+		runtime = hydradx_runtime,
+		core = {
+			XcmpMessageHandler: hydradx_runtime::XcmpQueue,
+			LocationToAccountId: hydradx_runtime::xcm::LocationToAccountId,
+			ParachainInfo: hydradx_runtime::ParachainInfo,
+			MessageOrigin: cumulus_primitives_core::AggregateMessageOrigin,
+		},
+		pallets = {
+			PolkadotXcm: hydradx_runtime::PolkadotXcm,
+			Balances: hydradx_runtime::Balances,
+		}
+	}
 }
 
-decl_test_networks! {
-	pub struct TestNet {
-		relay_chain = PolkadotRelay,
-		parachains = vec![
-			Acala,
-			Moonbeam,
-			Interlay,
-			Hydra,
-			AssetHub,
-		],
-		bridge = ()
-	},
-}
-
-pub mod polkadot {
+pub mod rococo {
 	use super::*;
 
 	fn get_host_configuration() -> HostConfiguration<BlockNumber> {
@@ -257,61 +284,80 @@ pub mod polkadot {
 		}
 	}
 
-	use pallet_im_online::sr25519::AuthorityId as ImOnlineId;
+	use sp_core::{Pair, Public};
+
 	use polkadot_primitives::{AssignmentId, ValidatorId};
 	use polkadot_service::chain_spec::get_authority_keys_from_seed_no_beefy;
 	use sc_consensus_grandpa::AuthorityId as GrandpaId;
 	use sp_authority_discovery::AuthorityId as AuthorityDiscoveryId;
 	use sp_consensus_babe::AuthorityId as BabeId;
 
+	/// Helper function to generate a crypto pair from seed
+	fn get_from_seed<TPublic: Public>(seed: &str) -> <TPublic::Pair as Pair>::Public {
+		TPublic::Pair::from_string(&format!("//{}", seed), None)
+			.expect("static values are valid; qed")
+			.public()
+	}
+
 	#[allow(clippy::type_complexity)]
 	pub fn initial_authorities() -> Vec<(
 		AccountId,
 		AccountId,
 		BabeId,
 		GrandpaId,
-		ImOnlineId,
 		ValidatorId,
 		AssignmentId,
 		AuthorityDiscoveryId,
+		BeefyId,
 	)> {
-		vec![get_authority_keys_from_seed_no_beefy("Alice")]
+		let no_beefy = get_authority_keys_from_seed_no_beefy("Alice");
+		let with_beefy = (
+			no_beefy.0,
+			no_beefy.1,
+			no_beefy.2,
+			no_beefy.3,
+			no_beefy.4,
+			no_beefy.5,
+			no_beefy.6,
+			get_from_seed::<BeefyId>("Alice"),
+		);
+		vec![with_beefy]
 	}
 
 	fn session_keys(
 		babe: BabeId,
 		grandpa: GrandpaId,
-		im_online: ImOnlineId,
 		para_validator: ValidatorId,
 		para_assignment: AssignmentId,
 		authority_discovery: AuthorityDiscoveryId,
-	) -> polkadot_runtime::SessionKeys {
-		polkadot_runtime::SessionKeys {
+		beefy: BeefyId,
+	) -> rococo_runtime::SessionKeys {
+		rococo_runtime::SessionKeys {
 			babe,
 			grandpa,
-			im_online,
 			para_validator,
 			para_assignment,
 			authority_discovery,
+			beefy,
 		}
 	}
 
 	pub fn genesis() -> Storage {
-		let genesis_config = polkadot_runtime::RuntimeGenesisConfig {
-			balances: polkadot_runtime::BalancesConfig {
+		let genesis_config = rococo_runtime::RuntimeGenesisConfig {
+			balances: rococo_runtime::BalancesConfig {
 				balances: vec![
 					(AccountId::from(ALICE), 2_002 * UNITS),
 					(ParaId::from(HYDRA_PARA_ID).into_account_truncating(), 10 * UNITS),
 				],
 			},
-			session: polkadot_runtime::SessionConfig {
+			session: rococo_runtime::SessionConfig {
 				keys: initial_authorities()
 					.iter()
 					.map(|x| {
 						(
 							x.0.clone(),
 							x.0.clone(),
-							polkadot::session_keys(
+							session_keys(
 								x.2.clone(),
 								x.3.clone(),
 								x.4.clone(),
@@ -323,16 +369,16 @@ pub mod polkadot {
 					})
 					.collect::<Vec<_>>(),
 			},
-			configuration: polkadot_runtime::ConfigurationConfig {
+			configuration: rococo_runtime::ConfigurationConfig {
 				config: get_host_configuration(),
 			},
-			xcm_pallet: polkadot_runtime::XcmPalletConfig {
+			xcm_pallet: rococo_runtime::XcmPalletConfig {
 				safe_xcm_version: Some(3),
 				..Default::default()
 			},
-			babe: polkadot_runtime::BabeConfig {
+			babe: rococo_runtime::BabeConfig {
 				authorities: Default::default(),
-				epoch_config: Some(polkadot_runtime::BABE_GENESIS_EPOCH_CONFIG),
+				epoch_config: Some(rococo_runtime::BABE_GENESIS_EPOCH_CONFIG),
 				..Default::default()
 			},
 			..Default::default()
@@ -533,7 +579,6 @@ pub mod hydra {
 					(AccountId::from(CHARLIE), LRNA, CHARLIE_INITIAL_LRNA_BALANCE),
 					(AccountId::from(DAVE), LRNA, 1_000 * UNITS),
 					(AccountId::from(DAVE), DAI, 1_000_000_000 * UNITS),
-					(evm_account(), WETH, to_ether(1_000)),
 					(omnipool_account.clone(), DAI, stable_amount),
 					(omnipool_account.clone(), ETH, eth_amount),
 					(omnipool_account.clone(), BTC, btc_amount),
@@ -624,16 +669,22 @@ pub fn last_hydra_events(n: usize) -> Vec<hydradx_runtime::RuntimeEvent> {
 		.collect()
 }
 
-pub fn expect_hydra_events(e: Vec<hydradx_runtime::RuntimeEvent>) {
+pub fn expect_hydra_last_events(e: Vec<hydradx_runtime::RuntimeEvent>) {
 	pretty_assertions::assert_eq!(last_hydra_events(e.len()), e);
 }
 
+pub fn expect_hydra_events(event: Vec<hydradx_runtime::RuntimeEvent>) {
+	for e in event.iter() {
+		frame_system::Pallet::<hydradx_runtime::Runtime>::assert_has_event(e.clone());
+	}
+}
+
 pub fn set_relaychain_block_number(number: BlockNumber) {
 	use hydradx_runtime::ParachainSystem;
 
 	// We need to set block number this way as well because tarpaulin code coverage tool does not like the way
 	// how we set the block number with `cumulus-test-relay-sproof-builder` package
-	polkadot_run_to_block(number);
+	rococo_run_to_block(number);
 
 	ParachainSystem::on_initialize(number);
 
@@ -661,13 +712,13 @@ pub fn hydradx_run_to_next_block() {
 	let b = hydradx_runtime::System::block_number();
 
 	hydradx_runtime::System::on_finalize(b);
-	hydradx_runtime::EmaOracle::on_finalize(b);
 	hydradx_runtime::MultiTransactionPayment::on_finalize(b);
+	hydradx_runtime::EmaOracle::on_finalize(b);
 
 	hydradx_runtime::System::on_initialize(b + 1);
-	hydradx_runtime::EmaOracle::on_initialize(b + 1);
 	hydradx_runtime::MultiTransactionPayment::on_initialize(b + 1);
 	hydradx_runtime::DynamicEvmFee::on_initialize(b + 1);
+	hydradx_runtime::EmaOracle::on_initialize(b + 1);
 
 	hydradx_runtime::System::set_block_number(b + 1);
 }
@@ -687,11 +738,11 @@ pub fn hydradx_finalize_block() {
 	let b = hydradx_runtime::System::block_number();
 
 	hydradx_runtime::System::on_finalize(b);
-	hydradx_runtime::EmaOracle::on_finalize(b);
 	hydradx_runtime::MultiTransactionPayment::on_finalize(b);
+	hydradx_runtime::EmaOracle::on_finalize(b);
 }
 
-pub fn polkadot_run_to_block(to: BlockNumber) {
+pub fn rococo_run_to_block(to: BlockNumber) {
 	use frame_support::traits::OnFinalize;
 
 	while hydradx_runtime::System::block_number() < to {
@@ -699,16 +750,16 @@ pub fn polkadot_run_to_block(to: BlockNumber) {
 
 		hydradx_runtime::System::on_finalize(b);
 		hydradx_runtime::MultiTransactionPayment::on_finalize(b);
-		hydradx_runtime::EmaOracle::on_finalize(b);
-		hydradx_runtime::DCA::on_finalize(b);
 		hydradx_runtime::CircuitBreaker::on_finalize(b);
+		hydradx_runtime::DCA::on_finalize(b);
+		hydradx_runtime::EmaOracle::on_finalize(b);
 
 		hydradx_runtime::System::on_initialize(b + 1);
 		hydradx_runtime::MultiTransactionPayment::on_initialize(b + 1);
-		hydradx_runtime::EmaOracle::on_initialize(b + 1);
-		hydradx_runtime::DCA::on_initialize(b + 1);
 		hydradx_runtime::CircuitBreaker::on_initialize(b + 1);
 		hydradx_runtime::DynamicEvmFee::on_initialize(b + 1);
+		hydradx_runtime::DCA::on_initialize(b + 1);
+		hydradx_runtime::EmaOracle::on_initialize(b + 1);
 
 		hydradx_runtime::System::set_block_number(b + 1);
 	}
@@ -804,3 +855,19 @@ pub fn set_zero_reward_for_referrals(asset_id: AssetId) {
 		FeeDistribution::default(),
 	));
 }
+
+use xcm_emulator::pallet_message_queue;
+
+pub fn assert_xcm_message_processing_failed() {
+	assert!(hydradx_runtime::System::events().iter().any(|r| matches!(
+		r.event,
+		hydradx_runtime::RuntimeEvent::MessageQueue(pallet_message_queue::Event::Processed { success: false, .. })
+	)));
+}
+
+pub fn assert_xcm_message_processing_passed() {
+	assert!(hydradx_runtime::System::events().iter().any(|r| matches!(
+		r.event,
+		hydradx_runtime::RuntimeEvent::MessageQueue(pallet_message_queue::Event::Processed { success: true, .. })
+	)));
+}
diff --git a/integration-tests/src/referrals.rs b/integration-tests/src/referrals.rs
index 53cf8e901..136992a5b 100644
--- a/integration-tests/src/referrals.rs
+++ b/integration-tests/src/referrals.rs
@@ -339,7 +339,7 @@ fn buying_hdx_in_omnipool_should_transfer_correct_fee() {
 			u128::MAX,
 		));
 
-		expect_hydra_events(vec![pallet_omnipool::Event::BuyExecuted {
+		expect_hydra_last_events(vec![pallet_omnipool::Event::BuyExecuted {
 			who: BOB.into(),
 			asset_in: DAI,
 			asset_out: HDX,
@@ -376,7 +376,7 @@ fn buying_with_hdx_in_omnipool_should_transfer_correct_fee() {
 			u128::MAX,
 		));
 
-		expect_hydra_events(vec![pallet_omnipool::Event::BuyExecuted {
+		expect_hydra_last_events(vec![pallet_omnipool::Event::BuyExecuted {
 			who: BOB.into(),
 			asset_in: HDX,
 			asset_out: DAI,
@@ -434,7 +434,7 @@ fn transfer_using_mutate_should_emit_event() {
 			Preservation::Preserve
 		));
 
-		expect_hydra_events(vec![pallet_balances::Event::Transfer {
+		expect_hydra_last_events(vec![pallet_balances::Event::Transfer {
 			from: ALICE.into(),
 			to: BOB.into(),
 			amount: 1_000_000_000_000,
diff --git a/integration-tests/src/router.rs b/integration-tests/src/router.rs
index 4c9c11b05..34fffcda6 100644
--- a/integration-tests/src/router.rs
+++ b/integration-tests/src/router.rs
@@ -152,7 +152,7 @@ mod router_different_pools_tests {
 			assert_balance!(BOB.into(), HDX, BOB_INITIAL_NATIVE_BALANCE);
 			assert_balance!(BOB.into(), DOT, amount_out);
 
-			expect_hydra_events(vec![pallet_route_executor::Event::Executed {
+			expect_hydra_last_events(vec![pallet_route_executor::Event::Executed {
 				asset_in: DAI,
 				asset_out: DOT,
 				amount_in: amount_to_sell,
@@ -218,7 +218,7 @@ mod router_different_pools_tests {
 				assert_balance!(BOB.into(), stable_asset_1, 0);
 				assert_balance!(BOB.into(), stable_asset_2, amount_out);
 
-				expect_hydra_events(vec![pallet_route_executor::Event::Executed {
+				expect_hydra_last_events(vec![pallet_route_executor::Event::Executed {
 					asset_in: DAI,
 					asset_out: stable_asset_2,
 					amount_in: amount_to_sell,
@@ -281,7 +281,7 @@ mod router_different_pools_tests {
 			assert_balance!(BOB.into(), HDX, BOB_INITIAL_NATIVE_BALANCE);
 			assert_balance!(BOB.into(), DOT, amount_to_buy);
 
-			expect_hydra_events(vec![pallet_route_executor::Event::Executed {
+			expect_hydra_last_events(vec![pallet_route_executor::Event::Executed {
 				asset_in: DAI,
 				asset_out: DOT,
 				amount_in,
@@ -347,7 +347,7 @@ mod router_different_pools_tests {
 				assert_balance!(BOB.into(), stable_asset_1, 0);
 				assert_balance!(BOB.into(), stable_asset_2, amount_to_buy);
 
-				expect_hydra_events(vec![pallet_route_executor::Event::Executed {
+				expect_hydra_last_events(vec![pallet_route_executor::Event::Executed {
 					asset_in: DAI,
 					asset_out: stable_asset_2,
 					amount_in,
@@ -696,7 +696,7 @@ mod router_different_pools_tests {
 			//Act & Assert
 			assert_eq!(
 				RouterWeightInfo::sell_weight(trades.as_slice()),
-				hydradx_runtime::weights::omnipool::HydraWeight::<Runtime>::router_execution_sell(1, 1)
+				hydradx_runtime::weights::pallet_omnipool::HydraWeight::<Runtime>::router_execution_sell(1, 1)
 					.checked_add(&<OmnipoolHookAdapter<
 						RuntimeOrigin,
 						ConstU32<HDX>,
@@ -713,7 +713,9 @@ mod router_different_pools_tests {
 					> as OmnipoolHooks::<RuntimeOrigin, AccountId, AssetId, Balance>>::on_liquidity_changed_weight(
 					))
 					.unwrap()
-					.checked_add(&hydradx_runtime::weights::lbp::HydraWeight::<Runtime>::router_execution_sell(1, 1))
+					.checked_add(
+						&hydradx_runtime::weights::pallet_lbp::HydraWeight::<Runtime>::router_execution_sell(1, 1)
+					)
 					.unwrap()
 					.checked_add(
 						&RouterWeightInfo::sell_and_calculate_sell_trade_amounts_overhead_weight(0, 1)
@@ -724,7 +726,7 @@ mod router_different_pools_tests {
 			);
 			assert_eq!(
 				RouterWeightInfo::buy_weight(trades.as_slice()),
-				hydradx_runtime::weights::omnipool::HydraWeight::<Runtime>::router_execution_buy(1, 1)
+				hydradx_runtime::weights::pallet_omnipool::HydraWeight::<Runtime>::router_execution_buy(1, 1)
 					.checked_add(&<OmnipoolHookAdapter<
 						RuntimeOrigin,
 						ConstU32<HDX>,
@@ -741,7 +743,9 @@ mod router_different_pools_tests {
 					> as OmnipoolHooks::<RuntimeOrigin, AccountId, AssetId, Balance>>::on_liquidity_changed_weight(
 					))
 					.unwrap()
-					.checked_add(&hydradx_runtime::weights::lbp::HydraWeight::<Runtime>::router_execution_buy(1, 1))
+					.checked_add(
+						&hydradx_runtime::weights::pallet_lbp::HydraWeight::<Runtime>::router_execution_buy(1, 1)
+					)
 					.unwrap()
 					.checked_add(
 						&RouterWeightInfo::buy_and_calculate_buy_trade_amounts_overhead_weight(0, 1)
@@ -792,7 +796,7 @@ mod omnipool_router_tests {
 			assert_balance!(BOB.into(), HDX, BOB_INITIAL_NATIVE_BALANCE - amount_to_sell);
 			assert_balance!(BOB.into(), DAI, BOB_INITIAL_DAI_BALANCE + amount_out);
 
-			expect_hydra_events(vec![pallet_route_executor::Event::Executed {
+			expect_hydra_last_events(vec![pallet_route_executor::Event::Executed {
 				asset_in: HDX,
 				asset_out: DAI,
 				amount_in: amount_to_sell,
@@ -852,14 +856,14 @@ mod omnipool_router_tests {
 	}
 
 	#[test]
-	fn sell_should_fail_when_all_asset_in_spent_for_shitcoin() {
+	fn sell_should_fail_when_all_asset_in_spent_for_altcoin() {
 		TestNet::reset();
 
 		Hydra::execute_with(|| {
 			let _ = with_transaction(|| {
 				//Arrange
 				let name = b"SHITCO".to_vec();
-				let shitcoin = AssetRegistry::register_insufficient_asset(
+				let altcoin = AssetRegistry::register_insufficient_asset(
 					None,
 					Some(name.try_into().unwrap()),
 					AssetKind::External,
@@ -870,7 +874,7 @@ mod omnipool_router_tests {
 					None,
 				)
 				.unwrap();
-				assert_ok!(Currencies::deposit(shitcoin, &DAVE.into(), 100000 * UNITS,));
+				assert_ok!(Currencies::deposit(altcoin, &DAVE.into(), 100000 * UNITS,));
 				assert_ok!(Currencies::update_balance(
 					hydradx_runtime::RuntimeOrigin::root(),
 					DAVE.into(),
@@ -882,14 +886,14 @@ mod omnipool_router_tests {
 					RuntimeOrigin::signed(DAVE.into()),
 					HDX,
 					100000 * UNITS,
-					shitcoin,
+					altcoin,
 					100000 * UNITS,
 				));
 
 				let trades = vec![Trade {
 					pool: PoolType::XYK,
 					asset_in: HDX,
-					asset_out: shitcoin,
+					asset_out: altcoin,
 				}];
 
 				//Act
@@ -898,7 +902,7 @@ mod omnipool_router_tests {
 					Router::sell(
 						hydradx_runtime::RuntimeOrigin::signed(ALICE.into()),
 						HDX,
-						shitcoin,
+						altcoin,
 						amount_to_sell,
 						0,
 						trades
@@ -912,14 +916,14 @@ mod omnipool_router_tests {
 	}
 
 	#[test]
-	fn sell_should_pass_when_user_has_asset_in_covering_the_fee_for_shitcoin() {
+	fn sell_should_pass_when_user_has_asset_in_covering_the_fee_for_altcoin() {
 		TestNet::reset();
 
 		Hydra::execute_with(|| {
 			let _ = with_transaction(|| {
 				//Arrange
 				let name = b"SHITCO".to_vec();
-				let shitcoin = AssetRegistry::register_insufficient_asset(
+				let altcoin = AssetRegistry::register_insufficient_asset(
 					None,
 					Some(name.try_into().unwrap()),
 					AssetKind::External,
@@ -931,7 +935,7 @@ mod omnipool_router_tests {
 				)
 				.unwrap();
 
-				assert_ok!(Currencies::deposit(shitcoin, &DAVE.into(), 100000 * UNITS,));
+				assert_ok!(Currencies::deposit(altcoin, &DAVE.into(), 100000 * UNITS,));
 				assert_ok!(Currencies::update_balance(
 					hydradx_runtime::RuntimeOrigin::root(),
 					DAVE.into(),
@@ -943,14 +947,14 @@ mod omnipool_router_tests {
 					RuntimeOrigin::signed(DAVE.into()),
 					HDX,
 					100000 * UNITS,
-					shitcoin,
+					altcoin,
 					100000 * UNITS,
 				));
 
 				let trades = vec![Trade {
 					pool: PoolType::XYK,
 					asset_in: HDX,
-					asset_out: shitcoin,
+					asset_out: altcoin,
 				}];
 
 				//Act
@@ -958,7 +962,7 @@ mod omnipool_router_tests {
 				assert_ok!(Router::sell(
 					hydradx_runtime::RuntimeOrigin::signed(ALICE.into()),
 					HDX,
-					shitcoin,
+					altcoin,
 					amount_to_sell,
 					0,
 					trades
@@ -1443,7 +1447,7 @@ mod omnipool_router_tests {
 			assert_balance!(BOB.into(), LRNA, 1_000 * UNITS - amount_to_sell);
 			assert_balance!(BOB.into(), DAI, BOB_INITIAL_DAI_BALANCE + amount_out);
 
-			expect_hydra_events(vec![pallet_route_executor::Event::Executed {
+			expect_hydra_last_events(vec![pallet_route_executor::Event::Executed {
 				asset_in: LRNA,
 				asset_out: DAI,
 				amount_in: amount_to_sell,
@@ -1486,7 +1490,7 @@ mod omnipool_router_tests {
 			assert_balance!(BOB.into(), HDX, BOB_INITIAL_NATIVE_BALANCE - amount_to_sell);
 			assert_balance!(BOB.into(), DAI, BOB_INITIAL_DAI_BALANCE + amount_out);
 
-			expect_hydra_events(vec![pallet_route_executor::Event::Executed {
+			expect_hydra_last_events(vec![pallet_route_executor::Event::Executed {
 				asset_in: HDX,
 				asset_out: DAI,
 				amount_in: amount_to_sell,
@@ -1511,7 +1515,7 @@ mod omnipool_router_tests {
 			));
 
 			//Assert
-			expect_hydra_events(vec![pallet_omnipool::Event::SellExecuted {
+			expect_hydra_last_events(vec![pallet_omnipool::Event::SellExecuted {
 				who: BOB.into(),
 				asset_in: HDX,
 				asset_out: DAI,
@@ -1561,7 +1565,7 @@ mod omnipool_router_tests {
 			assert_balance!(BOB.into(), HDX, BOB_INITIAL_NATIVE_BALANCE - amount_in);
 			assert_balance!(BOB.into(), DAI, BOB_INITIAL_DAI_BALANCE + amount_to_buy);
 
-			expect_hydra_events(vec![pallet_route_executor::Event::Executed {
+			expect_hydra_last_events(vec![pallet_route_executor::Event::Executed {
 				asset_in: HDX,
 				asset_out: DAI,
 				amount_in,
@@ -1666,7 +1670,7 @@ mod omnipool_router_tests {
 			assert_balance!(BOB.into(), HDX, BOB_INITIAL_NATIVE_BALANCE - amount_in);
 			assert_balance!(BOB.into(), DAI, BOB_INITIAL_DAI_BALANCE + amount_to_buy);
 
-			expect_hydra_events(vec![pallet_route_executor::Event::Executed {
+			expect_hydra_last_events(vec![pallet_route_executor::Event::Executed {
 				asset_in: HDX,
 				asset_out: DAI,
 				amount_in,
@@ -1691,7 +1695,7 @@ mod omnipool_router_tests {
 			));
 
 			//Assert
-			expect_hydra_events(vec![pallet_omnipool::Event::BuyExecuted {
+			expect_hydra_last_events(vec![pallet_omnipool::Event::BuyExecuted {
 				who: BOB.into(),
 				asset_in: HDX,
 				asset_out: DAI,
@@ -1778,7 +1782,7 @@ mod lbp_router_tests {
 			assert_balance!(BOB.into(), HDX, BOB_INITIAL_NATIVE_BALANCE - amount_to_sell);
 			assert_balance!(BOB.into(), DAI, BOB_INITIAL_DAI_BALANCE + amount_out);
 
-			expect_hydra_events(vec![pallet_route_executor::Event::Executed {
+			expect_hydra_last_events(vec![pallet_route_executor::Event::Executed {
 				asset_in: HDX,
 				asset_out: DAI,
 				amount_in: amount_to_sell,
@@ -1821,7 +1825,7 @@ mod lbp_router_tests {
 			assert_balance!(BOB.into(), DAI, BOB_INITIAL_DAI_BALANCE - amount_to_sell);
 			assert_balance!(BOB.into(), HDX, BOB_INITIAL_NATIVE_BALANCE + amount_out);
 
-			expect_hydra_events(vec![pallet_route_executor::Event::Executed {
+			expect_hydra_last_events(vec![pallet_route_executor::Event::Executed {
 				asset_in: DAI,
 				asset_out: HDX,
 				amount_in: amount_to_sell,
@@ -1873,7 +1877,7 @@ mod lbp_router_tests {
 			assert_balance!(BOB.into(), DAI, BOB_INITIAL_DAI_BALANCE);
 			assert_balance!(BOB.into(), DOT, amount_out);
 
-			expect_hydra_events(vec![pallet_route_executor::Event::Executed {
+			expect_hydra_last_events(vec![pallet_route_executor::Event::Executed {
 				asset_in: HDX,
 				asset_out: DOT,
 				amount_in: amount_to_sell,
@@ -1925,7 +1929,7 @@ mod lbp_router_tests {
 			assert_balance!(BOB.into(), DAI, BOB_INITIAL_DAI_BALANCE);
 			assert_balance!(BOB.into(), DOT, amount_out);
 
-			expect_hydra_events(vec![pallet_route_executor::Event::Executed {
+			expect_hydra_last_events(vec![pallet_route_executor::Event::Executed {
 				asset_in: HDX,
 				asset_out: DOT,
 				amount_in: amount_to_sell,
@@ -1968,7 +1972,7 @@ mod lbp_router_tests {
 			assert_balance!(BOB.into(), HDX, BOB_INITIAL_NATIVE_BALANCE - amount_to_sell);
 			assert_balance!(BOB.into(), DAI, BOB_INITIAL_DAI_BALANCE + received_amount_out);
 
-			expect_hydra_events(vec![pallet_route_executor::Event::Executed {
+			expect_hydra_last_events(vec![pallet_route_executor::Event::Executed {
 				asset_in: HDX,
 				asset_out: DAI,
 				amount_in: amount_to_sell,
@@ -1994,7 +1998,7 @@ mod lbp_router_tests {
 			));
 
 			//Assert
-			expect_hydra_events(vec![pallet_lbp::Event::SellExecuted {
+			expect_hydra_last_events(vec![pallet_lbp::Event::SellExecuted {
 				who: BOB.into(),
 				asset_in: HDX,
 				asset_out: DAI,
@@ -2043,7 +2047,7 @@ mod lbp_router_tests {
 			assert_balance!(BOB.into(), HDX, BOB_INITIAL_NATIVE_BALANCE - amount_in);
 			assert_balance!(BOB.into(), DAI, BOB_INITIAL_DAI_BALANCE + amount_to_buy);
 
-			expect_hydra_events(vec![pallet_route_executor::Event::Executed {
+			expect_hydra_last_events(vec![pallet_route_executor::Event::Executed {
 				asset_in: HDX,
 				asset_out: DAI,
 				amount_in,
@@ -2086,7 +2090,7 @@ mod lbp_router_tests {
 			assert_balance!(BOB.into(), HDX, BOB_INITIAL_NATIVE_BALANCE + amount_to_buy);
 			assert_balance!(BOB.into(), DAI, BOB_INITIAL_DAI_BALANCE - amount_in);
 
-			expect_hydra_events(vec![pallet_route_executor::Event::Executed {
+			expect_hydra_last_events(vec![pallet_route_executor::Event::Executed {
 				asset_in: DAI,
 				asset_out: HDX,
 				amount_in,
@@ -2138,7 +2142,7 @@ mod lbp_router_tests {
 			assert_balance!(BOB.into(), DAI, BOB_INITIAL_DAI_BALANCE);
 			assert_balance!(BOB.into(), DOT, amount_to_buy);
 
-			expect_hydra_events(vec![pallet_route_executor::Event::Executed {
+			expect_hydra_last_events(vec![pallet_route_executor::Event::Executed {
 				asset_in: HDX,
 				asset_out: DOT,
 				amount_in,
@@ -2190,7 +2194,7 @@ mod lbp_router_tests {
 			assert_balance!(BOB.into(), DAI, BOB_INITIAL_DAI_BALANCE);
 			assert_balance!(BOB.into(), DOT, amount_to_buy);
 
-			expect_hydra_events(vec![pallet_route_executor::Event::Executed {
+			expect_hydra_last_events(vec![pallet_route_executor::Event::Executed {
 				asset_in: HDX,
 				asset_out: DOT,
 				amount_in,
@@ -2233,7 +2237,7 @@ mod lbp_router_tests {
 			assert_balance!(BOB.into(), HDX, BOB_INITIAL_NATIVE_BALANCE - spent_amount_in);
 			assert_balance!(BOB.into(), DAI, BOB_INITIAL_DAI_BALANCE + amount_to_buy);
 
-			expect_hydra_events(vec![pallet_route_executor::Event::Executed {
+			expect_hydra_last_events(vec![pallet_route_executor::Event::Executed {
 				asset_in: HDX,
 				asset_out: DAI,
 				amount_in: spent_amount_in,
@@ -2335,7 +2339,7 @@ mod xyk_router_tests {
 			assert_balance!(BOB.into(), HDX, BOB_INITIAL_NATIVE_BALANCE - amount_to_sell);
 			assert_balance!(BOB.into(), DOT, amount_out);
 
-			expect_hydra_events(vec![pallet_route_executor::Event::Executed {
+			expect_hydra_last_events(vec![pallet_route_executor::Event::Executed {
 				asset_in: HDX,
 				asset_out: DOT,
 				amount_in: amount_to_sell,
@@ -2398,7 +2402,7 @@ mod xyk_router_tests {
 			assert_balance!(BOB.into(), DAI, BOB_INITIAL_DAI_BALANCE);
 			assert_balance!(BOB.into(), DOT, amount_out);
 
-			expect_hydra_events(vec![pallet_route_executor::Event::Executed {
+			expect_hydra_last_events(vec![pallet_route_executor::Event::Executed {
 				asset_in: HDX,
 				asset_out: DOT,
 				amount_in: amount_to_sell,
@@ -2563,7 +2567,7 @@ mod xyk_router_tests {
 			assert_balance!(BOB.into(), HDX, BOB_INITIAL_NATIVE_BALANCE - amount_in);
 			assert_balance!(BOB.into(), DOT, amount_to_buy);
 
-			expect_hydra_events(vec![pallet_route_executor::Event::Executed {
+			expect_hydra_last_events(vec![pallet_route_executor::Event::Executed {
 				asset_in: HDX,
 				asset_out: DOT,
 				amount_in,
@@ -2618,7 +2622,7 @@ mod xyk_router_tests {
 			assert_balance!(BOB.into(), DOT, 0);
 			assert_balance!(BOB.into(), DAI, BOB_INITIAL_DAI_BALANCE + amount_to_buy);
 
-			expect_hydra_events(vec![pallet_route_executor::Event::Executed {
+			expect_hydra_last_events(vec![pallet_route_executor::Event::Executed {
 				asset_in: HDX,
 				asset_out: DAI,
 				amount_in,
@@ -2681,7 +2685,7 @@ mod xyk_router_tests {
 			assert_balance!(BOB.into(), LRNA, BOB_INITIAL_LRNA_BALANCE);
 			assert_balance!(BOB.into(), DAI, BOB_INITIAL_DAI_BALANCE + amount_to_buy);
 
-			expect_hydra_events(vec![pallet_route_executor::Event::Executed {
+			expect_hydra_last_events(vec![pallet_route_executor::Event::Executed {
 				asset_in: HDX,
 				asset_out: DAI,
 				amount_in,
@@ -4274,7 +4278,7 @@ mod with_on_chain_and_default_route {
 			assert_balance!(BOB.into(), HDX, BOB_INITIAL_NATIVE_BALANCE - amount_to_sell);
 			assert_balance!(BOB.into(), DAI, BOB_INITIAL_DAI_BALANCE + amount_out);
 
-			expect_hydra_events(vec![pallet_route_executor::Event::Executed {
+			expect_hydra_last_events(vec![pallet_route_executor::Event::Executed {
 				asset_in: HDX,
 				asset_out: DAI,
 				amount_in: amount_to_sell,
@@ -4311,7 +4315,7 @@ mod with_on_chain_and_default_route {
 			assert_balance!(BOB.into(), HDX, BOB_INITIAL_NATIVE_BALANCE - amount_in);
 			assert_balance!(BOB.into(), DAI, BOB_INITIAL_DAI_BALANCE + amount_to_buy);
 
-			expect_hydra_events(vec![pallet_route_executor::Event::Executed {
+			expect_hydra_last_events(vec![pallet_route_executor::Event::Executed {
 				asset_in: HDX,
 				asset_out: DAI,
 				amount_in,
diff --git a/integration-tests/src/staking.rs b/integration-tests/src/staking.rs
index 9ccf44872..7c4870855 100644
--- a/integration-tests/src/staking.rs
+++ b/integration-tests/src/staking.rs
@@ -21,7 +21,7 @@ use sp_runtime::AccountId32;
 use xcm_emulator::TestExt;
 
 type CallOf<T> = <T as frame_system::Config>::RuntimeCall;
-type BoundedCallOf<T> = Bounded<CallOf<T>>;
+type BoundedCallOf<T> = Bounded<CallOf<T>, <T as frame_system::Config>::Hashing>;
 type Schedule = VestingSchedule<BlockNumber, Balance>;
 
 fn vesting_schedule() -> Schedule {
diff --git a/integration-tests/src/transact_call_filter.rs b/integration-tests/src/transact_call_filter.rs
index f1c49ce1d..6f6f3f8ad 100644
--- a/integration-tests/src/transact_call_filter.rs
+++ b/integration-tests/src/transact_call_filter.rs
@@ -4,7 +4,8 @@ use crate::polkadot_test_net::*;
 use frame_support::{assert_ok, dispatch::GetDispatchInfo};
 use sp_runtime::codec::Encode;
 
-use polkadot_xcm::latest::prelude::*;
+use polkadot_xcm::v4::prelude::*;
+use sp_std::sync::Arc;
 use xcm_emulator::TestExt;
 
 #[test]
@@ -13,7 +14,7 @@ fn allowed_transact_call_should_pass_filter() {
 	TestNet::reset();
 
 	Hydra::execute_with(|| {
-		assert_ok!(hydradx_runtime::Balances::transfer(
+		assert_ok!(hydradx_runtime::Balances::transfer_allow_death(
 			hydradx_runtime::RuntimeOrigin::signed(ALICE.into()),
 			parachain_reserve_account(),
 			1_000 * UNITS,
@@ -22,30 +23,31 @@ fn allowed_transact_call_should_pass_filter() {
 
 	Acala::execute_with(|| {
 		// allowed by SafeCallFilter and the runtime call filter
-		let call = pallet_balances::Call::<hydradx_runtime::Runtime>::transfer {
+		let call = pallet_balances::Call::<hydradx_runtime::Runtime>::transfer_allow_death {
 			dest: BOB.into(),
 			value: UNITS,
 		};
+
+		let hdx_loc = Location::new(
+			1,
+			cumulus_primitives_core::Junctions::X2(Arc::new([
+				cumulus_primitives_core::Junction::Parachain(HYDRA_PARA_ID),
+				cumulus_primitives_core::Junction::GeneralIndex(0),
+			])),
+		);
+		let asset_to_withdraw: Asset = Asset {
+			id: cumulus_primitives_core::AssetId(hdx_loc.clone()),
+			fun: Fungible(900 * UNITS),
+		};
+		let asset_for_buy_execution: Asset = Asset {
+			id: cumulus_primitives_core::AssetId(hdx_loc),
+			fun: Fungible(800 * UNITS),
+		};
+
 		let message = Xcm(vec![
-			WithdrawAsset(
-				(
-					MultiLocation {
-						parents: 1,
-						interior: X2(Parachain(HYDRA_PARA_ID), GeneralIndex(0)),
-					},
-					900 * UNITS,
-				)
-					.into(),
-			),
+			WithdrawAsset(asset_to_withdraw.into()),
 			BuyExecution {
-				fees: (
-					MultiLocation {
-						parents: 1,
-						interior: X2(Parachain(HYDRA_PARA_ID), GeneralIndex(0)),
-					},
-					800 * UNITS,
-				)
-					.into(),
+				fees: asset_for_buy_execution,
 				weight_limit: Unlimited,
 			},
 			Transact {
@@ -57,7 +59,7 @@ fn allowed_transact_call_should_pass_filter() {
 			RefundSurplus,
 			DepositAsset {
 				assets: All.into(),
-				beneficiary: Junction::AccountId32 {
+				beneficiary: cumulus_primitives_core::Junction::AccountId32 {
 					id: parachain_reserve_account().into(),
 					network: None,
 				}
@@ -68,17 +70,20 @@ fn allowed_transact_call_should_pass_filter() {
 		// Act
 		assert_ok!(hydradx_runtime::PolkadotXcm::send_xcm(
 			Here,
-			MultiLocation::new(1, X1(Parachain(HYDRA_PARA_ID))),
+			Location::new(
+				1,
+				cumulus_primitives_core::Junctions::X1(Arc::new([cumulus_primitives_core::Junction::Parachain(
+					HYDRA_PARA_ID
+				)])),
+			),
 			message
 		));
 	});
 
 	Hydra::execute_with(|| {
 		// Assert
-		assert!(hydradx_runtime::System::events().iter().any(|r| matches!(
-			r.event,
-			hydradx_runtime::RuntimeEvent::XcmpQueue(cumulus_pallet_xcmp_queue::Event::Success { .. })
-		)));
+		assert_xcm_message_processing_passed();
+
 		assert_eq!(
 			hydradx_runtime::Balances::free_balance(AccountId::from(BOB)),
 			BOB_INITIAL_NATIVE_BALANCE + UNITS
@@ -92,7 +97,7 @@ fn blocked_transact_calls_should_not_pass_filter() {
 	TestNet::reset();
 
 	Hydra::execute_with(|| {
-		assert_ok!(hydradx_runtime::Balances::transfer(
+		assert_ok!(hydradx_runtime::Balances::transfer_allow_death(
 			hydradx_runtime::RuntimeOrigin::signed(ALICE.into()),
 			parachain_reserve_account(),
 			1_000 * UNITS,
@@ -105,26 +110,27 @@ fn blocked_transact_calls_should_not_pass_filter() {
 			reason: vec![0, 10],
 			who: BOB.into(),
 		};
+
+		let hdx_loc = Location::new(
+			1,
+			cumulus_primitives_core::Junctions::X2(Arc::new([
+				cumulus_primitives_core::Junction::Parachain(HYDRA_PARA_ID),
+				cumulus_primitives_core::Junction::GeneralIndex(0),
+			])),
+		);
+		let asset_to_withdraw: Asset = Asset {
+			id: cumulus_primitives_core::AssetId(hdx_loc.clone()),
+			fun: Fungible(900 * UNITS),
+		};
+		let asset_for_buy_execution: Asset = Asset {
+			id: cumulus_primitives_core::AssetId(hdx_loc),
+			fun: Fungible(800 * UNITS),
+		};
+
 		let message = Xcm(vec![
-			WithdrawAsset(
-				(
-					MultiLocation {
-						parents: 1,
-						interior: X2(Parachain(HYDRA_PARA_ID), GeneralIndex(0)),
-					},
-					900 * UNITS,
-				)
-					.into(),
-			),
+			WithdrawAsset(asset_to_withdraw.into()),
 			BuyExecution {
-				fees: (
-					MultiLocation {
-						parents: 1,
-						interior: X2(Parachain(HYDRA_PARA_ID), GeneralIndex(0)),
-					},
-					800 * UNITS,
-				)
-					.into(),
+				fees: asset_for_buy_execution,
 				weight_limit: Unlimited,
 			},
 			Transact {
@@ -136,7 +142,7 @@ fn blocked_transact_calls_should_not_pass_filter() {
 			RefundSurplus,
 			DepositAsset {
 				assets: All.into(),
-				beneficiary: Junction::AccountId32 {
+				beneficiary: cumulus_primitives_core::Junction::AccountId32 {
 					id: parachain_reserve_account().into(),
 					network: None,
 				}
@@ -147,20 +153,19 @@ fn blocked_transact_calls_should_not_pass_filter() {
 		// Act
 		assert_ok!(hydradx_runtime::PolkadotXcm::send_xcm(
 			Here,
-			MultiLocation::new(1, X1(Parachain(HYDRA_PARA_ID))),
+			Location::new(
+				1,
+				cumulus_primitives_core::Junctions::X1(Arc::new([cumulus_primitives_core::Junction::Parachain(
+					HYDRA_PARA_ID
+				)])),
+			),
 			message
 		));
 	});
 
 	Hydra::execute_with(|| {
 		// Assert
-		assert!(hydradx_runtime::System::events().iter().any(|r| matches!(
-			r.event,
-			hydradx_runtime::RuntimeEvent::XcmpQueue(cumulus_pallet_xcmp_queue::Event::Fail {
-				error: cumulus_primitives_core::XcmError::NoPermission,
-				..
-			})
-		)));
+		assert_xcm_message_processing_failed();
 	});
 }
 
@@ -170,7 +175,7 @@ fn safe_call_filter_should_respect_runtime_call_filter() {
 	TestNet::reset();
 
 	Hydra::execute_with(|| {
-		assert_ok!(hydradx_runtime::Balances::transfer(
+		assert_ok!(hydradx_runtime::Balances::transfer_allow_death(
 			hydradx_runtime::RuntimeOrigin::signed(ALICE.into()),
 			parachain_reserve_account(),
 			1_000 * UNITS,
@@ -179,30 +184,31 @@ fn safe_call_filter_should_respect_runtime_call_filter() {
 
 	Acala::execute_with(|| {
 		// transfer to the Omnipool is filtered by the runtime call filter
-		let call = pallet_balances::Call::<hydradx_runtime::Runtime>::transfer {
+		let call = pallet_balances::Call::<hydradx_runtime::Runtime>::transfer_allow_death {
 			dest: hydradx_runtime::Omnipool::protocol_account(),
 			value: UNITS,
 		};
+
+		let hdx_loc = Location::new(
+			1,
+			cumulus_primitives_core::Junctions::X2(Arc::new([
+				cumulus_primitives_core::Junction::Parachain(HYDRA_PARA_ID),
+				cumulus_primitives_core::Junction::GeneralIndex(0),
+			])),
+		);
+		let asset_to_withdraw: Asset = Asset {
+			id: cumulus_primitives_core::AssetId(hdx_loc.clone()),
+			fun: Fungible(900 * UNITS),
+		};
+		let asset_for_buy_execution: Asset = Asset {
+			id: cumulus_primitives_core::AssetId(hdx_loc),
+			fun: Fungible(800 * UNITS),
+		};
+
 		let message = Xcm(vec![
-			WithdrawAsset(
-				(
-					MultiLocation {
-						parents: 1,
-						interior: X2(Parachain(HYDRA_PARA_ID), GeneralIndex(0)),
-					},
-					900 * UNITS,
-				)
-					.into(),
-			),
+			WithdrawAsset(asset_to_withdraw.into()),
 			BuyExecution {
-				fees: (
-					MultiLocation {
-						parents: 1,
-						interior: X2(Parachain(HYDRA_PARA_ID), GeneralIndex(0)),
-					},
-					800 * UNITS,
-				)
-					.into(),
+				fees: asset_for_buy_execution,
 				weight_limit: Unlimited,
 			},
 			Transact {
@@ -214,7 +220,7 @@ fn safe_call_filter_should_respect_runtime_call_filter() {
 			RefundSurplus,
 			DepositAsset {
 				assets: All.into(),
-				beneficiary: Junction::AccountId32 {
+				beneficiary: cumulus_primitives_core::Junction::AccountId32 {
 					id: parachain_reserve_account().into(),
 					network: None,
 				}
@@ -225,19 +231,18 @@ fn safe_call_filter_should_respect_runtime_call_filter() {
 		// Act
 		assert_ok!(hydradx_runtime::PolkadotXcm::send_xcm(
 			Here,
-			MultiLocation::new(1, X1(Parachain(HYDRA_PARA_ID))),
+			Location::new(
+				1,
+				cumulus_primitives_core::Junctions::X1(Arc::new([cumulus_primitives_core::Junction::Parachain(
+					HYDRA_PARA_ID
+				)])),
+			),
 			message
 		));
 	});
 
 	Hydra::execute_with(|| {
 		// Assert
-		assert!(hydradx_runtime::System::events().iter().any(|r| matches!(
-			r.event,
-			hydradx_runtime::RuntimeEvent::XcmpQueue(cumulus_pallet_xcmp_queue::Event::Fail {
-				error: cumulus_primitives_core::XcmError::NoPermission,
-				..
-			})
-		)));
+		assert_xcm_message_processing_failed();
 	});
 }
diff --git a/integration-tests/src/utils/accounts.rs b/integration-tests/src/utils/accounts.rs
index f7f5ea9ba..5f252f92d 100644
--- a/integration-tests/src/utils/accounts.rs
+++ b/integration-tests/src/utils/accounts.rs
@@ -36,5 +36,3 @@ impl MockAccount {
 		Currencies::free_balance(asset, &self.0)
 	}
 }
-
-//pub(crate) static TreasuryAccount: MockAccount = MockAccount::new(Treasury::account_id());
diff --git a/integration-tests/src/xcm_defer.rs b/integration-tests/src/xcm_defer.rs
deleted file mode 100644
index 9aa2477ed..000000000
--- a/integration-tests/src/xcm_defer.rs
+++ /dev/null
@@ -1,32 +0,0 @@
-#![cfg(test)]
-use cumulus_pallet_xcmp_queue::WeightInfo;
-
-use hydradx_runtime::weights::xcmp_queue::HydraWeight;
-use hydradx_runtime::BlockWeights;
-use hydradx_runtime::{MaxBucketsProcessed, MaxDeferredMessages, ReservedXcmpWeight};
-
-#[test]
-fn xcmp_operations_should_fit_in_weight_budget() {
-	assert!(
-		HydraWeight::<hydradx_runtime::Runtime>::try_place_in_deferred_queue(MaxDeferredMessages::get())
-			.all_lte(ReservedXcmpWeight::get()),
-		"placing in deferred queue should fit in weight budget"
-	);
-	assert!(
-		HydraWeight::<hydradx_runtime::Runtime>::service_deferred(MaxBucketsProcessed::get())
-			.all_lte(ReservedXcmpWeight::get()),
-		"processing deferred queue should fit in weight budget"
-	);
-	// We take half the block weight as an arbitrary upper number for a reasonable weight here.
-	let half_block = BlockWeights::get().max_block / 2;
-	assert!(
-		HydraWeight::<hydradx_runtime::Runtime>::discard_deferred_bucket(MaxDeferredMessages::get())
-			.all_lte(half_block),
-		"discarding deferred messages should fit in block weight budget"
-	);
-	assert!(
-		HydraWeight::<hydradx_runtime::Runtime>::discard_deferred_individual(MaxDeferredMessages::get())
-			.all_lte(half_block),
-		"discarding deferred messages should fit in block weight budget"
-	);
-}
diff --git a/integration-tests/src/xcm_rate_limiter.rs b/integration-tests/src/xcm_rate_limiter.rs
deleted file mode 100644
index 5c5fc6725..000000000
--- a/integration-tests/src/xcm_rate_limiter.rs
+++ /dev/null
@@ -1,271 +0,0 @@
-#![cfg(test)]
-
-use crate::polkadot_test_net::*;
-
-use frame_support::{assert_ok, pallet_prelude::Weight};
-use hydradx_traits::registry::Mutate;
-use orml_traits::currency::MultiCurrency;
-use polkadot_xcm::prelude::*;
-use xcm_emulator::TestExt;
-
-/// Returns the message hash in the `XcmpMessageSent` event at the `n`th last event (1-indexed, so if the second to last
-/// event has the hash, pass `2`);
-fn get_message_hash_from_event(n: usize) -> Option<[u8; 32]> {
-	use cumulus_pallet_xcmp_queue::Event;
-	use hydradx_runtime::RuntimeEvent;
-	let RuntimeEvent::XcmpQueue(Event::XcmpMessageSent { message_hash }) = &last_hydra_events(n)[0] else {
-		panic!("expecting to find message sent event");
-	};
-	Some(*message_hash)
-}
-
-#[test]
-fn xcm_rate_limiter_should_limit_aca_when_limit_is_exceeded() {
-	// Arrange
-	TestNet::reset();
-
-	Hydra::execute_with(|| {
-		assert_ok!(hydradx_runtime::AssetRegistry::set_location(
-			ACA,
-			hydradx_runtime::AssetLocation(MultiLocation::new(1, X2(Parachain(ACALA_PARA_ID), GeneralIndex(0))))
-		));
-
-		// set an xcm rate limit
-		assert_ok!(hydradx_runtime::AssetRegistry::update(
-			hydradx_runtime::RuntimeOrigin::root(),
-			ACA,
-			None,
-			None,
-			None,
-			Some(50 * UNITS),
-			None,
-			None,
-			None,
-			None
-		));
-
-		assert_eq!(hydradx_runtime::Tokens::free_balance(ACA, &AccountId::from(BOB)), 0);
-
-		//Set it to same as the relay block number should be in XcmDeferFilter
-		//since we use different RelayChainBlockNumberProvider in runtime-benchmark feature
-		//where we return frame_system current time
-		frame_system::Pallet::<hydradx_runtime::Runtime>::set_block_number(4);
-	});
-
-	let amount = 100 * UNITS;
-	let mut message_hash = None;
-	Acala::execute_with(|| {
-		// Act
-		assert_ok!(hydradx_runtime::XTokens::transfer(
-			hydradx_runtime::RuntimeOrigin::signed(ALICE.into()),
-			0,
-			amount,
-			Box::new(
-				MultiLocation::new(
-					1,
-					X2(
-						Junction::Parachain(HYDRA_PARA_ID),
-						Junction::AccountId32 { id: BOB, network: None }
-					)
-				)
-				.into()
-			),
-			WeightLimit::Limited(Weight::from_parts(399_600_000_000, 0))
-		));
-
-		message_hash = get_message_hash_from_event(2);
-
-		// Assert
-		assert_eq!(
-			hydradx_runtime::Balances::free_balance(AccountId::from(ALICE)),
-			ALICE_INITIAL_NATIVE_BALANCE - amount
-		);
-	});
-
-	let relay_block = PolkadotRelay::execute_with(polkadot_runtime::System::block_number);
-
-	Hydra::execute_with(|| {
-		expect_hydra_events(vec![
-			cumulus_pallet_xcmp_queue::Event::XcmDeferred {
-				sender: ACALA_PARA_ID.into(),
-				sent_at: relay_block,
-				deferred_to: hydradx_runtime::DeferDuration::get() + relay_block - 1,
-				message_hash,
-				index: (hydradx_runtime::DeferDuration::get() + relay_block - 1, 0),
-				position: 0,
-			}
-			.into(),
-			pallet_relaychain_info::Event::CurrentBlockNumbers {
-				parachain_block_number: 5,
-				relaychain_block_number: relay_block + 1,
-			}
-			.into(),
-		]);
-		assert_eq!(hydradx_runtime::Tokens::free_balance(ACA, &AccountId::from(BOB)), 0);
-	});
-}
-
-#[test]
-fn xcm_rate_limiter_should_not_limit_aca_when_limit_is_not_exceeded() {
-	// Arrange
-	TestNet::reset();
-
-	Hydra::execute_with(|| {
-		assert_ok!(hydradx_runtime::AssetRegistry::set_location(
-			ACA,
-			hydradx_runtime::AssetLocation(MultiLocation::new(1, X2(Parachain(ACALA_PARA_ID), GeneralIndex(0))))
-		));
-
-		// set an xcm rate limit
-		assert_ok!(hydradx_runtime::AssetRegistry::update(
-			hydradx_runtime::RuntimeOrigin::root(),
-			ACA,
-			None,
-			None,
-			None,
-			Some(101 * UNITS),
-			None,
-			None,
-			None,
-			None
-		));
-	});
-
-	let amount = 100 * UNITS;
-	Acala::execute_with(|| {
-		// Act
-		assert_ok!(hydradx_runtime::XTokens::transfer(
-			hydradx_runtime::RuntimeOrigin::signed(ALICE.into()),
-			0,
-			amount,
-			Box::new(
-				MultiLocation::new(
-					1,
-					X2(
-						Junction::Parachain(HYDRA_PARA_ID),
-						Junction::AccountId32 { id: BOB, network: None }
-					)
-				)
-				.into()
-			),
-			WeightLimit::Limited(Weight::from_parts(399_600_000_000, 0))
-		));
-
-		// Assert
-		assert_eq!(
-			hydradx_runtime::Balances::free_balance(AccountId::from(ALICE)),
-			ALICE_INITIAL_NATIVE_BALANCE - amount
-		);
-	});
-
-	Hydra::execute_with(|| {
-		let fee = hydradx_runtime::Tokens::free_balance(ACA, &hydradx_runtime::Treasury::account_id());
-		assert_eq!(
-			hydradx_runtime::Tokens::free_balance(ACA, &AccountId::from(BOB)),
-			amount - fee
-		);
-	});
-}
-
-#[test]
-fn deferred_messages_should_be_executable_by_root() {
-	// Arrange
-	TestNet::reset();
-
-	Hydra::execute_with(|| {
-		assert_ok!(hydradx_runtime::AssetRegistry::set_location(
-			ACA,
-			hydradx_runtime::AssetLocation(MultiLocation::new(1, X2(Parachain(ACALA_PARA_ID), GeneralIndex(0))))
-		));
-
-		// set an xcm rate limit
-		assert_ok!(hydradx_runtime::AssetRegistry::update(
-			hydradx_runtime::RuntimeOrigin::root(),
-			ACA,
-			None,
-			None,
-			None,
-			Some(50 * UNITS),
-			None,
-			None,
-			None,
-			None
-		));
-
-		assert_eq!(hydradx_runtime::Tokens::free_balance(ACA, &AccountId::from(BOB)), 0);
-
-		//Set it to same as the relay block number should be in XcmDeferFilter
-		//since we use different RelayChainBlockNumberProvider in runtime-benchmark feature
-		//where we return frame_system current time
-		frame_system::Pallet::<hydradx_runtime::Runtime>::set_block_number(4);
-	});
-
-	let amount = 100 * UNITS;
-	let mut message_hash = None;
-	let max_weight = Weight::from_parts(399_600_000_000, 0);
-	Acala::execute_with(|| {
-		// Act
-		assert_ok!(hydradx_runtime::XTokens::transfer(
-			hydradx_runtime::RuntimeOrigin::signed(ALICE.into()),
-			0,
-			amount,
-			Box::new(
-				MultiLocation::new(
-					1,
-					X2(
-						Junction::Parachain(HYDRA_PARA_ID),
-						Junction::AccountId32 { id: BOB, network: None }
-					)
-				)
-				.into()
-			),
-			WeightLimit::Limited(max_weight),
-		));
-
-		message_hash = get_message_hash_from_event(2);
-
-		// Assert
-		assert_eq!(
-			hydradx_runtime::Balances::free_balance(AccountId::from(ALICE)),
-			ALICE_INITIAL_NATIVE_BALANCE - amount
-		);
-	});
-
-	let relay_block = PolkadotRelay::execute_with(polkadot_runtime::System::block_number);
-
-	Hydra::execute_with(|| {
-		expect_hydra_events(vec![
-			cumulus_pallet_xcmp_queue::Event::XcmDeferred {
-				sender: ACALA_PARA_ID.into(),
-				sent_at: relay_block,
-				deferred_to: hydradx_runtime::DeferDuration::get() + relay_block - 1,
-				message_hash,
-				index: (hydradx_runtime::DeferDuration::get() + relay_block - 1, 0),
-				position: 0,
-			}
-			.into(),
-			pallet_relaychain_info::Event::CurrentBlockNumbers {
-				parachain_block_number: 5,
-				relaychain_block_number: relay_block + 1,
-			}
-			.into(),
-		]);
-		assert_eq!(hydradx_runtime::Tokens::free_balance(ACA, &AccountId::from(BOB)), 0);
-
-		set_relaychain_block_number(hydradx_runtime::DeferDuration::get() + relay_block);
-
-		assert_eq!(hydradx_runtime::Tokens::free_balance(ACA, &AccountId::from(BOB)), 0);
-		assert_ok!(hydradx_runtime::XcmpQueue::service_deferred(
-			hydradx_runtime::RuntimeOrigin::root(),
-			hydradx_runtime::ReservedXcmpWeight::get(),
-			ACALA_PARA_ID.into(),
-			hydradx_runtime::MaxDeferredBuckets::get(),
-		));
-
-		let fee = hydradx_runtime::Tokens::free_balance(ACA, &hydradx_runtime::Treasury::account_id());
-		assert_eq!(
-			hydradx_runtime::Tokens::free_balance(ACA, &AccountId::from(BOB)),
-			amount - fee
-		);
-	});
-}
diff --git a/node/Cargo.toml b/node/Cargo.toml
index fcd2797fe..2fb7d1203 100644
--- a/node/Cargo.toml
+++ b/node/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "hydradx"
-version = "12.3.0"
+version = "13.1.0"
 description = "HydraDX node"
 authors = ["GalacticCouncil"]
 edition = "2021"
@@ -20,7 +20,7 @@ hydra-dx-build-script-utils = { workspace = true }
 [dependencies]
 codec = { package = "parity-scale-codec", version = "3.4.0" }
 hex-literal = "0.3.4"
-jsonrpsee = { version = "0.16.2", features = ["server", "macros"] }
+jsonrpsee = { version = "0.20.3", features = ["server", "macros"] }
 log = "0.4.17"
 serde = { version = "1.0.136", features = ["derive"] }
 serde_json = "1.0.85"
@@ -54,6 +54,7 @@ sc-transaction-pool = { workspace = true }
 sc-transaction-pool-api = { workspace = true }
 sc-sysinfo = { workspace = true }
 sp-api = { workspace = true }
+sp-std = { workspace = true }
 sp-block-builder = { workspace = true }
 sp-blockchain = { workspace = true }
 sp-consensus = { workspace = true }
diff --git a/node/src/chain_spec/local.rs b/node/src/chain_spec/local.rs
index 38246ddd4..af7c434bd 100644
--- a/node/src/chain_spec/local.rs
+++ b/node/src/chain_spec/local.rs
@@ -10,141 +10,134 @@ pub fn parachain_config() -> Result<ChainSpec, String> {
 	properties.insert("tokenDecimals".into(), TOKEN_DECIMALS.into());
 	properties.insert("tokenSymbol".into(), TOKEN_SYMBOL.into());
 
-	Ok(ChainSpec::from_genesis(
-		// Name
-		"HydraDX Local Testnet",
-		// ID
-		"local_testnet",
-		ChainType::Local,
-		move || {
-			parachain_genesis(
-				wasm_binary,
-				// Sudo account
-				get_account_id_from_seed::<sr25519::Public>("Alice"),
-				// initial authorities & invulnerables
+	let genesis_json = parachain_genesis(
+		// Sudo account
+		get_account_id_from_seed::<sr25519::Public>("Alice"),
+		// initial authorities & invulnerables
+		(
+			vec![
 				(
-					vec![
-						(
-							get_account_id_from_seed::<sr25519::Public>("Alice"),
-							get_from_seed::<AuraId>("Alice"),
-						),
-						(
-							get_account_id_from_seed::<sr25519::Public>("Bob"),
-							get_from_seed::<AuraId>("Bob"),
-						),
-					],
-					// candidacy bond
-					10_000 * UNITS,
-				),
-				// Pre-funded accounts
-				vec![
-					(get_account_id_from_seed::<sr25519::Public>("Alice"), INITIAL_BALANCE),
-					(get_account_id_from_seed::<sr25519::Public>("Bob"), INITIAL_BALANCE),
-					(get_account_id_from_seed::<sr25519::Public>("Charlie"), INITIAL_BALANCE),
-					(get_account_id_from_seed::<sr25519::Public>("Dave"), INITIAL_BALANCE),
-					(get_account_id_from_seed::<sr25519::Public>("Eve"), INITIAL_BALANCE),
-					(get_account_id_from_seed::<sr25519::Public>("Ferdie"), INITIAL_BALANCE),
-					(
-						get_account_id_from_seed::<sr25519::Public>("Alice//stash"),
-						INITIAL_BALANCE,
-					),
-					(
-						get_account_id_from_seed::<sr25519::Public>("Bob//stash"),
-						INITIAL_BALANCE,
-					),
-					(
-						get_account_id_from_seed::<sr25519::Public>("Charlie//stash"),
-						INITIAL_BALANCE,
-					),
-					(
-						get_account_id_from_seed::<sr25519::Public>("Dave//stash"),
-						INITIAL_BALANCE,
-					),
-					(
-						get_account_id_from_seed::<sr25519::Public>("Eve//stash"),
-						INITIAL_BALANCE,
-					),
-					(
-						get_account_id_from_seed::<sr25519::Public>("Ferdie//stash"),
-						INITIAL_BALANCE,
-					),
-				],
-				// council members
-				vec![get_account_id_from_seed::<sr25519::Public>("Alice")],
-				// technical committee members
-				vec![
 					get_account_id_from_seed::<sr25519::Public>("Alice"),
+					get_from_seed::<AuraId>("Alice"),
+				),
+				(
 					get_account_id_from_seed::<sr25519::Public>("Bob"),
-					get_account_id_from_seed::<sr25519::Public>("Eve"),
-				],
-				// vestings
-				vec![],
-				// registered assets
-				vec![
-					(
-						Some(1),
-						Some(b"KSM".to_vec().try_into().expect("Name is too long")),
-						1_000u128,
-						None,
-						None,
-						None,
-						true,
-					),
-					(
-						Some(2),
-						Some(b"KUSD".to_vec().try_into().expect("Name is too long")),
-						1_000u128,
-						None,
-						None,
-						None,
-						true,
-					),
-				],
-				// accepted assets
-				vec![(1, Price::from_float(0.0000212)), (2, Price::from_float(0.000806))],
-				// token balances
-				vec![
-					(
-						get_account_id_from_seed::<sr25519::Public>("Alice"),
-						vec![(1, INITIAL_TOKEN_BALANCE), (2, INITIAL_TOKEN_BALANCE)],
-					),
-					(
-						get_account_id_from_seed::<sr25519::Public>("Bob"),
-						vec![(1, INITIAL_TOKEN_BALANCE), (2, INITIAL_TOKEN_BALANCE)],
-					),
-				],
-				// claims data
-				create_testnet_claims(),
-				// elections
-				vec![
-					(get_account_id_from_seed::<sr25519::Public>("Alice"), STASH / 5),
-					(get_account_id_from_seed::<sr25519::Public>("Bob"), STASH / 5),
-					(get_account_id_from_seed::<sr25519::Public>("Eve"), STASH / 5),
-				],
-				// parachain ID
-				PARA_ID.into(),
-				DusterConfig {
-					account_blacklist: vec![get_account_id_from_seed::<sr25519::Public>("Duster")],
-					reward_account: Some(get_account_id_from_seed::<sr25519::Public>("Duster")),
-					dust_account: Some(get_account_id_from_seed::<sr25519::Public>("Duster")),
-				},
-			)
-		},
-		// Bootnodes
+					get_from_seed::<AuraId>("Bob"),
+				),
+			],
+			// candidacy bond
+			10_000 * UNITS,
+		),
+		// Pre-funded accounts
+		vec![
+			(get_account_id_from_seed::<sr25519::Public>("Alice"), INITIAL_BALANCE),
+			(get_account_id_from_seed::<sr25519::Public>("Bob"), INITIAL_BALANCE),
+			(get_account_id_from_seed::<sr25519::Public>("Charlie"), INITIAL_BALANCE),
+			(get_account_id_from_seed::<sr25519::Public>("Dave"), INITIAL_BALANCE),
+			(get_account_id_from_seed::<sr25519::Public>("Eve"), INITIAL_BALANCE),
+			(get_account_id_from_seed::<sr25519::Public>("Ferdie"), INITIAL_BALANCE),
+			(
+				get_account_id_from_seed::<sr25519::Public>("Alice//stash"),
+				INITIAL_BALANCE,
+			),
+			(
+				get_account_id_from_seed::<sr25519::Public>("Bob//stash"),
+				INITIAL_BALANCE,
+			),
+			(
+				get_account_id_from_seed::<sr25519::Public>("Charlie//stash"),
+				INITIAL_BALANCE,
+			),
+			(
+				get_account_id_from_seed::<sr25519::Public>("Dave//stash"),
+				INITIAL_BALANCE,
+			),
+			(
+				get_account_id_from_seed::<sr25519::Public>("Eve//stash"),
+				INITIAL_BALANCE,
+			),
+			(
+				get_account_id_from_seed::<sr25519::Public>("Ferdie//stash"),
+				INITIAL_BALANCE,
+			),
+		],
+		// council members
+		vec![get_account_id_from_seed::<sr25519::Public>("Alice")],
+		// technical committee members
+		vec![
+			get_account_id_from_seed::<sr25519::Public>("Alice"),
+			get_account_id_from_seed::<sr25519::Public>("Bob"),
+			get_account_id_from_seed::<sr25519::Public>("Eve"),
+		],
+		// vestings
 		vec![],
-		// Telemetry
-		None,
-		// Protocol ID
-		Some(PROTOCOL_ID),
-		// Fork ID
-		None,
-		// Properties
-		Some(properties),
-		// Extensions
+		// registered assets
+		vec![
+			(
+				Some(1),
+				Some(b"KSM".to_vec().try_into().expect("Name is too long")),
+				1_000u128,
+				None,
+				None,
+				None,
+				true,
+			),
+			(
+				Some(2),
+				Some(b"KUSD".to_vec().try_into().expect("Name is too long")),
+				1_000u128,
+				None,
+				None,
+				None,
+				true,
+			),
+		],
+		// accepted assets
+		vec![(1, Price::from_float(0.0000212)), (2, Price::from_float(0.000806))],
+		// token balances
+		vec![
+			(
+				get_account_id_from_seed::<sr25519::Public>("Alice"),
+				vec![(1, INITIAL_TOKEN_BALANCE), (2, INITIAL_TOKEN_BALANCE)],
+			),
+			(
+				get_account_id_from_seed::<sr25519::Public>("Bob"),
+				vec![(1, INITIAL_TOKEN_BALANCE), (2, INITIAL_TOKEN_BALANCE)],
+			),
+		],
+		// claims data
+		create_testnet_claims(),
+		// elections
+		vec![
+			(get_account_id_from_seed::<sr25519::Public>("Alice"), STASH / 5),
+			(get_account_id_from_seed::<sr25519::Public>("Bob"), STASH / 5),
+			(get_account_id_from_seed::<sr25519::Public>("Eve"), STASH / 5),
+		],
+		// parachain ID
+		PARA_ID.into(),
+		DusterConfig {
+			account_blacklist: vec![get_account_id_from_seed::<sr25519::Public>("Duster")],
+			reward_account: Some(get_account_id_from_seed::<sr25519::Public>("Duster")),
+			dust_account: Some(get_account_id_from_seed::<sr25519::Public>("Duster")),
+		},
+	);
+
+	let chain_spec = ChainSpec::builder(
+		wasm_binary,
 		Extensions {
 			relay_chain: "rococo-local".into(),
 			para_id: PARA_ID,
 			evm_since: 1,
 		},
-	))
+	)
+	.with_name("HydraDX Local Testnet")
+	.with_id("local_testnet")
+	.with_chain_type(ChainType::Local)
+	.with_boot_nodes(vec![])
+	.with_properties(properties)
+	.with_protocol_id(PROTOCOL_ID)
+	.with_genesis_config_patch(genesis_json)
+	.build();
+
+	Ok(chain_spec)
 }
diff --git a/node/src/chain_spec/mod.rs b/node/src/chain_spec/mod.rs
index 713c4160c..d0ba40231 100644
--- a/node/src/chain_spec/mod.rs
+++ b/node/src/chain_spec/mod.rs
@@ -28,10 +28,8 @@ pub mod staging;
 use cumulus_primitives_core::ParaId;
 use hex_literal::hex;
 use hydradx_runtime::{
-	pallet_claims::EthereumAddress, AccountId, AssetRegistryConfig, AuraId, Balance, BalancesConfig, ClaimsConfig,
-	CollatorSelectionConfig, CouncilConfig, DusterConfig, ElectionsConfig, GenesisHistoryConfig,
-	MultiTransactionPaymentConfig, ParachainInfoConfig, RegistryStrLimit, RuntimeGenesisConfig, SessionConfig,
-	Signature, SystemConfig, TechnicalCommitteeConfig, TokensConfig, VestingConfig, WASM_BINARY,
+	pallet_claims::EthereumAddress, AccountId, AuraId, Balance, DusterConfig, RegistryStrLimit, RuntimeGenesisConfig,
+	Signature, WASM_BINARY,
 };
 use primitives::{
 	constants::currency::{NATIVE_EXISTENTIAL_DEPOSIT, UNITS},
@@ -94,7 +92,6 @@ where
 
 #[allow(clippy::type_complexity)]
 pub fn parachain_genesis(
-	wasm_binary: &[u8],
 	_root_key: AccountId,
 	initial_authorities: (Vec<(AccountId, AuraId)>, Balance), // (initial auths, candidacy bond)
 	endowed_accounts: Vec<(AccountId, Balance)>,
@@ -116,109 +113,115 @@ pub fn parachain_genesis(
 	elections: Vec<(AccountId, Balance)>,
 	parachain_id: ParaId,
 	duster: DusterConfig,
-) -> RuntimeGenesisConfig {
-	RuntimeGenesisConfig {
-		system: SystemConfig {
-			// Add Wasm runtime to storage.
-			code: wasm_binary.to_vec(),
-			..Default::default()
-		},
-		session: SessionConfig {
-			keys: initial_authorities
-				.0
+) -> serde_json::Value {
+	serde_json::json!({
+	"system": {},
+	"session": {
+		"keys": initial_authorities
+			.0
+			.iter()
+			.cloned()
+			.map(|(acc, aura)| {
+				(
+					acc.clone(),                                   // account id
+					acc,                                           // validator id
+					hydradx_runtime::opaque::SessionKeys { aura }, // session keys
+				)
+			})
+			.collect::<Vec<_>>(),
+	},
+	"aura": {
+		"authorities": Vec::<sp_consensus_aura::sr25519::AuthorityId>::new()
+	},
+	"collatorSelection": {
+		"invulnerables": initial_authorities.0.iter().cloned().map(|(acc, _)| acc).collect::<Vec<_>>(),
+		"candidacyBond": initial_authorities.1,
+		"desiredCandidates": 0u32,
+	},
+	"balances": {
+		"balances": endowed_accounts
+			.iter()
+			.cloned()
+			.map(|k| (k.0.clone(), k.1 * UNITS))
+			.collect::<Vec<_>>(),
+	},
+	"council": {
+		"members": council_members,
+	},
+	"technicalCommittee": {
+		"members": tech_committee_members,
+	},
+	"vesting": { "vesting": vesting_list },
+	"assetRegistry": {
+		"registeredAssets": registered_assets.clone(),
+		"nativeAssetName": <Vec<u8> as TryInto<BoundedVec<u8, hydradx_runtime::RegistryStrLimit>>>::try_into(TOKEN_SYMBOL.as_bytes().to_vec())
+			.expect("Native asset name is too long."),
+		"nativeExistentialDeposit": NATIVE_EXISTENTIAL_DEPOSIT,
+		"nativeSymbol": <Vec<u8> as TryInto<BoundedVec<u8, hydradx_runtime::RegistryStrLimit>>>::try_into(TOKEN_SYMBOL.as_bytes().to_vec())
+			.expect("Native symbol is too long."),
+		"nativeDecimals": TOKEN_DECIMALS,
+	},
+	"multiTransactionPayment": {
+		"currencies": accepted_assets,
+		"accountCurrencies": Vec::<(AccountId, AssetId)>::new(),
+	},
+	"tokens": {
+		"balances": if registered_assets.is_empty() {
+			vec![]
+		} else {
+			token_balances
 				.iter()
-				.cloned()
-				.map(|(acc, aura)| {
-					(
-						acc.clone(),                                   // account id
-						acc,                                           // validator id
-						hydradx_runtime::opaque::SessionKeys { aura }, // session keys
-					)
+				.flat_map(|x| {
+					x.1.clone()
+						.into_iter()
+						.map(|(asset_id, amount)| (x.0.clone(), asset_id, amount))
 				})
-				.collect(),
-		},
-		// no need to pass anything, it will panic if we do. Session will take care
-		// of this.
-		aura: Default::default(),
-		collator_selection: CollatorSelectionConfig {
-			invulnerables: initial_authorities.0.iter().cloned().map(|(acc, _)| acc).collect(),
-			candidacy_bond: initial_authorities.1,
-			..Default::default()
-		},
-		balances: BalancesConfig {
-			// Configure endowed accounts with initial balance of a lot.
-			balances: endowed_accounts.iter().cloned().map(|k| (k.0, k.1 * UNITS)).collect(),
-		},
-		council: CouncilConfig {
-			// Intergalactic council member
-			members: council_members,
-			phantom: Default::default(),
-		},
-		technical_committee: TechnicalCommitteeConfig {
-			members: tech_committee_members,
-			phantom: Default::default(),
-		},
-		vesting: VestingConfig { vesting: vesting_list },
-		asset_registry: AssetRegistryConfig {
-			registered_assets: registered_assets.clone(),
-			native_asset_name: TOKEN_SYMBOL
-				.as_bytes()
-				.to_vec()
-				.try_into()
-				.expect("Native asset name is too long."),
-			native_existential_deposit: NATIVE_EXISTENTIAL_DEPOSIT,
-			native_symbol: TOKEN_SYMBOL
-				.as_bytes()
-				.to_vec()
-				.try_into()
-				.expect("Native symbol is too long."),
-			native_decimals: TOKEN_DECIMALS,
-		},
-		multi_transaction_payment: MultiTransactionPaymentConfig {
-			currencies: accepted_assets,
-			account_currencies: vec![],
-		},
-		tokens: TokensConfig {
-			balances: if registered_assets.is_empty() {
-				vec![]
-			} else {
-				token_balances
-					.iter()
-					.flat_map(|x| {
-						x.1.clone()
-							.into_iter()
-							.map(|(asset_id, amount)| (x.0.clone(), asset_id, amount))
-					})
-					.collect()
-			},
-		},
-		treasury: Default::default(),
-		elections: ElectionsConfig {
-			// Intergalactic elections
-			members: elections,
-		},
-
-		genesis_history: GenesisHistoryConfig::default(),
-		claims: ClaimsConfig { claims: claims_data },
-		parachain_info: ParachainInfoConfig {
-			parachain_id,
-			..Default::default()
-		},
-		aura_ext: Default::default(),
-		polkadot_xcm: Default::default(),
-		ema_oracle: Default::default(),
-		duster,
-		omnipool_warehouse_lm: Default::default(),
-		omnipool_liquidity_mining: Default::default(),
-		evm_chain_id: hydradx_runtime::EVMChainIdConfig {
-			chain_id: 2_222_222u32.into(),
-			..Default::default()
+			.collect::<Vec<_>>()
 		},
-		ethereum: Default::default(),
-		evm: Default::default(),
-		xyk_warehouse_lm: Default::default(),
-		xyk_liquidity_mining: Default::default(),
+	},
+	"treasury": {
+	},
+	"elections": {
+		"members": elections,
+	},
+	"genesisHistory": {
+		"previousChain": hydradx_runtime::Chain::default()
+	},
+	"claims": { "claims": claims_data },
+	"parachainInfo": {
+		"parachainId": parachain_id,
+	},
+	"auraExt": {
+	},
+	"polkadotXcm": {
+		"safeXcmVersion": hydradx_runtime::xcm::XcmGenesisConfig::<hydradx_runtime::Runtime>::default().safe_xcm_version
+	},
+	"emaOracle": {
+		"initialData": Vec::<(hydradx_runtime::Source, (AssetId, AssetId), Price, hydradx_runtime::Liquidity<Balance>)>::new()
+	},
+	"duster": {
+		"accountBlacklist": duster.account_blacklist,
+		"rewardAccount": duster.reward_account,
+		"dustAccount": duster.dust_account
+	},
+	"omnipoolWarehouseLm": {
+	},
+	"omnipoolLiquidityMining": {
+	},
+	"evmChainId": {
+		"chainId": 2_222_222u64,
+	},
+	"ethereum": {
+	},
+	"evm": {
+		"accounts": sp_std::collections::btree_map::BTreeMap::<sp_core::H160, hydradx_runtime::evm::EvmGenesisAccount>::new()
+	},
+	"xykWarehouseLm": {
+	},
+	"xykLiquidityMining": {
+	},
 	}
+	)
 }
 
 pub fn create_testnet_claims() -> Vec<(EthereumAddress, Balance)> {
diff --git a/node/src/chain_spec/rococo.rs b/node/src/chain_spec/rococo.rs
index a2d7228fd..24c42689e 100644
--- a/node/src/chain_spec/rococo.rs
+++ b/node/src/chain_spec/rococo.rs
@@ -15,128 +15,119 @@ pub fn parachain_config() -> Result<ChainSpec, String> {
 
 pub fn _parachain_config_rococo() -> Result<ChainSpec, String> {
 	let wasm_binary = WASM_BINARY.ok_or("Development wasm binary not available".to_string())?;
+
 	let mut properties = Map::new();
 	properties.insert("tokenDecimals".into(), TOKEN_DECIMALS.into());
 	properties.insert("tokenSymbol".into(), TOKEN_SYMBOL.into());
 
-	Ok(ChainSpec::from_genesis(
-		// Name
-		"HydraDX testnet",
-		// ID
-		"hydra_rococo",
-		ChainType::Live,
-		move || {
-			parachain_genesis(
-				wasm_binary,
-				// Sudo account
-				// Galactic Council
-				// 7JcAAB6cXQxVQyVLksPUdthJwcoEGm8SW9hsNgdP6hjme5J1
-				hex!["2cb1a0ef4ce819893905e3a6a8e46b652c43aee6c154921220902cabfdcfdd07"].into(),
-				// initial authorities & invulnerable collators
+	let genesis_json = parachain_genesis(
+		// Sudo account
+		// Galactic Council
+		// 7JcAAB6cXQxVQyVLksPUdthJwcoEGm8SW9hsNgdP6hjme5J1
+		hex!["2cb1a0ef4ce819893905e3a6a8e46b652c43aee6c154921220902cabfdcfdd07"].into(),
+		// initial authorities & invulnerable collators
+		(
+			vec![
 				(
-					vec![
-						(
-							// 5DvFqJq182asuR9EKoBBJBGEnZwpMHvuBrYpiMdr4hS8B6Eh
-							hex!["5206e6a18c96bab98f459ab636226481699220cf94346d766cd1142557a2fc66"].into(),
-							hex!["5206e6a18c96bab98f459ab636226481699220cf94346d766cd1142557a2fc66"].unchecked_into(),
-						),
-						(
-							// 5Fbc5bQp1bHfNpx8yuTshYK1pNhBbajZyaosRNvuyM3KRiMz
-							hex!["9c45dc3b15cd55531cad1e4c21cacb47611be54e3da6bf5be451f5e578a68344"].into(),
-							hex!["9c45dc3b15cd55531cad1e4c21cacb47611be54e3da6bf5be451f5e578a68344"].unchecked_into(),
-						),
-						(
-							// 5CAP1unPwP9RnvNcJn7YSZy1A8Snv5fGebuWMU99vpaJcfjh
-							hex!["04540c9406af2f5bf34f948dd1c7f029892247c2e1472b7cd51c188e4e0c2f2b"].into(),
-							hex!["04540c9406af2f5bf34f948dd1c7f029892247c2e1472b7cd51c188e4e0c2f2b"].unchecked_into(),
-						),
-						(
-							// 5GrzdLdMFuV6ZvWQjYUhVEpZQFoSxkLboKY3xeEdEjNUPoH7
-							hex!["d43ead05edb218c199fc0dfe36ec9389f509d8447e43109e1cb04305de4f9359"].into(),
-							hex!["d43ead05edb218c199fc0dfe36ec9389f509d8447e43109e1cb04305de4f9359"].unchecked_into(),
-						),
-						(
-							// 5G9gRv1GE8HPsjXnNm8By2SWuasTan5gU2AZm8pundyduHTM
-							hex!["b4bc5b99d9207ab2aadd222581809b53372e7e17c4eaa88742f3501f3044bf27"].into(),
-							hex!["b4bc5b99d9207ab2aadd222581809b53372e7e17c4eaa88742f3501f3044bf27"].unchecked_into(),
-						),
-					],
-					10_000 * UNITS,
+					// 5DvFqJq182asuR9EKoBBJBGEnZwpMHvuBrYpiMdr4hS8B6Eh
+					hex!["5206e6a18c96bab98f459ab636226481699220cf94346d766cd1142557a2fc66"].into(),
+					hex!["5206e6a18c96bab98f459ab636226481699220cf94346d766cd1142557a2fc66"].unchecked_into(),
 				),
-				// Pre-funded accounts
-				vec![(
-					// Galactic Council
-					// 7JcAAB6cXQxVQyVLksPUdthJwcoEGm8SW9hsNgdP6hjme5J1
-					hex!["2cb1a0ef4ce819893905e3a6a8e46b652c43aee6c154921220902cabfdcfdd07"].into(),
-					1_500_000_000,
-				)],
-				// council members
-				// GC - same as sudo
-				vec![hex!["2cb1a0ef4ce819893905e3a6a8e46b652c43aee6c154921220902cabfdcfdd07"].into()],
-				// technical committee
-				// GC - same as sudo
-				vec![hex!["2cb1a0ef4ce819893905e3a6a8e46b652c43aee6c154921220902cabfdcfdd07"].into()],
-				// vestings
-				vec![],
-				// registered_assets
-				vec![],
-				// accepted_assets
-				vec![],
-				// token balances
-				vec![],
-				// claims data
-				Default::default(),
-				// elections
-				vec![(
-					hex!["2cb1a0ef4ce819893905e3a6a8e46b652c43aee6c154921220902cabfdcfdd07"].into(),
-					1_200_000_000 * UNITS,
-				)],
-				// parachain ID
-				PARA_ID.into(),
-				// duster
-				DusterConfig {
-					// treasury
-					account_blacklist: vec![
-						hex!["6d6f646c70792f74727372790000000000000000000000000000000000000000"].into()
-					],
-					reward_account: Some(
-						hex!["6d6f646c70792f74727372790000000000000000000000000000000000000000"].into(),
-					),
-					dust_account: Some(hex!["6d6f646c70792f74727372790000000000000000000000000000000000000000"].into()),
-				},
-			)
-		},
-		// Bootnodes
-		vec![
-			"/dns/rococo-hydradx-p2p01.hydration.dev/tcp/30333/p2p/12D3KooWCtBQpwnWV7yMaEyBRkcAcAej78Q2uZawk5RcDrYktVQS"
-				.parse()
-				.unwrap(),
-			"/dns/rococo-hydradx-p2p02.hydration.dev/tcp/30333/p2p/12D3KooWLfojmwK6cAFDhzewCjUsyzYAKrpL4Ze42D1bLo8gvS4j"
-				.parse()
-				.unwrap(),
-			"/dns/rococo-hydradx-p2p03.hydration.dev/tcp/30333/p2p/12D3KooWEuEVHGrntL4Anje1k9z85V7thwhgPd9WnX4EJP5i13Xc"
-				.parse()
-				.unwrap(),
-		],
-		// Telemetry
-		Some(
-			TelemetryEndpoints::new(vec![
-				(_TELEMETRY_URLS[0].to_string(), 0),
-				(_TELEMETRY_URLS[1].to_string(), 0),
-			])
-			.expect("Telemetry url is valid"),
+				(
+					// 5Fbc5bQp1bHfNpx8yuTshYK1pNhBbajZyaosRNvuyM3KRiMz
+					hex!["9c45dc3b15cd55531cad1e4c21cacb47611be54e3da6bf5be451f5e578a68344"].into(),
+					hex!["9c45dc3b15cd55531cad1e4c21cacb47611be54e3da6bf5be451f5e578a68344"].unchecked_into(),
+				),
+				(
+					// 5CAP1unPwP9RnvNcJn7YSZy1A8Snv5fGebuWMU99vpaJcfjh
+					hex!["04540c9406af2f5bf34f948dd1c7f029892247c2e1472b7cd51c188e4e0c2f2b"].into(),
+					hex!["04540c9406af2f5bf34f948dd1c7f029892247c2e1472b7cd51c188e4e0c2f2b"].unchecked_into(),
+				),
+				(
+					// 5GrzdLdMFuV6ZvWQjYUhVEpZQFoSxkLboKY3xeEdEjNUPoH7
+					hex!["d43ead05edb218c199fc0dfe36ec9389f509d8447e43109e1cb04305de4f9359"].into(),
+					hex!["d43ead05edb218c199fc0dfe36ec9389f509d8447e43109e1cb04305de4f9359"].unchecked_into(),
+				),
+				(
+					// 5G9gRv1GE8HPsjXnNm8By2SWuasTan5gU2AZm8pundyduHTM
+					hex!["b4bc5b99d9207ab2aadd222581809b53372e7e17c4eaa88742f3501f3044bf27"].into(),
+					hex!["b4bc5b99d9207ab2aadd222581809b53372e7e17c4eaa88742f3501f3044bf27"].unchecked_into(),
+				),
+			],
+			10_000 * UNITS,
 		),
-		// Protocol ID
-		Some(PROTOCOL_ID),
-		// Fork ID
-		None,
-		// Properties
-		Some(properties),
-		// Extensions
+		// Pre-funded accounts
+		vec![(
+			// Galactic Council
+			// 7JcAAB6cXQxVQyVLksPUdthJwcoEGm8SW9hsNgdP6hjme5J1
+			hex!["2cb1a0ef4ce819893905e3a6a8e46b652c43aee6c154921220902cabfdcfdd07"].into(),
+			1_500_000_000,
+		)],
+		// council members
+		// GC - same as sudo
+		vec![hex!["2cb1a0ef4ce819893905e3a6a8e46b652c43aee6c154921220902cabfdcfdd07"].into()],
+		// technical committee
+		// GC - same as sudo
+		vec![hex!["2cb1a0ef4ce819893905e3a6a8e46b652c43aee6c154921220902cabfdcfdd07"].into()],
+		// vestings
+		vec![],
+		// registered_assets
+		vec![],
+		// accepted_assets
+		vec![],
+		// token balances
+		vec![],
+		// claims data
+		Default::default(),
+		// elections
+		vec![(
+			hex!["2cb1a0ef4ce819893905e3a6a8e46b652c43aee6c154921220902cabfdcfdd07"].into(),
+			1_200_000_000 * UNITS,
+		)],
+		// parachain ID
+		PARA_ID.into(),
+		// duster
+		DusterConfig {
+			// treasury
+			account_blacklist: vec![hex!["6d6f646c70792f74727372790000000000000000000000000000000000000000"].into()],
+			reward_account: Some(hex!["6d6f646c70792f74727372790000000000000000000000000000000000000000"].into()),
+			dust_account: Some(hex!["6d6f646c70792f74727372790000000000000000000000000000000000000000"].into()),
+		},
+	);
+
+	let chain_spec = ChainSpec::builder(
+		wasm_binary,
 		Extensions {
 			relay_chain: "rococo".into(),
 			para_id: PARA_ID,
 			evm_since: 1,
 		},
-	))
+	)
+	.with_name("HydraDX testnet")
+	.with_id("hydra_rococo")
+	.with_chain_type(ChainType::Live)
+	.with_boot_nodes(vec![
+		"/dns/rococo-hydradx-p2p01.hydration.dev/tcp/30333/p2p/12D3KooWCtBQpwnWV7yMaEyBRkcAcAej78Q2uZawk5RcDrYktVQS"
+			.parse()
+			.unwrap(),
+		"/dns/rococo-hydradx-p2p02.hydration.dev/tcp/30333/p2p/12D3KooWLfojmwK6cAFDhzewCjUsyzYAKrpL4Ze42D1bLo8gvS4j"
+			.parse()
+			.unwrap(),
+		"/dns/rococo-hydradx-p2p03.hydration.dev/tcp/30333/p2p/12D3KooWEuEVHGrntL4Anje1k9z85V7thwhgPd9WnX4EJP5i13Xc"
+			.parse()
+			.unwrap(),
+	])
+	.with_telemetry_endpoints(
+		TelemetryEndpoints::new(vec![
+			(_TELEMETRY_URLS[0].to_string(), 0),
+			(_TELEMETRY_URLS[1].to_string(), 0),
+		])
+		.expect("Telemetry url is valid"),
+	)
+	.with_properties(properties)
+	.with_protocol_id(PROTOCOL_ID)
+	.with_genesis_config_patch(genesis_json)
+	.build();
+
+	Ok(chain_spec)
 }
diff --git a/node/src/chain_spec/staging.rs b/node/src/chain_spec/staging.rs
index e284801ce..c40961ed1 100644
--- a/node/src/chain_spec/staging.rs
+++ b/node/src/chain_spec/staging.rs
@@ -15,123 +15,113 @@ pub fn parachain_config() -> Result<ChainSpec, String> {
 	properties.insert("tokenDecimals".into(), TOKEN_DECIMALS.into());
 	properties.insert("tokenSymbol".into(), TOKEN_SYMBOL.into());
 
-	Ok(ChainSpec::from_genesis(
-		// Name
-		"HydraDX",
-		// ID
-		"hydra",
-		ChainType::Live,
-		move || {
-			parachain_genesis(
-				wasm_binary,
-				// Sudo account
-				// Galactic Council
-				// 7HqdGVRB4MXz1osLR77mfWoo536cWasTYsuAbVuicHdiKQXf
-				hex!["0abad795adcb5dee45d29528005b1f78d55fc170844babde88df84016c6cd14d"].into(),
-				// initial authorities & invulnerable collators
+	let genesis_json = parachain_genesis(
+		// Sudo account
+		// Galactic Council
+		// 7HqdGVRB4MXz1osLR77mfWoo536cWasTYsuAbVuicHdiKQXf
+		hex!["0abad795adcb5dee45d29528005b1f78d55fc170844babde88df84016c6cd14d"].into(),
+		// initial authorities & invulnerable collators
+		(
+			vec![
 				(
-					vec![
-						(
-							// 5G3t6yhAonQHGUEqrByWQPgP9R8fcSSL6Vujphc89ysdTpKF
-							hex!["b0502e92d738d528922e8963b8a58a3c7c3b693db51b0972a6981836d67b8835"].into(),
-							hex!["b0502e92d738d528922e8963b8a58a3c7c3b693db51b0972a6981836d67b8835"].unchecked_into(),
-						),
-						(
-							// 5CVBHPAjhcVVAvL3AYpa9MB6kWDwoJbBwu7q4MqbhKwNnrV4
-							hex!["12aa36d6c1b055b9a7ab5d39f4fd9a9fe42912163c90e122fb7997e890a53d7e"].into(),
-							hex!["12aa36d6c1b055b9a7ab5d39f4fd9a9fe42912163c90e122fb7997e890a53d7e"].unchecked_into(),
-						),
-						(
-							// 5DFGmHjpxS6Xveg4YDw2hSp62JJ9h8oLCkeZUAoVR7hVtQ3k
-							hex!["344b7693389189ad0be0c83630b02830a568f7cb0f2d4b3483bcea323cc85f70"].into(),
-							hex!["344b7693389189ad0be0c83630b02830a568f7cb0f2d4b3483bcea323cc85f70"].unchecked_into(),
-						),
-						(
-							// 5H178NL4DLM9DGgAgZz1kbrX2TReP3uPk7svPtsg1VcYnuXH
-							hex!["da6e859211b1140369a73af533ecea4e4c0e985ad122ac4c663cc8b81d4fcd12"].into(),
-							hex!["da6e859211b1140369a73af533ecea4e4c0e985ad122ac4c663cc8b81d4fcd12"].unchecked_into(),
-						),
-						(
-							// 5Ca1iV2RNV253FzYJo12XtKJMPWCjv5CsPK9HdmwgJarD1sJ
-							hex!["165a3c2eb21341bf170fd1fa728bd9a7d02b7dc3b4968a46f2b1d494ee8c2b5d"].into(),
-							hex!["165a3c2eb21341bf170fd1fa728bd9a7d02b7dc3b4968a46f2b1d494ee8c2b5d"].unchecked_into(),
-						),
-					],
-					10_000 * UNITS,
+					// 5G3t6yhAonQHGUEqrByWQPgP9R8fcSSL6Vujphc89ysdTpKF
+					hex!["b0502e92d738d528922e8963b8a58a3c7c3b693db51b0972a6981836d67b8835"].into(),
+					hex!["b0502e92d738d528922e8963b8a58a3c7c3b693db51b0972a6981836d67b8835"].unchecked_into(),
 				),
-				// Pre-funded accounts
-				vec![(
-					// Galactic Council
-					// 7HqdGVRB4MXz1osLR77mfWoo536cWasTYsuAbVuicHdiKQXf
-					hex!["0abad795adcb5dee45d29528005b1f78d55fc170844babde88df84016c6cd14d"].into(),
-					1_500_000_000 * UNITS,
-				)],
-				// council members
-				vec![],
-				// technical committee
-				vec![],
-				// vestings
-				vec![],
-				// registered_assets
-				vec![],
-				// accepted_assets
-				vec![],
-				// token balances
-				vec![],
-				// claims data
-				Default::default(),
-				// elections
-				vec![
-					(get_account_id_from_seed::<sr25519::Public>("Alice"), STASH / 5),
-					(get_account_id_from_seed::<sr25519::Public>("Bob"), STASH / 5),
-					(get_account_id_from_seed::<sr25519::Public>("Eve"), STASH / 5),
-				],
-				// parachain ID
-				PARA_ID.into(),
-				// duster
-				DusterConfig {
-					// treasury
-					account_blacklist: vec![
-						hex!["6d6f646c70792f74727372790000000000000000000000000000000000000000"].into()
-					],
-					reward_account: Some(
-						hex!["6d6f646c70792f74727372790000000000000000000000000000000000000000"].into(),
-					),
-					dust_account: Some(hex!["6d6f646c70792f74727372790000000000000000000000000000000000000000"].into()),
-				},
-			)
-		},
-		// Bootnodes
+				(
+					// 5CVBHPAjhcVVAvL3AYpa9MB6kWDwoJbBwu7q4MqbhKwNnrV4
+					hex!["12aa36d6c1b055b9a7ab5d39f4fd9a9fe42912163c90e122fb7997e890a53d7e"].into(),
+					hex!["12aa36d6c1b055b9a7ab5d39f4fd9a9fe42912163c90e122fb7997e890a53d7e"].unchecked_into(),
+				),
+				(
+					// 5DFGmHjpxS6Xveg4YDw2hSp62JJ9h8oLCkeZUAoVR7hVtQ3k
+					hex!["344b7693389189ad0be0c83630b02830a568f7cb0f2d4b3483bcea323cc85f70"].into(),
+					hex!["344b7693389189ad0be0c83630b02830a568f7cb0f2d4b3483bcea323cc85f70"].unchecked_into(),
+				),
+				(
+					// 5H178NL4DLM9DGgAgZz1kbrX2TReP3uPk7svPtsg1VcYnuXH
+					hex!["da6e859211b1140369a73af533ecea4e4c0e985ad122ac4c663cc8b81d4fcd12"].into(),
+					hex!["da6e859211b1140369a73af533ecea4e4c0e985ad122ac4c663cc8b81d4fcd12"].unchecked_into(),
+				),
+				(
+					// 5Ca1iV2RNV253FzYJo12XtKJMPWCjv5CsPK9HdmwgJarD1sJ
+					hex!["165a3c2eb21341bf170fd1fa728bd9a7d02b7dc3b4968a46f2b1d494ee8c2b5d"].into(),
+					hex!["165a3c2eb21341bf170fd1fa728bd9a7d02b7dc3b4968a46f2b1d494ee8c2b5d"].unchecked_into(),
+				),
+			],
+			10_000 * UNITS,
+		),
+		// Pre-funded accounts
+		vec![(
+			// Galactic Council
+			// 7HqdGVRB4MXz1osLR77mfWoo536cWasTYsuAbVuicHdiKQXf
+			hex!["0abad795adcb5dee45d29528005b1f78d55fc170844babde88df84016c6cd14d"].into(),
+			1_500_000_000 * UNITS,
+		)],
+		// council members
+		vec![],
+		// technical committee
+		vec![],
+		// vestings
+		vec![],
+		// registered_assets
+		vec![],
+		// accepted_assets
+		vec![],
+		// token balances
+		vec![],
+		// claims data
+		Default::default(),
+		// elections
 		vec![
-			"/dns/p2p-01.hydra.hydradx.io/tcp/30333/p2p/12D3KooWHzv7XVVBwY4EX1aKJBU6qzEjqGk6XtoFagr5wEXx6MsH"
-				.parse()
-				.unwrap(),
-			"/dns/p2p-02.hydra.hydradx.io/tcp/30333/p2p/12D3KooWR72FwHrkGNTNes6U5UHQezWLmrKu6b45MvcnRGK8J3S6"
-				.parse()
-				.unwrap(),
-			"/dns/p2p-03.hydra.hydradx.io/tcp/30333/p2p/12D3KooWFDwxZinAjgmLVgsideCmdB2bz911YgiQdLEiwKovezUz"
-				.parse()
-				.unwrap(),
+			(get_account_id_from_seed::<sr25519::Public>("Alice"), STASH / 5),
+			(get_account_id_from_seed::<sr25519::Public>("Bob"), STASH / 5),
+			(get_account_id_from_seed::<sr25519::Public>("Eve"), STASH / 5),
 		],
-		// Telemetry
-		Some(
-			TelemetryEndpoints::new(vec![
-				(TELEMETRY_URLS[0].to_string(), 0),
-				(TELEMETRY_URLS[1].to_string(), 0),
-			])
-			.expect("Telemetry url is valid"),
-		),
-		// Protocol ID
-		Some(PROTOCOL_ID),
-		// Fork ID
-		None,
-		// Properties
-		Some(properties),
-		// Extensions
+		// parachain ID
+		PARA_ID.into(),
+		// duster
+		DusterConfig {
+			// treasury
+			account_blacklist: vec![hex!["6d6f646c70792f74727372790000000000000000000000000000000000000000"].into()],
+			reward_account: Some(hex!["6d6f646c70792f74727372790000000000000000000000000000000000000000"].into()),
+			dust_account: Some(hex!["6d6f646c70792f74727372790000000000000000000000000000000000000000"].into()),
+		},
+	);
+
+	let chain_spec = ChainSpec::builder(
+		wasm_binary,
 		Extensions {
 			relay_chain: "polkadot".into(),
 			para_id: PARA_ID,
 			evm_since: 1,
 		},
-	))
+	)
+	.with_name("HydraDX")
+	.with_id("hydra")
+	.with_chain_type(ChainType::Live)
+	.with_boot_nodes(vec![
+		"/dns/p2p-01.hydra.hydradx.io/tcp/30333/p2p/12D3KooWHzv7XVVBwY4EX1aKJBU6qzEjqGk6XtoFagr5wEXx6MsH"
+			.parse()
+			.unwrap(),
+		"/dns/p2p-02.hydra.hydradx.io/tcp/30333/p2p/12D3KooWR72FwHrkGNTNes6U5UHQezWLmrKu6b45MvcnRGK8J3S6"
+			.parse()
+			.unwrap(),
+		"/dns/p2p-03.hydra.hydradx.io/tcp/30333/p2p/12D3KooWFDwxZinAjgmLVgsideCmdB2bz911YgiQdLEiwKovezUz"
+			.parse()
+			.unwrap(),
+	])
+	.with_telemetry_endpoints(
+		TelemetryEndpoints::new(vec![
+			(TELEMETRY_URLS[0].to_string(), 0),
+			(TELEMETRY_URLS[1].to_string(), 0),
+		])
+		.expect("Telemetry url is valid"),
+	)
+	.with_properties(properties)
+	.with_protocol_id(PROTOCOL_ID)
+	.with_genesis_config_patch(genesis_json)
+	.build();
+
+	Ok(chain_spec)
 }
diff --git a/node/src/cli.rs b/node/src/cli.rs
index 70b60fe22..28488c341 100644
--- a/node/src/cli.rs
+++ b/node/src/cli.rs
@@ -110,7 +110,7 @@ pub enum Subcommand {
 
 	/// Export the genesis state of the parachain.
 	#[clap(name = "export-genesis-state")]
-	ExportGenesisState(cumulus_client_cli::ExportGenesisStateCommand),
+	ExportGenesisHead(cumulus_client_cli::ExportGenesisHeadCommand),
 
 	/// Export the genesis wasm of the parachain.
 	#[clap(name = "export-genesis-wasm")]
diff --git a/node/src/command.rs b/node/src/command.rs
index b2ed3c031..9ebbe33f3 100644
--- a/node/src/command.rs
+++ b/node/src/command.rs
@@ -20,7 +20,6 @@ use crate::cli::{Cli, RelayChainCli, Subcommand};
 use crate::service::{new_partial, HydraDXNativeExecutor};
 
 use codec::Encode;
-use cumulus_client_cli::generate_genesis_block;
 use cumulus_primitives_core::ParaId;
 use frame_benchmarking_cli::{BenchmarkCmd, SUBSTRATE_REFERENCE_HARDWARE};
 use hydradx_runtime::Block;
@@ -32,8 +31,10 @@ use sc_cli::{
 use sc_executor::{sp_wasm_interface::ExtendedHostFunctions, NativeExecutionDispatch};
 use sc_service::config::{BasePath, PrometheusConfig};
 use sp_core::hexdisplay::HexDisplay;
-use sp_runtime::traits::AccountIdConversion;
-use sp_runtime::traits::Block as BlockT;
+use sp_runtime::{
+	traits::{AccountIdConversion, Block as BlockT, Hash as HashT, Header as HeaderT, Zero},
+	StateVersion,
+};
 use std::io::Write;
 
 fn load_spec(id: &str) -> std::result::Result<Box<dyn sc_service::ChainSpec>, String> {
@@ -227,7 +228,7 @@ pub fn run() -> sc_cli::Result<()> {
 				}
 			}
 		}
-		Some(Subcommand::ExportGenesisState(params)) => {
+		Some(Subcommand::ExportGenesisHead(params)) => {
 			let mut builder = sc_cli::LoggerBuilder::new("");
 			builder.with_profiling(sc_tracing::TracingReceiver::Log, "");
 			let _ = builder.init();
@@ -281,13 +282,6 @@ pub fn run() -> sc_cli::Result<()> {
 					return Err("It is not allowed to run a collator node with the benchmarking runtime.".into());
 				};
 
-				let hwbench = (!cli.no_hardware_benchmarks)
-					.then_some(config.database.path().map(|database_path| {
-						let _ = std::fs::create_dir_all(database_path);
-						sc_sysinfo::gather_hwbench(Some(database_path))
-					}))
-					.flatten();
-
 				let polkadot_cli = RelayChainCli::new(
 					&config,
 					[RelayChainCli::executable_name()]
@@ -302,7 +296,7 @@ pub fn run() -> sc_cli::Result<()> {
 				let id = ParaId::from(para_id);
 
 				let parachain_account =
-					AccountIdConversion::<polkadot_primitives::v5::AccountId>::into_account_truncating(&id);
+					AccountIdConversion::<polkadot_primitives::v6::AccountId>::into_account_truncating(&id);
 
 				let state_version = Cli::runtime_version().state_version();
 
@@ -324,7 +318,7 @@ pub fn run() -> sc_cli::Result<()> {
 					if config.role.is_authority() { "yes" } else { "no" }
 				);
 
-				crate::service::start_node(config, polkadot_config, cli.ethereum_config, collator_options, id, hwbench)
+				crate::service::start_node(config, polkadot_config, cli.ethereum_config, collator_options, id)
 					.await
 					.map(|r| r.0)
 					.map_err(Into::into)
@@ -448,3 +442,37 @@ impl Cli {
 		&hydradx_runtime::VERSION
 	}
 }
+
+/// Generate the genesis block from a given ChainSpec.
+pub fn generate_genesis_block<Block: BlockT>(
+	chain_spec: &dyn ChainSpec,
+	genesis_state_version: StateVersion,
+) -> std::result::Result<Block, String> {
+	let storage = chain_spec.build_storage()?;
+
+	let child_roots = storage.children_default.iter().map(|(sk, child_content)| {
+		let state_root = <<<Block as BlockT>::Header as HeaderT>::Hashing as HashT>::trie_root(
+			child_content.data.clone().into_iter().collect(),
+			genesis_state_version,
+		);
+		(sk.clone(), state_root.encode())
+	});
+	let state_root = <<<Block as BlockT>::Header as HeaderT>::Hashing as HashT>::trie_root(
+		storage.top.clone().into_iter().chain(child_roots).collect(),
+		genesis_state_version,
+	);
+
+	let extrinsics_root =
+		<<<Block as BlockT>::Header as HeaderT>::Hashing as HashT>::trie_root(Vec::new(), genesis_state_version);
+
+	Ok(Block::new(
+		<<Block as BlockT>::Header as HeaderT>::new(
+			Zero::zero(),
+			extrinsics_root,
+			state_root,
+			Default::default(),
+			Default::default(),
+		),
+		Default::default(),
+	))
+}
diff --git a/node/src/rpc.rs b/node/src/rpc.rs
index 09c51f309..19fa60f40 100644
--- a/node/src/rpc.rs
+++ b/node/src/rpc.rs
@@ -29,9 +29,13 @@ pub use fc_rpc::{
 	EthBlockDataCacheTask, OverrideHandle, RuntimeApiStorageOverride, SchemaV1Override, SchemaV2Override,
 	SchemaV3Override, StorageOverride,
 };
+use fc_rpc_core::types::CallRequest;
 pub use fc_rpc_core::types::{FeeHistoryCache, FeeHistoryCacheLimit, FilterPool};
 use fp_rpc::{ConvertTransaction, ConvertTransactionRuntimeApi, EthereumRuntimeRPCApi};
-use hydradx_runtime::{opaque::Block, AccountId, Balance, Index};
+use hydradx_runtime::{
+	opaque::{Block, Hash},
+	AccountId, Balance, Index,
+};
 use sc_client_api::{
 	backend::{Backend, StateBackend, StorageProvider},
 	client::BlockchainEvents,
@@ -45,9 +49,39 @@ use sc_transaction_pool_api::TransactionPool;
 use sp_api::{CallApiAt, ProvideRuntimeApi};
 use sp_block_builder::BlockBuilder as BlockBuilderApi;
 use sp_blockchain::{Error as BlockChainError, HeaderBackend, HeaderMetadata};
-use sp_core::H256;
 use sp_runtime::traits::{BlakeTwo256, Block as BlockT};
 
+pub struct HydraDxEGA;
+
+impl fc_rpc::EstimateGasAdapter for HydraDxEGA {
+	fn adapt_request(mut request: CallRequest) -> CallRequest {
+		// Redirect any call to batch precompile:
+		// force usage of batchAll method for estimation
+		use sp_core::H160;
+		const BATCH_PRECOMPILE_ADDRESS: H160 = H160(hex_literal::hex!("0000000000000000000000000000000000000808"));
+		const BATCH_PRECOMPILE_BATCH_ALL_SELECTOR: [u8; 4] = hex_literal::hex!("96e292b8");
+		if request.to == Some(BATCH_PRECOMPILE_ADDRESS) {
+			if let Some(ref mut data) = request.data {
+				if data.0.len() >= 4 {
+					data.0[..4].copy_from_slice(&BATCH_PRECOMPILE_BATCH_ALL_SELECTOR);
+				}
+			}
+		}
+		request
+	}
+}
+
+pub struct HydraDxEthConfig<C, BE>(std::marker::PhantomData<(C, BE)>);
+
+impl<C, BE> fc_rpc::EthConfig<Block, C> for HydraDxEthConfig<C, BE>
+where
+	C: sc_client_api::StorageProvider<Block, BE> + Sync + Send + 'static,
+	BE: Backend<Block> + 'static,
+{
+	type EstimateGasAdapter = HydraDxEGA;
+	type RuntimeStorageOverride = fc_rpc::frontier_backend_client::SystemAccountId20StorageOverride<Block, C, BE>;
+}
+
 /// Full client dependencies.
 pub struct FullDeps<C, P, B> {
 	/// The client instance to use.
@@ -61,7 +95,7 @@ pub struct FullDeps<C, P, B> {
 }
 
 /// Extra dependencies for Ethereum compatibility.
-pub struct Deps<C, P, A: ChainApi, CT, B: BlockT> {
+pub struct Deps<C, P, A: ChainApi, CT> {
 	/// The client instance to use.
 	pub client: Arc<C>,
 	/// Transaction pool instance.
@@ -75,15 +109,15 @@ pub struct Deps<C, P, A: ChainApi, CT, B: BlockT> {
 	/// Whether to enable dev signer
 	pub enable_dev_signer: bool,
 	/// Network service
-	pub network: Arc<NetworkService<B, B::Hash>>,
+	pub network: Arc<NetworkService<Block, Hash>>,
 	/// Chain syncing service
-	pub sync: Arc<SyncingService<B>>,
+	pub sync: Arc<SyncingService<Block>>,
 	/// Frontier Backend.
-	pub frontier_backend: Arc<FrontierBackend<B>>,
+	pub frontier_backend: Arc<FrontierBackend<Block>>,
 	/// Ethereum data access overrides.
-	pub overrides: Arc<OverrideHandle<B>>,
+	pub overrides: Arc<OverrideHandle<Block>>,
 	/// Cache for Ethereum block data.
-	pub block_data_cache: Arc<EthBlockDataCacheTask<B>>,
+	pub block_data_cache: Arc<EthBlockDataCacheTask<Block>>,
 	/// EthFilterApi pool.
 	pub filter_pool: FilterPool,
 	/// Maximum number of logs in a query.
@@ -133,26 +167,25 @@ where
 }
 
 /// Instantiate Ethereum-compatible RPC extensions.
-pub fn create<C, BE, P, A, CT, B>(
+pub fn create<C, BE, P, A, CT>(
 	mut io: RpcExtension,
-	deps: Deps<C, P, A, CT, B>,
+	deps: Deps<C, P, A, CT>,
 	subscription_task_executor: SubscriptionTaskExecutor,
 	pubsub_notification_sinks: Arc<
-		fc_mapping_sync::EthereumBlockNotificationSinks<fc_mapping_sync::EthereumBlockNotification<B>>,
+		fc_mapping_sync::EthereumBlockNotificationSinks<fc_mapping_sync::EthereumBlockNotification<Block>>,
 	>,
 ) -> Result<RpcExtension, Box<dyn std::error::Error + Send + Sync>>
 where
-	B: BlockT<Hash = H256>,
-	C: ProvideRuntimeApi<B>,
-	C::Api: BlockBuilderApi<B> + EthereumRuntimeRPCApi<B> + ConvertTransactionRuntimeApi<B>,
-	C: BlockchainEvents<B> + 'static,
-	C: HeaderBackend<B> + HeaderMetadata<B, Error = BlockChainError> + StorageProvider<B, BE>,
-	C: CallApiAt<B>,
-	BE: Backend<B> + 'static,
+	C: ProvideRuntimeApi<Block>,
+	C::Api: BlockBuilderApi<Block> + EthereumRuntimeRPCApi<Block> + ConvertTransactionRuntimeApi<Block>,
+	C: BlockchainEvents<Block> + 'static,
+	C: HeaderBackend<Block> + HeaderMetadata<Block, Error = BlockChainError> + StorageProvider<Block, BE>,
+	C: CallApiAt<Block>,
+	BE: Backend<Block> + 'static,
 	BE::State: StateBackend<BlakeTwo256>,
-	P: TransactionPool<Block = B> + 'static,
-	A: ChainApi<Block = B> + 'static,
-	CT: ConvertTransaction<<B as BlockT>::Extrinsic> + Send + Sync + 'static,
+	P: TransactionPool<Block = Block> + 'static,
+	A: ChainApi<Block = Block> + 'static,
+	CT: ConvertTransaction<<Block as BlockT>::Extrinsic> + Send + Sync + 'static,
 {
 	use fc_rpc::{
 		Eth, EthApiServer, EthDevSigner, EthFilter, EthFilterApiServer, EthPubSub, EthPubSubApiServer, EthSigner, Net,
@@ -207,7 +240,7 @@ where
 	};
 
 	io.merge(
-		Eth::new(
+		Eth::<_, _, _, _, _, _, _, HydraDxEthConfig<_, _>>::new(
 			client.clone(),
 			pool.clone(),
 			graph.clone(),
@@ -225,6 +258,7 @@ where
 			pending_create_inherent_data_providers,
 			None,
 		)
+		.replace_config::<HydraDxEthConfig<C, BE>>()
 		.into_rpc(),
 	)?;
 
@@ -268,7 +302,7 @@ where
 	Ok(io)
 }
 
-impl<C, P, A: ChainApi, CT: Clone, B: BlockT> Clone for Deps<C, P, A, CT, B> {
+impl<C, P, A: ChainApi, CT: Clone> Clone for Deps<C, P, A, CT> {
 	fn clone(&self) -> Self {
 		Self {
 			client: self.client.clone(),
diff --git a/node/src/service.rs b/node/src/service.rs
index fd1c2e135..e45de298b 100644
--- a/node/src/service.rs
+++ b/node/src/service.rs
@@ -206,7 +206,6 @@ async fn start_node_impl(
 	ethereum_config: evm::EthereumConfig,
 	collator_options: CollatorOptions,
 	para_id: ParaId,
-	hwbench: Option<sc_sysinfo::HwBench>,
 ) -> sc_service::error::Result<(TaskManager, Arc<ParachainClient>)> {
 	let parachain_config = prepare_node_config(parachain_config);
 
@@ -225,7 +224,7 @@ async fn start_node_impl(
 		telemetry_worker_handle,
 		&mut task_manager,
 		collator_options.clone(),
-		hwbench.clone(),
+		None,
 	)
 	.await
 	.map_err(|e| sc_service::Error::Application(Box::new(e) as Box<_>))?;
@@ -368,28 +367,6 @@ async fn start_node_impl(
 		pubsub_notification_sinks,
 	);
 
-	if let Some(hwbench) = hwbench {
-		sc_sysinfo::print_hwbench(&hwbench);
-		// Here you can check whether the hardware meets your chains' requirements. Putting a link
-		// in there and swapping out the requirements for your own are probably a good idea. The
-		// requirements for a para-chain are dictated by its relay-chain.
-		if !frame_benchmarking_cli::SUBSTRATE_REFERENCE_HARDWARE.check_hardware(&hwbench) && validator {
-			log::warn!(
-				"⚠️  The hardware does not meet the minimal requirements for role 'Authority' find out more at:\n\
-			https://wiki.polkadot.network/docs/maintain-guides-how-to-validate-polkadot#reference-hardware"
-			);
-		}
-
-		if let Some(ref mut telemetry) = telemetry {
-			let telemetry_handle = telemetry.handle();
-			task_manager.spawn_handle().spawn(
-				"telemetry_hwbench",
-				None,
-				sc_sysinfo::initialize_hwbench_telemetry(telemetry_handle, hwbench),
-			);
-		}
-	}
-
 	let announce_block = {
 		let sync_service = sync_service.clone();
 		Arc::new(move |hash, data| sync_service.announce_block(hash, data))
@@ -530,6 +507,7 @@ fn start_consensus(
 		collator_service,
 		// Very limited proposal time.
 		authoring_duration: Duration::from_millis(500),
+		collation_request_receiver: None,
 	};
 
 	let fut = basic_aura::run::<Block, sp_consensus_aura::sr25519::AuthorityPair, _, _, _, _, _, _, _>(params);
@@ -545,7 +523,6 @@ pub async fn start_node(
 	ethereum_config: evm::EthereumConfig,
 	collator_options: CollatorOptions,
 	para_id: ParaId,
-	hwbench: Option<sc_sysinfo::HwBench>,
 ) -> sc_service::error::Result<(TaskManager, Arc<ParachainClient>)> {
 	start_node_impl(
 		parachain_config,
@@ -553,7 +530,6 @@ pub async fn start_node(
 		ethereum_config,
 		collator_options,
 		para_id,
-		hwbench,
 	)
 	.await
 }
diff --git a/pallets/asset-registry/Cargo.toml b/pallets/asset-registry/Cargo.toml
index 3cface2ca..38832f9e6 100644
--- a/pallets/asset-registry/Cargo.toml
+++ b/pallets/asset-registry/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-asset-registry"
-version = "3.2.3"
+version = "3.2.4"
 description = "Pallet for asset registry management"
 authors = ["GalacticCouncil"]
 edition = "2021"
diff --git a/pallets/asset-registry/src/lib.rs b/pallets/asset-registry/src/lib.rs
index 5e7c34309..6a9174b64 100644
--- a/pallets/asset-registry/src/lib.rs
+++ b/pallets/asset-registry/src/lib.rs
@@ -37,7 +37,7 @@ pub mod migration;
 mod types;
 pub mod weights;
 
-use weights::WeightInfo;
+pub use weights::WeightInfo;
 
 pub use types::AssetType;
 
diff --git a/pallets/asset-registry/src/tests/mock.rs b/pallets/asset-registry/src/tests/mock.rs
index 106afec4d..ba04c5707 100644
--- a/pallets/asset-registry/src/tests/mock.rs
+++ b/pallets/asset-registry/src/tests/mock.rs
@@ -69,6 +69,7 @@ impl system::Config for Test {
 	type BlockLength = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
+	type RuntimeTask = RuntimeTask;
 	type Nonce = u64;
 	type Block = Block;
 	type Hash = H256;
diff --git a/pallets/asset-registry/src/weights.rs b/pallets/asset-registry/src/weights.rs
index b40d1c585..8aa8daa00 100644
--- a/pallets/asset-registry/src/weights.rs
+++ b/pallets/asset-registry/src/weights.rs
@@ -15,26 +15,32 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! Autogenerated weights for pallet_asset_registry
+//! Autogenerated weights for `pallet_asset_registry`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-10-23, STEPS: 10, REPEAT: 20, LOW RANGE: [], HIGH RANGE: []
-//! EXECUTION: Some(Wasm), WASM-EXECUTION: Compiled, CHAIN: Some("dev"), DB CACHE: 1024
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-05-23, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! WORST CASE MAP SIZE: `1000000`
+//! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024`
 
 // Executed Command:
-// target/release/hydradx
+// ./target/release/hydradx
 // benchmark
 // pallet
-// --chain=dev
-// --steps=10
-// --repeat=20
-// --execution=wasm
 // --wasm-execution=compiled
-// --heap-pages=4096
-// --template=.maintain/pallet-weight-template-no-back.hbs
-// --pallet=pallet_asset_registry
-// --output=weights.rs
-// --extrinsic=*
+// --pallet
+// *
+// --extrinsic
+// *
+// --heap-pages
+// 4096
+// --steps
+// 50
+// --repeat
+// 20
+// --template=scripts/pallet-weight-template.hbs
+// --output
+// weights/
 
 #![allow(unused_parens)]
 #![allow(unused_imports)]
@@ -54,136 +60,81 @@ pub trait WeightInfo {
 	fn unban_asset() -> Weight;
 }
 /// Weights for pallet_asset_registry using the hydraDX node and recommended hardware.
-pub struct HydraWeight<T>(PhantomData<T>);
-
-impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
-	// Storage: AssetRegistry Assets (r:1 w:1)
-	// Proof: AssetRegistry Assets (max_values: None, max_size: Some(133), added: 2608, mode: MaxEncodedLen)
-	// Storage: AssetRegistry AssetIds (r:1 w:1)
-	// Proof: AssetRegistry AssetIds (max_values: None, max_size: Some(53), added: 2528, mode: MaxEncodedLen)
-	// Storage: AssetRegistry LocationAssets (r:1 w:1)
-	// Proof: AssetRegistry LocationAssets (max_values: None, max_size: Some(622), added: 3097, mode: MaxEncodedLen)
-	// Storage: AssetRegistry AssetLocations (r:0 w:1)
-	// Proof: AssetRegistry AssetLocations (max_values: None, max_size: Some(622), added: 3097, mode: MaxEncodedLen)
-	fn register() -> Weight {
-		// Minimum execution time: 39_013 nanoseconds.
-		Weight::from_parts(39_795_000, 0)
-			.saturating_add(T::DbWeight::get().reads(3 as u64))
-			.saturating_add(T::DbWeight::get().writes(4 as u64))
-	}
-	// Storage: AssetRegistry Assets (r:1 w:1)
-	// Proof: AssetRegistry Assets (max_values: None, max_size: Some(133), added: 2608, mode: MaxEncodedLen)
-	// Storage: AssetRegistry AssetIds (r:1 w:2)
-	// Proof: AssetRegistry AssetIds (max_values: None, max_size: Some(53), added: 2528, mode: MaxEncodedLen)
-	// Storage: AssetRegistry AssetLocations (r:1 w:1)
-	// Proof: AssetRegistry AssetLocations (max_values: None, max_size: Some(622), added: 3097, mode: MaxEncodedLen)
-	// Storage: AssetRegistry LocationAssets (r:0 w:1)
-	// Proof: AssetRegistry LocationAssets (max_values: None, max_size: Some(622), added: 3097, mode: MaxEncodedLen)
-	fn update() -> Weight {
-		// Minimum execution time: 47_430 nanoseconds.
-		Weight::from_parts(47_760_000, 0)
-			.saturating_add(T::DbWeight::get().reads(3 as u64))
-			.saturating_add(T::DbWeight::get().writes(5 as u64))
-	}
-	// Storage: System Account (r:2 w:2)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	// Storage: AssetRegistry NextAssetId (r:1 w:1)
-	// Proof: AssetRegistry NextAssetId (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	// Storage: AssetRegistry LocationAssets (r:1 w:1)
-	// Proof: AssetRegistry LocationAssets (max_values: None, max_size: Some(622), added: 3097, mode: MaxEncodedLen)
-	// Storage: AssetRegistry AssetLocations (r:0 w:1)
-	// Proof: AssetRegistry AssetLocations (max_values: None, max_size: Some(622), added: 3097, mode: MaxEncodedLen)
-	// Storage: AssetRegistry Assets (r:0 w:1)
-	// Proof: AssetRegistry Assets (max_values: None, max_size: Some(133), added: 2608, mode: MaxEncodedLen)
-	fn register_external() -> Weight {
-		// Minimum execution time: 63_891 nanoseconds.
-		Weight::from_parts(64_922_000, 0)
-			.saturating_add(T::DbWeight::get().reads(4 as u64))
-			.saturating_add(T::DbWeight::get().writes(6 as u64))
-	}
-
-	// Storage: AssetRegistry Assets (r:1 w:0)
-	// Proof: AssetRegistry Assets (max_values: None, max_size: Some(125), added: 2600, mode: MaxEncodedLen)
-	// Storage: AssetRegistry BlacklistedAssets (r:1 w:1)
-	// Proof: AssetRegistry BlacklistedAssets (max_values: None, max_size: Some(20), added: 2495, mode: MaxEncodedLen)
-	fn ban_asset() -> Weight {
-		// Minimum execution time: 22_677 nanoseconds.
-		Weight::from_parts(22_950_000, 0)
-			.saturating_add(T::DbWeight::get().reads(2 as u64))
-			.saturating_add(T::DbWeight::get().writes(1 as u64))
-	}
-	// Storage: AssetRegistry BlacklistedAssets (r:1 w:1)
-	// Proof: AssetRegistry BlacklistedAssets (max_values: None, max_size: Some(20), added: 2495, mode: MaxEncodedLen)
-	fn unban_asset() -> Weight {
-		// Minimum execution time: 17_460 nanoseconds.
-		Weight::from_parts(17_958_000, 0)
-			.saturating_add(T::DbWeight::get().reads(1 as u64))
-			.saturating_add(T::DbWeight::get().writes(1 as u64))
-	}
-}
 
 impl WeightInfo for () {
-	// Storage: AssetRegistry Assets (r:1 w:1)
-	// Proof: AssetRegistry Assets (max_values: None, max_size: Some(133), added: 2608, mode: MaxEncodedLen)
-	// Storage: AssetRegistry AssetIds (r:1 w:1)
-	// Proof: AssetRegistry AssetIds (max_values: None, max_size: Some(53), added: 2528, mode: MaxEncodedLen)
-	// Storage: AssetRegistry LocationAssets (r:1 w:1)
-	// Proof: AssetRegistry LocationAssets (max_values: None, max_size: Some(622), added: 3097, mode: MaxEncodedLen)
-	// Storage: AssetRegistry AssetLocations (r:0 w:1)
-	// Proof: AssetRegistry AssetLocations (max_values: None, max_size: Some(622), added: 3097, mode: MaxEncodedLen)
+	/// Storage: `AssetRegistry::Assets` (r:1 w:1)
+	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::AssetIds` (r:1 w:1)
+	/// Proof: `AssetRegistry::AssetIds` (`max_values`: None, `max_size`: Some(53), added: 2528, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::LocationAssets` (r:1 w:1)
+	/// Proof: `AssetRegistry::LocationAssets` (`max_values`: None, `max_size`: Some(622), added: 3097, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::AssetLocations` (r:0 w:1)
+	/// Proof: `AssetRegistry::AssetLocations` (`max_values`: None, `max_size`: Some(622), added: 3097, mode: `MaxEncodedLen`)
 	fn register() -> Weight {
-		// Minimum execution time: 39_013 nanoseconds.
-		Weight::from_parts(39_795_000, 0)
-			.saturating_add(RocksDbWeight::get().reads(3 as u64))
-			.saturating_add(RocksDbWeight::get().writes(4 as u64))
+		// Proof Size summary in bytes:
+		//  Measured:  `388`
+		//  Estimated: `4087`
+		// Minimum execution time: 33_258_000 picoseconds.
+		Weight::from_parts(33_840_000, 4087)
+			.saturating_add(RocksDbWeight::get().reads(3_u64))
+			.saturating_add(RocksDbWeight::get().writes(4_u64))
 	}
-	// Storage: AssetRegistry Assets (r:1 w:1)
-	// Proof: AssetRegistry Assets (max_values: None, max_size: Some(133), added: 2608, mode: MaxEncodedLen)
-	// Storage: AssetRegistry AssetIds (r:1 w:2)
-	// Proof: AssetRegistry AssetIds (max_values: None, max_size: Some(53), added: 2528, mode: MaxEncodedLen)
-	// Storage: AssetRegistry AssetLocations (r:1 w:1)
-	// Proof: AssetRegistry AssetLocations (max_values: None, max_size: Some(622), added: 3097, mode: MaxEncodedLen)
-	// Storage: AssetRegistry LocationAssets (r:0 w:1)
-	// Proof: AssetRegistry LocationAssets (max_values: None, max_size: Some(622), added: 3097, mode: MaxEncodedLen)
+	/// Storage: `AssetRegistry::Assets` (r:1 w:1)
+	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::AssetIds` (r:1 w:2)
+	/// Proof: `AssetRegistry::AssetIds` (`max_values`: None, `max_size`: Some(53), added: 2528, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::AssetLocations` (r:1 w:1)
+	/// Proof: `AssetRegistry::AssetLocations` (`max_values`: None, `max_size`: Some(622), added: 3097, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::LocationAssets` (r:0 w:1)
+	/// Proof: `AssetRegistry::LocationAssets` (`max_values`: None, `max_size`: Some(622), added: 3097, mode: `MaxEncodedLen`)
 	fn update() -> Weight {
-		// Minimum execution time: 47_430 nanoseconds.
-		Weight::from_parts(47_760_000, 0)
-			.saturating_add(RocksDbWeight::get().reads(3 as u64))
-			.saturating_add(RocksDbWeight::get().writes(5 as u64))
+		// Proof Size summary in bytes:
+		//  Measured:  `617`
+		//  Estimated: `4087`
+		// Minimum execution time: 40_246_000 picoseconds.
+		Weight::from_parts(40_839_000, 4087)
+			.saturating_add(RocksDbWeight::get().reads(3_u64))
+			.saturating_add(RocksDbWeight::get().writes(5_u64))
 	}
-	// Storage: System Account (r:2 w:2)
-	// Proof: System Account (max_values: None, max_size: Some(128), added: 2603, mode: MaxEncodedLen)
-	// Storage: AssetRegistry NextAssetId (r:1 w:1)
-	// Proof: AssetRegistry NextAssetId (max_values: Some(1), max_size: Some(4), added: 499, mode: MaxEncodedLen)
-	// Storage: AssetRegistry LocationAssets (r:1 w:1)
-	// Proof: AssetRegistry LocationAssets (max_values: None, max_size: Some(622), added: 3097, mode: MaxEncodedLen)
-	// Storage: AssetRegistry AssetLocations (r:0 w:1)
-	// Proof: AssetRegistry AssetLocations (max_values: None, max_size: Some(622), added: 3097, mode: MaxEncodedLen)
-	// Storage: AssetRegistry Assets (r:0 w:1)
-	// Proof: AssetRegistry Assets (max_values: None, max_size: Some(133), added: 2608, mode: MaxEncodedLen)
+	/// Storage: `AssetRegistry::NextAssetId` (r:1 w:1)
+	/// Proof: `AssetRegistry::NextAssetId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::LocationAssets` (r:1 w:1)
+	/// Proof: `AssetRegistry::LocationAssets` (`max_values`: None, `max_size`: Some(622), added: 3097, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::AssetLocations` (r:0 w:1)
+	/// Proof: `AssetRegistry::AssetLocations` (`max_values`: None, `max_size`: Some(622), added: 3097, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::Assets` (r:0 w:1)
+	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
 	fn register_external() -> Weight {
-		// Minimum execution time: 63_891 nanoseconds.
-		Weight::from_parts(64_922_000, 0)
-			.saturating_add(RocksDbWeight::get().reads(4 as u64))
-			.saturating_add(RocksDbWeight::get().writes(6 as u64))
+		// Proof Size summary in bytes:
+		//  Measured:  `301`
+		//  Estimated: `4087`
+		// Minimum execution time: 23_496_000 picoseconds.
+		Weight::from_parts(23_982_000, 4087)
+			.saturating_add(RocksDbWeight::get().reads(2_u64))
+			.saturating_add(RocksDbWeight::get().writes(4_u64))
 	}
-
-	// Storage: AssetRegistry Assets (r:1 w:0)
-	// Proof: AssetRegistry Assets (max_values: None, max_size: Some(125), added: 2600, mode: MaxEncodedLen)
-	// Storage: AssetRegistry BlacklistedAssets (r:1 w:1)
-	// Proof: AssetRegistry BlacklistedAssets (max_values: None, max_size: Some(20), added: 2495, mode: MaxEncodedLen)
+	/// Storage: `AssetRegistry::Assets` (r:1 w:0)
+	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::BannedAssets` (r:1 w:1)
+	/// Proof: `AssetRegistry::BannedAssets` (`max_values`: None, `max_size`: Some(20), added: 2495, mode: `MaxEncodedLen`)
 	fn ban_asset() -> Weight {
-		// Minimum execution time: 22_677 nanoseconds.
-		Weight::from_parts(22_950_000, 0)
-			.saturating_add(RocksDbWeight::get().reads(2 as u64))
-			.saturating_add(RocksDbWeight::get().writes(1 as u64))
+		// Proof Size summary in bytes:
+		//  Measured:  `427`
+		//  Estimated: `3590`
+		// Minimum execution time: 17_542_000 picoseconds.
+		Weight::from_parts(17_999_000, 3590)
+			.saturating_add(RocksDbWeight::get().reads(2_u64))
+			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
-	// Storage: AssetRegistry BlacklistedAssets (r:1 w:1)
-	// Proof: AssetRegistry BlacklistedAssets (max_values: None, max_size: Some(20), added: 2495, mode: MaxEncodedLen)
+	/// Storage: `AssetRegistry::BannedAssets` (r:1 w:1)
+	/// Proof: `AssetRegistry::BannedAssets` (`max_values`: None, `max_size`: Some(20), added: 2495, mode: `MaxEncodedLen`)
 	fn unban_asset() -> Weight {
-		// Minimum execution time: 17_460 nanoseconds.
-		Weight::from_parts(17_958_000, 0)
-			.saturating_add(RocksDbWeight::get().reads(1 as u64))
-			.saturating_add(RocksDbWeight::get().writes(1 as u64))
+		// Proof Size summary in bytes:
+		//  Measured:  `320`
+		//  Estimated: `3485`
+		// Minimum execution time: 14_891_000 picoseconds.
+		Weight::from_parts(15_319_000, 3485)
+			.saturating_add(RocksDbWeight::get().reads(1_u64))
+			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
 }
diff --git a/pallets/bonds/Cargo.toml b/pallets/bonds/Cargo.toml
index d422a8226..2417b8c7d 100644
--- a/pallets/bonds/Cargo.toml
+++ b/pallets/bonds/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-bonds"
-version = "2.2.2"
+version = "2.2.3"
 authors = ['GalacticCouncil']
 edition = "2021"
 license = "Apache-2.0"
diff --git a/pallets/bonds/src/tests/mock.rs b/pallets/bonds/src/tests/mock.rs
index 0bf2f8181..31c8b02f2 100644
--- a/pallets/bonds/src/tests/mock.rs
+++ b/pallets/bonds/src/tests/mock.rs
@@ -123,6 +123,7 @@ impl frame_system::Config for Test {
 	type BlockLength = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
+	type RuntimeTask = RuntimeTask;
 	type Nonce = u64;
 	type Block = Block;
 	type Hash = H256;
diff --git a/pallets/bonds/src/weights.rs b/pallets/bonds/src/weights.rs
index 3e2392821..2709a2edd 100644
--- a/pallets/bonds/src/weights.rs
+++ b/pallets/bonds/src/weights.rs
@@ -17,27 +17,30 @@
 
 //! Autogenerated weights for `pallet_bonds`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-12-12, STEPS: `5`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-05-23, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024`
 
 // Executed Command:
-// target/release/hydradx
+// ./target/release/hydradx
 // benchmark
 // pallet
-// --pallet=pallet-bonds
 // --wasm-execution=compiled
-// --heap-pages=4096
-// --chain=dev
-// --extrinsic=*
-// --steps=5
-// --repeat=20
+// --pallet
+// *
+// --extrinsic
+// *
+// --heap-pages
+// 4096
+// --steps
+// 50
+// --repeat
+// 20
+// --template=scripts/pallet-weight-template.hbs
 // --output
-// ./weights-1.1.0/bonds.rs
-// --template
-// .maintain/pallet-weight-template-no-back.hbs
+// weights/
 
 #![allow(unused_parens)]
 #![allow(unused_imports)]
@@ -56,97 +59,47 @@ pub trait WeightInfo {
 }
 
 /// Weights for pallet_bonds using the hydraDX node and recommended hardware.
-pub struct HydraWeight<T>(PhantomData<T>);
-
-impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
-	/// Storage: `AssetRegistry::Assets` (r:1 w:1)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
-	/// Storage: `Bonds::BondIds` (r:1 w:1)
-	/// Proof: `Bonds::BondIds` (`max_values`: None, `max_size`: Some(32), added: 2507, mode: `MaxEncodedLen`)
-	/// Storage: `Timestamp::Now` (r:1 w:0)
-	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::NextAssetId` (r:1 w:1)
-	/// Proof: `AssetRegistry::NextAssetId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:3 w:3)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `Tokens::Accounts` (r:1 w:1)
-	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
-	/// Storage: `Tokens::TotalIssuance` (r:1 w:1)
-	/// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
-	/// Storage: `MultiTransactionPayment::AccountCurrencyMap` (r:1 w:0)
-	/// Proof: `MultiTransactionPayment::AccountCurrencyMap` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
-	/// Storage: `MultiTransactionPayment::AcceptedCurrencies` (r:1 w:0)
-	/// Proof: `MultiTransactionPayment::AcceptedCurrencies` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
-	/// Storage: `Bonds::Bonds` (r:0 w:1)
-	/// Proof: `Bonds::Bonds` (`max_values`: None, `max_size`: Some(32), added: 2507, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::AssetIds` (r:0 w:1)
-	/// Proof: `AssetRegistry::AssetIds` (`max_values`: None, `max_size`: Some(53), added: 2528, mode: `MaxEncodedLen`)
-	fn issue() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1240`
-		//  Estimated: `8799`
-		// Minimum execution time: 208_163_000 picoseconds.
-		Weight::from_parts(209_241_000, 8799)
-			.saturating_add(T::DbWeight::get().reads(11_u64))
-			.saturating_add(T::DbWeight::get().writes(10_u64))
-	}
-	/// Storage: `Bonds::Bonds` (r:1 w:0)
-	/// Proof: `Bonds::Bonds` (`max_values`: None, `max_size`: Some(32), added: 2507, mode: `MaxEncodedLen`)
-	/// Storage: `Timestamp::Now` (r:1 w:0)
-	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `MaxEncodedLen`)
-	/// Storage: `Tokens::Accounts` (r:1 w:1)
-	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:1 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
-	/// Storage: `Tokens::TotalIssuance` (r:1 w:1)
-	/// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:2 w:2)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `MultiTransactionPayment::AccountCurrencyMap` (r:0 w:1)
-	/// Proof: `MultiTransactionPayment::AccountCurrencyMap` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
-	fn redeem() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1415`
-		//  Estimated: `6196`
-		// Minimum execution time: 146_646_000 picoseconds.
-		Weight::from_parts(147_343_000, 6196)
-			.saturating_add(T::DbWeight::get().reads(7_u64))
-			.saturating_add(T::DbWeight::get().writes(5_u64))
-	}
-}
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
 	/// Storage: `AssetRegistry::Assets` (r:1 w:1)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
+	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
 	/// Storage: `Bonds::BondIds` (r:1 w:1)
 	/// Proof: `Bonds::BondIds` (`max_values`: None, `max_size`: Some(32), added: 2507, mode: `MaxEncodedLen`)
 	/// Storage: `Timestamp::Now` (r:1 w:0)
 	/// Proof: `Timestamp::Now` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `MaxEncodedLen`)
 	/// Storage: `AssetRegistry::NextAssetId` (r:1 w:1)
 	/// Proof: `AssetRegistry::NextAssetId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::AssetIds` (r:1 w:1)
+	/// Proof: `AssetRegistry::AssetIds` (`max_values`: None, `max_size`: Some(53), added: 2528, mode: `MaxEncodedLen`)
 	/// Storage: `System::Account` (r:3 w:3)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::BannedAssets` (r:1 w:0)
+	/// Proof: `AssetRegistry::BannedAssets` (`max_values`: None, `max_size`: Some(20), added: 2495, mode: `MaxEncodedLen`)
 	/// Storage: `Tokens::Accounts` (r:1 w:1)
 	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
-	/// Storage: `Tokens::TotalIssuance` (r:1 w:1)
-	/// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
 	/// Storage: `MultiTransactionPayment::AccountCurrencyMap` (r:1 w:0)
 	/// Proof: `MultiTransactionPayment::AccountCurrencyMap` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:1 w:1)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:1 w:0)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(49), added: 2524, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::ExistentialDepositCounter` (r:1 w:1)
+	/// Proof: `AssetRegistry::ExistentialDepositCounter` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	/// Storage: `Tokens::TotalIssuance` (r:1 w:1)
+	/// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
 	/// Storage: `MultiTransactionPayment::AcceptedCurrencies` (r:1 w:0)
 	/// Proof: `MultiTransactionPayment::AcceptedCurrencies` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
 	/// Storage: `Bonds::Bonds` (r:0 w:1)
 	/// Proof: `Bonds::Bonds` (`max_values`: None, `max_size`: Some(32), added: 2507, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::AssetIds` (r:0 w:1)
-	/// Proof: `AssetRegistry::AssetIds` (`max_values`: None, `max_size`: Some(53), added: 2528, mode: `MaxEncodedLen`)
 	fn issue() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1240`
+		//  Measured:  `1393`
 		//  Estimated: `8799`
-		// Minimum execution time: 208_163_000 picoseconds.
-		Weight::from_parts(209_241_000, 8799)
-			.saturating_add(RocksDbWeight::get().reads(11_u64))
-			.saturating_add(RocksDbWeight::get().writes(10_u64))
+		// Minimum execution time: 233_669_000 picoseconds.
+		Weight::from_parts(235_504_000, 8799)
+			.saturating_add(RocksDbWeight::get().reads(16_u64))
+			.saturating_add(RocksDbWeight::get().writes(12_u64))
 	}
 	/// Storage: `Bonds::Bonds` (r:1 w:0)
 	/// Proof: `Bonds::Bonds` (`max_values`: None, `max_size`: Some(32), added: 2507, mode: `MaxEncodedLen`)
@@ -155,20 +108,26 @@ impl WeightInfo for () {
 	/// Storage: `Tokens::Accounts` (r:1 w:1)
 	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
 	/// Storage: `AssetRegistry::Assets` (r:1 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
+	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
 	/// Storage: `Tokens::TotalIssuance` (r:1 w:1)
 	/// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:2 w:2)
+	/// Storage: `System::Account` (r:3 w:3)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `MultiTransactionPayment::AccountCurrencyMap` (r:0 w:1)
+	/// Storage: `MultiTransactionPayment::AccountCurrencyMap` (r:1 w:0)
 	/// Proof: `MultiTransactionPayment::AccountCurrencyMap` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:1 w:1)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::ExistentialDepositCounter` (r:1 w:1)
+	/// Proof: `AssetRegistry::ExistentialDepositCounter` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:1 w:0)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(49), added: 2524, mode: `MaxEncodedLen`)
 	fn redeem() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1415`
-		//  Estimated: `6196`
-		// Minimum execution time: 146_646_000 picoseconds.
-		Weight::from_parts(147_343_000, 6196)
-			.saturating_add(RocksDbWeight::get().reads(7_u64))
-			.saturating_add(RocksDbWeight::get().writes(5_u64))
+		//  Measured:  `1810`
+		//  Estimated: `8799`
+		// Minimum execution time: 175_138_000 picoseconds.
+		Weight::from_parts(176_054_000, 8799)
+			.saturating_add(RocksDbWeight::get().reads(12_u64))
+			.saturating_add(RocksDbWeight::get().writes(7_u64))
 	}
 }
diff --git a/pallets/circuit-breaker/Cargo.toml b/pallets/circuit-breaker/Cargo.toml
index 5d7b0b2a1..5ea64546b 100644
--- a/pallets/circuit-breaker/Cargo.toml
+++ b/pallets/circuit-breaker/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-circuit-breaker"
-version = "1.1.24"
+version = "1.1.25"
 authors = ["GalacticCouncil <hydradx@galacticcouncil.io>"]
 edition = "2021"
 license = "Apache-2.0"
diff --git a/pallets/circuit-breaker/src/tests/mock.rs b/pallets/circuit-breaker/src/tests/mock.rs
index 8dae69510..a28a2ac92 100644
--- a/pallets/circuit-breaker/src/tests/mock.rs
+++ b/pallets/circuit-breaker/src/tests/mock.rs
@@ -101,6 +101,7 @@ impl frame_system::Config for Test {
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
+	type RuntimeTask = RuntimeTask;
 	type Nonce = u64;
 	type Block = Block;
 	type Hash = H256;
@@ -160,8 +161,8 @@ impl pallet_balances::Config for Test {
 	type ReserveIdentifier = [u8; 8];
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
-	type MaxHolds = ();
 	type RuntimeHoldReason = ();
+	type RuntimeFreezeReason = ();
 }
 
 parameter_type_with_key! {
diff --git a/pallets/circuit-breaker/src/weights.rs b/pallets/circuit-breaker/src/weights.rs
index 9fe074fbe..ec3b5a601 100644
--- a/pallets/circuit-breaker/src/weights.rs
+++ b/pallets/circuit-breaker/src/weights.rs
@@ -17,27 +17,30 @@
 
 //! Autogenerated weights for `pallet_circuit_breaker`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-12-12, STEPS: `5`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-05-23, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024`
 
 // Executed Command:
-// target/release/hydradx
+// ./target/release/hydradx
 // benchmark
 // pallet
-// --pallet=pallet-circuit-breaker
 // --wasm-execution=compiled
-// --heap-pages=4096
-// --chain=dev
-// --extrinsic=*
-// --steps=5
-// --repeat=20
+// --pallet
+// *
+// --extrinsic
+// *
+// --heap-pages
+// 4096
+// --steps
+// 50
+// --repeat
+// 20
+// --template=scripts/pallet-weight-template.hbs
 // --output
-// ./weights-1.1.0/circuit_breaker.rs
-// --template
-// .maintain/pallet-weight-template-no-back.hbs
+// weights/
 
 #![allow(unused_parens)]
 #![allow(unused_imports)]
@@ -69,35 +72,35 @@ impl WeightInfo for () {
 	/// The range of component `m` is `[0, 400]`.
 	fn on_finalize(n: u32, m: u32) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `105 + m * (113 ±0) + n * (56 ±0)`
+		//  Measured:  `64 + m * (113 ±0) + n * (56 ±0)`
 		//  Estimated: `0`
-		// Minimum execution time: 336_709_000 picoseconds.
-		Weight::from_parts(338_100_000, 0)
-			// Standard Error: 34_770
-			.saturating_add(Weight::from_parts(304_235, 0).saturating_mul(n.into()))
-			// Standard Error: 34_770
-			.saturating_add(Weight::from_parts(1_161_474, 0).saturating_mul(m.into()))
+		// Minimum execution time: 306_621_000 picoseconds.
+		Weight::from_parts(308_251_000, 0)
+			// Standard Error: 8_989
+			.saturating_add(Weight::from_parts(270_702, 0).saturating_mul(n.into()))
+			// Standard Error: 8_989
+			.saturating_add(Weight::from_parts(1_049_170, 0).saturating_mul(m.into()))
 	}
 	fn on_finalize_single_liquidity_limit_entry() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `208`
 		//  Estimated: `0`
-		// Minimum execution time: 9_370_000 picoseconds.
-		Weight::from_parts(9_492_000, 0)
+		// Minimum execution time: 8_112_000 picoseconds.
+		Weight::from_parts(8_381_000, 0)
 	}
 	fn on_finalize_single_trade_limit_entry() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `208`
 		//  Estimated: `0`
-		// Minimum execution time: 9_297_000 picoseconds.
-		Weight::from_parts(9_518_000, 0)
+		// Minimum execution time: 8_194_000 picoseconds.
+		Weight::from_parts(8_399_000, 0)
 	}
 	fn on_finalize_empty() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `208`
 		//  Estimated: `0`
-		// Minimum execution time: 9_320_000 picoseconds.
-		Weight::from_parts(9_566_000, 0)
+		// Minimum execution time: 8_191_000 picoseconds.
+		Weight::from_parts(8_373_000, 0)
 	}
 	/// Storage: `CircuitBreaker::TradeVolumeLimitPerAsset` (r:0 w:1)
 	/// Proof: `CircuitBreaker::TradeVolumeLimitPerAsset` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
@@ -105,8 +108,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 12_401_000 picoseconds.
-		Weight::from_parts(12_601_000, 0).saturating_add(RocksDbWeight::get().writes(1_u64))
+		// Minimum execution time: 8_818_000 picoseconds.
+		Weight::from_parts(9_140_000, 0).saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
 	/// Storage: `CircuitBreaker::LiquidityAddLimitPerAsset` (r:0 w:1)
 	/// Proof: `CircuitBreaker::LiquidityAddLimitPerAsset` (`max_values`: None, `max_size`: Some(29), added: 2504, mode: `MaxEncodedLen`)
@@ -114,8 +117,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 12_366_000 picoseconds.
-		Weight::from_parts(12_660_000, 0).saturating_add(RocksDbWeight::get().writes(1_u64))
+		// Minimum execution time: 8_841_000 picoseconds.
+		Weight::from_parts(9_081_000, 0).saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
 	/// Storage: `CircuitBreaker::LiquidityRemoveLimitPerAsset` (r:0 w:1)
 	/// Proof: `CircuitBreaker::LiquidityRemoveLimitPerAsset` (`max_values`: None, `max_size`: Some(29), added: 2504, mode: `MaxEncodedLen`)
@@ -123,8 +126,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 12_543_000 picoseconds.
-		Weight::from_parts(12_729_000, 0).saturating_add(RocksDbWeight::get().writes(1_u64))
+		// Minimum execution time: 9_089_000 picoseconds.
+		Weight::from_parts(9_231_000, 0).saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
 	/// Storage: `CircuitBreaker::LiquidityAddLimitPerAsset` (r:1 w:0)
 	/// Proof: `CircuitBreaker::LiquidityAddLimitPerAsset` (`max_values`: None, `max_size`: Some(29), added: 2504, mode: `MaxEncodedLen`)
@@ -138,8 +141,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `262`
 		//  Estimated: `3517`
-		// Minimum execution time: 20_930_000 picoseconds.
-		Weight::from_parts(21_398_000, 3517)
+		// Minimum execution time: 20_016_000 picoseconds.
+		Weight::from_parts(20_252_000, 3517)
 			.saturating_add(RocksDbWeight::get().reads(4_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
@@ -155,8 +158,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `208`
 		//  Estimated: `3517`
-		// Minimum execution time: 17_808_000 picoseconds.
-		Weight::from_parts(18_193_000, 3517)
+		// Minimum execution time: 17_308_000 picoseconds.
+		Weight::from_parts(17_647_000, 3517)
 			.saturating_add(RocksDbWeight::get().reads(4_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
@@ -168,8 +171,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `208`
 		//  Estimated: `6076`
-		// Minimum execution time: 18_243_000 picoseconds.
-		Weight::from_parts(18_729_000, 6076)
+		// Minimum execution time: 17_387_000 picoseconds.
+		Weight::from_parts(17_667_000, 6076)
 			.saturating_add(RocksDbWeight::get().reads(4_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
diff --git a/pallets/claims/Cargo.toml b/pallets/claims/Cargo.toml
index b42404ada..50524f836 100644
--- a/pallets/claims/Cargo.toml
+++ b/pallets/claims/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = 'pallet-claims'
-version = '3.4.8'
+version = '3.4.9'
 description = 'HydraDX Claims Module'
 authors = ['GalacticCouncil']
 edition = '2021'
diff --git a/pallets/claims/src/lib.rs b/pallets/claims/src/lib.rs
index 60bc16ff5..42a67fed2 100644
--- a/pallets/claims/src/lib.rs
+++ b/pallets/claims/src/lib.rs
@@ -35,7 +35,7 @@ use scale_info::TypeInfo;
 use sp_runtime::DispatchError;
 use sp_runtime::{traits::Zero, ModuleError};
 use sp_std::{marker::PhantomData, prelude::*, vec::Vec};
-use weights::WeightInfo;
+pub use weights::WeightInfo;
 
 mod benchmarking;
 mod traits;
diff --git a/pallets/claims/src/mock.rs b/pallets/claims/src/mock.rs
index 0d9fcdcfd..6746daa7a 100644
--- a/pallets/claims/src/mock.rs
+++ b/pallets/claims/src/mock.rs
@@ -50,6 +50,7 @@ impl frame_system::Config for Test {
 	type BlockLength = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
+	type RuntimeTask = RuntimeTask;
 	type Nonce = u64;
 	type Block = Block;
 	type Hash = H256;
@@ -86,8 +87,8 @@ impl pallet_balances::Config for Test {
 	type ReserveIdentifier = ();
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
-	type MaxHolds = ();
 	type RuntimeHoldReason = ();
+	type RuntimeFreezeReason = ();
 }
 
 parameter_types! {
diff --git a/pallets/claims/src/weights.rs b/pallets/claims/src/weights.rs
index ad2f63ee6..4c0d5b79f 100644
--- a/pallets/claims/src/weights.rs
+++ b/pallets/claims/src/weights.rs
@@ -55,22 +55,6 @@ pub trait WeightInfo {
 }
 
 /// Weights for claims using the hydraDX node and recommended hardware.
-pub struct HydraWeight<T>(PhantomData<T>);
-impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
-	/// Storage: `Claims::Claims` (r:1 w:1)
-	/// Proof: `Claims::Claims` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	fn claim() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `382`
-		//  Estimated: `3593`
-		// Minimum execution time: 82_736_000 picoseconds.
-		Weight::from_parts(83_275_000, 3593)
-			.saturating_add(T::DbWeight::get().reads(2_u64))
-			.saturating_add(T::DbWeight::get().writes(2_u64))
-	}
-}
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
@@ -82,8 +66,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `382`
 		//  Estimated: `3593`
-		// Minimum execution time: 82_736_000 picoseconds.
-		Weight::from_parts(83_275_000, 3593)
+		// Minimum execution time: 69_254_000 picoseconds.
+		Weight::from_parts(69_849_000, 3593)
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
diff --git a/pallets/collator-rewards/Cargo.toml b/pallets/collator-rewards/Cargo.toml
index 111ae549e..21f55d01f 100644
--- a/pallets/collator-rewards/Cargo.toml
+++ b/pallets/collator-rewards/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-collator-rewards"
-version = "1.0.7"
+version = "1.0.8"
 description = "Pallet for collator rewards"
 authors = ["GalacticCouncil"]
 edition = "2021"
diff --git a/pallets/collator-rewards/src/mock.rs b/pallets/collator-rewards/src/mock.rs
index 7fe3582b0..5e4a0b5cf 100644
--- a/pallets/collator-rewards/src/mock.rs
+++ b/pallets/collator-rewards/src/mock.rs
@@ -58,6 +58,7 @@ impl system::Config for Test {
 	type BlockLength = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
+	type RuntimeTask = RuntimeTask;
 	type Nonce = u64;
 	type Block = Block;
 	type Hash = H256;
@@ -115,8 +116,8 @@ impl pallet_balances::Config for Test {
 	type ReserveIdentifier = ();
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
-	type MaxHolds = ();
 	type RuntimeHoldReason = ();
+	type RuntimeFreezeReason = ();
 }
 
 parameter_types! {
diff --git a/pallets/currencies/Cargo.toml b/pallets/currencies/Cargo.toml
index 5ad72157d..0421c8177 100644
--- a/pallets/currencies/Cargo.toml
+++ b/pallets/currencies/Cargo.toml
@@ -3,7 +3,7 @@ name = "pallet-currencies"
 description = "Provide `MultiCurrency` implementation using `pallet-balances` and `orml-tokens` module."
 repository = "https://github.com/open-web3-stack/open-runtime-module-library/tree/master/currencies"
 license = "Apache-2.0"
-version = "2.1.0"
+version = "2.1.1"
 authors = ["Laminar Developers <hello@laminar.one>"]
 edition = "2021"
 
diff --git a/pallets/currencies/src/lib.rs b/pallets/currencies/src/lib.rs
index 188e60aa5..f280e66f2 100644
--- a/pallets/currencies/src/lib.rs
+++ b/pallets/currencies/src/lib.rs
@@ -893,6 +893,7 @@ impl<T: Config, AccountId, Currency, Amount, Moment> Unbalanced<AccountId>
 	for BasicCurrencyAdapter<T, Currency, Amount, Moment>
 where
 	Currency: Mutate<AccountId>,
+	AccountId: Eq,
 {
 	fn handle_dust(dust: Dust<AccountId, Self>) {
 		<Currency as Unbalanced<AccountId>>::handle_dust(Dust(dust.0))
@@ -919,6 +920,7 @@ impl<T: Config, AccountId, Currency, Amount, Moment> Mutate<AccountId>
 	for BasicCurrencyAdapter<T, Currency, Amount, Moment>
 where
 	Currency: Mutate<AccountId>,
+	AccountId: Eq,
 {
 	fn done_mint_into(who: &AccountId, amount: Self::Balance) {
 		<Currency as Mutate<AccountId>>::done_mint_into(who, amount)
diff --git a/pallets/currencies/src/mock.rs b/pallets/currencies/src/mock.rs
index 0432ffa43..701e1d67c 100644
--- a/pallets/currencies/src/mock.rs
+++ b/pallets/currencies/src/mock.rs
@@ -28,6 +28,7 @@ impl frame_system::Config for Runtime {
 	type AccountId = AccountId;
 	type Lookup = IdentityLookup<Self::AccountId>;
 	type RuntimeEvent = RuntimeEvent;
+	type RuntimeTask = RuntimeTask;
 	type BlockHashCount = ConstU64<250>;
 	type BlockWeights = ();
 	type BlockLength = ();
@@ -59,8 +60,8 @@ impl pallet_balances::Config for Runtime {
 	type WeightInfo = ();
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
-	type MaxHolds = ();
 	type RuntimeHoldReason = ();
+	type RuntimeFreezeReason = ();
 }
 
 parameter_type_with_key! {
diff --git a/pallets/currencies/src/weights.rs b/pallets/currencies/src/weights.rs
index ede399f83..1a75abd99 100644
--- a/pallets/currencies/src/weights.rs
+++ b/pallets/currencies/src/weights.rs
@@ -15,29 +15,33 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+
 //! Autogenerated weights for `pallet_currencies`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-12-12, STEPS: `5`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-05-23, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024`
 
 // Executed Command:
-// target/release/hydradx
+// ./target/release/hydradx
 // benchmark
 // pallet
-// --pallet=pallet-currencies
 // --wasm-execution=compiled
-// --heap-pages=4096
-// --chain=dev
-// --extrinsic=*
-// --steps=5
-// --repeat=20
+// --pallet
+// *
+// --extrinsic
+// *
+// --heap-pages
+// 4096
+// --steps
+// 50
+// --repeat
+// 20
+// --template=scripts/pallet-weight-template.hbs
 // --output
-// ./weights-1.1.0/currencies.rs
-// --template
-// .maintain/pallet-weight-template-no-back.hbs
+// weights/
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -58,10 +62,14 @@ pub trait WeightInfo {
 
 /// Default weights.
 impl WeightInfo for () {
+	/// Storage: `Duster::AccountBlacklist` (r:1 w:0)
+	/// Proof: `Duster::AccountBlacklist` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::BannedAssets` (r:1 w:0)
+	/// Proof: `AssetRegistry::BannedAssets` (`max_values`: None, `max_size`: Some(20), added: 2495, mode: `MaxEncodedLen`)
 	/// Storage: `Tokens::Accounts` (r:2 w:2)
 	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
 	/// Storage: `AssetRegistry::Assets` (r:1 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
+	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
 	/// Storage: `System::Account` (r:1 w:1)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	/// Storage: `MultiTransactionPayment::AccountCurrencyMap` (r:1 w:1)
@@ -70,28 +78,30 @@ impl WeightInfo for () {
 	/// Proof: `MultiTransactionPayment::AcceptedCurrencies` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
 	fn transfer_non_native_currency() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2335`
+		//  Measured:  `2649`
 		//  Estimated: `6156`
-		// Minimum execution time: 96_394_000 picoseconds.
-		Weight::from_parts(96_942_000, 6156)
-			.saturating_add(RocksDbWeight::get().reads(6_u64))
+		// Minimum execution time: 89_816_000 picoseconds.
+		Weight::from_parts(90_275_000, 6156)
+			.saturating_add(RocksDbWeight::get().reads(8_u64))
 			.saturating_add(RocksDbWeight::get().writes(4_u64))
 	}
 	/// Storage: `System::Account` (r:1 w:1)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn transfer_native_currency() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1668`
+		//  Measured:  `1642`
 		//  Estimated: `3593`
-		// Minimum execution time: 92_953_000 picoseconds.
-		Weight::from_parts(94_336_000, 3593)
+		// Minimum execution time: 70_873_000 picoseconds.
+		Weight::from_parts(71_750_000, 3593)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
+	/// Storage: `AssetRegistry::BannedAssets` (r:1 w:0)
+	/// Proof: `AssetRegistry::BannedAssets` (`max_values`: None, `max_size`: Some(20), added: 2495, mode: `MaxEncodedLen`)
 	/// Storage: `Tokens::Accounts` (r:1 w:1)
 	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
 	/// Storage: `AssetRegistry::Assets` (r:1 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
+	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
 	/// Storage: `Tokens::TotalIssuance` (r:1 w:1)
 	/// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
 	/// Storage: `System::Account` (r:1 w:1)
@@ -102,21 +112,21 @@ impl WeightInfo for () {
 	/// Proof: `MultiTransactionPayment::AcceptedCurrencies` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
 	fn update_balance_non_native_currency() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2127`
+		//  Measured:  `2213`
 		//  Estimated: `3593`
-		// Minimum execution time: 73_636_000 picoseconds.
-		Weight::from_parts(74_177_000, 3593)
-			.saturating_add(RocksDbWeight::get().reads(6_u64))
+		// Minimum execution time: 62_719_000 picoseconds.
+		Weight::from_parts(63_335_000, 3593)
+			.saturating_add(RocksDbWeight::get().reads(7_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 	}
 	/// Storage: `System::Account` (r:1 w:1)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn update_balance_native_currency_creating() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1528`
+		//  Measured:  `1502`
 		//  Estimated: `3593`
-		// Minimum execution time: 54_370_000 picoseconds.
-		Weight::from_parts(55_148_000, 3593)
+		// Minimum execution time: 38_419_000 picoseconds.
+		Weight::from_parts(39_090_000, 3593)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -124,10 +134,10 @@ impl WeightInfo for () {
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn update_balance_native_currency_killing() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1616`
+		//  Measured:  `1590`
 		//  Estimated: `3593`
-		// Minimum execution time: 54_487_000 picoseconds.
-		Weight::from_parts(55_170_000, 3593)
+		// Minimum execution time: 40_366_000 picoseconds.
+		Weight::from_parts(41_238_000, 3593)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
diff --git a/pallets/dca/Cargo.toml b/pallets/dca/Cargo.toml
index dfac51357..c7634b80c 100644
--- a/pallets/dca/Cargo.toml
+++ b/pallets/dca/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = 'pallet-dca'
-version = "1.4.7"
+version = "1.4.8"
 description = 'A pallet to manage DCA scheduling'
 authors = ['GalacticCouncil']
 edition = '2021'
diff --git a/pallets/dca/src/lib.rs b/pallets/dca/src/lib.rs
index 09e786839..f0504baea 100644
--- a/pallets/dca/src/lib.rs
+++ b/pallets/dca/src/lib.rs
@@ -101,7 +101,7 @@ mod tests;
 pub mod types;
 pub mod weights;
 
-use weights::WeightInfo;
+pub use weights::WeightInfo;
 
 // Re-export pallet items so that they can be accessed from the crate namespace.
 pub use pallet::*;
diff --git a/pallets/dca/src/tests/mock.rs b/pallets/dca/src/tests/mock.rs
index 72d992889..cc46592bc 100644
--- a/pallets/dca/src/tests/mock.rs
+++ b/pallets/dca/src/tests/mock.rs
@@ -54,10 +54,10 @@ pub type BlockNumber = u64;
 pub type AssetId = u32;
 type NamedReserveIdentifier = [u8; 8];
 
-pub const BUY_DCA_FEE_IN_NATIVE: Balance = 1374044000;
-pub const BUY_DCA_FEE_IN_DAI: Balance = 1209158720;
-pub const SELL_DCA_FEE_IN_NATIVE: Balance = 1374576000;
-pub const SELL_DCA_FEE_IN_DAI: Balance = 1209626880;
+pub const BUY_DCA_FEE_IN_NATIVE: Balance = 1334471000;
+pub const BUY_DCA_FEE_IN_DAI: Balance = 1174334480;
+pub const SELL_DCA_FEE_IN_NATIVE: Balance = 1335115000;
+pub const SELL_DCA_FEE_IN_DAI: Balance = 1174901200;
 
 pub const HDX: AssetId = 0;
 pub const LRNA: AssetId = 1;
@@ -175,6 +175,7 @@ impl system::Config for Test {
 	type BlockLength = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
+	type RuntimeTask = RuntimeTask;
 	type Nonce = u64;
 	type Block = Block;
 	type Hash = H256;
@@ -332,8 +333,8 @@ impl pallet_balances::Config for Test {
 	type ReserveIdentifier = NamedReserveIdentifier;
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
-	type MaxHolds = ();
 	type RuntimeHoldReason = ();
+	type RuntimeFreezeReason = ();
 }
 
 impl pallet_currencies::Config for Test {
diff --git a/pallets/dca/src/tests/on_initialize.rs b/pallets/dca/src/tests/on_initialize.rs
index d1f793a33..423aef6f8 100644
--- a/pallets/dca/src/tests/on_initialize.rs
+++ b/pallets/dca/src/tests/on_initialize.rs
@@ -865,7 +865,7 @@ fn full_buy_dca_should_be_completed_when_some_execution_is_successful_but_not_en
 			assert_number_of_executed_buy_trades!(4);
 			assert_eq!(0, Currencies::reserved_balance(HDX, &ALICE));
 
-			let left_over_which_is_not_enough_for_last_trade = 9994503824000;
+			let left_over_which_is_not_enough_for_last_trade = 9994662116000;
 
 			assert_balance!(
 				ALICE,
diff --git a/pallets/dca/src/weights.rs b/pallets/dca/src/weights.rs
index bccefb04d..50d5a67b4 100644
--- a/pallets/dca/src/weights.rs
+++ b/pallets/dca/src/weights.rs
@@ -17,11 +17,11 @@
 
 //! Autogenerated weights for `pallet_dca`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-12-27, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-05-24, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: 1024
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
 
 // Executed Command:
 // target/release/hydradx
@@ -32,9 +32,9 @@
 // --repeat=30
 // --wasm-execution=compiled
 // --heap-pages=4096
-// --template=.maintain/pallet-weight-template-no-back.hbs
+// --template=scripts/pallet-weight-template.hbs
 // --pallet=pallet-dca
-// --output=weights-1.1.0/dca.rs
+// --output=weights/dca.rs
 // --extrinsic=*
 
 #![allow(unused_parens)]
@@ -57,117 +57,6 @@ pub trait WeightInfo {
 }
 
 /// Weights for pallet_dca using the hydraDX node and recommended hardware.
-pub struct HydraWeight<T>(PhantomData<T>);
-
-impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
-	/// Storage: `DCA::ScheduleIdsPerBlock` (r:12 w:2)
-	/// Proof: `DCA::ScheduleIdsPerBlock` (`max_values`: None, `max_size`: Some(101), added: 2576, mode: `MaxEncodedLen`)
-	/// Storage: `DCA::Schedules` (r:1 w:0)
-	/// Proof: `DCA::Schedules` (`max_values`: None, `max_size`: Some(191), added: 2666, mode: `MaxEncodedLen`)
-	/// Storage: `DCA::RemainingAmounts` (r:1 w:1)
-	/// Proof: `DCA::RemainingAmounts` (`max_values`: None, `max_size`: Some(36), added: 2511, mode: `MaxEncodedLen`)
-	/// Storage: `Balances::Reserves` (r:1 w:1)
-	/// Proof: `Balances::Reserves` (`max_values`: None, `max_size`: Some(1249), added: 3724, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:2 w:2)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `DCA::RetriesOnError` (r:0 w:1)
-	/// Proof: `DCA::RetriesOnError` (`max_values`: None, `max_size`: Some(21), added: 2496, mode: `MaxEncodedLen`)
-	fn on_initialize_with_buy_trade() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `54411`
-		//  Estimated: `31902`
-		// Minimum execution time: 244_530_000 picoseconds.
-		Weight::from_parts(249_044_000, 31902)
-			.saturating_add(T::DbWeight::get().reads(17))
-			.saturating_add(T::DbWeight::get().writes(7))
-	}
-	/// Storage: `DCA::ScheduleIdsPerBlock` (r:12 w:2)
-	/// Proof: `DCA::ScheduleIdsPerBlock` (`max_values`: None, `max_size`: Some(101), added: 2576, mode: `MaxEncodedLen`)
-	/// Storage: `DCA::Schedules` (r:1 w:0)
-	/// Proof: `DCA::Schedules` (`max_values`: None, `max_size`: Some(191), added: 2666, mode: `MaxEncodedLen`)
-	/// Storage: `DCA::RemainingAmounts` (r:1 w:1)
-	/// Proof: `DCA::RemainingAmounts` (`max_values`: None, `max_size`: Some(36), added: 2511, mode: `MaxEncodedLen`)
-	/// Storage: `Balances::Reserves` (r:1 w:1)
-	/// Proof: `Balances::Reserves` (`max_values`: None, `max_size`: Some(1249), added: 3724, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:2 w:2)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `DCA::RetriesOnError` (r:0 w:1)
-	/// Proof: `DCA::RetriesOnError` (`max_values`: None, `max_size`: Some(21), added: 2496, mode: `MaxEncodedLen`)
-	fn on_initialize_with_sell_trade() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `54411`
-		//  Estimated: `31902`
-		// Minimum execution time: 244_929_000 picoseconds.
-		Weight::from_parts(249_576_000, 31902)
-			.saturating_add(T::DbWeight::get().reads(17))
-			.saturating_add(T::DbWeight::get().writes(7))
-	}
-	/// Storage: `DCA::ScheduleIdsPerBlock` (r:1 w:0)
-	/// Proof: `DCA::ScheduleIdsPerBlock` (`max_values`: None, `max_size`: Some(101), added: 2576, mode: `MaxEncodedLen`)
-	fn on_initialize_with_empty_block() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1075`
-		//  Estimated: `3566`
-		// Minimum execution time: 17_904_000 picoseconds.
-		Weight::from_parts(18_177_000, 3566).saturating_add(T::DbWeight::get().reads(1))
-	}
-	/// Storage: `MultiTransactionPayment::AcceptedCurrencies` (r:1 w:0)
-	/// Proof: `MultiTransactionPayment::AcceptedCurrencies` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
-	/// Storage: `Router::Routes` (r:1 w:0)
-	/// Proof: `Router::Routes` (`max_values`: None, `max_size`: Some(90), added: 2565, mode: `MaxEncodedLen`)
-	/// Storage: `DCA::ScheduleIdSequencer` (r:1 w:1)
-	/// Proof: `DCA::ScheduleIdSequencer` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	/// Storage: `Tokens::Reserves` (r:1 w:1)
-	/// Proof: `Tokens::Reserves` (`max_values`: None, `max_size`: Some(1261), added: 3736, mode: `MaxEncodedLen`)
-	/// Storage: `Tokens::Accounts` (r:1 w:1)
-	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:1 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
-	/// Storage: `DCA::ScheduleIdsPerBlock` (r:11 w:1)
-	/// Proof: `DCA::ScheduleIdsPerBlock` (`max_values`: None, `max_size`: Some(101), added: 2576, mode: `MaxEncodedLen`)
-	/// Storage: `DCA::RetriesOnError` (r:0 w:1)
-	/// Proof: `DCA::RetriesOnError` (`max_values`: None, `max_size`: Some(21), added: 2496, mode: `MaxEncodedLen`)
-	/// Storage: `DCA::Schedules` (r:0 w:1)
-	/// Proof: `DCA::Schedules` (`max_values`: None, `max_size`: Some(191), added: 2666, mode: `MaxEncodedLen`)
-	/// Storage: `DCA::ScheduleOwnership` (r:0 w:1)
-	/// Proof: `DCA::ScheduleOwnership` (`max_values`: None, `max_size`: Some(60), added: 2535, mode: `MaxEncodedLen`)
-	/// Storage: `DCA::RemainingAmounts` (r:0 w:1)
-	/// Proof: `DCA::RemainingAmounts` (`max_values`: None, `max_size`: Some(36), added: 2511, mode: `MaxEncodedLen`)
-	fn schedule() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `52577`
-		//  Estimated: `29326`
-		// Minimum execution time: 175_288_000 picoseconds.
-		Weight::from_parts(178_961_000, 29326)
-			.saturating_add(T::DbWeight::get().reads(17))
-			.saturating_add(T::DbWeight::get().writes(8))
-	}
-	/// Storage: `DCA::Schedules` (r:1 w:1)
-	/// Proof: `DCA::Schedules` (`max_values`: None, `max_size`: Some(191), added: 2666, mode: `MaxEncodedLen`)
-	/// Storage: `DCA::RemainingAmounts` (r:1 w:1)
-	/// Proof: `DCA::RemainingAmounts` (`max_values`: None, `max_size`: Some(36), added: 2511, mode: `MaxEncodedLen`)
-	/// Storage: `Balances::Reserves` (r:1 w:1)
-	/// Proof: `Balances::Reserves` (`max_values`: None, `max_size`: Some(1249), added: 3724, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `DCA::ScheduleIdsPerBlock` (r:1 w:1)
-	/// Proof: `DCA::ScheduleIdsPerBlock` (`max_values`: None, `max_size`: Some(101), added: 2576, mode: `MaxEncodedLen`)
-	/// Storage: `DCA::RetriesOnError` (r:0 w:1)
-	/// Proof: `DCA::RetriesOnError` (`max_values`: None, `max_size`: Some(21), added: 2496, mode: `MaxEncodedLen`)
-	/// Storage: `DCA::ScheduleOwnership` (r:0 w:1)
-	/// Proof: `DCA::ScheduleOwnership` (`max_values`: None, `max_size`: Some(60), added: 2535, mode: `MaxEncodedLen`)
-	fn terminate() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `2526`
-		//  Estimated: `4714`
-		// Minimum execution time: 82_404_000 picoseconds.
-		Weight::from_parts(83_099_000, 4714)
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(7))
-	}
-}
-
-// For backwards compatibility and tests
 impl WeightInfo for () {
 	/// Storage: `DCA::ScheduleIdsPerBlock` (r:12 w:2)
 	/// Proof: `DCA::ScheduleIdsPerBlock` (`max_values`: None, `max_size`: Some(101), added: 2576, mode: `MaxEncodedLen`)
@@ -183,12 +72,12 @@ impl WeightInfo for () {
 	/// Proof: `DCA::RetriesOnError` (`max_values`: None, `max_size`: Some(21), added: 2496, mode: `MaxEncodedLen`)
 	fn on_initialize_with_buy_trade() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `54411`
+		//  Measured:  `54485`
 		//  Estimated: `31902`
-		// Minimum execution time: 244_530_000 picoseconds.
-		Weight::from_parts(249_044_000, 31902)
-			.saturating_add(RocksDbWeight::get().reads(17))
-			.saturating_add(RocksDbWeight::get().writes(7))
+		// Minimum execution time: 207_153_000 picoseconds.
+		Weight::from_parts(209_471_000, 31902)
+			.saturating_add(RocksDbWeight::get().reads(17_u64))
+			.saturating_add(RocksDbWeight::get().writes(7_u64))
 	}
 	/// Storage: `DCA::ScheduleIdsPerBlock` (r:12 w:2)
 	/// Proof: `DCA::ScheduleIdsPerBlock` (`max_values`: None, `max_size`: Some(101), added: 2576, mode: `MaxEncodedLen`)
@@ -204,12 +93,12 @@ impl WeightInfo for () {
 	/// Proof: `DCA::RetriesOnError` (`max_values`: None, `max_size`: Some(21), added: 2496, mode: `MaxEncodedLen`)
 	fn on_initialize_with_sell_trade() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `54411`
+		//  Measured:  `54593`
 		//  Estimated: `31902`
-		// Minimum execution time: 244_929_000 picoseconds.
-		Weight::from_parts(249_576_000, 31902)
-			.saturating_add(RocksDbWeight::get().reads(17))
-			.saturating_add(RocksDbWeight::get().writes(7))
+		// Minimum execution time: 206_729_000 picoseconds.
+		Weight::from_parts(210_115_000, 31902)
+			.saturating_add(RocksDbWeight::get().reads(17_u64))
+			.saturating_add(RocksDbWeight::get().writes(7_u64))
 	}
 	/// Storage: `DCA::ScheduleIdsPerBlock` (r:1 w:0)
 	/// Proof: `DCA::ScheduleIdsPerBlock` (`max_values`: None, `max_size`: Some(101), added: 2576, mode: `MaxEncodedLen`)
@@ -217,8 +106,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `1075`
 		//  Estimated: `3566`
-		// Minimum execution time: 17_904_000 picoseconds.
-		Weight::from_parts(18_177_000, 3566).saturating_add(RocksDbWeight::get().reads(1))
+		// Minimum execution time: 14_273_000 picoseconds.
+		Weight::from_parts(14_864_000, 3566).saturating_add(RocksDbWeight::get().reads(1_u64))
 	}
 	/// Storage: `MultiTransactionPayment::AcceptedCurrencies` (r:1 w:0)
 	/// Proof: `MultiTransactionPayment::AcceptedCurrencies` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
@@ -231,7 +120,7 @@ impl WeightInfo for () {
 	/// Storage: `Tokens::Accounts` (r:1 w:1)
 	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
 	/// Storage: `AssetRegistry::Assets` (r:1 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
+	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
 	/// Storage: `DCA::ScheduleIdsPerBlock` (r:11 w:1)
 	/// Proof: `DCA::ScheduleIdsPerBlock` (`max_values`: None, `max_size`: Some(101), added: 2576, mode: `MaxEncodedLen`)
 	/// Storage: `DCA::RetriesOnError` (r:0 w:1)
@@ -244,12 +133,12 @@ impl WeightInfo for () {
 	/// Proof: `DCA::RemainingAmounts` (`max_values`: None, `max_size`: Some(36), added: 2511, mode: `MaxEncodedLen`)
 	fn schedule() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `52577`
+		//  Measured:  `52618`
 		//  Estimated: `29326`
-		// Minimum execution time: 175_288_000 picoseconds.
-		Weight::from_parts(178_961_000, 29326)
-			.saturating_add(RocksDbWeight::get().reads(17))
-			.saturating_add(RocksDbWeight::get().writes(8))
+		// Minimum execution time: 153_135_000 picoseconds.
+		Weight::from_parts(155_526_000, 29326)
+			.saturating_add(RocksDbWeight::get().reads(17_u64))
+			.saturating_add(RocksDbWeight::get().writes(8_u64))
 	}
 	/// Storage: `DCA::Schedules` (r:1 w:1)
 	/// Proof: `DCA::Schedules` (`max_values`: None, `max_size`: Some(191), added: 2666, mode: `MaxEncodedLen`)
@@ -267,11 +156,11 @@ impl WeightInfo for () {
 	/// Proof: `DCA::ScheduleOwnership` (`max_values`: None, `max_size`: Some(60), added: 2535, mode: `MaxEncodedLen`)
 	fn terminate() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2526`
+		//  Measured:  `2492`
 		//  Estimated: `4714`
-		// Minimum execution time: 82_404_000 picoseconds.
-		Weight::from_parts(83_099_000, 4714)
-			.saturating_add(RocksDbWeight::get().reads(5))
-			.saturating_add(RocksDbWeight::get().writes(7))
+		// Minimum execution time: 70_794_000 picoseconds.
+		Weight::from_parts(71_685_000, 4714)
+			.saturating_add(RocksDbWeight::get().reads(5_u64))
+			.saturating_add(RocksDbWeight::get().writes(7_u64))
 	}
 }
diff --git a/pallets/democracy/Cargo.toml b/pallets/democracy/Cargo.toml
index 2fb3e3250..f3304d7cc 100644
--- a/pallets/democracy/Cargo.toml
+++ b/pallets/democracy/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-democracy"
-version = "4.2.0"
+version = "4.2.1"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2021"
 license = "Apache-2.0"
diff --git a/pallets/democracy/src/benchmarking.rs b/pallets/democracy/src/benchmarking.rs
index 165a2e336..ecfd1b693 100644
--- a/pallets/democracy/src/benchmarking.rs
+++ b/pallets/democracy/src/benchmarking.rs
@@ -25,7 +25,6 @@ use frame_support::{
 	traits::{Currency, EnsureOrigin, Get, OnInitialize, UnfilteredDispatchable},
 };
 use frame_system::{pallet_prelude::BlockNumberFor, RawOrigin};
-use sp_core::H256;
 use sp_runtime::{traits::Bounded, BoundedVec};
 
 use crate::Pallet as Democracy;
@@ -46,7 +45,7 @@ fn make_proposal<T: Config>(n: u32) -> BoundedCallOf<T> {
 	<T as Config>::Preimages::bound(call).unwrap()
 }
 
-fn add_proposal<T: Config>(n: u32) -> Result<H256, &'static str> {
+fn add_proposal<T: Config>(n: u32) -> Result<T::Hash, &'static str> {
 	let other = funded_account::<T>("proposer", n);
 	let value = T::MinimumDeposit::get();
 	let proposal = make_proposal::<T>(n);
@@ -55,13 +54,13 @@ fn add_proposal<T: Config>(n: u32) -> Result<H256, &'static str> {
 }
 
 // add a referendum with a metadata.
-fn add_referendum<T: Config>(n: u32) -> (ReferendumIndex, H256, PreimageHash) {
+fn add_referendum<T: Config>(n: u32) -> (ReferendumIndex, T::Hash, T::Hash) {
 	let vote_threshold = VoteThreshold::SimpleMajority;
 	let proposal = make_proposal::<T>(n);
 	let hash = proposal.hash();
 	let index = Democracy::<T>::inject_referendum(T::LaunchPeriod::get(), proposal, vote_threshold, 0u32.into());
 	let preimage_hash = note_preimage::<T>();
-	MetadataOf::<T>::insert(crate::MetadataOwner::Referendum(index), preimage_hash.clone());
+	MetadataOf::<T>::insert(crate::MetadataOwner::Referendum(index), preimage_hash);
 	(index, hash, preimage_hash)
 }
 
@@ -83,14 +82,13 @@ fn assert_has_event<T: Config>(generic_event: <T as Config>::RuntimeEvent) {
 }
 
 // note a new preimage.
-fn note_preimage<T: Config>() -> PreimageHash {
+fn note_preimage<T: Config>() -> T::Hash {
 	use core::sync::atomic::{AtomicU8, Ordering};
 	use sp_std::borrow::Cow;
 	// note a new preimage on every function invoke.
 	static COUNTER: AtomicU8 = AtomicU8::new(0);
 	let data = Cow::from(vec![COUNTER.fetch_add(1, Ordering::Relaxed)]);
-	let hash = <T as Config>::Preimages::note(data).unwrap();
-	hash
+	<T as Config>::Preimages::note(data).unwrap()
 }
 
 benchmarks! {
@@ -255,7 +253,6 @@ benchmarks! {
 		// Add proposal to blacklist with block number 0
 
 		let addresses: BoundedVec<_, _> = (0..(T::MaxBlacklisted::get() - 1))
-			.into_iter()
 			.map(|i| account::<T::AccountId>("blacklist", i, SEED))
 			.collect::<Vec<_>>()
 			.try_into()
@@ -341,7 +338,7 @@ benchmarks! {
 	}: _<T::RuntimeOrigin>(origin, proposal_hash)
 	verify {
 		assert!(NextExternal::<T>::get().is_none());
-		let (_, new_vetoers) = <Blacklist<T>>::get(&proposal_hash).ok_or("no blacklist")?;
+		let (_, new_vetoers) = <Blacklist<T>>::get(proposal_hash).ok_or("no blacklist")?;
 		assert_eq!(new_vetoers.len(), T::MaxBlacklisted::get() as usize, "vetoers not added");
 	}
 
diff --git a/pallets/democracy/src/conviction.rs b/pallets/democracy/src/conviction.rs
index ffbf6445d..902b6b4c9 100644
--- a/pallets/democracy/src/conviction.rs
+++ b/pallets/democracy/src/conviction.rs
@@ -27,9 +27,12 @@ use sp_runtime::{
 use sp_std::{prelude::*, result::Result};
 
 /// A value denoting the strength of conviction of a vote.
-#[derive(Encode, MaxEncodedLen, Decode, Copy, Clone, Eq, PartialEq, Ord, PartialOrd, RuntimeDebug, TypeInfo)]
+#[derive(
+	Default, Encode, MaxEncodedLen, Decode, Copy, Clone, Eq, PartialEq, Ord, PartialOrd, RuntimeDebug, TypeInfo,
+)]
 pub enum Conviction {
 	/// 0.1x votes, unlocked.
+	#[default]
 	None,
 	/// 1x votes, locked for an enactment period following a successful vote.
 	Locked1x,
@@ -45,12 +48,6 @@ pub enum Conviction {
 	Locked6x,
 }
 
-impl Default for Conviction {
-	fn default() -> Self {
-		Conviction::None
-	}
-}
-
 impl From<Conviction> for u8 {
 	fn from(c: Conviction) -> u8 {
 		match c {
diff --git a/pallets/democracy/src/lib.rs b/pallets/democracy/src/lib.rs
index 9d1fd0400..14a355812 100644
--- a/pallets/democracy/src/lib.rs
+++ b/pallets/democracy/src/lib.rs
@@ -149,9 +149,9 @@
 //! - `cancel_queued` - Cancels a proposal that is queued for enactment.
 //! - `clear_public_proposal` - Removes all public proposals.
 
-#![allow(clippy::all)]
 #![recursion_limit = "256"]
 #![cfg_attr(not(feature = "std"), no_std)]
+#![allow(clippy::type_complexity)]
 
 use codec::{Decode, Encode};
 use frame_support::{
@@ -160,8 +160,8 @@ use frame_support::{
 	traits::{
 		defensive_prelude::*,
 		schedule::{v3::Named as ScheduleNamed, DispatchTime},
-		Bounded, Currency, EnsureOrigin, Get, Hash as PreimageHash, LockIdentifier, LockableCurrency, OnUnbalanced,
-		QueryPreimage, ReservableCurrency, StorePreimage, WithdrawReasons,
+		Bounded, Currency, EnsureOrigin, Get, LockIdentifier, LockableCurrency, OnUnbalanced, QueryPreimage,
+		ReservableCurrency, StorePreimage, WithdrawReasons,
 	},
 	weights::Weight,
 };
@@ -170,7 +170,7 @@ use sp_runtime::{
 	traits::{Bounded as ArithBounded, One, Saturating, StaticLookup, Zero},
 	ArithmeticError, DispatchError, DispatchResult,
 };
-use sp_std::{prelude::*, vec};
+use sp_std::prelude::*;
 
 mod conviction;
 pub mod traits;
@@ -202,16 +202,14 @@ type BalanceOf<T> = <<T as Config>::Currency as Currency<<T as frame_system::Con
 type NegativeImbalanceOf<T> =
 	<<T as Config>::Currency as Currency<<T as frame_system::Config>::AccountId>>::NegativeImbalance;
 pub type CallOf<T> = <T as frame_system::Config>::RuntimeCall;
-pub type BoundedCallOf<T> = Bounded<CallOf<T>>;
+pub type BoundedCallOf<T> = Bounded<CallOf<T>, <T as frame_system::Config>::Hashing>;
 type AccountIdLookupOf<T> = <<T as frame_system::Config>::Lookup as StaticLookup>::Source;
 
 #[frame_support::pallet]
 pub mod pallet {
 	use super::{DispatchResult, *};
-	use crate::traits::DemocracyHooks;
 	use frame_support::pallet_prelude::*;
 	use frame_system::pallet_prelude::*;
-	use sp_core::H256;
 
 	/// The current storage version.
 	const STORAGE_VERSION: StorageVersion = StorageVersion::new(1);
@@ -226,10 +224,10 @@ pub mod pallet {
 		type RuntimeEvent: From<Event<Self>> + IsType<<Self as frame_system::Config>::RuntimeEvent>;
 
 		/// The Scheduler.
-		type Scheduler: ScheduleNamed<BlockNumberFor<Self>, CallOf<Self>, Self::PalletsOrigin>;
+		type Scheduler: ScheduleNamed<BlockNumberFor<Self>, CallOf<Self>, Self::PalletsOrigin, Hasher = Self::Hashing>;
 
 		/// The Preimage provider.
-		type Preimages: QueryPreimage + StorePreimage;
+		type Preimages: QueryPreimage<H = Self::Hashing> + StorePreimage;
 
 		/// Currency type for this pallet.
 		type Currency: ReservableCurrency<Self::AccountId>
@@ -412,20 +410,20 @@ pub mod pallet {
 	/// (until when it may not be resubmitted) and who vetoed it.
 	#[pallet::storage]
 	pub type Blacklist<T: Config> =
-		StorageMap<_, Identity, H256, (BlockNumberFor<T>, BoundedVec<T::AccountId, T::MaxBlacklisted>)>;
+		StorageMap<_, Identity, T::Hash, (BlockNumberFor<T>, BoundedVec<T::AccountId, T::MaxBlacklisted>)>;
 
 	/// Record of all proposals that have been subject to emergency cancellation.
 	#[pallet::storage]
-	pub type Cancellations<T: Config> = StorageMap<_, Identity, H256, bool, ValueQuery>;
+	pub type Cancellations<T: Config> = StorageMap<_, Identity, T::Hash, bool, ValueQuery>;
 
 	/// General information concerning any proposal or referendum.
-	/// The `PreimageHash` refers to the preimage of the `Preimages` provider which can be a JSON
+	/// The `Hash` refers to the preimage of the `Preimages` provider which can be a JSON
 	/// dump or IPFS hash of a JSON file.
 	///
 	/// Consider a garbage collection for a metadata of finished referendums to `unrequest` (remove)
 	/// large preimages.
 	#[pallet::storage]
-	pub type MetadataOf<T: Config> = StorageMap<_, Blake2_128Concat, MetadataOwner, PreimageHash>;
+	pub type MetadataOf<T: Config> = StorageMap<_, Blake2_128Concat, MetadataOwner, T::Hash>;
 
 	#[pallet::genesis_config]
 	#[derive(frame_support::DefaultNoBound)]
@@ -476,11 +474,11 @@ pub mod pallet {
 		/// An external proposal has been vetoed.
 		Vetoed {
 			who: T::AccountId,
-			proposal_hash: H256,
+			proposal_hash: T::Hash,
 			until: BlockNumberFor<T>,
 		},
 		/// A proposal_hash has been blacklisted permanently.
-		Blacklisted { proposal_hash: H256 },
+		Blacklisted { proposal_hash: T::Hash },
 		/// An account has voted in a referendum
 		Voted {
 			voter: T::AccountId,
@@ -499,14 +497,14 @@ pub mod pallet {
 			/// Metadata owner.
 			owner: MetadataOwner,
 			/// Preimage hash.
-			hash: PreimageHash,
+			hash: T::Hash,
 		},
 		/// Metadata for a proposal or a referendum has been cleared.
 		MetadataCleared {
 			/// Metadata owner.
 			owner: MetadataOwner,
 			/// Preimage hash.
-			hash: PreimageHash,
+			hash: T::Hash,
 		},
 		/// Metadata has been transferred to new owner.
 		MetadataTransferred {
@@ -515,7 +513,7 @@ pub mod pallet {
 			/// New metadata owner.
 			owner: MetadataOwner,
 			/// Preimage hash.
-			hash: PreimageHash,
+			hash: T::Hash,
 		},
 	}
 
@@ -774,7 +772,7 @@ pub mod pallet {
 		#[pallet::weight(T::WeightInfo::fast_track())]
 		pub fn fast_track(
 			origin: OriginFor<T>,
-			proposal_hash: H256,
+			proposal_hash: T::Hash,
 			voting_period: BlockNumberFor<T>,
 			delay: BlockNumberFor<T>,
 		) -> DispatchResult {
@@ -820,7 +818,7 @@ pub mod pallet {
 		/// Weight: `O(V + log(V))` where V is number of `existing vetoers`
 		#[pallet::call_index(8)]
 		#[pallet::weight(T::WeightInfo::veto_external())]
-		pub fn veto_external(origin: OriginFor<T>, proposal_hash: H256) -> DispatchResult {
+		pub fn veto_external(origin: OriginFor<T>, proposal_hash: T::Hash) -> DispatchResult {
 			let who = T::VetoOrigin::ensure_origin(origin)?;
 
 			if let Some((ext_proposal, _)) = NextExternal::<T>::get() {
@@ -829,7 +827,7 @@ pub mod pallet {
 				return Err(Error::<T>::NoProposal.into());
 			}
 
-			let mut existing_vetoers = <Blacklist<T>>::get(&proposal_hash)
+			let mut existing_vetoers = <Blacklist<T>>::get(proposal_hash)
 				.map(|pair| pair.1)
 				.unwrap_or_default();
 			let insert_position = existing_vetoers
@@ -841,7 +839,7 @@ pub mod pallet {
 				.map_err(|_| Error::<T>::TooMany)?;
 
 			let until = <frame_system::Pallet<T>>::block_number().saturating_add(T::CooloffPeriod::get());
-			<Blacklist<T>>::insert(&proposal_hash, (until, existing_vetoers));
+			<Blacklist<T>>::insert(proposal_hash, (until, existing_vetoers));
 
 			Self::deposit_event(Event::<T>::Vetoed {
 				who,
@@ -1045,7 +1043,7 @@ pub mod pallet {
 		#[pallet::weight((T::WeightInfo::blacklist(), DispatchClass::Operational))]
 		pub fn blacklist(
 			origin: OriginFor<T>,
-			proposal_hash: H256,
+			proposal_hash: T::Hash,
 			maybe_ref_index: Option<ReferendumIndex>,
 		) -> DispatchResult {
 			T::BlacklistOrigin::ensure_origin(origin)?;
@@ -1055,7 +1053,7 @@ pub mod pallet {
 				BlockNumberFor::<T>::max_value(),
 				BoundedVec::<T::AccountId, _>::default(),
 			);
-			Blacklist::<T>::insert(&proposal_hash, permanent);
+			Blacklist::<T>::insert(proposal_hash, permanent);
 
 			// Remove the queued proposal, if it's there.
 			PublicProps::<T>::mutate(|props| {
@@ -1138,11 +1136,7 @@ pub mod pallet {
 				(MetadataOwner::Referendum(_), None) => T::WeightInfo::clear_referendum_metadata(),
 			}
 		)]
-		pub fn set_metadata(
-			origin: OriginFor<T>,
-			owner: MetadataOwner,
-			maybe_hash: Option<PreimageHash>,
-		) -> DispatchResult {
+		pub fn set_metadata(origin: OriginFor<T>, owner: MetadataOwner, maybe_hash: Option<T::Hash>) -> DispatchResult {
 			match owner {
 				MetadataOwner::External => {
 					let (_, threshold) = <NextExternal<T>>::get().ok_or(Error::<T>::NoProposal)?;
@@ -1175,15 +1169,16 @@ pub mod pallet {
 }
 
 pub trait EncodeInto: Encode {
-	fn encode_into<T: AsMut<[u8]> + Default>(&self) -> T {
+	fn encode_into<T: AsMut<[u8]> + Default, H: sp_core::Hasher>(&self) -> T {
 		let mut t = T::default();
 		self.using_encoded(|data| {
 			if data.len() <= t.as_mut().len() {
 				t.as_mut()[0..data.len()].copy_from_slice(data);
 			} else {
-				// encoded self is too big to fit into a T. hash it and use the first bytes of that
-				// instead.
-				let hash = sp_io::hashing::blake2_256(data);
+				// encoded self is too big to fit into a T.
+				// hash it and use the first bytes of that instead.
+				let hash = H::hash(data);
+				let hash = hash.as_ref();
 				let l = t.as_mut().len().min(hash.len());
 				t.as_mut()[0..l].copy_from_slice(&hash[0..l]);
 			}
@@ -1609,7 +1604,7 @@ impl<T: Config> Pallet<T> {
 			Self::transfer_metadata(MetadataOwner::External, MetadataOwner::Referendum(ref_index));
 			Ok(())
 		} else {
-			return Err(Error::<T>::NoneWaiting.into());
+			Err(Error::<T>::NoneWaiting.into())
 		}
 	}
 
@@ -1645,7 +1640,7 @@ impl<T: Config> Pallet<T> {
 			}
 			Ok(())
 		} else {
-			return Err(Error::<T>::NoneWaiting.into());
+			Err(Error::<T>::NoneWaiting.into())
 		}
 	}
 
@@ -1663,7 +1658,7 @@ impl<T: Config> Pallet<T> {
 			// Earliest it can be scheduled for is next block.
 			let when = now.saturating_add(status.delay.max(One::one()));
 			if T::Scheduler::schedule_named(
-				(DEMOCRACY_ID, index).encode_into(),
+				(DEMOCRACY_ID, index).encode_into::<_, T::Hashing>(),
 				DispatchTime::At(when),
 				None,
 				63,
diff --git a/pallets/democracy/src/migrations/mod.rs b/pallets/democracy/src/migrations/mod.rs
new file mode 100644
index 000000000..3f77e0388
--- /dev/null
+++ b/pallets/democracy/src/migrations/mod.rs
@@ -0,0 +1,22 @@
+// This file is part of Substrate.
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! All migrations of this pallet.
+
+/// Migration to unlock and unreserve all pallet funds.
+pub mod unlock_and_unreserve_all_funds;
+
+/// V1 storage migrations for the preimage pallet.
+pub mod v1;
diff --git a/pallets/democracy/src/migrations/unlock_and_unreserve_all_funds.rs b/pallets/democracy/src/migrations/unlock_and_unreserve_all_funds.rs
new file mode 100644
index 000000000..b90ba2324
--- /dev/null
+++ b/pallets/democracy/src/migrations/unlock_and_unreserve_all_funds.rs
@@ -0,0 +1,416 @@
+// This file is part of Substrate.
+
+// Copyright (C) Parity Technologies (UK) Ltd.
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// 	http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+//! A migration that unreserves all deposit and unlocks all stake held in the context of this
+//! pallet.
+
+use crate::{PropIndex, Voting, DEMOCRACY_ID};
+use core::iter::Sum;
+use frame_support::{
+	pallet_prelude::ValueQuery,
+	storage_alias,
+	traits::{Currency, LockableCurrency, OnRuntimeUpgrade, ReservableCurrency},
+	weights::RuntimeDbWeight,
+	Parameter, Twox64Concat,
+};
+use sp_core::Get;
+use sp_runtime::{traits::Zero, BoundedVec, Saturating};
+use sp_std::{collections::btree_map::BTreeMap, vec::Vec};
+
+const LOG_TARGET: &str = "runtime::democracy::migrations::unlock_and_unreserve_all_funds";
+
+type BalanceOf<T> = <<T as UnlockConfig>::Currency as Currency<<T as UnlockConfig>::AccountId>>::Balance;
+
+/// The configuration for [`UnlockAndUnreserveAllFunds`].
+pub trait UnlockConfig: 'static {
+	/// The account ID used in the runtime.
+	type AccountId: Parameter + Ord;
+	/// The currency type used in the runtime.
+	///
+	/// Should match the currency type previously used for the pallet, if applicable.
+	type Currency: LockableCurrency<Self::AccountId> + ReservableCurrency<Self::AccountId>;
+	/// The name of the pallet as previously configured in
+	/// [`construct_runtime!`](frame_support::construct_runtime).
+	type PalletName: Get<&'static str>;
+	/// The maximum number of votes as configured previously in the runtime.
+	type MaxVotes: Get<u32>;
+	/// The maximum deposit as configured previously in the runtime.
+	type MaxDeposits: Get<u32>;
+	/// The DB weight as configured in the runtime to calculate the correct weight.
+	type DbWeight: Get<RuntimeDbWeight>;
+	/// The block number as configured in the runtime.
+	type BlockNumber: Parameter + Zero + Copy + Ord;
+}
+
+#[storage_alias(dynamic)]
+type DepositOf<T: UnlockConfig> = StorageMap<
+	<T as UnlockConfig>::PalletName,
+	Twox64Concat,
+	PropIndex,
+	(
+		BoundedVec<<T as UnlockConfig>::AccountId, <T as UnlockConfig>::MaxDeposits>,
+		BalanceOf<T>,
+	),
+>;
+
+#[storage_alias(dynamic)]
+type VotingOf<T: UnlockConfig> = StorageMap<
+	<T as UnlockConfig>::PalletName,
+	Twox64Concat,
+	<T as UnlockConfig>::AccountId,
+	Voting<
+		BalanceOf<T>,
+		<T as UnlockConfig>::AccountId,
+		<T as UnlockConfig>::BlockNumber,
+		<T as UnlockConfig>::MaxVotes,
+	>,
+	ValueQuery,
+>;
+
+/// A migration that unreserves all deposit and unlocks all stake held in the context of this
+/// pallet.
+///
+/// Useful to prevent funds from being locked up when the pallet is being deprecated.
+///
+/// The pallet should be made inoperable before this migration is run.
+///
+/// (See also [`RemovePallet`][frame_support::migrations::RemovePallet])
+pub struct UnlockAndUnreserveAllFunds<T: UnlockConfig>(sp_std::marker::PhantomData<T>);
+
+impl<T: UnlockConfig> UnlockAndUnreserveAllFunds<T> {
+	/// Calculates and returns the total amounts reserved by each account by this pallet, and all
+	/// accounts with locks in the context of this pallet.
+	///
+	/// There is no need to return the amount locked, because the entire lock is removed (always
+	/// should be zero post-migration). We need to return the amounts reserved to check that the
+	/// reserved amount is deducted correctly.
+	///
+	/// # Returns
+	///
+	/// This function returns a tuple of two `BTreeMap` collections and the weight of the reads:
+	///
+	/// * `BTreeMap<T::AccountId, BalanceOf<T>>`: Map of account IDs to their respective total
+	///   reserved balance by this pallet
+	/// * `BTreeMap<T::AccountId, BalanceOf<T>>`: Map of account IDs to their respective total
+	///   locked balance by this pallet
+	/// * `frame_support::weights::Weight`: the weight consumed by this call.
+	fn get_account_deposits_and_locks() -> (
+		BTreeMap<T::AccountId, BalanceOf<T>>,
+		BTreeMap<T::AccountId, BalanceOf<T>>,
+		frame_support::weights::Weight,
+	) {
+		let mut deposit_of_len = 0;
+
+		// Get all deposits (reserved).
+		let mut total_voting_vec_entries: u64 = 0;
+		let account_deposits: BTreeMap<T::AccountId, BalanceOf<T>> = DepositOf::<T>::iter()
+			.flat_map(|(_prop_index, (accounts, balance))| {
+				// Count the number of deposits
+				deposit_of_len.saturating_inc();
+
+				// Track the total number of vec entries to calculate the weight of the reads.
+				total_voting_vec_entries.saturating_accrue(accounts.len() as u64);
+
+				// Create a vec of tuples where each account is associated with the given balance
+				accounts
+					.into_iter()
+					.map(|account| (account, balance))
+					.collect::<Vec<_>>()
+			})
+			.fold(BTreeMap::new(), |mut acc, (account, balance)| {
+				// Add the balance to the account's existing balance in the accumulator
+				acc.entry(account.clone())
+					.or_insert(Zero::zero())
+					.saturating_accrue(balance);
+				acc
+			});
+
+		// Voter accounts have amounts locked.
+		let account_stakes: BTreeMap<T::AccountId, BalanceOf<T>> = VotingOf::<T>::iter()
+			.map(|(account_id, voting)| (account_id, voting.locked_balance()))
+			.collect();
+		let voting_of_len = account_stakes.len() as u64;
+
+		(
+			account_deposits,
+			account_stakes,
+			T::DbWeight::get().reads(deposit_of_len.saturating_add(voting_of_len).saturating_add(
+				// Max items in a Voting enum is MaxVotes + 5
+				total_voting_vec_entries.saturating_mul(T::MaxVotes::get().saturating_add(5) as u64),
+			)),
+		)
+	}
+}
+
+impl<T: UnlockConfig> OnRuntimeUpgrade for UnlockAndUnreserveAllFunds<T>
+where
+	BalanceOf<T>: Sum,
+{
+	/// Collects pre-migration data useful for validating the migration was successful, and also
+	/// checks the integrity of deposited and reserved balances.
+	///
+	/// Steps:
+	/// 1. Gets the deposited balances for each account stored in this pallet.
+	/// 2. Collects actual pre-migration reserved balances for each account.
+	/// 3. Checks the integrity of the deposited balances.
+	/// 4. Prints summary statistics about the state to be migrated.
+	/// 5. Encodes and returns pre-migration data to be used in post_upgrade.
+	///
+	/// Fails with a `TryRuntimeError` if somehow the amount reserved by this pallet is greater than
+	/// the actual total reserved amount for any accounts.
+	#[cfg(feature = "try-runtime")]
+	fn pre_upgrade() -> Result<Vec<u8>, sp_runtime::TryRuntimeError> {
+		use codec::Encode;
+		use sp_std::collections::btree_set::BTreeSet;
+
+		// Get staked and deposited balances as reported by this pallet.
+		let (account_deposits, account_locks, _) = Self::get_account_deposits_and_locks();
+
+		let all_accounts = account_deposits
+			.keys()
+			.chain(account_locks.keys())
+			.cloned()
+			.collect::<BTreeSet<_>>();
+		let account_reserved_before: BTreeMap<T::AccountId, BalanceOf<T>> = account_deposits
+			.keys()
+			.map(|account| (account.clone(), T::Currency::reserved_balance(account)))
+			.collect();
+
+		// Total deposited for each account *should* be less than or equal to the total reserved,
+		// however this does not hold for all cases due to bugs in the reserve logic of this pallet.
+		let bugged_deposits = all_accounts
+			.iter()
+			.filter(|account| {
+				account_deposits.get(account).unwrap_or(&Zero::zero())
+					> account_reserved_before.get(account).unwrap_or(&Zero::zero())
+			})
+			.count();
+
+		let total_deposits_to_unreserve = account_deposits.clone().into_values().sum::<BalanceOf<T>>();
+		let total_stake_to_unlock = account_locks.clone().into_values().sum::<BalanceOf<T>>();
+
+		log::info!(target: LOG_TARGET, "Total accounts: {:?}", all_accounts.len());
+		log::info!(target: LOG_TARGET, "Total stake to unlock: {:?}", total_stake_to_unlock);
+		log::info!(
+			target: LOG_TARGET,
+			"Total deposit to unreserve: {:?}",
+			total_deposits_to_unreserve
+		);
+		log::info!(
+			target: LOG_TARGET,
+			"Bugged deposits: {}/{}",
+			bugged_deposits,
+			account_deposits.len()
+		);
+
+		Ok(account_reserved_before.encode())
+	}
+
+	/// Executes the migration.
+	///
+	/// Steps:
+	/// 1. Retrieves the deposit and accounts with locks for the pallet.
+	/// 2. Unreserves the deposited funds for each account.
+	/// 3. Unlocks the staked funds for each account.
+	fn on_runtime_upgrade() -> frame_support::weights::Weight {
+		// Get staked and deposited balances as reported by this pallet.
+		let (account_deposits, account_stakes, initial_reads) = Self::get_account_deposits_and_locks();
+
+		// Deposited funds need to be unreserved.
+		for (account, unreserve_amount) in account_deposits.iter() {
+			if unreserve_amount.is_zero() {
+				log::warn!(target: LOG_TARGET, "Unexpected zero amount to unreserve!");
+				continue;
+			}
+			T::Currency::unreserve(account, *unreserve_amount);
+		}
+
+		// Staked funds need to be unlocked.
+		for account in account_stakes.keys() {
+			T::Currency::remove_lock(DEMOCRACY_ID, account);
+		}
+
+		T::DbWeight::get()
+			.reads_writes(
+				account_stakes.len().saturating_add(account_deposits.len()) as u64,
+				account_stakes.len().saturating_add(account_deposits.len()) as u64,
+			)
+			.saturating_add(initial_reads)
+	}
+
+	/// Performs post-upgrade sanity checks:
+	///
+	/// 1. No locks remain for this pallet in Balances.
+	/// 2. The reserved balance for each account has been reduced by the expected amount.
+	#[cfg(feature = "try-runtime")]
+	fn post_upgrade(account_reserved_before_bytes: Vec<u8>) -> Result<(), sp_runtime::TryRuntimeError> {
+		use codec::Decode;
+
+		let account_reserved_before =
+			BTreeMap::<T::AccountId, BalanceOf<T>>::decode(&mut &account_reserved_before_bytes[..])
+				.map_err(|_| "Failed to decode account_reserved_before_bytes")?;
+
+		// Get staked and deposited balances as reported by this pallet.
+		let (account_deposits, _, _) = Self::get_account_deposits_and_locks();
+
+		// Check that the reserved balance is reduced by the expected deposited amount.
+		for (account, actual_reserved_before) in account_reserved_before {
+			let actual_reserved_after = T::Currency::reserved_balance(&account);
+			let expected_amount_deducted = *account_deposits
+				.get(&account)
+				.expect("account deposit must exist to be in pre_migration_data, qed");
+			let expected_reserved_after = actual_reserved_before.saturating_sub(expected_amount_deducted);
+			assert!(
+				actual_reserved_after == expected_reserved_after,
+				"Reserved balance for {:?} is incorrect. actual before: {:?}, actual after, {:?}, expected deducted: {:?}",
+				account,
+				actual_reserved_before,
+				actual_reserved_after,
+				expected_amount_deducted,
+			);
+		}
+
+		Ok(())
+	}
+}
+
+#[cfg(all(feature = "try-runtime", test))]
+mod test {
+	use super::*;
+	use crate::{
+		tests::{new_test_ext, Balances, Test},
+		DepositOf, Voting, VotingOf,
+	};
+	use frame_support::{
+		assert_ok, parameter_types,
+		traits::{Currency, OnRuntimeUpgrade, ReservableCurrency, WithdrawReasons},
+		BoundedVec,
+	};
+	use frame_system::pallet_prelude::BlockNumberFor;
+	use sp_core::ConstU32;
+
+	parameter_types! {
+		const PalletName: &'static str = "Democracy";
+	}
+
+	struct UnlockConfigImpl;
+
+	impl super::UnlockConfig for UnlockConfigImpl {
+		type Currency = Balances;
+		type MaxVotes = ConstU32<100>;
+		type MaxDeposits = ConstU32<1000>;
+		type AccountId = u64;
+		type BlockNumber = BlockNumberFor<Test>;
+		type DbWeight = ();
+		type PalletName = PalletName;
+	}
+
+	#[test]
+	fn unreserve_works_for_depositer() {
+		let depositer_0 = 10;
+		let depositer_1 = 11;
+		let deposit = 25;
+		let depositer_0_initial_reserved = 0;
+		let depositer_1_initial_reserved = 15;
+		let initial_balance = 100_000;
+		new_test_ext().execute_with(|| {
+			// Set up initial state.
+			<Test as crate::Config>::Currency::make_free_balance_be(&depositer_0, initial_balance);
+			<Test as crate::Config>::Currency::make_free_balance_be(&depositer_1, initial_balance);
+			assert_ok!(<Test as crate::Config>::Currency::reserve(
+				&depositer_0,
+				depositer_0_initial_reserved + deposit
+			));
+			assert_ok!(<Test as crate::Config>::Currency::reserve(
+				&depositer_1,
+				depositer_1_initial_reserved + deposit
+			));
+			let depositors =
+				BoundedVec::<_, <Test as crate::Config>::MaxDeposits>::truncate_from(vec![depositer_0, depositer_1]);
+			DepositOf::<Test>::insert(0, (depositors, deposit));
+
+			// Sanity check: ensure initial reserved balance was set correctly.
+			assert_eq!(
+				<Test as crate::Config>::Currency::reserved_balance(depositer_0),
+				depositer_0_initial_reserved + deposit
+			);
+			assert_eq!(
+				<Test as crate::Config>::Currency::reserved_balance(depositer_1),
+				depositer_1_initial_reserved + deposit
+			);
+
+			// Run the migration.
+			let bytes = UnlockAndUnreserveAllFunds::<UnlockConfigImpl>::pre_upgrade()
+				.unwrap_or_else(|e| panic!("pre_upgrade failed: {:?}", e));
+			UnlockAndUnreserveAllFunds::<UnlockConfigImpl>::on_runtime_upgrade();
+			assert_ok!(UnlockAndUnreserveAllFunds::<UnlockConfigImpl>::post_upgrade(bytes));
+
+			// Assert the reserved balance was reduced by the expected amount.
+			assert_eq!(
+				<Test as crate::Config>::Currency::reserved_balance(depositer_0),
+				depositer_0_initial_reserved
+			);
+			assert_eq!(
+				<Test as crate::Config>::Currency::reserved_balance(depositer_1),
+				depositer_1_initial_reserved
+			);
+		});
+	}
+
+	#[test]
+	fn unlock_works_for_voter() {
+		let voter = 10;
+		let stake = 25;
+		let initial_locks = vec![(b"somethin", 10)];
+		let initial_balance = 100_000;
+		new_test_ext().execute_with(|| {
+			// Set up initial state.
+			<Test as crate::Config>::Currency::make_free_balance_be(&voter, initial_balance);
+			for lock in initial_locks.clone() {
+				<Test as crate::Config>::Currency::set_lock(*lock.0, &voter, lock.1, WithdrawReasons::all());
+			}
+			VotingOf::<Test>::insert(voter, Voting::default());
+			<Test as crate::Config>::Currency::set_lock(DEMOCRACY_ID, &voter, stake, WithdrawReasons::all());
+
+			// Sanity check: ensure initial Balance state was set up correctly.
+			let mut voter_all_locks = initial_locks.clone();
+			voter_all_locks.push((&DEMOCRACY_ID, stake));
+			assert_eq!(
+				<Test as crate::Config>::Currency::locks(voter)
+					.iter()
+					.map(|lock| (&lock.id, lock.amount))
+					.collect::<Vec<_>>(),
+				voter_all_locks
+			);
+
+			// Run the migration.
+			let bytes = UnlockAndUnreserveAllFunds::<UnlockConfigImpl>::pre_upgrade()
+				.unwrap_or_else(|e| panic!("pre_upgrade failed: {:?}", e));
+			UnlockAndUnreserveAllFunds::<UnlockConfigImpl>::on_runtime_upgrade();
+			assert_ok!(UnlockAndUnreserveAllFunds::<UnlockConfigImpl>::post_upgrade(bytes));
+
+			// Assert the voter lock was removed
+			assert_eq!(
+				<Test as crate::Config>::Currency::locks(voter)
+					.iter()
+					.map(|lock| (&lock.id, lock.amount))
+					.collect::<Vec<_>>(),
+				initial_locks
+			);
+		});
+	}
+}
diff --git a/pallets/democracy/src/migrations.rs b/pallets/democracy/src/migrations/v1.rs
similarity index 95%
rename from pallets/democracy/src/migrations.rs
rename to pallets/democracy/src/migrations/v1.rs
index ac145b022..bf10ed7e4 100644
--- a/pallets/democracy/src/migrations.rs
+++ b/pallets/democracy/src/migrations/v1.rs
@@ -17,12 +17,15 @@
 
 //! Storage migrations for the preimage pallet.
 
-use super::*;
+#![allow(clippy::module_inception)]
+
+use crate::*;
 use frame_support::{pallet_prelude::*, storage_alias, traits::OnRuntimeUpgrade, BoundedVec};
+use frame_system::pallet_prelude::BlockNumberFor;
 use sp_core::H256;
 
 /// The log target.
-const TARGET: &'static str = "runtime::democracy::migration::v1";
+const TARGET: &str = "runtime::democracy::migration::v1";
 
 /// The original data layout of the democracy pallet without a specific version number.
 mod v0 {
@@ -173,7 +176,7 @@ mod test {
 			let hash = H256::repeat_byte(1);
 			let status = ReferendumStatus {
 				end: 1u32.into(),
-				proposal: hash.clone(),
+				proposal: hash,
 				threshold: VoteThreshold::SuperMajorityApprove,
 				delay: 1u32.into(),
 				tally: Tally {
@@ -195,10 +198,10 @@ mod test {
 
 			// Case 3: Public proposals
 			let hash2 = H256::repeat_byte(2);
-			v0::PublicProps::<T>::put(vec![(3u32, hash.clone(), 123u64), (4u32, hash2.clone(), 123u64)]);
+			v0::PublicProps::<T>::put(vec![(3u32, hash, 123u64), (4u32, hash2, 123u64)]);
 
 			// Case 4: Next external
-			v0::NextExternal::<T>::put((hash.clone(), VoteThreshold::SuperMajorityApprove));
+			v0::NextExternal::<T>::put((hash, VoteThreshold::SuperMajorityApprove));
 
 			// Migrate.
 			let state = v1::Migration::<T>::pre_upgrade().unwrap();
diff --git a/pallets/democracy/src/tests.rs b/pallets/democracy/src/tests.rs
index fd2deff3f..df3db254c 100644
--- a/pallets/democracy/src/tests.rs
+++ b/pallets/democracy/src/tests.rs
@@ -20,7 +20,7 @@
 use super::*;
 use crate as pallet_democracy;
 use frame_support::{
-	assert_noop, assert_ok, ord_parameter_types, parameter_types,
+	assert_noop, assert_ok, derive_impl, ord_parameter_types, parameter_types,
 	traits::{ConstU32, ConstU64, Contains, EqualPrivilegeOnly, OnInitialize, SortedMembers, StorePreimage},
 	weights::Weight,
 };
@@ -67,11 +67,11 @@ type Block = frame_system::mocking::MockBlock<Test>;
 frame_support::construct_runtime!(
 	pub enum Test
 	{
-		System: frame_system::{Pallet, Call, Config<T>, Storage, Event<T>},
-		Balances: pallet_balances::{Pallet, Call, Storage, Config<T>, Event<T>},
+		System: frame_system,
+		Balances: pallet_balances,
 		Preimage: pallet_preimage,
-		Scheduler: pallet_scheduler::{Pallet, Call, Storage, Event<T>},
-		Democracy: pallet_democracy::{Pallet, Call, Storage, Config<T>, Event<T>},
+		Scheduler: pallet_scheduler,
+		Democracy: pallet_democracy,
 	}
 );
 
@@ -92,6 +92,8 @@ parameter_types! {
 			Weight::from_parts(frame_support::weights::constants::WEIGHT_REF_TIME_PER_SECOND, u64::MAX),
 		);
 }
+
+#[derive_impl(frame_system::config_preludes::TestDefaultConfig as frame_system::DefaultConfig)]
 impl frame_system::Config for Test {
 	type BaseCallFilter = BaseFilter;
 	type BlockWeights = BlockWeights;
@@ -126,8 +128,7 @@ impl pallet_preimage::Config for Test {
 	type WeightInfo = ();
 	type Currency = Balances;
 	type ManagerOrigin = EnsureRoot<u64>;
-	type BaseDeposit = ConstU64<0>;
-	type ByteDeposit = ConstU64<0>;
+	type Consideration = ();
 }
 
 impl pallet_scheduler::Config for Test {
@@ -156,7 +157,7 @@ impl pallet_balances::Config for Test {
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
 	type RuntimeHoldReason = ();
-	type MaxHolds = ();
+	type RuntimeFreezeReason = ();
 }
 parameter_types! {
 	pub static PreimageByteDeposit: u64 = 0;
@@ -279,28 +280,28 @@ fn begin_referendum() -> ReferendumIndex {
 fn aye(who: u64) -> AccountVote<u64> {
 	AccountVote::Standard {
 		vote: AYE,
-		balance: Balances::free_balance(&who),
+		balance: Balances::free_balance(who),
 	}
 }
 
 fn nay(who: u64) -> AccountVote<u64> {
 	AccountVote::Standard {
 		vote: NAY,
-		balance: Balances::free_balance(&who),
+		balance: Balances::free_balance(who),
 	}
 }
 
 fn big_aye(who: u64) -> AccountVote<u64> {
 	AccountVote::Standard {
 		vote: BIG_AYE,
-		balance: Balances::free_balance(&who),
+		balance: Balances::free_balance(who),
 	}
 }
 
 fn big_nay(who: u64) -> AccountVote<u64> {
 	AccountVote::Standard {
 		vote: BIG_NAY,
-		balance: Balances::free_balance(&who),
+		balance: Balances::free_balance(who),
 	}
 }
 
@@ -309,7 +310,7 @@ fn tally(r: ReferendumIndex) -> Tally<u64> {
 }
 
 /// note a new preimage without registering.
-fn note_preimage(who: u64) -> PreimageHash {
+fn note_preimage(who: u64) -> <Test as frame_system::Config>::Hash {
 	use std::sync::atomic::{AtomicU8, Ordering};
 	// note a new preimage on every function invoke.
 	static COUNTER: AtomicU8 = AtomicU8::new(0);
diff --git a/pallets/democracy/src/tests/cancellation.rs b/pallets/democracy/src/tests/cancellation.rs
index b2e7c3d0e..3a789c119 100644
--- a/pallets/democracy/src/tests/cancellation.rs
+++ b/pallets/democracy/src/tests/cancellation.rs
@@ -24,7 +24,7 @@ fn cancel_referendum_should_work() {
 	new_test_ext().execute_with(|| {
 		let r = Democracy::inject_referendum(2, set_balance_proposal(2), VoteThreshold::SuperMajorityApprove, 0);
 		assert_ok!(Democracy::vote(RuntimeOrigin::signed(1), r, aye(1)));
-		assert_ok!(Democracy::cancel_referendum(RuntimeOrigin::root(), r.into()));
+		assert_ok!(Democracy::cancel_referendum(RuntimeOrigin::root(), r));
 		assert_eq!(Democracy::lowest_unbaked(), 0);
 
 		next_block();
diff --git a/pallets/democracy/src/tests/decoders.rs b/pallets/democracy/src/tests/decoders.rs
index f3365b130..198e052a3 100644
--- a/pallets/democracy/src/tests/decoders.rs
+++ b/pallets/democracy/src/tests/decoders.rs
@@ -30,7 +30,7 @@ fn test_decode_compact_u32_at() {
 		migration::put_storage_value(b"test", b"", &[], v);
 		assert_eq!(decode_compact_u32_at(b"test"), None);
 
-		for v in vec![0, 10, u32::MAX] {
+		for v in [0, 10, u32::MAX] {
 			let compact_v = codec::Compact(v);
 			unhashed::put(b"test", &compact_v);
 			assert_eq!(decode_compact_u32_at(b"test"), Some(v));
@@ -44,7 +44,7 @@ fn test_decode_compact_u32_at() {
 #[test]
 fn len_of_deposit_of() {
 	new_test_ext().execute_with(|| {
-		for l in vec![0, 1, 200, 1000] {
+		for l in [0, 1, 200, 1000] {
 			let value: (BoundedVec<u64, _>, u64) = (
 				(0..l)
 					.map(|_| Default::default())
diff --git a/pallets/democracy/src/tests/metadata.rs b/pallets/democracy/src/tests/metadata.rs
index 459e8a669..e1dd6355e 100644
--- a/pallets/democracy/src/tests/metadata.rs
+++ b/pallets/democracy/src/tests/metadata.rs
@@ -22,9 +22,8 @@ use super::*;
 #[test]
 fn set_external_metadata_works() {
 	new_test_ext().execute_with(|| {
-		use frame_support::traits::Hash as PreimageHash;
 		// invalid preimage hash.
-		let invalid_hash: PreimageHash = [1u8; 32].into();
+		let invalid_hash: <Test as frame_system::Config>::Hash = [1u8; 32].into();
 		// metadata owner is an external proposal.
 		let owner = MetadataOwner::External;
 		// fails to set metadata if an external proposal does not exist.
@@ -91,9 +90,8 @@ fn clear_metadata_works() {
 #[test]
 fn set_proposal_metadata_works() {
 	new_test_ext().execute_with(|| {
-		use frame_support::traits::Hash as PreimageHash;
 		// invalid preimage hash.
-		let invalid_hash: PreimageHash = [1u8; 32].into();
+		let invalid_hash: <Test as frame_system::Config>::Hash = [1u8; 32].into();
 		// create an external proposal.
 		assert_ok!(propose_set_balance(1, 2, 5));
 		// metadata owner is a public proposal.
diff --git a/pallets/democracy/src/tests/scheduling.rs b/pallets/democracy/src/tests/scheduling.rs
index c4060f2ea..4371cbb54 100644
--- a/pallets/democracy/src/tests/scheduling.rs
+++ b/pallets/democracy/src/tests/scheduling.rs
@@ -134,7 +134,7 @@ fn lowest_unbaked_should_be_sensible() {
 		assert_ok!(Democracy::vote(RuntimeOrigin::signed(1), r1, aye(1)));
 		assert_ok!(Democracy::vote(RuntimeOrigin::signed(1), r2, aye(1)));
 		// r3 is canceled
-		assert_ok!(Democracy::cancel_referendum(RuntimeOrigin::root(), r3.into()));
+		assert_ok!(Democracy::cancel_referendum(RuntimeOrigin::root(), r3));
 		assert_eq!(Democracy::lowest_unbaked(), 0);
 
 		next_block();
diff --git a/pallets/democracy/src/weights.rs b/pallets/democracy/src/weights.rs
index 464316c00..076e0aac6 100644
--- a/pallets/democracy/src/weights.rs
+++ b/pallets/democracy/src/weights.rs
@@ -1,4 +1,8 @@
 // This file is part of HydraDX.
+
+// Copyright (C) 2020-2023  Intergalactic, Limited (GIB).
+// SPDX-License-Identifier: Apache-2.0
+
 // This file is part of HydraDX.
 
 // Copyright (C) 2020-2023  Intergalactic, Limited (GIB).
@@ -16,10 +20,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+
 //! Autogenerated weights for `pallet_democracy`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-12-12, STEPS: `5`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-05-29, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
@@ -28,17 +33,15 @@
 // target/release/hydradx
 // benchmark
 // pallet
-// --pallet=pallet-democracy
+// --chain=dev
+// --steps=10
+// --repeat=30
 // --wasm-execution=compiled
 // --heap-pages=4096
-// --chain=dev
+// --template=scripts/pallet-weight-template.hbs
+// --pallet=pallet-democracy
+// --output=weights/democracy.rs
 // --extrinsic=*
-// --steps=5
-// --repeat=20
-// --output
-// ./weights-1.1.0/democracy.rs
-// --template
-// .maintain/pallet-weight-template-no-back.hbs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -81,483 +84,6 @@ pub trait WeightInfo {
 }
 
 /// Weights for pallet_democracy using the Substrate node and recommended hardware.
-pub struct SubstrateWeight<T>(PhantomData<T>);
-impl<T: frame_system::Config> WeightInfo for SubstrateWeight<T> {
-	/// Storage: `Democracy::PublicPropCount` (r:1 w:1)
-	/// Proof: `Democracy::PublicPropCount` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	/// Storage: `Democracy::PublicProps` (r:1 w:1)
-	/// Proof: `Democracy::PublicProps` (`max_values`: Some(1), `max_size`: Some(16702), added: 17197, mode: `MaxEncodedLen`)
-	/// Storage: `Democracy::Blacklist` (r:1 w:0)
-	/// Proof: `Democracy::Blacklist` (`max_values`: None, `max_size`: Some(3238), added: 5713, mode: `MaxEncodedLen`)
-	/// Storage: `Democracy::DepositOf` (r:0 w:1)
-	/// Proof: `Democracy::DepositOf` (`max_values`: None, `max_size`: Some(3230), added: 5705, mode: `MaxEncodedLen`)
-	fn propose() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `4688`
-		//  Estimated: `18187`
-		// Minimum execution time: 52_594_000 picoseconds.
-		Weight::from_parts(53_207_000, 18187)
-			.saturating_add(T::DbWeight::get().reads(3_u64))
-			.saturating_add(T::DbWeight::get().writes(3_u64))
-	}
-	/// Storage: `Democracy::DepositOf` (r:1 w:1)
-	/// Proof: `Democracy::DepositOf` (`max_values`: None, `max_size`: Some(3230), added: 5705, mode: `MaxEncodedLen`)
-	fn second() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `3443`
-		//  Estimated: `6695`
-		// Minimum execution time: 47_180_000 picoseconds.
-		Weight::from_parts(47_748_000, 6695)
-			.saturating_add(T::DbWeight::get().reads(1_u64))
-			.saturating_add(T::DbWeight::get().writes(1_u64))
-	}
-	/// Storage: `Democracy::ReferendumInfoOf` (r:100 w:1)
-	/// Proof: `Democracy::ReferendumInfoOf` (`max_values`: None, `max_size`: Some(201), added: 2676, mode: `MaxEncodedLen`)
-	/// Storage: `Democracy::VotingOf` (r:1 w:1)
-	/// Proof: `Democracy::VotingOf` (`max_values`: None, `max_size`: Some(3795), added: 6270, mode: `MaxEncodedLen`)
-	/// Storage: `Balances::Locks` (r:1 w:1)
-	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
-	/// Storage: `Balances::Freezes` (r:1 w:0)
-	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(49), added: 2524, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::Account` (r:2 w:0)
-	/// Proof: `Uniques::Account` (`max_values`: None, `max_size`: Some(112), added: 2587, mode: `MaxEncodedLen`)
-	/// Storage: `Staking::Positions` (r:1 w:1)
-	/// Proof: `Staking::Positions` (`max_values`: None, `max_size`: Some(132), added: 2607, mode: `MaxEncodedLen`)
-	/// Storage: `Staking::PositionVotes` (r:1 w:1)
-	/// Proof: `Staking::PositionVotes` (`max_values`: None, `max_size`: Some(2134), added: 4609, mode: `MaxEncodedLen`)
-	fn vote_new() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `15343`
-		//  Estimated: `268590`
-		// Minimum execution time: 452_520_000 picoseconds.
-		Weight::from_parts(456_752_000, 268590)
-			.saturating_add(T::DbWeight::get().reads(107_u64))
-			.saturating_add(T::DbWeight::get().writes(5_u64))
-	}
-	/// Storage: `Democracy::ReferendumInfoOf` (r:100 w:1)
-	/// Proof: `Democracy::ReferendumInfoOf` (`max_values`: None, `max_size`: Some(201), added: 2676, mode: `MaxEncodedLen`)
-	/// Storage: `Democracy::VotingOf` (r:1 w:1)
-	/// Proof: `Democracy::VotingOf` (`max_values`: None, `max_size`: Some(3795), added: 6270, mode: `MaxEncodedLen`)
-	/// Storage: `Balances::Locks` (r:1 w:1)
-	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
-	/// Storage: `Balances::Freezes` (r:1 w:0)
-	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(49), added: 2524, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::Account` (r:2 w:0)
-	/// Proof: `Uniques::Account` (`max_values`: None, `max_size`: Some(112), added: 2587, mode: `MaxEncodedLen`)
-	/// Storage: `Staking::Positions` (r:1 w:1)
-	/// Proof: `Staking::Positions` (`max_values`: None, `max_size`: Some(132), added: 2607, mode: `MaxEncodedLen`)
-	/// Storage: `Staking::PositionVotes` (r:1 w:1)
-	/// Proof: `Staking::PositionVotes` (`max_values`: None, `max_size`: Some(2134), added: 4609, mode: `MaxEncodedLen`)
-	fn vote_existing() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `15365`
-		//  Estimated: `268590`
-		// Minimum execution time: 451_312_000 picoseconds.
-		Weight::from_parts(457_827_000, 268590)
-			.saturating_add(T::DbWeight::get().reads(107_u64))
-			.saturating_add(T::DbWeight::get().writes(5_u64))
-	}
-	/// Storage: `Democracy::ReferendumInfoOf` (r:1 w:1)
-	/// Proof: `Democracy::ReferendumInfoOf` (`max_values`: None, `max_size`: Some(201), added: 2676, mode: `MaxEncodedLen`)
-	/// Storage: `Democracy::Cancellations` (r:1 w:1)
-	/// Proof: `Democracy::Cancellations` (`max_values`: None, `max_size`: Some(33), added: 2508, mode: `MaxEncodedLen`)
-	/// Storage: `Democracy::MetadataOf` (r:1 w:1)
-	/// Proof: `Democracy::MetadataOf` (`max_values`: None, `max_size`: Some(53), added: 2528, mode: `MaxEncodedLen`)
-	fn emergency_cancel() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `249`
-		//  Estimated: `3666`
-		// Minimum execution time: 35_636_000 picoseconds.
-		Weight::from_parts(36_070_000, 3666)
-			.saturating_add(T::DbWeight::get().reads(3_u64))
-			.saturating_add(T::DbWeight::get().writes(3_u64))
-	}
-	/// Storage: `Democracy::PublicProps` (r:1 w:1)
-	/// Proof: `Democracy::PublicProps` (`max_values`: Some(1), `max_size`: Some(16702), added: 17197, mode: `MaxEncodedLen`)
-	/// Storage: `Democracy::DepositOf` (r:1 w:1)
-	/// Proof: `Democracy::DepositOf` (`max_values`: None, `max_size`: Some(3230), added: 5705, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:2 w:2)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `Democracy::MetadataOf` (r:3 w:1)
-	/// Proof: `Democracy::MetadataOf` (`max_values`: None, `max_size`: Some(53), added: 2528, mode: `MaxEncodedLen`)
-	/// Storage: `Democracy::NextExternal` (r:1 w:1)
-	/// Proof: `Democracy::NextExternal` (`max_values`: Some(1), `max_size`: Some(132), added: 627, mode: `MaxEncodedLen`)
-	/// Storage: `Democracy::ReferendumInfoOf` (r:1 w:1)
-	/// Proof: `Democracy::ReferendumInfoOf` (`max_values`: None, `max_size`: Some(201), added: 2676, mode: `MaxEncodedLen`)
-	/// Storage: `Democracy::Blacklist` (r:0 w:1)
-	/// Proof: `Democracy::Blacklist` (`max_values`: None, `max_size`: Some(3238), added: 5713, mode: `MaxEncodedLen`)
-	fn blacklist() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `6191`
-		//  Estimated: `18187`
-		// Minimum execution time: 132_102_000 picoseconds.
-		Weight::from_parts(133_131_000, 18187)
-			.saturating_add(T::DbWeight::get().reads(9_u64))
-			.saturating_add(T::DbWeight::get().writes(8_u64))
-	}
-	/// Storage: `Democracy::NextExternal` (r:1 w:1)
-	/// Proof: `Democracy::NextExternal` (`max_values`: Some(1), `max_size`: Some(132), added: 627, mode: `MaxEncodedLen`)
-	/// Storage: `Democracy::Blacklist` (r:1 w:0)
-	/// Proof: `Democracy::Blacklist` (`max_values`: None, `max_size`: Some(3238), added: 5713, mode: `MaxEncodedLen`)
-	fn external_propose() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `3276`
-		//  Estimated: `6703`
-		// Minimum execution time: 16_474_000 picoseconds.
-		Weight::from_parts(16_722_000, 6703)
-			.saturating_add(T::DbWeight::get().reads(2_u64))
-			.saturating_add(T::DbWeight::get().writes(1_u64))
-	}
-	/// Storage: `Democracy::NextExternal` (r:0 w:1)
-	/// Proof: `Democracy::NextExternal` (`max_values`: Some(1), `max_size`: Some(132), added: 627, mode: `MaxEncodedLen`)
-	fn external_propose_majority() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 5_354_000 picoseconds.
-		Weight::from_parts(5_544_000, 0).saturating_add(T::DbWeight::get().writes(1_u64))
-	}
-	/// Storage: `Democracy::NextExternal` (r:0 w:1)
-	/// Proof: `Democracy::NextExternal` (`max_values`: Some(1), `max_size`: Some(132), added: 627, mode: `MaxEncodedLen`)
-	fn external_propose_default() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 5_302_000 picoseconds.
-		Weight::from_parts(5_556_000, 0).saturating_add(T::DbWeight::get().writes(1_u64))
-	}
-	/// Storage: `Democracy::NextExternal` (r:1 w:1)
-	/// Proof: `Democracy::NextExternal` (`max_values`: Some(1), `max_size`: Some(132), added: 627, mode: `MaxEncodedLen`)
-	/// Storage: `Democracy::ReferendumCount` (r:1 w:1)
-	/// Proof: `Democracy::ReferendumCount` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	/// Storage: `Democracy::MetadataOf` (r:1 w:2)
-	/// Proof: `Democracy::MetadataOf` (`max_values`: None, `max_size`: Some(53), added: 2528, mode: `MaxEncodedLen`)
-	/// Storage: `Democracy::ReferendumInfoOf` (r:0 w:1)
-	/// Proof: `Democracy::ReferendumInfoOf` (`max_values`: None, `max_size`: Some(201), added: 2676, mode: `MaxEncodedLen`)
-	fn fast_track() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `147`
-		//  Estimated: `3518`
-		// Minimum execution time: 35_393_000 picoseconds.
-		Weight::from_parts(36_025_000, 3518)
-			.saturating_add(T::DbWeight::get().reads(3_u64))
-			.saturating_add(T::DbWeight::get().writes(5_u64))
-	}
-	/// Storage: `Democracy::NextExternal` (r:1 w:1)
-	/// Proof: `Democracy::NextExternal` (`max_values`: Some(1), `max_size`: Some(132), added: 627, mode: `MaxEncodedLen`)
-	/// Storage: `Democracy::Blacklist` (r:1 w:1)
-	/// Proof: `Democracy::Blacklist` (`max_values`: None, `max_size`: Some(3238), added: 5713, mode: `MaxEncodedLen`)
-	/// Storage: `Democracy::MetadataOf` (r:1 w:1)
-	/// Proof: `Democracy::MetadataOf` (`max_values`: None, `max_size`: Some(53), added: 2528, mode: `MaxEncodedLen`)
-	fn veto_external() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `3377`
-		//  Estimated: `6703`
-		// Minimum execution time: 37_183_000 picoseconds.
-		Weight::from_parts(37_728_000, 6703)
-			.saturating_add(T::DbWeight::get().reads(3_u64))
-			.saturating_add(T::DbWeight::get().writes(3_u64))
-	}
-	/// Storage: `Democracy::PublicProps` (r:1 w:1)
-	/// Proof: `Democracy::PublicProps` (`max_values`: Some(1), `max_size`: Some(16702), added: 17197, mode: `MaxEncodedLen`)
-	/// Storage: `Democracy::DepositOf` (r:1 w:1)
-	/// Proof: `Democracy::DepositOf` (`max_values`: None, `max_size`: Some(3230), added: 5705, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:2 w:2)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `Democracy::MetadataOf` (r:1 w:1)
-	/// Proof: `Democracy::MetadataOf` (`max_values`: None, `max_size`: Some(53), added: 2528, mode: `MaxEncodedLen`)
-	fn cancel_proposal() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `6076`
-		//  Estimated: `18187`
-		// Minimum execution time: 107_143_000 picoseconds.
-		Weight::from_parts(107_867_000, 18187)
-			.saturating_add(T::DbWeight::get().reads(5_u64))
-			.saturating_add(T::DbWeight::get().writes(5_u64))
-	}
-	/// Storage: `Democracy::MetadataOf` (r:1 w:1)
-	/// Proof: `Democracy::MetadataOf` (`max_values`: None, `max_size`: Some(53), added: 2528, mode: `MaxEncodedLen`)
-	/// Storage: `Democracy::ReferendumInfoOf` (r:0 w:1)
-	/// Proof: `Democracy::ReferendumInfoOf` (`max_values`: None, `max_size`: Some(201), added: 2676, mode: `MaxEncodedLen`)
-	fn cancel_referendum() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `181`
-		//  Estimated: `3518`
-		// Minimum execution time: 27_379_000 picoseconds.
-		Weight::from_parts(27_886_000, 3518)
-			.saturating_add(T::DbWeight::get().reads(1_u64))
-			.saturating_add(T::DbWeight::get().writes(2_u64))
-	}
-	/// Storage: `Democracy::LowestUnbaked` (r:1 w:1)
-	/// Proof: `Democracy::LowestUnbaked` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	/// Storage: `Democracy::ReferendumCount` (r:1 w:0)
-	/// Proof: `Democracy::ReferendumCount` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	/// Storage: `Democracy::ReferendumInfoOf` (r:99 w:0)
-	/// Proof: `Democracy::ReferendumInfoOf` (`max_values`: None, `max_size`: Some(201), added: 2676, mode: `MaxEncodedLen`)
-	/// The range of component `r` is `[0, 99]`.
-	fn on_initialize_base(r: u32) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `108 + r * (86 ±0)`
-		//  Estimated: `1489 + r * (2676 ±0)`
-		// Minimum execution time: 6_121_000 picoseconds.
-		Weight::from_parts(8_592_893, 1489)
-			// Standard Error: 15_703
-			.saturating_add(Weight::from_parts(3_531_200, 0).saturating_mul(r.into()))
-			.saturating_add(T::DbWeight::get().reads(2_u64))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r.into())))
-			.saturating_add(T::DbWeight::get().writes(1_u64))
-			.saturating_add(Weight::from_parts(0, 2676).saturating_mul(r.into()))
-	}
-	/// Storage: `Democracy::LowestUnbaked` (r:1 w:1)
-	/// Proof: `Democracy::LowestUnbaked` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	/// Storage: `Democracy::ReferendumCount` (r:1 w:0)
-	/// Proof: `Democracy::ReferendumCount` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	/// Storage: `Democracy::LastTabledWasExternal` (r:1 w:0)
-	/// Proof: `Democracy::LastTabledWasExternal` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`)
-	/// Storage: `Democracy::NextExternal` (r:1 w:0)
-	/// Proof: `Democracy::NextExternal` (`max_values`: Some(1), `max_size`: Some(132), added: 627, mode: `MaxEncodedLen`)
-	/// Storage: `Democracy::PublicProps` (r:1 w:0)
-	/// Proof: `Democracy::PublicProps` (`max_values`: Some(1), `max_size`: Some(16702), added: 17197, mode: `MaxEncodedLen`)
-	/// Storage: `Democracy::ReferendumInfoOf` (r:99 w:0)
-	/// Proof: `Democracy::ReferendumInfoOf` (`max_values`: None, `max_size`: Some(201), added: 2676, mode: `MaxEncodedLen`)
-	/// The range of component `r` is `[0, 99]`.
-	fn on_initialize_base_with_launch_period(r: u32) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `108 + r * (86 ±0)`
-		//  Estimated: `18187 + r * (2676 ±0)`
-		// Minimum execution time: 10_482_000 picoseconds.
-		Weight::from_parts(12_899_855, 18187)
-			// Standard Error: 16_258
-			.saturating_add(Weight::from_parts(3_555_121, 0).saturating_mul(r.into()))
-			.saturating_add(T::DbWeight::get().reads(5_u64))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r.into())))
-			.saturating_add(T::DbWeight::get().writes(1_u64))
-			.saturating_add(Weight::from_parts(0, 2676).saturating_mul(r.into()))
-	}
-	/// Storage: `Democracy::VotingOf` (r:3 w:3)
-	/// Proof: `Democracy::VotingOf` (`max_values`: None, `max_size`: Some(3795), added: 6270, mode: `MaxEncodedLen`)
-	/// Storage: `Democracy::ReferendumInfoOf` (r:99 w:99)
-	/// Proof: `Democracy::ReferendumInfoOf` (`max_values`: None, `max_size`: Some(201), added: 2676, mode: `MaxEncodedLen`)
-	/// Storage: `Balances::Locks` (r:1 w:1)
-	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
-	/// Storage: `Balances::Freezes` (r:1 w:0)
-	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(49), added: 2524, mode: `MaxEncodedLen`)
-	/// The range of component `r` is `[0, 99]`.
-	fn delegate(r: u32) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `658 + r * (108 ±0)`
-		//  Estimated: `19800 + r * (2676 ±0)`
-		// Minimum execution time: 52_402_000 picoseconds.
-		Weight::from_parts(54_800_637, 19800)
-			// Standard Error: 20_146
-			.saturating_add(Weight::from_parts(4_621_419, 0).saturating_mul(r.into()))
-			.saturating_add(T::DbWeight::get().reads(5_u64))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r.into())))
-			.saturating_add(T::DbWeight::get().writes(4_u64))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(r.into())))
-			.saturating_add(Weight::from_parts(0, 2676).saturating_mul(r.into()))
-	}
-	/// Storage: `Democracy::VotingOf` (r:2 w:2)
-	/// Proof: `Democracy::VotingOf` (`max_values`: None, `max_size`: Some(3795), added: 6270, mode: `MaxEncodedLen`)
-	/// Storage: `Democracy::ReferendumInfoOf` (r:99 w:99)
-	/// Proof: `Democracy::ReferendumInfoOf` (`max_values`: None, `max_size`: Some(201), added: 2676, mode: `MaxEncodedLen`)
-	/// The range of component `r` is `[0, 99]`.
-	fn undelegate(r: u32) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `356 + r * (108 ±0)`
-		//  Estimated: `13530 + r * (2676 ±0)`
-		// Minimum execution time: 25_946_000 picoseconds.
-		Weight::from_parts(27_003_784, 13530)
-			// Standard Error: 14_228
-			.saturating_add(Weight::from_parts(4_553_164, 0).saturating_mul(r.into()))
-			.saturating_add(T::DbWeight::get().reads(2_u64))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r.into())))
-			.saturating_add(T::DbWeight::get().writes(2_u64))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(r.into())))
-			.saturating_add(Weight::from_parts(0, 2676).saturating_mul(r.into()))
-	}
-	/// Storage: `Democracy::PublicProps` (r:0 w:1)
-	/// Proof: `Democracy::PublicProps` (`max_values`: Some(1), `max_size`: Some(16702), added: 17197, mode: `MaxEncodedLen`)
-	fn clear_public_proposals() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 5_588_000 picoseconds.
-		Weight::from_parts(5_693_000, 0).saturating_add(T::DbWeight::get().writes(1_u64))
-	}
-	/// Storage: `Democracy::VotingOf` (r:1 w:1)
-	/// Proof: `Democracy::VotingOf` (`max_values`: None, `max_size`: Some(3795), added: 6270, mode: `MaxEncodedLen`)
-	/// Storage: `Balances::Locks` (r:1 w:1)
-	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
-	/// Storage: `Balances::Freezes` (r:1 w:0)
-	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(49), added: 2524, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// The range of component `r` is `[0, 99]`.
-	fn unlock_remove(r: u32) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `432`
-		//  Estimated: `7260`
-		// Minimum execution time: 31_199_000 picoseconds.
-		Weight::from_parts(38_826_891, 7260)
-			// Standard Error: 21_192
-			.saturating_add(Weight::from_parts(155_153, 0).saturating_mul(r.into()))
-			.saturating_add(T::DbWeight::get().reads(4_u64))
-			.saturating_add(T::DbWeight::get().writes(3_u64))
-	}
-	/// Storage: `Democracy::VotingOf` (r:1 w:1)
-	/// Proof: `Democracy::VotingOf` (`max_values`: None, `max_size`: Some(3795), added: 6270, mode: `MaxEncodedLen`)
-	/// Storage: `Balances::Locks` (r:1 w:1)
-	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
-	/// Storage: `Balances::Freezes` (r:1 w:0)
-	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(49), added: 2524, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// The range of component `r` is `[0, 99]`.
-	fn unlock_set(r: u32) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `432 + r * (22 ±0)`
-		//  Estimated: `7260`
-		// Minimum execution time: 46_808_000 picoseconds.
-		Weight::from_parts(47_316_553, 7260)
-			// Standard Error: 2_010
-			.saturating_add(Weight::from_parts(32_507, 0).saturating_mul(r.into()))
-			.saturating_add(T::DbWeight::get().reads(4_u64))
-			.saturating_add(T::DbWeight::get().writes(3_u64))
-	}
-	/// Storage: `Democracy::ReferendumInfoOf` (r:100 w:1)
-	/// Proof: `Democracy::ReferendumInfoOf` (`max_values`: None, `max_size`: Some(201), added: 2676, mode: `MaxEncodedLen`)
-	/// Storage: `Democracy::VotingOf` (r:1 w:1)
-	/// Proof: `Democracy::VotingOf` (`max_values`: None, `max_size`: Some(3795), added: 6270, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::Account` (r:2 w:0)
-	/// Proof: `Uniques::Account` (`max_values`: None, `max_size`: Some(112), added: 2587, mode: `MaxEncodedLen`)
-	/// Storage: `Staking::Positions` (r:1 w:1)
-	/// Proof: `Staking::Positions` (`max_values`: None, `max_size`: Some(132), added: 2607, mode: `MaxEncodedLen`)
-	/// Storage: `Staking::PositionVotes` (r:1 w:1)
-	/// Proof: `Staking::PositionVotes` (`max_values`: None, `max_size`: Some(2134), added: 4609, mode: `MaxEncodedLen`)
-	/// The range of component `r` is `[1, 100]`.
-	fn remove_vote(r: u32) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1081 + r * (129 ±0)`
-		//  Estimated: `7260 + r * (2676 ±0)`
-		// Minimum execution time: 50_224_000 picoseconds.
-		Weight::from_parts(48_115_552, 7260)
-			// Standard Error: 12_377
-			.saturating_add(Weight::from_parts(3_620_792, 0).saturating_mul(r.into()))
-			.saturating_add(T::DbWeight::get().reads(5_u64))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r.into())))
-			.saturating_add(T::DbWeight::get().writes(4_u64))
-			.saturating_add(Weight::from_parts(0, 2676).saturating_mul(r.into()))
-	}
-	/// Storage: `Democracy::ReferendumInfoOf` (r:100 w:1)
-	/// Proof: `Democracy::ReferendumInfoOf` (`max_values`: None, `max_size`: Some(201), added: 2676, mode: `MaxEncodedLen`)
-	/// Storage: `Democracy::VotingOf` (r:1 w:1)
-	/// Proof: `Democracy::VotingOf` (`max_values`: None, `max_size`: Some(3795), added: 6270, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::Account` (r:2 w:0)
-	/// Proof: `Uniques::Account` (`max_values`: None, `max_size`: Some(112), added: 2587, mode: `MaxEncodedLen`)
-	/// Storage: `Staking::Positions` (r:1 w:1)
-	/// Proof: `Staking::Positions` (`max_values`: None, `max_size`: Some(132), added: 2607, mode: `MaxEncodedLen`)
-	/// Storage: `Staking::PositionVotes` (r:1 w:1)
-	/// Proof: `Staking::PositionVotes` (`max_values`: None, `max_size`: Some(2134), added: 4609, mode: `MaxEncodedLen`)
-	/// The range of component `r` is `[1, 100]`.
-	fn remove_other_vote(r: u32) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1081 + r * (129 ±0)`
-		//  Estimated: `7260 + r * (2676 ±0)`
-		// Minimum execution time: 50_234_000 picoseconds.
-		Weight::from_parts(48_913_493, 7260)
-			// Standard Error: 9_632
-			.saturating_add(Weight::from_parts(3_610_105, 0).saturating_mul(r.into()))
-			.saturating_add(T::DbWeight::get().reads(5_u64))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r.into())))
-			.saturating_add(T::DbWeight::get().writes(4_u64))
-			.saturating_add(Weight::from_parts(0, 2676).saturating_mul(r.into()))
-	}
-	/// Storage: `Democracy::NextExternal` (r:1 w:0)
-	/// Proof: `Democracy::NextExternal` (`max_values`: Some(1), `max_size`: Some(132), added: 627, mode: `MaxEncodedLen`)
-	/// Storage: `Preimage::StatusFor` (r:1 w:0)
-	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`)
-	/// Storage: `Democracy::MetadataOf` (r:0 w:1)
-	/// Proof: `Democracy::MetadataOf` (`max_values`: None, `max_size`: Some(53), added: 2528, mode: `MaxEncodedLen`)
-	fn set_external_metadata() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `287`
-		//  Estimated: `3556`
-		// Minimum execution time: 23_854_000 picoseconds.
-		Weight::from_parts(24_292_000, 3556)
-			.saturating_add(T::DbWeight::get().reads(2_u64))
-			.saturating_add(T::DbWeight::get().writes(1_u64))
-	}
-	/// Storage: `Democracy::NextExternal` (r:1 w:0)
-	/// Proof: `Democracy::NextExternal` (`max_values`: Some(1), `max_size`: Some(132), added: 627, mode: `MaxEncodedLen`)
-	/// Storage: `Democracy::MetadataOf` (r:1 w:1)
-	/// Proof: `Democracy::MetadataOf` (`max_values`: None, `max_size`: Some(53), added: 2528, mode: `MaxEncodedLen`)
-	fn clear_external_metadata() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `147`
-		//  Estimated: `3518`
-		// Minimum execution time: 21_276_000 picoseconds.
-		Weight::from_parts(21_525_000, 3518)
-			.saturating_add(T::DbWeight::get().reads(2_u64))
-			.saturating_add(T::DbWeight::get().writes(1_u64))
-	}
-	/// Storage: `Democracy::PublicProps` (r:1 w:0)
-	/// Proof: `Democracy::PublicProps` (`max_values`: Some(1), `max_size`: Some(16702), added: 17197, mode: `MaxEncodedLen`)
-	/// Storage: `Preimage::StatusFor` (r:1 w:0)
-	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`)
-	/// Storage: `Democracy::MetadataOf` (r:0 w:1)
-	/// Proof: `Democracy::MetadataOf` (`max_values`: None, `max_size`: Some(53), added: 2528, mode: `MaxEncodedLen`)
-	fn set_proposal_metadata() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `4842`
-		//  Estimated: `18187`
-		// Minimum execution time: 47_143_000 picoseconds.
-		Weight::from_parts(47_852_000, 18187)
-			.saturating_add(T::DbWeight::get().reads(2_u64))
-			.saturating_add(T::DbWeight::get().writes(1_u64))
-	}
-	/// Storage: `Democracy::PublicProps` (r:1 w:0)
-	/// Proof: `Democracy::PublicProps` (`max_values`: Some(1), `max_size`: Some(16702), added: 17197, mode: `MaxEncodedLen`)
-	/// Storage: `Democracy::MetadataOf` (r:1 w:1)
-	/// Proof: `Democracy::MetadataOf` (`max_values`: None, `max_size`: Some(53), added: 2528, mode: `MaxEncodedLen`)
-	fn clear_proposal_metadata() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `4706`
-		//  Estimated: `18187`
-		// Minimum execution time: 43_821_000 picoseconds.
-		Weight::from_parts(44_144_000, 18187)
-			.saturating_add(T::DbWeight::get().reads(2_u64))
-			.saturating_add(T::DbWeight::get().writes(1_u64))
-	}
-	/// Storage: `Preimage::StatusFor` (r:1 w:0)
-	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`)
-	/// Storage: `Democracy::MetadataOf` (r:0 w:1)
-	/// Proof: `Democracy::MetadataOf` (`max_values`: None, `max_size`: Some(53), added: 2528, mode: `MaxEncodedLen`)
-	fn set_referendum_metadata() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `211`
-		//  Estimated: `3556`
-		// Minimum execution time: 20_772_000 picoseconds.
-		Weight::from_parts(21_133_000, 3556)
-			.saturating_add(T::DbWeight::get().reads(1_u64))
-			.saturating_add(T::DbWeight::get().writes(1_u64))
-	}
-	/// Storage: `Democracy::ReferendumInfoOf` (r:1 w:0)
-	/// Proof: `Democracy::ReferendumInfoOf` (`max_values`: None, `max_size`: Some(201), added: 2676, mode: `MaxEncodedLen`)
-	/// Storage: `Democracy::MetadataOf` (r:1 w:1)
-	/// Proof: `Democracy::MetadataOf` (`max_values`: None, `max_size`: Some(53), added: 2528, mode: `MaxEncodedLen`)
-	fn clear_referendum_metadata() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `159`
-		//  Estimated: `3666`
-		// Minimum execution time: 23_308_000 picoseconds.
-		Weight::from_parts(23_661_000, 3666)
-			.saturating_add(T::DbWeight::get().reads(2_u64))
-			.saturating_add(T::DbWeight::get().writes(1_u64))
-	}
-}
-
-// For backwards compatibility and tests
 impl WeightInfo for () {
 	/// Storage: `Democracy::PublicPropCount` (r:1 w:1)
 	/// Proof: `Democracy::PublicPropCount` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
@@ -571,8 +97,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `4688`
 		//  Estimated: `18187`
-		// Minimum execution time: 52_594_000 picoseconds.
-		Weight::from_parts(53_207_000, 18187)
+		// Minimum execution time: 41_701_000 picoseconds.
+		Weight::from_parts(42_235_000, 18187)
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 	}
@@ -582,8 +108,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `3443`
 		//  Estimated: `6695`
-		// Minimum execution time: 47_180_000 picoseconds.
-		Weight::from_parts(47_748_000, 6695)
+		// Minimum execution time: 39_489_000 picoseconds.
+		Weight::from_parts(40_100_000, 6695)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -605,8 +131,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `15343`
 		//  Estimated: `268590`
-		// Minimum execution time: 452_520_000 picoseconds.
-		Weight::from_parts(456_752_000, 268590)
+		// Minimum execution time: 415_574_000 picoseconds.
+		Weight::from_parts(419_090_000, 268590)
 			.saturating_add(RocksDbWeight::get().reads(107_u64))
 			.saturating_add(RocksDbWeight::get().writes(5_u64))
 	}
@@ -628,8 +154,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `15365`
 		//  Estimated: `268590`
-		// Minimum execution time: 451_312_000 picoseconds.
-		Weight::from_parts(457_827_000, 268590)
+		// Minimum execution time: 415_249_000 picoseconds.
+		Weight::from_parts(422_003_000, 268590)
 			.saturating_add(RocksDbWeight::get().reads(107_u64))
 			.saturating_add(RocksDbWeight::get().writes(5_u64))
 	}
@@ -643,8 +169,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `249`
 		//  Estimated: `3666`
-		// Minimum execution time: 35_636_000 picoseconds.
-		Weight::from_parts(36_070_000, 3666)
+		// Minimum execution time: 27_483_000 picoseconds.
+		Weight::from_parts(28_007_000, 3666)
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 	}
@@ -666,8 +192,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `6191`
 		//  Estimated: `18187`
-		// Minimum execution time: 132_102_000 picoseconds.
-		Weight::from_parts(133_131_000, 18187)
+		// Minimum execution time: 107_718_000 picoseconds.
+		Weight::from_parts(108_453_000, 18187)
 			.saturating_add(RocksDbWeight::get().reads(9_u64))
 			.saturating_add(RocksDbWeight::get().writes(8_u64))
 	}
@@ -679,8 +205,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `3276`
 		//  Estimated: `6703`
-		// Minimum execution time: 16_474_000 picoseconds.
-		Weight::from_parts(16_722_000, 6703)
+		// Minimum execution time: 13_141_000 picoseconds.
+		Weight::from_parts(13_507_000, 6703)
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -690,8 +216,9 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 5_354_000 picoseconds.
-		Weight::from_parts(5_544_000, 0).saturating_add(RocksDbWeight::get().writes(1_u64))
+		// Minimum execution time: 3_720_000 picoseconds.
+		Weight::from_parts(3_904_000, 0)
+			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
 	/// Storage: `Democracy::NextExternal` (r:0 w:1)
 	/// Proof: `Democracy::NextExternal` (`max_values`: Some(1), `max_size`: Some(132), added: 627, mode: `MaxEncodedLen`)
@@ -699,8 +226,9 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 5_302_000 picoseconds.
-		Weight::from_parts(5_556_000, 0).saturating_add(RocksDbWeight::get().writes(1_u64))
+		// Minimum execution time: 3_862_000 picoseconds.
+		Weight::from_parts(4_053_000, 0)
+			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
 	/// Storage: `Democracy::NextExternal` (r:1 w:1)
 	/// Proof: `Democracy::NextExternal` (`max_values`: Some(1), `max_size`: Some(132), added: 627, mode: `MaxEncodedLen`)
@@ -714,8 +242,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `147`
 		//  Estimated: `3518`
-		// Minimum execution time: 35_393_000 picoseconds.
-		Weight::from_parts(36_025_000, 3518)
+		// Minimum execution time: 25_432_000 picoseconds.
+		Weight::from_parts(25_892_000, 3518)
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
 			.saturating_add(RocksDbWeight::get().writes(5_u64))
 	}
@@ -729,8 +257,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `3377`
 		//  Estimated: `6703`
-		// Minimum execution time: 37_183_000 picoseconds.
-		Weight::from_parts(37_728_000, 6703)
+		// Minimum execution time: 28_422_000 picoseconds.
+		Weight::from_parts(28_931_000, 6703)
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 	}
@@ -746,8 +274,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `6076`
 		//  Estimated: `18187`
-		// Minimum execution time: 107_143_000 picoseconds.
-		Weight::from_parts(107_867_000, 18187)
+		// Minimum execution time: 87_703_000 picoseconds.
+		Weight::from_parts(88_416_000, 18187)
 			.saturating_add(RocksDbWeight::get().reads(5_u64))
 			.saturating_add(RocksDbWeight::get().writes(5_u64))
 	}
@@ -759,8 +287,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `181`
 		//  Estimated: `3518`
-		// Minimum execution time: 27_379_000 picoseconds.
-		Weight::from_parts(27_886_000, 3518)
+		// Minimum execution time: 20_107_000 picoseconds.
+		Weight::from_parts(20_377_000, 3518)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
@@ -771,14 +299,14 @@ impl WeightInfo for () {
 	/// Storage: `Democracy::ReferendumInfoOf` (r:99 w:0)
 	/// Proof: `Democracy::ReferendumInfoOf` (`max_values`: None, `max_size`: Some(201), added: 2676, mode: `MaxEncodedLen`)
 	/// The range of component `r` is `[0, 99]`.
-	fn on_initialize_base(r: u32) -> Weight {
+	fn on_initialize_base(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `108 + r * (86 ±0)`
+		//  Measured:  `125 + r * (86 ±0)`
 		//  Estimated: `1489 + r * (2676 ±0)`
-		// Minimum execution time: 6_121_000 picoseconds.
-		Weight::from_parts(8_592_893, 1489)
-			// Standard Error: 15_703
-			.saturating_add(Weight::from_parts(3_531_200, 0).saturating_mul(r.into()))
+		// Minimum execution time: 3_840_000 picoseconds.
+		Weight::from_parts(7_774_936, 1489)
+			// Standard Error: 9_193
+			.saturating_add(Weight::from_parts(3_259_471, 0).saturating_mul(r.into()))
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(r.into())))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
@@ -797,14 +325,14 @@ impl WeightInfo for () {
 	/// Storage: `Democracy::ReferendumInfoOf` (r:99 w:0)
 	/// Proof: `Democracy::ReferendumInfoOf` (`max_values`: None, `max_size`: Some(201), added: 2676, mode: `MaxEncodedLen`)
 	/// The range of component `r` is `[0, 99]`.
-	fn on_initialize_base_with_launch_period(r: u32) -> Weight {
+	fn on_initialize_base_with_launch_period(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `108 + r * (86 ±0)`
+		//  Measured:  `125 + r * (86 ±0)`
 		//  Estimated: `18187 + r * (2676 ±0)`
-		// Minimum execution time: 10_482_000 picoseconds.
-		Weight::from_parts(12_899_855, 18187)
-			// Standard Error: 16_258
-			.saturating_add(Weight::from_parts(3_555_121, 0).saturating_mul(r.into()))
+		// Minimum execution time: 6_495_000 picoseconds.
+		Weight::from_parts(10_267_498, 18187)
+			// Standard Error: 9_509
+			.saturating_add(Weight::from_parts(3_264_278, 0).saturating_mul(r.into()))
 			.saturating_add(RocksDbWeight::get().reads(5_u64))
 			.saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(r.into())))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
@@ -819,14 +347,14 @@ impl WeightInfo for () {
 	/// Storage: `Balances::Freezes` (r:1 w:0)
 	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(49), added: 2524, mode: `MaxEncodedLen`)
 	/// The range of component `r` is `[0, 99]`.
-	fn delegate(r: u32) -> Weight {
+	fn delegate(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `658 + r * (108 ±0)`
+		//  Measured:  `677 + r * (108 ±0)`
 		//  Estimated: `19800 + r * (2676 ±0)`
-		// Minimum execution time: 52_402_000 picoseconds.
-		Weight::from_parts(54_800_637, 19800)
-			// Standard Error: 20_146
-			.saturating_add(Weight::from_parts(4_621_419, 0).saturating_mul(r.into()))
+		// Minimum execution time: 43_812_000 picoseconds.
+		Weight::from_parts(46_935_837, 19800)
+			// Standard Error: 11_136
+			.saturating_add(Weight::from_parts(4_198_915, 0).saturating_mul(r.into()))
 			.saturating_add(RocksDbWeight::get().reads(5_u64))
 			.saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(r.into())))
 			.saturating_add(RocksDbWeight::get().writes(4_u64))
@@ -838,14 +366,14 @@ impl WeightInfo for () {
 	/// Storage: `Democracy::ReferendumInfoOf` (r:99 w:99)
 	/// Proof: `Democracy::ReferendumInfoOf` (`max_values`: None, `max_size`: Some(201), added: 2676, mode: `MaxEncodedLen`)
 	/// The range of component `r` is `[0, 99]`.
-	fn undelegate(r: u32) -> Weight {
+	fn undelegate(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `356 + r * (108 ±0)`
+		//  Measured:  `373 + r * (108 ±0)`
 		//  Estimated: `13530 + r * (2676 ±0)`
-		// Minimum execution time: 25_946_000 picoseconds.
-		Weight::from_parts(27_003_784, 13530)
-			// Standard Error: 14_228
-			.saturating_add(Weight::from_parts(4_553_164, 0).saturating_mul(r.into()))
+		// Minimum execution time: 20_720_000 picoseconds.
+		Weight::from_parts(20_631_640, 13530)
+			// Standard Error: 8_748
+			.saturating_add(Weight::from_parts(4_193_472, 0).saturating_mul(r.into()))
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(r.into())))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
@@ -858,8 +386,9 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 5_588_000 picoseconds.
-		Weight::from_parts(5_693_000, 0).saturating_add(RocksDbWeight::get().writes(1_u64))
+		// Minimum execution time: 4_235_000 picoseconds.
+		Weight::from_parts(4_396_000, 0)
+			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
 	/// Storage: `Democracy::VotingOf` (r:1 w:1)
 	/// Proof: `Democracy::VotingOf` (`max_values`: None, `max_size`: Some(3795), added: 6270, mode: `MaxEncodedLen`)
@@ -870,14 +399,14 @@ impl WeightInfo for () {
 	/// Storage: `System::Account` (r:1 w:1)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	/// The range of component `r` is `[0, 99]`.
-	fn unlock_remove(r: u32) -> Weight {
+	fn unlock_remove(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `432`
 		//  Estimated: `7260`
-		// Minimum execution time: 31_199_000 picoseconds.
-		Weight::from_parts(38_826_891, 7260)
-			// Standard Error: 21_192
-			.saturating_add(Weight::from_parts(155_153, 0).saturating_mul(r.into()))
+		// Minimum execution time: 26_209_000 picoseconds.
+		Weight::from_parts(35_136_293, 7260)
+			// Standard Error: 8_398
+			.saturating_add(Weight::from_parts(78_899, 0).saturating_mul(r.into()))
 			.saturating_add(RocksDbWeight::get().reads(4_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 	}
@@ -890,78 +419,80 @@ impl WeightInfo for () {
 	/// Storage: `System::Account` (r:1 w:1)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	/// The range of component `r` is `[0, 99]`.
-	fn unlock_set(r: u32) -> Weight {
+	fn unlock_set(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `432 + r * (22 ±0)`
 		//  Estimated: `7260`
-		// Minimum execution time: 46_808_000 picoseconds.
-		Weight::from_parts(47_316_553, 7260)
-			// Standard Error: 2_010
-			.saturating_add(Weight::from_parts(32_507, 0).saturating_mul(r.into()))
+		// Minimum execution time: 37_733_000 picoseconds.
+		Weight::from_parts(38_316_728, 7260)
+			// Standard Error: 1_094
+			.saturating_add(Weight::from_parts(52_536, 0).saturating_mul(r.into()))
 			.saturating_add(RocksDbWeight::get().reads(4_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 	}
-	/// Storage: `Democracy::ReferendumInfoOf` (r:100 w:1)
+	/// Storage: `Democracy::ReferendumInfoOf` (r:1 w:1)
 	/// Proof: `Democracy::ReferendumInfoOf` (`max_values`: None, `max_size`: Some(201), added: 2676, mode: `MaxEncodedLen`)
 	/// Storage: `Democracy::VotingOf` (r:1 w:1)
 	/// Proof: `Democracy::VotingOf` (`max_values`: None, `max_size`: Some(3795), added: 6270, mode: `MaxEncodedLen`)
 	/// Storage: `Uniques::Account` (r:2 w:0)
 	/// Proof: `Uniques::Account` (`max_values`: None, `max_size`: Some(112), added: 2587, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::ProcessedVotes` (r:1 w:0)
+	/// Proof: `Staking::ProcessedVotes` (`max_values`: None, `max_size`: Some(85), added: 2560, mode: `MaxEncodedLen`)
 	/// Storage: `Staking::Positions` (r:1 w:1)
 	/// Proof: `Staking::Positions` (`max_values`: None, `max_size`: Some(132), added: 2607, mode: `MaxEncodedLen`)
 	/// Storage: `Staking::PositionVotes` (r:1 w:1)
 	/// Proof: `Staking::PositionVotes` (`max_values`: None, `max_size`: Some(2134), added: 4609, mode: `MaxEncodedLen`)
 	/// The range of component `r` is `[1, 100]`.
-	fn remove_vote(r: u32) -> Weight {
+	fn remove_vote(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1081 + r * (129 ±0)`
-		//  Estimated: `7260 + r * (2676 ±0)`
-		// Minimum execution time: 50_224_000 picoseconds.
-		Weight::from_parts(48_115_552, 7260)
-			// Standard Error: 12_377
-			.saturating_add(Weight::from_parts(3_620_792, 0).saturating_mul(r.into()))
-			.saturating_add(RocksDbWeight::get().reads(5_u64))
-			.saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(r.into())))
+		//  Measured:  `1503 + r * (46 ±0)`
+		//  Estimated: `7260`
+		// Minimum execution time: 48_213_000 picoseconds.
+		Weight::from_parts(51_366_745, 7260)
+			// Standard Error: 4_640
+			.saturating_add(Weight::from_parts(131_667, 0).saturating_mul(r.into()))
+			.saturating_add(RocksDbWeight::get().reads(7_u64))
 			.saturating_add(RocksDbWeight::get().writes(4_u64))
-			.saturating_add(Weight::from_parts(0, 2676).saturating_mul(r.into()))
 	}
-	/// Storage: `Democracy::ReferendumInfoOf` (r:100 w:1)
+	/// Storage: `Democracy::ReferendumInfoOf` (r:1 w:1)
 	/// Proof: `Democracy::ReferendumInfoOf` (`max_values`: None, `max_size`: Some(201), added: 2676, mode: `MaxEncodedLen`)
 	/// Storage: `Democracy::VotingOf` (r:1 w:1)
 	/// Proof: `Democracy::VotingOf` (`max_values`: None, `max_size`: Some(3795), added: 6270, mode: `MaxEncodedLen`)
 	/// Storage: `Uniques::Account` (r:2 w:0)
 	/// Proof: `Uniques::Account` (`max_values`: None, `max_size`: Some(112), added: 2587, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::ProcessedVotes` (r:1 w:0)
+	/// Proof: `Staking::ProcessedVotes` (`max_values`: None, `max_size`: Some(85), added: 2560, mode: `MaxEncodedLen`)
 	/// Storage: `Staking::Positions` (r:1 w:1)
 	/// Proof: `Staking::Positions` (`max_values`: None, `max_size`: Some(132), added: 2607, mode: `MaxEncodedLen`)
 	/// Storage: `Staking::PositionVotes` (r:1 w:1)
 	/// Proof: `Staking::PositionVotes` (`max_values`: None, `max_size`: Some(2134), added: 4609, mode: `MaxEncodedLen`)
 	/// The range of component `r` is `[1, 100]`.
-	fn remove_other_vote(r: u32) -> Weight {
+	fn remove_other_vote(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1081 + r * (129 ±0)`
-		//  Estimated: `7260 + r * (2676 ±0)`
-		// Minimum execution time: 50_234_000 picoseconds.
-		Weight::from_parts(48_913_493, 7260)
-			// Standard Error: 9_632
-			.saturating_add(Weight::from_parts(3_610_105, 0).saturating_mul(r.into()))
-			.saturating_add(RocksDbWeight::get().reads(5_u64))
-			.saturating_add(RocksDbWeight::get().reads((1_u64).saturating_mul(r.into())))
+		//  Measured:  `1503 + r * (46 ±0)`
+		//  Estimated: `7260`
+		// Minimum execution time: 48_122_000 picoseconds.
+		Weight::from_parts(51_591_726, 7260)
+			// Standard Error: 4_962
+			.saturating_add(Weight::from_parts(133_813, 0).saturating_mul(r.into()))
+			.saturating_add(RocksDbWeight::get().reads(7_u64))
 			.saturating_add(RocksDbWeight::get().writes(4_u64))
-			.saturating_add(Weight::from_parts(0, 2676).saturating_mul(r.into()))
 	}
 	/// Storage: `Democracy::NextExternal` (r:1 w:0)
 	/// Proof: `Democracy::NextExternal` (`max_values`: Some(1), `max_size`: Some(132), added: 627, mode: `MaxEncodedLen`)
 	/// Storage: `Preimage::StatusFor` (r:1 w:0)
 	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:0)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(75), added: 2550, mode: `MaxEncodedLen`)
 	/// Storage: `Democracy::MetadataOf` (r:0 w:1)
 	/// Proof: `Democracy::MetadataOf` (`max_values`: None, `max_size`: Some(53), added: 2528, mode: `MaxEncodedLen`)
 	fn set_external_metadata() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `287`
 		//  Estimated: `3556`
-		// Minimum execution time: 23_854_000 picoseconds.
-		Weight::from_parts(24_292_000, 3556)
-			.saturating_add(RocksDbWeight::get().reads(2_u64))
+		// Minimum execution time: 20_454_000 picoseconds.
+		Weight::from_parts(20_805_000, 3556)
+			.saturating_add(RocksDbWeight::get().reads(3_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
 	/// Storage: `Democracy::NextExternal` (r:1 w:0)
@@ -972,8 +503,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `147`
 		//  Estimated: `3518`
-		// Minimum execution time: 21_276_000 picoseconds.
-		Weight::from_parts(21_525_000, 3518)
+		// Minimum execution time: 16_223_000 picoseconds.
+		Weight::from_parts(16_478_000, 3518)
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -981,15 +512,17 @@ impl WeightInfo for () {
 	/// Proof: `Democracy::PublicProps` (`max_values`: Some(1), `max_size`: Some(16702), added: 17197, mode: `MaxEncodedLen`)
 	/// Storage: `Preimage::StatusFor` (r:1 w:0)
 	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:0)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(75), added: 2550, mode: `MaxEncodedLen`)
 	/// Storage: `Democracy::MetadataOf` (r:0 w:1)
 	/// Proof: `Democracy::MetadataOf` (`max_values`: None, `max_size`: Some(53), added: 2528, mode: `MaxEncodedLen`)
 	fn set_proposal_metadata() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `4842`
 		//  Estimated: `18187`
-		// Minimum execution time: 47_143_000 picoseconds.
-		Weight::from_parts(47_852_000, 18187)
-			.saturating_add(RocksDbWeight::get().reads(2_u64))
+		// Minimum execution time: 42_358_000 picoseconds.
+		Weight::from_parts(42_867_000, 18187)
+			.saturating_add(RocksDbWeight::get().reads(3_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
 	/// Storage: `Democracy::PublicProps` (r:1 w:0)
@@ -1000,22 +533,24 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `4706`
 		//  Estimated: `18187`
-		// Minimum execution time: 43_821_000 picoseconds.
-		Weight::from_parts(44_144_000, 18187)
+		// Minimum execution time: 37_064_000 picoseconds.
+		Weight::from_parts(37_477_000, 18187)
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
 	/// Storage: `Preimage::StatusFor` (r:1 w:0)
 	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:0)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(75), added: 2550, mode: `MaxEncodedLen`)
 	/// Storage: `Democracy::MetadataOf` (r:0 w:1)
 	/// Proof: `Democracy::MetadataOf` (`max_values`: None, `max_size`: Some(53), added: 2528, mode: `MaxEncodedLen`)
 	fn set_referendum_metadata() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `211`
 		//  Estimated: `3556`
-		// Minimum execution time: 20_772_000 picoseconds.
-		Weight::from_parts(21_133_000, 3556)
-			.saturating_add(RocksDbWeight::get().reads(1_u64))
+		// Minimum execution time: 18_290_000 picoseconds.
+		Weight::from_parts(18_660_000, 3556)
+			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
 	/// Storage: `Democracy::ReferendumInfoOf` (r:1 w:0)
@@ -1026,8 +561,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `159`
 		//  Estimated: `3666`
-		// Minimum execution time: 23_308_000 picoseconds.
-		Weight::from_parts(23_661_000, 3666)
+		// Minimum execution time: 18_955_000 picoseconds.
+		Weight::from_parts(19_323_000, 3666)
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
diff --git a/pallets/duster/Cargo.toml b/pallets/duster/Cargo.toml
index 5fee2d013..073910cd1 100644
--- a/pallets/duster/Cargo.toml
+++ b/pallets/duster/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-duster"
-version = "3.2.4"
+version = "3.2.5"
 description = "Account duster"
 authors = ["GalacticCouncil"]
 edition = "2021"
diff --git a/pallets/duster/src/lib.rs b/pallets/duster/src/lib.rs
index 030d14d1a..a832fb09c 100644
--- a/pallets/duster/src/lib.rs
+++ b/pallets/duster/src/lib.rs
@@ -27,6 +27,8 @@ mod tests;
 pub mod migration;
 pub mod weights;
 
+pub use crate::weights::WeightInfo;
+
 use frame_support::{dispatch::DispatchResult, ensure, traits::Contains, traits::Get};
 
 use orml_traits::{
diff --git a/pallets/duster/src/mock.rs b/pallets/duster/src/mock.rs
index a7b0e7f8f..42d5638a7 100644
--- a/pallets/duster/src/mock.rs
+++ b/pallets/duster/src/mock.rs
@@ -81,6 +81,7 @@ impl system::Config for Test {
 	type BlockLength = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
+	type RuntimeTask = RuntimeTask;
 	type Nonce = u64;
 	type Block = Block;
 	type Hash = H256;
@@ -164,8 +165,8 @@ impl pallet_balances::Config for Test {
 	type ReserveIdentifier = ();
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
-	type MaxHolds = ();
 	type RuntimeHoldReason = ();
+	type RuntimeFreezeReason = ();
 }
 
 pub struct ExtBuilder {
diff --git a/pallets/duster/src/weights.rs b/pallets/duster/src/weights.rs
index 920078063..16f46958a 100644
--- a/pallets/duster/src/weights.rs
+++ b/pallets/duster/src/weights.rs
@@ -3,11 +3,6 @@
 // Copyright (C) 2020-2023  Intergalactic, Limited (GIB).
 // SPDX-License-Identifier: Apache-2.0
 
-// This file is part of HydraDX.
-
-// Copyright (C) 2020-2023  Intergalactic, Limited (GIB).
-// SPDX-License-Identifier: Apache-2.0
-
 // Licensed under the Apache License, Version 2.0 (the "License");
 // you may not use this file except in compliance with the License.
 // You may obtain a copy of the License at
@@ -22,27 +17,30 @@
 
 //! Autogenerated weights for `pallet_duster`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-12-12, STEPS: `5`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-05-23, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024`
 
 // Executed Command:
-// target/release/hydradx
+// ./target/release/hydradx
 // benchmark
 // pallet
-// --pallet=pallet-duster
 // --wasm-execution=compiled
-// --heap-pages=4096
-// --chain=dev
-// --extrinsic=*
-// --steps=5
-// --repeat=20
+// --pallet
+// *
+// --extrinsic
+// *
+// --heap-pages
+// 4096
+// --steps
+// 50
+// --repeat
+// 20
+// --template=scripts/pallet-weight-template.hbs
 // --output
-// ./weights-1.1.0/duster.rs
-// --template
-// .maintain/pallet-weight-template-no-back.hbs
+// weights/
 
 #![allow(unused_parens)]
 #![allow(unused_imports)]
@@ -62,63 +60,17 @@ pub trait WeightInfo {
 }
 
 /// Weights for claims using the hydraDX node and recommended hardware.
-pub struct HydraWeight<T>(PhantomData<T>);
-impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
-	/// Storage: `Duster::AccountBlacklist` (r:1 w:0)
-	/// Proof: `Duster::AccountBlacklist` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:1 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
-	/// Storage: `Tokens::Accounts` (r:2 w:2)
-	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
-	/// Storage: `Duster::DustAccount` (r:1 w:0)
-	/// Proof: `Duster::DustAccount` (`max_values`: Some(1), `max_size`: Some(32), added: 527, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `Duster::RewardAccount` (r:1 w:0)
-	/// Proof: `Duster::RewardAccount` (`max_values`: Some(1), `max_size`: Some(32), added: 527, mode: `MaxEncodedLen`)
-	/// Storage: `MultiTransactionPayment::AccountCurrencyMap` (r:0 w:1)
-	/// Proof: `MultiTransactionPayment::AccountCurrencyMap` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
-	fn dust_account() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `2538`
-		//  Estimated: `6156`
-		// Minimum execution time: 90_102_000 picoseconds.
-		Weight::from_parts(90_700_000, 6156)
-			.saturating_add(T::DbWeight::get().reads(7_u64))
-			.saturating_add(T::DbWeight::get().writes(4_u64))
-	}
-	/// Storage: `Duster::AccountBlacklist` (r:0 w:1)
-	/// Proof: `Duster::AccountBlacklist` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
-	fn add_nondustable_account() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1008`
-		//  Estimated: `0`
-		// Minimum execution time: 21_071_000 picoseconds.
-		Weight::from_parts(21_591_000, 0).saturating_add(T::DbWeight::get().writes(1_u64))
-	}
-	/// Storage: `Duster::AccountBlacklist` (r:1 w:1)
-	/// Proof: `Duster::AccountBlacklist` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
-	fn remove_nondustable_account() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1296`
-		//  Estimated: `3513`
-		// Minimum execution time: 26_630_000 picoseconds.
-		Weight::from_parts(27_026_000, 3513)
-			.saturating_add(T::DbWeight::get().reads(1_u64))
-			.saturating_add(T::DbWeight::get().writes(1_u64))
-	}
-}
-
-// For backwards compatibility and tests
 impl WeightInfo for () {
 	/// Storage: `Duster::AccountBlacklist` (r:1 w:0)
 	/// Proof: `Duster::AccountBlacklist` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
 	/// Storage: `AssetRegistry::Assets` (r:1 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
+	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
 	/// Storage: `Tokens::Accounts` (r:2 w:2)
 	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
 	/// Storage: `Duster::DustAccount` (r:1 w:0)
 	/// Proof: `Duster::DustAccount` (`max_values`: Some(1), `max_size`: Some(32), added: 527, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::BannedAssets` (r:1 w:0)
+	/// Proof: `AssetRegistry::BannedAssets` (`max_values`: None, `max_size`: Some(20), added: 2495, mode: `MaxEncodedLen`)
 	/// Storage: `System::Account` (r:1 w:1)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	/// Storage: `Duster::RewardAccount` (r:1 w:0)
@@ -127,30 +79,30 @@ impl WeightInfo for () {
 	/// Proof: `MultiTransactionPayment::AccountCurrencyMap` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
 	fn dust_account() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2538`
+		//  Measured:  `2690`
 		//  Estimated: `6156`
-		// Minimum execution time: 90_102_000 picoseconds.
-		Weight::from_parts(90_700_000, 6156)
-			.saturating_add(RocksDbWeight::get().reads(7_u64))
+		// Minimum execution time: 84_500_000 picoseconds.
+		Weight::from_parts(85_254_000, 6156)
+			.saturating_add(RocksDbWeight::get().reads(8_u64))
 			.saturating_add(RocksDbWeight::get().writes(4_u64))
 	}
 	/// Storage: `Duster::AccountBlacklist` (r:0 w:1)
 	/// Proof: `Duster::AccountBlacklist` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
 	fn add_nondustable_account() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1008`
+		//  Measured:  `1016`
 		//  Estimated: `0`
-		// Minimum execution time: 21_071_000 picoseconds.
-		Weight::from_parts(21_591_000, 0).saturating_add(RocksDbWeight::get().writes(1_u64))
+		// Minimum execution time: 16_109_000 picoseconds.
+		Weight::from_parts(16_551_000, 0).saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
 	/// Storage: `Duster::AccountBlacklist` (r:1 w:1)
 	/// Proof: `Duster::AccountBlacklist` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
 	fn remove_nondustable_account() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1296`
+		//  Measured:  `1370`
 		//  Estimated: `3513`
-		// Minimum execution time: 26_630_000 picoseconds.
-		Weight::from_parts(27_026_000, 3513)
+		// Minimum execution time: 20_814_000 picoseconds.
+		Weight::from_parts(21_277_000, 3513)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
diff --git a/pallets/dynamic-evm-fee/Cargo.toml b/pallets/dynamic-evm-fee/Cargo.toml
index b990b64e6..7ee724aa4 100644
--- a/pallets/dynamic-evm-fee/Cargo.toml
+++ b/pallets/dynamic-evm-fee/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-dynamic-evm-fee"
-version = "1.0.1"
+version = "1.0.2"
 description = "Storing and mutating the dynamic fee for EVM transactions."
 authors = ["GalacticCoucil"]
 edition = "2021"
diff --git a/pallets/dynamic-evm-fee/src/lib.rs b/pallets/dynamic-evm-fee/src/lib.rs
index 1857b4e4d..7485eb85b 100644
--- a/pallets/dynamic-evm-fee/src/lib.rs
+++ b/pallets/dynamic-evm-fee/src/lib.rs
@@ -55,7 +55,11 @@ pub use pallet::*;
 pub use weights::WeightInfo;
 
 use codec::HasCompact;
-use frame_support::pallet_prelude::*;
+use frame_support::pallet_prelude::{
+	Get, Hooks, MaxEncodedLen, MaybeSerializeDeserialize, Member, Parameter, StorageValue, StorageVersion, TypeInfo,
+	ValueQuery,
+};
+use frame_support::weights::Weight;
 use frame_system::pallet_prelude::BlockNumberFor;
 use hydra_dx_math::ema::EmaPrice;
 use hydradx_traits::NativePriceOracle;
diff --git a/pallets/dynamic-evm-fee/src/tests/mock.rs b/pallets/dynamic-evm-fee/src/tests/mock.rs
index 6049f1f06..a69655003 100644
--- a/pallets/dynamic-evm-fee/src/tests/mock.rs
+++ b/pallets/dynamic-evm-fee/src/tests/mock.rs
@@ -99,6 +99,7 @@ impl system::Config for Test {
 	type BlockLength = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
+	type RuntimeTask = RuntimeTask;
 	type Nonce = u64;
 	type Block = Block;
 	type Hash = H256;
@@ -186,8 +187,8 @@ impl pallet_balances::Config for Test {
 	type ReserveIdentifier = ();
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
-	type MaxHolds = ();
 	type RuntimeHoldReason = ();
+	type RuntimeFreezeReason = ();
 }
 
 parameter_types! {
diff --git a/pallets/dynamic-evm-fee/src/weights.rs b/pallets/dynamic-evm-fee/src/weights.rs
index 838a95c3f..b8fbb32bc 100644
--- a/pallets/dynamic-evm-fee/src/weights.rs
+++ b/pallets/dynamic-evm-fee/src/weights.rs
@@ -18,25 +18,30 @@
 
 //! Autogenerated weights for `pallet_dynamic_evm_fee`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-02-06, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-05-23, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `dmoka-msi-pc`, CPU: `AMD Ryzen 9 5900X 12-Core Processor`
-//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
+//! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024`
 
 // Executed Command:
-// target/release/hydradx
+// ./target/release/hydradx
 // benchmark
 // pallet
-// --chain=dev
-// --steps=10
-// --repeat=30
 // --wasm-execution=compiled
-// --heap-pages=4096
-// --template=.maintain/pallet-weight-template.hbs
-// --pallet=pallet-dynamic-evm-fee
-// --output=dynamic-evm-fee2.rs
-// --extrinsic=*
+// --pallet
+// *
+// --extrinsic
+// *
+// --heap-pages
+// 4096
+// --steps
+// 50
+// --repeat
+// 20
+// --template=scripts/pallet-weight-template.hbs
+// --output
+// weights/
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -52,56 +57,28 @@ pub trait WeightInfo {
 }
 
 /// Weights for `pallet_dynamic_evm_fee` using the HydraDX node and recommended hardware.
-pub struct HydraWeight<T>(PhantomData<T>);
-impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
-    /// Storage: `DynamicEvmFee::BaseFeePerGas` (r:1 w:1)
-    /// Proof: `DynamicEvmFee::BaseFeePerGas` (`max_values`: Some(1), `max_size`: Some(32), added: 527, mode: `MaxEncodedLen`)
-    /// Storage: `TransactionPayment::NextFeeMultiplier` (r:1 w:0)
-    /// Proof: `TransactionPayment::NextFeeMultiplier` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
-    /// Storage: `AssetRegistry::NextAssetId` (r:1 w:0)
-    /// Proof: `AssetRegistry::NextAssetId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-    /// Storage: `AssetRegistry::LocationAssets` (r:1 w:0)
-    /// Proof: `AssetRegistry::LocationAssets` (`max_values`: None, `max_size`: Some(622), added: 3097, mode: `MaxEncodedLen`)
-    /// Storage: `MultiTransactionPayment::AcceptedCurrencies` (r:1 w:0)
-    /// Proof: `MultiTransactionPayment::AcceptedCurrencies` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
-    /// Storage: `Router::Routes` (r:1 w:0)
-    /// Proof: `Router::Routes` (`max_values`: None, `max_size`: Some(90), added: 2565, mode: `MaxEncodedLen`)
-    /// Storage: `EmaOracle::Oracles` (r:4 w:0)
-    /// Proof: `EmaOracle::Oracles` (`max_values`: None, `max_size`: Some(177), added: 2652, mode: `MaxEncodedLen`)
-    fn on_initialize() -> Weight {
-        // Proof Size summary in bytes:
-        //  Measured:  `2709`
-        //  Estimated: `11598`
-        // Minimum execution time: 64_849_000 picoseconds.
-        Weight::from_parts(66_099_000, 11598)
-            .saturating_add(T::DbWeight::get().reads(10_u64))
-            .saturating_add(T::DbWeight::get().writes(1_u64))
-    }
-}
-
-// For backwards compatibility and tests.
 impl WeightInfo for () {
     /// Storage: `DynamicEvmFee::BaseFeePerGas` (r:1 w:1)
-    /// Proof: `DynamicEvmFee::BaseFeePerGas` (`max_values`: Some(1), `max_size`: Some(32), added: 527, mode: `MaxEncodedLen`)
-    /// Storage: `TransactionPayment::NextFeeMultiplier` (r:1 w:0)
-    /// Proof: `TransactionPayment::NextFeeMultiplier` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
-    /// Storage: `AssetRegistry::NextAssetId` (r:1 w:0)
-    /// Proof: `AssetRegistry::NextAssetId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-    /// Storage: `AssetRegistry::LocationAssets` (r:1 w:0)
-    /// Proof: `AssetRegistry::LocationAssets` (`max_values`: None, `max_size`: Some(622), added: 3097, mode: `MaxEncodedLen`)
-    /// Storage: `MultiTransactionPayment::AcceptedCurrencies` (r:1 w:0)
-    /// Proof: `MultiTransactionPayment::AcceptedCurrencies` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
-    /// Storage: `Router::Routes` (r:1 w:0)
-    /// Proof: `Router::Routes` (`max_values`: None, `max_size`: Some(90), added: 2565, mode: `MaxEncodedLen`)
-    /// Storage: `EmaOracle::Oracles` (r:4 w:0)
-    /// Proof: `EmaOracle::Oracles` (`max_values`: None, `max_size`: Some(177), added: 2652, mode: `MaxEncodedLen`)
-    fn on_initialize() -> Weight {
-        // Proof Size summary in bytes:
-        //  Measured:  `2709`
-        //  Estimated: `11598`
-        // Minimum execution time: 64_849_000 picoseconds.
-        Weight::from_parts(66_099_000, 11598)
-            .saturating_add(RocksDbWeight::get().reads(10_u64))
-            .saturating_add(RocksDbWeight::get().writes(1_u64))
-    }
+	/// Proof: `DynamicEvmFee::BaseFeePerGas` (`max_values`: Some(1), `max_size`: Some(32), added: 527, mode: `MaxEncodedLen`)
+	/// Storage: `TransactionPayment::NextFeeMultiplier` (r:1 w:0)
+	/// Proof: `TransactionPayment::NextFeeMultiplier` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::NextAssetId` (r:1 w:0)
+	/// Proof: `AssetRegistry::NextAssetId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::LocationAssets` (r:1 w:0)
+	/// Proof: `AssetRegistry::LocationAssets` (`max_values`: None, `max_size`: Some(622), added: 3097, mode: `MaxEncodedLen`)
+	/// Storage: `MultiTransactionPayment::AcceptedCurrencies` (r:1 w:0)
+	/// Proof: `MultiTransactionPayment::AcceptedCurrencies` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
+	/// Storage: `Router::Routes` (r:1 w:0)
+	/// Proof: `Router::Routes` (`max_values`: None, `max_size`: Some(90), added: 2565, mode: `MaxEncodedLen`)
+	/// Storage: `EmaOracle::Oracles` (r:4 w:0)
+	/// Proof: `EmaOracle::Oracles` (`max_values`: None, `max_size`: Some(177), added: 2652, mode: `MaxEncodedLen`)
+	fn on_initialize() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `2746`
+		//  Estimated: `11598`
+		// Minimum execution time: 66_128_000 picoseconds.
+		Weight::from_parts(66_561_000, 11598)
+			.saturating_add(RocksDbWeight::get().reads(10_u64))
+			.saturating_add(RocksDbWeight::get().writes(1_u64))
+	}
 }
diff --git a/pallets/dynamic-fees/Cargo.toml b/pallets/dynamic-fees/Cargo.toml
index 3acfcb3f0..d82bf47fb 100644
--- a/pallets/dynamic-fees/Cargo.toml
+++ b/pallets/dynamic-fees/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = 'pallet-dynamic-fees'
-version = '1.0.3'
+version = '1.0.4'
 description = 'A pallet to provide support for dynamic fees'
 authors = ['GalacticCouncil']
 edition = '2021'
diff --git a/pallets/dynamic-fees/src/tests/mock.rs b/pallets/dynamic-fees/src/tests/mock.rs
index 80b0dbb9b..ee1a57ef5 100644
--- a/pallets/dynamic-fees/src/tests/mock.rs
+++ b/pallets/dynamic-fees/src/tests/mock.rs
@@ -29,7 +29,6 @@ use frame_support::{
 	traits::{ConstU32, ConstU64},
 };
 use orml_traits::GetByKey;
-
 use sp_core::H256;
 use sp_runtime::{
 	traits::{BlakeTwo256, IdentityLookup, One, Zero},
@@ -77,6 +76,7 @@ impl frame_system::Config for Test {
 	type BlockLength = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
+	type RuntimeTask = RuntimeTask;
 	type Nonce = u64;
 	type Block = Block;
 	type Hash = H256;
diff --git a/pallets/ema-oracle/Cargo.toml b/pallets/ema-oracle/Cargo.toml
index b20232dc2..4427b7748 100644
--- a/pallets/ema-oracle/Cargo.toml
+++ b/pallets/ema-oracle/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = 'pallet-ema-oracle'
-version = '1.3.1'
+version = '1.3.2'
 description = 'Exponential moving average oracle for AMM pools'
 authors = ['GalacticCouncil']
 edition = '2021'
diff --git a/pallets/ema-oracle/src/benchmarking.rs b/pallets/ema-oracle/src/benchmarking.rs
index d4336d1fa..baccedeef 100644
--- a/pallets/ema-oracle/src/benchmarking.rs
+++ b/pallets/ema-oracle/src/benchmarking.rs
@@ -105,7 +105,7 @@ benchmarks! {
 	}: { EmaOracle::<T>::on_finalize(block_num); }
 	verify {
 		assert!(Accumulator::<T>::get().is_empty());
-		assert_eq!(Oracles::<T>::get((SOURCE, ordered_pair(HDX, DOT), LastBlock)).unwrap(), (entry, block_num));
+		assert_eq!(Oracles::<T>::get((SOURCE, ordered_pair(HDX, DOT), OraclePeriod::LastBlock)).unwrap(), (entry, block_num));
 	}
 
 	#[extra]
@@ -148,7 +148,7 @@ benchmarks! {
 	}: { EmaOracle::<T>::on_finalize(block_num); }
 	verify {
 		assert!(Accumulator::<T>::get().is_empty());
-		assert_eq!(Oracles::<T>::get((SOURCE, ordered_pair(HDX, DOT), LastBlock)).unwrap(), (entry, initial_data_block));
+		assert_eq!(Oracles::<T>::get((SOURCE, ordered_pair(HDX, DOT), OraclePeriod::LastBlock)).unwrap(), (entry, initial_data_block));
 	}
 
 	on_finalize_multiple_tokens {
@@ -198,7 +198,7 @@ benchmarks! {
 		for i in 0 .. b {
 			let asset_a = i * 1_000;
 			let asset_b = asset_a + 500;
-			assert_eq!(Oracles::<T>::get((SOURCE, ordered_pair(asset_a, asset_b), LastBlock)).unwrap(), (entry.clone(), initial_data_block));
+			assert_eq!(Oracles::<T>::get((SOURCE, ordered_pair(asset_a, asset_b), OraclePeriod::LastBlock)).unwrap(), (entry.clone(), initial_data_block));
 		}
 	}
 
@@ -367,7 +367,7 @@ benchmarks! {
 		let res = core::cell::RefCell::new(Err(OracleError::NotPresent));
 
 		// aim to find a period that is not `LastBlock`, falling back to `LastBlock` if none is found.
-		let period = T::SupportedPeriods::get().into_iter().find(|p| p != &LastBlock).unwrap_or(LastBlock);
+		let period = T::SupportedPeriods::get().into_iter().find(|p| p != &OraclePeriod::LastBlock).unwrap_or(OraclePeriod::LastBlock);
 
 	}: { let _ = res.replace(EmaOracle::<T>::get_entry(asset_a, asset_b, period, SOURCE)); }
 	verify {
diff --git a/pallets/ema-oracle/src/lib.rs b/pallets/ema-oracle/src/lib.rs
index 97e8d4c50..76a7a71eb 100644
--- a/pallets/ema-oracle/src/lib.rs
+++ b/pallets/ema-oracle/src/lib.rs
@@ -72,7 +72,7 @@ use frame_support::traits::Contains;
 use frame_system::pallet_prelude::BlockNumberFor;
 use hydradx_traits::{
 	AggregatedEntry, AggregatedOracle, AggregatedPriceOracle, Liquidity, OnCreatePoolHandler,
-	OnLiquidityChangedHandler, OnTradeHandler, OraclePeriod::*, Volume,
+	OnLiquidityChangedHandler, OnTradeHandler, Volume,
 };
 use sp_arithmetic::traits::Saturating;
 use sp_std::marker::PhantomData;
@@ -86,7 +86,7 @@ pub use types::*;
 
 #[allow(clippy::all)]
 pub mod weights;
-use weights::WeightInfo;
+pub use weights::WeightInfo;
 
 mod benchmarking;
 
@@ -350,7 +350,7 @@ impl<T: Config> Pallet<T> {
 		assets: (AssetId, AssetId),
 		block: BlockNumberFor<T>,
 	) -> Option<(OracleEntry<BlockNumberFor<T>>, BlockNumberFor<T>)> {
-		Self::oracle((source, assets, LastBlock)).map(|(mut last_block, init)| {
+		Self::oracle((source, assets, OraclePeriod::LastBlock)).map(|(mut last_block, init)| {
 			// update the `LastBlock` oracle to the last block if it hasn't been updated for a while
 			// price and liquidity stay constant, volume becomes zero
 			if last_block.updated_at != block {
@@ -364,12 +364,15 @@ impl<T: Config> Pallet<T> {
 	fn update_oracles_from_accumulator() {
 		for ((src, assets), oracle_entry) in Accumulator::<T>::take().into_iter() {
 			// First we update the non-immediate oracles with the value of the `LastBlock` oracle.
-			for period in T::SupportedPeriods::get().into_iter().filter(|p| *p != LastBlock) {
+			for period in T::SupportedPeriods::get()
+				.into_iter()
+				.filter(|p| *p != OraclePeriod::LastBlock)
+			{
 				Self::update_oracle(src, assets, period, oracle_entry.clone());
 			}
 			// As we use (the old value of) the `LastBlock` entry to update the other oracles it
 			// gets updated last.
-			Self::update_oracle(src, assets, LastBlock, oracle_entry.clone());
+			Self::update_oracle(src, assets, OraclePeriod::LastBlock, oracle_entry.clone());
 		}
 	}
 
@@ -430,7 +433,7 @@ impl<T: Config> Pallet<T> {
 		// First get the `LastBlock` oracle to calculate the updated values for the others.
 		let (last_block, last_block_init) = Self::last_block_oracle(src, assets, parent)?;
 		// If it was requested return it directly.
-		if period == LastBlock {
+		if period == OraclePeriod::LastBlock {
 			return Some((last_block, last_block_init));
 		}
 
diff --git a/pallets/ema-oracle/src/tests/mock.rs b/pallets/ema-oracle/src/tests/mock.rs
index cb492235b..1a8af6712 100644
--- a/pallets/ema-oracle/src/tests/mock.rs
+++ b/pallets/ema-oracle/src/tests/mock.rs
@@ -89,6 +89,7 @@ impl frame_system::Config for Test {
 	type BlockLength = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
+	type RuntimeTask = RuntimeTask;
 	type Nonce = u64;
 	type Block = Block;
 	type Hash = H256;
diff --git a/pallets/ema-oracle/src/tests/mod.rs b/pallets/ema-oracle/src/tests/mod.rs
index 54da4cb3c..b1e74f6c3 100644
--- a/pallets/ema-oracle/src/tests/mod.rs
+++ b/pallets/ema-oracle/src/tests/mod.rs
@@ -20,6 +20,7 @@ mod invariants;
 mod mock;
 
 use super::*;
+use crate::OraclePeriod::*;
 pub use mock::{
 	BlockNumber, EmaOracle, ExtBuilder, System, Test, ACA, DOT, HDX, INSUFFICIENT_ASSET, ORACLE_ENTRY_1, ORACLE_ENTRY_2,
 };
diff --git a/pallets/ema-oracle/src/weights.rs b/pallets/ema-oracle/src/weights.rs
index 9f5677c51..1d3872a85 100644
--- a/pallets/ema-oracle/src/weights.rs
+++ b/pallets/ema-oracle/src/weights.rs
@@ -17,25 +17,30 @@
 
 //! Autogenerated weights for `pallet_ema_oracle`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-03-05, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-05-23, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: 1024
+//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024`
 
 // Executed Command:
-// target/release/hydradx
+// ./target/release/hydradx
 // benchmark
 // pallet
-// --chain=dev
-// --steps=10
-// --repeat=30
 // --wasm-execution=compiled
-// --heap-pages=4096
-// --template=.maintain/pallet-weight-template-no-back.hbs
-// --pallet=pallet-ema-oracle
-// --output=weights-1.1.0/oracle.rs
-// --extrinsic=*
+// --pallet
+// *
+// --extrinsic
+// *
+// --heap-pages
+// 4096
+// --steps
+// 50
+// --repeat
+// 20
+// --template=scripts/pallet-weight-template.hbs
+// --output
+// weights*
 
 #![allow(unused_parens)]
 #![allow(unused_imports)]
@@ -58,125 +63,33 @@ pub trait WeightInfo {
 	fn get_entry() -> Weight;
 }
 
-pub struct BasiliskWeight<T>(PhantomData<T>);
-
-impl<T: frame_system::Config> WeightInfo for BasiliskWeight<T> {
+/// Weights for `pallet_ema_oracle` using the HydraDX node and recommended hardware.
+impl WeightInfo for () {
 	/// Storage: `EmaOracle::WhitelistedAssets` (r:1 w:1)
 	/// Proof: `EmaOracle::WhitelistedAssets` (`max_values`: Some(1), `max_size`: Some(641), added: 1136, mode: `MaxEncodedLen`)
 	fn add_oracle() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `860`
 		//  Estimated: `2126`
-		// Minimum execution time: 21_341_000 picoseconds.
-		Weight::from_parts(21_667_000, 2126)
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
+		// Minimum execution time: 15_633_000 picoseconds.
+		Weight::from_parts(15_827_000, 2126)
+			.saturating_add(RocksDbWeight::get().reads(1_u64))
+			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
 	/// Storage: `EmaOracle::WhitelistedAssets` (r:1 w:1)
 	/// Proof: `EmaOracle::WhitelistedAssets` (`max_values`: Some(1), `max_size`: Some(641), added: 1136, mode: `MaxEncodedLen`)
-	fn remove_oracle() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `876`
-		//  Estimated: `2126`
-		// Minimum execution time: 21_553_000 picoseconds.
-		Weight::from_parts(21_866_000, 2126)
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `EmaOracle::Accumulator` (r:1 w:0)
-	/// Proof: `EmaOracle::Accumulator` (`max_values`: Some(1), `max_size`: Some(5921), added: 6416, mode: `MaxEncodedLen`)
-	fn on_finalize_no_entry() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `208`
-		//  Estimated: `7406`
-		// Minimum execution time: 3_165_000 picoseconds.
-		Weight::from_parts(3_271_000, 7406).saturating_add(T::DbWeight::get().reads(1))
-	}
-	/// Storage: `EmaOracle::Accumulator` (r:1 w:1)
-	/// Proof: `EmaOracle::Accumulator` (`max_values`: Some(1), `max_size`: Some(5921), added: 6416, mode: `MaxEncodedLen`)
-	/// Storage: `EmaOracle::Oracles` (r:117 w:117)
-	/// Proof: `EmaOracle::Oracles` (`max_values`: None, `max_size`: Some(177), added: 2652, mode: `MaxEncodedLen`)
-	/// The range of component `b` is `[1, 39]`.
-	fn on_finalize_multiple_tokens(b: u32) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `304 + b * (626 ±0)`
-		//  Estimated: `7406 + b * (7956 ±0)`
-		// Minimum execution time: 48_505_000 picoseconds.
-		Weight::from_parts(12_673_348, 7406)
-			// Standard Error: 31_644
-			.saturating_add(Weight::from_parts(36_427_193, 0).saturating_mul(b.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(b.into())))
-			.saturating_add(T::DbWeight::get().writes(1))
-			.saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(b.into())))
-			.saturating_add(Weight::from_parts(0, 7956).saturating_mul(b.into()))
-	}
-	/// Storage: `AssetRegistry::Assets` (r:2 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
-	/// Storage: `EmaOracle::Accumulator` (r:1 w:1)
-	/// Proof: `EmaOracle::Accumulator` (`max_values`: Some(1), `max_size`: Some(5921), added: 6416, mode: `MaxEncodedLen`)
-	/// The range of component `b` is `[1, 39]`.
-	fn on_trade_multiple_tokens(b: u32) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `751 + b * (163 ±0)`
-		//  Estimated: `7406`
-		// Minimum execution time: 18_943_000 picoseconds.
-		Weight::from_parts(19_294_596, 7406)
-			// Standard Error: 3_556
-			.saturating_add(Weight::from_parts(423_769, 0).saturating_mul(b.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `AssetRegistry::Assets` (r:2 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
 	/// Storage: `EmaOracle::Accumulator` (r:1 w:1)
 	/// Proof: `EmaOracle::Accumulator` (`max_values`: Some(1), `max_size`: Some(5921), added: 6416, mode: `MaxEncodedLen`)
-	/// The range of component `b` is `[1, 39]`.
-	fn on_liquidity_changed_multiple_tokens(b: u32) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `751 + b * (163 ±0)`
-		//  Estimated: `7406`
-		// Minimum execution time: 19_079_000 picoseconds.
-		Weight::from_parts(19_403_394, 7406)
-			// Standard Error: 3_730
-			.saturating_add(Weight::from_parts(422_560, 0).saturating_mul(b.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `EmaOracle::Oracles` (r:2 w:0)
+	/// Storage: `EmaOracle::Oracles` (r:0 w:3)
 	/// Proof: `EmaOracle::Oracles` (`max_values`: None, `max_size`: Some(177), added: 2652, mode: `MaxEncodedLen`)
-	fn get_entry() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `638`
-		//  Estimated: `6294`
-		// Minimum execution time: 18_991_000 picoseconds.
-		Weight::from_parts(19_258_000, 6294).saturating_add(T::DbWeight::get().reads(2))
-	}
-}
-
-// For backwards compatibility and tests
-impl WeightInfo for () {
-	/// Storage: `EmaOracle::WhitelistedAssets` (r:1 w:1)
-	/// Proof: `EmaOracle::WhitelistedAssets` (`max_values`: Some(1), `max_size`: Some(641), added: 1136, mode: `MaxEncodedLen`)
-	fn add_oracle() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `860`
-		//  Estimated: `2126`
-		// Minimum execution time: 21_341_000 picoseconds.
-		Weight::from_parts(21_667_000, 2126)
-			.saturating_add(RocksDbWeight::get().reads(1))
-			.saturating_add(RocksDbWeight::get().writes(1))
-	}
-	/// Storage: `EmaOracle::WhitelistedAssets` (r:1 w:1)
-	/// Proof: `EmaOracle::WhitelistedAssets` (`max_values`: Some(1), `max_size`: Some(641), added: 1136, mode: `MaxEncodedLen`)
 	fn remove_oracle() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `876`
-		//  Estimated: `2126`
-		// Minimum execution time: 21_553_000 picoseconds.
-		Weight::from_parts(21_866_000, 2126)
-			.saturating_add(RocksDbWeight::get().reads(1))
-			.saturating_add(RocksDbWeight::get().writes(1))
+		//  Estimated: `7406`
+		// Minimum execution time: 31_307_000 picoseconds.
+		Weight::from_parts(31_799_000, 7406)
+			.saturating_add(RocksDbWeight::get().reads(2_u64))
+			.saturating_add(RocksDbWeight::get().writes(5_u64))
 	}
 	/// Storage: `EmaOracle::Accumulator` (r:1 w:0)
 	/// Proof: `EmaOracle::Accumulator` (`max_values`: Some(1), `max_size`: Some(5921), added: 6416, mode: `MaxEncodedLen`)
@@ -184,8 +97,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `208`
 		//  Estimated: `7406`
-		// Minimum execution time: 3_165_000 picoseconds.
-		Weight::from_parts(3_271_000, 7406).saturating_add(RocksDbWeight::get().reads(1))
+		// Minimum execution time: 2_253_000 picoseconds.
+		Weight::from_parts(2_365_000, 7406).saturating_add(RocksDbWeight::get().reads(1_u64))
 	}
 	/// Storage: `EmaOracle::Accumulator` (r:1 w:1)
 	/// Proof: `EmaOracle::Accumulator` (`max_values`: Some(1), `max_size`: Some(5921), added: 6416, mode: `MaxEncodedLen`)
@@ -194,15 +107,15 @@ impl WeightInfo for () {
 	/// The range of component `b` is `[1, 39]`.
 	fn on_finalize_multiple_tokens(b: u32) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `304 + b * (626 ±0)`
+		//  Measured:  `305 + b * (626 ±0)`
 		//  Estimated: `7406 + b * (7956 ±0)`
-		// Minimum execution time: 48_505_000 picoseconds.
-		Weight::from_parts(12_673_348, 7406)
-			// Standard Error: 31_644
-			.saturating_add(Weight::from_parts(36_427_193, 0).saturating_mul(b.into()))
-			.saturating_add(RocksDbWeight::get().reads(1))
+		// Minimum execution time: 44_581_000 picoseconds.
+		Weight::from_parts(9_813_697, 7406)
+			// Standard Error: 19_578
+			.saturating_add(Weight::from_parts(33_915_148, 0).saturating_mul(b.into()))
+			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().reads((3_u64).saturating_mul(b.into())))
-			.saturating_add(RocksDbWeight::get().writes(1))
+			.saturating_add(RocksDbWeight::get().writes(1_u64))
 			.saturating_add(RocksDbWeight::get().writes((3_u64).saturating_mul(b.into())))
 			.saturating_add(Weight::from_parts(0, 7956).saturating_mul(b.into()))
 	}
@@ -213,14 +126,14 @@ impl WeightInfo for () {
 	/// The range of component `b` is `[1, 39]`.
 	fn on_trade_multiple_tokens(b: u32) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `751 + b * (163 ±0)`
+		//  Measured:  `821 + b * (164 ±0)`
 		//  Estimated: `7406`
-		// Minimum execution time: 18_943_000 picoseconds.
-		Weight::from_parts(19_294_596, 7406)
-			// Standard Error: 3_556
-			.saturating_add(Weight::from_parts(423_769, 0).saturating_mul(b.into()))
-			.saturating_add(RocksDbWeight::get().reads(3))
-			.saturating_add(RocksDbWeight::get().writes(1))
+		// Minimum execution time: 16_199_000 picoseconds.
+		Weight::from_parts(17_137_924, 7406)
+			// Standard Error: 2_536
+			.saturating_add(Weight::from_parts(402_614, 0).saturating_mul(b.into()))
+			.saturating_add(RocksDbWeight::get().reads(3_u64))
+			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
 	/// Storage: `AssetRegistry::Assets` (r:2 w:0)
 	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
@@ -229,14 +142,14 @@ impl WeightInfo for () {
 	/// The range of component `b` is `[1, 39]`.
 	fn on_liquidity_changed_multiple_tokens(b: u32) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `751 + b * (163 ±0)`
+		//  Measured:  `821 + b * (164 ±0)`
 		//  Estimated: `7406`
-		// Minimum execution time: 19_079_000 picoseconds.
-		Weight::from_parts(19_403_394, 7406)
-			// Standard Error: 3_730
-			.saturating_add(Weight::from_parts(422_560, 0).saturating_mul(b.into()))
-			.saturating_add(RocksDbWeight::get().reads(3))
-			.saturating_add(RocksDbWeight::get().writes(1))
+		// Minimum execution time: 16_217_000 picoseconds.
+		Weight::from_parts(17_087_683, 7406)
+			// Standard Error: 2_611
+			.saturating_add(Weight::from_parts(406_220, 0).saturating_mul(b.into()))
+			.saturating_add(RocksDbWeight::get().reads(3_u64))
+			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
 	/// Storage: `EmaOracle::Oracles` (r:2 w:0)
 	/// Proof: `EmaOracle::Oracles` (`max_values`: None, `max_size`: Some(177), added: 2652, mode: `MaxEncodedLen`)
@@ -244,7 +157,7 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `638`
 		//  Estimated: `6294`
-		// Minimum execution time: 18_991_000 picoseconds.
-		Weight::from_parts(19_258_000, 6294).saturating_add(RocksDbWeight::get().reads(2))
+		// Minimum execution time: 17_768_000 picoseconds.
+		Weight::from_parts(18_090_000, 6294).saturating_add(RocksDbWeight::get().reads(2_u64))
 	}
 }
diff --git a/pallets/evm-accounts/Cargo.toml b/pallets/evm-accounts/Cargo.toml
index fa04db78f..5fc8abfbe 100644
--- a/pallets/evm-accounts/Cargo.toml
+++ b/pallets/evm-accounts/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-evm-accounts"
-version = "1.1.1"
+version = "1.1.2"
 authors = ['GalacticCouncil']
 edition = "2021"
 license = "Apache-2.0"
diff --git a/pallets/evm-accounts/src/mock.rs b/pallets/evm-accounts/src/mock.rs
index fb2b601de..89b49be1f 100644
--- a/pallets/evm-accounts/src/mock.rs
+++ b/pallets/evm-accounts/src/mock.rs
@@ -70,6 +70,7 @@ impl frame_system::Config for Test {
 	type BlockLength = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
+	type RuntimeTask = RuntimeTask;
 	type Nonce = u64;
 	type Block = Block;
 	type Hash = H256;
diff --git a/pallets/evm-accounts/src/weights.rs b/pallets/evm-accounts/src/weights.rs
index 4ba3fa82c..d9175d81c 100644
--- a/pallets/evm-accounts/src/weights.rs
+++ b/pallets/evm-accounts/src/weights.rs
@@ -1,6 +1,6 @@
 // This file is part of HydraDX.
 
-// Copyright (C) 2020-2024  Intergalactic, Limited (GIB).
+// Copyright (C) 2020-2023  Intergalactic, Limited (GIB).
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,25 +17,30 @@
 
 //! Autogenerated weights for `pallet_evm_accounts`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-02-21, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-05-23, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: 1024
+//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024`
 
 // Executed Command:
-// target/release/hydradx
+// ./target/release/hydradx
 // benchmark
 // pallet
-// --chain=dev
-// --steps=10
-// --repeat=30
 // --wasm-execution=compiled
-// --heap-pages=4096
-// --template=.maintain/pallet-weight-template-no-back.hbs
-// --pallet=pallet-evm-accounts
-// --output=weights-1.1.0/evm-accounts.rs
-// --extrinsic=*
+// --pallet
+// *
+// --extrinsic
+// *
+// --heap-pages
+// 4096
+// --steps
+// 50
+// --repeat
+// 20
+// --template=scripts/pallet-weight-template.hbs
+// --output
+// weights/
 
 #![allow(unused_parens)]
 #![allow(unused_imports)]
@@ -54,58 +59,7 @@ pub trait WeightInfo {
 	fn renounce_contract_deployer() -> Weight;
 }
 
-pub struct HydraWeight<T>(PhantomData<T>);
-
-impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
-	/// Storage: `EVMAccounts::AccountExtension` (r:1 w:1)
-	/// Proof: `EVMAccounts::AccountExtension` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:0)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::NextAssetId` (r:1 w:0)
-	/// Proof: `AssetRegistry::NextAssetId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::LocationAssets` (r:1 w:0)
-	/// Proof: `AssetRegistry::LocationAssets` (`max_values`: None, `max_size`: Some(622), added: 3097, mode: `MaxEncodedLen`)
-	/// Storage: `Tokens::Accounts` (r:1 w:0)
-	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
-	fn bind_evm_address() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `479`
-		//  Estimated: `4087`
-		// Minimum execution time: 36_357_000 picoseconds.
-		Weight::from_parts(36_601_000, 4087)
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `EVMAccounts::ContractDeployer` (r:0 w:1)
-	/// Proof: `EVMAccounts::ContractDeployer` (`max_values`: None, `max_size`: Some(36), added: 2511, mode: `MaxEncodedLen`)
-	fn add_contract_deployer() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 13_157_000 picoseconds.
-		Weight::from_parts(13_481_000, 0).saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `EVMAccounts::ContractDeployer` (r:0 w:1)
-	/// Proof: `EVMAccounts::ContractDeployer` (`max_values`: None, `max_size`: Some(36), added: 2511, mode: `MaxEncodedLen`)
-	fn remove_contract_deployer() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 13_196_000 picoseconds.
-		Weight::from_parts(13_517_000, 0).saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `EVMAccounts::ContractDeployer` (r:0 w:1)
-	/// Proof: `EVMAccounts::ContractDeployer` (`max_values`: None, `max_size`: Some(36), added: 2511, mode: `MaxEncodedLen`)
-	fn renounce_contract_deployer() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 13_153_000 picoseconds.
-		Weight::from_parts(13_380_000, 0).saturating_add(T::DbWeight::get().writes(1))
-	}
-}
-
-// For backwards compatibility and tests
+/// Weights for `pallet_evm_accounts` using the HydraDX node and recommended hardware.
 impl WeightInfo for () {
 	/// Storage: `EVMAccounts::AccountExtension` (r:1 w:1)
 	/// Proof: `EVMAccounts::AccountExtension` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
@@ -117,14 +71,16 @@ impl WeightInfo for () {
 	/// Proof: `AssetRegistry::LocationAssets` (`max_values`: None, `max_size`: Some(622), added: 3097, mode: `MaxEncodedLen`)
 	/// Storage: `Tokens::Accounts` (r:1 w:0)
 	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::Assets` (r:1 w:0)
+	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
 	fn bind_evm_address() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `479`
+		//  Measured:  `545`
 		//  Estimated: `4087`
-		// Minimum execution time: 36_357_000 picoseconds.
-		Weight::from_parts(36_601_000, 4087)
-			.saturating_add(RocksDbWeight::get().reads(5))
-			.saturating_add(RocksDbWeight::get().writes(1))
+		// Minimum execution time: 32_109_000 picoseconds.
+		Weight::from_parts(32_705_000, 4087)
+			.saturating_add(RocksDbWeight::get().reads(6_u64))
+			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
 	/// Storage: `EVMAccounts::ContractDeployer` (r:0 w:1)
 	/// Proof: `EVMAccounts::ContractDeployer` (`max_values`: None, `max_size`: Some(36), added: 2511, mode: `MaxEncodedLen`)
@@ -132,8 +88,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 13_157_000 picoseconds.
-		Weight::from_parts(13_481_000, 0).saturating_add(RocksDbWeight::get().writes(1))
+		// Minimum execution time: 9_574_000 picoseconds.
+		Weight::from_parts(9_760_000, 0).saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
 	/// Storage: `EVMAccounts::ContractDeployer` (r:0 w:1)
 	/// Proof: `EVMAccounts::ContractDeployer` (`max_values`: None, `max_size`: Some(36), added: 2511, mode: `MaxEncodedLen`)
@@ -141,8 +97,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 13_196_000 picoseconds.
-		Weight::from_parts(13_517_000, 0).saturating_add(RocksDbWeight::get().writes(1))
+		// Minimum execution time: 9_344_000 picoseconds.
+		Weight::from_parts(9_633_000, 0).saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
 	/// Storage: `EVMAccounts::ContractDeployer` (r:0 w:1)
 	/// Proof: `EVMAccounts::ContractDeployer` (`max_values`: None, `max_size`: Some(36), added: 2511, mode: `MaxEncodedLen`)
@@ -150,7 +106,7 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 13_153_000 picoseconds.
-		Weight::from_parts(13_380_000, 0).saturating_add(RocksDbWeight::get().writes(1))
+		// Minimum execution time: 9_421_000 picoseconds.
+		Weight::from_parts(9_685_000, 0).saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
 }
diff --git a/pallets/genesis-history/Cargo.toml b/pallets/genesis-history/Cargo.toml
index f07d505f4..9975b0a38 100644
--- a/pallets/genesis-history/Cargo.toml
+++ b/pallets/genesis-history/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-genesis-history"
-version = "2.1.1"
+version = "2.1.2"
 description = "Keeping track of the past chain generations."
 authors = ["GalacticCouncil <hydradx@galacticcouncil.io>"]
 edition = "2021"
diff --git a/pallets/genesis-history/src/mock.rs b/pallets/genesis-history/src/mock.rs
index f3302d8f6..bdbc753e1 100644
--- a/pallets/genesis-history/src/mock.rs
+++ b/pallets/genesis-history/src/mock.rs
@@ -48,6 +48,7 @@ impl system::Config for Test {
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
+	type RuntimeTask = RuntimeTask;
 	type Nonce = u64;
 	type Block = Block;
 	type Hash = H256;
diff --git a/pallets/lbp/Cargo.toml b/pallets/lbp/Cargo.toml
index 42c82080a..68726ad06 100644
--- a/pallets/lbp/Cargo.toml
+++ b/pallets/lbp/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-lbp"
-version = "4.8.2"
+version = "4.8.3"
 description = "HydraDX Liquidity Bootstrapping Pool Pallet"
 authors = ["GalacticCouncil"]
 edition = "2021"
diff --git a/pallets/lbp/src/lib.rs b/pallets/lbp/src/lib.rs
index d340f1a13..96e159c53 100644
--- a/pallets/lbp/src/lib.rs
+++ b/pallets/lbp/src/lib.rs
@@ -64,7 +64,7 @@ mod provider;
 mod trade_execution;
 pub mod types;
 
-use weights::WeightInfo;
+pub use weights::WeightInfo;
 // Re-export pallet items so that they can be accessed from the crate namespace.
 pub use pallet::*;
 
diff --git a/pallets/lbp/src/mock.rs b/pallets/lbp/src/mock.rs
index 83bfe1f7b..c685d6dc8 100644
--- a/pallets/lbp/src/mock.rs
+++ b/pallets/lbp/src/mock.rs
@@ -90,6 +90,7 @@ impl frame_system::Config for Test {
 	type BlockLength = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
+	type RuntimeTask = RuntimeTask;
 	type Nonce = u64;
 	type Block = Block;
 	type Hash = H256;
diff --git a/pallets/lbp/src/weights.rs b/pallets/lbp/src/weights.rs
index b43c189e4..2447524f8 100644
--- a/pallets/lbp/src/weights.rs
+++ b/pallets/lbp/src/weights.rs
@@ -17,27 +17,30 @@
 
 //! Autogenerated weights for `pallet_lbp`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-12-12, STEPS: `5`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-05-23, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024`
 
 // Executed Command:
-// target/release/hydradx
+// ./target/release/hydradx
 // benchmark
 // pallet
-// --pallet=pallet-lbp
 // --wasm-execution=compiled
-// --heap-pages=4096
-// --chain=dev
-// --extrinsic=*
-// --steps=5
-// --repeat=20
+// --pallet
+// *
+// --extrinsic
+// *
+// --heap-pages
+// 4096
+// --steps
+// 50
+// --repeat
+// 20
+// --template=scripts/pallet-weight-template.hbs
 // --output
-// ./weights-1.1.0/lbp.rs
-// --template
-// .maintain/pallet-weight-template-no-back.hbs
+// weights/
 
 #![allow(unused_parens)]
 #![allow(unused_imports)]
@@ -63,191 +66,6 @@ pub trait WeightInfo {
 }
 
 /// Weights for pallet_lbp using the hydraDX node and recommended hardware.
-pub struct HydraWeight<T>(PhantomData<T>);
-
-impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
-	/// Storage: `LBP::PoolData` (r:1 w:1)
-	/// Proof: `LBP::PoolData` (`max_values`: None, `max_size`: Some(163), added: 2638, mode: `MaxEncodedLen`)
-	/// Storage: `LBP::FeeCollectorWithAsset` (r:1 w:1)
-	/// Proof: `LBP::FeeCollectorWithAsset` (`max_values`: None, `max_size`: Some(69), added: 2544, mode: `MaxEncodedLen`)
-	/// Storage: `Tokens::Accounts` (r:4 w:4)
-	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:2 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:2 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `MultiTransactionPayment::AccountCurrencyMap` (r:1 w:1)
-	/// Proof: `MultiTransactionPayment::AccountCurrencyMap` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
-	/// Storage: `MultiTransactionPayment::AcceptedCurrencies` (r:1 w:0)
-	/// Proof: `MultiTransactionPayment::AcceptedCurrencies` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
-	fn create_pool() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `992`
-		//  Estimated: `11322`
-		// Minimum execution time: 144_386_000 picoseconds.
-		Weight::from_parts(145_196_000, 11322)
-			.saturating_add(T::DbWeight::get().reads(12_u64))
-			.saturating_add(T::DbWeight::get().writes(8_u64))
-	}
-	/// Storage: `LBP::PoolData` (r:1 w:1)
-	/// Proof: `LBP::PoolData` (`max_values`: None, `max_size`: Some(163), added: 2638, mode: `MaxEncodedLen`)
-	/// Storage: `LBP::FeeCollectorWithAsset` (r:1 w:2)
-	/// Proof: `LBP::FeeCollectorWithAsset` (`max_values`: None, `max_size`: Some(69), added: 2544, mode: `MaxEncodedLen`)
-	fn update_pool_data() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `351`
-		//  Estimated: `3628`
-		// Minimum execution time: 30_461_000 picoseconds.
-		Weight::from_parts(30_686_000, 3628)
-			.saturating_add(T::DbWeight::get().reads(2_u64))
-			.saturating_add(T::DbWeight::get().writes(3_u64))
-	}
-	/// Storage: `LBP::PoolData` (r:1 w:0)
-	/// Proof: `LBP::PoolData` (`max_values`: None, `max_size`: Some(163), added: 2638, mode: `MaxEncodedLen`)
-	/// Storage: `Tokens::Accounts` (r:4 w:4)
-	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:2 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:0)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	fn add_liquidity() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1180`
-		//  Estimated: `11322`
-		// Minimum execution time: 100_583_000 picoseconds.
-		Weight::from_parts(101_592_000, 11322)
-			.saturating_add(T::DbWeight::get().reads(8_u64))
-			.saturating_add(T::DbWeight::get().writes(4_u64))
-	}
-	/// Storage: `LBP::PoolData` (r:1 w:1)
-	/// Proof: `LBP::PoolData` (`max_values`: None, `max_size`: Some(163), added: 2638, mode: `MaxEncodedLen`)
-	/// Storage: `Tokens::Accounts` (r:4 w:4)
-	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:2 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `MultiTransactionPayment::AccountCurrencyMap` (r:1 w:1)
-	/// Proof: `MultiTransactionPayment::AccountCurrencyMap` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
-	/// Storage: `Tokens::Locks` (r:1 w:0)
-	/// Proof: `Tokens::Locks` (`max_values`: None, `max_size`: Some(1261), added: 3736, mode: `MaxEncodedLen`)
-	/// Storage: `LBP::FeeCollectorWithAsset` (r:0 w:1)
-	/// Proof: `LBP::FeeCollectorWithAsset` (`max_values`: None, `max_size`: Some(69), added: 2544, mode: `MaxEncodedLen`)
-	fn remove_liquidity() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1368`
-		//  Estimated: `11322`
-		// Minimum execution time: 133_274_000 picoseconds.
-		Weight::from_parts(134_648_000, 11322)
-			.saturating_add(T::DbWeight::get().reads(10_u64))
-			.saturating_add(T::DbWeight::get().writes(8_u64))
-	}
-	/// Storage: `Tokens::Accounts` (r:5 w:5)
-	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
-	/// Storage: `LBP::PoolData` (r:1 w:0)
-	/// Proof: `LBP::PoolData` (`max_values`: None, `max_size`: Some(163), added: 2638, mode: `MaxEncodedLen`)
-	/// Storage: `Tokens::Locks` (r:1 w:1)
-	/// Proof: `Tokens::Locks` (`max_values`: None, `max_size`: Some(1261), added: 3736, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:2 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:3 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	fn sell() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1585`
-		//  Estimated: `13905`
-		// Minimum execution time: 218_344_000 picoseconds.
-		Weight::from_parts(220_109_000, 13905)
-			.saturating_add(T::DbWeight::get().reads(12_u64))
-			.saturating_add(T::DbWeight::get().writes(7_u64))
-	}
-	/// Storage: `LBP::PoolData` (r:1 w:0)
-	/// Proof: `LBP::PoolData` (`max_values`: None, `max_size`: Some(163), added: 2638, mode: `MaxEncodedLen`)
-	/// Storage: `Tokens::Accounts` (r:5 w:5)
-	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
-	/// Storage: `Tokens::Locks` (r:1 w:1)
-	/// Proof: `Tokens::Locks` (`max_values`: None, `max_size`: Some(1261), added: 3736, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:2 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:3 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	fn buy() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1585`
-		//  Estimated: `13905`
-		// Minimum execution time: 219_060_000 picoseconds.
-		Weight::from_parts(220_516_000, 13905)
-			.saturating_add(T::DbWeight::get().reads(12_u64))
-			.saturating_add(T::DbWeight::get().writes(7_u64))
-	}
-	/// Storage: `LBP::PoolData` (r:1 w:0)
-	/// Proof: `LBP::PoolData` (`max_values`: None, `max_size`: Some(163), added: 2638, mode: `MaxEncodedLen`)
-	/// Storage: `Tokens::Accounts` (r:5 w:5)
-	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
-	/// Storage: `Tokens::Locks` (r:1 w:1)
-	/// Proof: `Tokens::Locks` (`max_values`: None, `max_size`: Some(1261), added: 3736, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:2 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:3 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// The range of component `c` is `[1, 2]`.
-	/// The range of component `e` is `[0, 1]`.
-	fn router_execution_sell(c: u32, e: u32) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `756 + e * (829 ±0)`
-		//  Estimated: `6156 + e * (7749 ±0)`
-		// Minimum execution time: 65_722_000 picoseconds.
-		Weight::from_parts(66_193_000, 6156)
-			// Standard Error: 1_355_364
-			.saturating_add(Weight::from_parts(3_961_882, 0).saturating_mul(c.into()))
-			// Standard Error: 2_927_921
-			.saturating_add(Weight::from_parts(163_724_923, 0).saturating_mul(e.into()))
-			.saturating_add(T::DbWeight::get().reads(3_u64))
-			.saturating_add(T::DbWeight::get().reads((9_u64).saturating_mul(e.into())))
-			.saturating_add(T::DbWeight::get().writes((7_u64).saturating_mul(e.into())))
-			.saturating_add(Weight::from_parts(0, 7749).saturating_mul(e.into()))
-	}
-	/// Storage: `LBP::PoolData` (r:1 w:0)
-	/// Proof: `LBP::PoolData` (`max_values`: None, `max_size`: Some(163), added: 2638, mode: `MaxEncodedLen`)
-	/// Storage: `Tokens::Accounts` (r:5 w:5)
-	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
-	/// Storage: `Tokens::Locks` (r:1 w:1)
-	/// Proof: `Tokens::Locks` (`max_values`: None, `max_size`: Some(1261), added: 3736, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:2 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:3 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// The range of component `c` is `[1, 3]`.
-	/// The range of component `e` is `[0, 1]`.
-	fn router_execution_buy(c: u32, e: u32) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `756 + e * (829 ±0)`
-		//  Estimated: `6156 + e * (7749 ±0)`
-		// Minimum execution time: 116_733_000 picoseconds.
-		Weight::from_parts(117_433_000, 6156)
-			// Standard Error: 1_509_020
-			.saturating_add(Weight::from_parts(5_197_432, 0).saturating_mul(c.into()))
-			// Standard Error: 4_928_439
-			.saturating_add(Weight::from_parts(141_782_318, 0).saturating_mul(e.into()))
-			.saturating_add(T::DbWeight::get().reads(3_u64))
-			.saturating_add(T::DbWeight::get().reads((9_u64).saturating_mul(e.into())))
-			.saturating_add(T::DbWeight::get().writes((7_u64).saturating_mul(e.into())))
-			.saturating_add(Weight::from_parts(0, 7749).saturating_mul(e.into()))
-	}
-	/// Storage: `LBP::PoolData` (r:1 w:0)
-	/// Proof: `LBP::PoolData` (`max_values`: None, `max_size`: Some(163), added: 2638, mode: `MaxEncodedLen`)
-	/// Storage: `Tokens::Accounts` (r:2 w:0)
-	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
-	fn calculate_buy() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `756`
-		//  Estimated: `6156`
-		// Minimum execution time: 65_795_000 picoseconds.
-		Weight::from_parts(66_370_000, 6156).saturating_add(T::DbWeight::get().reads(3_u64))
-	}
-}
-
-// For backwards compatibility and tests
 impl WeightInfo for () {
 	/// Storage: `LBP::PoolData` (r:1 w:1)
 	/// Proof: `LBP::PoolData` (`max_values`: None, `max_size`: Some(163), added: 2638, mode: `MaxEncodedLen`)
@@ -255,8 +73,12 @@ impl WeightInfo for () {
 	/// Proof: `LBP::FeeCollectorWithAsset` (`max_values`: None, `max_size`: Some(69), added: 2544, mode: `MaxEncodedLen`)
 	/// Storage: `Tokens::Accounts` (r:4 w:4)
 	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
+	/// Storage: `Duster::AccountBlacklist` (r:1 w:0)
+	/// Proof: `Duster::AccountBlacklist` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::BannedAssets` (r:2 w:0)
+	/// Proof: `AssetRegistry::BannedAssets` (`max_values`: None, `max_size`: Some(20), added: 2495, mode: `MaxEncodedLen`)
 	/// Storage: `AssetRegistry::Assets` (r:2 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
+	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
 	/// Storage: `System::Account` (r:2 w:1)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	/// Storage: `MultiTransactionPayment::AccountCurrencyMap` (r:1 w:1)
@@ -265,11 +87,11 @@ impl WeightInfo for () {
 	/// Proof: `MultiTransactionPayment::AcceptedCurrencies` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
 	fn create_pool() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `992`
+		//  Measured:  `1311`
 		//  Estimated: `11322`
-		// Minimum execution time: 144_386_000 picoseconds.
-		Weight::from_parts(145_196_000, 11322)
-			.saturating_add(RocksDbWeight::get().reads(12_u64))
+		// Minimum execution time: 131_482_000 picoseconds.
+		Weight::from_parts(132_832_000, 11322)
+			.saturating_add(RocksDbWeight::get().reads(15_u64))
 			.saturating_add(RocksDbWeight::get().writes(8_u64))
 	}
 	/// Storage: `LBP::PoolData` (r:1 w:1)
@@ -278,10 +100,10 @@ impl WeightInfo for () {
 	/// Proof: `LBP::FeeCollectorWithAsset` (`max_values`: None, `max_size`: Some(69), added: 2544, mode: `MaxEncodedLen`)
 	fn update_pool_data() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `351`
+		//  Measured:  `417`
 		//  Estimated: `3628`
-		// Minimum execution time: 30_461_000 picoseconds.
-		Weight::from_parts(30_686_000, 3628)
+		// Minimum execution time: 24_822_000 picoseconds.
+		Weight::from_parts(25_218_000, 3628)
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 	}
@@ -289,25 +111,33 @@ impl WeightInfo for () {
 	/// Proof: `LBP::PoolData` (`max_values`: None, `max_size`: Some(163), added: 2638, mode: `MaxEncodedLen`)
 	/// Storage: `Tokens::Accounts` (r:4 w:4)
 	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
+	/// Storage: `Duster::AccountBlacklist` (r:1 w:0)
+	/// Proof: `Duster::AccountBlacklist` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::BannedAssets` (r:2 w:0)
+	/// Proof: `AssetRegistry::BannedAssets` (`max_values`: None, `max_size`: Some(20), added: 2495, mode: `MaxEncodedLen`)
 	/// Storage: `AssetRegistry::Assets` (r:2 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
+	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
 	/// Storage: `System::Account` (r:1 w:0)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn add_liquidity() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1180`
+		//  Measured:  `1572`
 		//  Estimated: `11322`
-		// Minimum execution time: 100_583_000 picoseconds.
-		Weight::from_parts(101_592_000, 11322)
-			.saturating_add(RocksDbWeight::get().reads(8_u64))
+		// Minimum execution time: 99_136_000 picoseconds.
+		Weight::from_parts(99_953_000, 11322)
+			.saturating_add(RocksDbWeight::get().reads(11_u64))
 			.saturating_add(RocksDbWeight::get().writes(4_u64))
 	}
 	/// Storage: `LBP::PoolData` (r:1 w:1)
 	/// Proof: `LBP::PoolData` (`max_values`: None, `max_size`: Some(163), added: 2638, mode: `MaxEncodedLen`)
 	/// Storage: `Tokens::Accounts` (r:4 w:4)
 	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
+	/// Storage: `Duster::AccountBlacklist` (r:1 w:0)
+	/// Proof: `Duster::AccountBlacklist` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::BannedAssets` (r:2 w:0)
+	/// Proof: `AssetRegistry::BannedAssets` (`max_values`: None, `max_size`: Some(20), added: 2495, mode: `MaxEncodedLen`)
 	/// Storage: `AssetRegistry::Assets` (r:2 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
+	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
 	/// Storage: `System::Account` (r:1 w:1)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	/// Storage: `MultiTransactionPayment::AccountCurrencyMap` (r:1 w:1)
@@ -318,11 +148,11 @@ impl WeightInfo for () {
 	/// Proof: `LBP::FeeCollectorWithAsset` (`max_values`: None, `max_size`: Some(69), added: 2544, mode: `MaxEncodedLen`)
 	fn remove_liquidity() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1368`
+		//  Measured:  `1687`
 		//  Estimated: `11322`
-		// Minimum execution time: 133_274_000 picoseconds.
-		Weight::from_parts(134_648_000, 11322)
-			.saturating_add(RocksDbWeight::get().reads(10_u64))
+		// Minimum execution time: 129_681_000 picoseconds.
+		Weight::from_parts(131_072_000, 11322)
+			.saturating_add(RocksDbWeight::get().reads(13_u64))
 			.saturating_add(RocksDbWeight::get().writes(8_u64))
 	}
 	/// Storage: `Tokens::Accounts` (r:5 w:5)
@@ -331,17 +161,21 @@ impl WeightInfo for () {
 	/// Proof: `LBP::PoolData` (`max_values`: None, `max_size`: Some(163), added: 2638, mode: `MaxEncodedLen`)
 	/// Storage: `Tokens::Locks` (r:1 w:1)
 	/// Proof: `Tokens::Locks` (`max_values`: None, `max_size`: Some(1261), added: 3736, mode: `MaxEncodedLen`)
+	/// Storage: `Duster::AccountBlacklist` (r:2 w:0)
+	/// Proof: `Duster::AccountBlacklist` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::BannedAssets` (r:2 w:0)
+	/// Proof: `AssetRegistry::BannedAssets` (`max_values`: None, `max_size`: Some(20), added: 2495, mode: `MaxEncodedLen`)
 	/// Storage: `AssetRegistry::Assets` (r:2 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
+	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
 	/// Storage: `System::Account` (r:3 w:1)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn sell() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1585`
+		//  Measured:  `1977`
 		//  Estimated: `13905`
-		// Minimum execution time: 218_344_000 picoseconds.
-		Weight::from_parts(220_109_000, 13905)
-			.saturating_add(RocksDbWeight::get().reads(12_u64))
+		// Minimum execution time: 229_471_000 picoseconds.
+		Weight::from_parts(231_032_000, 13905)
+			.saturating_add(RocksDbWeight::get().reads(16_u64))
 			.saturating_add(RocksDbWeight::get().writes(7_u64))
 	}
 	/// Storage: `LBP::PoolData` (r:1 w:0)
@@ -350,17 +184,21 @@ impl WeightInfo for () {
 	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
 	/// Storage: `Tokens::Locks` (r:1 w:1)
 	/// Proof: `Tokens::Locks` (`max_values`: None, `max_size`: Some(1261), added: 3736, mode: `MaxEncodedLen`)
+	/// Storage: `Duster::AccountBlacklist` (r:2 w:0)
+	/// Proof: `Duster::AccountBlacklist` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::BannedAssets` (r:2 w:0)
+	/// Proof: `AssetRegistry::BannedAssets` (`max_values`: None, `max_size`: Some(20), added: 2495, mode: `MaxEncodedLen`)
 	/// Storage: `AssetRegistry::Assets` (r:2 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
+	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
 	/// Storage: `System::Account` (r:3 w:1)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn buy() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1585`
+		//  Measured:  `1977`
 		//  Estimated: `13905`
-		// Minimum execution time: 219_060_000 picoseconds.
-		Weight::from_parts(220_516_000, 13905)
-			.saturating_add(RocksDbWeight::get().reads(12_u64))
+		// Minimum execution time: 230_204_000 picoseconds.
+		Weight::from_parts(231_446_000, 13905)
+			.saturating_add(RocksDbWeight::get().reads(16_u64))
 			.saturating_add(RocksDbWeight::get().writes(7_u64))
 	}
 	/// Storage: `LBP::PoolData` (r:1 w:0)
@@ -369,24 +207,28 @@ impl WeightInfo for () {
 	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
 	/// Storage: `Tokens::Locks` (r:1 w:1)
 	/// Proof: `Tokens::Locks` (`max_values`: None, `max_size`: Some(1261), added: 3736, mode: `MaxEncodedLen`)
+	/// Storage: `Duster::AccountBlacklist` (r:2 w:0)
+	/// Proof: `Duster::AccountBlacklist` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::BannedAssets` (r:2 w:0)
+	/// Proof: `AssetRegistry::BannedAssets` (`max_values`: None, `max_size`: Some(20), added: 2495, mode: `MaxEncodedLen`)
 	/// Storage: `AssetRegistry::Assets` (r:2 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
+	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
 	/// Storage: `System::Account` (r:3 w:1)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	/// The range of component `c` is `[1, 2]`.
 	/// The range of component `e` is `[0, 1]`.
 	fn router_execution_sell(c: u32, e: u32) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `756 + e * (829 ±0)`
-		//  Estimated: `6156 + e * (7749 ±0)`
-		// Minimum execution time: 65_722_000 picoseconds.
-		Weight::from_parts(66_193_000, 6156)
-			// Standard Error: 1_355_364
-			.saturating_add(Weight::from_parts(3_961_882, 0).saturating_mul(c.into()))
-			// Standard Error: 2_927_921
-			.saturating_add(Weight::from_parts(163_724_923, 0).saturating_mul(e.into()))
+		//  Measured:  `822 + e * (1155 ±0)`
+		//  Estimated: `8799 + e * (7749 ±0)`
+		// Minimum execution time: 86_477_000 picoseconds.
+		Weight::from_parts(87_284_000, 8799)
+			// Standard Error: 227_219
+			.saturating_add(Weight::from_parts(978_707, 0).saturating_mul(c.into()))
+			// Standard Error: 506_080
+			.saturating_add(Weight::from_parts(145_385_809, 0).saturating_mul(e.into()))
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
-			.saturating_add(RocksDbWeight::get().reads((9_u64).saturating_mul(e.into())))
+			.saturating_add(RocksDbWeight::get().reads((13_u64).saturating_mul(e.into())))
 			.saturating_add(RocksDbWeight::get().writes((7_u64).saturating_mul(e.into())))
 			.saturating_add(Weight::from_parts(0, 7749).saturating_mul(e.into()))
 	}
@@ -396,26 +238,30 @@ impl WeightInfo for () {
 	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
 	/// Storage: `Tokens::Locks` (r:1 w:1)
 	/// Proof: `Tokens::Locks` (`max_values`: None, `max_size`: Some(1261), added: 3736, mode: `MaxEncodedLen`)
+	/// Storage: `Duster::AccountBlacklist` (r:2 w:0)
+	/// Proof: `Duster::AccountBlacklist` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::BannedAssets` (r:2 w:0)
+	/// Proof: `AssetRegistry::BannedAssets` (`max_values`: None, `max_size`: Some(20), added: 2495, mode: `MaxEncodedLen`)
 	/// Storage: `AssetRegistry::Assets` (r:2 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
+	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
 	/// Storage: `System::Account` (r:3 w:1)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	/// The range of component `c` is `[1, 3]`.
 	/// The range of component `e` is `[0, 1]`.
 	fn router_execution_buy(c: u32, e: u32) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `756 + e * (829 ±0)`
-		//  Estimated: `6156 + e * (7749 ±0)`
-		// Minimum execution time: 116_733_000 picoseconds.
-		Weight::from_parts(117_433_000, 6156)
-			// Standard Error: 1_509_020
-			.saturating_add(Weight::from_parts(5_197_432, 0).saturating_mul(c.into()))
-			// Standard Error: 4_928_439
-			.saturating_add(Weight::from_parts(141_782_318, 0).saturating_mul(e.into()))
+		//  Measured:  `822 + e * (1155 ±0)`
+		//  Estimated: `6156 + e * (8544 ±4_363_391_150_632_390)`
+		// Minimum execution time: 157_384_000 picoseconds.
+		Weight::from_parts(158_861_000, 6156)
+			// Standard Error: 426_842
+			.saturating_add(Weight::from_parts(2_861_447, 0).saturating_mul(c.into()))
+			// Standard Error: 1_439_449
+			.saturating_add(Weight::from_parts(107_641_350, 0).saturating_mul(e.into()))
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
-			.saturating_add(RocksDbWeight::get().reads((9_u64).saturating_mul(e.into())))
+			.saturating_add(RocksDbWeight::get().reads((13_u64).saturating_mul(e.into())))
 			.saturating_add(RocksDbWeight::get().writes((7_u64).saturating_mul(e.into())))
-			.saturating_add(Weight::from_parts(0, 7749).saturating_mul(e.into()))
+			.saturating_add(Weight::from_parts(0, 8544).saturating_mul(e.into()))
 	}
 	/// Storage: `LBP::PoolData` (r:1 w:0)
 	/// Proof: `LBP::PoolData` (`max_values`: None, `max_size`: Some(163), added: 2638, mode: `MaxEncodedLen`)
@@ -423,9 +269,9 @@ impl WeightInfo for () {
 	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
 	fn calculate_buy() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `756`
+		//  Measured:  `822`
 		//  Estimated: `6156`
-		// Minimum execution time: 65_795_000 picoseconds.
-		Weight::from_parts(66_370_000, 6156).saturating_add(RocksDbWeight::get().reads(3_u64))
+		// Minimum execution time: 88_840_000 picoseconds.
+		Weight::from_parts(89_569_000, 6156).saturating_add(RocksDbWeight::get().reads(3_u64))
 	}
 }
diff --git a/pallets/liquidity-mining/Cargo.toml b/pallets/liquidity-mining/Cargo.toml
index ee6a7961b..567b9ed39 100644
--- a/pallets/liquidity-mining/Cargo.toml
+++ b/pallets/liquidity-mining/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-liquidity-mining"
-version = "4.3.3"
+version = "4.3.4"
 description = "Liquidity mining"
 authors = ["GalacticCouncil"]
 edition = "2021"
diff --git a/pallets/liquidity-mining/src/tests/mock.rs b/pallets/liquidity-mining/src/tests/mock.rs
index 26bf3fcd0..43213e99c 100644
--- a/pallets/liquidity-mining/src/tests/mock.rs
+++ b/pallets/liquidity-mining/src/tests/mock.rs
@@ -145,6 +145,7 @@ impl system::Config for Test {
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
+	type RuntimeTask = RuntimeTask;
 	type Nonce = u64;
 	type Block = Block;
 	type Hash = H256;
@@ -354,8 +355,8 @@ impl pallet_balances::Config for Test {
 	type ReserveIdentifier = ReserveIdentifier;
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
-	type MaxHolds = ();
 	type RuntimeHoldReason = ();
+	type RuntimeFreezeReason = ();
 }
 
 impl orml_tokens::Config for Test {
diff --git a/pallets/nft/Cargo.toml b/pallets/nft/Cargo.toml
index 68450c070..0ad235e1e 100644
--- a/pallets/nft/Cargo.toml
+++ b/pallets/nft/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-nft"
-version = "7.1.3"
+version = "7.1.4"
 description = "A generic NFT pallet for managing non-fungible tokens"
 authors = ["GalacticCoucil"]
 edition = "2021"
diff --git a/pallets/nft/src/lib.rs b/pallets/nft/src/lib.rs
index ee1283e4c..45ef0aca3 100644
--- a/pallets/nft/src/lib.rs
+++ b/pallets/nft/src/lib.rs
@@ -36,7 +36,7 @@ use sp_runtime::{
 };
 use sp_std::boxed::Box;
 pub use types::*;
-use weights::WeightInfo;
+pub use weights::WeightInfo;
 
 mod benchmarking;
 pub mod migration;
diff --git a/pallets/nft/src/mock.rs b/pallets/nft/src/mock.rs
index ce6fdcdaa..dc380f668 100644
--- a/pallets/nft/src/mock.rs
+++ b/pallets/nft/src/mock.rs
@@ -27,10 +27,6 @@ use sp_runtime::{
 	BuildStorage, Perbill,
 };
 
-mod nfc {
-	// Re-export needed for `impl_outer_event!`.
-}
-
 type AccountId = AccountId32;
 type Block = frame_system::mocking::MockBlock<Test>;
 type Balance = u128;
@@ -81,7 +77,7 @@ impl NftPermission<CollectionType> for NftTestPermissions {
 
 impl Config for Test {
 	type RuntimeEvent = RuntimeEvent;
-	type WeightInfo = pallet_nft::weights::BasiliskWeight<Test>;
+	type WeightInfo = ();
 	type NftCollectionId = CollectionId;
 	type NftItemId = ItemId;
 	type CollectionType = CollectionType;
@@ -135,6 +131,7 @@ impl frame_system::Config for Test {
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
+	type RuntimeTask = RuntimeTask;
 	type Nonce = u64;
 	type Block = Block;
 	type Hash = H256;
@@ -170,8 +167,8 @@ impl pallet_balances::Config for Test {
 	type ReserveIdentifier = ();
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
-	type MaxHolds = ();
 	type RuntimeHoldReason = ();
+	type RuntimeFreezeReason = ();
 }
 
 pub const ALICE: AccountId = AccountId::new([1u8; 32]);
diff --git a/pallets/nft/src/weights.rs b/pallets/nft/src/weights.rs
index 2a5413a9a..dd1a7c342 100644
--- a/pallets/nft/src/weights.rs
+++ b/pallets/nft/src/weights.rs
@@ -17,25 +17,32 @@
 
 //! Autogenerated weights for `pallet_nft`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-12-18, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-04-25, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
+//! HOSTNAME: `ubuntu`, CPU: `AMD Ryzen 9 5900X 12-Core Processor`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024`
 
 // Executed Command:
-// target/release/basilisk
+// ./target/release/basilisk
 // benchmark
 // pallet
-// --chain=dev
-// --steps=10
-// --repeat=30
 // --wasm-execution=compiled
-// --heap-pages=4096
+// --pallet
+// *
+// --extrinsic
+// *
+// --heap-pages
+// 4096
+// --steps
+// 50
+// --repeat
+// 20
 // --template=.maintain/pallet-weight-template-no-back.hbs
-// --pallet=pallet-nft
-// --output=weights-1.1.0/nft.rs
-// --extrinsic=*
+// --json-file
+// raw.json
+// --output
+// weights/
 
 #![allow(unused_parens)]
 #![allow(unused_imports)]
@@ -56,125 +63,10 @@ pub trait WeightInfo {
 	fn burn() -> Weight;
 }
 
-pub struct BasiliskWeight<T>(PhantomData<T>);
+const CREATE_COLLECTION_OFFSET: u64 = 180 * 3;
+const MINT_OFFSET: u64 = 140 * 3;
 
-impl<T: frame_system::Config> WeightInfo for BasiliskWeight<T> {
-	/// Storage: `Uniques::Class` (r:1 w:1)
-	/// Proof: `Uniques::Class` (`max_values`: None, `max_size`: Some(190), added: 2665, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::NextAssetId` (r:1 w:0)
-	/// Proof: `AssetRegistry::NextAssetId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::LocationAssets` (r:1 w:0)
-	/// Proof: `AssetRegistry::LocationAssets` (`max_values`: None, `max_size`: Some(622), added: 3097, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::ClassAccount` (r:0 w:1)
-	/// Proof: `Uniques::ClassAccount` (`max_values`: None, `max_size`: Some(80), added: 2555, mode: `MaxEncodedLen`)
-	/// Storage: `NFT::Collections` (r:0 w:1)
-	/// Proof: `NFT::Collections` (`max_values`: None, `max_size`: Some(99), added: 2574, mode: `MaxEncodedLen`)
-	fn create_collection() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `467`
-		//  Estimated: `4087`
-		// Minimum execution time: 36_037_000 picoseconds.
-		Weight::from_parts(36_568_000, 4087)
-			.saturating_add(T::DbWeight::get().reads(3_u64))
-			.saturating_add(T::DbWeight::get().writes(3_u64))
-	}
-	/// Storage: `NFT::Collections` (r:1 w:0)
-	/// Proof: `NFT::Collections` (`max_values`: None, `max_size`: Some(99), added: 2574, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::Class` (r:1 w:1)
-	/// Proof: `Uniques::Class` (`max_values`: None, `max_size`: Some(190), added: 2665, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::Asset` (r:1 w:1)
-	/// Proof: `Uniques::Asset` (`max_values`: None, `max_size`: Some(146), added: 2621, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::CollectionMaxSupply` (r:1 w:0)
-	/// Proof: `Uniques::CollectionMaxSupply` (`max_values`: None, `max_size`: Some(36), added: 2511, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::NextAssetId` (r:1 w:0)
-	/// Proof: `AssetRegistry::NextAssetId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::LocationAssets` (r:1 w:0)
-	/// Proof: `AssetRegistry::LocationAssets` (`max_values`: None, `max_size`: Some(622), added: 3097, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::Account` (r:0 w:1)
-	/// Proof: `Uniques::Account` (`max_values`: None, `max_size`: Some(112), added: 2587, mode: `MaxEncodedLen`)
-	/// Storage: `NFT::Items` (r:0 w:1)
-	/// Proof: `NFT::Items` (`max_values`: None, `max_size`: Some(122), added: 2597, mode: `MaxEncodedLen`)
-	fn mint() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `903`
-		//  Estimated: `4087`
-		// Minimum execution time: 57_537_000 picoseconds.
-		Weight::from_parts(58_178_000, 4087)
-			.saturating_add(T::DbWeight::get().reads(6_u64))
-			.saturating_add(T::DbWeight::get().writes(4_u64))
-	}
-	/// Storage: `NFT::Collections` (r:1 w:0)
-	/// Proof: `NFT::Collections` (`max_values`: None, `max_size`: Some(99), added: 2574, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::Asset` (r:1 w:1)
-	/// Proof: `Uniques::Asset` (`max_values`: None, `max_size`: Some(146), added: 2621, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::Class` (r:1 w:0)
-	/// Proof: `Uniques::Class` (`max_values`: None, `max_size`: Some(190), added: 2665, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::Account` (r:0 w:2)
-	/// Proof: `Uniques::Account` (`max_values`: None, `max_size`: Some(112), added: 2587, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::ItemPriceOf` (r:0 w:1)
-	/// Proof: `Uniques::ItemPriceOf` (`max_values`: None, `max_size`: Some(113), added: 2588, mode: `MaxEncodedLen`)
-	fn transfer() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `873`
-		//  Estimated: `3655`
-		// Minimum execution time: 52_771_000 picoseconds.
-		Weight::from_parts(53_359_000, 3655)
-			.saturating_add(T::DbWeight::get().reads(3_u64))
-			.saturating_add(T::DbWeight::get().writes(4_u64))
-	}
-	/// Storage: `NFT::Collections` (r:1 w:1)
-	/// Proof: `NFT::Collections` (`max_values`: None, `max_size`: Some(99), added: 2574, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::Class` (r:1 w:1)
-	/// Proof: `Uniques::Class` (`max_values`: None, `max_size`: Some(190), added: 2665, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::Asset` (r:1 w:0)
-	/// Proof: `Uniques::Asset` (`max_values`: None, `max_size`: Some(146), added: 2621, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::NextAssetId` (r:1 w:0)
-	/// Proof: `AssetRegistry::NextAssetId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::LocationAssets` (r:1 w:0)
-	/// Proof: `AssetRegistry::LocationAssets` (`max_values`: None, `max_size`: Some(622), added: 3097, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::ClassAccount` (r:0 w:1)
-	/// Proof: `Uniques::ClassAccount` (`max_values`: None, `max_size`: Some(80), added: 2555, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::ClassMetadataOf` (r:0 w:1)
-	/// Proof: `Uniques::ClassMetadataOf` (`max_values`: None, `max_size`: Some(123), added: 2598, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::CollectionMaxSupply` (r:0 w:1)
-	/// Proof: `Uniques::CollectionMaxSupply` (`max_values`: None, `max_size`: Some(36), added: 2511, mode: `MaxEncodedLen`)
-	fn destroy_collection() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `945`
-		//  Estimated: `4087`
-		// Minimum execution time: 67_231_000 picoseconds.
-		Weight::from_parts(67_829_000, 4087)
-			.saturating_add(T::DbWeight::get().reads(5_u64))
-			.saturating_add(T::DbWeight::get().writes(5_u64))
-	}
-	/// Storage: `NFT::Collections` (r:1 w:0)
-	/// Proof: `NFT::Collections` (`max_values`: None, `max_size`: Some(99), added: 2574, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::Asset` (r:1 w:1)
-	/// Proof: `Uniques::Asset` (`max_values`: None, `max_size`: Some(146), added: 2621, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::Class` (r:1 w:1)
-	/// Proof: `Uniques::Class` (`max_values`: None, `max_size`: Some(190), added: 2665, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::NextAssetId` (r:1 w:0)
-	/// Proof: `AssetRegistry::NextAssetId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::LocationAssets` (r:1 w:0)
-	/// Proof: `AssetRegistry::LocationAssets` (`max_values`: None, `max_size`: Some(622), added: 3097, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::Account` (r:0 w:1)
-	/// Proof: `Uniques::Account` (`max_values`: None, `max_size`: Some(112), added: 2587, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::ItemPriceOf` (r:0 w:1)
-	/// Proof: `Uniques::ItemPriceOf` (`max_values`: None, `max_size`: Some(113), added: 2588, mode: `MaxEncodedLen`)
-	/// Storage: `NFT::Items` (r:0 w:1)
-	/// Proof: `NFT::Items` (`max_values`: None, `max_size`: Some(122), added: 2597, mode: `MaxEncodedLen`)
-	fn burn() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1108`
-		//  Estimated: `4087`
-		// Minimum execution time: 56_978_000 picoseconds.
-		Weight::from_parts(57_449_000, 4087)
-			.saturating_add(T::DbWeight::get().reads(5_u64))
-			.saturating_add(T::DbWeight::get().writes(5_u64))
-	}
-}
-
-// For backwards compatibility and tests
+/// Weights for `pallet_nft` using the Basilisk node and recommended hardware.
 impl WeightInfo for () {
 	/// Storage: `Uniques::Class` (r:1 w:1)
 	/// Proof: `Uniques::Class` (`max_values`: None, `max_size`: Some(190), added: 2665, mode: `MaxEncodedLen`)
@@ -188,10 +80,11 @@ impl WeightInfo for () {
 	/// Proof: `NFT::Collections` (`max_values`: None, `max_size`: Some(99), added: 2574, mode: `MaxEncodedLen`)
 	fn create_collection() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `467`
+		//  Measured:  `500`
 		//  Estimated: `4087`
-		// Minimum execution time: 36_037_000 picoseconds.
-		Weight::from_parts(36_568_000, 4087)
+		// Minimum execution time: 21_440_000 picoseconds.
+		Weight::from_parts(22_950_000, 4087)
+			.saturating_mul(CREATE_COLLECTION_OFFSET)
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 	}
@@ -213,10 +106,11 @@ impl WeightInfo for () {
 	/// Proof: `NFT::Items` (`max_values`: None, `max_size`: Some(122), added: 2597, mode: `MaxEncodedLen`)
 	fn mint() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `903`
+		//  Measured:  `936`
 		//  Estimated: `4087`
-		// Minimum execution time: 57_537_000 picoseconds.
-		Weight::from_parts(58_178_000, 4087)
+		// Minimum execution time: 38_970_000 picoseconds.
+		Weight::from_parts(40_021_000, 4087)
+			.saturating_mul(MINT_OFFSET)
 			.saturating_add(RocksDbWeight::get().reads(6_u64))
 			.saturating_add(RocksDbWeight::get().writes(4_u64))
 	}
@@ -234,8 +128,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `873`
 		//  Estimated: `3655`
-		// Minimum execution time: 52_771_000 picoseconds.
-		Weight::from_parts(53_359_000, 3655)
+		// Minimum execution time: 36_170_000 picoseconds.
+		Weight::from_parts(38_671_000, 3655)
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
 			.saturating_add(RocksDbWeight::get().writes(4_u64))
 	}
@@ -257,10 +151,10 @@ impl WeightInfo for () {
 	/// Proof: `Uniques::CollectionMaxSupply` (`max_values`: None, `max_size`: Some(36), added: 2511, mode: `MaxEncodedLen`)
 	fn destroy_collection() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `945`
+		//  Measured:  `978`
 		//  Estimated: `4087`
-		// Minimum execution time: 67_231_000 picoseconds.
-		Weight::from_parts(67_829_000, 4087)
+		// Minimum execution time: 45_351_000 picoseconds.
+		Weight::from_parts(46_690_000, 4087)
 			.saturating_add(RocksDbWeight::get().reads(5_u64))
 			.saturating_add(RocksDbWeight::get().writes(5_u64))
 	}
@@ -282,10 +176,10 @@ impl WeightInfo for () {
 	/// Proof: `NFT::Items` (`max_values`: None, `max_size`: Some(122), added: 2597, mode: `MaxEncodedLen`)
 	fn burn() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1108`
+		//  Measured:  `1141`
 		//  Estimated: `4087`
-		// Minimum execution time: 56_978_000 picoseconds.
-		Weight::from_parts(57_449_000, 4087)
+		// Minimum execution time: 39_440_000 picoseconds.
+		Weight::from_parts(41_081_000, 4087)
 			.saturating_add(RocksDbWeight::get().reads(5_u64))
 			.saturating_add(RocksDbWeight::get().writes(5_u64))
 	}
diff --git a/pallets/omnipool-liquidity-mining/Cargo.toml b/pallets/omnipool-liquidity-mining/Cargo.toml
index 4b9cda7f9..67ea84795 100644
--- a/pallets/omnipool-liquidity-mining/Cargo.toml
+++ b/pallets/omnipool-liquidity-mining/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-omnipool-liquidity-mining"
-version = "2.1.7"
+version = "2.1.8"
 authors = ['GalacticCouncil']
 edition = "2021"
 license = "Apache-2.0"
diff --git a/pallets/omnipool-liquidity-mining/src/tests/mock.rs b/pallets/omnipool-liquidity-mining/src/tests/mock.rs
index 980610d3f..a04e8cfd1 100644
--- a/pallets/omnipool-liquidity-mining/src/tests/mock.rs
+++ b/pallets/omnipool-liquidity-mining/src/tests/mock.rs
@@ -136,6 +136,7 @@ impl frame_system::Config for Test {
 	type BlockLength = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
+	type RuntimeTask = RuntimeTask;
 	type Nonce = u64;
 	type Block = Block;
 	type Hash = H256;
@@ -217,8 +218,8 @@ impl pallet_balances::Config for Test {
 	type ReserveIdentifier = [u8; 8];
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
-	type MaxHolds = ();
 	type RuntimeHoldReason = ();
+	type RuntimeFreezeReason = ();
 }
 
 parameter_type_with_key! {
diff --git a/pallets/omnipool-liquidity-mining/src/weights.rs b/pallets/omnipool-liquidity-mining/src/weights.rs
index bf997493c..b145e46ee 100644
--- a/pallets/omnipool-liquidity-mining/src/weights.rs
+++ b/pallets/omnipool-liquidity-mining/src/weights.rs
@@ -17,27 +17,30 @@
 
 //! Autogenerated weights for `pallet_omnipool_liquidity_mining`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-12-12, STEPS: `5`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-05-23, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024`
 
 // Executed Command:
-// target/release/hydradx
+// ./target/release/hydradx
 // benchmark
 // pallet
-// --pallet=pallet-omnipool-liquidity-mining
 // --wasm-execution=compiled
-// --heap-pages=4096
-// --chain=dev
-// --extrinsic=*
-// --steps=5
-// --repeat=20
+// --pallet
+// *
+// --extrinsic
+// *
+// --heap-pages
+// 4096
+// --steps
+// 50
+// --repeat
+// 20
+// --template=scripts/pallet-weight-template.hbs
 // --output
-// ./weights-1.1.0/omnipool_lm.rs
-// --template
-// .maintain/pallet-weight-template-no-back.hbs
+// weights/
 
 #![allow(unused_parens)]
 #![allow(unused_imports)]
@@ -65,282 +68,9 @@ pub trait WeightInfo {
 }
 
 /// Weights for pallet_omnipool_liquidity_mining using the hydraDX node and recommended hardware.
-pub struct HydraWeight<T>(PhantomData<T>);
-
-impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
-	/// Storage: `AssetRegistry::Assets` (r:2 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:2 w:2)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `OmnipoolWarehouseLM::FarmSequencer` (r:1 w:1)
-	/// Proof: `OmnipoolWarehouseLM::FarmSequencer` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	/// Storage: `Duster::AccountBlacklist` (r:0 w:1)
-	/// Proof: `Duster::AccountBlacklist` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
-	/// Storage: `OmnipoolWarehouseLM::GlobalFarm` (r:0 w:1)
-	/// Proof: `OmnipoolWarehouseLM::GlobalFarm` (`max_values`: None, `max_size`: Some(205), added: 2680, mode: `MaxEncodedLen`)
-	fn create_global_farm() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `462`
-		//  Estimated: `6196`
-		// Minimum execution time: 104_411_000 picoseconds.
-		Weight::from_parts(105_372_000, 6196)
-			.saturating_add(T::DbWeight::get().reads(5_u64))
-			.saturating_add(T::DbWeight::get().writes(5_u64))
-	}
-	/// Storage: `OmnipoolWarehouseLM::GlobalFarm` (r:1 w:1)
-	/// Proof: `OmnipoolWarehouseLM::GlobalFarm` (`max_values`: None, `max_size`: Some(205), added: 2680, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:2 w:2)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `Duster::AccountBlacklist` (r:1 w:1)
-	/// Proof: `Duster::AccountBlacklist` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
-	fn terminate_global_farm() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `898`
-		//  Estimated: `6196`
-		// Minimum execution time: 101_766_000 picoseconds.
-		Weight::from_parts(102_892_000, 6196)
-			.saturating_add(T::DbWeight::get().reads(4_u64))
-			.saturating_add(T::DbWeight::get().writes(4_u64))
-	}
-	/// Storage: `Omnipool::Assets` (r:1 w:0)
-	/// Proof: `Omnipool::Assets` (`max_values`: None, `max_size`: Some(85), added: 2560, mode: `MaxEncodedLen`)
-	/// Storage: `OmnipoolWarehouseLM::GlobalFarm` (r:1 w:1)
-	/// Proof: `OmnipoolWarehouseLM::GlobalFarm` (`max_values`: None, `max_size`: Some(205), added: 2680, mode: `MaxEncodedLen`)
-	/// Storage: `OmnipoolWarehouseLM::ActiveYieldFarm` (r:1 w:1)
-	/// Proof: `OmnipoolWarehouseLM::ActiveYieldFarm` (`max_values`: None, `max_size`: Some(44), added: 2519, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:1 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:2 w:2)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `EmaOracle::Oracles` (r:2 w:0)
-	/// Proof: `EmaOracle::Oracles` (`max_values`: None, `max_size`: Some(177), added: 2652, mode: `MaxEncodedLen`)
-	/// Storage: `OmnipoolWarehouseLM::FarmSequencer` (r:1 w:1)
-	/// Proof: `OmnipoolWarehouseLM::FarmSequencer` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	/// Storage: `OmnipoolWarehouseLM::YieldFarm` (r:0 w:1)
-	/// Proof: `OmnipoolWarehouseLM::YieldFarm` (`max_values`: None, `max_size`: Some(198), added: 2673, mode: `MaxEncodedLen`)
-	fn create_yield_farm() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `2287`
-		//  Estimated: `6294`
-		// Minimum execution time: 140_071_000 picoseconds.
-		Weight::from_parts(141_599_000, 6294)
-			.saturating_add(T::DbWeight::get().reads(9_u64))
-			.saturating_add(T::DbWeight::get().writes(6_u64))
-	}
-	/// Storage: `Omnipool::Assets` (r:1 w:0)
-	/// Proof: `Omnipool::Assets` (`max_values`: None, `max_size`: Some(85), added: 2560, mode: `MaxEncodedLen`)
-	/// Storage: `OmnipoolWarehouseLM::ActiveYieldFarm` (r:1 w:0)
-	/// Proof: `OmnipoolWarehouseLM::ActiveYieldFarm` (`max_values`: None, `max_size`: Some(44), added: 2519, mode: `MaxEncodedLen`)
-	/// Storage: `OmnipoolWarehouseLM::YieldFarm` (r:1 w:1)
-	/// Proof: `OmnipoolWarehouseLM::YieldFarm` (`max_values`: None, `max_size`: Some(198), added: 2673, mode: `MaxEncodedLen`)
-	/// Storage: `OmnipoolWarehouseLM::GlobalFarm` (r:1 w:1)
-	/// Proof: `OmnipoolWarehouseLM::GlobalFarm` (`max_values`: None, `max_size`: Some(205), added: 2680, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:1 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:2 w:2)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `EmaOracle::Oracles` (r:2 w:0)
-	/// Proof: `EmaOracle::Oracles` (`max_values`: None, `max_size`: Some(177), added: 2652, mode: `MaxEncodedLen`)
-	fn update_yield_farm() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `2457`
-		//  Estimated: `6294`
-		// Minimum execution time: 145_051_000 picoseconds.
-		Weight::from_parts(146_213_000, 6294)
-			.saturating_add(T::DbWeight::get().reads(9_u64))
-			.saturating_add(T::DbWeight::get().writes(4_u64))
-	}
-	/// Storage: `OmnipoolWarehouseLM::ActiveYieldFarm` (r:1 w:1)
-	/// Proof: `OmnipoolWarehouseLM::ActiveYieldFarm` (`max_values`: None, `max_size`: Some(44), added: 2519, mode: `MaxEncodedLen`)
-	/// Storage: `OmnipoolWarehouseLM::YieldFarm` (r:1 w:1)
-	/// Proof: `OmnipoolWarehouseLM::YieldFarm` (`max_values`: None, `max_size`: Some(198), added: 2673, mode: `MaxEncodedLen`)
-	/// Storage: `OmnipoolWarehouseLM::GlobalFarm` (r:1 w:1)
-	/// Proof: `OmnipoolWarehouseLM::GlobalFarm` (`max_values`: None, `max_size`: Some(205), added: 2680, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:1 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:2 w:2)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `EmaOracle::Oracles` (r:2 w:0)
-	/// Proof: `EmaOracle::Oracles` (`max_values`: None, `max_size`: Some(177), added: 2652, mode: `MaxEncodedLen`)
-	fn stop_yield_farm() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `2096`
-		//  Estimated: `6294`
-		// Minimum execution time: 139_750_000 picoseconds.
-		Weight::from_parts(140_646_000, 6294)
-			.saturating_add(T::DbWeight::get().reads(8_u64))
-			.saturating_add(T::DbWeight::get().writes(5_u64))
-	}
-	/// Storage: `Omnipool::Assets` (r:1 w:0)
-	/// Proof: `Omnipool::Assets` (`max_values`: None, `max_size`: Some(85), added: 2560, mode: `MaxEncodedLen`)
-	/// Storage: `OmnipoolWarehouseLM::ActiveYieldFarm` (r:1 w:1)
-	/// Proof: `OmnipoolWarehouseLM::ActiveYieldFarm` (`max_values`: None, `max_size`: Some(44), added: 2519, mode: `MaxEncodedLen`)
-	/// Storage: `OmnipoolWarehouseLM::YieldFarm` (r:1 w:1)
-	/// Proof: `OmnipoolWarehouseLM::YieldFarm` (`max_values`: None, `max_size`: Some(198), added: 2673, mode: `MaxEncodedLen`)
-	/// Storage: `OmnipoolWarehouseLM::GlobalFarm` (r:1 w:1)
-	/// Proof: `OmnipoolWarehouseLM::GlobalFarm` (`max_values`: None, `max_size`: Some(205), added: 2680, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:1 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:2 w:2)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `EmaOracle::Oracles` (r:2 w:0)
-	/// Proof: `EmaOracle::Oracles` (`max_values`: None, `max_size`: Some(177), added: 2652, mode: `MaxEncodedLen`)
-	fn resume_yield_farm() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `2493`
-		//  Estimated: `6294`
-		// Minimum execution time: 141_404_000 picoseconds.
-		Weight::from_parts(142_349_000, 6294)
-			.saturating_add(T::DbWeight::get().reads(9_u64))
-			.saturating_add(T::DbWeight::get().writes(5_u64))
-	}
-	/// Storage: `OmnipoolWarehouseLM::ActiveYieldFarm` (r:1 w:0)
-	/// Proof: `OmnipoolWarehouseLM::ActiveYieldFarm` (`max_values`: None, `max_size`: Some(44), added: 2519, mode: `MaxEncodedLen`)
-	/// Storage: `OmnipoolWarehouseLM::GlobalFarm` (r:1 w:1)
-	/// Proof: `OmnipoolWarehouseLM::GlobalFarm` (`max_values`: None, `max_size`: Some(205), added: 2680, mode: `MaxEncodedLen`)
-	/// Storage: `OmnipoolWarehouseLM::YieldFarm` (r:1 w:1)
-	/// Proof: `OmnipoolWarehouseLM::YieldFarm` (`max_values`: None, `max_size`: Some(198), added: 2673, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:2 w:2)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	fn terminate_yield_farm() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `924`
-		//  Estimated: `6196`
-		// Minimum execution time: 90_529_000 picoseconds.
-		Weight::from_parts(91_011_000, 6196)
-			.saturating_add(T::DbWeight::get().reads(5_u64))
-			.saturating_add(T::DbWeight::get().writes(4_u64))
-	}
-	/// Storage: `Uniques::Asset` (r:2 w:2)
-	/// Proof: `Uniques::Asset` (`max_values`: None, `max_size`: Some(146), added: 2621, mode: `MaxEncodedLen`)
-	/// Storage: `Omnipool::Positions` (r:1 w:0)
-	/// Proof: `Omnipool::Positions` (`max_values`: None, `max_size`: Some(100), added: 2575, mode: `MaxEncodedLen`)
-	/// Storage: `Omnipool::Assets` (r:1 w:0)
-	/// Proof: `Omnipool::Assets` (`max_values`: None, `max_size`: Some(85), added: 2560, mode: `MaxEncodedLen`)
-	/// Storage: `OmnipoolWarehouseLM::YieldFarm` (r:1 w:1)
-	/// Proof: `OmnipoolWarehouseLM::YieldFarm` (`max_values`: None, `max_size`: Some(198), added: 2673, mode: `MaxEncodedLen`)
-	/// Storage: `OmnipoolWarehouseLM::GlobalFarm` (r:1 w:1)
-	/// Proof: `OmnipoolWarehouseLM::GlobalFarm` (`max_values`: None, `max_size`: Some(205), added: 2680, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:1 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:2 w:2)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `EmaOracle::Oracles` (r:4 w:0)
-	/// Proof: `EmaOracle::Oracles` (`max_values`: None, `max_size`: Some(177), added: 2652, mode: `MaxEncodedLen`)
-	/// Storage: `OmnipoolWarehouseLM::DepositSequencer` (r:1 w:1)
-	/// Proof: `OmnipoolWarehouseLM::DepositSequencer` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::Class` (r:2 w:1)
-	/// Proof: `Uniques::Class` (`max_values`: None, `max_size`: Some(190), added: 2665, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::CollectionMaxSupply` (r:1 w:0)
-	/// Proof: `Uniques::CollectionMaxSupply` (`max_values`: None, `max_size`: Some(36), added: 2511, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::Account` (r:0 w:3)
-	/// Proof: `Uniques::Account` (`max_values`: None, `max_size`: Some(112), added: 2587, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::ItemPriceOf` (r:0 w:1)
-	/// Proof: `Uniques::ItemPriceOf` (`max_values`: None, `max_size`: Some(113), added: 2588, mode: `MaxEncodedLen`)
-	/// Storage: `OmnipoolLiquidityMining::OmniPositionId` (r:0 w:1)
-	/// Proof: `OmnipoolLiquidityMining::OmniPositionId` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
-	/// Storage: `OmnipoolWarehouseLM::Deposit` (r:0 w:1)
-	/// Proof: `OmnipoolWarehouseLM::Deposit` (`max_values`: None, `max_size`: Some(385), added: 2860, mode: `MaxEncodedLen`)
-	fn deposit_shares() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `3989`
-		//  Estimated: `11598`
-		// Minimum execution time: 240_264_000 picoseconds.
-		Weight::from_parts(241_286_000, 11598)
-			.saturating_add(T::DbWeight::get().reads(17_u64))
-			.saturating_add(T::DbWeight::get().writes(14_u64))
-	}
-	/// Storage: `Uniques::Asset` (r:2 w:0)
-	/// Proof: `Uniques::Asset` (`max_values`: None, `max_size`: Some(146), added: 2621, mode: `MaxEncodedLen`)
-	/// Storage: `OmnipoolLiquidityMining::OmniPositionId` (r:1 w:0)
-	/// Proof: `OmnipoolLiquidityMining::OmniPositionId` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
-	/// Storage: `Omnipool::Positions` (r:1 w:0)
-	/// Proof: `Omnipool::Positions` (`max_values`: None, `max_size`: Some(100), added: 2575, mode: `MaxEncodedLen`)
-	/// Storage: `Omnipool::Assets` (r:1 w:0)
-	/// Proof: `Omnipool::Assets` (`max_values`: None, `max_size`: Some(85), added: 2560, mode: `MaxEncodedLen`)
-	/// Storage: `OmnipoolWarehouseLM::Deposit` (r:1 w:1)
-	/// Proof: `OmnipoolWarehouseLM::Deposit` (`max_values`: None, `max_size`: Some(385), added: 2860, mode: `MaxEncodedLen`)
-	/// Storage: `OmnipoolWarehouseLM::YieldFarm` (r:1 w:1)
-	/// Proof: `OmnipoolWarehouseLM::YieldFarm` (`max_values`: None, `max_size`: Some(198), added: 2673, mode: `MaxEncodedLen`)
-	/// Storage: `OmnipoolWarehouseLM::GlobalFarm` (r:1 w:1)
-	/// Proof: `OmnipoolWarehouseLM::GlobalFarm` (`max_values`: None, `max_size`: Some(205), added: 2680, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:1 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:2 w:2)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `EmaOracle::Oracles` (r:4 w:0)
-	/// Proof: `EmaOracle::Oracles` (`max_values`: None, `max_size`: Some(177), added: 2652, mode: `MaxEncodedLen`)
-	fn redeposit_shares() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `4331`
-		//  Estimated: `11598`
-		// Minimum execution time: 195_833_000 picoseconds.
-		Weight::from_parts(196_912_000, 11598)
-			.saturating_add(T::DbWeight::get().reads(15_u64))
-			.saturating_add(T::DbWeight::get().writes(5_u64))
-	}
-	/// Storage: `Uniques::Asset` (r:1 w:0)
-	/// Proof: `Uniques::Asset` (`max_values`: None, `max_size`: Some(146), added: 2621, mode: `MaxEncodedLen`)
-	/// Storage: `OmnipoolWarehouseLM::Deposit` (r:1 w:1)
-	/// Proof: `OmnipoolWarehouseLM::Deposit` (`max_values`: None, `max_size`: Some(385), added: 2860, mode: `MaxEncodedLen`)
-	/// Storage: `OmnipoolWarehouseLM::YieldFarm` (r:1 w:1)
-	/// Proof: `OmnipoolWarehouseLM::YieldFarm` (`max_values`: None, `max_size`: Some(198), added: 2673, mode: `MaxEncodedLen`)
-	/// Storage: `OmnipoolWarehouseLM::GlobalFarm` (r:1 w:1)
-	/// Proof: `OmnipoolWarehouseLM::GlobalFarm` (`max_values`: None, `max_size`: Some(205), added: 2680, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:1 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:3 w:3)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `EmaOracle::Oracles` (r:2 w:0)
-	/// Proof: `EmaOracle::Oracles` (`max_values`: None, `max_size`: Some(177), added: 2652, mode: `MaxEncodedLen`)
-	fn claim_rewards() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `2896`
-		//  Estimated: `8799`
-		// Minimum execution time: 195_680_000 picoseconds.
-		Weight::from_parts(196_827_000, 8799)
-			.saturating_add(T::DbWeight::get().reads(10_u64))
-			.saturating_add(T::DbWeight::get().writes(6_u64))
-	}
-	/// Storage: `Uniques::Asset` (r:2 w:2)
-	/// Proof: `Uniques::Asset` (`max_values`: None, `max_size`: Some(146), added: 2621, mode: `MaxEncodedLen`)
-	/// Storage: `OmnipoolLiquidityMining::OmniPositionId` (r:1 w:1)
-	/// Proof: `OmnipoolLiquidityMining::OmniPositionId` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
-	/// Storage: `Omnipool::Positions` (r:1 w:0)
-	/// Proof: `Omnipool::Positions` (`max_values`: None, `max_size`: Some(100), added: 2575, mode: `MaxEncodedLen`)
-	/// Storage: `OmnipoolWarehouseLM::Deposit` (r:1 w:1)
-	/// Proof: `OmnipoolWarehouseLM::Deposit` (`max_values`: None, `max_size`: Some(385), added: 2860, mode: `MaxEncodedLen`)
-	/// Storage: `OmnipoolWarehouseLM::YieldFarm` (r:1 w:1)
-	/// Proof: `OmnipoolWarehouseLM::YieldFarm` (`max_values`: None, `max_size`: Some(198), added: 2673, mode: `MaxEncodedLen`)
-	/// Storage: `OmnipoolWarehouseLM::GlobalFarm` (r:1 w:1)
-	/// Proof: `OmnipoolWarehouseLM::GlobalFarm` (`max_values`: None, `max_size`: Some(205), added: 2680, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:1 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:3 w:3)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `EmaOracle::Oracles` (r:2 w:0)
-	/// Proof: `EmaOracle::Oracles` (`max_values`: None, `max_size`: Some(177), added: 2652, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::Class` (r:2 w:1)
-	/// Proof: `Uniques::Class` (`max_values`: None, `max_size`: Some(190), added: 2665, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::Account` (r:0 w:3)
-	/// Proof: `Uniques::Account` (`max_values`: None, `max_size`: Some(112), added: 2587, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::ItemPriceOf` (r:0 w:2)
-	/// Proof: `Uniques::ItemPriceOf` (`max_values`: None, `max_size`: Some(113), added: 2588, mode: `MaxEncodedLen`)
-	fn withdraw_shares() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `3857`
-		//  Estimated: `8799`
-		// Minimum execution time: 294_229_000 picoseconds.
-		Weight::from_parts(296_004_000, 8799)
-			.saturating_add(T::DbWeight::get().reads(15_u64))
-			.saturating_add(T::DbWeight::get().writes(15_u64))
-	}
-}
-
-// For backwards compatibility and tests
 impl WeightInfo for () {
 	/// Storage: `AssetRegistry::Assets` (r:2 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
+	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
 	/// Storage: `System::Account` (r:2 w:2)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	/// Storage: `OmnipoolWarehouseLM::FarmSequencer` (r:1 w:1)
@@ -351,10 +81,10 @@ impl WeightInfo for () {
 	/// Proof: `OmnipoolWarehouseLM::GlobalFarm` (`max_values`: None, `max_size`: Some(205), added: 2680, mode: `MaxEncodedLen`)
 	fn create_global_farm() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `462`
+		//  Measured:  `557`
 		//  Estimated: `6196`
-		// Minimum execution time: 104_411_000 picoseconds.
-		Weight::from_parts(105_372_000, 6196)
+		// Minimum execution time: 80_933_000 picoseconds.
+		Weight::from_parts(81_673_000, 6196)
 			.saturating_add(RocksDbWeight::get().reads(5_u64))
 			.saturating_add(RocksDbWeight::get().writes(5_u64))
 	}
@@ -366,10 +96,10 @@ impl WeightInfo for () {
 	/// Proof: `Duster::AccountBlacklist` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
 	fn terminate_global_farm() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `898`
+		//  Measured:  `964`
 		//  Estimated: `6196`
-		// Minimum execution time: 101_766_000 picoseconds.
-		Weight::from_parts(102_892_000, 6196)
+		// Minimum execution time: 79_070_000 picoseconds.
+		Weight::from_parts(79_648_000, 6196)
 			.saturating_add(RocksDbWeight::get().reads(4_u64))
 			.saturating_add(RocksDbWeight::get().writes(4_u64))
 	}
@@ -380,7 +110,7 @@ impl WeightInfo for () {
 	/// Storage: `OmnipoolWarehouseLM::ActiveYieldFarm` (r:1 w:1)
 	/// Proof: `OmnipoolWarehouseLM::ActiveYieldFarm` (`max_values`: None, `max_size`: Some(44), added: 2519, mode: `MaxEncodedLen`)
 	/// Storage: `AssetRegistry::Assets` (r:1 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
+	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
 	/// Storage: `System::Account` (r:2 w:2)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	/// Storage: `EmaOracle::Oracles` (r:2 w:0)
@@ -391,10 +121,10 @@ impl WeightInfo for () {
 	/// Proof: `OmnipoolWarehouseLM::YieldFarm` (`max_values`: None, `max_size`: Some(198), added: 2673, mode: `MaxEncodedLen`)
 	fn create_yield_farm() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2287`
+		//  Measured:  `2337`
 		//  Estimated: `6294`
-		// Minimum execution time: 140_071_000 picoseconds.
-		Weight::from_parts(141_599_000, 6294)
+		// Minimum execution time: 123_093_000 picoseconds.
+		Weight::from_parts(124_230_000, 6294)
 			.saturating_add(RocksDbWeight::get().reads(9_u64))
 			.saturating_add(RocksDbWeight::get().writes(6_u64))
 	}
@@ -407,17 +137,17 @@ impl WeightInfo for () {
 	/// Storage: `OmnipoolWarehouseLM::GlobalFarm` (r:1 w:1)
 	/// Proof: `OmnipoolWarehouseLM::GlobalFarm` (`max_values`: None, `max_size`: Some(205), added: 2680, mode: `MaxEncodedLen`)
 	/// Storage: `AssetRegistry::Assets` (r:1 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
+	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
 	/// Storage: `System::Account` (r:2 w:2)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	/// Storage: `EmaOracle::Oracles` (r:2 w:0)
 	/// Proof: `EmaOracle::Oracles` (`max_values`: None, `max_size`: Some(177), added: 2652, mode: `MaxEncodedLen`)
 	fn update_yield_farm() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2457`
+		//  Measured:  `2507`
 		//  Estimated: `6294`
-		// Minimum execution time: 145_051_000 picoseconds.
-		Weight::from_parts(146_213_000, 6294)
+		// Minimum execution time: 126_053_000 picoseconds.
+		Weight::from_parts(127_134_000, 6294)
 			.saturating_add(RocksDbWeight::get().reads(9_u64))
 			.saturating_add(RocksDbWeight::get().writes(4_u64))
 	}
@@ -428,17 +158,17 @@ impl WeightInfo for () {
 	/// Storage: `OmnipoolWarehouseLM::GlobalFarm` (r:1 w:1)
 	/// Proof: `OmnipoolWarehouseLM::GlobalFarm` (`max_values`: None, `max_size`: Some(205), added: 2680, mode: `MaxEncodedLen`)
 	/// Storage: `AssetRegistry::Assets` (r:1 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
+	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
 	/// Storage: `System::Account` (r:2 w:2)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	/// Storage: `EmaOracle::Oracles` (r:2 w:0)
 	/// Proof: `EmaOracle::Oracles` (`max_values`: None, `max_size`: Some(177), added: 2652, mode: `MaxEncodedLen`)
 	fn stop_yield_farm() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2096`
+		//  Measured:  `2146`
 		//  Estimated: `6294`
-		// Minimum execution time: 139_750_000 picoseconds.
-		Weight::from_parts(140_646_000, 6294)
+		// Minimum execution time: 120_037_000 picoseconds.
+		Weight::from_parts(120_995_000, 6294)
 			.saturating_add(RocksDbWeight::get().reads(8_u64))
 			.saturating_add(RocksDbWeight::get().writes(5_u64))
 	}
@@ -451,17 +181,17 @@ impl WeightInfo for () {
 	/// Storage: `OmnipoolWarehouseLM::GlobalFarm` (r:1 w:1)
 	/// Proof: `OmnipoolWarehouseLM::GlobalFarm` (`max_values`: None, `max_size`: Some(205), added: 2680, mode: `MaxEncodedLen`)
 	/// Storage: `AssetRegistry::Assets` (r:1 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
+	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
 	/// Storage: `System::Account` (r:2 w:2)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	/// Storage: `EmaOracle::Oracles` (r:2 w:0)
 	/// Proof: `EmaOracle::Oracles` (`max_values`: None, `max_size`: Some(177), added: 2652, mode: `MaxEncodedLen`)
 	fn resume_yield_farm() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2493`
+		//  Measured:  `2543`
 		//  Estimated: `6294`
-		// Minimum execution time: 141_404_000 picoseconds.
-		Weight::from_parts(142_349_000, 6294)
+		// Minimum execution time: 124_191_000 picoseconds.
+		Weight::from_parts(124_920_000, 6294)
 			.saturating_add(RocksDbWeight::get().reads(9_u64))
 			.saturating_add(RocksDbWeight::get().writes(5_u64))
 	}
@@ -477,8 +207,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `924`
 		//  Estimated: `6196`
-		// Minimum execution time: 90_529_000 picoseconds.
-		Weight::from_parts(91_011_000, 6196)
+		// Minimum execution time: 75_542_000 picoseconds.
+		Weight::from_parts(75_959_000, 6196)
 			.saturating_add(RocksDbWeight::get().reads(5_u64))
 			.saturating_add(RocksDbWeight::get().writes(4_u64))
 	}
@@ -493,7 +223,7 @@ impl WeightInfo for () {
 	/// Storage: `OmnipoolWarehouseLM::GlobalFarm` (r:1 w:1)
 	/// Proof: `OmnipoolWarehouseLM::GlobalFarm` (`max_values`: None, `max_size`: Some(205), added: 2680, mode: `MaxEncodedLen`)
 	/// Storage: `AssetRegistry::Assets` (r:1 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
+	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
 	/// Storage: `System::Account` (r:2 w:2)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	/// Storage: `EmaOracle::Oracles` (r:4 w:0)
@@ -514,10 +244,10 @@ impl WeightInfo for () {
 	/// Proof: `OmnipoolWarehouseLM::Deposit` (`max_values`: None, `max_size`: Some(385), added: 2860, mode: `MaxEncodedLen`)
 	fn deposit_shares() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3989`
+		//  Measured:  `4072`
 		//  Estimated: `11598`
-		// Minimum execution time: 240_264_000 picoseconds.
-		Weight::from_parts(241_286_000, 11598)
+		// Minimum execution time: 207_096_000 picoseconds.
+		Weight::from_parts(208_255_000, 11598)
 			.saturating_add(RocksDbWeight::get().reads(17_u64))
 			.saturating_add(RocksDbWeight::get().writes(14_u64))
 	}
@@ -536,17 +266,17 @@ impl WeightInfo for () {
 	/// Storage: `OmnipoolWarehouseLM::GlobalFarm` (r:1 w:1)
 	/// Proof: `OmnipoolWarehouseLM::GlobalFarm` (`max_values`: None, `max_size`: Some(205), added: 2680, mode: `MaxEncodedLen`)
 	/// Storage: `AssetRegistry::Assets` (r:1 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
+	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
 	/// Storage: `System::Account` (r:2 w:2)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	/// Storage: `EmaOracle::Oracles` (r:4 w:0)
 	/// Proof: `EmaOracle::Oracles` (`max_values`: None, `max_size`: Some(177), added: 2652, mode: `MaxEncodedLen`)
 	fn redeposit_shares() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `4331`
+		//  Measured:  `4381`
 		//  Estimated: `11598`
-		// Minimum execution time: 195_833_000 picoseconds.
-		Weight::from_parts(196_912_000, 11598)
+		// Minimum execution time: 171_971_000 picoseconds.
+		Weight::from_parts(173_516_000, 11598)
 			.saturating_add(RocksDbWeight::get().reads(15_u64))
 			.saturating_add(RocksDbWeight::get().writes(5_u64))
 	}
@@ -559,17 +289,17 @@ impl WeightInfo for () {
 	/// Storage: `OmnipoolWarehouseLM::GlobalFarm` (r:1 w:1)
 	/// Proof: `OmnipoolWarehouseLM::GlobalFarm` (`max_values`: None, `max_size`: Some(205), added: 2680, mode: `MaxEncodedLen`)
 	/// Storage: `AssetRegistry::Assets` (r:1 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
+	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
 	/// Storage: `System::Account` (r:3 w:3)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	/// Storage: `EmaOracle::Oracles` (r:2 w:0)
 	/// Proof: `EmaOracle::Oracles` (`max_values`: None, `max_size`: Some(177), added: 2652, mode: `MaxEncodedLen`)
 	fn claim_rewards() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2896`
+		//  Measured:  `2946`
 		//  Estimated: `8799`
-		// Minimum execution time: 195_680_000 picoseconds.
-		Weight::from_parts(196_827_000, 8799)
+		// Minimum execution time: 165_734_000 picoseconds.
+		Weight::from_parts(167_004_000, 8799)
 			.saturating_add(RocksDbWeight::get().reads(10_u64))
 			.saturating_add(RocksDbWeight::get().writes(6_u64))
 	}
@@ -586,7 +316,7 @@ impl WeightInfo for () {
 	/// Storage: `OmnipoolWarehouseLM::GlobalFarm` (r:1 w:1)
 	/// Proof: `OmnipoolWarehouseLM::GlobalFarm` (`max_values`: None, `max_size`: Some(205), added: 2680, mode: `MaxEncodedLen`)
 	/// Storage: `AssetRegistry::Assets` (r:1 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
+	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
 	/// Storage: `System::Account` (r:3 w:3)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	/// Storage: `EmaOracle::Oracles` (r:2 w:0)
@@ -599,10 +329,10 @@ impl WeightInfo for () {
 	/// Proof: `Uniques::ItemPriceOf` (`max_values`: None, `max_size`: Some(113), added: 2588, mode: `MaxEncodedLen`)
 	fn withdraw_shares() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3857`
+		//  Measured:  `3940`
 		//  Estimated: `8799`
-		// Minimum execution time: 294_229_000 picoseconds.
-		Weight::from_parts(296_004_000, 8799)
+		// Minimum execution time: 250_173_000 picoseconds.
+		Weight::from_parts(251_222_000, 8799)
 			.saturating_add(RocksDbWeight::get().reads(15_u64))
 			.saturating_add(RocksDbWeight::get().writes(15_u64))
 	}
diff --git a/pallets/omnipool/Cargo.toml b/pallets/omnipool/Cargo.toml
index f19811b37..d316eb163 100644
--- a/pallets/omnipool/Cargo.toml
+++ b/pallets/omnipool/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-omnipool"
-version = "4.3.0"
+version = "4.3.1"
 authors = ['GalacticCouncil']
 edition = "2021"
 license = "Apache-2.0"
diff --git a/pallets/omnipool/src/tests/mock.rs b/pallets/omnipool/src/tests/mock.rs
index 62d71e075..6d7dfe5a8 100644
--- a/pallets/omnipool/src/tests/mock.rs
+++ b/pallets/omnipool/src/tests/mock.rs
@@ -95,6 +95,7 @@ impl frame_system::Config for Test {
 	type BlockLength = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
+	type RuntimeTask = RuntimeTask;
 	type Nonce = u64;
 	type Block = Block;
 	type Hash = H256;
@@ -127,8 +128,8 @@ impl pallet_balances::Config for Test {
 	type ReserveIdentifier = [u8; 8];
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
-	type MaxHolds = ();
 	type RuntimeHoldReason = ();
+	type RuntimeFreezeReason = ();
 }
 
 parameter_type_with_key! {
diff --git a/pallets/omnipool/src/weights.rs b/pallets/omnipool/src/weights.rs
index 27d69e493..b8ca1f488 100644
--- a/pallets/omnipool/src/weights.rs
+++ b/pallets/omnipool/src/weights.rs
@@ -17,25 +17,30 @@
 
 //! Autogenerated weights for `pallet_omnipool`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-01-09, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-05-23, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: 1024
+//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024`
 
 // Executed Command:
-// target/release/hydradx
+// ./target/release/hydradx
 // benchmark
 // pallet
-// --chain=dev
-// --steps=10
-// --repeat=30
 // --wasm-execution=compiled
-// --heap-pages=4096
-// --template=.maintain/pallet-weight-template-no-back.hbs
-// --pallet=pallet-omnipool
-// --output=weights-1.1.0/omnipool.rs
-// --extrinsic=*
+// --pallet
+// *
+// --extrinsic
+// *
+// --heap-pages
+// 4096
+// --steps
+// 50
+// --repeat
+// 20
+// --template=scripts/pallet-weight-template.hbs
+// --output
+// weights/
 
 #![allow(unused_parens)]
 #![allow(unused_imports)]
@@ -65,476 +70,11 @@ pub trait WeightInfo {
 }
 
 /// Weights for pallet_omnipool using the hydraDX node and recommended hardware.
-pub struct HydraWeight<T>(PhantomData<T>);
-
-impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
-	/// Storage: `Omnipool::Assets` (r:1 w:1)
-	/// Proof: `Omnipool::Assets` (`max_values`: None, `max_size`: Some(85), added: 2560, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:2 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::Class` (r:1 w:1)
-	/// Proof: `Uniques::Class` (`max_values`: None, `max_size`: Some(190), added: 2665, mode: `MaxEncodedLen`)
-	/// Storage: `Tokens::Accounts` (r:2 w:1)
-	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
-	/// Storage: `Omnipool::NextPositionId` (r:1 w:1)
-	/// Proof: `Omnipool::NextPositionId` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::Asset` (r:1 w:1)
-	/// Proof: `Uniques::Asset` (`max_values`: None, `max_size`: Some(146), added: 2621, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::CollectionMaxSupply` (r:1 w:0)
-	/// Proof: `Uniques::CollectionMaxSupply` (`max_values`: None, `max_size`: Some(36), added: 2511, mode: `MaxEncodedLen`)
-	/// Storage: `Omnipool::HubAssetImbalance` (r:1 w:1)
-	/// Proof: `Omnipool::HubAssetImbalance` (`max_values`: Some(1), `max_size`: Some(17), added: 512, mode: `MaxEncodedLen`)
-	/// Storage: `Tokens::TotalIssuance` (r:1 w:1)
-	/// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
-	/// Storage: `EmaOracle::Accumulator` (r:1 w:1)
-	/// Proof: `EmaOracle::Accumulator` (`max_values`: Some(1), `max_size`: Some(5921), added: 6416, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::Account` (r:0 w:1)
-	/// Proof: `Uniques::Account` (`max_values`: None, `max_size`: Some(112), added: 2587, mode: `MaxEncodedLen`)
-	/// Storage: `Omnipool::Positions` (r:0 w:1)
-	/// Proof: `Omnipool::Positions` (`max_values`: None, `max_size`: Some(100), added: 2575, mode: `MaxEncodedLen`)
-	fn add_token() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `3004`
-		//  Estimated: `7406`
-		// Minimum execution time: 141_394_000 picoseconds.
-		Weight::from_parts(142_349_000, 7406)
-			.saturating_add(T::DbWeight::get().reads(12))
-			.saturating_add(T::DbWeight::get().writes(10))
-	}
-	/// Storage: `Tokens::Accounts` (r:3 w:3)
-	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
-	/// Storage: `Omnipool::Assets` (r:1 w:1)
-	/// Proof: `Omnipool::Assets` (`max_values`: None, `max_size`: Some(85), added: 2560, mode: `MaxEncodedLen`)
-	/// Storage: `EmaOracle::Oracles` (r:2 w:0)
-	/// Proof: `EmaOracle::Oracles` (`max_values`: None, `max_size`: Some(177), added: 2652, mode: `MaxEncodedLen`)
-	/// Storage: `Omnipool::HubAssetImbalance` (r:1 w:1)
-	/// Proof: `Omnipool::HubAssetImbalance` (`max_values`: Some(1), `max_size`: Some(17), added: 512, mode: `MaxEncodedLen`)
-	/// Storage: `Omnipool::NextPositionId` (r:1 w:1)
-	/// Proof: `Omnipool::NextPositionId` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::Asset` (r:1 w:1)
-	/// Proof: `Uniques::Asset` (`max_values`: None, `max_size`: Some(146), added: 2621, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::Class` (r:1 w:1)
-	/// Proof: `Uniques::Class` (`max_values`: None, `max_size`: Some(190), added: 2665, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::CollectionMaxSupply` (r:1 w:0)
-	/// Proof: `Uniques::CollectionMaxSupply` (`max_values`: None, `max_size`: Some(36), added: 2511, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:2 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:0)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `Tokens::TotalIssuance` (r:1 w:1)
-	/// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
-	/// Storage: `EmaOracle::Accumulator` (r:1 w:1)
-	/// Proof: `EmaOracle::Accumulator` (`max_values`: Some(1), `max_size`: Some(5921), added: 6416, mode: `MaxEncodedLen`)
-	/// Storage: `CircuitBreaker::LiquidityAddLimitPerAsset` (r:1 w:0)
-	/// Proof: `CircuitBreaker::LiquidityAddLimitPerAsset` (`max_values`: None, `max_size`: Some(29), added: 2504, mode: `MaxEncodedLen`)
-	/// Storage: `CircuitBreaker::AllowedAddLiquidityAmountPerAsset` (r:1 w:1)
-	/// Proof: `CircuitBreaker::AllowedAddLiquidityAmountPerAsset` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
-	/// Storage: `CircuitBreaker::LiquidityRemoveLimitPerAsset` (r:1 w:0)
-	/// Proof: `CircuitBreaker::LiquidityRemoveLimitPerAsset` (`max_values`: None, `max_size`: Some(29), added: 2504, mode: `MaxEncodedLen`)
-	/// Storage: `CircuitBreaker::AllowedRemoveLiquidityAmountPerAsset` (r:1 w:1)
-	/// Proof: `CircuitBreaker::AllowedRemoveLiquidityAmountPerAsset` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::Account` (r:0 w:1)
-	/// Proof: `Uniques::Account` (`max_values`: None, `max_size`: Some(112), added: 2587, mode: `MaxEncodedLen`)
-	/// Storage: `Omnipool::Positions` (r:0 w:1)
-	/// Proof: `Omnipool::Positions` (`max_values`: None, `max_size`: Some(100), added: 2575, mode: `MaxEncodedLen`)
-	fn add_liquidity() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `3919`
-		//  Estimated: `8739`
-		// Minimum execution time: 220_969_000 picoseconds.
-		Weight::from_parts(222_574_000, 8739)
-			.saturating_add(T::DbWeight::get().reads(20))
-			.saturating_add(T::DbWeight::get().writes(14))
-	}
-	/// Storage: `Uniques::Asset` (r:1 w:1)
-	/// Proof: `Uniques::Asset` (`max_values`: None, `max_size`: Some(146), added: 2621, mode: `MaxEncodedLen`)
-	/// Storage: `Omnipool::Positions` (r:1 w:1)
-	/// Proof: `Omnipool::Positions` (`max_values`: None, `max_size`: Some(100), added: 2575, mode: `MaxEncodedLen`)
-	/// Storage: `Omnipool::Assets` (r:1 w:1)
-	/// Proof: `Omnipool::Assets` (`max_values`: None, `max_size`: Some(85), added: 2560, mode: `MaxEncodedLen`)
-	/// Storage: `Tokens::Accounts` (r:4 w:4)
-	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
-	/// Storage: `EmaOracle::Oracles` (r:2 w:0)
-	/// Proof: `EmaOracle::Oracles` (`max_values`: None, `max_size`: Some(177), added: 2652, mode: `MaxEncodedLen`)
-	/// Storage: `Omnipool::HubAssetImbalance` (r:1 w:1)
-	/// Proof: `Omnipool::HubAssetImbalance` (`max_values`: Some(1), `max_size`: Some(17), added: 512, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:2 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:2 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `Tokens::TotalIssuance` (r:1 w:1)
-	/// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
-	/// Storage: `MultiTransactionPayment::AccountCurrencyMap` (r:1 w:1)
-	/// Proof: `MultiTransactionPayment::AccountCurrencyMap` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
-	/// Storage: `MultiTransactionPayment::AcceptedCurrencies` (r:1 w:0)
-	/// Proof: `MultiTransactionPayment::AcceptedCurrencies` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::Class` (r:1 w:1)
-	/// Proof: `Uniques::Class` (`max_values`: None, `max_size`: Some(190), added: 2665, mode: `MaxEncodedLen`)
-	/// Storage: `EmaOracle::Accumulator` (r:1 w:1)
-	/// Proof: `EmaOracle::Accumulator` (`max_values`: Some(1), `max_size`: Some(5921), added: 6416, mode: `MaxEncodedLen`)
-	/// Storage: `CircuitBreaker::LiquidityAddLimitPerAsset` (r:1 w:0)
-	/// Proof: `CircuitBreaker::LiquidityAddLimitPerAsset` (`max_values`: None, `max_size`: Some(29), added: 2504, mode: `MaxEncodedLen`)
-	/// Storage: `CircuitBreaker::AllowedAddLiquidityAmountPerAsset` (r:1 w:0)
-	/// Proof: `CircuitBreaker::AllowedAddLiquidityAmountPerAsset` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
-	/// Storage: `CircuitBreaker::LiquidityRemoveLimitPerAsset` (r:1 w:0)
-	/// Proof: `CircuitBreaker::LiquidityRemoveLimitPerAsset` (`max_values`: None, `max_size`: Some(29), added: 2504, mode: `MaxEncodedLen`)
-	/// Storage: `CircuitBreaker::AllowedRemoveLiquidityAmountPerAsset` (r:1 w:1)
-	/// Proof: `CircuitBreaker::AllowedRemoveLiquidityAmountPerAsset` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::Account` (r:0 w:1)
-	/// Proof: `Uniques::Account` (`max_values`: None, `max_size`: Some(112), added: 2587, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::ItemPriceOf` (r:0 w:1)
-	/// Proof: `Uniques::ItemPriceOf` (`max_values`: None, `max_size`: Some(113), added: 2588, mode: `MaxEncodedLen`)
-	fn remove_liquidity() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `6903`
-		//  Estimated: `11322`
-		// Minimum execution time: 297_780_000 picoseconds.
-		Weight::from_parts(299_506_000, 11322)
-			.saturating_add(T::DbWeight::get().reads(23))
-			.saturating_add(T::DbWeight::get().writes(16))
-	}
-	/// Storage: `Tokens::Accounts` (r:5 w:5)
-	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
-	/// Storage: `Omnipool::Assets` (r:3 w:3)
-	/// Proof: `Omnipool::Assets` (`max_values`: None, `max_size`: Some(85), added: 2560, mode: `MaxEncodedLen`)
-	/// Storage: `Omnipool::HubAssetImbalance` (r:1 w:1)
-	/// Proof: `Omnipool::HubAssetImbalance` (`max_values`: Some(1), `max_size`: Some(17), added: 512, mode: `MaxEncodedLen`)
-	/// Storage: `DynamicFees::AssetFee` (r:2 w:0)
-	/// Proof: `DynamicFees::AssetFee` (`max_values`: None, `max_size`: Some(24), added: 2499, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:2 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:3 w:2)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `MultiTransactionPayment::AccountCurrencyMap` (r:2 w:2)
-	/// Proof: `MultiTransactionPayment::AccountCurrencyMap` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
-	/// Storage: `MultiTransactionPayment::AcceptedCurrencies` (r:1 w:0)
-	/// Proof: `MultiTransactionPayment::AcceptedCurrencies` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
-	/// Storage: `EmaOracle::Accumulator` (r:1 w:1)
-	/// Proof: `EmaOracle::Accumulator` (`max_values`: Some(1), `max_size`: Some(5921), added: 6416, mode: `MaxEncodedLen`)
-	/// Storage: `CircuitBreaker::AllowedTradeVolumeLimitPerAsset` (r:2 w:2)
-	/// Proof: `CircuitBreaker::AllowedTradeVolumeLimitPerAsset` (`max_values`: None, `max_size`: Some(68), added: 2543, mode: `MaxEncodedLen`)
-	/// Storage: `CircuitBreaker::LiquidityAddLimitPerAsset` (r:1 w:0)
-	/// Proof: `CircuitBreaker::LiquidityAddLimitPerAsset` (`max_values`: None, `max_size`: Some(29), added: 2504, mode: `MaxEncodedLen`)
-	/// Storage: `CircuitBreaker::AllowedAddLiquidityAmountPerAsset` (r:1 w:1)
-	/// Proof: `CircuitBreaker::AllowedAddLiquidityAmountPerAsset` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
-	/// Storage: `CircuitBreaker::LiquidityRemoveLimitPerAsset` (r:1 w:0)
-	/// Proof: `CircuitBreaker::LiquidityRemoveLimitPerAsset` (`max_values`: None, `max_size`: Some(29), added: 2504, mode: `MaxEncodedLen`)
-	/// Storage: `CircuitBreaker::AllowedRemoveLiquidityAmountPerAsset` (r:1 w:0)
-	/// Proof: `CircuitBreaker::AllowedRemoveLiquidityAmountPerAsset` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
-	/// Storage: `Referrals::LinkedAccounts` (r:1 w:0)
-	/// Proof: `Referrals::LinkedAccounts` (`max_values`: None, `max_size`: Some(80), added: 2555, mode: `MaxEncodedLen`)
-	/// Storage: `Referrals::Referrer` (r:1 w:0)
-	/// Proof: `Referrals::Referrer` (`max_values`: None, `max_size`: Some(65), added: 2540, mode: `MaxEncodedLen`)
-	/// Storage: `Referrals::AssetRewards` (r:1 w:0)
-	/// Proof: `Referrals::AssetRewards` (`max_values`: None, `max_size`: Some(49), added: 2524, mode: `MaxEncodedLen`)
-	/// Storage: `Referrals::TotalShares` (r:1 w:1)
-	/// Proof: `Referrals::TotalShares` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
-	/// Storage: `Referrals::ReferrerShares` (r:1 w:1)
-	/// Proof: `Referrals::ReferrerShares` (`max_values`: None, `max_size`: Some(64), added: 2539, mode: `MaxEncodedLen`)
-	/// Storage: `Referrals::TraderShares` (r:2 w:2)
-	/// Proof: `Referrals::TraderShares` (`max_values`: None, `max_size`: Some(64), added: 2539, mode: `MaxEncodedLen`)
-	/// Storage: `Referrals::PendingConversions` (r:1 w:1)
-	/// Proof: `Referrals::PendingConversions` (`max_values`: None, `max_size`: Some(20), added: 2495, mode: `MaxEncodedLen`)
-	/// Storage: `Referrals::CounterForPendingConversions` (r:1 w:1)
-	/// Proof: `Referrals::CounterForPendingConversions` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	fn sell() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `7179`
-		//  Estimated: `13905`
-		// Minimum execution time: 333_598_000 picoseconds.
-		Weight::from_parts(336_465_000, 13905)
-			.saturating_add(T::DbWeight::get().reads(35))
-			.saturating_add(T::DbWeight::get().writes(23))
-	}
-	/// Storage: `Omnipool::Assets` (r:3 w:3)
-	/// Proof: `Omnipool::Assets` (`max_values`: None, `max_size`: Some(85), added: 2560, mode: `MaxEncodedLen`)
-	/// Storage: `Tokens::Accounts` (r:5 w:5)
-	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
-	/// Storage: `Omnipool::HubAssetImbalance` (r:1 w:1)
-	/// Proof: `Omnipool::HubAssetImbalance` (`max_values`: Some(1), `max_size`: Some(17), added: 512, mode: `MaxEncodedLen`)
-	/// Storage: `DynamicFees::AssetFee` (r:2 w:0)
-	/// Proof: `DynamicFees::AssetFee` (`max_values`: None, `max_size`: Some(24), added: 2499, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:2 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:3 w:2)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `MultiTransactionPayment::AccountCurrencyMap` (r:2 w:2)
-	/// Proof: `MultiTransactionPayment::AccountCurrencyMap` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
-	/// Storage: `MultiTransactionPayment::AcceptedCurrencies` (r:1 w:0)
-	/// Proof: `MultiTransactionPayment::AcceptedCurrencies` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
-	/// Storage: `EmaOracle::Accumulator` (r:1 w:1)
-	/// Proof: `EmaOracle::Accumulator` (`max_values`: Some(1), `max_size`: Some(5921), added: 6416, mode: `MaxEncodedLen`)
-	/// Storage: `CircuitBreaker::AllowedTradeVolumeLimitPerAsset` (r:2 w:2)
-	/// Proof: `CircuitBreaker::AllowedTradeVolumeLimitPerAsset` (`max_values`: None, `max_size`: Some(68), added: 2543, mode: `MaxEncodedLen`)
-	/// Storage: `CircuitBreaker::LiquidityAddLimitPerAsset` (r:1 w:0)
-	/// Proof: `CircuitBreaker::LiquidityAddLimitPerAsset` (`max_values`: None, `max_size`: Some(29), added: 2504, mode: `MaxEncodedLen`)
-	/// Storage: `CircuitBreaker::AllowedAddLiquidityAmountPerAsset` (r:1 w:1)
-	/// Proof: `CircuitBreaker::AllowedAddLiquidityAmountPerAsset` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
-	/// Storage: `CircuitBreaker::LiquidityRemoveLimitPerAsset` (r:1 w:0)
-	/// Proof: `CircuitBreaker::LiquidityRemoveLimitPerAsset` (`max_values`: None, `max_size`: Some(29), added: 2504, mode: `MaxEncodedLen`)
-	/// Storage: `CircuitBreaker::AllowedRemoveLiquidityAmountPerAsset` (r:1 w:0)
-	/// Proof: `CircuitBreaker::AllowedRemoveLiquidityAmountPerAsset` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
-	/// Storage: `Referrals::LinkedAccounts` (r:1 w:0)
-	/// Proof: `Referrals::LinkedAccounts` (`max_values`: None, `max_size`: Some(80), added: 2555, mode: `MaxEncodedLen`)
-	/// Storage: `Referrals::Referrer` (r:1 w:0)
-	/// Proof: `Referrals::Referrer` (`max_values`: None, `max_size`: Some(65), added: 2540, mode: `MaxEncodedLen`)
-	/// Storage: `Referrals::AssetRewards` (r:1 w:0)
-	/// Proof: `Referrals::AssetRewards` (`max_values`: None, `max_size`: Some(49), added: 2524, mode: `MaxEncodedLen`)
-	/// Storage: `Referrals::TotalShares` (r:1 w:1)
-	/// Proof: `Referrals::TotalShares` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
-	/// Storage: `Referrals::ReferrerShares` (r:1 w:1)
-	/// Proof: `Referrals::ReferrerShares` (`max_values`: None, `max_size`: Some(64), added: 2539, mode: `MaxEncodedLen`)
-	/// Storage: `Referrals::TraderShares` (r:2 w:2)
-	/// Proof: `Referrals::TraderShares` (`max_values`: None, `max_size`: Some(64), added: 2539, mode: `MaxEncodedLen`)
-	/// Storage: `Referrals::PendingConversions` (r:1 w:1)
-	/// Proof: `Referrals::PendingConversions` (`max_values`: None, `max_size`: Some(20), added: 2495, mode: `MaxEncodedLen`)
-	/// Storage: `Referrals::CounterForPendingConversions` (r:1 w:1)
-	/// Proof: `Referrals::CounterForPendingConversions` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	fn buy() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `7179`
-		//  Estimated: `13905`
-		// Minimum execution time: 333_688_000 picoseconds.
-		Weight::from_parts(335_133_000, 13905)
-			.saturating_add(T::DbWeight::get().reads(35))
-			.saturating_add(T::DbWeight::get().writes(23))
-	}
-	/// Storage: `Omnipool::Assets` (r:1 w:1)
-	/// Proof: `Omnipool::Assets` (`max_values`: None, `max_size`: Some(85), added: 2560, mode: `MaxEncodedLen`)
-	fn set_asset_tradable_state() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1305`
-		//  Estimated: `3550`
-		// Minimum execution time: 32_634_000 picoseconds.
-		Weight::from_parts(33_024_000, 3550)
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Omnipool::Assets` (r:1 w:0)
-	/// Proof: `Omnipool::Assets` (`max_values`: None, `max_size`: Some(85), added: 2560, mode: `MaxEncodedLen`)
-	/// Storage: `Tokens::Accounts` (r:2 w:2)
-	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:1 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:2 w:2)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `MultiTransactionPayment::AccountCurrencyMap` (r:1 w:1)
-	/// Proof: `MultiTransactionPayment::AccountCurrencyMap` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
-	/// Storage: `MultiTransactionPayment::AcceptedCurrencies` (r:1 w:0)
-	/// Proof: `MultiTransactionPayment::AcceptedCurrencies` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
-	fn refund_refused_asset() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `2336`
-		//  Estimated: `6196`
-		// Minimum execution time: 107_435_000 picoseconds.
-		Weight::from_parts(108_211_000, 6196)
-			.saturating_add(T::DbWeight::get().reads(8))
-			.saturating_add(T::DbWeight::get().writes(5))
-	}
-	/// Storage: `Omnipool::Positions` (r:1 w:1)
-	/// Proof: `Omnipool::Positions` (`max_values`: None, `max_size`: Some(100), added: 2575, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::Asset` (r:1 w:1)
-	/// Proof: `Uniques::Asset` (`max_values`: None, `max_size`: Some(146), added: 2621, mode: `MaxEncodedLen`)
-	/// Storage: `Omnipool::Assets` (r:1 w:1)
-	/// Proof: `Omnipool::Assets` (`max_values`: None, `max_size`: Some(85), added: 2560, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::Class` (r:1 w:1)
-	/// Proof: `Uniques::Class` (`max_values`: None, `max_size`: Some(190), added: 2665, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::Account` (r:0 w:1)
-	/// Proof: `Uniques::Account` (`max_values`: None, `max_size`: Some(112), added: 2587, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::ItemPriceOf` (r:0 w:1)
-	/// Proof: `Uniques::ItemPriceOf` (`max_values`: None, `max_size`: Some(113), added: 2588, mode: `MaxEncodedLen`)
-	fn sacrifice_position() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `2876`
-		//  Estimated: `3655`
-		// Minimum execution time: 75_289_000 picoseconds.
-		Weight::from_parts(76_090_000, 3655)
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(6))
-	}
-	/// Storage: `Omnipool::Assets` (r:1 w:1)
-	/// Proof: `Omnipool::Assets` (`max_values`: None, `max_size`: Some(85), added: 2560, mode: `MaxEncodedLen`)
-	fn set_asset_weight_cap() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1305`
-		//  Estimated: `3550`
-		// Minimum execution time: 32_857_000 picoseconds.
-		Weight::from_parts(33_349_000, 3550)
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Omnipool::Assets` (r:1 w:1)
-	/// Proof: `Omnipool::Assets` (`max_values`: None, `max_size`: Some(85), added: 2560, mode: `MaxEncodedLen`)
-	/// Storage: `Tokens::Accounts` (r:3 w:3)
-	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
-	/// Storage: `Omnipool::HubAssetImbalance` (r:1 w:1)
-	/// Proof: `Omnipool::HubAssetImbalance` (`max_values`: Some(1), `max_size`: Some(17), added: 512, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:2 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:2 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `MultiTransactionPayment::AccountCurrencyMap` (r:1 w:0)
-	/// Proof: `MultiTransactionPayment::AccountCurrencyMap` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
-	/// Storage: `MultiTransactionPayment::AcceptedCurrencies` (r:1 w:0)
-	/// Proof: `MultiTransactionPayment::AcceptedCurrencies` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
-	/// Storage: `Tokens::TotalIssuance` (r:1 w:1)
-	/// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
-	/// Storage: `EmaOracle::Accumulator` (r:1 w:1)
-	/// Proof: `EmaOracle::Accumulator` (`max_values`: Some(1), `max_size`: Some(5921), added: 6416, mode: `MaxEncodedLen`)
-	fn withdraw_protocol_liquidity() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `4019`
-		//  Estimated: `8739`
-		// Minimum execution time: 161_313_000 picoseconds.
-		Weight::from_parts(162_354_000, 8739)
-			.saturating_add(T::DbWeight::get().reads(13))
-			.saturating_add(T::DbWeight::get().writes(8))
-	}
-	/// Storage: `Omnipool::Assets` (r:1 w:1)
-	/// Proof: `Omnipool::Assets` (`max_values`: None, `max_size`: Some(85), added: 2560, mode: `MaxEncodedLen`)
-	/// Storage: `Tokens::Accounts` (r:4 w:3)
-	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
-	/// Storage: `Omnipool::HubAssetImbalance` (r:1 w:1)
-	/// Proof: `Omnipool::HubAssetImbalance` (`max_values`: Some(1), `max_size`: Some(17), added: 512, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:2 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
-	/// Storage: `Tokens::TotalIssuance` (r:1 w:1)
-	/// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:2 w:2)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `MultiTransactionPayment::AccountCurrencyMap` (r:2 w:0)
-	/// Proof: `MultiTransactionPayment::AccountCurrencyMap` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
-	/// Storage: `MultiTransactionPayment::AcceptedCurrencies` (r:1 w:0)
-	/// Proof: `MultiTransactionPayment::AcceptedCurrencies` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
-	fn remove_token() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `3110`
-		//  Estimated: `11322`
-		// Minimum execution time: 160_104_000 picoseconds.
-		Weight::from_parts(161_947_000, 11322)
-			.saturating_add(T::DbWeight::get().reads(14))
-			.saturating_add(T::DbWeight::get().writes(8))
-	}
-	/// Storage: `Omnipool::Assets` (r:3 w:3)
-	/// Proof: `Omnipool::Assets` (`max_values`: None, `max_size`: Some(85), added: 2560, mode: `MaxEncodedLen`)
-	/// Storage: `Tokens::Accounts` (r:5 w:5)
-	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
-	/// Storage: `Omnipool::HubAssetImbalance` (r:1 w:1)
-	/// Proof: `Omnipool::HubAssetImbalance` (`max_values`: Some(1), `max_size`: Some(17), added: 512, mode: `MaxEncodedLen`)
-	/// Storage: `DynamicFees::AssetFee` (r:2 w:0)
-	/// Proof: `DynamicFees::AssetFee` (`max_values`: None, `max_size`: Some(24), added: 2499, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:2 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:3 w:2)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `MultiTransactionPayment::AccountCurrencyMap` (r:2 w:2)
-	/// Proof: `MultiTransactionPayment::AccountCurrencyMap` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
-	/// Storage: `MultiTransactionPayment::AcceptedCurrencies` (r:1 w:0)
-	/// Proof: `MultiTransactionPayment::AcceptedCurrencies` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
-	/// Storage: `EmaOracle::Accumulator` (r:1 w:1)
-	/// Proof: `EmaOracle::Accumulator` (`max_values`: Some(1), `max_size`: Some(5921), added: 6416, mode: `MaxEncodedLen`)
-	/// Storage: `CircuitBreaker::AllowedTradeVolumeLimitPerAsset` (r:2 w:2)
-	/// Proof: `CircuitBreaker::AllowedTradeVolumeLimitPerAsset` (`max_values`: None, `max_size`: Some(68), added: 2543, mode: `MaxEncodedLen`)
-	/// Storage: `CircuitBreaker::LiquidityAddLimitPerAsset` (r:1 w:0)
-	/// Proof: `CircuitBreaker::LiquidityAddLimitPerAsset` (`max_values`: None, `max_size`: Some(29), added: 2504, mode: `MaxEncodedLen`)
-	/// Storage: `CircuitBreaker::AllowedAddLiquidityAmountPerAsset` (r:1 w:1)
-	/// Proof: `CircuitBreaker::AllowedAddLiquidityAmountPerAsset` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
-	/// Storage: `CircuitBreaker::LiquidityRemoveLimitPerAsset` (r:1 w:0)
-	/// Proof: `CircuitBreaker::LiquidityRemoveLimitPerAsset` (`max_values`: None, `max_size`: Some(29), added: 2504, mode: `MaxEncodedLen`)
-	/// Storage: `CircuitBreaker::AllowedRemoveLiquidityAmountPerAsset` (r:1 w:0)
-	/// Proof: `CircuitBreaker::AllowedRemoveLiquidityAmountPerAsset` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
-	/// Storage: `Referrals::LinkedAccounts` (r:1 w:0)
-	/// Proof: `Referrals::LinkedAccounts` (`max_values`: None, `max_size`: Some(80), added: 2555, mode: `MaxEncodedLen`)
-	/// Storage: `Referrals::AssetRewards` (r:1 w:0)
-	/// Proof: `Referrals::AssetRewards` (`max_values`: None, `max_size`: Some(49), added: 2524, mode: `MaxEncodedLen`)
-	/// Storage: `Referrals::TotalShares` (r:1 w:1)
-	/// Proof: `Referrals::TotalShares` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
-	/// Storage: `Referrals::TraderShares` (r:2 w:2)
-	/// Proof: `Referrals::TraderShares` (`max_values`: None, `max_size`: Some(64), added: 2539, mode: `MaxEncodedLen`)
-	/// Storage: `Referrals::PendingConversions` (r:1 w:1)
-	/// Proof: `Referrals::PendingConversions` (`max_values`: None, `max_size`: Some(20), added: 2495, mode: `MaxEncodedLen`)
-	/// Storage: `Referrals::CounterForPendingConversions` (r:1 w:1)
-	/// Proof: `Referrals::CounterForPendingConversions` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	/// The range of component `c` is `[1, 2]`.
-	/// The range of component `e` is `[0, 1]`.
-	fn router_execution_sell(c: u32, e: u32) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1974 + e * (4788 ±0)`
-		//  Estimated: `6156 + e * (7749 ±0)`
-		// Minimum execution time: 48_705_000 picoseconds.
-		Weight::from_parts(49_088_855, 6156)
-			// Standard Error: 97_412
-			.saturating_add(Weight::from_parts(321_546, 0).saturating_mul(c.into()))
-			// Standard Error: 97_412
-			.saturating_add(Weight::from_parts(291_861_384, 0).saturating_mul(e.into()))
-			.saturating_add(T::DbWeight::get().reads(7))
-			.saturating_add(T::DbWeight::get().reads((26_u64).saturating_mul(e.into())))
-			.saturating_add(T::DbWeight::get().writes((22_u64).saturating_mul(e.into())))
-			.saturating_add(Weight::from_parts(0, 7749).saturating_mul(e.into()))
-	}
-	/// Storage: `Omnipool::Assets` (r:3 w:3)
-	/// Proof: `Omnipool::Assets` (`max_values`: None, `max_size`: Some(85), added: 2560, mode: `MaxEncodedLen`)
-	/// Storage: `Tokens::Accounts` (r:5 w:5)
-	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
-	/// Storage: `Omnipool::HubAssetImbalance` (r:1 w:1)
-	/// Proof: `Omnipool::HubAssetImbalance` (`max_values`: Some(1), `max_size`: Some(17), added: 512, mode: `MaxEncodedLen`)
-	/// Storage: `DynamicFees::AssetFee` (r:2 w:0)
-	/// Proof: `DynamicFees::AssetFee` (`max_values`: None, `max_size`: Some(24), added: 2499, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:2 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:3 w:2)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `MultiTransactionPayment::AccountCurrencyMap` (r:2 w:2)
-	/// Proof: `MultiTransactionPayment::AccountCurrencyMap` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
-	/// Storage: `MultiTransactionPayment::AcceptedCurrencies` (r:1 w:0)
-	/// Proof: `MultiTransactionPayment::AcceptedCurrencies` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
-	/// Storage: `EmaOracle::Accumulator` (r:1 w:1)
-	/// Proof: `EmaOracle::Accumulator` (`max_values`: Some(1), `max_size`: Some(5921), added: 6416, mode: `MaxEncodedLen`)
-	/// Storage: `CircuitBreaker::AllowedTradeVolumeLimitPerAsset` (r:2 w:2)
-	/// Proof: `CircuitBreaker::AllowedTradeVolumeLimitPerAsset` (`max_values`: None, `max_size`: Some(68), added: 2543, mode: `MaxEncodedLen`)
-	/// Storage: `CircuitBreaker::LiquidityAddLimitPerAsset` (r:1 w:0)
-	/// Proof: `CircuitBreaker::LiquidityAddLimitPerAsset` (`max_values`: None, `max_size`: Some(29), added: 2504, mode: `MaxEncodedLen`)
-	/// Storage: `CircuitBreaker::AllowedAddLiquidityAmountPerAsset` (r:1 w:1)
-	/// Proof: `CircuitBreaker::AllowedAddLiquidityAmountPerAsset` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
-	/// Storage: `CircuitBreaker::LiquidityRemoveLimitPerAsset` (r:1 w:0)
-	/// Proof: `CircuitBreaker::LiquidityRemoveLimitPerAsset` (`max_values`: None, `max_size`: Some(29), added: 2504, mode: `MaxEncodedLen`)
-	/// Storage: `CircuitBreaker::AllowedRemoveLiquidityAmountPerAsset` (r:1 w:0)
-	/// Proof: `CircuitBreaker::AllowedRemoveLiquidityAmountPerAsset` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
-	/// Storage: `Referrals::LinkedAccounts` (r:1 w:0)
-	/// Proof: `Referrals::LinkedAccounts` (`max_values`: None, `max_size`: Some(80), added: 2555, mode: `MaxEncodedLen`)
-	/// Storage: `Referrals::AssetRewards` (r:1 w:0)
-	/// Proof: `Referrals::AssetRewards` (`max_values`: None, `max_size`: Some(49), added: 2524, mode: `MaxEncodedLen`)
-	/// Storage: `Referrals::TotalShares` (r:1 w:1)
-	/// Proof: `Referrals::TotalShares` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
-	/// Storage: `Referrals::TraderShares` (r:2 w:2)
-	/// Proof: `Referrals::TraderShares` (`max_values`: None, `max_size`: Some(64), added: 2539, mode: `MaxEncodedLen`)
-	/// Storage: `Referrals::PendingConversions` (r:1 w:1)
-	/// Proof: `Referrals::PendingConversions` (`max_values`: None, `max_size`: Some(20), added: 2495, mode: `MaxEncodedLen`)
-	/// Storage: `Referrals::CounterForPendingConversions` (r:1 w:1)
-	/// Proof: `Referrals::CounterForPendingConversions` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	/// The range of component `c` is `[1, 2]`.
-	/// The range of component `e` is `[0, 1]`.
-	fn router_execution_buy(c: u32, e: u32) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `6762`
-		//  Estimated: `13905`
-		// Minimum execution time: 325_047_000 picoseconds.
-		Weight::from_parts(309_584_818, 13905)
-			// Standard Error: 196_245
-			.saturating_add(Weight::from_parts(16_694_995, 0).saturating_mul(c.into()))
-			// Standard Error: 196_245
-			.saturating_add(Weight::from_parts(1_594_024, 0).saturating_mul(e.into()))
-			.saturating_add(T::DbWeight::get().reads(33))
-			.saturating_add(T::DbWeight::get().writes(22))
-	}
-}
-
-// For backwards compatibility and tests
 impl WeightInfo for () {
 	/// Storage: `Omnipool::Assets` (r:1 w:1)
 	/// Proof: `Omnipool::Assets` (`max_values`: None, `max_size`: Some(85), added: 2560, mode: `MaxEncodedLen`)
 	/// Storage: `AssetRegistry::Assets` (r:2 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
+	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
 	/// Storage: `Uniques::Class` (r:1 w:1)
 	/// Proof: `Uniques::Class` (`max_values`: None, `max_size`: Some(190), added: 2665, mode: `MaxEncodedLen`)
 	/// Storage: `Tokens::Accounts` (r:2 w:1)
@@ -547,6 +87,8 @@ impl WeightInfo for () {
 	/// Proof: `Uniques::CollectionMaxSupply` (`max_values`: None, `max_size`: Some(36), added: 2511, mode: `MaxEncodedLen`)
 	/// Storage: `Omnipool::HubAssetImbalance` (r:1 w:1)
 	/// Proof: `Omnipool::HubAssetImbalance` (`max_values`: Some(1), `max_size`: Some(17), added: 512, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::BannedAssets` (r:1 w:0)
+	/// Proof: `AssetRegistry::BannedAssets` (`max_values`: None, `max_size`: Some(20), added: 2495, mode: `MaxEncodedLen`)
 	/// Storage: `Tokens::TotalIssuance` (r:1 w:1)
 	/// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
 	/// Storage: `EmaOracle::Accumulator` (r:1 w:1)
@@ -557,12 +99,12 @@ impl WeightInfo for () {
 	/// Proof: `Omnipool::Positions` (`max_values`: None, `max_size`: Some(100), added: 2575, mode: `MaxEncodedLen`)
 	fn add_token() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3004`
+		//  Measured:  `3132`
 		//  Estimated: `7406`
-		// Minimum execution time: 141_394_000 picoseconds.
-		Weight::from_parts(142_349_000, 7406)
-			.saturating_add(RocksDbWeight::get().reads(12))
-			.saturating_add(RocksDbWeight::get().writes(10))
+		// Minimum execution time: 129_176_000 picoseconds.
+		Weight::from_parts(130_298_000, 7406)
+			.saturating_add(RocksDbWeight::get().reads(13_u64))
+			.saturating_add(RocksDbWeight::get().writes(10_u64))
 	}
 	/// Storage: `Tokens::Accounts` (r:3 w:3)
 	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
@@ -580,8 +122,12 @@ impl WeightInfo for () {
 	/// Proof: `Uniques::Class` (`max_values`: None, `max_size`: Some(190), added: 2665, mode: `MaxEncodedLen`)
 	/// Storage: `Uniques::CollectionMaxSupply` (r:1 w:0)
 	/// Proof: `Uniques::CollectionMaxSupply` (`max_values`: None, `max_size`: Some(36), added: 2511, mode: `MaxEncodedLen`)
+	/// Storage: `Duster::AccountBlacklist` (r:1 w:0)
+	/// Proof: `Duster::AccountBlacklist` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::BannedAssets` (r:2 w:0)
+	/// Proof: `AssetRegistry::BannedAssets` (`max_values`: None, `max_size`: Some(20), added: 2495, mode: `MaxEncodedLen`)
 	/// Storage: `AssetRegistry::Assets` (r:2 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
+	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
 	/// Storage: `System::Account` (r:1 w:0)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	/// Storage: `Tokens::TotalIssuance` (r:1 w:1)
@@ -602,12 +148,12 @@ impl WeightInfo for () {
 	/// Proof: `Omnipool::Positions` (`max_values`: None, `max_size`: Some(100), added: 2575, mode: `MaxEncodedLen`)
 	fn add_liquidity() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3919`
+		//  Measured:  `4348`
 		//  Estimated: `8739`
-		// Minimum execution time: 220_969_000 picoseconds.
-		Weight::from_parts(222_574_000, 8739)
-			.saturating_add(RocksDbWeight::get().reads(20))
-			.saturating_add(RocksDbWeight::get().writes(14))
+		// Minimum execution time: 204_599_000 picoseconds.
+		Weight::from_parts(205_728_000, 8739)
+			.saturating_add(RocksDbWeight::get().reads(23_u64))
+			.saturating_add(RocksDbWeight::get().writes(14_u64))
 	}
 	/// Storage: `Uniques::Asset` (r:1 w:1)
 	/// Proof: `Uniques::Asset` (`max_values`: None, `max_size`: Some(146), added: 2621, mode: `MaxEncodedLen`)
@@ -621,8 +167,12 @@ impl WeightInfo for () {
 	/// Proof: `EmaOracle::Oracles` (`max_values`: None, `max_size`: Some(177), added: 2652, mode: `MaxEncodedLen`)
 	/// Storage: `Omnipool::HubAssetImbalance` (r:1 w:1)
 	/// Proof: `Omnipool::HubAssetImbalance` (`max_values`: Some(1), `max_size`: Some(17), added: 512, mode: `MaxEncodedLen`)
+	/// Storage: `Duster::AccountBlacklist` (r:1 w:0)
+	/// Proof: `Duster::AccountBlacklist` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::BannedAssets` (r:2 w:0)
+	/// Proof: `AssetRegistry::BannedAssets` (`max_values`: None, `max_size`: Some(20), added: 2495, mode: `MaxEncodedLen`)
 	/// Storage: `AssetRegistry::Assets` (r:2 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
+	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
 	/// Storage: `System::Account` (r:2 w:1)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	/// Storage: `Tokens::TotalIssuance` (r:1 w:1)
@@ -649,12 +199,12 @@ impl WeightInfo for () {
 	/// Proof: `Uniques::ItemPriceOf` (`max_values`: None, `max_size`: Some(113), added: 2588, mode: `MaxEncodedLen`)
 	fn remove_liquidity() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `6903`
+		//  Measured:  `7259`
 		//  Estimated: `11322`
-		// Minimum execution time: 297_780_000 picoseconds.
-		Weight::from_parts(299_506_000, 11322)
-			.saturating_add(RocksDbWeight::get().reads(23))
-			.saturating_add(RocksDbWeight::get().writes(16))
+		// Minimum execution time: 275_044_000 picoseconds.
+		Weight::from_parts(276_562_000, 11322)
+			.saturating_add(RocksDbWeight::get().reads(26_u64))
+			.saturating_add(RocksDbWeight::get().writes(16_u64))
 	}
 	/// Storage: `Tokens::Accounts` (r:5 w:5)
 	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
@@ -664,8 +214,12 @@ impl WeightInfo for () {
 	/// Proof: `Omnipool::HubAssetImbalance` (`max_values`: Some(1), `max_size`: Some(17), added: 512, mode: `MaxEncodedLen`)
 	/// Storage: `DynamicFees::AssetFee` (r:2 w:0)
 	/// Proof: `DynamicFees::AssetFee` (`max_values`: None, `max_size`: Some(24), added: 2499, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:2 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
+	/// Storage: `Duster::AccountBlacklist` (r:2 w:0)
+	/// Proof: `Duster::AccountBlacklist` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::BannedAssets` (r:2 w:0)
+	/// Proof: `AssetRegistry::BannedAssets` (`max_values`: None, `max_size`: Some(20), added: 2495, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::Assets` (r:4 w:0)
+	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
 	/// Storage: `System::Account` (r:3 w:2)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	/// Storage: `MultiTransactionPayment::AccountCurrencyMap` (r:2 w:2)
@@ -702,12 +256,12 @@ impl WeightInfo for () {
 	/// Proof: `Referrals::CounterForPendingConversions` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	fn sell() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `7179`
+		//  Measured:  `7619`
 		//  Estimated: `13905`
-		// Minimum execution time: 333_598_000 picoseconds.
-		Weight::from_parts(336_465_000, 13905)
-			.saturating_add(RocksDbWeight::get().reads(35))
-			.saturating_add(RocksDbWeight::get().writes(23))
+		// Minimum execution time: 327_772_000 picoseconds.
+		Weight::from_parts(329_562_000, 13905)
+			.saturating_add(RocksDbWeight::get().reads(41_u64))
+			.saturating_add(RocksDbWeight::get().writes(23_u64))
 	}
 	/// Storage: `Omnipool::Assets` (r:3 w:3)
 	/// Proof: `Omnipool::Assets` (`max_values`: None, `max_size`: Some(85), added: 2560, mode: `MaxEncodedLen`)
@@ -717,8 +271,12 @@ impl WeightInfo for () {
 	/// Proof: `Omnipool::HubAssetImbalance` (`max_values`: Some(1), `max_size`: Some(17), added: 512, mode: `MaxEncodedLen`)
 	/// Storage: `DynamicFees::AssetFee` (r:2 w:0)
 	/// Proof: `DynamicFees::AssetFee` (`max_values`: None, `max_size`: Some(24), added: 2499, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:2 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
+	/// Storage: `Duster::AccountBlacklist` (r:2 w:0)
+	/// Proof: `Duster::AccountBlacklist` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::BannedAssets` (r:2 w:0)
+	/// Proof: `AssetRegistry::BannedAssets` (`max_values`: None, `max_size`: Some(20), added: 2495, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::Assets` (r:4 w:0)
+	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
 	/// Storage: `System::Account` (r:3 w:2)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	/// Storage: `MultiTransactionPayment::AccountCurrencyMap` (r:2 w:2)
@@ -755,30 +313,34 @@ impl WeightInfo for () {
 	/// Proof: `Referrals::CounterForPendingConversions` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	fn buy() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `7179`
+		//  Measured:  `7619`
 		//  Estimated: `13905`
-		// Minimum execution time: 333_688_000 picoseconds.
-		Weight::from_parts(335_133_000, 13905)
-			.saturating_add(RocksDbWeight::get().reads(35))
-			.saturating_add(RocksDbWeight::get().writes(23))
+		// Minimum execution time: 327_371_000 picoseconds.
+		Weight::from_parts(328_952_000, 13905)
+			.saturating_add(RocksDbWeight::get().reads(41_u64))
+			.saturating_add(RocksDbWeight::get().writes(23_u64))
 	}
 	/// Storage: `Omnipool::Assets` (r:1 w:1)
 	/// Proof: `Omnipool::Assets` (`max_values`: None, `max_size`: Some(85), added: 2560, mode: `MaxEncodedLen`)
 	fn set_asset_tradable_state() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1305`
+		//  Measured:  `1309`
 		//  Estimated: `3550`
-		// Minimum execution time: 32_634_000 picoseconds.
-		Weight::from_parts(33_024_000, 3550)
-			.saturating_add(RocksDbWeight::get().reads(1))
-			.saturating_add(RocksDbWeight::get().writes(1))
+		// Minimum execution time: 27_719_000 picoseconds.
+		Weight::from_parts(28_329_000, 3550)
+			.saturating_add(RocksDbWeight::get().reads(1_u64))
+			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
 	/// Storage: `Omnipool::Assets` (r:1 w:0)
 	/// Proof: `Omnipool::Assets` (`max_values`: None, `max_size`: Some(85), added: 2560, mode: `MaxEncodedLen`)
 	/// Storage: `Tokens::Accounts` (r:2 w:2)
 	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
+	/// Storage: `Duster::AccountBlacklist` (r:1 w:0)
+	/// Proof: `Duster::AccountBlacklist` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::BannedAssets` (r:1 w:0)
+	/// Proof: `AssetRegistry::BannedAssets` (`max_values`: None, `max_size`: Some(20), added: 2495, mode: `MaxEncodedLen`)
 	/// Storage: `AssetRegistry::Assets` (r:1 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
+	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
 	/// Storage: `System::Account` (r:2 w:2)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	/// Storage: `MultiTransactionPayment::AccountCurrencyMap` (r:1 w:1)
@@ -787,12 +349,12 @@ impl WeightInfo for () {
 	/// Proof: `MultiTransactionPayment::AcceptedCurrencies` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
 	fn refund_refused_asset() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2336`
+		//  Measured:  `2646`
 		//  Estimated: `6196`
-		// Minimum execution time: 107_435_000 picoseconds.
-		Weight::from_parts(108_211_000, 6196)
-			.saturating_add(RocksDbWeight::get().reads(8))
-			.saturating_add(RocksDbWeight::get().writes(5))
+		// Minimum execution time: 99_820_000 picoseconds.
+		Weight::from_parts(100_687_000, 6196)
+			.saturating_add(RocksDbWeight::get().reads(10_u64))
+			.saturating_add(RocksDbWeight::get().writes(5_u64))
 	}
 	/// Storage: `Omnipool::Positions` (r:1 w:1)
 	/// Proof: `Omnipool::Positions` (`max_values`: None, `max_size`: Some(100), added: 2575, mode: `MaxEncodedLen`)
@@ -808,23 +370,23 @@ impl WeightInfo for () {
 	/// Proof: `Uniques::ItemPriceOf` (`max_values`: None, `max_size`: Some(113), added: 2588, mode: `MaxEncodedLen`)
 	fn sacrifice_position() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2876`
+		//  Measured:  `2914`
 		//  Estimated: `3655`
-		// Minimum execution time: 75_289_000 picoseconds.
-		Weight::from_parts(76_090_000, 3655)
-			.saturating_add(RocksDbWeight::get().reads(4))
-			.saturating_add(RocksDbWeight::get().writes(6))
+		// Minimum execution time: 66_207_000 picoseconds.
+		Weight::from_parts(66_955_000, 3655)
+			.saturating_add(RocksDbWeight::get().reads(4_u64))
+			.saturating_add(RocksDbWeight::get().writes(6_u64))
 	}
 	/// Storage: `Omnipool::Assets` (r:1 w:1)
 	/// Proof: `Omnipool::Assets` (`max_values`: None, `max_size`: Some(85), added: 2560, mode: `MaxEncodedLen`)
 	fn set_asset_weight_cap() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1305`
+		//  Measured:  `1309`
 		//  Estimated: `3550`
-		// Minimum execution time: 32_857_000 picoseconds.
-		Weight::from_parts(33_349_000, 3550)
-			.saturating_add(RocksDbWeight::get().reads(1))
-			.saturating_add(RocksDbWeight::get().writes(1))
+		// Minimum execution time: 28_043_000 picoseconds.
+		Weight::from_parts(28_560_000, 3550)
+			.saturating_add(RocksDbWeight::get().reads(1_u64))
+			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
 	/// Storage: `Omnipool::Assets` (r:1 w:1)
 	/// Proof: `Omnipool::Assets` (`max_values`: None, `max_size`: Some(85), added: 2560, mode: `MaxEncodedLen`)
@@ -832,8 +394,12 @@ impl WeightInfo for () {
 	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
 	/// Storage: `Omnipool::HubAssetImbalance` (r:1 w:1)
 	/// Proof: `Omnipool::HubAssetImbalance` (`max_values`: Some(1), `max_size`: Some(17), added: 512, mode: `MaxEncodedLen`)
+	/// Storage: `Duster::AccountBlacklist` (r:1 w:0)
+	/// Proof: `Duster::AccountBlacklist` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::BannedAssets` (r:1 w:0)
+	/// Proof: `AssetRegistry::BannedAssets` (`max_values`: None, `max_size`: Some(20), added: 2495, mode: `MaxEncodedLen`)
 	/// Storage: `AssetRegistry::Assets` (r:2 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
+	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
 	/// Storage: `System::Account` (r:2 w:1)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	/// Storage: `MultiTransactionPayment::AccountCurrencyMap` (r:1 w:0)
@@ -846,12 +412,12 @@ impl WeightInfo for () {
 	/// Proof: `EmaOracle::Accumulator` (`max_values`: Some(1), `max_size`: Some(5921), added: 6416, mode: `MaxEncodedLen`)
 	fn withdraw_protocol_liquidity() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `4019`
+		//  Measured:  `4341`
 		//  Estimated: `8739`
-		// Minimum execution time: 161_313_000 picoseconds.
-		Weight::from_parts(162_354_000, 8739)
-			.saturating_add(RocksDbWeight::get().reads(13))
-			.saturating_add(RocksDbWeight::get().writes(8))
+		// Minimum execution time: 146_266_000 picoseconds.
+		Weight::from_parts(147_681_000, 8739)
+			.saturating_add(RocksDbWeight::get().reads(15_u64))
+			.saturating_add(RocksDbWeight::get().writes(8_u64))
 	}
 	/// Storage: `Omnipool::Assets` (r:1 w:1)
 	/// Proof: `Omnipool::Assets` (`max_values`: None, `max_size`: Some(85), added: 2560, mode: `MaxEncodedLen`)
@@ -860,9 +426,13 @@ impl WeightInfo for () {
 	/// Storage: `Omnipool::HubAssetImbalance` (r:1 w:1)
 	/// Proof: `Omnipool::HubAssetImbalance` (`max_values`: Some(1), `max_size`: Some(17), added: 512, mode: `MaxEncodedLen`)
 	/// Storage: `AssetRegistry::Assets` (r:2 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
+	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
 	/// Storage: `Tokens::TotalIssuance` (r:1 w:1)
 	/// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
+	/// Storage: `Duster::AccountBlacklist` (r:1 w:0)
+	/// Proof: `Duster::AccountBlacklist` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::BannedAssets` (r:1 w:0)
+	/// Proof: `AssetRegistry::BannedAssets` (`max_values`: None, `max_size`: Some(20), added: 2495, mode: `MaxEncodedLen`)
 	/// Storage: `System::Account` (r:2 w:2)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	/// Storage: `MultiTransactionPayment::AccountCurrencyMap` (r:2 w:0)
@@ -871,12 +441,12 @@ impl WeightInfo for () {
 	/// Proof: `MultiTransactionPayment::AcceptedCurrencies` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
 	fn remove_token() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3110`
+		//  Measured:  `3432`
 		//  Estimated: `11322`
-		// Minimum execution time: 160_104_000 picoseconds.
-		Weight::from_parts(161_947_000, 11322)
-			.saturating_add(RocksDbWeight::get().reads(14))
-			.saturating_add(RocksDbWeight::get().writes(8))
+		// Minimum execution time: 145_092_000 picoseconds.
+		Weight::from_parts(146_152_000, 11322)
+			.saturating_add(RocksDbWeight::get().reads(16_u64))
+			.saturating_add(RocksDbWeight::get().writes(8_u64))
 	}
 	/// Storage: `Omnipool::Assets` (r:3 w:3)
 	/// Proof: `Omnipool::Assets` (`max_values`: None, `max_size`: Some(85), added: 2560, mode: `MaxEncodedLen`)
@@ -886,8 +456,12 @@ impl WeightInfo for () {
 	/// Proof: `Omnipool::HubAssetImbalance` (`max_values`: Some(1), `max_size`: Some(17), added: 512, mode: `MaxEncodedLen`)
 	/// Storage: `DynamicFees::AssetFee` (r:2 w:0)
 	/// Proof: `DynamicFees::AssetFee` (`max_values`: None, `max_size`: Some(24), added: 2499, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:2 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
+	/// Storage: `Duster::AccountBlacklist` (r:2 w:0)
+	/// Proof: `Duster::AccountBlacklist` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::BannedAssets` (r:2 w:0)
+	/// Proof: `AssetRegistry::BannedAssets` (`max_values`: None, `max_size`: Some(20), added: 2495, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::Assets` (r:4 w:0)
+	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
 	/// Storage: `System::Account` (r:3 w:2)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	/// Storage: `MultiTransactionPayment::AccountCurrencyMap` (r:2 w:2)
@@ -912,7 +486,7 @@ impl WeightInfo for () {
 	/// Proof: `Referrals::AssetRewards` (`max_values`: None, `max_size`: Some(49), added: 2524, mode: `MaxEncodedLen`)
 	/// Storage: `Referrals::TotalShares` (r:1 w:1)
 	/// Proof: `Referrals::TotalShares` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
-	/// Storage: `Referrals::TraderShares` (r:2 w:2)
+	/// Storage: `Referrals::TraderShares` (r:1 w:1)
 	/// Proof: `Referrals::TraderShares` (`max_values`: None, `max_size`: Some(64), added: 2539, mode: `MaxEncodedLen`)
 	/// Storage: `Referrals::PendingConversions` (r:1 w:1)
 	/// Proof: `Referrals::PendingConversions` (`max_values`: None, `max_size`: Some(20), added: 2495, mode: `MaxEncodedLen`)
@@ -920,19 +494,17 @@ impl WeightInfo for () {
 	/// Proof: `Referrals::CounterForPendingConversions` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	/// The range of component `c` is `[1, 2]`.
 	/// The range of component `e` is `[0, 1]`.
-	fn router_execution_sell(c: u32, e: u32) -> Weight {
+	fn router_execution_sell(_c: u32, e: u32) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1974 + e * (4788 ±0)`
-		//  Estimated: `6156 + e * (7749 ±0)`
-		// Minimum execution time: 48_705_000 picoseconds.
-		Weight::from_parts(49_088_855, 6156)
-			// Standard Error: 97_412
-			.saturating_add(Weight::from_parts(321_546, 0).saturating_mul(c.into()))
-			// Standard Error: 97_412
-			.saturating_add(Weight::from_parts(291_861_384, 0).saturating_mul(e.into()))
-			.saturating_add(RocksDbWeight::get().reads(7))
-			.saturating_add(RocksDbWeight::get().reads((26_u64).saturating_mul(e.into())))
-			.saturating_add(RocksDbWeight::get().writes((22_u64).saturating_mul(e.into())))
+		//  Measured:  `1978 + e * (5140 ±0)`
+		//  Estimated: `11390 + e * (7749 ±0)`
+		// Minimum execution time: 44_566_000 picoseconds.
+		Weight::from_parts(46_051_604, 11390)
+			// Standard Error: 113_379
+			.saturating_add(Weight::from_parts(283_478_583, 0).saturating_mul(e.into()))
+			.saturating_add(RocksDbWeight::get().reads(7_u64))
+			.saturating_add(RocksDbWeight::get().reads((31_u64).saturating_mul(e.into())))
+			.saturating_add(RocksDbWeight::get().writes((21_u64).saturating_mul(e.into())))
 			.saturating_add(Weight::from_parts(0, 7749).saturating_mul(e.into()))
 	}
 	/// Storage: `Omnipool::Assets` (r:3 w:3)
@@ -943,8 +515,12 @@ impl WeightInfo for () {
 	/// Proof: `Omnipool::HubAssetImbalance` (`max_values`: Some(1), `max_size`: Some(17), added: 512, mode: `MaxEncodedLen`)
 	/// Storage: `DynamicFees::AssetFee` (r:2 w:0)
 	/// Proof: `DynamicFees::AssetFee` (`max_values`: None, `max_size`: Some(24), added: 2499, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:2 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
+	/// Storage: `Duster::AccountBlacklist` (r:2 w:0)
+	/// Proof: `Duster::AccountBlacklist` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::BannedAssets` (r:2 w:0)
+	/// Proof: `AssetRegistry::BannedAssets` (`max_values`: None, `max_size`: Some(20), added: 2495, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::Assets` (r:4 w:0)
+	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
 	/// Storage: `System::Account` (r:3 w:2)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	/// Storage: `MultiTransactionPayment::AccountCurrencyMap` (r:2 w:2)
@@ -969,7 +545,7 @@ impl WeightInfo for () {
 	/// Proof: `Referrals::AssetRewards` (`max_values`: None, `max_size`: Some(49), added: 2524, mode: `MaxEncodedLen`)
 	/// Storage: `Referrals::TotalShares` (r:1 w:1)
 	/// Proof: `Referrals::TotalShares` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
-	/// Storage: `Referrals::TraderShares` (r:2 w:2)
+	/// Storage: `Referrals::TraderShares` (r:1 w:1)
 	/// Proof: `Referrals::TraderShares` (`max_values`: None, `max_size`: Some(64), added: 2539, mode: `MaxEncodedLen`)
 	/// Storage: `Referrals::PendingConversions` (r:1 w:1)
 	/// Proof: `Referrals::PendingConversions` (`max_values`: None, `max_size`: Some(20), added: 2495, mode: `MaxEncodedLen`)
@@ -977,17 +553,15 @@ impl WeightInfo for () {
 	/// Proof: `Referrals::CounterForPendingConversions` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	/// The range of component `c` is `[1, 2]`.
 	/// The range of component `e` is `[0, 1]`.
-	fn router_execution_buy(c: u32, e: u32) -> Weight {
+	fn router_execution_buy(c: u32, _e: u32) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `6762`
+		//  Measured:  `7118`
 		//  Estimated: `13905`
-		// Minimum execution time: 325_047_000 picoseconds.
-		Weight::from_parts(309_584_818, 13905)
-			// Standard Error: 196_245
-			.saturating_add(Weight::from_parts(16_694_995, 0).saturating_mul(c.into()))
-			// Standard Error: 196_245
-			.saturating_add(Weight::from_parts(1_594_024, 0).saturating_mul(e.into()))
-			.saturating_add(RocksDbWeight::get().reads(33))
-			.saturating_add(RocksDbWeight::get().writes(22))
+		// Minimum execution time: 312_903_000 picoseconds.
+		Weight::from_parts(305_669_455, 13905)
+			// Standard Error: 152_808
+			.saturating_add(Weight::from_parts(12_462_813, 0).saturating_mul(c.into()))
+			.saturating_add(RocksDbWeight::get().reads(38_u64))
+			.saturating_add(RocksDbWeight::get().writes(21_u64))
 	}
 }
diff --git a/pallets/otc/Cargo.toml b/pallets/otc/Cargo.toml
index 3d84afc8b..68108477f 100644
--- a/pallets/otc/Cargo.toml
+++ b/pallets/otc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = 'pallet-otc'
-version = '1.1.3'
+version = '1.1.4'
 description = 'A pallet for trustless over-the-counter trading'
 authors = ['GalacticCouncil']
 edition = '2021'
diff --git a/pallets/otc/src/lib.rs b/pallets/otc/src/lib.rs
index c924a83e8..674a9f16d 100644
--- a/pallets/otc/src/lib.rs
+++ b/pallets/otc/src/lib.rs
@@ -49,7 +49,7 @@ mod benchmarks;
 
 pub mod weights;
 
-use weights::WeightInfo;
+pub use weights::WeightInfo;
 
 // Re-export pallet items so that they can be accessed from the crate namespace.
 pub use pallet::*;
diff --git a/pallets/otc/src/tests/mock.rs b/pallets/otc/src/tests/mock.rs
index 362597482..aff2a0daf 100644
--- a/pallets/otc/src/tests/mock.rs
+++ b/pallets/otc/src/tests/mock.rs
@@ -96,6 +96,7 @@ impl system::Config for Test {
 	type BlockLength = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
+	type RuntimeTask = RuntimeTask;
 	type Nonce = u64;
 	type Block = Block;
 	type Hash = H256;
diff --git a/pallets/otc/src/weights.rs b/pallets/otc/src/weights.rs
index 96dafe15f..4af2df9b9 100644
--- a/pallets/otc/src/weights.rs
+++ b/pallets/otc/src/weights.rs
@@ -17,27 +17,30 @@
 
 //! Autogenerated weights for `pallet_otc`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-12-12, STEPS: `5`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-05-23, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024`
 
 // Executed Command:
-// target/release/hydradx
+// ./target/release/hydradx
 // benchmark
 // pallet
-// --pallet=pallet-otc
 // --wasm-execution=compiled
-// --heap-pages=4096
-// --chain=dev
-// --extrinsic=*
-// --steps=5
-// --repeat=20
+// --pallet
+// *
+// --extrinsic
+// *
+// --heap-pages
+// 4096
+// --steps
+// 50
+// --repeat
+// 20
+// --template=scripts/pallet-weight-template.hbs
 // --output
-// ./weights-1.1.0/otc.rs
-// --template
-// .maintain/pallet-weight-template-no-back.hbs
+// weights/
 
 #![allow(unused_parens)]
 #![allow(unused_imports)]
@@ -58,155 +61,87 @@ pub trait WeightInfo {
 }
 
 /// Weights for pallet_otc using the hydraDX node and recommended hardware.
-pub struct HydraWeight<T>(PhantomData<T>);
-
-impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
-	/// Storage: `AssetRegistry::Assets` (r:2 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
-	/// Storage: `OTC::NextOrderId` (r:1 w:1)
-	/// Proof: `OTC::NextOrderId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	/// Storage: `Balances::Reserves` (r:1 w:1)
-	/// Proof: `Balances::Reserves` (`max_values`: None, `max_size`: Some(1249), added: 3724, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `OTC::Orders` (r:0 w:1)
-	/// Proof: `OTC::Orders` (`max_values`: None, `max_size`: Some(93), added: 2568, mode: `MaxEncodedLen`)
-	fn place_order() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `624`
-		//  Estimated: `6114`
-		// Minimum execution time: 54_176_000 picoseconds.
-		Weight::from_parts(54_920_000, 6114)
-			.saturating_add(T::DbWeight::get().reads(5_u64))
-			.saturating_add(T::DbWeight::get().writes(4_u64))
-	}
-	/// Storage: `OTC::Orders` (r:1 w:1)
-	/// Proof: `OTC::Orders` (`max_values`: None, `max_size`: Some(93), added: 2568, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:2 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
-	/// Storage: `Tokens::Accounts` (r:2 w:2)
-	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:2 w:2)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `Balances::Reserves` (r:1 w:1)
-	/// Proof: `Balances::Reserves` (`max_values`: None, `max_size`: Some(1249), added: 3724, mode: `MaxEncodedLen`)
-	fn partial_fill_order() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1404`
-		//  Estimated: `6196`
-		// Minimum execution time: 138_354_000 picoseconds.
-		Weight::from_parts(140_113_000, 6196)
-			.saturating_add(T::DbWeight::get().reads(8_u64))
-			.saturating_add(T::DbWeight::get().writes(6_u64))
-	}
-	/// Storage: `OTC::Orders` (r:1 w:1)
-	/// Proof: `OTC::Orders` (`max_values`: None, `max_size`: Some(93), added: 2568, mode: `MaxEncodedLen`)
-	/// Storage: `Tokens::Accounts` (r:2 w:2)
-	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:1 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:2 w:2)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `Balances::Reserves` (r:1 w:1)
-	/// Proof: `Balances::Reserves` (`max_values`: None, `max_size`: Some(1249), added: 3724, mode: `MaxEncodedLen`)
-	fn fill_order() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1399`
-		//  Estimated: `6196`
-		// Minimum execution time: 136_927_000 picoseconds.
-		Weight::from_parts(137_782_000, 6196)
-			.saturating_add(T::DbWeight::get().reads(7_u64))
-			.saturating_add(T::DbWeight::get().writes(6_u64))
-	}
-	/// Storage: `OTC::Orders` (r:1 w:1)
-	/// Proof: `OTC::Orders` (`max_values`: None, `max_size`: Some(93), added: 2568, mode: `MaxEncodedLen`)
-	/// Storage: `Balances::Reserves` (r:1 w:1)
-	/// Proof: `Balances::Reserves` (`max_values`: None, `max_size`: Some(1249), added: 3724, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	fn cancel_order() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `525`
-		//  Estimated: `4714`
-		// Minimum execution time: 44_402_000 picoseconds.
-		Weight::from_parts(44_773_000, 4714)
-			.saturating_add(T::DbWeight::get().reads(3_u64))
-			.saturating_add(T::DbWeight::get().writes(3_u64))
-	}
-}
-
-// For backwards compatibility and tests
 impl WeightInfo for () {
 	/// Storage: `AssetRegistry::Assets` (r:2 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
+	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
 	/// Storage: `OTC::NextOrderId` (r:1 w:1)
 	/// Proof: `OTC::NextOrderId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	/// Storage: `Balances::Reserves` (r:1 w:1)
-	/// Proof: `Balances::Reserves` (`max_values`: None, `max_size`: Some(1249), added: 3724, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `Tokens::Reserves` (r:1 w:1)
+	/// Proof: `Tokens::Reserves` (`max_values`: None, `max_size`: Some(1261), added: 3736, mode: `MaxEncodedLen`)
+	/// Storage: `Tokens::Accounts` (r:1 w:1)
+	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
 	/// Storage: `OTC::Orders` (r:0 w:1)
 	/// Proof: `OTC::Orders` (`max_values`: None, `max_size`: Some(93), added: 2568, mode: `MaxEncodedLen`)
 	fn place_order() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `624`
-		//  Estimated: `6114`
-		// Minimum execution time: 54_176_000 picoseconds.
-		Weight::from_parts(54_920_000, 6114)
+		//  Measured:  `963`
+		//  Estimated: `6190`
+		// Minimum execution time: 46_410_000 picoseconds.
+		Weight::from_parts(46_985_000, 6190)
 			.saturating_add(RocksDbWeight::get().reads(5_u64))
 			.saturating_add(RocksDbWeight::get().writes(4_u64))
 	}
 	/// Storage: `OTC::Orders` (r:1 w:1)
 	/// Proof: `OTC::Orders` (`max_values`: None, `max_size`: Some(93), added: 2568, mode: `MaxEncodedLen`)
 	/// Storage: `AssetRegistry::Assets` (r:2 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
-	/// Storage: `Tokens::Accounts` (r:2 w:2)
+	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
+	/// Storage: `Duster::AccountBlacklist` (r:2 w:0)
+	/// Proof: `Duster::AccountBlacklist` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::BannedAssets` (r:2 w:0)
+	/// Proof: `AssetRegistry::BannedAssets` (`max_values`: None, `max_size`: Some(20), added: 2495, mode: `MaxEncodedLen`)
+	/// Storage: `Tokens::Accounts` (r:4 w:4)
 	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:2 w:2)
+	/// Storage: `System::Account` (r:2 w:0)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `Balances::Reserves` (r:1 w:1)
-	/// Proof: `Balances::Reserves` (`max_values`: None, `max_size`: Some(1249), added: 3724, mode: `MaxEncodedLen`)
+	/// Storage: `Tokens::Reserves` (r:1 w:1)
+	/// Proof: `Tokens::Reserves` (`max_values`: None, `max_size`: Some(1261), added: 3736, mode: `MaxEncodedLen`)
 	fn partial_fill_order() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1404`
-		//  Estimated: `6196`
-		// Minimum execution time: 138_354_000 picoseconds.
-		Weight::from_parts(140_113_000, 6196)
-			.saturating_add(RocksDbWeight::get().reads(8_u64))
+		//  Measured:  `2034`
+		//  Estimated: `11322`
+		// Minimum execution time: 116_670_000 picoseconds.
+		Weight::from_parts(117_660_000, 11322)
+			.saturating_add(RocksDbWeight::get().reads(14_u64))
 			.saturating_add(RocksDbWeight::get().writes(6_u64))
 	}
 	/// Storage: `OTC::Orders` (r:1 w:1)
 	/// Proof: `OTC::Orders` (`max_values`: None, `max_size`: Some(93), added: 2568, mode: `MaxEncodedLen`)
-	/// Storage: `Tokens::Accounts` (r:2 w:2)
+	/// Storage: `Duster::AccountBlacklist` (r:2 w:0)
+	/// Proof: `Duster::AccountBlacklist` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::BannedAssets` (r:2 w:0)
+	/// Proof: `AssetRegistry::BannedAssets` (`max_values`: None, `max_size`: Some(20), added: 2495, mode: `MaxEncodedLen`)
+	/// Storage: `Tokens::Accounts` (r:4 w:4)
 	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:1 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:2 w:2)
+	/// Storage: `AssetRegistry::Assets` (r:2 w:0)
+	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:2 w:0)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `Balances::Reserves` (r:1 w:1)
-	/// Proof: `Balances::Reserves` (`max_values`: None, `max_size`: Some(1249), added: 3724, mode: `MaxEncodedLen`)
+	/// Storage: `Tokens::Reserves` (r:1 w:1)
+	/// Proof: `Tokens::Reserves` (`max_values`: None, `max_size`: Some(1261), added: 3736, mode: `MaxEncodedLen`)
 	fn fill_order() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1399`
-		//  Estimated: `6196`
-		// Minimum execution time: 136_927_000 picoseconds.
-		Weight::from_parts(137_782_000, 6196)
-			.saturating_add(RocksDbWeight::get().reads(7_u64))
+		//  Measured:  `2034`
+		//  Estimated: `11322`
+		// Minimum execution time: 114_236_000 picoseconds.
+		Weight::from_parts(114_837_000, 11322)
+			.saturating_add(RocksDbWeight::get().reads(14_u64))
 			.saturating_add(RocksDbWeight::get().writes(6_u64))
 	}
 	/// Storage: `OTC::Orders` (r:1 w:1)
 	/// Proof: `OTC::Orders` (`max_values`: None, `max_size`: Some(93), added: 2568, mode: `MaxEncodedLen`)
-	/// Storage: `Balances::Reserves` (r:1 w:1)
-	/// Proof: `Balances::Reserves` (`max_values`: None, `max_size`: Some(1249), added: 3724, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `Tokens::Reserves` (r:1 w:1)
+	/// Proof: `Tokens::Reserves` (`max_values`: None, `max_size`: Some(1261), added: 3736, mode: `MaxEncodedLen`)
+	/// Storage: `Tokens::Accounts` (r:1 w:1)
+	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::Assets` (r:1 w:0)
+	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
 	fn cancel_order() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `525`
-		//  Estimated: `4714`
-		// Minimum execution time: 44_402_000 picoseconds.
-		Weight::from_parts(44_773_000, 4714)
-			.saturating_add(RocksDbWeight::get().reads(3_u64))
+		//  Measured:  `1197`
+		//  Estimated: `4726`
+		// Minimum execution time: 41_852_000 picoseconds.
+		Weight::from_parts(42_296_000, 4726)
+			.saturating_add(RocksDbWeight::get().reads(4_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 	}
 }
diff --git a/pallets/referrals/Cargo.toml b/pallets/referrals/Cargo.toml
index 8db637300..981f0829e 100644
--- a/pallets/referrals/Cargo.toml
+++ b/pallets/referrals/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-referrals"
-version = "1.2.4"
+version = "1.2.5"
 authors = ['GalacticCouncil']
 edition = "2021"
 license = "Apache-2.0"
diff --git a/pallets/referrals/src/lib.rs b/pallets/referrals/src/lib.rs
index 0d0f1924e..57871655b 100644
--- a/pallets/referrals/src/lib.rs
+++ b/pallets/referrals/src/lib.rs
@@ -75,7 +75,7 @@ pub use crate::traits::BenchmarkHelper;
 
 pub use pallet::*;
 
-use weights::WeightInfo;
+pub use weights::WeightInfo;
 
 pub type Balance = u128;
 pub type ReferralCode<S> = BoundedVec<u8, S>;
diff --git a/pallets/referrals/src/tests.rs b/pallets/referrals/src/tests.rs
index 008bfb500..3267a3e6b 100644
--- a/pallets/referrals/src/tests.rs
+++ b/pallets/referrals/src/tests.rs
@@ -154,6 +154,7 @@ impl frame_system::Config for Test {
 	type BlockLength = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
+	type RuntimeTask = RuntimeTask;
 	type Nonce = u64;
 	type Block = Block;
 	type Hash = H256;
diff --git a/pallets/referrals/src/weights.rs b/pallets/referrals/src/weights.rs
index 364772a08..d2a537eb0 100644
--- a/pallets/referrals/src/weights.rs
+++ b/pallets/referrals/src/weights.rs
@@ -17,25 +17,30 @@
 
 //! Autogenerated weights for `pallet_referrals`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-01-09, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-05-23, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: 1024
+//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024`
 
 // Executed Command:
-// target/release/hydradx
+// ./target/release/hydradx
 // benchmark
 // pallet
-// --chain=dev
-// --steps=10
-// --repeat=30
 // --wasm-execution=compiled
-// --heap-pages=4096
-// --template=.maintain/pallet-weight-template-no-back.hbs
-// --pallet=pallet-referrals
-// --output=weights-1.1.0/referrals.rs
-// --extrinsic=*
+// --pallet
+// *
+// --extrinsic
+// *
+// --heap-pages
+// 4096
+// --steps
+// 50
+// --repeat
+// 20
+// --template=scripts/pallet-weight-template.hbs
+// --output
+// weights/
 
 #![allow(unused_parens)]
 #![allow(unused_imports)]
@@ -57,118 +62,6 @@ pub trait WeightInfo {
 }
 
 /// Weights for pallet_referrals using the hydraDX node and recommended hardware.
-pub struct HydraWeight<T>(PhantomData<T>);
-
-impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
-	/// Storage: `Referrals::ReferralAccounts` (r:1 w:1)
-	/// Proof: `Referrals::ReferralAccounts` (`max_values`: None, `max_size`: Some(59), added: 2534, mode: `MaxEncodedLen`)
-	/// Storage: `Referrals::ReferralCodes` (r:1 w:1)
-	/// Proof: `Referrals::ReferralCodes` (`max_values`: None, `max_size`: Some(59), added: 2534, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:2 w:2)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `Referrals::Referrer` (r:0 w:1)
-	/// Proof: `Referrals::Referrer` (`max_values`: None, `max_size`: Some(65), added: 2540, mode: `MaxEncodedLen`)
-	fn register_code() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `284`
-		//  Estimated: `6196`
-		// Minimum execution time: 64_118_000 picoseconds.
-		Weight::from_parts(64_600_000, 6196)
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(5))
-	}
-	/// Storage: `Referrals::ReferralCodes` (r:1 w:0)
-	/// Proof: `Referrals::ReferralCodes` (`max_values`: None, `max_size`: Some(59), added: 2534, mode: `MaxEncodedLen`)
-	/// Storage: `Referrals::LinkedAccounts` (r:1 w:1)
-	/// Proof: `Referrals::LinkedAccounts` (`max_values`: None, `max_size`: Some(80), added: 2555, mode: `MaxEncodedLen`)
-	fn link_code() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `194`
-		//  Estimated: `3545`
-		// Minimum execution time: 22_117_000 picoseconds.
-		Weight::from_parts(22_358_000, 3545)
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Tokens::Accounts` (r:2 w:2)
-	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
-	/// Storage: `Omnipool::Assets` (r:2 w:2)
-	/// Proof: `Omnipool::Assets` (`max_values`: None, `max_size`: Some(85), added: 2560, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:2 w:2)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `Omnipool::HubAssetImbalance` (r:1 w:1)
-	/// Proof: `Omnipool::HubAssetImbalance` (`max_values`: Some(1), `max_size`: Some(17), added: 512, mode: `MaxEncodedLen`)
-	/// Storage: `DynamicFees::AssetFee` (r:2 w:0)
-	/// Proof: `DynamicFees::AssetFee` (`max_values`: None, `max_size`: Some(24), added: 2499, mode: `MaxEncodedLen`)
-	/// Storage: `EmaOracle::Oracles` (r:2 w:0)
-	/// Proof: `EmaOracle::Oracles` (`max_values`: None, `max_size`: Some(177), added: 2652, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:1 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
-	/// Storage: `EmaOracle::Accumulator` (r:1 w:1)
-	/// Proof: `EmaOracle::Accumulator` (`max_values`: Some(1), `max_size`: Some(5921), added: 6416, mode: `MaxEncodedLen`)
-	/// Storage: `CircuitBreaker::AllowedTradeVolumeLimitPerAsset` (r:2 w:2)
-	/// Proof: `CircuitBreaker::AllowedTradeVolumeLimitPerAsset` (`max_values`: None, `max_size`: Some(68), added: 2543, mode: `MaxEncodedLen`)
-	/// Storage: `CircuitBreaker::TradeVolumeLimitPerAsset` (r:2 w:0)
-	/// Proof: `CircuitBreaker::TradeVolumeLimitPerAsset` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
-	/// Storage: `CircuitBreaker::LiquidityAddLimitPerAsset` (r:1 w:0)
-	/// Proof: `CircuitBreaker::LiquidityAddLimitPerAsset` (`max_values`: None, `max_size`: Some(29), added: 2504, mode: `MaxEncodedLen`)
-	/// Storage: `CircuitBreaker::AllowedAddLiquidityAmountPerAsset` (r:1 w:1)
-	/// Proof: `CircuitBreaker::AllowedAddLiquidityAmountPerAsset` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
-	/// Storage: `CircuitBreaker::LiquidityRemoveLimitPerAsset` (r:1 w:0)
-	/// Proof: `CircuitBreaker::LiquidityRemoveLimitPerAsset` (`max_values`: None, `max_size`: Some(29), added: 2504, mode: `MaxEncodedLen`)
-	/// Storage: `CircuitBreaker::AllowedRemoveLiquidityAmountPerAsset` (r:1 w:1)
-	/// Proof: `CircuitBreaker::AllowedRemoveLiquidityAmountPerAsset` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
-	/// Storage: `Staking::Staking` (r:1 w:0)
-	/// Proof: `Staking::Staking` (`max_values`: Some(1), `max_size`: Some(48), added: 543, mode: `MaxEncodedLen`)
-	/// Storage: `Referrals::PendingConversions` (r:1 w:1)
-	/// Proof: `Referrals::PendingConversions` (`max_values`: None, `max_size`: Some(20), added: 2495, mode: `MaxEncodedLen`)
-	/// Storage: `Referrals::CounterForPendingConversions` (r:1 w:1)
-	/// Proof: `Referrals::CounterForPendingConversions` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	/// Storage: `MultiTransactionPayment::AccountCurrencyMap` (r:0 w:1)
-	/// Proof: `MultiTransactionPayment::AccountCurrencyMap` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
-	fn convert() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `2105`
-		//  Estimated: `7406`
-		// Minimum execution time: 290_406_000 picoseconds.
-		Weight::from_parts(291_955_000, 7406)
-			.saturating_add(T::DbWeight::get().reads(24))
-			.saturating_add(T::DbWeight::get().writes(15))
-	}
-	/// Storage: `Referrals::PendingConversions` (r:1 w:0)
-	/// Proof: `Referrals::PendingConversions` (`max_values`: None, `max_size`: Some(20), added: 2495, mode: `MaxEncodedLen`)
-	/// Storage: `Referrals::ReferrerShares` (r:1 w:1)
-	/// Proof: `Referrals::ReferrerShares` (`max_values`: None, `max_size`: Some(64), added: 2539, mode: `MaxEncodedLen`)
-	/// Storage: `Referrals::TraderShares` (r:1 w:1)
-	/// Proof: `Referrals::TraderShares` (`max_values`: None, `max_size`: Some(64), added: 2539, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:2 w:2)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `Referrals::TotalShares` (r:1 w:1)
-	/// Proof: `Referrals::TotalShares` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
-	/// Storage: `Referrals::Referrer` (r:1 w:1)
-	/// Proof: `Referrals::Referrer` (`max_values`: None, `max_size`: Some(65), added: 2540, mode: `MaxEncodedLen`)
-	fn claim_rewards() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `655`
-		//  Estimated: `6196`
-		// Minimum execution time: 88_340_000 picoseconds.
-		Weight::from_parts(89_429_000, 6196)
-			.saturating_add(T::DbWeight::get().reads(7))
-			.saturating_add(T::DbWeight::get().writes(6))
-	}
-	/// Storage: `Referrals::AssetRewards` (r:1 w:1)
-	/// Proof: `Referrals::AssetRewards` (`max_values`: None, `max_size`: Some(49), added: 2524, mode: `MaxEncodedLen`)
-	fn set_reward_percentage() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `42`
-		//  Estimated: `3514`
-		// Minimum execution time: 16_024_000 picoseconds.
-		Weight::from_parts(16_319_000, 3514)
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-}
-
 impl WeightInfo for () {
 	/// Storage: `Referrals::ReferralAccounts` (r:1 w:1)
 	/// Proof: `Referrals::ReferralAccounts` (`max_values`: None, `max_size`: Some(59), added: 2534, mode: `MaxEncodedLen`)
@@ -180,12 +73,12 @@ impl WeightInfo for () {
 	/// Proof: `Referrals::Referrer` (`max_values`: None, `max_size`: Some(65), added: 2540, mode: `MaxEncodedLen`)
 	fn register_code() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `284`
+		//  Measured:  `318`
 		//  Estimated: `6196`
-		// Minimum execution time: 64_118_000 picoseconds.
-		Weight::from_parts(64_600_000, 6196)
-			.saturating_add(RocksDbWeight::get().reads(4))
-			.saturating_add(RocksDbWeight::get().writes(5))
+		// Minimum execution time: 58_712_000 picoseconds.
+		Weight::from_parts(59_464_000, 6196)
+			.saturating_add(RocksDbWeight::get().reads(4_u64))
+			.saturating_add(RocksDbWeight::get().writes(5_u64))
 	}
 	/// Storage: `Referrals::ReferralCodes` (r:1 w:0)
 	/// Proof: `Referrals::ReferralCodes` (`max_values`: None, `max_size`: Some(59), added: 2534, mode: `MaxEncodedLen`)
@@ -193,12 +86,12 @@ impl WeightInfo for () {
 	/// Proof: `Referrals::LinkedAccounts` (`max_values`: None, `max_size`: Some(80), added: 2555, mode: `MaxEncodedLen`)
 	fn link_code() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `194`
+		//  Measured:  `228`
 		//  Estimated: `3545`
-		// Minimum execution time: 22_117_000 picoseconds.
-		Weight::from_parts(22_358_000, 3545)
-			.saturating_add(RocksDbWeight::get().reads(2))
-			.saturating_add(RocksDbWeight::get().writes(1))
+		// Minimum execution time: 17_123_000 picoseconds.
+		Weight::from_parts(17_546_000, 3545)
+			.saturating_add(RocksDbWeight::get().reads(2_u64))
+			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
 	/// Storage: `Tokens::Accounts` (r:2 w:2)
 	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
@@ -212,8 +105,10 @@ impl WeightInfo for () {
 	/// Proof: `DynamicFees::AssetFee` (`max_values`: None, `max_size`: Some(24), added: 2499, mode: `MaxEncodedLen`)
 	/// Storage: `EmaOracle::Oracles` (r:2 w:0)
 	/// Proof: `EmaOracle::Oracles` (`max_values`: None, `max_size`: Some(177), added: 2652, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:1 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::BannedAssets` (r:1 w:0)
+	/// Proof: `AssetRegistry::BannedAssets` (`max_values`: None, `max_size`: Some(20), added: 2495, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::Assets` (r:3 w:0)
+	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
 	/// Storage: `EmaOracle::Accumulator` (r:1 w:1)
 	/// Proof: `EmaOracle::Accumulator` (`max_values`: Some(1), `max_size`: Some(5921), added: 6416, mode: `MaxEncodedLen`)
 	/// Storage: `CircuitBreaker::AllowedTradeVolumeLimitPerAsset` (r:2 w:2)
@@ -238,12 +133,12 @@ impl WeightInfo for () {
 	/// Proof: `MultiTransactionPayment::AccountCurrencyMap` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
 	fn convert() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2105`
-		//  Estimated: `7406`
-		// Minimum execution time: 290_406_000 picoseconds.
-		Weight::from_parts(291_955_000, 7406)
-			.saturating_add(RocksDbWeight::get().reads(24))
-			.saturating_add(RocksDbWeight::get().writes(15))
+		//  Measured:  `2226`
+		//  Estimated: `8790`
+		// Minimum execution time: 263_297_000 picoseconds.
+		Weight::from_parts(264_892_000, 8790)
+			.saturating_add(RocksDbWeight::get().reads(27_u64))
+			.saturating_add(RocksDbWeight::get().writes(15_u64))
 	}
 	/// Storage: `Referrals::PendingConversions` (r:1 w:0)
 	/// Proof: `Referrals::PendingConversions` (`max_values`: None, `max_size`: Some(20), added: 2495, mode: `MaxEncodedLen`)
@@ -259,22 +154,22 @@ impl WeightInfo for () {
 	/// Proof: `Referrals::Referrer` (`max_values`: None, `max_size`: Some(65), added: 2540, mode: `MaxEncodedLen`)
 	fn claim_rewards() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `655`
+		//  Measured:  `689`
 		//  Estimated: `6196`
-		// Minimum execution time: 88_340_000 picoseconds.
-		Weight::from_parts(89_429_000, 6196)
-			.saturating_add(RocksDbWeight::get().reads(7))
-			.saturating_add(RocksDbWeight::get().writes(6))
+		// Minimum execution time: 77_361_000 picoseconds.
+		Weight::from_parts(78_136_000, 6196)
+			.saturating_add(RocksDbWeight::get().reads(7_u64))
+			.saturating_add(RocksDbWeight::get().writes(6_u64))
 	}
 	/// Storage: `Referrals::AssetRewards` (r:1 w:1)
 	/// Proof: `Referrals::AssetRewards` (`max_values`: None, `max_size`: Some(49), added: 2524, mode: `MaxEncodedLen`)
 	fn set_reward_percentage() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `42`
+		//  Measured:  `76`
 		//  Estimated: `3514`
-		// Minimum execution time: 16_024_000 picoseconds.
-		Weight::from_parts(16_319_000, 3514)
-			.saturating_add(RocksDbWeight::get().reads(1))
-			.saturating_add(RocksDbWeight::get().writes(1))
+		// Minimum execution time: 11_771_000 picoseconds.
+		Weight::from_parts(11_990_000, 3514)
+			.saturating_add(RocksDbWeight::get().reads(1_u64))
+			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
 }
diff --git a/pallets/route-executor/Cargo.toml b/pallets/route-executor/Cargo.toml
index ccf6826f9..fc6eb60d0 100644
--- a/pallets/route-executor/Cargo.toml
+++ b/pallets/route-executor/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = 'pallet-route-executor'
-version = '2.3.2'
+version = '2.3.3'
 description = 'A pallet to execute a route containing a sequence of trades'
 authors = ['GalacticCouncil']
 edition = '2021'
diff --git a/pallets/route-executor/src/lib.rs b/pallets/route-executor/src/lib.rs
index e8c388e6a..8a5874d06 100644
--- a/pallets/route-executor/src/lib.rs
+++ b/pallets/route-executor/src/lib.rs
@@ -47,6 +47,8 @@ use sp_std::{vec, vec::Vec};
 mod tests;
 pub mod weights;
 
+pub use weights::WeightInfo;
+
 // Re-export pallet items so that they can be accessed from the crate namespace.
 pub use pallet::*;
 
diff --git a/pallets/route-executor/src/tests/mock.rs b/pallets/route-executor/src/tests/mock.rs
index 042303d95..354ab60e9 100644
--- a/pallets/route-executor/src/tests/mock.rs
+++ b/pallets/route-executor/src/tests/mock.rs
@@ -63,6 +63,7 @@ impl frame_system::Config for Test {
 	type BlockLength = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
+	type RuntimeTask = RuntimeTask;
 	type Nonce = u64;
 	type Block = Block;
 	type Hash = H256;
@@ -122,8 +123,8 @@ impl pallet_balances::Config for Test {
 	type ReserveIdentifier = ();
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
-	type MaxHolds = ();
 	type RuntimeHoldReason = ();
+	type RuntimeFreezeReason = ();
 }
 
 impl pallet_currencies::Config for Test {
diff --git a/pallets/route-executor/src/weights.rs b/pallets/route-executor/src/weights.rs
index be4375720..e6c944d64 100644
--- a/pallets/route-executor/src/weights.rs
+++ b/pallets/route-executor/src/weights.rs
@@ -18,8 +18,8 @@
 
 //! Autogenerated weights for `pallet_route_executor`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-03-18, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-05-24, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
@@ -33,9 +33,9 @@
 // --repeat=30
 // --wasm-execution=compiled
 // --heap-pages=4096
-// --template=.maintain/pallet-weight-template.hbs
-// --pallet=pallet_route-executor
-// --output=re2.rs
+// --template=scripts/pallet-weight-template.hbs
+// --pallet=pallet-route-executor
+// --output=weights/route_executor.rs
 // --extrinsic=*
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
@@ -55,133 +55,30 @@ pub trait WeightInfo {
 }
 
 /// Weights for `pallet_route_executor` using the HydraDX node and recommended hardware.
-pub struct HydraWeight<T>(PhantomData<T>);
-impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
-	/// Storage: `LBP::PoolData` (r:1 w:0)
-	/// Proof: `LBP::PoolData` (`max_values`: None, `max_size`: Some(163), added: 2638, mode: `MaxEncodedLen`)
-	/// Storage: `Tokens::Accounts` (r:5 w:5)
-	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:3 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `Tokens::Locks` (r:1 w:1)
-	/// Proof: `Tokens::Locks` (`max_values`: None, `max_size`: Some(1261), added: 3736, mode: `MaxEncodedLen`)
-	/// Storage: `Duster::AccountBlacklist` (r:2 w:0)
-	/// Proof: `Duster::AccountBlacklist` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::BannedAssets` (r:2 w:0)
-	/// Proof: `AssetRegistry::BannedAssets` (`max_values`: None, `max_size`: Some(20), added: 2495, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:2 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
-	/// The range of component `c` is `[0, 1]`.
-	fn calculate_and_execute_sell_in_lbp(c: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `3436`
-		//  Estimated: `13905`
-		// Minimum execution time: 342_467_000 picoseconds.
-		Weight::from_parts(346_028_529, 13905)
-			// Standard Error: 185_098
-			.saturating_add(Weight::from_parts(50_586_970, 0).saturating_mul(c.into()))
-			.saturating_add(T::DbWeight::get().reads(16_u64))
-			.saturating_add(T::DbWeight::get().writes(7_u64))
-	}
+impl WeightInfo for () {
 	/// Storage: `LBP::PoolData` (r:1 w:0)
 	/// Proof: `LBP::PoolData` (`max_values`: None, `max_size`: Some(163), added: 2638, mode: `MaxEncodedLen`)
 	/// Storage: `Tokens::Accounts` (r:5 w:5)
 	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
 	/// Storage: `System::Account` (r:3 w:1)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `Tokens::Locks` (r:1 w:1)
-	/// Proof: `Tokens::Locks` (`max_values`: None, `max_size`: Some(1261), added: 3736, mode: `MaxEncodedLen`)
-	/// Storage: `Duster::AccountBlacklist` (r:2 w:0)
-	/// Proof: `Duster::AccountBlacklist` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::BannedAssets` (r:2 w:0)
-	/// Proof: `AssetRegistry::BannedAssets` (`max_values`: None, `max_size`: Some(20), added: 2495, mode: `MaxEncodedLen`)
 	/// Storage: `AssetRegistry::Assets` (r:2 w:0)
 	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
-	/// The range of component `c` is `[1, 2]`.
-	/// The range of component `b` is `[0, 1]`.
-	fn calculate_and_execute_buy_in_lbp(c: u32, b: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1604 + b * (1837 ±0)`
-		//  Estimated: `6156 + b * (7749 ±0)`
-		// Minimum execution time: 75_256_000 picoseconds.
-		Weight::from_parts(76_245_000, 6156)
-			// Standard Error: 604_587
-			.saturating_add(Weight::from_parts(2_376_809, 0).saturating_mul(c.into()))
-			// Standard Error: 1_327_242
-			.saturating_add(Weight::from_parts(273_173_826, 0).saturating_mul(b.into()))
-			.saturating_add(T::DbWeight::get().reads(3_u64))
-			.saturating_add(T::DbWeight::get().reads((13_u64).saturating_mul(b.into())))
-			.saturating_add(T::DbWeight::get().writes((7_u64).saturating_mul(b.into())))
-			.saturating_add(Weight::from_parts(0, 7749).saturating_mul(b.into()))
-	}
-	/// Storage: `AssetRegistry::Assets` (r:6 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
-	/// Storage: `Router::Routes` (r:1 w:1)
-	/// Proof: `Router::Routes` (`max_values`: None, `max_size`: Some(90), added: 2565, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:7 w:0)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `Tokens::Accounts` (r:15 w:0)
-	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
-	/// Storage: `XYK::ShareToken` (r:6 w:0)
-	/// Proof: `XYK::ShareToken` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
-	/// Storage: `Duster::AccountBlacklist` (r:7 w:0)
-	/// Proof: `Duster::AccountBlacklist` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::BannedAssets` (r:5 w:0)
-	/// Proof: `AssetRegistry::BannedAssets` (`max_values`: None, `max_size`: Some(20), added: 2495, mode: `MaxEncodedLen`)
-	/// Storage: `MultiTransactionPayment::AccountCurrencyMap` (r:1 w:0)
-	/// Proof: `MultiTransactionPayment::AccountCurrencyMap` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
-	/// Storage: `MultiTransactionPayment::AcceptedCurrencies` (r:5 w:0)
-	/// Proof: `MultiTransactionPayment::AcceptedCurrencies` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
-	/// Storage: `EmaOracle::Accumulator` (r:1 w:0)
-	/// Proof: `EmaOracle::Accumulator` (`max_values`: Some(1), `max_size`: Some(5921), added: 6416, mode: `MaxEncodedLen`)
-	/// Storage: `Tokens::TotalIssuance` (r:1 w:0)
-	/// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
-	fn set_route_for_xyk() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `6326`
-		//  Estimated: `39735`
-		// Minimum execution time: 2_275_922_000 picoseconds.
-		Weight::from_parts(2_284_697_000, 39735)
-			.saturating_add(T::DbWeight::get().reads(55_u64))
-			.saturating_add(T::DbWeight::get().writes(1_u64))
-	}
-	/// Storage: `Router::Routes` (r:0 w:1)
-	/// Proof: `Router::Routes` (`max_values`: None, `max_size`: Some(90), added: 2565, mode: `MaxEncodedLen`)
-	fn force_insert_route() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1012`
-		//  Estimated: `0`
-		// Minimum execution time: 30_072_000 picoseconds.
-		Weight::from_parts(30_421_000, 0)
-			.saturating_add(T::DbWeight::get().writes(1_u64))
-	}
-}
-
-// For backwards compatibility and tests.
-impl WeightInfo for () {
-	/// Storage: `LBP::PoolData` (r:1 w:0)
-	/// Proof: `LBP::PoolData` (`max_values`: None, `max_size`: Some(163), added: 2638, mode: `MaxEncodedLen`)
-	/// Storage: `Tokens::Accounts` (r:5 w:5)
-	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:3 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	/// Storage: `Tokens::Locks` (r:1 w:1)
 	/// Proof: `Tokens::Locks` (`max_values`: None, `max_size`: Some(1261), added: 3736, mode: `MaxEncodedLen`)
 	/// Storage: `Duster::AccountBlacklist` (r:2 w:0)
 	/// Proof: `Duster::AccountBlacklist` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
 	/// Storage: `AssetRegistry::BannedAssets` (r:2 w:0)
 	/// Proof: `AssetRegistry::BannedAssets` (`max_values`: None, `max_size`: Some(20), added: 2495, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:2 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
 	/// The range of component `c` is `[0, 1]`.
 	fn calculate_and_execute_sell_in_lbp(c: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3436`
+		//  Measured:  `3535`
 		//  Estimated: `13905`
-		// Minimum execution time: 342_467_000 picoseconds.
-		Weight::from_parts(346_028_529, 13905)
-			// Standard Error: 185_098
-			.saturating_add(Weight::from_parts(50_586_970, 0).saturating_mul(c.into()))
+		// Minimum execution time: 353_367_000 picoseconds.
+		Weight::from_parts(356_268_786, 13905)
+			// Standard Error: 166_444
+			.saturating_add(Weight::from_parts(71_565_213, 0).saturating_mul(c.into()))
 			.saturating_add(RocksDbWeight::get().reads(16_u64))
 			.saturating_add(RocksDbWeight::get().writes(7_u64))
 	}
@@ -191,26 +88,26 @@ impl WeightInfo for () {
 	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
 	/// Storage: `System::Account` (r:3 w:1)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::Assets` (r:2 w:0)
+	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
 	/// Storage: `Tokens::Locks` (r:1 w:1)
 	/// Proof: `Tokens::Locks` (`max_values`: None, `max_size`: Some(1261), added: 3736, mode: `MaxEncodedLen`)
 	/// Storage: `Duster::AccountBlacklist` (r:2 w:0)
 	/// Proof: `Duster::AccountBlacklist` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
 	/// Storage: `AssetRegistry::BannedAssets` (r:2 w:0)
 	/// Proof: `AssetRegistry::BannedAssets` (`max_values`: None, `max_size`: Some(20), added: 2495, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:2 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
 	/// The range of component `c` is `[1, 2]`.
 	/// The range of component `b` is `[0, 1]`.
 	fn calculate_and_execute_buy_in_lbp(c: u32, b: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1604 + b * (1837 ±0)`
-		//  Estimated: `6156 + b * (7749 ±0)`
-		// Minimum execution time: 75_256_000 picoseconds.
-		Weight::from_parts(76_245_000, 6156)
-			// Standard Error: 604_587
-			.saturating_add(Weight::from_parts(2_376_809, 0).saturating_mul(c.into()))
-			// Standard Error: 1_327_242
-			.saturating_add(Weight::from_parts(273_173_826, 0).saturating_mul(b.into()))
+		//  Measured:  `1637 + b * (1923 ±0)`
+		//  Estimated: `6156 + b * (7749 ±245_709_589_663_843_264)`
+		// Minimum execution time: 94_954_000 picoseconds.
+		Weight::from_parts(95_935_000, 6156)
+			// Standard Error: 916_176
+			.saturating_add(Weight::from_parts(3_538_176, 0).saturating_mul(c.into()))
+			// Standard Error: 2_011_269
+			.saturating_add(Weight::from_parts(271_193_375, 0).saturating_mul(b.into()))
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
 			.saturating_add(RocksDbWeight::get().reads((13_u64).saturating_mul(b.into())))
 			.saturating_add(RocksDbWeight::get().writes((7_u64).saturating_mul(b.into())))
@@ -240,10 +137,10 @@ impl WeightInfo for () {
 	/// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
 	fn set_route_for_xyk() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `6326`
+		//  Measured:  `6426`
 		//  Estimated: `39735`
-		// Minimum execution time: 2_275_922_000 picoseconds.
-		Weight::from_parts(2_284_697_000, 39735)
+		// Minimum execution time: 1_873_189_000 picoseconds.
+		Weight::from_parts(1_884_759_000, 39735)
 			.saturating_add(RocksDbWeight::get().reads(55_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -253,8 +150,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `1012`
 		//  Estimated: `0`
-		// Minimum execution time: 30_072_000 picoseconds.
-		Weight::from_parts(30_421_000, 0)
+		// Minimum execution time: 25_395_000 picoseconds.
+		Weight::from_parts(25_888_000, 0)
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
 }
diff --git a/pallets/stableswap/Cargo.toml b/pallets/stableswap/Cargo.toml
index 5c4ab38bd..e16b4a778 100644
--- a/pallets/stableswap/Cargo.toml
+++ b/pallets/stableswap/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = 'pallet-stableswap'
-version = '3.6.2'
+version = '3.6.3'
 description = 'AMM for correlated assets'
 authors = ['GalacticCouncil']
 edition = '2021'
@@ -68,6 +68,7 @@ std = [
     'sp-std/std',
     "orml-tokens/std",
     "frame-benchmarking/std",
+    'orml-traits/std',
     "hydra-dx-math/std",
 ]
 try-runtime = ["frame-support/try-runtime"]
diff --git a/pallets/stableswap/src/lib.rs b/pallets/stableswap/src/lib.rs
index e11d5e9d0..13cf9caeb 100644
--- a/pallets/stableswap/src/lib.rs
+++ b/pallets/stableswap/src/lib.rs
@@ -73,7 +73,7 @@ use hydra_dx_math::stableswap::types::AssetReserve;
 use hydradx_traits::pools::DustRemovalAccountWhitelist;
 use orml_traits::MultiCurrency;
 use sp_std::collections::btree_map::BTreeMap;
-use weights::WeightInfo;
+pub use weights::WeightInfo;
 
 #[cfg(test)]
 pub(crate) mod tests;
diff --git a/pallets/stableswap/src/tests/mock.rs b/pallets/stableswap/src/tests/mock.rs
index 43fa450f9..079938ce3 100644
--- a/pallets/stableswap/src/tests/mock.rs
+++ b/pallets/stableswap/src/tests/mock.rs
@@ -90,6 +90,7 @@ impl frame_system::Config for Test {
 	type BlockLength = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
+	type RuntimeTask = RuntimeTask;
 	type Nonce = u64;
 	type Block = Block;
 	type Hash = H256;
diff --git a/pallets/stableswap/src/types.rs b/pallets/stableswap/src/types.rs
index ad3881557..17a8002d0 100644
--- a/pallets/stableswap/src/types.rs
+++ b/pallets/stableswap/src/types.rs
@@ -1,4 +1,5 @@
 #![allow(clippy::bad_bit_mask)]
+
 #[cfg(feature = "std")]
 use serde::{Deserialize, Serialize};
 
diff --git a/pallets/stableswap/src/weights.rs b/pallets/stableswap/src/weights.rs
index ed47df426..9d5f57226 100644
--- a/pallets/stableswap/src/weights.rs
+++ b/pallets/stableswap/src/weights.rs
@@ -1,5 +1,4 @@
 // This file is part of HydraDX.
-// This file is part of HydraDX.
 
 // Copyright (C) 2020-2023  Intergalactic, Limited (GIB).
 // SPDX-License-Identifier: Apache-2.0
@@ -18,25 +17,30 @@
 
 //! Autogenerated weights for `pallet_stableswap`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-12-18, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-05-23, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: 1024
+//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024`
 
 // Executed Command:
-// target/release/hydradx
+// ./target/release/hydradx
 // benchmark
 // pallet
-// --chain=dev
-// --steps=10
-// --repeat=30
 // --wasm-execution=compiled
-// --heap-pages=4096
-// --template=.maintain/pallet-weight-template-no-back.hbs
-// --pallet=pallet-stableswap
-// --output=weights-1.1.0/stableswap.rs
-// --extrinsic=*
+// --pallet
+// *
+// --extrinsic
+// *
+// --heap-pages
+// 4096
+// --steps
+// 50
+// --repeat
+// 20
+// --template=scripts/pallet-weight-template.hbs
+// --output
+// weights/
 
 #![allow(unused_parens)]
 #![allow(unused_imports)]
@@ -65,23 +69,21 @@ pub trait WeightInfo {
 }
 
 /// Weights for pallet_stableswap using the hydraDX node and recommended hardware.
-pub struct HydraWeight<T>(PhantomData<T>);
-
-impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
+impl WeightInfo for () {
 	/// Storage: `Stableswap::Pools` (r:1 w:1)
 	/// Proof: `Stableswap::Pools` (`max_values`: None, `max_size`: Some(57), added: 2532, mode: `MaxEncodedLen`)
 	/// Storage: `AssetRegistry::Assets` (r:6 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
+	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
 	/// Storage: `Duster::AccountBlacklist` (r:0 w:1)
 	/// Proof: `Duster::AccountBlacklist` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
 	fn create_pool() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `717`
-		//  Estimated: `16362`
-		// Minimum execution time: 52_498_000 picoseconds.
-		Weight::from_parts(52_992_000, 16362)
-			.saturating_add(T::DbWeight::get().reads(7))
-			.saturating_add(T::DbWeight::get().writes(2))
+		//  Measured:  `855`
+		//  Estimated: `16590`
+		// Minimum execution time: 42_284_000 picoseconds.
+		Weight::from_parts(42_906_000, 16590)
+			.saturating_add(RocksDbWeight::get().reads(7_u64))
+			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
 	/// Storage: `Stableswap::Pools` (r:1 w:0)
 	/// Proof: `Stableswap::Pools` (`max_values`: None, `max_size`: Some(57), added: 2532, mode: `MaxEncodedLen`)
@@ -89,353 +91,61 @@ impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
 	/// Proof: `Stableswap::AssetTradability` (`max_values`: None, `max_size`: Some(41), added: 2516, mode: `MaxEncodedLen`)
 	/// Storage: `Tokens::Accounts` (r:11 w:11)
 	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::AssetMetadataMap` (r:5 w:0)
-	/// Proof: `AssetRegistry::AssetMetadataMap` (`max_values`: None, `max_size`: Some(46), added: 2521, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::Assets` (r:6 w:0)
+	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
 	/// Storage: `Tokens::TotalIssuance` (r:1 w:1)
 	/// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:6 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::BannedAssets` (r:6 w:0)
+	/// Proof: `AssetRegistry::BannedAssets` (`max_values`: None, `max_size`: Some(20), added: 2495, mode: `MaxEncodedLen`)
 	/// Storage: `System::Account` (r:1 w:1)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	/// Storage: `MultiTransactionPayment::AccountCurrencyMap` (r:1 w:0)
 	/// Proof: `MultiTransactionPayment::AccountCurrencyMap` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
 	/// Storage: `MultiTransactionPayment::AcceptedCurrencies` (r:1 w:0)
 	/// Proof: `MultiTransactionPayment::AcceptedCurrencies` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
+	/// Storage: `Duster::AccountBlacklist` (r:1 w:0)
+	/// Proof: `Duster::AccountBlacklist` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
 	/// Storage: `EmaOracle::Accumulator` (r:1 w:1)
 	/// Proof: `EmaOracle::Accumulator` (`max_values`: Some(1), `max_size`: Some(5921), added: 6416, mode: `MaxEncodedLen`)
 	fn add_liquidity() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3168`
+		//  Measured:  `3471`
 		//  Estimated: `29403`
-		// Minimum execution time: 1_087_109_000 picoseconds.
-		Weight::from_parts(1_090_256_000, 29403)
-			.saturating_add(T::DbWeight::get().reads(33))
-			.saturating_add(T::DbWeight::get().writes(14))
-	}
-	/// Storage: `Stableswap::Pools` (r:1 w:0)
-	/// Proof: `Stableswap::Pools` (`max_values`: None, `max_size`: Some(57), added: 2532, mode: `MaxEncodedLen`)
-	/// Storage: `Tokens::TotalIssuance` (r:1 w:1)
-	/// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
-	/// Storage: `Tokens::Accounts` (r:7 w:3)
-	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::AssetMetadataMap` (r:5 w:0)
-	/// Proof: `AssetRegistry::AssetMetadataMap` (`max_values`: None, `max_size`: Some(46), added: 2521, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:2 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `MultiTransactionPayment::AccountCurrencyMap` (r:1 w:0)
-	/// Proof: `MultiTransactionPayment::AccountCurrencyMap` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
-	/// Storage: `MultiTransactionPayment::AcceptedCurrencies` (r:1 w:0)
-	/// Proof: `MultiTransactionPayment::AcceptedCurrencies` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
-	/// Storage: `EmaOracle::Accumulator` (r:1 w:1)
-	/// Proof: `EmaOracle::Accumulator` (`max_values`: Some(1), `max_size`: Some(5921), added: 6416, mode: `MaxEncodedLen`)
-	fn add_liquidity_shares() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `3014`
-		//  Estimated: `19071`
-		// Minimum execution time: 739_668_000 picoseconds.
-		Weight::from_parts(743_517_000, 19071)
-			.saturating_add(T::DbWeight::get().reads(20))
-			.saturating_add(T::DbWeight::get().writes(6))
+		// Minimum execution time: 1_342_534_000 picoseconds.
+		Weight::from_parts(1_346_186_000, 29403)
+			.saturating_add(RocksDbWeight::get().reads(35_u64))
+			.saturating_add(RocksDbWeight::get().writes(14_u64))
 	}
 	/// Storage: `Stableswap::AssetTradability` (r:1 w:0)
 	/// Proof: `Stableswap::AssetTradability` (`max_values`: None, `max_size`: Some(41), added: 2516, mode: `MaxEncodedLen`)
-	/// Storage: `Tokens::Accounts` (r:7 w:3)
-	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
 	/// Storage: `Stableswap::Pools` (r:1 w:0)
 	/// Proof: `Stableswap::Pools` (`max_values`: None, `max_size`: Some(57), added: 2532, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::AssetMetadataMap` (r:5 w:0)
-	/// Proof: `AssetRegistry::AssetMetadataMap` (`max_values`: None, `max_size`: Some(46), added: 2521, mode: `MaxEncodedLen`)
 	/// Storage: `Tokens::TotalIssuance` (r:1 w:1)
 	/// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:2 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:2 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `MultiTransactionPayment::AcceptedCurrencies` (r:1 w:0)
-	/// Proof: `MultiTransactionPayment::AcceptedCurrencies` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
-	/// Storage: `EmaOracle::Accumulator` (r:1 w:1)
-	/// Proof: `EmaOracle::Accumulator` (`max_values`: Some(1), `max_size`: Some(5921), added: 6416, mode: `MaxEncodedLen`)
-	/// Storage: `MultiTransactionPayment::AccountCurrencyMap` (r:0 w:1)
-	/// Proof: `MultiTransactionPayment::AccountCurrencyMap` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
-	fn remove_liquidity_one_asset() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `3017`
-		//  Estimated: `19071`
-		// Minimum execution time: 777_557_000 picoseconds.
-		Weight::from_parts(781_094_000, 19071)
-			.saturating_add(T::DbWeight::get().reads(21))
-			.saturating_add(T::DbWeight::get().writes(7))
-	}
-	/// Storage: `Stableswap::AssetTradability` (r:1 w:0)
-	/// Proof: `Stableswap::AssetTradability` (`max_values`: None, `max_size`: Some(41), added: 2516, mode: `MaxEncodedLen`)
-	/// Storage: `Stableswap::Pools` (r:1 w:0)
-	/// Proof: `Stableswap::Pools` (`max_values`: None, `max_size`: Some(57), added: 2532, mode: `MaxEncodedLen`)
 	/// Storage: `Tokens::Accounts` (r:7 w:3)
 	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::AssetMetadataMap` (r:5 w:0)
-	/// Proof: `AssetRegistry::AssetMetadataMap` (`max_values`: None, `max_size`: Some(46), added: 2521, mode: `MaxEncodedLen`)
-	/// Storage: `Tokens::TotalIssuance` (r:1 w:1)
-	/// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:2 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:2 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `MultiTransactionPayment::AccountCurrencyMap` (r:1 w:0)
-	/// Proof: `MultiTransactionPayment::AccountCurrencyMap` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
-	/// Storage: `MultiTransactionPayment::AcceptedCurrencies` (r:1 w:0)
-	/// Proof: `MultiTransactionPayment::AcceptedCurrencies` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
-	/// Storage: `EmaOracle::Accumulator` (r:1 w:1)
-	/// Proof: `EmaOracle::Accumulator` (`max_values`: Some(1), `max_size`: Some(5921), added: 6416, mode: `MaxEncodedLen`)
-	fn withdraw_asset_amount() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `3017`
-		//  Estimated: `19071`
-		// Minimum execution time: 1_041_027_000 picoseconds.
-		Weight::from_parts(1_050_193_000, 19071)
-			.saturating_add(T::DbWeight::get().reads(22))
-			.saturating_add(T::DbWeight::get().writes(6))
-	}
-	/// Storage: `Stableswap::AssetTradability` (r:2 w:0)
-	/// Proof: `Stableswap::AssetTradability` (`max_values`: None, `max_size`: Some(41), added: 2516, mode: `MaxEncodedLen`)
-	/// Storage: `Tokens::Accounts` (r:7 w:4)
-	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
-	/// Storage: `Stableswap::Pools` (r:1 w:0)
-	/// Proof: `Stableswap::Pools` (`max_values`: None, `max_size`: Some(57), added: 2532, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::AssetMetadataMap` (r:5 w:0)
-	/// Proof: `AssetRegistry::AssetMetadataMap` (`max_values`: None, `max_size`: Some(46), added: 2521, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:2 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:2 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `MultiTransactionPayment::AcceptedCurrencies` (r:1 w:0)
-	/// Proof: `MultiTransactionPayment::AcceptedCurrencies` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
-	/// Storage: `Tokens::TotalIssuance` (r:1 w:0)
-	/// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
-	/// Storage: `EmaOracle::Accumulator` (r:1 w:1)
-	/// Proof: `EmaOracle::Accumulator` (`max_values`: Some(1), `max_size`: Some(5921), added: 6416, mode: `MaxEncodedLen`)
-	/// Storage: `MultiTransactionPayment::AccountCurrencyMap` (r:0 w:1)
-	/// Proof: `MultiTransactionPayment::AccountCurrencyMap` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
-	fn sell() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `3043`
-		//  Estimated: `19071`
-		// Minimum execution time: 730_301_000 picoseconds.
-		Weight::from_parts(735_887_000, 19071)
-			.saturating_add(T::DbWeight::get().reads(22))
-			.saturating_add(T::DbWeight::get().writes(7))
-	}
-	/// Storage: `Stableswap::AssetTradability` (r:2 w:0)
-	/// Proof: `Stableswap::AssetTradability` (`max_values`: None, `max_size`: Some(41), added: 2516, mode: `MaxEncodedLen`)
-	/// Storage: `Stableswap::Pools` (r:1 w:0)
-	/// Proof: `Stableswap::Pools` (`max_values`: None, `max_size`: Some(57), added: 2532, mode: `MaxEncodedLen`)
-	/// Storage: `Tokens::Accounts` (r:7 w:4)
-	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::AssetMetadataMap` (r:5 w:0)
-	/// Proof: `AssetRegistry::AssetMetadataMap` (`max_values`: None, `max_size`: Some(46), added: 2521, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:2 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:2 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `MultiTransactionPayment::AccountCurrencyMap` (r:1 w:0)
-	/// Proof: `MultiTransactionPayment::AccountCurrencyMap` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
-	/// Storage: `MultiTransactionPayment::AcceptedCurrencies` (r:1 w:0)
-	/// Proof: `MultiTransactionPayment::AcceptedCurrencies` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
-	/// Storage: `Tokens::TotalIssuance` (r:1 w:0)
-	/// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
-	/// Storage: `EmaOracle::Accumulator` (r:1 w:1)
-	/// Proof: `EmaOracle::Accumulator` (`max_values`: Some(1), `max_size`: Some(5921), added: 6416, mode: `MaxEncodedLen`)
-	fn buy() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `3013`
-		//  Estimated: `19071`
-		// Minimum execution time: 710_874_000 picoseconds.
-		Weight::from_parts(714_006_000, 19071)
-			.saturating_add(T::DbWeight::get().reads(23))
-			.saturating_add(T::DbWeight::get().writes(6))
-	}
-	/// Storage: `Stableswap::Pools` (r:1 w:0)
-	/// Proof: `Stableswap::Pools` (`max_values`: None, `max_size`: Some(57), added: 2532, mode: `MaxEncodedLen`)
-	/// Storage: `Stableswap::AssetTradability` (r:1 w:1)
-	/// Proof: `Stableswap::AssetTradability` (`max_values`: None, `max_size`: Some(41), added: 2516, mode: `MaxEncodedLen`)
-	fn set_asset_tradable_state() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `291`
-		//  Estimated: `3522`
-		// Minimum execution time: 25_547_000 picoseconds.
-		Weight::from_parts(25_951_000, 3522)
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Stableswap::Pools` (r:1 w:1)
-	/// Proof: `Stableswap::Pools` (`max_values`: None, `max_size`: Some(57), added: 2532, mode: `MaxEncodedLen`)
-	fn update_pool_fee() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `291`
-		//  Estimated: `3522`
-		// Minimum execution time: 23_026_000 picoseconds.
-		Weight::from_parts(23_457_000, 3522)
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Stableswap::Pools` (r:1 w:1)
-	/// Proof: `Stableswap::Pools` (`max_values`: None, `max_size`: Some(57), added: 2532, mode: `MaxEncodedLen`)
-	fn update_amplification() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `291`
-		//  Estimated: `3522`
-		// Minimum execution time: 24_839_000 picoseconds.
-		Weight::from_parts(25_332_000, 3522)
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Stableswap::Pools` (r:1 w:0)
-	/// Proof: `Stableswap::Pools` (`max_values`: None, `max_size`: Some(57), added: 2532, mode: `MaxEncodedLen`)
-	/// Storage: `Tokens::Accounts` (r:7 w:4)
-	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::AssetMetadataMap` (r:5 w:0)
-	/// Proof: `AssetRegistry::AssetMetadataMap` (`max_values`: None, `max_size`: Some(46), added: 2521, mode: `MaxEncodedLen`)
-	/// Storage: `Stableswap::AssetTradability` (r:2 w:0)
-	/// Proof: `Stableswap::AssetTradability` (`max_values`: None, `max_size`: Some(41), added: 2516, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:2 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:2 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `MultiTransactionPayment::AcceptedCurrencies` (r:1 w:0)
-	/// Proof: `MultiTransactionPayment::AcceptedCurrencies` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
-	/// Storage: `Tokens::TotalIssuance` (r:1 w:0)
-	/// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
-	/// Storage: `EmaOracle::Accumulator` (r:1 w:1)
-	/// Proof: `EmaOracle::Accumulator` (`max_values`: Some(1), `max_size`: Some(5921), added: 6416, mode: `MaxEncodedLen`)
-	/// Storage: `MultiTransactionPayment::AccountCurrencyMap` (r:0 w:1)
-	/// Proof: `MultiTransactionPayment::AccountCurrencyMap` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
-	/// The range of component `c` is `[1, 2]`.
-	/// The range of component `e` is `[0, 1]`.
-	fn router_execution_sell(_c: u32, e: u32) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1276 + e * (1767 ±0)`
-		//  Estimated: `13905 + e * (5797 ±124_823_812_913_251_024)`
-		// Minimum execution time: 305_934_000 picoseconds.
-		Weight::from_parts(312_030_194, 13905)
-			// Standard Error: 324_777
-			.saturating_add(Weight::from_parts(704_923_524, 0).saturating_mul(e.into()))
-			.saturating_add(T::DbWeight::get().reads(11))
-			.saturating_add(T::DbWeight::get().reads((11_u64).saturating_mul(e.into())))
-			.saturating_add(T::DbWeight::get().writes((7_u64).saturating_mul(e.into())))
-			.saturating_add(Weight::from_parts(0, 5797).saturating_mul(e.into()))
-	}
-	/// Storage: `Stableswap::Pools` (r:1 w:0)
-	/// Proof: `Stableswap::Pools` (`max_values`: None, `max_size`: Some(57), added: 2532, mode: `MaxEncodedLen`)
-	/// Storage: `Tokens::Accounts` (r:7 w:4)
-	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::AssetMetadataMap` (r:5 w:0)
-	/// Proof: `AssetRegistry::AssetMetadataMap` (`max_values`: None, `max_size`: Some(46), added: 2521, mode: `MaxEncodedLen`)
-	/// Storage: `Stableswap::AssetTradability` (r:2 w:0)
-	/// Proof: `Stableswap::AssetTradability` (`max_values`: None, `max_size`: Some(41), added: 2516, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:2 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:2 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `MultiTransactionPayment::AccountCurrencyMap` (r:1 w:0)
-	/// Proof: `MultiTransactionPayment::AccountCurrencyMap` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
-	/// Storage: `MultiTransactionPayment::AcceptedCurrencies` (r:1 w:0)
-	/// Proof: `MultiTransactionPayment::AcceptedCurrencies` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
-	/// Storage: `Tokens::TotalIssuance` (r:1 w:0)
-	/// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
-	/// Storage: `EmaOracle::Accumulator` (r:1 w:1)
-	/// Proof: `EmaOracle::Accumulator` (`max_values`: Some(1), `max_size`: Some(5921), added: 6416, mode: `MaxEncodedLen`)
-	/// The range of component `c` is `[1, 2]`.
-	/// The range of component `e` is `[0, 1]`.
-	fn router_execution_buy(c: u32, e: u32) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1275 + e * (1738 ±0)`
-		//  Estimated: `13905 + e * (5797 ±201_913_854_157_949_888)`
-		// Minimum execution time: 304_954_000 picoseconds.
-		Weight::from_parts(306_226_000, 13905)
-			// Standard Error: 3_224_854
-			.saturating_add(Weight::from_parts(12_176_535, 0).saturating_mul(c.into()))
-			// Standard Error: 7_079_475
-			.saturating_add(Weight::from_parts(445_329_428, 0).saturating_mul(e.into()))
-			.saturating_add(T::DbWeight::get().reads(11))
-			.saturating_add(T::DbWeight::get().reads((12_u64).saturating_mul(e.into())))
-			.saturating_add(T::DbWeight::get().writes((6_u64).saturating_mul(e.into())))
-			.saturating_add(Weight::from_parts(0, 5797).saturating_mul(e.into()))
-	}
-}
-
-// For backwards compatibility and tests
-impl WeightInfo for () {
-	/// Storage: `Stableswap::Pools` (r:1 w:1)
-	/// Proof: `Stableswap::Pools` (`max_values`: None, `max_size`: Some(57), added: 2532, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:6 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
-	/// Storage: `Duster::AccountBlacklist` (r:0 w:1)
-	/// Proof: `Duster::AccountBlacklist` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
-	fn create_pool() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `717`
-		//  Estimated: `16362`
-		// Minimum execution time: 52_498_000 picoseconds.
-		Weight::from_parts(52_992_000, 16362)
-			.saturating_add(RocksDbWeight::get().reads(7))
-			.saturating_add(RocksDbWeight::get().writes(2))
-	}
-	/// Storage: `Stableswap::Pools` (r:1 w:0)
-	/// Proof: `Stableswap::Pools` (`max_values`: None, `max_size`: Some(57), added: 2532, mode: `MaxEncodedLen`)
-	/// Storage: `Stableswap::AssetTradability` (r:5 w:0)
-	/// Proof: `Stableswap::AssetTradability` (`max_values`: None, `max_size`: Some(41), added: 2516, mode: `MaxEncodedLen`)
-	/// Storage: `Tokens::Accounts` (r:11 w:11)
-	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::AssetMetadataMap` (r:5 w:0)
-	/// Proof: `AssetRegistry::AssetMetadataMap` (`max_values`: None, `max_size`: Some(46), added: 2521, mode: `MaxEncodedLen`)
-	/// Storage: `Tokens::TotalIssuance` (r:1 w:1)
-	/// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
 	/// Storage: `AssetRegistry::Assets` (r:6 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `MultiTransactionPayment::AccountCurrencyMap` (r:1 w:0)
-	/// Proof: `MultiTransactionPayment::AccountCurrencyMap` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
-	/// Storage: `MultiTransactionPayment::AcceptedCurrencies` (r:1 w:0)
-	/// Proof: `MultiTransactionPayment::AcceptedCurrencies` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
-	/// Storage: `EmaOracle::Accumulator` (r:1 w:1)
-	/// Proof: `EmaOracle::Accumulator` (`max_values`: Some(1), `max_size`: Some(5921), added: 6416, mode: `MaxEncodedLen`)
-	fn add_liquidity() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `3168`
-		//  Estimated: `29403`
-		// Minimum execution time: 1_087_109_000 picoseconds.
-		Weight::from_parts(1_090_256_000, 29403)
-			.saturating_add(RocksDbWeight::get().reads(33))
-			.saturating_add(RocksDbWeight::get().writes(14))
-	}
-	/// Storage: `Stableswap::Pools` (r:1 w:0)
-	/// Proof: `Stableswap::Pools` (`max_values`: None, `max_size`: Some(57), added: 2532, mode: `MaxEncodedLen`)
-	/// Storage: `Tokens::TotalIssuance` (r:1 w:1)
-	/// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
-	/// Storage: `Tokens::Accounts` (r:7 w:3)
-	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::AssetMetadataMap` (r:5 w:0)
-	/// Proof: `AssetRegistry::AssetMetadataMap` (`max_values`: None, `max_size`: Some(46), added: 2521, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:2 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
+	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::BannedAssets` (r:2 w:0)
+	/// Proof: `AssetRegistry::BannedAssets` (`max_values`: None, `max_size`: Some(20), added: 2495, mode: `MaxEncodedLen`)
 	/// Storage: `System::Account` (r:1 w:1)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	/// Storage: `MultiTransactionPayment::AccountCurrencyMap` (r:1 w:0)
 	/// Proof: `MultiTransactionPayment::AccountCurrencyMap` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
 	/// Storage: `MultiTransactionPayment::AcceptedCurrencies` (r:1 w:0)
 	/// Proof: `MultiTransactionPayment::AcceptedCurrencies` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
+	/// Storage: `Duster::AccountBlacklist` (r:1 w:0)
+	/// Proof: `Duster::AccountBlacklist` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
 	/// Storage: `EmaOracle::Accumulator` (r:1 w:1)
 	/// Proof: `EmaOracle::Accumulator` (`max_values`: Some(1), `max_size`: Some(5921), added: 6416, mode: `MaxEncodedLen`)
 	fn add_liquidity_shares() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3014`
+		//  Measured:  `3339`
 		//  Estimated: `19071`
-		// Minimum execution time: 739_668_000 picoseconds.
-		Weight::from_parts(743_517_000, 19071)
-			.saturating_add(RocksDbWeight::get().reads(20))
-			.saturating_add(RocksDbWeight::get().writes(6))
+		// Minimum execution time: 896_494_000 picoseconds.
+		Weight::from_parts(900_100_000, 19071)
+			.saturating_add(RocksDbWeight::get().reads(23_u64))
+			.saturating_add(RocksDbWeight::get().writes(6_u64))
 	}
 	/// Storage: `Stableswap::AssetTradability` (r:1 w:0)
 	/// Proof: `Stableswap::AssetTradability` (`max_values`: None, `max_size`: Some(41), added: 2516, mode: `MaxEncodedLen`)
@@ -443,14 +153,16 @@ impl WeightInfo for () {
 	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
 	/// Storage: `Stableswap::Pools` (r:1 w:0)
 	/// Proof: `Stableswap::Pools` (`max_values`: None, `max_size`: Some(57), added: 2532, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::AssetMetadataMap` (r:5 w:0)
-	/// Proof: `AssetRegistry::AssetMetadataMap` (`max_values`: None, `max_size`: Some(46), added: 2521, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::Assets` (r:6 w:0)
+	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
 	/// Storage: `Tokens::TotalIssuance` (r:1 w:1)
 	/// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:2 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
 	/// Storage: `System::Account` (r:2 w:1)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `Duster::AccountBlacklist` (r:1 w:0)
+	/// Proof: `Duster::AccountBlacklist` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::BannedAssets` (r:1 w:0)
+	/// Proof: `AssetRegistry::BannedAssets` (`max_values`: None, `max_size`: Some(20), added: 2495, mode: `MaxEncodedLen`)
 	/// Storage: `MultiTransactionPayment::AcceptedCurrencies` (r:1 w:0)
 	/// Proof: `MultiTransactionPayment::AcceptedCurrencies` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
 	/// Storage: `EmaOracle::Accumulator` (r:1 w:1)
@@ -459,12 +171,12 @@ impl WeightInfo for () {
 	/// Proof: `MultiTransactionPayment::AccountCurrencyMap` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
 	fn remove_liquidity_one_asset() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3017`
+		//  Measured:  `3363`
 		//  Estimated: `19071`
-		// Minimum execution time: 777_557_000 picoseconds.
-		Weight::from_parts(781_094_000, 19071)
-			.saturating_add(RocksDbWeight::get().reads(21))
-			.saturating_add(RocksDbWeight::get().writes(7))
+		// Minimum execution time: 921_757_000 picoseconds.
+		Weight::from_parts(924_632_000, 19071)
+			.saturating_add(RocksDbWeight::get().reads(22_u64))
+			.saturating_add(RocksDbWeight::get().writes(7_u64))
 	}
 	/// Storage: `Stableswap::AssetTradability` (r:1 w:0)
 	/// Proof: `Stableswap::AssetTradability` (`max_values`: None, `max_size`: Some(41), added: 2516, mode: `MaxEncodedLen`)
@@ -472,12 +184,14 @@ impl WeightInfo for () {
 	/// Proof: `Stableswap::Pools` (`max_values`: None, `max_size`: Some(57), added: 2532, mode: `MaxEncodedLen`)
 	/// Storage: `Tokens::Accounts` (r:7 w:3)
 	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::AssetMetadataMap` (r:5 w:0)
-	/// Proof: `AssetRegistry::AssetMetadataMap` (`max_values`: None, `max_size`: Some(46), added: 2521, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::Assets` (r:6 w:0)
+	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
 	/// Storage: `Tokens::TotalIssuance` (r:1 w:1)
 	/// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:2 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
+	/// Storage: `Duster::AccountBlacklist` (r:1 w:0)
+	/// Proof: `Duster::AccountBlacklist` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::BannedAssets` (r:1 w:0)
+	/// Proof: `AssetRegistry::BannedAssets` (`max_values`: None, `max_size`: Some(20), added: 2495, mode: `MaxEncodedLen`)
 	/// Storage: `System::Account` (r:2 w:1)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	/// Storage: `MultiTransactionPayment::AccountCurrencyMap` (r:1 w:0)
@@ -488,12 +202,12 @@ impl WeightInfo for () {
 	/// Proof: `EmaOracle::Accumulator` (`max_values`: Some(1), `max_size`: Some(5921), added: 6416, mode: `MaxEncodedLen`)
 	fn withdraw_asset_amount() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3017`
+		//  Measured:  `3363`
 		//  Estimated: `19071`
-		// Minimum execution time: 1_041_027_000 picoseconds.
-		Weight::from_parts(1_050_193_000, 19071)
-			.saturating_add(RocksDbWeight::get().reads(22))
-			.saturating_add(RocksDbWeight::get().writes(6))
+		// Minimum execution time: 1_266_805_000 picoseconds.
+		Weight::from_parts(1_272_407_000, 19071)
+			.saturating_add(RocksDbWeight::get().reads(23_u64))
+			.saturating_add(RocksDbWeight::get().writes(6_u64))
 	}
 	/// Storage: `Stableswap::AssetTradability` (r:2 w:0)
 	/// Proof: `Stableswap::AssetTradability` (`max_values`: None, `max_size`: Some(41), added: 2516, mode: `MaxEncodedLen`)
@@ -501,10 +215,12 @@ impl WeightInfo for () {
 	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
 	/// Storage: `Stableswap::Pools` (r:1 w:0)
 	/// Proof: `Stableswap::Pools` (`max_values`: None, `max_size`: Some(57), added: 2532, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::AssetMetadataMap` (r:5 w:0)
-	/// Proof: `AssetRegistry::AssetMetadataMap` (`max_values`: None, `max_size`: Some(46), added: 2521, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:2 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::Assets` (r:6 w:0)
+	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
+	/// Storage: `Duster::AccountBlacklist` (r:2 w:0)
+	/// Proof: `Duster::AccountBlacklist` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::BannedAssets` (r:2 w:0)
+	/// Proof: `AssetRegistry::BannedAssets` (`max_values`: None, `max_size`: Some(20), added: 2495, mode: `MaxEncodedLen`)
 	/// Storage: `System::Account` (r:2 w:1)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	/// Storage: `MultiTransactionPayment::AcceptedCurrencies` (r:1 w:0)
@@ -517,12 +233,12 @@ impl WeightInfo for () {
 	/// Proof: `MultiTransactionPayment::AccountCurrencyMap` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
 	fn sell() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3043`
+		//  Measured:  `3426`
 		//  Estimated: `19071`
-		// Minimum execution time: 730_301_000 picoseconds.
-		Weight::from_parts(735_887_000, 19071)
-			.saturating_add(RocksDbWeight::get().reads(22))
-			.saturating_add(RocksDbWeight::get().writes(7))
+		// Minimum execution time: 863_718_000 picoseconds.
+		Weight::from_parts(866_668_000, 19071)
+			.saturating_add(RocksDbWeight::get().reads(25_u64))
+			.saturating_add(RocksDbWeight::get().writes(7_u64))
 	}
 	/// Storage: `Stableswap::AssetTradability` (r:2 w:0)
 	/// Proof: `Stableswap::AssetTradability` (`max_values`: None, `max_size`: Some(41), added: 2516, mode: `MaxEncodedLen`)
@@ -530,10 +246,12 @@ impl WeightInfo for () {
 	/// Proof: `Stableswap::Pools` (`max_values`: None, `max_size`: Some(57), added: 2532, mode: `MaxEncodedLen`)
 	/// Storage: `Tokens::Accounts` (r:7 w:4)
 	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::AssetMetadataMap` (r:5 w:0)
-	/// Proof: `AssetRegistry::AssetMetadataMap` (`max_values`: None, `max_size`: Some(46), added: 2521, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:2 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::Assets` (r:6 w:0)
+	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
+	/// Storage: `Duster::AccountBlacklist` (r:2 w:0)
+	/// Proof: `Duster::AccountBlacklist` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::BannedAssets` (r:2 w:0)
+	/// Proof: `AssetRegistry::BannedAssets` (`max_values`: None, `max_size`: Some(20), added: 2495, mode: `MaxEncodedLen`)
 	/// Storage: `System::Account` (r:2 w:1)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	/// Storage: `MultiTransactionPayment::AccountCurrencyMap` (r:1 w:0)
@@ -546,12 +264,12 @@ impl WeightInfo for () {
 	/// Proof: `EmaOracle::Accumulator` (`max_values`: Some(1), `max_size`: Some(5921), added: 6416, mode: `MaxEncodedLen`)
 	fn buy() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3013`
+		//  Measured:  `3396`
 		//  Estimated: `19071`
-		// Minimum execution time: 710_874_000 picoseconds.
-		Weight::from_parts(714_006_000, 19071)
-			.saturating_add(RocksDbWeight::get().reads(23))
-			.saturating_add(RocksDbWeight::get().writes(6))
+		// Minimum execution time: 846_241_000 picoseconds.
+		Weight::from_parts(850_907_000, 19071)
+			.saturating_add(RocksDbWeight::get().reads(26_u64))
+			.saturating_add(RocksDbWeight::get().writes(6_u64))
 	}
 	/// Storage: `Stableswap::Pools` (r:1 w:0)
 	/// Proof: `Stableswap::Pools` (`max_values`: None, `max_size`: Some(57), added: 2532, mode: `MaxEncodedLen`)
@@ -561,10 +279,10 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `291`
 		//  Estimated: `3522`
-		// Minimum execution time: 25_547_000 picoseconds.
-		Weight::from_parts(25_951_000, 3522)
-			.saturating_add(RocksDbWeight::get().reads(2))
-			.saturating_add(RocksDbWeight::get().writes(1))
+		// Minimum execution time: 20_725_000 picoseconds.
+		Weight::from_parts(21_012_000, 3522)
+			.saturating_add(RocksDbWeight::get().reads(2_u64))
+			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
 	/// Storage: `Stableswap::Pools` (r:1 w:1)
 	/// Proof: `Stableswap::Pools` (`max_values`: None, `max_size`: Some(57), added: 2532, mode: `MaxEncodedLen`)
@@ -572,10 +290,10 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `291`
 		//  Estimated: `3522`
-		// Minimum execution time: 23_026_000 picoseconds.
-		Weight::from_parts(23_457_000, 3522)
-			.saturating_add(RocksDbWeight::get().reads(1))
-			.saturating_add(RocksDbWeight::get().writes(1))
+		// Minimum execution time: 18_190_000 picoseconds.
+		Weight::from_parts(18_524_000, 3522)
+			.saturating_add(RocksDbWeight::get().reads(1_u64))
+			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
 	/// Storage: `Stableswap::Pools` (r:1 w:1)
 	/// Proof: `Stableswap::Pools` (`max_values`: None, `max_size`: Some(57), added: 2532, mode: `MaxEncodedLen`)
@@ -583,21 +301,23 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `291`
 		//  Estimated: `3522`
-		// Minimum execution time: 24_839_000 picoseconds.
-		Weight::from_parts(25_332_000, 3522)
-			.saturating_add(RocksDbWeight::get().reads(1))
-			.saturating_add(RocksDbWeight::get().writes(1))
+		// Minimum execution time: 19_133_000 picoseconds.
+		Weight::from_parts(19_315_000, 3522)
+			.saturating_add(RocksDbWeight::get().reads(1_u64))
+			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
 	/// Storage: `Stableswap::Pools` (r:1 w:0)
 	/// Proof: `Stableswap::Pools` (`max_values`: None, `max_size`: Some(57), added: 2532, mode: `MaxEncodedLen`)
 	/// Storage: `Tokens::Accounts` (r:7 w:4)
 	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::AssetMetadataMap` (r:5 w:0)
-	/// Proof: `AssetRegistry::AssetMetadataMap` (`max_values`: None, `max_size`: Some(46), added: 2521, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::Assets` (r:6 w:0)
+	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
 	/// Storage: `Stableswap::AssetTradability` (r:2 w:0)
 	/// Proof: `Stableswap::AssetTradability` (`max_values`: None, `max_size`: Some(41), added: 2516, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:2 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
+	/// Storage: `Duster::AccountBlacklist` (r:2 w:0)
+	/// Proof: `Duster::AccountBlacklist` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::BannedAssets` (r:2 w:0)
+	/// Proof: `AssetRegistry::BannedAssets` (`max_values`: None, `max_size`: Some(20), added: 2495, mode: `MaxEncodedLen`)
 	/// Storage: `System::Account` (r:2 w:1)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	/// Storage: `MultiTransactionPayment::AcceptedCurrencies` (r:1 w:0)
@@ -610,29 +330,33 @@ impl WeightInfo for () {
 	/// Proof: `MultiTransactionPayment::AccountCurrencyMap` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
 	/// The range of component `c` is `[1, 2]`.
 	/// The range of component `e` is `[0, 1]`.
-	fn router_execution_sell(_c: u32, e: u32) -> Weight {
+	fn router_execution_sell(c: u32, e: u32) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1276 + e * (1767 ±0)`
-		//  Estimated: `13905 + e * (5797 ±124_823_812_913_251_024)`
-		// Minimum execution time: 305_934_000 picoseconds.
-		Weight::from_parts(312_030_194, 13905)
-			// Standard Error: 324_777
-			.saturating_add(Weight::from_parts(704_923_524, 0).saturating_mul(e.into()))
-			.saturating_add(RocksDbWeight::get().reads(11))
-			.saturating_add(RocksDbWeight::get().reads((11_u64).saturating_mul(e.into())))
+		//  Measured:  `1621 + e * (1805 ±0)`
+		//  Estimated: `13990 + e * (5166 ±0)`
+		// Minimum execution time: 376_396_000 picoseconds.
+		Weight::from_parts(353_453_826, 13990)
+			// Standard Error: 838_992
+			.saturating_add(Weight::from_parts(12_974_831, 0).saturating_mul(c.into()))
+			// Standard Error: 838_992
+			.saturating_add(Weight::from_parts(852_434_060, 0).saturating_mul(e.into()))
+			.saturating_add(RocksDbWeight::get().reads(11_u64))
+			.saturating_add(RocksDbWeight::get().reads((14_u64).saturating_mul(e.into())))
 			.saturating_add(RocksDbWeight::get().writes((7_u64).saturating_mul(e.into())))
-			.saturating_add(Weight::from_parts(0, 5797).saturating_mul(e.into()))
+			.saturating_add(Weight::from_parts(0, 5166).saturating_mul(e.into()))
 	}
 	/// Storage: `Stableswap::Pools` (r:1 w:0)
 	/// Proof: `Stableswap::Pools` (`max_values`: None, `max_size`: Some(57), added: 2532, mode: `MaxEncodedLen`)
 	/// Storage: `Tokens::Accounts` (r:7 w:4)
 	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::AssetMetadataMap` (r:5 w:0)
-	/// Proof: `AssetRegistry::AssetMetadataMap` (`max_values`: None, `max_size`: Some(46), added: 2521, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::Assets` (r:6 w:0)
+	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
 	/// Storage: `Stableswap::AssetTradability` (r:2 w:0)
 	/// Proof: `Stableswap::AssetTradability` (`max_values`: None, `max_size`: Some(41), added: 2516, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:2 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
+	/// Storage: `Duster::AccountBlacklist` (r:2 w:0)
+	/// Proof: `Duster::AccountBlacklist` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::BannedAssets` (r:2 w:0)
+	/// Proof: `AssetRegistry::BannedAssets` (`max_values`: None, `max_size`: Some(20), added: 2495, mode: `MaxEncodedLen`)
 	/// Storage: `System::Account` (r:2 w:1)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	/// Storage: `MultiTransactionPayment::AccountCurrencyMap` (r:1 w:0)
@@ -647,17 +371,17 @@ impl WeightInfo for () {
 	/// The range of component `e` is `[0, 1]`.
 	fn router_execution_buy(c: u32, e: u32) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1275 + e * (1738 ±0)`
-		//  Estimated: `13905 + e * (5797 ±201_913_854_157_949_888)`
-		// Minimum execution time: 304_954_000 picoseconds.
-		Weight::from_parts(306_226_000, 13905)
-			// Standard Error: 3_224_854
-			.saturating_add(Weight::from_parts(12_176_535, 0).saturating_mul(c.into()))
-			// Standard Error: 7_079_475
-			.saturating_add(Weight::from_parts(445_329_428, 0).saturating_mul(e.into()))
-			.saturating_add(RocksDbWeight::get().reads(11))
-			.saturating_add(RocksDbWeight::get().reads((12_u64).saturating_mul(e.into())))
+		//  Measured:  `1620 + e * (1776 ±0)`
+		//  Estimated: `13990 + e * (5166 ±0)`
+		// Minimum execution time: 375_050_000 picoseconds.
+		Weight::from_parts(376_366_000, 13990)
+			// Standard Error: 1_073_561
+			.saturating_add(Weight::from_parts(3_994_783, 0).saturating_mul(c.into()))
+			// Standard Error: 2_391_123
+			.saturating_add(Weight::from_parts(488_537_240, 0).saturating_mul(e.into()))
+			.saturating_add(RocksDbWeight::get().reads(11_u64))
+			.saturating_add(RocksDbWeight::get().reads((15_u64).saturating_mul(e.into())))
 			.saturating_add(RocksDbWeight::get().writes((6_u64).saturating_mul(e.into())))
-			.saturating_add(Weight::from_parts(0, 5797).saturating_mul(e.into()))
+			.saturating_add(Weight::from_parts(0, 5166).saturating_mul(e.into()))
 	}
 }
diff --git a/pallets/staking/Cargo.toml b/pallets/staking/Cargo.toml
index db02e77d5..35a8b2dbd 100644
--- a/pallets/staking/Cargo.toml
+++ b/pallets/staking/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-staking"
-version = "3.1.0"
+version = "3.1.1"
 authors = ['GalacticCouncil']
 edition = "2021"
 license = "Apache-2.0"
diff --git a/pallets/staking/src/tests/mock.rs b/pallets/staking/src/tests/mock.rs
index 90d5b6ecf..d149fb4e6 100644
--- a/pallets/staking/src/tests/mock.rs
+++ b/pallets/staking/src/tests/mock.rs
@@ -91,6 +91,7 @@ impl frame_system::Config for Test {
 	type BlockLength = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
+	type RuntimeTask = RuntimeTask;
 	type Nonce = u64;
 	type Block = Block;
 	type Hash = H256;
@@ -126,8 +127,8 @@ impl pallet_balances::Config for Test {
 	type ReserveIdentifier = [u8; 8];
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
-	type MaxHolds = ();
 	type RuntimeHoldReason = ();
+	type RuntimeFreezeReason = ();
 }
 
 parameter_types! {
diff --git a/pallets/staking/src/weights.rs b/pallets/staking/src/weights.rs
index 42d55e902..46c45c092 100644
--- a/pallets/staking/src/weights.rs
+++ b/pallets/staking/src/weights.rs
@@ -17,8 +17,8 @@
 
 //! Autogenerated weights for `pallet_staking`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-12-12, STEPS: `5`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-05-29, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
 //! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
@@ -27,17 +27,15 @@
 // target/release/hydradx
 // benchmark
 // pallet
-// --pallet=pallet-staking
+// --chain=dev
+// --steps=10
+// --repeat=30
 // --wasm-execution=compiled
 // --heap-pages=4096
-// --chain=dev
+// --template=scripts/pallet-weight-template.hbs
+// --pallet=pallet-staking
+// --output=weights/staking.rs
 // --extrinsic=*
-// --steps=5
-// --repeat=20
-// --output
-// ./weights-1.1.0/staking.rs
-// --template
-// .maintain/pallet-weight-template-no-back.hbs
 
 #![allow(unused_parens)]
 #![allow(unused_imports)]
@@ -59,139 +57,6 @@ pub trait WeightInfo {
 }
 
 /// Weights for pallet_staking using the hydraDX node and recommended hardware.
-pub struct HydraWeight<T>(PhantomData<T>);
-
-impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
-	/// Storage: `Staking::Staking` (r:1 w:1)
-	/// Proof: `Staking::Staking` (`max_values`: Some(1), `max_size`: Some(48), added: 543, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:0)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::Class` (r:1 w:1)
-	/// Proof: `Uniques::Class` (`max_values`: None, `max_size`: Some(190), added: 2665, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::ClassAccount` (r:0 w:1)
-	/// Proof: `Uniques::ClassAccount` (`max_values`: None, `max_size`: Some(80), added: 2555, mode: `MaxEncodedLen`)
-	fn initialize_staking() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `513`
-		//  Estimated: `3655`
-		// Minimum execution time: 46_433_000 picoseconds.
-		Weight::from_parts(47_121_000, 3655)
-			.saturating_add(T::DbWeight::get().reads(3_u64))
-			.saturating_add(T::DbWeight::get().writes(3_u64))
-	}
-	/// Storage: `Staking::Staking` (r:1 w:1)
-	/// Proof: `Staking::Staking` (`max_values`: Some(1), `max_size`: Some(48), added: 543, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::Account` (r:1 w:1)
-	/// Proof: `Uniques::Account` (`max_values`: None, `max_size`: Some(112), added: 2587, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:2 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `Balances::Locks` (r:1 w:1)
-	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
-	/// Storage: `Staking::NextPositionId` (r:1 w:1)
-	/// Proof: `Staking::NextPositionId` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::Asset` (r:1 w:1)
-	/// Proof: `Uniques::Asset` (`max_values`: None, `max_size`: Some(146), added: 2621, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::Class` (r:1 w:1)
-	/// Proof: `Uniques::Class` (`max_values`: None, `max_size`: Some(190), added: 2665, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::CollectionMaxSupply` (r:1 w:0)
-	/// Proof: `Uniques::CollectionMaxSupply` (`max_values`: None, `max_size`: Some(36), added: 2511, mode: `MaxEncodedLen`)
-	/// Storage: `Balances::Freezes` (r:1 w:0)
-	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(49), added: 2524, mode: `MaxEncodedLen`)
-	/// Storage: `Staking::Positions` (r:0 w:1)
-	/// Proof: `Staking::Positions` (`max_values`: None, `max_size`: Some(132), added: 2607, mode: `MaxEncodedLen`)
-	fn stake() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1240`
-		//  Estimated: `6196`
-		// Minimum execution time: 113_477_000 picoseconds.
-		Weight::from_parts(114_557_000, 6196)
-			.saturating_add(T::DbWeight::get().reads(10_u64))
-			.saturating_add(T::DbWeight::get().writes(8_u64))
-	}
-	/// Storage: `Staking::Staking` (r:1 w:1)
-	/// Proof: `Staking::Staking` (`max_values`: Some(1), `max_size`: Some(48), added: 543, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::Asset` (r:1 w:0)
-	/// Proof: `Uniques::Asset` (`max_values`: None, `max_size`: Some(146), added: 2621, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:2 w:2)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `Staking::Positions` (r:1 w:1)
-	/// Proof: `Staking::Positions` (`max_values`: None, `max_size`: Some(132), added: 2607, mode: `MaxEncodedLen`)
-	/// Storage: `Balances::Locks` (r:1 w:1)
-	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
-	/// Storage: `Staking::PositionVotes` (r:1 w:1)
-	/// Proof: `Staking::PositionVotes` (`max_values`: None, `max_size`: Some(2134), added: 4609, mode: `MaxEncodedLen`)
-	/// Storage: `Democracy::ReferendumInfoOf` (r:100 w:0)
-	/// Proof: `Democracy::ReferendumInfoOf` (`max_values`: None, `max_size`: Some(201), added: 2676, mode: `MaxEncodedLen`)
-	/// Storage: `Balances::Freezes` (r:1 w:0)
-	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(49), added: 2524, mode: `MaxEncodedLen`)
-	fn increase_stake() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `3379`
-		//  Estimated: `268590`
-		// Minimum execution time: 297_204_000 picoseconds.
-		Weight::from_parts(300_714_000, 268590)
-			.saturating_add(T::DbWeight::get().reads(108_u64))
-			.saturating_add(T::DbWeight::get().writes(6_u64))
-	}
-	/// Storage: `Staking::Staking` (r:1 w:1)
-	/// Proof: `Staking::Staking` (`max_values`: Some(1), `max_size`: Some(48), added: 543, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::Asset` (r:1 w:0)
-	/// Proof: `Uniques::Asset` (`max_values`: None, `max_size`: Some(146), added: 2621, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:2 w:2)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `Staking::Positions` (r:1 w:1)
-	/// Proof: `Staking::Positions` (`max_values`: None, `max_size`: Some(132), added: 2607, mode: `MaxEncodedLen`)
-	/// Storage: `Staking::PositionVotes` (r:1 w:1)
-	/// Proof: `Staking::PositionVotes` (`max_values`: None, `max_size`: Some(2134), added: 4609, mode: `MaxEncodedLen`)
-	/// Storage: `Democracy::ReferendumInfoOf` (r:100 w:0)
-	/// Proof: `Democracy::ReferendumInfoOf` (`max_values`: None, `max_size`: Some(201), added: 2676, mode: `MaxEncodedLen`)
-	/// Storage: `Balances::Locks` (r:1 w:1)
-	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
-	/// Storage: `Balances::Freezes` (r:1 w:0)
-	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(49), added: 2524, mode: `MaxEncodedLen`)
-	fn claim() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `3379`
-		//  Estimated: `268590`
-		// Minimum execution time: 291_136_000 picoseconds.
-		Weight::from_parts(294_313_000, 268590)
-			.saturating_add(T::DbWeight::get().reads(108_u64))
-			.saturating_add(T::DbWeight::get().writes(6_u64))
-	}
-	/// Storage: `Staking::Staking` (r:1 w:1)
-	/// Proof: `Staking::Staking` (`max_values`: Some(1), `max_size`: Some(48), added: 543, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::Asset` (r:1 w:1)
-	/// Proof: `Uniques::Asset` (`max_values`: None, `max_size`: Some(146), added: 2621, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:2 w:2)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `Staking::Positions` (r:1 w:1)
-	/// Proof: `Staking::Positions` (`max_values`: None, `max_size`: Some(132), added: 2607, mode: `MaxEncodedLen`)
-	/// Storage: `Staking::PositionVotes` (r:1 w:1)
-	/// Proof: `Staking::PositionVotes` (`max_values`: None, `max_size`: Some(2134), added: 4609, mode: `MaxEncodedLen`)
-	/// Storage: `Democracy::ReferendumInfoOf` (r:100 w:0)
-	/// Proof: `Democracy::ReferendumInfoOf` (`max_values`: None, `max_size`: Some(201), added: 2676, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::Class` (r:1 w:1)
-	/// Proof: `Uniques::Class` (`max_values`: None, `max_size`: Some(190), added: 2665, mode: `MaxEncodedLen`)
-	/// Storage: `Balances::Locks` (r:1 w:1)
-	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
-	/// Storage: `Balances::Freezes` (r:1 w:0)
-	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(49), added: 2524, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::Account` (r:0 w:1)
-	/// Proof: `Uniques::Account` (`max_values`: None, `max_size`: Some(112), added: 2587, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::ItemPriceOf` (r:0 w:1)
-	/// Proof: `Uniques::ItemPriceOf` (`max_values`: None, `max_size`: Some(113), added: 2588, mode: `MaxEncodedLen`)
-	fn unstake() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `3598`
-		//  Estimated: `268590`
-		// Minimum execution time: 330_733_000 picoseconds.
-		Weight::from_parts(334_301_000, 268590)
-			.saturating_add(T::DbWeight::get().reads(109_u64))
-			.saturating_add(T::DbWeight::get().writes(10_u64))
-	}
-}
-
-// For backwards compatibility and tests
 impl WeightInfo for () {
 	/// Storage: `Staking::Staking` (r:1 w:1)
 	/// Proof: `Staking::Staking` (`max_values`: Some(1), `max_size`: Some(48), added: 543, mode: `MaxEncodedLen`)
@@ -203,10 +68,10 @@ impl WeightInfo for () {
 	/// Proof: `Uniques::ClassAccount` (`max_values`: None, `max_size`: Some(80), added: 2555, mode: `MaxEncodedLen`)
 	fn initialize_staking() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `513`
+		//  Measured:  `516`
 		//  Estimated: `3655`
-		// Minimum execution time: 46_433_000 picoseconds.
-		Weight::from_parts(47_121_000, 3655)
+		// Minimum execution time: 34_969_000 picoseconds.
+		Weight::from_parts(35_577_000, 3655)
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 	}
@@ -232,10 +97,10 @@ impl WeightInfo for () {
 	/// Proof: `Staking::Positions` (`max_values`: None, `max_size`: Some(132), added: 2607, mode: `MaxEncodedLen`)
 	fn stake() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1240`
+		//  Measured:  `1274`
 		//  Estimated: `6196`
-		// Minimum execution time: 113_477_000 picoseconds.
-		Weight::from_parts(114_557_000, 6196)
+		// Minimum execution time: 89_837_000 picoseconds.
+		Weight::from_parts(90_522_000, 6196)
 			.saturating_add(RocksDbWeight::get().reads(10_u64))
 			.saturating_add(RocksDbWeight::get().writes(8_u64))
 	}
@@ -243,6 +108,8 @@ impl WeightInfo for () {
 	/// Proof: `Staking::Staking` (`max_values`: Some(1), `max_size`: Some(48), added: 543, mode: `MaxEncodedLen`)
 	/// Storage: `Uniques::Asset` (r:1 w:0)
 	/// Proof: `Uniques::Asset` (`max_values`: None, `max_size`: Some(146), added: 2621, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::ProcessedVotes` (r:1 w:0)
+	/// Proof: `Staking::ProcessedVotes` (`max_values`: None, `max_size`: Some(85), added: 2560, mode: `MaxEncodedLen`)
 	/// Storage: `System::Account` (r:2 w:2)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	/// Storage: `Staking::Positions` (r:1 w:1)
@@ -259,15 +126,17 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `3379`
 		//  Estimated: `268590`
-		// Minimum execution time: 297_204_000 picoseconds.
-		Weight::from_parts(300_714_000, 268590)
-			.saturating_add(RocksDbWeight::get().reads(108_u64))
+		// Minimum execution time: 260_523_000 picoseconds.
+		Weight::from_parts(264_621_000, 268590)
+			.saturating_add(RocksDbWeight::get().reads(109_u64))
 			.saturating_add(RocksDbWeight::get().writes(6_u64))
 	}
 	/// Storage: `Staking::Staking` (r:1 w:1)
 	/// Proof: `Staking::Staking` (`max_values`: Some(1), `max_size`: Some(48), added: 543, mode: `MaxEncodedLen`)
 	/// Storage: `Uniques::Asset` (r:1 w:0)
 	/// Proof: `Uniques::Asset` (`max_values`: None, `max_size`: Some(146), added: 2621, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::ProcessedVotes` (r:1 w:0)
+	/// Proof: `Staking::ProcessedVotes` (`max_values`: None, `max_size`: Some(85), added: 2560, mode: `MaxEncodedLen`)
 	/// Storage: `System::Account` (r:2 w:2)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	/// Storage: `Staking::Positions` (r:1 w:1)
@@ -284,9 +153,9 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `3379`
 		//  Estimated: `268590`
-		// Minimum execution time: 291_136_000 picoseconds.
-		Weight::from_parts(294_313_000, 268590)
-			.saturating_add(RocksDbWeight::get().reads(108_u64))
+		// Minimum execution time: 256_924_000 picoseconds.
+		Weight::from_parts(260_188_000, 268590)
+			.saturating_add(RocksDbWeight::get().reads(109_u64))
 			.saturating_add(RocksDbWeight::get().writes(6_u64))
 	}
 	/// Storage: `Staking::Staking` (r:1 w:1)
@@ -299,8 +168,8 @@ impl WeightInfo for () {
 	/// Proof: `Staking::Positions` (`max_values`: None, `max_size`: Some(132), added: 2607, mode: `MaxEncodedLen`)
 	/// Storage: `Staking::PositionVotes` (r:1 w:1)
 	/// Proof: `Staking::PositionVotes` (`max_values`: None, `max_size`: Some(2134), added: 4609, mode: `MaxEncodedLen`)
-	/// Storage: `Democracy::ReferendumInfoOf` (r:100 w:0)
-	/// Proof: `Democracy::ReferendumInfoOf` (`max_values`: None, `max_size`: Some(201), added: 2676, mode: `MaxEncodedLen`)
+	/// Storage: `Staking::ProcessedVotes` (r:1 w:0)
+	/// Proof: `Staking::ProcessedVotes` (`max_values`: None, `max_size`: Some(85), added: 2560, mode: `MaxEncodedLen`)
 	/// Storage: `Uniques::Class` (r:1 w:1)
 	/// Proof: `Uniques::Class` (`max_values`: None, `max_size`: Some(190), added: 2665, mode: `MaxEncodedLen`)
 	/// Storage: `Balances::Locks` (r:1 w:1)
@@ -313,11 +182,11 @@ impl WeightInfo for () {
 	/// Proof: `Uniques::ItemPriceOf` (`max_values`: None, `max_size`: Some(113), added: 2588, mode: `MaxEncodedLen`)
 	fn unstake() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3598`
-		//  Estimated: `268590`
-		// Minimum execution time: 330_733_000 picoseconds.
-		Weight::from_parts(334_301_000, 268590)
-			.saturating_add(RocksDbWeight::get().reads(109_u64))
+		//  Measured:  `1431`
+		//  Estimated: `6196`
+		// Minimum execution time: 136_034_000 picoseconds.
+		Weight::from_parts(137_189_000, 6196)
+			.saturating_add(RocksDbWeight::get().reads(10_u64))
 			.saturating_add(RocksDbWeight::get().writes(10_u64))
 	}
 }
diff --git a/pallets/transaction-multi-payment/Cargo.toml b/pallets/transaction-multi-payment/Cargo.toml
index 9e1ccb746..6091feb80 100644
--- a/pallets/transaction-multi-payment/Cargo.toml
+++ b/pallets/transaction-multi-payment/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-transaction-multi-payment"
-version = "10.0.3"
+version = "10.0.4"
 description = "Transaction multi currency payment support module"
 authors = ["GalacticCoucil"]
 edition = "2021"
diff --git a/pallets/transaction-multi-payment/src/lib.rs b/pallets/transaction-multi-payment/src/lib.rs
index a28cca2c8..ac2d0ca2f 100644
--- a/pallets/transaction-multi-payment/src/lib.rs
+++ b/pallets/transaction-multi-payment/src/lib.rs
@@ -22,7 +22,7 @@
 
 pub mod weights;
 
-use weights::WeightInfo;
+pub use weights::WeightInfo;
 
 #[cfg(test)]
 mod mock;
diff --git a/pallets/transaction-multi-payment/src/mock.rs b/pallets/transaction-multi-payment/src/mock.rs
index 05cb71789..3692c0eec 100644
--- a/pallets/transaction-multi-payment/src/mock.rs
+++ b/pallets/transaction-multi-payment/src/mock.rs
@@ -133,6 +133,7 @@ impl system::Config for Test {
 	type BlockLength = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
+	type RuntimeTask = RuntimeTask;
 	type Nonce = u64;
 	type Block = Block;
 	type Hash = H256;
@@ -200,8 +201,8 @@ impl pallet_balances::Config for Test {
 	type ReserveIdentifier = ();
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
-	type MaxHolds = ();
 	type RuntimeHoldReason = ();
+	type RuntimeFreezeReason = ();
 }
 
 impl pallet_transaction_payment::Config for Test {
diff --git a/pallets/transaction-multi-payment/src/tests.rs b/pallets/transaction-multi-payment/src/tests.rs
index 52685b71b..8cb629a8d 100644
--- a/pallets/transaction-multi-payment/src/tests.rs
+++ b/pallets/transaction-multi-payment/src/tests.rs
@@ -34,7 +34,7 @@ use sp_runtime::traits::ValidateUnsigned;
 use sp_runtime::transaction_validity::TransactionSource;
 
 const CALL: &<Test as frame_system::Config>::RuntimeCall =
-	&RuntimeCall::Balances(BalancesCall::transfer { dest: BOB, value: 69 });
+	&RuntimeCall::Balances(BalancesCall::transfer_allow_death { dest: BOB, value: 69 });
 
 #[test]
 fn on_initialize_should_fill_storage_with_prices() {
diff --git a/pallets/transaction-multi-payment/src/weights.rs b/pallets/transaction-multi-payment/src/weights.rs
index b00df3764..2a5d51b51 100644
--- a/pallets/transaction-multi-payment/src/weights.rs
+++ b/pallets/transaction-multi-payment/src/weights.rs
@@ -1,6 +1,6 @@
 // This file is part of HydraDX.
 
-// Copyright (C) 2020-2024  Intergalactic, Limited (GIB).
+// Copyright (C) 2020-2023  Intergalactic, Limited (GIB).
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,25 +17,30 @@
 
 //! Autogenerated weights for `pallet_transaction_multi_payment`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-03-17, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-05-23, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: 1024
+//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024`
 
 // Executed Command:
-// target/release/hydradx
+// ./target/release/hydradx
 // benchmark
 // pallet
-// --chain=dev
-// --steps=10
-// --repeat=30
 // --wasm-execution=compiled
-// --heap-pages=4096
-// --template=.maintain/pallet-weight-template-no-back.hbs
-// --pallet=pallet-transaction-multi-payment
-// --output=weights-1.1.0/payment.rs
-// --extrinsic=*
+// --pallet
+// *
+// --extrinsic
+// *
+// --heap-pages
+// 4096
+// --steps
+// 50
+// --repeat
+// 20
+// --template=scripts/pallet-weight-template.hbs
+// --output
+// weights/
 
 #![allow(unused_parens)]
 #![allow(unused_imports)]
@@ -57,95 +62,28 @@ pub trait WeightInfo {
 }
 
 /// Weights for pallet_transaction_multi_payment using the hydraDX node and recommended hardware.
-pub struct HydraWeight<T>(PhantomData<T>);
-
-impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
-	/// Storage: `MultiTransactionPayment::AcceptedCurrencies` (r:1 w:1)
-	/// Proof: `MultiTransactionPayment::AcceptedCurrencies` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
-	fn add_currency() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1176`
-		//  Estimated: `3493`
-		// Minimum execution time: 24_548_000 picoseconds.
-		Weight::from_parts(25_118_000, 3493)
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `MultiTransactionPayment::AcceptedCurrencies` (r:1 w:1)
-	/// Proof: `MultiTransactionPayment::AcceptedCurrencies` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
-	fn remove_currency() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1207`
-		//  Estimated: `3493`
-		// Minimum execution time: 25_178_000 picoseconds.
-		Weight::from_parts(25_545_000, 3493)
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `MultiTransactionPayment::AcceptedCurrencies` (r:1 w:0)
-	/// Proof: `MultiTransactionPayment::AcceptedCurrencies` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
-	/// Storage: `MultiTransactionPayment::AccountCurrencyMap` (r:0 w:1)
-	/// Proof: `MultiTransactionPayment::AccountCurrencyMap` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
-	fn set_currency() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1241`
-		//  Estimated: `3493`
-		// Minimum execution time: 31_064_000 picoseconds.
-		Weight::from_parts(31_466_000, 3493)
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Router::Routes` (r:1 w:0)
-	/// Proof: `Router::Routes` (`max_values`: None, `max_size`: Some(90), added: 2565, mode: `MaxEncodedLen`)
-	/// Storage: `EmaOracle::Oracles` (r:10 w:0)
-	/// Proof: `EmaOracle::Oracles` (`max_values`: None, `max_size`: Some(177), added: 2652, mode: `MaxEncodedLen`)
-	fn get_oracle_price() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `3221`
-		//  Estimated: `27510`
-		// Minimum execution time: 93_281_000 picoseconds.
-		Weight::from_parts(94_259_000, 27510).saturating_add(T::DbWeight::get().reads(11))
-	}
-	/// Storage: `AssetRegistry::NextAssetId` (r:1 w:0)
-	/// Proof: `AssetRegistry::NextAssetId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::LocationAssets` (r:1 w:0)
-	/// Proof: `AssetRegistry::LocationAssets` (`max_values`: None, `max_size`: Some(622), added: 3097, mode: `MaxEncodedLen`)
-	/// Storage: `MultiTransactionPayment::AccountCurrencyMap` (r:0 w:1)
-	/// Proof: `MultiTransactionPayment::AccountCurrencyMap` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
-	fn reset_payment_currency() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1280`
-		//  Estimated: `4087`
-		// Minimum execution time: 28_830_000 picoseconds.
-		Weight::from_parts(29_378_000, 4087)
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-}
-
-// For backwards compatibility and tests
 impl WeightInfo for () {
 	/// Storage: `MultiTransactionPayment::AcceptedCurrencies` (r:1 w:1)
 	/// Proof: `MultiTransactionPayment::AcceptedCurrencies` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
 	fn add_currency() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1176`
+		//  Measured:  `1180`
 		//  Estimated: `3493`
-		// Minimum execution time: 24_548_000 picoseconds.
-		Weight::from_parts(25_118_000, 3493)
-			.saturating_add(RocksDbWeight::get().reads(1))
-			.saturating_add(RocksDbWeight::get().writes(1))
+		// Minimum execution time: 19_243_000 picoseconds.
+		Weight::from_parts(19_945_000, 3493)
+			.saturating_add(RocksDbWeight::get().reads(1_u64))
+			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
 	/// Storage: `MultiTransactionPayment::AcceptedCurrencies` (r:1 w:1)
 	/// Proof: `MultiTransactionPayment::AcceptedCurrencies` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
 	fn remove_currency() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1207`
+		//  Measured:  `1211`
 		//  Estimated: `3493`
-		// Minimum execution time: 25_178_000 picoseconds.
-		Weight::from_parts(25_545_000, 3493)
-			.saturating_add(RocksDbWeight::get().reads(1))
-			.saturating_add(RocksDbWeight::get().writes(1))
+		// Minimum execution time: 20_151_000 picoseconds.
+		Weight::from_parts(20_486_000, 3493)
+			.saturating_add(RocksDbWeight::get().reads(1_u64))
+			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
 	/// Storage: `MultiTransactionPayment::AcceptedCurrencies` (r:1 w:0)
 	/// Proof: `MultiTransactionPayment::AcceptedCurrencies` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
@@ -153,12 +91,12 @@ impl WeightInfo for () {
 	/// Proof: `MultiTransactionPayment::AccountCurrencyMap` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
 	fn set_currency() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1241`
+		//  Measured:  `1245`
 		//  Estimated: `3493`
-		// Minimum execution time: 31_064_000 picoseconds.
-		Weight::from_parts(31_466_000, 3493)
-			.saturating_add(RocksDbWeight::get().reads(1))
-			.saturating_add(RocksDbWeight::get().writes(1))
+		// Minimum execution time: 24_924_000 picoseconds.
+		Weight::from_parts(25_169_000, 3493)
+			.saturating_add(RocksDbWeight::get().reads(1_u64))
+			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
 	/// Storage: `Router::Routes` (r:1 w:0)
 	/// Proof: `Router::Routes` (`max_values`: None, `max_size`: Some(90), added: 2565, mode: `MaxEncodedLen`)
@@ -166,10 +104,10 @@ impl WeightInfo for () {
 	/// Proof: `EmaOracle::Oracles` (`max_values`: None, `max_size`: Some(177), added: 2652, mode: `MaxEncodedLen`)
 	fn get_oracle_price() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3221`
+		//  Measured:  `3225`
 		//  Estimated: `27510`
-		// Minimum execution time: 93_281_000 picoseconds.
-		Weight::from_parts(94_259_000, 27510).saturating_add(RocksDbWeight::get().reads(11))
+		// Minimum execution time: 89_268_000 picoseconds.
+		Weight::from_parts(90_513_000, 27510).saturating_add(RocksDbWeight::get().reads(11_u64))
 	}
 	/// Storage: `AssetRegistry::NextAssetId` (r:1 w:0)
 	/// Proof: `AssetRegistry::NextAssetId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
@@ -179,11 +117,11 @@ impl WeightInfo for () {
 	/// Proof: `MultiTransactionPayment::AccountCurrencyMap` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
 	fn reset_payment_currency() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1280`
+		//  Measured:  `1317`
 		//  Estimated: `4087`
-		// Minimum execution time: 28_830_000 picoseconds.
-		Weight::from_parts(29_378_000, 4087)
-			.saturating_add(RocksDbWeight::get().reads(2))
-			.saturating_add(RocksDbWeight::get().writes(1))
+		// Minimum execution time: 22_192_000 picoseconds.
+		Weight::from_parts(22_762_000, 4087)
+			.saturating_add(RocksDbWeight::get().reads(2_u64))
+			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
 }
diff --git a/pallets/transaction-pause/Cargo.toml b/pallets/transaction-pause/Cargo.toml
index 982250bc3..1c5e05d5c 100644
--- a/pallets/transaction-pause/Cargo.toml
+++ b/pallets/transaction-pause/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-transaction-pause"
-version = "1.0.2"
+version = "1.0.3"
 authors = ["Acala Developers", "GalacticCouncil"]
 edition = "2021"
 
diff --git a/pallets/transaction-pause/src/mock.rs b/pallets/transaction-pause/src/mock.rs
index 8ba773130..2178e4772 100644
--- a/pallets/transaction-pause/src/mock.rs
+++ b/pallets/transaction-pause/src/mock.rs
@@ -52,6 +52,7 @@ impl frame_system::Config for Runtime {
 	type AccountId = AccountId;
 	type Lookup = IdentityLookup<AccountId>;
 	type RuntimeEvent = RuntimeEvent;
+	type RuntimeTask = RuntimeTask;
 	type BlockHashCount = ConstU64<250>;
 	type BlockWeights = ();
 	type BlockLength = ();
@@ -80,8 +81,8 @@ impl pallet_balances::Config for Runtime {
 	type WeightInfo = ();
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
-	type MaxHolds = ();
 	type RuntimeHoldReason = ();
+	type RuntimeFreezeReason = ();
 }
 
 parameter_type_with_key! {
diff --git a/pallets/transaction-pause/src/tests.rs b/pallets/transaction-pause/src/tests.rs
index ee86414bb..bcfb5dbc8 100644
--- a/pallets/transaction-pause/src/tests.rs
+++ b/pallets/transaction-pause/src/tests.rs
@@ -26,7 +26,7 @@ use mock::{RuntimeEvent as Event, *};
 use sp_runtime::traits::BadOrigin;
 
 const BALANCE_TRANSFER: &<Runtime as frame_system::Config>::RuntimeCall =
-	&mock::RuntimeCall::Balances(pallet_balances::Call::transfer { dest: ALICE, value: 10 });
+	&mock::RuntimeCall::Balances(pallet_balances::Call::transfer_allow_death { dest: ALICE, value: 10 });
 const TOKENS_TRANSFER: &<Runtime as frame_system::Config>::RuntimeCall =
 	&mock::RuntimeCall::Tokens(orml_tokens::Call::transfer {
 		dest: ALICE,
@@ -172,7 +172,7 @@ fn paused_transaction_filter_work() {
 		assert_ok!(TransactionPause::pause_transaction(
 			RuntimeOrigin::signed(1),
 			b"Balances".to_vec(),
-			b"transfer".to_vec()
+			b"transfer_allow_death".to_vec()
 		));
 		assert_ok!(TransactionPause::pause_transaction(
 			RuntimeOrigin::signed(1),
@@ -184,7 +184,7 @@ fn paused_transaction_filter_work() {
 		assert_ok!(TransactionPause::unpause_transaction(
 			RuntimeOrigin::signed(1),
 			b"Balances".to_vec(),
-			b"transfer".to_vec()
+			b"transfer_allow_death".to_vec()
 		));
 		assert_ok!(TransactionPause::unpause_transaction(
 			RuntimeOrigin::signed(1),
diff --git a/pallets/transaction-pause/src/weights.rs b/pallets/transaction-pause/src/weights.rs
index 0a42477df..43cf80f9e 100644
--- a/pallets/transaction-pause/src/weights.rs
+++ b/pallets/transaction-pause/src/weights.rs
@@ -15,30 +15,33 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+
 //! Autogenerated weights for `pallet_transaction_pause`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-12-12, STEPS: `5`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-05-23, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024`
 
 // Executed Command:
-// target/release/hydradx
+// ./target/release/hydradx
 // benchmark
 // pallet
-// --pallet=pallet-transaction-pause
 // --wasm-execution=compiled
-// --heap-pages=4096
-// --chain=dev
-// --extrinsic=*
-// --steps=5
-// --repeat=20
+// --pallet
+// *
+// --extrinsic
+// *
+// --heap-pages
+// 4096
+// --steps
+// 50
+// --repeat
+// 20
+// --template=scripts/pallet-weight-template.hbs
 // --output
-// ./weights-1.1.0/transaction_pause.rs
-// --template
-// .maintain/pallet-weight-template-no-back.hbs
-
+// weights/
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -55,33 +58,6 @@ pub trait WeightInfo {
 }
 
 /// Weights for module_transaction_pause using the Acala node and recommended hardware.
-pub struct AcalaWeight<T>(PhantomData<T>);
-impl<T: frame_system::Config> WeightInfo for AcalaWeight<T> {
-	/// Storage: `TransactionPause::PausedTransactions` (r:1 w:1)
-	/// Proof: `TransactionPause::PausedTransactions` (`max_values`: None, `max_size`: Some(90), added: 2565, mode: `MaxEncodedLen`)
-	fn pause_transaction() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `109`
-		//  Estimated: `3555`
-		// Minimum execution time: 15_060_000 picoseconds.
-		Weight::from_parts(15_317_000, 3555)
-			.saturating_add(T::DbWeight::get().reads(1_u64))
-			.saturating_add(T::DbWeight::get().writes(1_u64))
-	}
-	/// Storage: `TransactionPause::PausedTransactions` (r:1 w:1)
-	/// Proof: `TransactionPause::PausedTransactions` (`max_values`: None, `max_size`: Some(90), added: 2565, mode: `MaxEncodedLen`)
-	fn unpause_transaction() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `160`
-		//  Estimated: `3555`
-		// Minimum execution time: 17_304_000 picoseconds.
-		Weight::from_parts(17_780_000, 3555)
-			.saturating_add(T::DbWeight::get().reads(1_u64))
-			.saturating_add(T::DbWeight::get().writes(1_u64))
-	}
-}
-
-// For backwards compatibility and tests
 impl WeightInfo for () {
 	/// Storage: `TransactionPause::PausedTransactions` (r:1 w:1)
 	/// Proof: `TransactionPause::PausedTransactions` (`max_values`: None, `max_size`: Some(90), added: 2565, mode: `MaxEncodedLen`)
@@ -89,8 +65,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `109`
 		//  Estimated: `3555`
-		// Minimum execution time: 15_060_000 picoseconds.
-		Weight::from_parts(15_317_000, 3555)
+		// Minimum execution time: 10_806_000 picoseconds.
+		Weight::from_parts(10_995_000, 3555)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -100,8 +76,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `160`
 		//  Estimated: `3555`
-		// Minimum execution time: 17_304_000 picoseconds.
-		Weight::from_parts(17_780_000, 3555)
+		// Minimum execution time: 12_641_000 picoseconds.
+		Weight::from_parts(13_122_000, 3555)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
diff --git a/pallets/xcm-rate-limiter/src/tests/mock.rs b/pallets/xcm-rate-limiter/src/tests/mock.rs
index c1f06d8f4..8ba04257c 100644
--- a/pallets/xcm-rate-limiter/src/tests/mock.rs
+++ b/pallets/xcm-rate-limiter/src/tests/mock.rs
@@ -97,6 +97,7 @@ impl frame_system::Config for Test {
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
+	type RuntimeTask = RuntimeTask;
 	type Nonce = u64;
 	type Block = Block;
 	type Hash = H256;
@@ -179,8 +180,8 @@ impl pallet_balances::Config for Test {
 	type ReserveIdentifier = [u8; 8];
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
-	type MaxHolds = ();
 	type RuntimeHoldReason = ();
+	type RuntimeFreezeReason = ();
 }
 
 parameter_type_with_key! {
diff --git a/pallets/xyk-liquidity-mining/Cargo.toml b/pallets/xyk-liquidity-mining/Cargo.toml
index 418de04a5..caac8a418 100644
--- a/pallets/xyk-liquidity-mining/Cargo.toml
+++ b/pallets/xyk-liquidity-mining/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-xyk-liquidity-mining"
-version = "1.1.10"
+version = "1.1.11"
 description = "Liquidity mining"
 authors = ["GalacticCouncil"]
 edition = "2021"
diff --git a/pallets/xyk-liquidity-mining/src/lib.rs b/pallets/xyk-liquidity-mining/src/lib.rs
index 52ff4e289..4ae443483 100644
--- a/pallets/xyk-liquidity-mining/src/lib.rs
+++ b/pallets/xyk-liquidity-mining/src/lib.rs
@@ -43,6 +43,7 @@ mod tests;
 pub mod migration;
 pub mod weights;
 
+pub use crate::weights::WeightInfo;
 pub use pallet::*;
 
 use frame_support::traits::tokens::nonfungibles::{Create, Inspect, Mutate, Transfer};
@@ -71,7 +72,6 @@ type PeriodOf<T> = BlockNumberFor<T>;
 #[allow(clippy::too_many_arguments)]
 pub mod pallet {
 	use super::*;
-	use crate::weights::WeightInfo;
 	use frame_system::pallet_prelude::BlockNumberFor;
 	use hydradx_traits::pools::DustRemovalAccountWhitelist;
 
diff --git a/pallets/xyk-liquidity-mining/src/tests/mock.rs b/pallets/xyk-liquidity-mining/src/tests/mock.rs
index e5637ffa4..bc58c68c0 100644
--- a/pallets/xyk-liquidity-mining/src/tests/mock.rs
+++ b/pallets/xyk-liquidity-mining/src/tests/mock.rs
@@ -121,6 +121,7 @@ impl system::Config for Test {
 	type DbWeight = DbWeight;
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
+	type RuntimeTask = RuntimeTask;
 	type Nonce = u64;
 	type Block = Block;
 	type Hash = H256;
@@ -849,8 +850,8 @@ impl pallet_balances::Config for Test {
 	type ReserveIdentifier = ();
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
-	type MaxHolds = ();
 	type RuntimeHoldReason = ();
+	type RuntimeFreezeReason = ();
 }
 
 parameter_type_with_key! {
diff --git a/pallets/xyk-liquidity-mining/src/weights.rs b/pallets/xyk-liquidity-mining/src/weights.rs
index 967fa8e9a..ee4ccc904 100644
--- a/pallets/xyk-liquidity-mining/src/weights.rs
+++ b/pallets/xyk-liquidity-mining/src/weights.rs
@@ -1,4 +1,4 @@
-// This file is part of Basilisk.
+// This file is part of HydraDX.
 
 // Copyright (C) 2020-2023  Intergalactic, Limited (GIB).
 // SPDX-License-Identifier: Apache-2.0
@@ -17,25 +17,30 @@
 
 //! Autogenerated weights for `pallet_xyk_liquidity_mining`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-12-06, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-05-23, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024`
 
 // Executed Command:
-// target/release/basilisk
+// ./target/release/hydradx
 // benchmark
 // pallet
-// --chain=dev
-// --steps=10
-// --repeat=30
 // --wasm-execution=compiled
-// --heap-pages=4096
-// --template=.maintain/pallet-weight-template-no-back.hbs
-// --pallet=pallet-xyk-liquidity-mining
-// --output=xyk_liquidity_mining.rs
-// --extrinsic=*
+// --pallet
+// *
+// --extrinsic
+// *
+// --heap-pages
+// 4096
+// --steps
+// 50
+// --repeat
+// 20
+// --template=scripts/pallet-weight-template.hbs
+// --output
+// weights/
 
 #![allow(unused_parens)]
 #![allow(unused_imports)]
@@ -63,349 +68,92 @@ pub trait WeightInfo {
 	fn resume_yield_farm() -> Weight;
 }
 
-pub struct BasiliskWeight<T>(PhantomData<T>);
-
-impl<T: frame_system::Config> WeightInfo for BasiliskWeight<T> {
-	/// Storage: `AssetRegistry::Assets` (r:1 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:2 w:2)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `XYKWarehouseLM::FarmSequencer` (r:1 w:1)
-	/// Proof: `XYKWarehouseLM::FarmSequencer` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	/// Storage: `Duster::AccountBlacklist` (r:0 w:1)
-	/// Proof: `Duster::AccountBlacklist` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
-	/// Storage: `XYKWarehouseLM::GlobalFarm` (r:0 w:1)
-	/// Proof: `XYKWarehouseLM::GlobalFarm` (`max_values`: None, `max_size`: Some(205), added: 2680, mode: `MaxEncodedLen`)
-	fn create_global_farm() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `473`
-		//  Estimated: `6196`
-		// Minimum execution time: 93_370_000 picoseconds.
-		Weight::from_parts(94_187_000, 6196)
-			.saturating_add(T::DbWeight::get().reads(4_u64))
-			.saturating_add(T::DbWeight::get().writes(5_u64))
-	}
-	/// Storage: `XYKWarehouseLM::GlobalFarm` (r:1 w:1)
-	/// Proof: `XYKWarehouseLM::GlobalFarm` (`max_values`: None, `max_size`: Some(205), added: 2680, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:1 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:2 w:2)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	fn update_global_farm() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `879`
-		//  Estimated: `6196`
-		// Minimum execution time: 98_533_000 picoseconds.
-		Weight::from_parts(99_357_000, 6196)
-			.saturating_add(T::DbWeight::get().reads(4_u64))
-			.saturating_add(T::DbWeight::get().writes(3_u64))
-	}
-	/// Storage: `XYKWarehouseLM::GlobalFarm` (r:1 w:1)
-	/// Proof: `XYKWarehouseLM::GlobalFarm` (`max_values`: None, `max_size`: Some(205), added: 2680, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:2 w:2)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+/// Weights for `pallet_xyk_liquidity_mining` using the HydraDX node and recommended hardware.
+impl WeightInfo for () {
+	/// Storage: `AssetRegistry::Assets` (r:2 w:0)
+	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
 	/// Storage: `Duster::AccountBlacklist` (r:1 w:1)
 	/// Proof: `Duster::AccountBlacklist` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
-	fn terminate_global_farm() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1002`
-		//  Estimated: `6196`
-		// Minimum execution time: 95_311_000 picoseconds.
-		Weight::from_parts(95_938_000, 6196)
-			.saturating_add(T::DbWeight::get().reads(4_u64))
-			.saturating_add(T::DbWeight::get().writes(4_u64))
-	}
-	/// Storage: `XYK::ShareToken` (r:1 w:0)
-	/// Proof: `XYK::ShareToken` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
-	/// Storage: `XYKWarehouseLM::GlobalFarm` (r:1 w:1)
-	/// Proof: `XYKWarehouseLM::GlobalFarm` (`max_values`: None, `max_size`: Some(205), added: 2680, mode: `MaxEncodedLen`)
-	/// Storage: `XYKWarehouseLM::ActiveYieldFarm` (r:1 w:1)
-	/// Proof: `XYKWarehouseLM::ActiveYieldFarm` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:1 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:2 w:2)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `XYKWarehouseLM::FarmSequencer` (r:1 w:1)
-	/// Proof: `XYKWarehouseLM::FarmSequencer` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	/// Storage: `XYKWarehouseLM::YieldFarm` (r:0 w:1)
-	/// Proof: `XYKWarehouseLM::YieldFarm` (`max_values`: None, `max_size`: Some(226), added: 2701, mode: `MaxEncodedLen`)
-	fn create_yield_farm() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1213`
-		//  Estimated: `6196`
-		// Minimum execution time: 122_647_000 picoseconds.
-		Weight::from_parts(124_077_000, 6196)
-			.saturating_add(T::DbWeight::get().reads(7_u64))
-			.saturating_add(T::DbWeight::get().writes(6_u64))
-	}
-	/// Storage: `XYK::ShareToken` (r:1 w:0)
-	/// Proof: `XYK::ShareToken` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
-	/// Storage: `XYKWarehouseLM::ActiveYieldFarm` (r:1 w:0)
-	/// Proof: `XYKWarehouseLM::ActiveYieldFarm` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
-	/// Storage: `XYKWarehouseLM::YieldFarm` (r:1 w:1)
-	/// Proof: `XYKWarehouseLM::YieldFarm` (`max_values`: None, `max_size`: Some(226), added: 2701, mode: `MaxEncodedLen`)
-	/// Storage: `XYKWarehouseLM::GlobalFarm` (r:1 w:1)
-	/// Proof: `XYKWarehouseLM::GlobalFarm` (`max_values`: None, `max_size`: Some(205), added: 2680, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:1 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:2 w:2)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	fn update_yield_farm() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1361`
-		//  Estimated: `6196`
-		// Minimum execution time: 129_497_000 picoseconds.
-		Weight::from_parts(130_156_000, 6196)
-			.saturating_add(T::DbWeight::get().reads(7_u64))
-			.saturating_add(T::DbWeight::get().writes(4_u64))
-	}
-	/// Storage: `XYKWarehouseLM::ActiveYieldFarm` (r:1 w:1)
-	/// Proof: `XYKWarehouseLM::ActiveYieldFarm` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
-	/// Storage: `XYKWarehouseLM::YieldFarm` (r:1 w:1)
-	/// Proof: `XYKWarehouseLM::YieldFarm` (`max_values`: None, `max_size`: Some(226), added: 2701, mode: `MaxEncodedLen`)
-	/// Storage: `XYKWarehouseLM::GlobalFarm` (r:1 w:1)
-	/// Proof: `XYKWarehouseLM::GlobalFarm` (`max_values`: None, `max_size`: Some(205), added: 2680, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:1 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:2 w:2)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	fn stop_yield_farm() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1195`
-		//  Estimated: `6196`
-		// Minimum execution time: 124_385_000 picoseconds.
-		Weight::from_parts(125_118_000, 6196)
-			.saturating_add(T::DbWeight::get().reads(6_u64))
-			.saturating_add(T::DbWeight::get().writes(5_u64))
-	}
-	/// Storage: `XYKWarehouseLM::ActiveYieldFarm` (r:1 w:0)
-	/// Proof: `XYKWarehouseLM::ActiveYieldFarm` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
-	/// Storage: `XYKWarehouseLM::GlobalFarm` (r:1 w:1)
-	/// Proof: `XYKWarehouseLM::GlobalFarm` (`max_values`: None, `max_size`: Some(205), added: 2680, mode: `MaxEncodedLen`)
-	/// Storage: `XYKWarehouseLM::YieldFarm` (r:1 w:1)
-	/// Proof: `XYKWarehouseLM::YieldFarm` (`max_values`: None, `max_size`: Some(226), added: 2701, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:2 w:2)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	fn terminate_yield_farm() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `904`
-		//  Estimated: `6196`
-		// Minimum execution time: 99_601_000 picoseconds.
-		Weight::from_parts(100_152_000, 6196)
-			.saturating_add(T::DbWeight::get().reads(5_u64))
-			.saturating_add(T::DbWeight::get().writes(4_u64))
-	}
-	/// Storage: `XYK::ShareToken` (r:1 w:0)
-	/// Proof: `XYK::ShareToken` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
-	/// Storage: `Tokens::Accounts` (r:3 w:2)
+	/// Storage: `AssetRegistry::BannedAssets` (r:1 w:0)
+	/// Proof: `AssetRegistry::BannedAssets` (`max_values`: None, `max_size`: Some(20), added: 2495, mode: `MaxEncodedLen`)
+	/// Storage: `Tokens::Accounts` (r:3 w:3)
 	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
-	/// Storage: `XYKWarehouseLM::YieldFarm` (r:1 w:1)
-	/// Proof: `XYKWarehouseLM::YieldFarm` (`max_values`: None, `max_size`: Some(226), added: 2701, mode: `MaxEncodedLen`)
-	/// Storage: `XYKWarehouseLM::GlobalFarm` (r:1 w:1)
-	/// Proof: `XYKWarehouseLM::GlobalFarm` (`max_values`: None, `max_size`: Some(205), added: 2680, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:2 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:4 w:3)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `XYK::PoolAssets` (r:1 w:0)
-	/// Proof: `XYK::PoolAssets` (`max_values`: None, `max_size`: Some(56), added: 2531, mode: `MaxEncodedLen`)
-	/// Storage: `XYK::TotalLiquidity` (r:1 w:0)
-	/// Proof: `XYK::TotalLiquidity` (`max_values`: None, `max_size`: Some(64), added: 2539, mode: `MaxEncodedLen`)
-	/// Storage: `XYKWarehouseLM::DepositSequencer` (r:1 w:1)
-	/// Proof: `XYKWarehouseLM::DepositSequencer` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
-	/// Storage: `MultiTransactionPayment::AccountCurrencyMap` (r:1 w:0)
+	/// Storage: `MultiTransactionPayment::AccountCurrencyMap` (r:3 w:0)
 	/// Proof: `MultiTransactionPayment::AccountCurrencyMap` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
-	/// Storage: `NFT::Collections` (r:1 w:0)
-	/// Proof: `NFT::Collections` (`max_values`: None, `max_size`: Some(99), added: 2574, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::Asset` (r:1 w:1)
-	/// Proof: `Uniques::Asset` (`max_values`: None, `max_size`: Some(146), added: 2621, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::Class` (r:1 w:1)
-	/// Proof: `Uniques::Class` (`max_values`: None, `max_size`: Some(190), added: 2665, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::CollectionMaxSupply` (r:1 w:0)
-	/// Proof: `Uniques::CollectionMaxSupply` (`max_values`: None, `max_size`: Some(36), added: 2511, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::NextAssetId` (r:1 w:0)
-	/// Proof: `AssetRegistry::NextAssetId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::LocationAssets` (r:1 w:0)
-	/// Proof: `AssetRegistry::LocationAssets` (`max_values`: None, `max_size`: Some(622), added: 3097, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::Account` (r:0 w:1)
-	/// Proof: `Uniques::Account` (`max_values`: None, `max_size`: Some(112), added: 2587, mode: `MaxEncodedLen`)
-	/// Storage: `NFT::Items` (r:0 w:1)
-	/// Proof: `NFT::Items` (`max_values`: None, `max_size`: Some(122), added: 2597, mode: `MaxEncodedLen`)
-	/// Storage: `XYKWarehouseLM::Deposit` (r:0 w:1)
-	/// Proof: `XYKWarehouseLM::Deposit` (`max_values`: None, `max_size`: Some(413), added: 2888, mode: `MaxEncodedLen`)
-	fn deposit_shares() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `3236`
-		//  Estimated: `11402`
-		// Minimum execution time: 257_650_000 picoseconds.
-		Weight::from_parts(258_966_000, 11402)
-			.saturating_add(T::DbWeight::get().reads(22_u64))
-			.saturating_add(T::DbWeight::get().writes(13_u64))
-	}
-	/// Storage: `Uniques::Asset` (r:1 w:0)
-	/// Proof: `Uniques::Asset` (`max_values`: None, `max_size`: Some(146), added: 2621, mode: `MaxEncodedLen`)
-	/// Storage: `XYK::ShareToken` (r:1 w:0)
-	/// Proof: `XYK::ShareToken` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
-	/// Storage: `XYKWarehouseLM::Deposit` (r:1 w:1)
-	/// Proof: `XYKWarehouseLM::Deposit` (`max_values`: None, `max_size`: Some(413), added: 2888, mode: `MaxEncodedLen`)
-	/// Storage: `XYKWarehouseLM::YieldFarm` (r:1 w:1)
-	/// Proof: `XYKWarehouseLM::YieldFarm` (`max_values`: None, `max_size`: Some(226), added: 2701, mode: `MaxEncodedLen`)
-	/// Storage: `XYKWarehouseLM::GlobalFarm` (r:1 w:1)
-	/// Proof: `XYKWarehouseLM::GlobalFarm` (`max_values`: None, `max_size`: Some(205), added: 2680, mode: `MaxEncodedLen`)
-	/// Storage: `XYK::PoolAssets` (r:1 w:0)
-	/// Proof: `XYK::PoolAssets` (`max_values`: None, `max_size`: Some(56), added: 2531, mode: `MaxEncodedLen`)
-	/// Storage: `XYK::TotalLiquidity` (r:1 w:0)
-	/// Proof: `XYK::TotalLiquidity` (`max_values`: None, `max_size`: Some(64), added: 2539, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:0)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `Tokens::Accounts` (r:1 w:0)
-	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
-	fn redeposit_shares() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `2363`
-		//  Estimated: `3878`
-		// Minimum execution time: 82_242_000 picoseconds.
-		Weight::from_parts(83_084_000, 3878)
-			.saturating_add(T::DbWeight::get().reads(9_u64))
-			.saturating_add(T::DbWeight::get().writes(3_u64))
-	}
-	/// Storage: `Uniques::Asset` (r:1 w:0)
-	/// Proof: `Uniques::Asset` (`max_values`: None, `max_size`: Some(146), added: 2621, mode: `MaxEncodedLen`)
-	/// Storage: `XYKWarehouseLM::Deposit` (r:1 w:1)
-	/// Proof: `XYKWarehouseLM::Deposit` (`max_values`: None, `max_size`: Some(413), added: 2888, mode: `MaxEncodedLen`)
-	/// Storage: `XYKWarehouseLM::YieldFarm` (r:1 w:1)
-	/// Proof: `XYKWarehouseLM::YieldFarm` (`max_values`: None, `max_size`: Some(226), added: 2701, mode: `MaxEncodedLen`)
-	/// Storage: `XYKWarehouseLM::GlobalFarm` (r:1 w:1)
-	/// Proof: `XYKWarehouseLM::GlobalFarm` (`max_values`: None, `max_size`: Some(205), added: 2680, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:1 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:3 w:3)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	fn claim_rewards() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `2097`
-		//  Estimated: `8799`
-		// Minimum execution time: 176_232_000 picoseconds.
-		Weight::from_parts(177_357_000, 8799)
-			.saturating_add(T::DbWeight::get().reads(8_u64))
-			.saturating_add(T::DbWeight::get().writes(6_u64))
-	}
-	/// Storage: `Uniques::Asset` (r:1 w:1)
-	/// Proof: `Uniques::Asset` (`max_values`: None, `max_size`: Some(146), added: 2621, mode: `MaxEncodedLen`)
-	/// Storage: `XYK::ShareToken` (r:1 w:0)
-	/// Proof: `XYK::ShareToken` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
-	/// Storage: `XYKWarehouseLM::Deposit` (r:1 w:1)
-	/// Proof: `XYKWarehouseLM::Deposit` (`max_values`: None, `max_size`: Some(413), added: 2888, mode: `MaxEncodedLen`)
-	/// Storage: `XYKWarehouseLM::YieldFarm` (r:1 w:1)
-	/// Proof: `XYKWarehouseLM::YieldFarm` (`max_values`: None, `max_size`: Some(226), added: 2701, mode: `MaxEncodedLen`)
-	/// Storage: `XYKWarehouseLM::GlobalFarm` (r:1 w:1)
-	/// Proof: `XYKWarehouseLM::GlobalFarm` (`max_values`: None, `max_size`: Some(205), added: 2680, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:2 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
 	/// Storage: `System::Account` (r:4 w:4)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `XYK::PoolAssets` (r:1 w:0)
-	/// Proof: `XYK::PoolAssets` (`max_values`: None, `max_size`: Some(56), added: 2531, mode: `MaxEncodedLen`)
-	/// Storage: `Tokens::Accounts` (r:2 w:2)
-	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
-	/// Storage: `MultiTransactionPayment::AccountCurrencyMap` (r:1 w:1)
-	/// Proof: `MultiTransactionPayment::AccountCurrencyMap` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:1 w:1)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:1 w:0)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(49), added: 2524, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::ExistentialDepositCounter` (r:1 w:1)
+	/// Proof: `AssetRegistry::ExistentialDepositCounter` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
 	/// Storage: `MultiTransactionPayment::AcceptedCurrencies` (r:1 w:0)
 	/// Proof: `MultiTransactionPayment::AcceptedCurrencies` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::Class` (r:1 w:1)
-	/// Proof: `Uniques::Class` (`max_values`: None, `max_size`: Some(190), added: 2665, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::NextAssetId` (r:1 w:0)
-	/// Proof: `AssetRegistry::NextAssetId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::LocationAssets` (r:1 w:0)
-	/// Proof: `AssetRegistry::LocationAssets` (`max_values`: None, `max_size`: Some(622), added: 3097, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::Account` (r:0 w:1)
-	/// Proof: `Uniques::Account` (`max_values`: None, `max_size`: Some(112), added: 2587, mode: `MaxEncodedLen`)
-	/// Storage: `Uniques::ItemPriceOf` (r:0 w:1)
-	/// Proof: `Uniques::ItemPriceOf` (`max_values`: None, `max_size`: Some(113), added: 2588, mode: `MaxEncodedLen`)
-	/// Storage: `NFT::Items` (r:0 w:1)
-	/// Proof: `NFT::Items` (`max_values`: None, `max_size`: Some(122), added: 2597, mode: `MaxEncodedLen`)
-	fn withdraw_shares() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `2928`
-		//  Estimated: `11402`
-		// Minimum execution time: 383_107_000 picoseconds.
-		Weight::from_parts(385_120_000, 11402)
-			.saturating_add(T::DbWeight::get().reads(19_u64))
-			.saturating_add(T::DbWeight::get().writes(15_u64))
-	}
-	/// Storage: `XYK::ShareToken` (r:1 w:0)
-	/// Proof: `XYK::ShareToken` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
-	/// Storage: `XYKWarehouseLM::ActiveYieldFarm` (r:1 w:1)
-	/// Proof: `XYKWarehouseLM::ActiveYieldFarm` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
-	/// Storage: `XYKWarehouseLM::YieldFarm` (r:1 w:1)
-	/// Proof: `XYKWarehouseLM::YieldFarm` (`max_values`: None, `max_size`: Some(226), added: 2701, mode: `MaxEncodedLen`)
-	/// Storage: `XYKWarehouseLM::GlobalFarm` (r:1 w:1)
-	/// Proof: `XYKWarehouseLM::GlobalFarm` (`max_values`: None, `max_size`: Some(205), added: 2680, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:1 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:2 w:2)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	fn resume_yield_farm() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1469`
-		//  Estimated: `6196`
-		// Minimum execution time: 123_753_000 picoseconds.
-		Weight::from_parts(124_758_000, 6196)
-			.saturating_add(T::DbWeight::get().reads(7_u64))
-			.saturating_add(T::DbWeight::get().writes(5_u64))
-	}
-}
-
-// For backwards compatibility and tests
-impl WeightInfo for () {
-	/// Storage: `AssetRegistry::Assets` (r:1 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:2 w:2)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	/// Storage: `XYKWarehouseLM::FarmSequencer` (r:1 w:1)
 	/// Proof: `XYKWarehouseLM::FarmSequencer` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	/// Storage: `Duster::AccountBlacklist` (r:0 w:1)
-	/// Proof: `Duster::AccountBlacklist` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
 	/// Storage: `XYKWarehouseLM::GlobalFarm` (r:0 w:1)
 	/// Proof: `XYKWarehouseLM::GlobalFarm` (`max_values`: None, `max_size`: Some(205), added: 2680, mode: `MaxEncodedLen`)
 	fn create_global_farm() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `473`
-		//  Estimated: `6196`
-		// Minimum execution time: 93_370_000 picoseconds.
-		Weight::from_parts(94_187_000, 6196)
-			.saturating_add(RocksDbWeight::get().reads(4_u64))
-			.saturating_add(RocksDbWeight::get().writes(5_u64))
+		//  Measured:  `3102`
+		//  Estimated: `11402`
+		// Minimum execution time: 277_908_000 picoseconds.
+		Weight::from_parts(279_339_000, 11402)
+			.saturating_add(RocksDbWeight::get().reads(19_u64))
+			.saturating_add(RocksDbWeight::get().writes(12_u64))
 	}
 	/// Storage: `XYKWarehouseLM::GlobalFarm` (r:1 w:1)
 	/// Proof: `XYKWarehouseLM::GlobalFarm` (`max_values`: None, `max_size`: Some(205), added: 2680, mode: `MaxEncodedLen`)
 	/// Storage: `AssetRegistry::Assets` (r:1 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:2 w:2)
+	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
+	/// Storage: `Tokens::Accounts` (r:2 w:2)
+	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
+	/// Storage: `EmaOracle::Oracles` (r:1 w:0)
+	/// Proof: `EmaOracle::Oracles` (`max_values`: None, `max_size`: Some(177), added: 2652, mode: `MaxEncodedLen`)
+	/// Storage: `Duster::AccountBlacklist` (r:1 w:0)
+	/// Proof: `Duster::AccountBlacklist` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::BannedAssets` (r:1 w:0)
+	/// Proof: `AssetRegistry::BannedAssets` (`max_values`: None, `max_size`: Some(20), added: 2495, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:1 w:0)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn update_global_farm() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `879`
-		//  Estimated: `6196`
-		// Minimum execution time: 98_533_000 picoseconds.
-		Weight::from_parts(99_357_000, 6196)
-			.saturating_add(RocksDbWeight::get().reads(4_u64))
+		//  Measured:  `4351`
+		//  Estimated: `6156`
+		// Minimum execution time: 103_336_000 picoseconds.
+		Weight::from_parts(104_299_000, 6156)
+			.saturating_add(RocksDbWeight::get().reads(8_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 	}
 	/// Storage: `XYKWarehouseLM::GlobalFarm` (r:1 w:1)
 	/// Proof: `XYKWarehouseLM::GlobalFarm` (`max_values`: None, `max_size`: Some(205), added: 2680, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:2 w:2)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `Tokens::Accounts` (r:2 w:2)
+	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
 	/// Storage: `Duster::AccountBlacklist` (r:1 w:1)
 	/// Proof: `Duster::AccountBlacklist` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::BannedAssets` (r:1 w:0)
+	/// Proof: `AssetRegistry::BannedAssets` (`max_values`: None, `max_size`: Some(20), added: 2495, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::Assets` (r:1 w:0)
+	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:2 w:2)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `MultiTransactionPayment::AccountCurrencyMap` (r:1 w:0)
+	/// Proof: `MultiTransactionPayment::AccountCurrencyMap` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:1 w:1)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::ExistentialDepositCounter` (r:1 w:1)
+	/// Proof: `AssetRegistry::ExistentialDepositCounter` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:1 w:0)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(49), added: 2524, mode: `MaxEncodedLen`)
 	fn terminate_global_farm() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1002`
+		//  Measured:  `3814`
 		//  Estimated: `6196`
-		// Minimum execution time: 95_311_000 picoseconds.
-		Weight::from_parts(95_938_000, 6196)
-			.saturating_add(RocksDbWeight::get().reads(4_u64))
-			.saturating_add(RocksDbWeight::get().writes(4_u64))
+		// Minimum execution time: 172_009_000 picoseconds.
+		Weight::from_parts(173_139_000, 6196)
+			.saturating_add(RocksDbWeight::get().reads(12_u64))
+			.saturating_add(RocksDbWeight::get().writes(8_u64))
 	}
 	/// Storage: `XYK::ShareToken` (r:1 w:0)
 	/// Proof: `XYK::ShareToken` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
@@ -413,22 +161,18 @@ impl WeightInfo for () {
 	/// Proof: `XYKWarehouseLM::GlobalFarm` (`max_values`: None, `max_size`: Some(205), added: 2680, mode: `MaxEncodedLen`)
 	/// Storage: `XYKWarehouseLM::ActiveYieldFarm` (r:1 w:1)
 	/// Proof: `XYKWarehouseLM::ActiveYieldFarm` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:1 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:2 w:2)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	/// Storage: `XYKWarehouseLM::FarmSequencer` (r:1 w:1)
 	/// Proof: `XYKWarehouseLM::FarmSequencer` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	/// Storage: `XYKWarehouseLM::YieldFarm` (r:0 w:1)
 	/// Proof: `XYKWarehouseLM::YieldFarm` (`max_values`: None, `max_size`: Some(226), added: 2701, mode: `MaxEncodedLen`)
 	fn create_yield_farm() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1213`
-		//  Estimated: `6196`
-		// Minimum execution time: 122_647_000 picoseconds.
-		Weight::from_parts(124_077_000, 6196)
-			.saturating_add(RocksDbWeight::get().reads(7_u64))
-			.saturating_add(RocksDbWeight::get().writes(6_u64))
+		//  Measured:  `1586`
+		//  Estimated: `3670`
+		// Minimum execution time: 47_538_000 picoseconds.
+		Weight::from_parts(48_206_000, 3670)
+			.saturating_add(RocksDbWeight::get().reads(4_u64))
+			.saturating_add(RocksDbWeight::get().writes(4_u64))
 	}
 	/// Storage: `XYK::ShareToken` (r:1 w:0)
 	/// Proof: `XYK::ShareToken` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
@@ -439,16 +183,24 @@ impl WeightInfo for () {
 	/// Storage: `XYKWarehouseLM::GlobalFarm` (r:1 w:1)
 	/// Proof: `XYKWarehouseLM::GlobalFarm` (`max_values`: None, `max_size`: Some(205), added: 2680, mode: `MaxEncodedLen`)
 	/// Storage: `AssetRegistry::Assets` (r:1 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:2 w:2)
+	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
+	/// Storage: `Tokens::Accounts` (r:2 w:2)
+	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
+	/// Storage: `EmaOracle::Oracles` (r:1 w:0)
+	/// Proof: `EmaOracle::Oracles` (`max_values`: None, `max_size`: Some(177), added: 2652, mode: `MaxEncodedLen`)
+	/// Storage: `Duster::AccountBlacklist` (r:1 w:0)
+	/// Proof: `Duster::AccountBlacklist` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::BannedAssets` (r:1 w:0)
+	/// Proof: `AssetRegistry::BannedAssets` (`max_values`: None, `max_size`: Some(20), added: 2495, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:1 w:0)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn update_yield_farm() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1361`
-		//  Estimated: `6196`
-		// Minimum execution time: 129_497_000 picoseconds.
-		Weight::from_parts(130_156_000, 6196)
-			.saturating_add(RocksDbWeight::get().reads(7_u64))
+		//  Measured:  `4867`
+		//  Estimated: `6156`
+		// Minimum execution time: 127_361_000 picoseconds.
+		Weight::from_parts(128_178_000, 6156)
+			.saturating_add(RocksDbWeight::get().reads(11_u64))
 			.saturating_add(RocksDbWeight::get().writes(4_u64))
 	}
 	/// Storage: `XYKWarehouseLM::ActiveYieldFarm` (r:1 w:1)
@@ -458,16 +210,24 @@ impl WeightInfo for () {
 	/// Storage: `XYKWarehouseLM::GlobalFarm` (r:1 w:1)
 	/// Proof: `XYKWarehouseLM::GlobalFarm` (`max_values`: None, `max_size`: Some(205), added: 2680, mode: `MaxEncodedLen`)
 	/// Storage: `AssetRegistry::Assets` (r:1 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:2 w:2)
+	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
+	/// Storage: `Tokens::Accounts` (r:2 w:2)
+	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
+	/// Storage: `EmaOracle::Oracles` (r:1 w:0)
+	/// Proof: `EmaOracle::Oracles` (`max_values`: None, `max_size`: Some(177), added: 2652, mode: `MaxEncodedLen`)
+	/// Storage: `Duster::AccountBlacklist` (r:1 w:0)
+	/// Proof: `Duster::AccountBlacklist` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::BannedAssets` (r:1 w:0)
+	/// Proof: `AssetRegistry::BannedAssets` (`max_values`: None, `max_size`: Some(20), added: 2495, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:1 w:0)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn stop_yield_farm() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1195`
-		//  Estimated: `6196`
-		// Minimum execution time: 124_385_000 picoseconds.
-		Weight::from_parts(125_118_000, 6196)
-			.saturating_add(RocksDbWeight::get().reads(6_u64))
+		//  Measured:  `4667`
+		//  Estimated: `6156`
+		// Minimum execution time: 122_100_000 picoseconds.
+		Weight::from_parts(123_315_000, 6156)
+			.saturating_add(RocksDbWeight::get().reads(10_u64))
 			.saturating_add(RocksDbWeight::get().writes(5_u64))
 	}
 	/// Storage: `XYKWarehouseLM::ActiveYieldFarm` (r:1 w:0)
@@ -476,28 +236,42 @@ impl WeightInfo for () {
 	/// Proof: `XYKWarehouseLM::GlobalFarm` (`max_values`: None, `max_size`: Some(205), added: 2680, mode: `MaxEncodedLen`)
 	/// Storage: `XYKWarehouseLM::YieldFarm` (r:1 w:1)
 	/// Proof: `XYKWarehouseLM::YieldFarm` (`max_values`: None, `max_size`: Some(226), added: 2701, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:2 w:2)
+	/// Storage: `Duster::AccountBlacklist` (r:1 w:0)
+	/// Proof: `Duster::AccountBlacklist` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::BannedAssets` (r:1 w:0)
+	/// Proof: `AssetRegistry::BannedAssets` (`max_values`: None, `max_size`: Some(20), added: 2495, mode: `MaxEncodedLen`)
+	/// Storage: `Tokens::Accounts` (r:2 w:2)
+	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::Assets` (r:1 w:0)
+	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:1 w:0)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn terminate_yield_farm() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `904`
-		//  Estimated: `6196`
-		// Minimum execution time: 99_601_000 picoseconds.
-		Weight::from_parts(100_152_000, 6196)
-			.saturating_add(RocksDbWeight::get().reads(5_u64))
+		//  Measured:  `4714`
+		//  Estimated: `6156`
+		// Minimum execution time: 99_990_000 picoseconds.
+		Weight::from_parts(100_957_000, 6156)
+			.saturating_add(RocksDbWeight::get().reads(9_u64))
 			.saturating_add(RocksDbWeight::get().writes(4_u64))
 	}
 	/// Storage: `XYK::ShareToken` (r:1 w:0)
 	/// Proof: `XYK::ShareToken` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
-	/// Storage: `Tokens::Accounts` (r:3 w:2)
+	/// Storage: `Tokens::Accounts` (r:6 w:4)
 	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
 	/// Storage: `XYKWarehouseLM::YieldFarm` (r:1 w:1)
 	/// Proof: `XYKWarehouseLM::YieldFarm` (`max_values`: None, `max_size`: Some(226), added: 2701, mode: `MaxEncodedLen`)
 	/// Storage: `XYKWarehouseLM::GlobalFarm` (r:1 w:1)
 	/// Proof: `XYKWarehouseLM::GlobalFarm` (`max_values`: None, `max_size`: Some(205), added: 2680, mode: `MaxEncodedLen`)
 	/// Storage: `AssetRegistry::Assets` (r:2 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:4 w:3)
+	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
+	/// Storage: `EmaOracle::Oracles` (r:1 w:0)
+	/// Proof: `EmaOracle::Oracles` (`max_values`: None, `max_size`: Some(177), added: 2652, mode: `MaxEncodedLen`)
+	/// Storage: `Duster::AccountBlacklist` (r:2 w:0)
+	/// Proof: `Duster::AccountBlacklist` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::BannedAssets` (r:2 w:0)
+	/// Proof: `AssetRegistry::BannedAssets` (`max_values`: None, `max_size`: Some(20), added: 2495, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:2 w:0)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	/// Storage: `XYK::PoolAssets` (r:1 w:0)
 	/// Proof: `XYK::PoolAssets` (`max_values`: None, `max_size`: Some(56), added: 2531, mode: `MaxEncodedLen`)
@@ -505,34 +279,24 @@ impl WeightInfo for () {
 	/// Proof: `XYK::TotalLiquidity` (`max_values`: None, `max_size`: Some(64), added: 2539, mode: `MaxEncodedLen`)
 	/// Storage: `XYKWarehouseLM::DepositSequencer` (r:1 w:1)
 	/// Proof: `XYKWarehouseLM::DepositSequencer` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
-	/// Storage: `MultiTransactionPayment::AccountCurrencyMap` (r:1 w:0)
-	/// Proof: `MultiTransactionPayment::AccountCurrencyMap` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
-	/// Storage: `NFT::Collections` (r:1 w:0)
-	/// Proof: `NFT::Collections` (`max_values`: None, `max_size`: Some(99), added: 2574, mode: `MaxEncodedLen`)
 	/// Storage: `Uniques::Asset` (r:1 w:1)
 	/// Proof: `Uniques::Asset` (`max_values`: None, `max_size`: Some(146), added: 2621, mode: `MaxEncodedLen`)
 	/// Storage: `Uniques::Class` (r:1 w:1)
 	/// Proof: `Uniques::Class` (`max_values`: None, `max_size`: Some(190), added: 2665, mode: `MaxEncodedLen`)
 	/// Storage: `Uniques::CollectionMaxSupply` (r:1 w:0)
 	/// Proof: `Uniques::CollectionMaxSupply` (`max_values`: None, `max_size`: Some(36), added: 2511, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::NextAssetId` (r:1 w:0)
-	/// Proof: `AssetRegistry::NextAssetId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::LocationAssets` (r:1 w:0)
-	/// Proof: `AssetRegistry::LocationAssets` (`max_values`: None, `max_size`: Some(622), added: 3097, mode: `MaxEncodedLen`)
 	/// Storage: `Uniques::Account` (r:0 w:1)
 	/// Proof: `Uniques::Account` (`max_values`: None, `max_size`: Some(112), added: 2587, mode: `MaxEncodedLen`)
-	/// Storage: `NFT::Items` (r:0 w:1)
-	/// Proof: `NFT::Items` (`max_values`: None, `max_size`: Some(122), added: 2597, mode: `MaxEncodedLen`)
 	/// Storage: `XYKWarehouseLM::Deposit` (r:0 w:1)
 	/// Proof: `XYKWarehouseLM::Deposit` (`max_values`: None, `max_size`: Some(413), added: 2888, mode: `MaxEncodedLen`)
 	fn deposit_shares() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3236`
-		//  Estimated: `11402`
-		// Minimum execution time: 257_650_000 picoseconds.
-		Weight::from_parts(258_966_000, 11402)
-			.saturating_add(RocksDbWeight::get().reads(22_u64))
-			.saturating_add(RocksDbWeight::get().writes(13_u64))
+		//  Measured:  `6036`
+		//  Estimated: `16488`
+		// Minimum execution time: 218_921_000 picoseconds.
+		Weight::from_parts(220_788_000, 16488)
+			.saturating_add(RocksDbWeight::get().reads(24_u64))
+			.saturating_add(RocksDbWeight::get().writes(11_u64))
 	}
 	/// Storage: `Uniques::Asset` (r:1 w:0)
 	/// Proof: `Uniques::Asset` (`max_values`: None, `max_size`: Some(146), added: 2621, mode: `MaxEncodedLen`)
@@ -544,22 +308,30 @@ impl WeightInfo for () {
 	/// Proof: `XYKWarehouseLM::YieldFarm` (`max_values`: None, `max_size`: Some(226), added: 2701, mode: `MaxEncodedLen`)
 	/// Storage: `XYKWarehouseLM::GlobalFarm` (r:1 w:1)
 	/// Proof: `XYKWarehouseLM::GlobalFarm` (`max_values`: None, `max_size`: Some(205), added: 2680, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::Assets` (r:1 w:0)
+	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
+	/// Storage: `Tokens::Accounts` (r:4 w:2)
+	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
+	/// Storage: `EmaOracle::Oracles` (r:1 w:0)
+	/// Proof: `EmaOracle::Oracles` (`max_values`: None, `max_size`: Some(177), added: 2652, mode: `MaxEncodedLen`)
+	/// Storage: `Duster::AccountBlacklist` (r:1 w:0)
+	/// Proof: `Duster::AccountBlacklist` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::BannedAssets` (r:1 w:0)
+	/// Proof: `AssetRegistry::BannedAssets` (`max_values`: None, `max_size`: Some(20), added: 2495, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:1 w:0)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	/// Storage: `XYK::PoolAssets` (r:1 w:0)
 	/// Proof: `XYK::PoolAssets` (`max_values`: None, `max_size`: Some(56), added: 2531, mode: `MaxEncodedLen`)
 	/// Storage: `XYK::TotalLiquidity` (r:1 w:0)
 	/// Proof: `XYK::TotalLiquidity` (`max_values`: None, `max_size`: Some(64), added: 2539, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:0)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `Tokens::Accounts` (r:1 w:0)
-	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
 	fn redeposit_shares() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2363`
-		//  Estimated: `3878`
-		// Minimum execution time: 82_242_000 picoseconds.
-		Weight::from_parts(83_084_000, 3878)
-			.saturating_add(RocksDbWeight::get().reads(9_u64))
-			.saturating_add(RocksDbWeight::get().writes(3_u64))
+		//  Measured:  `6965`
+		//  Estimated: `11322`
+		// Minimum execution time: 169_802_000 picoseconds.
+		Weight::from_parts(170_914_000, 11322)
+			.saturating_add(RocksDbWeight::get().reads(16_u64))
+			.saturating_add(RocksDbWeight::get().writes(5_u64))
 	}
 	/// Storage: `Uniques::Asset` (r:1 w:0)
 	/// Proof: `Uniques::Asset` (`max_values`: None, `max_size`: Some(146), added: 2621, mode: `MaxEncodedLen`)
@@ -570,16 +342,24 @@ impl WeightInfo for () {
 	/// Storage: `XYKWarehouseLM::GlobalFarm` (r:1 w:1)
 	/// Proof: `XYKWarehouseLM::GlobalFarm` (`max_values`: None, `max_size`: Some(205), added: 2680, mode: `MaxEncodedLen`)
 	/// Storage: `AssetRegistry::Assets` (r:1 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:3 w:3)
+	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
+	/// Storage: `Tokens::Accounts` (r:3 w:3)
+	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
+	/// Storage: `EmaOracle::Oracles` (r:1 w:0)
+	/// Proof: `EmaOracle::Oracles` (`max_values`: None, `max_size`: Some(177), added: 2652, mode: `MaxEncodedLen`)
+	/// Storage: `Duster::AccountBlacklist` (r:2 w:0)
+	/// Proof: `Duster::AccountBlacklist` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::BannedAssets` (r:1 w:0)
+	/// Proof: `AssetRegistry::BannedAssets` (`max_values`: None, `max_size`: Some(20), added: 2495, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:2 w:0)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn claim_rewards() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2097`
-		//  Estimated: `8799`
-		// Minimum execution time: 176_232_000 picoseconds.
-		Weight::from_parts(177_357_000, 8799)
-			.saturating_add(RocksDbWeight::get().reads(8_u64))
+		//  Measured:  `6806`
+		//  Estimated: `8739`
+		// Minimum execution time: 174_694_000 picoseconds.
+		Weight::from_parts(176_187_000, 8739)
+			.saturating_add(RocksDbWeight::get().reads(14_u64))
 			.saturating_add(RocksDbWeight::get().writes(6_u64))
 	}
 	/// Storage: `Uniques::Asset` (r:1 w:1)
@@ -593,37 +373,41 @@ impl WeightInfo for () {
 	/// Storage: `XYKWarehouseLM::GlobalFarm` (r:1 w:1)
 	/// Proof: `XYKWarehouseLM::GlobalFarm` (`max_values`: None, `max_size`: Some(205), added: 2680, mode: `MaxEncodedLen`)
 	/// Storage: `AssetRegistry::Assets` (r:2 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:4 w:4)
+	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
+	/// Storage: `Tokens::Accounts` (r:5 w:5)
+	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
+	/// Storage: `EmaOracle::Oracles` (r:1 w:0)
+	/// Proof: `EmaOracle::Oracles` (`max_values`: None, `max_size`: Some(177), added: 2652, mode: `MaxEncodedLen`)
+	/// Storage: `Duster::AccountBlacklist` (r:3 w:0)
+	/// Proof: `Duster::AccountBlacklist` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::BannedAssets` (r:2 w:0)
+	/// Proof: `AssetRegistry::BannedAssets` (`max_values`: None, `max_size`: Some(20), added: 2495, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:4 w:2)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	/// Storage: `XYK::PoolAssets` (r:1 w:0)
 	/// Proof: `XYK::PoolAssets` (`max_values`: None, `max_size`: Some(56), added: 2531, mode: `MaxEncodedLen`)
-	/// Storage: `Tokens::Accounts` (r:2 w:2)
-	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
-	/// Storage: `MultiTransactionPayment::AccountCurrencyMap` (r:1 w:1)
+	/// Storage: `MultiTransactionPayment::AccountCurrencyMap` (r:1 w:0)
 	/// Proof: `MultiTransactionPayment::AccountCurrencyMap` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
-	/// Storage: `MultiTransactionPayment::AcceptedCurrencies` (r:1 w:0)
-	/// Proof: `MultiTransactionPayment::AcceptedCurrencies` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:1 w:1)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::ExistentialDepositCounter` (r:1 w:1)
+	/// Proof: `AssetRegistry::ExistentialDepositCounter` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:1 w:0)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(49), added: 2524, mode: `MaxEncodedLen`)
 	/// Storage: `Uniques::Class` (r:1 w:1)
 	/// Proof: `Uniques::Class` (`max_values`: None, `max_size`: Some(190), added: 2665, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::NextAssetId` (r:1 w:0)
-	/// Proof: `AssetRegistry::NextAssetId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::LocationAssets` (r:1 w:0)
-	/// Proof: `AssetRegistry::LocationAssets` (`max_values`: None, `max_size`: Some(622), added: 3097, mode: `MaxEncodedLen`)
 	/// Storage: `Uniques::Account` (r:0 w:1)
 	/// Proof: `Uniques::Account` (`max_values`: None, `max_size`: Some(112), added: 2587, mode: `MaxEncodedLen`)
 	/// Storage: `Uniques::ItemPriceOf` (r:0 w:1)
 	/// Proof: `Uniques::ItemPriceOf` (`max_values`: None, `max_size`: Some(113), added: 2588, mode: `MaxEncodedLen`)
-	/// Storage: `NFT::Items` (r:0 w:1)
-	/// Proof: `NFT::Items` (`max_values`: None, `max_size`: Some(122), added: 2597, mode: `MaxEncodedLen`)
 	fn withdraw_shares() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2928`
-		//  Estimated: `11402`
-		// Minimum execution time: 383_107_000 picoseconds.
-		Weight::from_parts(385_120_000, 11402)
-			.saturating_add(RocksDbWeight::get().reads(19_u64))
-			.saturating_add(RocksDbWeight::get().writes(15_u64))
+		//  Measured:  `6479`
+		//  Estimated: `13905`
+		// Minimum execution time: 369_769_000 picoseconds.
+		Weight::from_parts(371_613_000, 13905)
+			.saturating_add(RocksDbWeight::get().reads(28_u64))
+			.saturating_add(RocksDbWeight::get().writes(16_u64))
 	}
 	/// Storage: `XYK::ShareToken` (r:1 w:0)
 	/// Proof: `XYK::ShareToken` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
@@ -634,16 +418,24 @@ impl WeightInfo for () {
 	/// Storage: `XYKWarehouseLM::GlobalFarm` (r:1 w:1)
 	/// Proof: `XYKWarehouseLM::GlobalFarm` (`max_values`: None, `max_size`: Some(205), added: 2680, mode: `MaxEncodedLen`)
 	/// Storage: `AssetRegistry::Assets` (r:1 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:2 w:2)
+	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
+	/// Storage: `Tokens::Accounts` (r:2 w:2)
+	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
+	/// Storage: `EmaOracle::Oracles` (r:1 w:0)
+	/// Proof: `EmaOracle::Oracles` (`max_values`: None, `max_size`: Some(177), added: 2652, mode: `MaxEncodedLen`)
+	/// Storage: `Duster::AccountBlacklist` (r:1 w:0)
+	/// Proof: `Duster::AccountBlacklist` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::BannedAssets` (r:1 w:0)
+	/// Proof: `AssetRegistry::BannedAssets` (`max_values`: None, `max_size`: Some(20), added: 2495, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:1 w:0)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn resume_yield_farm() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1469`
-		//  Estimated: `6196`
-		// Minimum execution time: 123_753_000 picoseconds.
-		Weight::from_parts(124_758_000, 6196)
-			.saturating_add(RocksDbWeight::get().reads(7_u64))
+		//  Measured:  `5159`
+		//  Estimated: `6156`
+		// Minimum execution time: 127_095_000 picoseconds.
+		Weight::from_parts(128_067_000, 6156)
+			.saturating_add(RocksDbWeight::get().reads(11_u64))
 			.saturating_add(RocksDbWeight::get().writes(5_u64))
 	}
 }
diff --git a/pallets/xyk/Cargo.toml b/pallets/xyk/Cargo.toml
index 040c37124..68c6df36f 100644
--- a/pallets/xyk/Cargo.toml
+++ b/pallets/xyk/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = 'pallet-xyk'
-version = "6.4.2"
+version = "6.4.3"
 description = 'XYK automated market maker'
 authors = ['GalacticCouncil']
 edition = '2021'
diff --git a/pallets/xyk/src/lib.rs b/pallets/xyk/src/lib.rs
index c75ca97ba..0090e2c8c 100644
--- a/pallets/xyk/src/lib.rs
+++ b/pallets/xyk/src/lib.rs
@@ -52,7 +52,7 @@ pub mod weights;
 
 pub use impls::XYKSpotPrice;
 
-use weights::WeightInfo;
+pub use weights::WeightInfo;
 
 // Re-export pallet items so that they can be accessed from the crate namespace.
 pub use pallet::*;
diff --git a/pallets/xyk/src/tests/mock.rs b/pallets/xyk/src/tests/mock.rs
index b8dffd442..00aaa71bb 100644
--- a/pallets/xyk/src/tests/mock.rs
+++ b/pallets/xyk/src/tests/mock.rs
@@ -125,6 +125,7 @@ impl system::Config for Test {
 	type BlockLength = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
+	type RuntimeTask = RuntimeTask;
 	type Nonce = u64;
 	type Block = Block;
 	type Hash = H256;
diff --git a/pallets/xyk/src/weights.rs b/pallets/xyk/src/weights.rs
index e1cae9ea6..a597f69f4 100644
--- a/pallets/xyk/src/weights.rs
+++ b/pallets/xyk/src/weights.rs
@@ -17,27 +17,30 @@
 
 //! Autogenerated weights for `pallet_xyk`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2023-12-12, STEPS: `5`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-05-23, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024`
 
 // Executed Command:
-// target/release/hydradx
+// ./target/release/hydradx
 // benchmark
 // pallet
-// --pallet=pallet-xyk
 // --wasm-execution=compiled
-// --heap-pages=4096
-// --chain=dev
-// --extrinsic=*
-// --steps=5
-// --repeat=20
+// --pallet
+// *
+// --extrinsic
+// *
+// --heap-pages
+// 4096
+// --steps
+// 50
+// --repeat
+// 20
+// --template=scripts/pallet-weight-template.hbs
 // --output
-// ./weights-1.1.0/xyk.rs
-// --template
-// .maintain/pallet-weight-template-no-back.hbs
+// weights/
 
 #![allow(unused_parens)]
 #![allow(unused_imports)]
@@ -61,361 +64,274 @@ pub trait WeightInfo {
 }
 
 /// Weights for amm using the hydraDX node and recommended hardware.
-pub struct HydraWeight<T>(PhantomData<T>);
-
-impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
+impl WeightInfo for () {
+	/// Storage: `AssetRegistry::Assets` (r:3 w:1)
+	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
 	/// Storage: `LBP::PoolData` (r:1 w:0)
 	/// Proof: `LBP::PoolData` (`max_values`: None, `max_size`: Some(163), added: 2638, mode: `MaxEncodedLen`)
 	/// Storage: `XYK::ShareToken` (r:1 w:1)
 	/// Proof: `XYK::ShareToken` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
-	/// Storage: `Tokens::Accounts` (r:5 w:5)
+	/// Storage: `Tokens::Accounts` (r:7 w:7)
 	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
 	/// Storage: `AssetRegistry::AssetIds` (r:1 w:1)
 	/// Proof: `AssetRegistry::AssetIds` (`max_values`: None, `max_size`: Some(53), added: 2528, mode: `MaxEncodedLen`)
 	/// Storage: `AssetRegistry::NextAssetId` (r:1 w:1)
 	/// Proof: `AssetRegistry::NextAssetId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:2 w:1)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:2 w:2)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `MultiTransactionPayment::AccountCurrencyMap` (r:2 w:1)
+	/// Storage: `Duster::AccountBlacklist` (r:1 w:1)
+	/// Proof: `Duster::AccountBlacklist` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::BannedAssets` (r:4 w:0)
+	/// Proof: `AssetRegistry::BannedAssets` (`max_values`: None, `max_size`: Some(20), added: 2495, mode: `MaxEncodedLen`)
+	/// Storage: `MultiTransactionPayment::AccountCurrencyMap` (r:3 w:0)
 	/// Proof: `MultiTransactionPayment::AccountCurrencyMap` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
-	/// Storage: `MultiTransactionPayment::AcceptedCurrencies` (r:1 w:0)
+	/// Storage: `MultiTransactionPayment::AcceptedCurrencyPrice` (r:1 w:0)
+	/// Proof: `MultiTransactionPayment::AcceptedCurrencyPrice` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:3 w:3)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `MultiTransactionPayment::AcceptedCurrencies` (r:3 w:0)
 	/// Proof: `MultiTransactionPayment::AcceptedCurrencies` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:1 w:1)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:1 w:0)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(49), added: 2524, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::ExistentialDepositCounter` (r:1 w:1)
+	/// Proof: `AssetRegistry::ExistentialDepositCounter` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
 	/// Storage: `Tokens::TotalIssuance` (r:1 w:1)
 	/// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
-	/// Storage: `Duster::AccountBlacklist` (r:0 w:1)
-	/// Proof: `Duster::AccountBlacklist` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
 	/// Storage: `XYK::TotalLiquidity` (r:0 w:1)
 	/// Proof: `XYK::TotalLiquidity` (`max_values`: None, `max_size`: Some(64), added: 2539, mode: `MaxEncodedLen`)
 	/// Storage: `XYK::PoolAssets` (r:0 w:1)
 	/// Proof: `XYK::PoolAssets` (`max_values`: None, `max_size`: Some(56), added: 2531, mode: `MaxEncodedLen`)
 	fn create_pool() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1140`
-		//  Estimated: `13905`
-		// Minimum execution time: 202_507_000 picoseconds.
-		Weight::from_parts(203_717_000, 13905)
-			.saturating_add(T::DbWeight::get().reads(17_u64))
-			.saturating_add(T::DbWeight::get().writes(16_u64))
+		//  Measured:  `3659`
+		//  Estimated: `19071`
+		// Minimum execution time: 479_166_000 picoseconds.
+		Weight::from_parts(482_391_000, 19071)
+			.saturating_add(RocksDbWeight::get().reads(33_u64))
+			.saturating_add(RocksDbWeight::get().writes(20_u64))
 	}
 	/// Storage: `XYK::ShareToken` (r:1 w:0)
 	/// Proof: `XYK::ShareToken` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
-	/// Storage: `Tokens::Accounts` (r:5 w:5)
+	/// Storage: `Tokens::Accounts` (r:7 w:7)
 	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
 	/// Storage: `XYK::TotalLiquidity` (r:1 w:1)
 	/// Proof: `XYK::TotalLiquidity` (`max_values`: None, `max_size`: Some(64), added: 2539, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:3 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:1)
+	/// Storage: `Duster::AccountBlacklist` (r:1 w:0)
+	/// Proof: `Duster::AccountBlacklist` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::BannedAssets` (r:4 w:0)
+	/// Proof: `AssetRegistry::BannedAssets` (`max_values`: None, `max_size`: Some(20), added: 2495, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::Assets` (r:4 w:0)
+	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:2 w:2)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `Tokens::TotalIssuance` (r:1 w:1)
-	/// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
 	/// Storage: `MultiTransactionPayment::AccountCurrencyMap` (r:1 w:0)
 	/// Proof: `MultiTransactionPayment::AccountCurrencyMap` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
-	/// Storage: `EmaOracle::Accumulator` (r:1 w:1)
-	/// Proof: `EmaOracle::Accumulator` (`max_values`: Some(1), `max_size`: Some(5921), added: 6416, mode: `MaxEncodedLen`)
-	fn add_liquidity() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1803`
-		//  Estimated: `13905`
-		// Minimum execution time: 176_176_000 picoseconds.
-		Weight::from_parts(177_422_000, 13905)
-			.saturating_add(T::DbWeight::get().reads(14_u64))
-			.saturating_add(T::DbWeight::get().writes(9_u64))
-	}
-	/// Storage: `XYK::ShareToken` (r:1 w:0)
-	/// Proof: `XYK::ShareToken` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
-	/// Storage: `XYK::TotalLiquidity` (r:1 w:1)
-	/// Proof: `XYK::TotalLiquidity` (`max_values`: None, `max_size`: Some(64), added: 2539, mode: `MaxEncodedLen`)
-	/// Storage: `Tokens::Accounts` (r:5 w:5)
-	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:3 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:0)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:1 w:1)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::ExistentialDepositCounter` (r:1 w:1)
+	/// Proof: `AssetRegistry::ExistentialDepositCounter` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:1 w:0)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(49), added: 2524, mode: `MaxEncodedLen`)
+	/// Storage: `MultiTransactionPayment::AcceptedCurrencyPrice` (r:1 w:0)
+	/// Proof: `MultiTransactionPayment::AcceptedCurrencyPrice` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
 	/// Storage: `Tokens::TotalIssuance` (r:1 w:1)
 	/// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
-	/// Storage: `EmaOracle::Accumulator` (r:1 w:1)
-	/// Proof: `EmaOracle::Accumulator` (`max_values`: Some(1), `max_size`: Some(5921), added: 6416, mode: `MaxEncodedLen`)
-	fn remove_liquidity() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1749`
-		//  Estimated: `13905`
-		// Minimum execution time: 168_176_000 picoseconds.
-		Weight::from_parts(169_296_000, 13905)
-			.saturating_add(T::DbWeight::get().reads(13_u64))
-			.saturating_add(T::DbWeight::get().writes(8_u64))
-	}
-	/// Storage: `XYK::ShareToken` (r:1 w:0)
-	/// Proof: `XYK::ShareToken` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
-	/// Storage: `Tokens::Accounts` (r:4 w:4)
-	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:2 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:2 w:0)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `EmaOracle::Accumulator` (r:1 w:1)
-	/// Proof: `EmaOracle::Accumulator` (`max_values`: Some(1), `max_size`: Some(5921), added: 6416, mode: `MaxEncodedLen`)
-	fn sell() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1492`
-		//  Estimated: `11322`
-		// Minimum execution time: 127_203_000 picoseconds.
-		Weight::from_parts(127_918_000, 11322)
-			.saturating_add(T::DbWeight::get().reads(10_u64))
-			.saturating_add(T::DbWeight::get().writes(5_u64))
-	}
-	/// Storage: `XYK::ShareToken` (r:1 w:0)
-	/// Proof: `XYK::ShareToken` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
-	/// Storage: `Tokens::Accounts` (r:4 w:4)
-	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:2 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:2 w:0)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `EmaOracle::Accumulator` (r:1 w:1)
-	/// Proof: `EmaOracle::Accumulator` (`max_values`: Some(1), `max_size`: Some(5921), added: 6416, mode: `MaxEncodedLen`)
-	fn buy() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1492`
-		//  Estimated: `11322`
-		// Minimum execution time: 126_846_000 picoseconds.
-		Weight::from_parts(127_737_000, 11322)
-			.saturating_add(T::DbWeight::get().reads(10_u64))
-			.saturating_add(T::DbWeight::get().writes(5_u64))
-	}
-	/// Storage: `XYK::ShareToken` (r:1 w:0)
-	/// Proof: `XYK::ShareToken` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
-	/// Storage: `Tokens::Accounts` (r:4 w:4)
-	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:2 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:2 w:0)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `EmaOracle::Accumulator` (r:1 w:1)
-	/// Proof: `EmaOracle::Accumulator` (`max_values`: Some(1), `max_size`: Some(5921), added: 6416, mode: `MaxEncodedLen`)
-	/// The range of component `c` is `[1, 2]`.
-	/// The range of component `e` is `[0, 1]`.
-	fn router_execution_sell(c: u32, e: u32) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `583 + e * (909 ±0)`
-		//  Estimated: `6156 + e * (5166 ±0)`
-		// Minimum execution time: 22_072_000 picoseconds.
-		Weight::from_parts(5_201_125, 6156)
-			// Standard Error: 56_711
-			.saturating_add(Weight::from_parts(8_630_075, 0).saturating_mul(c.into()))
-			// Standard Error: 56_711
-			.saturating_add(Weight::from_parts(113_479_825, 0).saturating_mul(e.into()))
-			.saturating_add(T::DbWeight::get().reads(3_u64))
-			.saturating_add(T::DbWeight::get().reads((7_u64).saturating_mul(e.into())))
-			.saturating_add(T::DbWeight::get().writes((5_u64).saturating_mul(e.into())))
-			.saturating_add(Weight::from_parts(0, 5166).saturating_mul(e.into()))
-	}
-	/// Storage: `XYK::ShareToken` (r:1 w:0)
-	/// Proof: `XYK::ShareToken` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
-	/// Storage: `Tokens::Accounts` (r:4 w:4)
-	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:2 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:2 w:0)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `EmaOracle::Accumulator` (r:1 w:1)
-	/// Proof: `EmaOracle::Accumulator` (`max_values`: Some(1), `max_size`: Some(5921), added: 6416, mode: `MaxEncodedLen`)
-	/// The range of component `c` is `[1, 3]`.
-	/// The range of component `e` is `[0, 1]`.
-	fn router_execution_buy(c: u32, e: u32) -> Weight {
+	/// Storage: `EmaOracle::WhitelistedAssets` (r:1 w:0)
+	/// Proof: `EmaOracle::WhitelistedAssets` (`max_values`: Some(1), `max_size`: Some(641), added: 1136, mode: `MaxEncodedLen`)
+	fn add_liquidity() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `583 + e * (909 ±0)`
-		//  Estimated: `6156 + e * (5166 ±0)`
-		// Minimum execution time: 30_065_000 picoseconds.
-		Weight::from_parts(6_816_200, 6156)
-			// Standard Error: 42_652
-			.saturating_add(Weight::from_parts(7_927_825, 0).saturating_mul(c.into()))
-			// Standard Error: 69_651
-			.saturating_add(Weight::from_parts(112_378_650, 0).saturating_mul(e.into()))
-			.saturating_add(T::DbWeight::get().reads(3_u64))
-			.saturating_add(T::DbWeight::get().reads((7_u64).saturating_mul(e.into())))
-			.saturating_add(T::DbWeight::get().writes((5_u64).saturating_mul(e.into())))
-			.saturating_add(Weight::from_parts(0, 5166).saturating_mul(e.into()))
+		//  Measured:  `4295`
+		//  Estimated: `19071`
+		// Minimum execution time: 295_185_000 picoseconds.
+		Weight::from_parts(297_223_000, 19071)
+			.saturating_add(RocksDbWeight::get().reads(27_u64))
+			.saturating_add(RocksDbWeight::get().writes(13_u64))
 	}
-}
-
-// For backwards compatibility and tests
-impl WeightInfo for () {
-	/// Storage: `LBP::PoolData` (r:1 w:0)
-	/// Proof: `LBP::PoolData` (`max_values`: None, `max_size`: Some(163), added: 2638, mode: `MaxEncodedLen`)
 	/// Storage: `XYK::ShareToken` (r:1 w:1)
 	/// Proof: `XYK::ShareToken` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
-	/// Storage: `Tokens::Accounts` (r:5 w:5)
+	/// Storage: `XYK::TotalLiquidity` (r:1 w:1)
+	/// Proof: `XYK::TotalLiquidity` (`max_values`: None, `max_size`: Some(64), added: 2539, mode: `MaxEncodedLen`)
+	/// Storage: `Tokens::Accounts` (r:7 w:7)
 	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::AssetIds` (r:1 w:1)
-	/// Proof: `AssetRegistry::AssetIds` (`max_values`: None, `max_size`: Some(53), added: 2528, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::NextAssetId` (r:1 w:1)
-	/// Proof: `AssetRegistry::NextAssetId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:2 w:1)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:2 w:2)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `MultiTransactionPayment::AccountCurrencyMap` (r:2 w:1)
+	/// Storage: `Duster::AccountBlacklist` (r:2 w:1)
+	/// Proof: `Duster::AccountBlacklist` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::BannedAssets` (r:3 w:0)
+	/// Proof: `AssetRegistry::BannedAssets` (`max_values`: None, `max_size`: Some(20), added: 2495, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::Assets` (r:4 w:0)
+	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
+	/// Storage: `MultiTransactionPayment::AccountCurrencyMap` (r:2 w:0)
 	/// Proof: `MultiTransactionPayment::AccountCurrencyMap` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
-	/// Storage: `MultiTransactionPayment::AcceptedCurrencies` (r:1 w:0)
-	/// Proof: `MultiTransactionPayment::AcceptedCurrencies` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
+	/// Storage: `MultiTransactionPayment::AcceptedCurrencyPrice` (r:1 w:0)
+	/// Proof: `MultiTransactionPayment::AcceptedCurrencyPrice` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:3 w:3)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:1 w:1)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:1 w:0)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(49), added: 2524, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::ExistentialDepositCounter` (r:1 w:1)
+	/// Proof: `AssetRegistry::ExistentialDepositCounter` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
 	/// Storage: `Tokens::TotalIssuance` (r:1 w:1)
 	/// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
-	/// Storage: `Duster::AccountBlacklist` (r:0 w:1)
-	/// Proof: `Duster::AccountBlacklist` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
-	/// Storage: `XYK::TotalLiquidity` (r:0 w:1)
-	/// Proof: `XYK::TotalLiquidity` (`max_values`: None, `max_size`: Some(64), added: 2539, mode: `MaxEncodedLen`)
+	/// Storage: `EmaOracle::WhitelistedAssets` (r:1 w:0)
+	/// Proof: `EmaOracle::WhitelistedAssets` (`max_values`: Some(1), `max_size`: Some(641), added: 1136, mode: `MaxEncodedLen`)
 	/// Storage: `XYK::PoolAssets` (r:0 w:1)
 	/// Proof: `XYK::PoolAssets` (`max_values`: None, `max_size`: Some(56), added: 2531, mode: `MaxEncodedLen`)
-	fn create_pool() -> Weight {
+	fn remove_liquidity() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1140`
-		//  Estimated: `13905`
-		// Minimum execution time: 202_507_000 picoseconds.
-		Weight::from_parts(203_717_000, 13905)
-			.saturating_add(RocksDbWeight::get().reads(17_u64))
-			.saturating_add(RocksDbWeight::get().writes(16_u64))
+		//  Measured:  `4345`
+		//  Estimated: `19071`
+		// Minimum execution time: 431_770_000 picoseconds.
+		Weight::from_parts(434_368_000, 19071)
+			.saturating_add(RocksDbWeight::get().reads(29_u64))
+			.saturating_add(RocksDbWeight::get().writes(17_u64))
 	}
 	/// Storage: `XYK::ShareToken` (r:1 w:0)
 	/// Proof: `XYK::ShareToken` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
-	/// Storage: `Tokens::Accounts` (r:5 w:5)
+	/// Storage: `Tokens::Accounts` (r:6 w:6)
 	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
-	/// Storage: `XYK::TotalLiquidity` (r:1 w:1)
-	/// Proof: `XYK::TotalLiquidity` (`max_values`: None, `max_size`: Some(64), added: 2539, mode: `MaxEncodedLen`)
+	/// Storage: `Duster::AccountBlacklist` (r:2 w:0)
+	/// Proof: `Duster::AccountBlacklist` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::BannedAssets` (r:3 w:0)
+	/// Proof: `AssetRegistry::BannedAssets` (`max_values`: None, `max_size`: Some(20), added: 2495, mode: `MaxEncodedLen`)
 	/// Storage: `AssetRegistry::Assets` (r:3 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:1)
+	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:3 w:2)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `Tokens::TotalIssuance` (r:1 w:1)
-	/// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
 	/// Storage: `MultiTransactionPayment::AccountCurrencyMap` (r:1 w:0)
 	/// Proof: `MultiTransactionPayment::AccountCurrencyMap` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
-	/// Storage: `EmaOracle::Accumulator` (r:1 w:1)
-	/// Proof: `EmaOracle::Accumulator` (`max_values`: Some(1), `max_size`: Some(5921), added: 6416, mode: `MaxEncodedLen`)
-	fn add_liquidity() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1803`
-		//  Estimated: `13905`
-		// Minimum execution time: 176_176_000 picoseconds.
-		Weight::from_parts(177_422_000, 13905)
-			.saturating_add(RocksDbWeight::get().reads(14_u64))
-			.saturating_add(RocksDbWeight::get().writes(9_u64))
-	}
-	/// Storage: `XYK::ShareToken` (r:1 w:0)
-	/// Proof: `XYK::ShareToken` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
-	/// Storage: `XYK::TotalLiquidity` (r:1 w:1)
-	/// Proof: `XYK::TotalLiquidity` (`max_values`: None, `max_size`: Some(64), added: 2539, mode: `MaxEncodedLen`)
-	/// Storage: `Tokens::Accounts` (r:5 w:5)
-	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:3 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:0)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `Tokens::TotalIssuance` (r:1 w:1)
-	/// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
-	/// Storage: `EmaOracle::Accumulator` (r:1 w:1)
-	/// Proof: `EmaOracle::Accumulator` (`max_values`: Some(1), `max_size`: Some(5921), added: 6416, mode: `MaxEncodedLen`)
-	fn remove_liquidity() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1749`
-		//  Estimated: `13905`
-		// Minimum execution time: 168_176_000 picoseconds.
-		Weight::from_parts(169_296_000, 13905)
-			.saturating_add(RocksDbWeight::get().reads(13_u64))
-			.saturating_add(RocksDbWeight::get().writes(8_u64))
-	}
-	/// Storage: `XYK::ShareToken` (r:1 w:0)
-	/// Proof: `XYK::ShareToken` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
-	/// Storage: `Tokens::Accounts` (r:4 w:4)
-	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:2 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:2 w:0)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `EmaOracle::Accumulator` (r:1 w:1)
-	/// Proof: `EmaOracle::Accumulator` (`max_values`: Some(1), `max_size`: Some(5921), added: 6416, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:1 w:1)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::ExistentialDepositCounter` (r:1 w:1)
+	/// Proof: `AssetRegistry::ExistentialDepositCounter` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:1 w:0)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(49), added: 2524, mode: `MaxEncodedLen`)
+	/// Storage: `MultiTransactionPayment::AcceptedCurrencyPrice` (r:1 w:0)
+	/// Proof: `MultiTransactionPayment::AcceptedCurrencyPrice` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
+	/// Storage: `EmaOracle::WhitelistedAssets` (r:1 w:0)
+	/// Proof: `EmaOracle::WhitelistedAssets` (`max_values`: Some(1), `max_size`: Some(641), added: 1136, mode: `MaxEncodedLen`)
 	fn sell() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1492`
-		//  Estimated: `11322`
-		// Minimum execution time: 127_203_000 picoseconds.
-		Weight::from_parts(127_918_000, 11322)
-			.saturating_add(RocksDbWeight::get().reads(10_u64))
-			.saturating_add(RocksDbWeight::get().writes(5_u64))
+		//  Measured:  `4194`
+		//  Estimated: `16488`
+		// Minimum execution time: 257_210_000 picoseconds.
+		Weight::from_parts(259_165_000, 16488)
+			.saturating_add(RocksDbWeight::get().reads(24_u64))
+			.saturating_add(RocksDbWeight::get().writes(10_u64))
 	}
 	/// Storage: `XYK::ShareToken` (r:1 w:0)
 	/// Proof: `XYK::ShareToken` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
-	/// Storage: `Tokens::Accounts` (r:4 w:4)
+	/// Storage: `Tokens::Accounts` (r:6 w:6)
 	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:2 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:2 w:0)
+	/// Storage: `Duster::AccountBlacklist` (r:2 w:0)
+	/// Proof: `Duster::AccountBlacklist` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::BannedAssets` (r:3 w:0)
+	/// Proof: `AssetRegistry::BannedAssets` (`max_values`: None, `max_size`: Some(20), added: 2495, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::Assets` (r:3 w:0)
+	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
+	/// Storage: `MultiTransactionPayment::AccountCurrencyMap` (r:1 w:0)
+	/// Proof: `MultiTransactionPayment::AccountCurrencyMap` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	/// Storage: `MultiTransactionPayment::AcceptedCurrencyPrice` (r:1 w:0)
+	/// Proof: `MultiTransactionPayment::AcceptedCurrencyPrice` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:3 w:2)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `EmaOracle::Accumulator` (r:1 w:1)
-	/// Proof: `EmaOracle::Accumulator` (`max_values`: Some(1), `max_size`: Some(5921), added: 6416, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:1 w:1)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:1 w:0)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(49), added: 2524, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::ExistentialDepositCounter` (r:1 w:1)
+	/// Proof: `AssetRegistry::ExistentialDepositCounter` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	/// Storage: `EmaOracle::WhitelistedAssets` (r:1 w:0)
+	/// Proof: `EmaOracle::WhitelistedAssets` (`max_values`: Some(1), `max_size`: Some(641), added: 1136, mode: `MaxEncodedLen`)
 	fn buy() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1492`
-		//  Estimated: `11322`
-		// Minimum execution time: 126_846_000 picoseconds.
-		Weight::from_parts(127_737_000, 11322)
-			.saturating_add(RocksDbWeight::get().reads(10_u64))
-			.saturating_add(RocksDbWeight::get().writes(5_u64))
+		//  Measured:  `4194`
+		//  Estimated: `16488`
+		// Minimum execution time: 256_649_000 picoseconds.
+		Weight::from_parts(257_410_000, 16488)
+			.saturating_add(RocksDbWeight::get().reads(24_u64))
+			.saturating_add(RocksDbWeight::get().writes(10_u64))
 	}
 	/// Storage: `XYK::ShareToken` (r:1 w:0)
 	/// Proof: `XYK::ShareToken` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
-	/// Storage: `Tokens::Accounts` (r:4 w:4)
+	/// Storage: `Tokens::Accounts` (r:6 w:6)
 	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:2 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:2 w:0)
+	/// Storage: `Duster::AccountBlacklist` (r:2 w:0)
+	/// Proof: `Duster::AccountBlacklist` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::BannedAssets` (r:3 w:0)
+	/// Proof: `AssetRegistry::BannedAssets` (`max_values`: None, `max_size`: Some(20), added: 2495, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::Assets` (r:3 w:0)
+	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:3 w:2)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `EmaOracle::Accumulator` (r:1 w:1)
-	/// Proof: `EmaOracle::Accumulator` (`max_values`: Some(1), `max_size`: Some(5921), added: 6416, mode: `MaxEncodedLen`)
+	/// Storage: `MultiTransactionPayment::AccountCurrencyMap` (r:1 w:0)
+	/// Proof: `MultiTransactionPayment::AccountCurrencyMap` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:1 w:1)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::ExistentialDepositCounter` (r:1 w:1)
+	/// Proof: `AssetRegistry::ExistentialDepositCounter` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:1 w:0)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(49), added: 2524, mode: `MaxEncodedLen`)
+	/// Storage: `MultiTransactionPayment::AcceptedCurrencyPrice` (r:1 w:0)
+	/// Proof: `MultiTransactionPayment::AcceptedCurrencyPrice` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
+	/// Storage: `EmaOracle::WhitelistedAssets` (r:1 w:0)
+	/// Proof: `EmaOracle::WhitelistedAssets` (`max_values`: Some(1), `max_size`: Some(641), added: 1136, mode: `MaxEncodedLen`)
 	/// The range of component `c` is `[1, 2]`.
 	/// The range of component `e` is `[0, 1]`.
 	fn router_execution_sell(c: u32, e: u32) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `583 + e * (909 ±0)`
-		//  Estimated: `6156 + e * (5166 ±0)`
-		// Minimum execution time: 22_072_000 picoseconds.
-		Weight::from_parts(5_201_125, 6156)
-			// Standard Error: 56_711
-			.saturating_add(Weight::from_parts(8_630_075, 0).saturating_mul(c.into()))
-			// Standard Error: 56_711
-			.saturating_add(Weight::from_parts(113_479_825, 0).saturating_mul(e.into()))
+		//  Measured:  `1221 + e * (2973 ±0)`
+		//  Estimated: `8799 + e * (10332 ±0)`
+		// Minimum execution time: 24_501_000 picoseconds.
+		Weight::from_parts(10_206_077, 8799)
+			// Standard Error: 76_653
+			.saturating_add(Weight::from_parts(7_446_454, 0).saturating_mul(c.into()))
+			// Standard Error: 76_653
+			.saturating_add(Weight::from_parts(241_285_864, 0).saturating_mul(e.into()))
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
-			.saturating_add(RocksDbWeight::get().reads((7_u64).saturating_mul(e.into())))
-			.saturating_add(RocksDbWeight::get().writes((5_u64).saturating_mul(e.into())))
-			.saturating_add(Weight::from_parts(0, 5166).saturating_mul(e.into()))
+			.saturating_add(RocksDbWeight::get().reads((21_u64).saturating_mul(e.into())))
+			.saturating_add(RocksDbWeight::get().writes((10_u64).saturating_mul(e.into())))
+			.saturating_add(Weight::from_parts(0, 10332).saturating_mul(e.into()))
 	}
 	/// Storage: `XYK::ShareToken` (r:1 w:0)
 	/// Proof: `XYK::ShareToken` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
-	/// Storage: `Tokens::Accounts` (r:4 w:4)
+	/// Storage: `Tokens::Accounts` (r:6 w:6)
 	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:2 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(87), added: 2562, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:2 w:0)
+	/// Storage: `Duster::AccountBlacklist` (r:2 w:0)
+	/// Proof: `Duster::AccountBlacklist` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::BannedAssets` (r:3 w:0)
+	/// Proof: `AssetRegistry::BannedAssets` (`max_values`: None, `max_size`: Some(20), added: 2495, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::Assets` (r:3 w:0)
+	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
+	/// Storage: `MultiTransactionPayment::AccountCurrencyMap` (r:1 w:0)
+	/// Proof: `MultiTransactionPayment::AccountCurrencyMap` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	/// Storage: `MultiTransactionPayment::AcceptedCurrencyPrice` (r:1 w:0)
+	/// Proof: `MultiTransactionPayment::AcceptedCurrencyPrice` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:3 w:2)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `EmaOracle::Accumulator` (r:1 w:1)
-	/// Proof: `EmaOracle::Accumulator` (`max_values`: Some(1), `max_size`: Some(5921), added: 6416, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Locks` (r:1 w:1)
+	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Freezes` (r:1 w:0)
+	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(49), added: 2524, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::ExistentialDepositCounter` (r:1 w:1)
+	/// Proof: `AssetRegistry::ExistentialDepositCounter` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	/// Storage: `EmaOracle::WhitelistedAssets` (r:1 w:0)
+	/// Proof: `EmaOracle::WhitelistedAssets` (`max_values`: Some(1), `max_size`: Some(641), added: 1136, mode: `MaxEncodedLen`)
 	/// The range of component `c` is `[1, 3]`.
 	/// The range of component `e` is `[0, 1]`.
 	fn router_execution_buy(c: u32, e: u32) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `583 + e * (909 ±0)`
-		//  Estimated: `6156 + e * (5166 ±0)`
-		// Minimum execution time: 30_065_000 picoseconds.
-		Weight::from_parts(6_816_200, 6156)
-			// Standard Error: 42_652
-			.saturating_add(Weight::from_parts(7_927_825, 0).saturating_mul(c.into()))
-			// Standard Error: 69_651
-			.saturating_add(Weight::from_parts(112_378_650, 0).saturating_mul(e.into()))
+		//  Measured:  `1221 + e * (2973 ±0)`
+		//  Estimated: `6156 + e * (10332 ±94_653_459_118_620)`
+		// Minimum execution time: 31_769_000 picoseconds.
+		Weight::from_parts(9_820_195, 6156)
+			// Standard Error: 25_963
+			.saturating_add(Weight::from_parts(7_544_497, 0).saturating_mul(c.into()))
+			// Standard Error: 43_217
+			.saturating_add(Weight::from_parts(239_839_406, 0).saturating_mul(e.into()))
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
-			.saturating_add(RocksDbWeight::get().reads((7_u64).saturating_mul(e.into())))
-			.saturating_add(RocksDbWeight::get().writes((5_u64).saturating_mul(e.into())))
-			.saturating_add(Weight::from_parts(0, 5166).saturating_mul(e.into()))
+			.saturating_add(RocksDbWeight::get().reads((21_u64).saturating_mul(e.into())))
+			.saturating_add(RocksDbWeight::get().writes((10_u64).saturating_mul(e.into())))
+			.saturating_add(Weight::from_parts(0, 10332).saturating_mul(e.into()))
 	}
 }
diff --git a/precompiles/call-permit/Cargo.toml b/precompiles/call-permit/Cargo.toml
index f5b81d9c2..556178a13 100644
--- a/precompiles/call-permit/Cargo.toml
+++ b/precompiles/call-permit/Cargo.toml
@@ -2,7 +2,7 @@
 name = "pallet-evm-precompile-call-permit"
 description = "A Precompile to dispatch a call with a ERC712 permit."
 edition = "2021"
-version = "0.1.0"
+version = "0.1.1"
 authors = ["PureStake"]
 repository = "https://github.com/PureStake/moonbeam"
 
diff --git a/precompiles/call-permit/src/mock.rs b/precompiles/call-permit/src/mock.rs
index 5e57bc16a..193f58339 100644
--- a/precompiles/call-permit/src/mock.rs
+++ b/precompiles/call-permit/src/mock.rs
@@ -54,6 +54,7 @@ impl frame_system::Config for Runtime {
 	type BaseCallFilter = Everything;
 	type DbWeight = ();
 	type RuntimeOrigin = RuntimeOrigin;
+	type RuntimeTask = RuntimeTask;
 	type Nonce = u64;
 	type Block = Block;
 	type RuntimeCall = RuntimeCall;
@@ -90,9 +91,8 @@ impl pallet_balances::Config for Runtime {
 	type WeightInfo = ();
 	type RuntimeHoldReason = ();
 	type FreezeIdentifier = ();
-	type MaxHolds = ();
 	type MaxFreezes = ();
-	//type RuntimeFreezeReason = ();
+	type RuntimeFreezeReason = ();
 }
 
 mock_account!(CallPermit, |_| MockAccount::from_u64(1));
@@ -111,7 +111,6 @@ pub type PCall = CallPermitPrecompileCall<Runtime>;
 parameter_types! {
 	pub PrecompilesValue: Precompiles<Runtime> = Precompiles::new();
 	pub const WeightPerGas: Weight = Weight::from_parts(1, 0);
-	pub const SuicideQuickClearLimit: u32 = 0;
 }
 
 impl pallet_evm::Config for Runtime {
@@ -134,7 +133,7 @@ impl pallet_evm::Config for Runtime {
 	type OnCreate = ();
 	type GasLimitPovSizeRatio = ();
 	type GasLimitStorageGrowthRatio = ();
-	//type SuicideQuickClearLimit = SuicideQuickClearLimit;
+	type SuicideQuickClearLimit = ConstU32<0>;
 	type Timestamp = Timestamp;
 	type WeightInfo = pallet_evm::weights::SubstrateWeight<Runtime>;
 }
diff --git a/precompiles/utils/Cargo.toml b/precompiles/utils/Cargo.toml
index a667a3bba..4f1a22312 100644
--- a/precompiles/utils/Cargo.toml
+++ b/precompiles/utils/Cargo.toml
@@ -2,7 +2,7 @@
 name = "precompile-utils"
 description = "Utils to write EVM precompiles."
 edition = "2021"
-version = "0.1.0"
+version = "0.1.1"
 authors = ["PureStake"]
 repository = "https://github.com/PureStake/moonbeam"
 
diff --git a/precompiles/utils/src/solidity/codec/xcm.rs b/precompiles/utils/src/solidity/codec/xcm.rs
index 2ea881869..0b80e2e6c 100644
--- a/precompiles/utils/src/solidity/codec/xcm.rs
+++ b/precompiles/utils/src/solidity/codec/xcm.rs
@@ -26,7 +26,7 @@ use {
 	sp_core::H256,
 	sp_std::vec::Vec,
 	sp_weights::Weight,
-	xcm::latest::{Junction, Junctions, MultiLocation, NetworkId},
+	xcm::v3::{Junction, Junctions, MultiLocation, NetworkId},
 };
 
 pub const JUNCTION_SIZE_LIMIT: u32 = 2u32.pow(16);
@@ -106,6 +106,11 @@ pub(crate) fn network_id_to_bytes(network_id: Option<NetworkId>) -> Vec<u8> {
 			encoded.push(9u8);
 			encoded
 		}
+		Some(NetworkId::PolkadotBulletin) => {
+			encoded.push(11u8);
+			encoded.push(10u8);
+			encoded
+		}
 	}
 }
 
diff --git a/precompiles/utils/src/tests.rs b/precompiles/utils/src/tests.rs
index cd10ace5b..07e101ce7 100644
--- a/precompiles/utils/src/tests.rs
+++ b/precompiles/utils/src/tests.rs
@@ -31,7 +31,7 @@ use {
 	pallet_evm::Context,
 	sp_core::{H160, H256, U256},
 	sp_std::convert::TryInto,
-	xcm::latest::{Junction, Junctions, NetworkId},
+	xcm::v3::{Junction, Junctions, NetworkId},
 };
 
 fn u256_repeat_byte(byte: u8) -> U256 {
diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml
index bc24303e3..b62a44c7e 100644
--- a/primitives/Cargo.toml
+++ b/primitives/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "primitives"
-version = "6.0.2"
+version = "6.0.3"
 authors = ["GalacticCouncil"]
 edition = "2021"
 repository = "https://github.com/galacticcouncil/HydraDX-node"
diff --git a/primitives/src/constants.rs b/primitives/src/constants.rs
index 8f7c1b083..1a825da6f 100644
--- a/primitives/src/constants.rs
+++ b/primitives/src/constants.rs
@@ -88,7 +88,7 @@ pub mod chain {
 	/// We allow for 0.5 seconds of compute
 	pub const MAXIMUM_BLOCK_WEIGHT: Weight = Weight::from_parts(
 		WEIGHT_REF_TIME_PER_SECOND.saturating_div(2),
-		polkadot_primitives::v5::MAX_POV_SIZE as u64,
+		polkadot_primitives::v6::MAX_POV_SIZE as u64,
 	);
 
 	/// The source of the data for the oracle.
diff --git a/runtime/adapters/Cargo.toml b/runtime/adapters/Cargo.toml
index 512d15490..05baabe02 100644
--- a/runtime/adapters/Cargo.toml
+++ b/runtime/adapters/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "hydradx-adapters"
-version = "1.3.3"
+version = "1.3.4"
 description = "Structs and other generic types for building runtimes."
 authors = ["GalacticCouncil"]
 edition = "2021"
diff --git a/runtime/adapters/src/lib.rs b/runtime/adapters/src/lib.rs
index 073ff7438..9fe5f2641 100644
--- a/runtime/adapters/src/lib.rs
+++ b/runtime/adapters/src/lib.rs
@@ -46,7 +46,7 @@ use pallet_ema_oracle::{OnActivityHandler, OracleError, Price};
 use pallet_omnipool::traits::{AssetInfo, ExternalPriceProvider, OmnipoolHooks};
 use pallet_stableswap::types::{PoolState, StableswapHooks};
 use pallet_transaction_multi_payment::DepositFee;
-use polkadot_xcm::latest::prelude::*;
+use polkadot_xcm::v4::prelude::*;
 use primitive_types::{U128, U512};
 use primitives::constants::chain::{STABLESWAP_SOURCE, XYK_SOURCE};
 use primitives::{constants::chain::OMNIPOOL_SOURCE, AccountId, AssetId, Balance, BlockNumber, CollectionId};
@@ -57,7 +57,7 @@ use warehouse_liquidity_mining::GlobalFarmData;
 use xcm_builder::TakeRevenue;
 use xcm_executor::{
 	traits::{ConvertLocation, MatchesFungible, TransactAsset, WeightTrader},
-	Assets,
+	AssetsInHolding,
 };
 
 pub mod inspect;
@@ -81,11 +81,11 @@ pub struct MultiCurrencyTrader<
 	Price: FixedPointNumber,
 	ConvertWeightToFee: WeightToFee<Balance = Balance>,
 	AcceptedCurrencyPrices: NativePriceOracle<AssetId, Price>,
-	ConvertCurrency: Convert<MultiAsset, Option<AssetId>>,
+	ConvertCurrency: Convert<Asset, Option<AssetId>>,
 	Revenue: TakeRevenue,
 > {
 	weight: Weight,
-	paid_assets: BTreeMap<(MultiLocation, Price), u128>,
+	paid_assets: BTreeMap<(Location, Price), u128>,
 	_phantom: PhantomData<(
 		AssetId,
 		Balance,
@@ -103,20 +103,17 @@ impl<
 		Price: FixedPointNumber,
 		ConvertWeightToFee: WeightToFee<Balance = Balance>,
 		AcceptedCurrencyPrices: NativePriceOracle<AssetId, Price>,
-		ConvertCurrency: Convert<MultiAsset, Option<AssetId>>,
+		ConvertCurrency: Convert<Asset, Option<AssetId>>,
 		Revenue: TakeRevenue,
 	> MultiCurrencyTrader<AssetId, Balance, Price, ConvertWeightToFee, AcceptedCurrencyPrices, ConvertCurrency, Revenue>
 {
 	/// Get the asset id of the first asset in `payment` and try to determine its price via the
 	/// price oracle.
-	fn get_asset_and_price(&mut self, payment: &Assets) -> Option<(MultiLocation, Price)> {
+	fn get_asset_and_price(&mut self, payment: &AssetsInHolding) -> Option<(Location, Price)> {
 		if let Some(asset) = payment.fungible_assets_iter().next() {
 			ConvertCurrency::convert(asset.clone())
 				.and_then(|currency| AcceptedCurrencyPrices::price(currency))
-				.and_then(|price| match asset.id {
-					Concrete(location) => Some((location, price)),
-					_ => None,
-				})
+				.map(|price| (asset.id.0, price))
 		} else {
 			None
 		}
@@ -129,7 +126,7 @@ impl<
 		Price: FixedPointNumber,
 		ConvertWeightToFee: WeightToFee<Balance = Balance>,
 		AcceptedCurrencyPrices: NativePriceOracle<AssetId, Price>,
-		ConvertCurrency: Convert<MultiAsset, Option<AssetId>>,
+		ConvertCurrency: Convert<Asset, Option<AssetId>>,
 		Revenue: TakeRevenue,
 	> WeightTrader
 	for MultiCurrencyTrader<AssetId, Balance, Price, ConvertWeightToFee, AcceptedCurrencyPrices, ConvertCurrency, Revenue>
@@ -148,7 +145,12 @@ impl<
 	/// per buy.
 	/// The fee is determined by `ConvertWeightToFee` in combination with the price determined by
 	/// `AcceptedCurrencyPrices`.
-	fn buy_weight(&mut self, weight: Weight, payment: Assets, _context: &XcmContext) -> Result<Assets, XcmError> {
+	fn buy_weight(
+		&mut self,
+		weight: Weight,
+		payment: AssetsInHolding,
+		_context: &XcmContext,
+	) -> Result<AssetsInHolding, XcmError> {
 		log::trace!(
 			target: "xcm::weight", "MultiCurrencyTrader::buy_weight weight: {:?}, payment: {:?}",
 			weight, payment
@@ -157,7 +159,7 @@ impl<
 		let fee = ConvertWeightToFee::weight_to_fee(&weight);
 		let converted_fee = price.checked_mul_int(fee).ok_or(XcmError::Overflow)?;
 		let amount: u128 = converted_fee.try_into().map_err(|_| XcmError::Overflow)?;
-		let required = (Concrete(asset_loc), amount).into();
+		let required = (asset_loc.clone(), amount).into();
 		let unused = payment.checked_sub(required).map_err(|_| XcmError::TooExpensive)?;
 		self.weight = self.weight.saturating_add(weight);
 		let key = (asset_loc, price);
@@ -171,7 +173,7 @@ impl<
 	}
 
 	/// Will refund up to `weight` from the first asset tracked by the trader.
-	fn refund_weight(&mut self, weight: Weight, _context: &XcmContext) -> Option<MultiAsset> {
+	fn refund_weight(&mut self, weight: Weight, _context: &XcmContext) -> Option<Asset> {
 		log::trace!(
 			target: "xcm::weight", "MultiCurrencyTrader::refund_weight weight: {:?}, paid_assets: {:?}",
 			weight, self.paid_assets
@@ -184,12 +186,12 @@ impl<
 			let refund = converted_fee.min(*amount);
 			*amount -= refund; // Will not underflow because of `min()` above.
 
-			let refund_asset = *asset_loc;
+			let refund_asset = asset_loc.clone();
 			if amount.is_zero() {
-				let key = (*asset_loc, *price);
+				let key = (asset_loc.clone(), *price);
 				self.paid_assets.remove(&key);
 			}
-			Some((Concrete(refund_asset), refund).into())
+			Some((refund_asset, refund).into())
 		} else {
 			None
 		}
@@ -204,14 +206,14 @@ impl<
 		Price: FixedPointNumber,
 		ConvertWeightToFee: WeightToFee<Balance = Balance>,
 		AcceptedCurrencyPrices: NativePriceOracle<AssetId, Price>,
-		ConvertCurrency: Convert<MultiAsset, Option<AssetId>>,
+		ConvertCurrency: Convert<Asset, Option<AssetId>>,
 		Revenue: TakeRevenue,
 	> Drop
 	for MultiCurrencyTrader<AssetId, Balance, Price, ConvertWeightToFee, AcceptedCurrencyPrices, ConvertCurrency, Revenue>
 {
 	fn drop(&mut self) {
 		for ((asset_loc, _), amount) in self.paid_assets.iter() {
-			Revenue::take_revenue((*asset_loc, *amount).into());
+			Revenue::take_revenue((asset_loc.clone(), *amount).into());
 		}
 	}
 }
@@ -228,18 +230,18 @@ impl<
 		AssetId,
 		Balance: AtLeast32BitUnsigned,
 		Price,
-		C: Convert<MultiLocation, Option<AssetId>>,
+		C: Convert<Asset, Option<AssetId>>,
 		D: DepositFee<AccountId, AssetId, Balance>,
 		F: Get<AccountId>,
 	> TakeRevenue for ToFeeReceiver<AccountId, AssetId, Balance, Price, C, D, F>
 {
-	fn take_revenue(asset: MultiAsset) {
-		match asset {
-			MultiAsset {
-				id: Concrete(loc),
+	fn take_revenue(asset: Asset) {
+		match asset.clone() {
+			Asset {
+				id: _asset_id,
 				fun: Fungibility::Fungible(amount),
 			} => {
-				C::convert(loc).and_then(|id| {
+				C::convert(asset).and_then(|id| {
 					let receiver = F::get();
 					D::deposit_fee(&receiver, id, amount.saturated_into::<Balance>())
 						.map_err(|e| log::trace!(target: "xcm::take_revenue", "Could not deposit fee: {:?}", e))
@@ -669,7 +671,7 @@ where
 enum Error {
 	/// Failed to match fungible.
 	FailedToMatchFungible,
-	/// `MultiLocation` to `AccountId` Conversion failed.
+	/// `Location` to `AccountId` Conversion failed.
 	AccountIdConversionFailed,
 	/// `CurrencyId` conversion failed.
 	CurrencyIdConversionFailed,
@@ -732,7 +734,7 @@ impl<
 		AccountId: sp_std::fmt::Debug + Clone,
 		AccountIdConvert: ConvertLocation<AccountId>,
 		CurrencyId: FullCodec + Eq + PartialEq + Copy + MaybeSerializeDeserialize + Debug,
-		CurrencyIdConvert: Convert<MultiAsset, Option<CurrencyId>>,
+		CurrencyIdConvert: Convert<Asset, Option<CurrencyId>>,
 		DepositFailureHandler: OnDepositFail<CurrencyId, AccountId, MultiCurrency::Balance>,
 		RerouteFilter: Contains<(CurrencyId, AccountId)>,
 		RerouteDestination: Get<AccountId>,
@@ -750,7 +752,7 @@ impl<
 		RerouteDestination,
 	>
 {
-	fn deposit_asset(asset: &MultiAsset, location: &MultiLocation, _context: &XcmContext) -> Result<(), XcmError> {
+	fn deposit_asset(asset: &Asset, location: &Location, _context: Option<&XcmContext>) -> Result<(), XcmError> {
 		match (
 			AccountIdConvert::convert_location(location),
 			CurrencyIdConvert::convert(asset.clone()),
@@ -773,10 +775,10 @@ impl<
 	}
 
 	fn withdraw_asset(
-		asset: &MultiAsset,
-		location: &MultiLocation,
+		asset: &Asset,
+		location: &Location,
 		_maybe_context: Option<&XcmContext>,
-	) -> Result<Assets, XcmError> {
+	) -> Result<AssetsInHolding, XcmError> {
 		UnknownAsset::withdraw(asset, location).or_else(|_| {
 			let who = AccountIdConvert::convert_location(location)
 				.ok_or_else(|| XcmError::from(Error::AccountIdConversionFailed))?;
@@ -792,11 +794,11 @@ impl<
 	}
 
 	fn transfer_asset(
-		asset: &MultiAsset,
-		from: &MultiLocation,
-		to: &MultiLocation,
+		asset: &Asset,
+		from: &Location,
+		to: &Location,
 		_context: &XcmContext,
-	) -> Result<Assets, XcmError> {
+	) -> Result<AssetsInHolding, XcmError> {
 		let from_account =
 			AccountIdConvert::convert_location(from).ok_or_else(|| XcmError::from(Error::AccountIdConversionFailed))?;
 		let to_account =
diff --git a/runtime/adapters/src/tests/mock.rs b/runtime/adapters/src/tests/mock.rs
index 3233bcaba..c244d849d 100644
--- a/runtime/adapters/src/tests/mock.rs
+++ b/runtime/adapters/src/tests/mock.rs
@@ -109,6 +109,7 @@ impl frame_system::Config for Test {
 	type BlockLength = ();
 	type RuntimeOrigin = RuntimeOrigin;
 	type RuntimeCall = RuntimeCall;
+	type RuntimeTask = RuntimeTask;
 	type Nonce = u64;
 	type Block = Block;
 	type Hash = H256;
@@ -141,8 +142,8 @@ impl pallet_balances::Config for Test {
 	type ReserveIdentifier = ();
 	type FreezeIdentifier = ();
 	type MaxFreezes = ();
-	type MaxHolds = ();
 	type RuntimeHoldReason = ();
+	type RuntimeFreezeReason = ();
 }
 
 parameter_type_with_key! {
diff --git a/runtime/adapters/src/tests/trader.rs b/runtime/adapters/src/tests/trader.rs
index 4d87e0d43..12ecf5a5d 100644
--- a/runtime/adapters/src/tests/trader.rs
+++ b/runtime/adapters/src/tests/trader.rs
@@ -21,6 +21,7 @@ use frame_support::{weights::IdentityFee, BoundedVec};
 use sp_runtime::{traits::One, DispatchResult, FixedU128};
 use sp_std::cell::RefCell;
 use sp_std::collections::btree_set::BTreeSet;
+use sp_std::sync::Arc;
 
 type AccountId = u32;
 type AssetId = u32;
@@ -47,33 +48,41 @@ impl NativePriceOracle<AssetId, Price> for MockOracle {
 }
 
 struct MockConvert;
-impl Convert<AssetId, Option<MultiLocation>> for MockConvert {
-	fn convert(id: AssetId) -> Option<MultiLocation> {
+impl Convert<AssetId, Option<Location>> for MockConvert {
+	fn convert(id: AssetId) -> Option<Location> {
 		match id {
 			CORE_ASSET_ID | TEST_ASSET_ID | CHEAP_ASSET_ID | OVERFLOW_ASSET_ID => {
 				let junction = Junction::from(BoundedVec::try_from(id.encode()).unwrap());
-				Some(polkadot_xcm::v3::MultiLocation::new(0, X1(junction)))
+				Some(Location::new(0, Junctions::X1(Arc::new([junction]))))
 			}
 			_ => None,
 		}
 	}
 }
 
-impl Convert<MultiLocation, Option<AssetId>> for MockConvert {
-	fn convert(location: MultiLocation) -> Option<AssetId> {
+impl Convert<Location, Option<AssetId>> for MockConvert {
+	fn convert(location: Location) -> Option<AssetId> {
 		match location {
-			MultiLocation {
+			Location {
 				parents: 0,
-				interior: X1(GeneralKey { data, .. }),
+				interior: Junctions::X1(a),
 			} => {
-				if let Ok(currency_id) = AssetId::decode(&mut &data[..]) {
-					// we currently have only one native asset
-					match currency_id {
-						CORE_ASSET_ID | TEST_ASSET_ID | CHEAP_ASSET_ID | OVERFLOW_ASSET_ID => Some(currency_id),
-						_ => None,
+				match (*a)[0] {
+					GeneralKey { data, .. } => {
+						match AssetId::decode(&mut &data[..]) {
+							Ok(currency_id) => {
+								// we currently have only one native asset
+								match currency_id {
+									CORE_ASSET_ID | TEST_ASSET_ID | CHEAP_ASSET_ID | OVERFLOW_ASSET_ID => {
+										Some(currency_id)
+									}
+									_ => None,
+								}
+							}
+							_ => None,
+						}
 					}
-				} else {
-					None
+					_ => None,
 				}
 			}
 			_ => None,
@@ -81,28 +90,22 @@ impl Convert<MultiLocation, Option<AssetId>> for MockConvert {
 	}
 }
 
-impl Convert<MultiAsset, Option<AssetId>> for MockConvert {
-	fn convert(asset: MultiAsset) -> Option<AssetId> {
-		if let MultiAsset {
-			id: Concrete(location), ..
-		} = asset
-		{
-			Self::convert(location)
-		} else {
-			None
-		}
+impl Convert<Asset, Option<AssetId>> for MockConvert {
+	fn convert(asset: Asset) -> Option<AssetId> {
+		let Asset { id: asset_id, .. } = asset;
+		Self::convert(asset_id.0)
 	}
 }
 
 thread_local! {
-	pub static TAKEN_REVENUE: RefCell<BTreeSet<MultiAsset>> = RefCell::new(BTreeSet::new());
-	pub static EXPECTED_REVENUE: RefCell<BTreeSet<MultiAsset>> = RefCell::new(BTreeSet::new());
+	pub static TAKEN_REVENUE: RefCell<BTreeSet<Asset>> = RefCell::new(BTreeSet::new());
+	pub static EXPECTED_REVENUE: RefCell<BTreeSet<Asset>> = RefCell::new(BTreeSet::new());
 }
 
 struct ExpectRevenue;
 impl ExpectRevenue {
 	/// Register an asset to be expected.
-	fn register_expected_asset(asset: MultiAsset) {
+	fn register_expected_asset(asset: Asset) {
 		EXPECTED_REVENUE.with(|e| e.borrow_mut().insert(asset));
 	}
 
@@ -134,7 +137,7 @@ impl ExpectRevenue {
 }
 
 impl TakeRevenue for ExpectRevenue {
-	fn take_revenue(asset: MultiAsset) {
+	fn take_revenue(asset: Asset) {
 		TAKEN_REVENUE.with(|t| t.borrow_mut().insert(asset));
 	}
 }
@@ -187,21 +190,21 @@ fn can_buy_weight() {
 			topic: None,
 		};
 
-		let core_payment: MultiAsset = (Concrete(core_id), 1_000_000).into();
+		let core_payment: Asset = (core_id, Fungible(1_000_000)).into();
 		let res = dbg!(trader.buy_weight(Weight::from_parts(1_000_000, 0), core_payment.clone().into(), &ctx));
 		assert!(res
 			.expect("buy_weight should succeed because payment == weight")
 			.is_empty());
 		ExpectRevenue::register_expected_asset(core_payment);
 
-		let test_payment: MultiAsset = (Concrete(test_id), 500_000).into();
+		let test_payment: Asset = (test_id, Fungible(500_000)).into();
 		let res = dbg!(trader.buy_weight(Weight::from_parts(1_000_000, 0), test_payment.clone().into(), &ctx));
 		assert!(res
 			.expect("buy_weight should succeed because payment == 0.5 * weight")
 			.is_empty());
 		ExpectRevenue::register_expected_asset(test_payment);
 
-		let cheap_payment: MultiAsset = (Concrete(cheap_id), 4_000_000).into();
+		let cheap_payment: Asset = (cheap_id, Fungible(4_000_000)).into();
 		let res = dbg!(trader.buy_weight(Weight::from_parts(1_000_000, 0), cheap_payment.clone().into(), &ctx));
 		assert!(res
 			.expect("buy_weight should succeed because payment == 4 * weight")
@@ -227,17 +230,17 @@ fn can_buy_twice() {
 			topic: None,
 		};
 
-		let payment1: MultiAsset = (Concrete(core_id), 1_000_000).into();
+		let payment1: Asset = (core_id.clone(), Fungible(1_000_000)).into();
 		let res = dbg!(trader.buy_weight(Weight::from_parts(1_000_000, 0), payment1.into(), &ctx));
 		assert!(res
 			.expect("buy_weight should succeed because payment == weight")
 			.is_empty());
-		let payment2: MultiAsset = (Concrete(core_id), 1_000_000).into();
+		let payment2: Asset = (core_id.clone(), Fungible(1_000_000)).into();
 		let res = dbg!(trader.buy_weight(Weight::from_parts(1_000_000, 0), payment2.into(), &ctx));
 		assert!(res
 			.expect("buy_weight should succeed because payment == weight")
 			.is_empty());
-		let total_payment: MultiAsset = (Concrete(core_id), 2_000_000).into();
+		let total_payment: Asset = (core_id, Fungible(2_000_000)).into();
 		ExpectRevenue::register_expected_asset(total_payment);
 	}
 	ExpectRevenue::expect_revenue();
@@ -255,7 +258,7 @@ fn cannot_buy_with_too_few_tokens() {
 		message_id: XcmHash::default(),
 		topic: None,
 	};
-	let payment: MultiAsset = (Concrete(core_id), 69).into();
+	let payment: Asset = (core_id, Fungible(69)).into();
 
 	let res = dbg!(trader.buy_weight(Weight::from_parts(1_000_000, 0), payment.into(), &ctx));
 	assert_eq!(res, Err(XcmError::TooExpensive));
@@ -273,7 +276,7 @@ fn cannot_buy_with_unknown_token() {
 		message_id: XcmHash::default(),
 		topic: None,
 	};
-	let payment: MultiAsset = (Concrete(unknown_token.into()), 1_000_000).into();
+	let payment: Asset = (unknown_token, Fungible(1_000_000)).into();
 	let res = dbg!(trader.buy_weight(Weight::from_parts(1_000_000, 0), payment.into(), &ctx));
 	assert_eq!(res, Err(XcmError::AssetNotFound));
 }
@@ -290,7 +293,7 @@ fn cannot_buy_with_non_fungible() {
 		message_id: XcmHash::default(),
 		topic: None,
 	};
-	let payment: MultiAsset = (Concrete(unknown_token.into()), NonFungible(AssetInstance::Undefined)).into();
+	let payment: Asset = (unknown_token, NonFungible(AssetInstance::Undefined)).into();
 
 	let res = dbg!(trader.buy_weight(Weight::from_parts(1_000_000, 0), payment.into(), &ctx));
 	assert_eq!(res, Err(XcmError::AssetNotFound));
@@ -321,7 +324,7 @@ fn overflow_errors() {
 	};
 
 	let amount = 1_000;
-	let payment: MultiAsset = (Concrete(overflow_id), amount).into();
+	let payment: Asset = (overflow_id, Fungible(amount)).into();
 	let weight = Weight::from_parts(1_000, 0);
 	let res = dbg!(trader.buy_weight(weight, payment.into(), &ctx));
 	assert_eq!(res, Err(XcmError::Overflow));
@@ -346,7 +349,7 @@ fn refunds_first_asset_completely() {
 
 		let weight = Weight::from_parts(1_000_000, 0);
 		let tokens = 1_000_000;
-		let core_payment: MultiAsset = (Concrete(core_id), tokens).into();
+		let core_payment: Asset = (core_id, Fungible(tokens)).into();
 		let res = dbg!(trader.buy_weight(weight, core_payment.clone().into(), &ctx));
 		assert!(res
 			.expect("buy_weight should succeed because payment == weight")
@@ -389,13 +392,13 @@ fn needs_multiple_refunds_for_multiple_currencies() {
 		};
 
 		let weight = Weight::from_parts(1_000_000, 0);
-		let core_payment: MultiAsset = (Concrete(core_id), 1_000_000).into();
+		let core_payment: Asset = (core_id, Fungible(1_000_000)).into();
 		let res = dbg!(trader.buy_weight(weight, core_payment.clone().into(), &ctx));
 		assert!(res
 			.expect("buy_weight should succeed because payment == weight")
 			.is_empty());
 
-		let test_payment: MultiAsset = (Concrete(test_id), 500_000).into();
+		let test_payment: Asset = (test_id, Fungible(500_000)).into();
 		let res = dbg!(trader.buy_weight(weight, test_payment.clone().into(), &ctx));
 		assert!(res
 			.expect("buy_weight should succeed because payment == 0.5 * weight")
diff --git a/runtime/adapters/src/tests/xcm_exchange.rs b/runtime/adapters/src/tests/xcm_exchange.rs
index 1849b8c70..c5642c7ec 100644
--- a/runtime/adapters/src/tests/xcm_exchange.rs
+++ b/runtime/adapters/src/tests/xcm_exchange.rs
@@ -11,7 +11,7 @@ use pretty_assertions::assert_eq;
 use sp_runtime::traits::Convert;
 use sp_runtime::{FixedU128, SaturatedConversion};
 use xcm_executor::traits::AssetExchange;
-use xcm_executor::Assets;
+use xcm_executor::AssetsInHolding;
 
 parameter_types! {
 	pub ExchangeTempAccount: AccountId = 12345;
@@ -24,28 +24,25 @@ const UNITS: u128 = 1_000_000_000_000;
 
 pub struct CurrencyIdConvert;
 
-impl Convert<MultiLocation, Option<CurrencyId>> for CurrencyIdConvert {
-	fn convert(location: MultiLocation) -> Option<CurrencyId> {
+impl Convert<Location, Option<CurrencyId>> for CurrencyIdConvert {
+	fn convert(location: Location) -> Option<CurrencyId> {
 		match location {
-			MultiLocation {
+			Location {
 				parents: 0,
-				interior: X1(GeneralIndex(index)),
-			} => Some(index.saturated_into()),
+				interior: Junctions::X1(a),
+			} => match (*a)[0] {
+				GeneralIndex(index) => Some(index.saturated_into()),
+				_ => None,
+			},
 			_ => None,
 		}
 	}
 }
 
-impl Convert<MultiAsset, Option<CurrencyId>> for CurrencyIdConvert {
-	fn convert(asset: MultiAsset) -> Option<CurrencyId> {
-		if let MultiAsset {
-			id: Concrete(location), ..
-		} = asset
-		{
-			Self::convert(location)
-		} else {
-			None
-		}
+impl Convert<Asset, Option<CurrencyId>> for CurrencyIdConvert {
+	fn convert(asset: Asset) -> Option<CurrencyId> {
+		let Asset { id: asset_id, .. } = asset;
+		Self::convert(asset_id.0)
 	}
 }
 
@@ -60,15 +57,17 @@ fn xcm_exchanger_allows_selling_supported_assets() {
 		.with_initial_pool(FixedU128::from_float(0.5), FixedU128::from(1))
 		.build()
 		.execute_with(|| {
-			let give = MultiAsset::from((GeneralIndex(DAI.into()), 100 * UNITS)).into();
+			let give: Assets = Asset::from((GeneralIndex(DAI.into()), 100 * UNITS)).into();
 			let wanted_amount = 45 * UNITS; // 50 - 5 to cover fees
-			let want: MultiAssets = MultiAsset::from((GeneralIndex(HDX.into()), wanted_amount)).into();
+			let want: Assets = Asset::from((GeneralIndex(HDX.into()), wanted_amount)).into();
 
 			// Act
-			let received = exchange_asset(None, give, &want, SELL).expect("should return ok");
+			let received: Assets = exchange_asset(None, give, &want, SELL)
+				.expect("should return ok")
+				.into();
 
 			// Assert
-			let mut iter = received.fungible_assets_iter();
+			let mut iter = received.inner().iter().filter(|asset| asset.is_fungible(None));
 			let asset_received = iter.next().expect("there should be at least one asset");
 			assert!(iter.next().is_none(), "there should only be one asset returned");
 			let Fungible(received_amount) = asset_received.fun else {
@@ -111,15 +110,17 @@ fn xcm_exchanger_should_work_with_onchain_route() {
 				],
 			));
 
-			let give = MultiAsset::from((GeneralIndex(DAI.into()), 100 * UNITS)).into();
+			let give = Asset::from((GeneralIndex(DAI.into()), 100 * UNITS)).into();
 			let wanted_amount = 40 * UNITS; // 50 - 10 to cover fees
-			let want: MultiAssets = MultiAsset::from((GeneralIndex(DOT.into()), wanted_amount)).into();
+			let want: Assets = Asset::from((GeneralIndex(DOT.into()), wanted_amount)).into();
 
 			// Act
-			let received = exchange_asset(None, give, &want, SELL).expect("should return ok");
+			let received: Assets = exchange_asset(None, give, &want, SELL)
+				.expect("should return ok")
+				.into();
 
 			// Assert
-			let mut iter = received.fungible_assets_iter();
+			let mut iter = received.inner().iter().filter(|asset| asset.is_fungible(None));
 			let asset_received = iter.next().expect("there should be at least one asset");
 			assert!(iter.next().is_none(), "there should only be one asset returned");
 			let Fungible(received_amount) = asset_received.fun else {
@@ -143,29 +144,37 @@ fn xcm_exchanger_allows_buying_supported_assets() {
 		.build()
 		.execute_with(|| {
 			let given_amount = 100 * UNITS;
-			let give_asset = MultiAsset::from((GeneralIndex(DAI.into()), given_amount));
+			let give_asset = Asset::from((GeneralIndex(DAI.into()), given_amount));
 			let give = give_asset.into();
 			let wanted_amount = 45 * UNITS; // 50 - 5 to cover fees
-			let want_asset = MultiAsset::from((GeneralIndex(HDX.into()), wanted_amount));
-			let want: MultiAssets = want_asset.clone().into();
+			let want_asset = Asset::from((GeneralIndex(HDX.into()), wanted_amount));
+			let want: Assets = want_asset.clone().into();
 
 			// Act
-			let received = exchange_asset(None, give, &want, BUY).expect("should return ok");
+			let received: Assets = exchange_asset(None, give, &want, BUY).expect("should return ok").into();
 
 			// Assert
-			let mut iter = received.fungible_assets_iter();
+			let mut iter = received.inner().iter().filter(|asset| asset.is_fungible(None));
 			let asset_received = iter.next().expect("there should be at least one asset");
-			let left_over = iter.next().expect("there should be at least some left_over asset_in");
+			let left_over = iter
+				.next()
+				.expect("there should be at least some left_over asset_in")
+				.clone();
+
 			assert!(iter.next().is_none(), "there should only be two assets returned");
+
 			let Fungible(left_over_amount) = left_over.fun else {
 				panic!("should be fungible")
 			};
+
 			assert_eq!(left_over, (GeneralIndex(DAI.into()), left_over_amount).into());
 			assert!(left_over_amount < given_amount);
-			assert_eq!(asset_received, want_asset);
+			assert_eq!(*asset_received, want_asset);
+
 			let Fungible(received_amount) = asset_received.fun else {
 				panic!("should be fungible")
 			};
+
 			assert!(received_amount == wanted_amount);
 			assert_eq!(Tokens::free_balance(DAI, &ExchangeTempAccount::get()), 0);
 			assert_eq!(Balances::free_balance(ExchangeTempAccount::get()), 0);
@@ -183,14 +192,14 @@ fn xcm_exchanger_should_not_allow_trading_for_multiple_assets() {
 		.with_initial_pool(FixedU128::from_float(0.5), FixedU128::from(1))
 		.build()
 		.execute_with(|| {
-			let give: MultiAssets = MultiAsset::from((GeneralIndex(DAI.into()), 100 * UNITS)).into();
+			let give: Assets = Asset::from((GeneralIndex(DAI.into()), 100 * UNITS)).into();
 			let wanted_amount = 45 * UNITS; // 50 - 5 to cover fees
-			let want1: MultiAsset = MultiAsset::from((GeneralIndex(HDX.into()), wanted_amount));
-			let want2: MultiAsset = MultiAsset::from((GeneralIndex(DAI.into()), wanted_amount));
-			let want: MultiAssets = vec![want1, want2].into();
+			let want1: Asset = Asset::from((GeneralIndex(HDX.into()), wanted_amount));
+			let want2: Asset = Asset::from((GeneralIndex(DAI.into()), wanted_amount));
+			let want: Assets = vec![want1, want2].into();
 
 			// Act and assert
-			assert_noop!(exchange_asset(None, give.clone().into(), &want, SELL), give);
+			assert_noop!(exchange_asset(None, give.clone(), &want, SELL), give);
 		});
 }
 
@@ -205,23 +214,26 @@ fn xcm_exchanger_works_with_specified_origin() {
 		.with_initial_pool(FixedU128::from_float(0.5), FixedU128::from(1))
 		.build()
 		.execute_with(|| {
-			let give = MultiAsset::from((GeneralIndex(DAI.into()), 100 * UNITS)).into();
+			let give = Asset::from((GeneralIndex(DAI.into()), 100 * UNITS)).into();
 			let wanted_amount = 45 * UNITS; // 50 - 5 to cover fees
-			let want = MultiAsset::from((GeneralIndex(HDX.into()), wanted_amount)).into();
+			let want = Asset::from((GeneralIndex(HDX.into()), wanted_amount)).into();
 
 			// Act and assert
-			assert_ok!(exchange_asset(Some(&MultiLocation::here()), give, &want, SELL));
+			assert_ok!(exchange_asset(Some(&Location::here()), give, &want, SELL));
 		});
 }
 
 fn exchange_asset(
-	origin: Option<&MultiLocation>,
+	origin: Option<&Location>,
 	give: Assets,
-	want: &MultiAssets,
+	want: &Assets,
 	is_sell: bool,
-) -> Result<Assets, Assets> {
+) -> Result<AssetsInHolding, AssetsInHolding> {
 	XcmAssetExchanger::<Test, ExchangeTempAccount, CurrencyIdConvert, Currencies>::exchange_asset(
-		origin, give, want, is_sell,
+		origin,
+		give.into(),
+		want,
+		is_sell,
 	)
 }
 
diff --git a/runtime/adapters/src/tests/xcm_execute_filter.rs b/runtime/adapters/src/tests/xcm_execute_filter.rs
index 4f3b568ee..2c76aab19 100644
--- a/runtime/adapters/src/tests/xcm_execute_filter.rs
+++ b/runtime/adapters/src/tests/xcm_execute_filter.rs
@@ -15,7 +15,7 @@ fn xcm_execute_filter_should_not_allow_transact() {
 		require_weight_at_most: Weight::from_parts(1, 1),
 		call: call.into(),
 	}]);
-	let loc = MultiLocation::new(
+	let loc = Location::new(
 		0,
 		AccountId32 {
 			network: None,
@@ -28,11 +28,11 @@ fn xcm_execute_filter_should_not_allow_transact() {
 #[test]
 fn xcm_execute_filter_should_allow_a_transfer_and_swap() {
 	//Arrange
-	let fees = MultiAsset::from((MultiLocation::here(), 10));
+	let fees = Asset::from((Location::here(), 10));
 	let weight_limit = WeightLimit::Unlimited;
-	let give: MultiAssetFilter = fees.clone().into();
-	let want: MultiAssets = fees.clone().into();
-	let assets: MultiAssets = fees.clone().into();
+	let give: AssetFilter = fees.clone().into();
+	let want: Assets = fees.clone().into();
+	let assets: Assets = fees.clone().into();
 
 	let max_assets = 2;
 	let beneficiary = Junction::AccountId32 {
@@ -40,7 +40,7 @@ fn xcm_execute_filter_should_allow_a_transfer_and_swap() {
 		network: None,
 	}
 	.into();
-	let dest = MultiLocation::new(1, Parachain(2047));
+	let dest = Location::new(1, Parachain(2047));
 
 	let xcm = Xcm(vec![
 		BuyExecution { fees, weight_limit },
@@ -60,7 +60,7 @@ fn xcm_execute_filter_should_allow_a_transfer_and_swap() {
 		TransferReserveAsset { assets, dest, xcm },
 	]);
 
-	let loc = MultiLocation::new(
+	let loc = Location::new(
 		0,
 		AccountId32 {
 			network: None,
@@ -75,8 +75,8 @@ fn xcm_execute_filter_should_allow_a_transfer_and_swap() {
 #[test]
 fn xcm_execute_filter_should_filter_too_deep_xcm() {
 	//Arrange
-	let fees = MultiAsset::from((MultiLocation::here(), 10));
-	let assets: MultiAssets = fees.into();
+	let fees = Asset::from((Location::here(), 10));
+	let assets: Assets = fees.into();
 
 	let max_assets = 2;
 	let beneficiary = Junction::AccountId32 {
@@ -84,7 +84,7 @@ fn xcm_execute_filter_should_filter_too_deep_xcm() {
 		network: None,
 	}
 	.into();
-	let dest = MultiLocation::new(1, Parachain(2047));
+	let dest = Location::new(1, Parachain(2047));
 
 	let deposit = Xcm(vec![DepositAsset {
 		assets: Wild(AllCounted(max_assets)),
@@ -93,7 +93,7 @@ fn xcm_execute_filter_should_filter_too_deep_xcm() {
 
 	let mut message = Xcm(vec![TransferReserveAsset {
 		assets: assets.clone(),
-		dest,
+		dest: dest.clone(),
 		xcm: deposit,
 	}]);
 
@@ -101,12 +101,12 @@ fn xcm_execute_filter_should_filter_too_deep_xcm() {
 		let xcm = message.clone();
 		message = Xcm(vec![TransferReserveAsset {
 			assets: assets.clone(),
-			dest,
+			dest: dest.clone(),
 			xcm,
 		}]);
 	}
 
-	let loc = MultiLocation::new(
+	let loc = Location::new(
 		0,
 		AccountId32 {
 			network: None,
@@ -121,8 +121,8 @@ fn xcm_execute_filter_should_filter_too_deep_xcm() {
 #[test]
 fn xcm_execute_filter_should_not_filter_message_with_max_deep() {
 	//Arrange
-	let fees = MultiAsset::from((MultiLocation::here(), 10));
-	let assets: MultiAssets = fees.into();
+	let fees = Asset::from((Location::here(), 10));
+	let assets: Assets = fees.into();
 
 	let max_assets = 2;
 	let beneficiary = Junction::AccountId32 {
@@ -130,7 +130,7 @@ fn xcm_execute_filter_should_not_filter_message_with_max_deep() {
 		network: None,
 	}
 	.into();
-	let dest = MultiLocation::new(1, Parachain(2047));
+	let dest = Location::new(1, Parachain(2047));
 
 	let deposit = Xcm(vec![DepositAsset {
 		assets: Wild(AllCounted(max_assets)),
@@ -139,7 +139,7 @@ fn xcm_execute_filter_should_not_filter_message_with_max_deep() {
 
 	let mut message = Xcm(vec![TransferReserveAsset {
 		assets: assets.clone(),
-		dest,
+		dest: dest.clone(),
 		xcm: deposit,
 	}]);
 
@@ -147,12 +147,12 @@ fn xcm_execute_filter_should_not_filter_message_with_max_deep() {
 		let xcm = message.clone();
 		message = Xcm(vec![TransferReserveAsset {
 			assets: assets.clone(),
-			dest,
+			dest: dest.clone(),
 			xcm,
 		}]);
 	}
 
-	let loc = MultiLocation::new(
+	let loc = Location::new(
 		0,
 		AccountId32 {
 			network: None,
@@ -169,25 +169,25 @@ fn xcm_execute_filter_should_not_filter_message_with_max_deep() {
 #[test]
 fn xcm_execute_filter_should_filter_messages_with_one_more_instruction_than_allowed_in_depth() {
 	//Arrange
-	let fees = MultiAsset::from((MultiLocation::here(), 10));
-	let assets: MultiAssets = fees.into();
+	let fees = Asset::from((Location::here(), 10));
+	let assets: Assets = fees.into();
 
 	let max_assets = 2;
-	let beneficiary = Junction::AccountId32 {
+	let beneficiary: Location = Junction::AccountId32 {
 		id: [3; 32],
 		network: None,
 	}
 	.into();
-	let dest = MultiLocation::new(1, Parachain(2047));
+	let dest = Location::new(1, Parachain(2047));
 
 	let deposit = Xcm(vec![DepositAsset {
 		assets: Wild(AllCounted(max_assets)),
-		beneficiary,
+		beneficiary: beneficiary.clone(),
 	}]);
 
 	let mut message = Xcm(vec![TransferReserveAsset {
 		assets: assets.clone(),
-		dest,
+		dest: dest.clone(),
 		xcm: deposit,
 	}]);
 
@@ -195,7 +195,7 @@ fn xcm_execute_filter_should_filter_messages_with_one_more_instruction_than_allo
 		let xcm = message.clone();
 		message = Xcm(vec![TransferReserveAsset {
 			assets: assets.clone(),
-			dest,
+			dest: dest.clone(),
 			xcm: xcm.clone(),
 		}]);
 	}
@@ -203,7 +203,7 @@ fn xcm_execute_filter_should_filter_messages_with_one_more_instruction_than_allo
 	//It has 5 instruction
 	let mut instructions_with_inner_xcms: Vec<cumulus_primitives_core::Instruction<()>> = vec![TransferReserveAsset {
 		assets: assets.clone(),
-		dest,
+		dest: dest.clone(),
 		xcm: message.clone(),
 	}];
 
@@ -223,7 +223,7 @@ fn xcm_execute_filter_should_filter_messages_with_one_more_instruction_than_allo
 		xcm: Xcm(instructions_with_inner_xcms.clone()),
 	}]);
 
-	let loc = MultiLocation::new(
+	let loc = Location::new(
 		0,
 		AccountId32 {
 			network: None,
@@ -253,7 +253,7 @@ fn xcm_execute_filter_should_filter_messages_with_one_more_instruction_than_allo
 		101
 	]);
 
-	let loc = MultiLocation::new(
+	let loc = Location::new(
 		0,
 		AccountId32 {
 			network: None,
@@ -268,10 +268,10 @@ fn xcm_execute_filter_should_filter_messages_with_one_more_instruction_than_allo
 	)));
 }
 
-fn xcm_execute_filter_allows(loc_and_message: &(MultiLocation, Xcm<RuntimeCall>)) -> bool {
+fn xcm_execute_filter_allows(loc_and_message: &(Location, Xcm<RuntimeCall>)) -> bool {
 	AllowTransferAndSwap::<ConstU16<5>, ConstU16<100>, RuntimeCall>::contains(loc_and_message)
 }
 
-fn xcm_execute_filter_does_not_allow(loc_and_message: &(MultiLocation, Xcm<()>)) -> bool {
+fn xcm_execute_filter_does_not_allow(loc_and_message: &(Location, Xcm<()>)) -> bool {
 	!AllowTransferAndSwap::<ConstU16<5>, ConstU16<100>, ()>::contains(loc_and_message)
 }
diff --git a/runtime/adapters/src/xcm_exchange.rs b/runtime/adapters/src/xcm_exchange.rs
index 78b445368..b4704724c 100644
--- a/runtime/adapters/src/xcm_exchange.rs
+++ b/runtime/adapters/src/xcm_exchange.rs
@@ -1,10 +1,11 @@
 use orml_traits::MultiCurrency;
-use polkadot_xcm::latest::prelude::*;
+use polkadot_xcm::v4::prelude::*;
 use sp_core::Get;
 use sp_runtime::traits::{Convert, Zero};
 use sp_std::marker::PhantomData;
 use sp_std::vec;
 use xcm_executor::traits::AssetExchange;
+use xcm_executor::AssetsInHolding;
 
 /// Implements `AssetExchange` to support the `ExchangeAsset` XCM instruction.
 ///
@@ -23,16 +24,16 @@ impl<Runtime, TempAccount, CurrencyIdConvert, Currency> AssetExchange
 where
 	Runtime: pallet_route_executor::Config,
 	TempAccount: Get<Runtime::AccountId>,
-	CurrencyIdConvert: Convert<MultiAsset, Option<Runtime::AssetId>>,
+	CurrencyIdConvert: Convert<Asset, Option<Runtime::AssetId>>,
 	Currency: MultiCurrency<Runtime::AccountId, CurrencyId = Runtime::AssetId, Balance = Runtime::Balance>,
 	Runtime::Balance: From<u128> + Zero + Into<u128>,
 {
 	fn exchange_asset(
-		_origin: Option<&MultiLocation>,
-		give: xcm_executor::Assets,
-		want: &MultiAssets,
+		_origin: Option<&Location>,
+		give: AssetsInHolding,
+		want: &Assets,
 		maximal: bool,
-	) -> Result<xcm_executor::Assets, xcm_executor::Assets> {
+	) -> Result<AssetsInHolding, AssetsInHolding> {
 		use orml_utilities::with_transaction_result;
 
 		let account = TempAccount::get();
@@ -88,7 +89,8 @@ where
 					"Sell should return more than mininum buy amount."
 				);
 				Currency::withdraw(asset_out, &account, amount_received)?; // burn the received tokens
-				Ok(MultiAsset::from((wanted.id, amount_received.into())).into())
+				let holding: Asset = (wanted.id.clone(), amount_received.into()).into();
+				Ok(holding.into())
 			})
 			.map_err(|_| give)
 		} else {
@@ -112,7 +114,8 @@ where
 				let left_over = Currency::free_balance(asset_in, &account);
 				if left_over > Runtime::Balance::zero() {
 					Currency::withdraw(asset_in, &account, left_over)?; // burn left over tokens
-					assets.push(MultiAsset::from((given.id, left_over.into())));
+					let holding: Asset = (given.id.clone(), left_over.into()).into();
+					assets.push(holding);
 				}
 				let amount_received = Currency::free_balance(asset_out, &account);
 				debug_assert!(
@@ -120,7 +123,8 @@ where
 					"Buy should return exactly the amount we specified."
 				);
 				Currency::withdraw(asset_out, &account, amount_received)?; // burn the received tokens
-				assets.push(MultiAsset::from((wanted.id, amount_received.into())));
+				let holding: Asset = (wanted.id.clone(), amount_received.into()).into();
+				assets.push(holding);
 				Ok(assets.into())
 			})
 			.map_err(|_| give)
diff --git a/runtime/adapters/src/xcm_execute_filter.rs b/runtime/adapters/src/xcm_execute_filter.rs
index 24a010350..36d66d7a1 100644
--- a/runtime/adapters/src/xcm_execute_filter.rs
+++ b/runtime/adapters/src/xcm_execute_filter.rs
@@ -2,7 +2,7 @@ use sp_std::cell::Cell;
 use sp_std::marker::PhantomData;
 
 use frame_support::traits::Contains;
-use polkadot_xcm::v3::prelude::*;
+use polkadot_xcm::v4::prelude::*;
 use sp_core::Get;
 use sp_runtime::Either;
 
@@ -12,15 +12,15 @@ pub struct AllowTransferAndSwap<MaxXcmDepth, MaxInstructions, RuntimeCall>(
 	PhantomData<(MaxXcmDepth, MaxInstructions, RuntimeCall)>,
 );
 
-impl<MaxXcmDepth, MaxInstructions, RuntimeCall> Contains<(MultiLocation, Xcm<RuntimeCall>)>
+impl<MaxXcmDepth, MaxInstructions, RuntimeCall> Contains<(Location, Xcm<RuntimeCall>)>
 	for AllowTransferAndSwap<MaxXcmDepth, MaxInstructions, RuntimeCall>
 where
 	MaxXcmDepth: Get<u16>,
 	MaxInstructions: Get<u16>,
 {
-	fn contains((loc, xcm): &(MultiLocation, Xcm<RuntimeCall>)) -> bool {
+	fn contains((loc, xcm): &(Location, Xcm<RuntimeCall>)) -> bool {
 		// allow root to execute XCM
-		if loc == &MultiLocation::here() {
+		if loc == &Location::here() {
 			return true;
 		}
 
diff --git a/runtime/hydradx/Cargo.toml b/runtime/hydradx/Cargo.toml
index 52353cede..26f2c58dc 100644
--- a/runtime/hydradx/Cargo.toml
+++ b/runtime/hydradx/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "hydradx-runtime"
-version = "241.0.0"
+version = "243.0.0"
 authors = ["GalacticCouncil"]
 edition = "2021"
 license = "Apache 2.0"
@@ -62,7 +62,7 @@ pallet-multisig = { workspace = true }
 pallet-democracy = { workspace = true }
 pallet-elections-phragmen = { workspace = true }
 pallet-uniques = { workspace = true }
-pallet-xcm-rate-limiter = { workspace = true }
+pallet-message-queue= { workspace = true }
 pallet-state-trie-migration = { workspace = true }
 
 # Warehouse dependencies
@@ -102,12 +102,12 @@ cumulus-pallet-aura-ext = { workspace = true }
 cumulus-pallet-parachain-system = { workspace = true }
 cumulus-pallet-xcm = { workspace = true }
 cumulus-pallet-xcmp-queue = { workspace = true }
-cumulus-pallet-dmp-queue = { workspace = true }
 cumulus-primitives-core = { workspace = true }
 cumulus-primitives-utility = { workspace = true }
 cumulus-primitives-parachain-inherent = { workspace = true }
 cumulus-primitives-timestamp = { workspace = true }
-parachain-info = { workspace = true }
+staging-parachain-info = { workspace = true }
+parachains-common = { workspace = true }
 
 # Polkadot dependencies
 polkadot-parachain = { workspace = true }
@@ -115,6 +115,7 @@ pallet-xcm = { workspace = true }
 polkadot-xcm = { workspace = true }
 xcm-executor = { workspace = true }
 xcm-builder = { workspace = true }
+polkadot-runtime-common= { workspace = true }
 
 # Substrate dependencies
 frame-benchmarking = { workspace = true, optional = true }
@@ -126,6 +127,7 @@ frame-system-rpc-runtime-api = { workspace = true }
 frame-try-runtime = { workspace = true, optional = true }
 sp-api = { workspace = true }
 sp-block-builder = { workspace = true }
+sp-genesis-builder = { workspace = true }
 sp-consensus-aura = { workspace = true }
 sp-core = { workspace = true }
 sp-inherents = { workspace = true }
@@ -207,6 +209,7 @@ runtime-benchmarks = [
     "pallet-elections-phragmen/runtime-benchmarks",
     "pallet-referrals/runtime-benchmarks",
     "pallet-evm-accounts/runtime-benchmarks",
+    "pallet-message-queue/runtime-benchmarks",
     "pallet-state-trie-migration/runtime-benchmarks",
 ]
 std = [
@@ -221,9 +224,10 @@ std = [
     "cumulus-pallet-parachain-system/std",
     "cumulus-pallet-aura-ext/std",
     "cumulus-primitives-core/std",
+    "cumulus-primitives-utility/std",
     "cumulus-pallet-xcm/std",
     "cumulus-pallet-xcmp-queue/std",
-    "parachain-info/std",
+    "staging-parachain-info/std",
     "pallet-xcm/std",
     "polkadot-xcm/std",
     "xcm-executor/std",
@@ -265,7 +269,6 @@ std = [
     "pallet-currencies/std",
     "pallet-omnipool/std",
     "pallet-circuit-breaker/std",
-    "pallet-xcm-rate-limiter/std",
     "pallet-transaction-pause/std",
     "pallet-dca/std",
     "pallet-ema-oracle/std",
@@ -282,6 +285,7 @@ std = [
     "warehouse-liquidity-mining/std",
     "sp-api/std",
     "sp-block-builder/std",
+    "sp-genesis-builder/std",
     "sp-consensus-aura/std",
     "sp-core/std",
     "sp-io/std",
@@ -305,11 +309,14 @@ std = [
     "pallet-evm-precompile-modexp/std",
     "pallet-evm-precompile-bn128/std",
     "pallet-evm-precompile-blake2/std",
+    "pallet-evm-precompile-call-permit/std",
     "pallet-xyk/std",
     "pallet-referrals/std",
     "pallet-evm-accounts/std",
     "pallet-evm-accounts-rpc-runtime-api/std",
     "pallet-xyk-liquidity-mining/std",
+    "parachains-common/std",
+    "polkadot-runtime-common/std",
     "pallet-state-trie-migration/std",
 ]
 try-runtime= [
@@ -326,7 +333,7 @@ try-runtime= [
     "cumulus-pallet-aura-ext/try-runtime",
     "cumulus-pallet-xcm/try-runtime",
     "cumulus-pallet-xcmp-queue/try-runtime",
-    "parachain-info/try-runtime",
+    "staging-parachain-info/try-runtime",
     "pallet-aura/try-runtime",
     "pallet-bags-list/try-runtime",
     "pallet-balances/try-runtime",
@@ -350,7 +357,6 @@ try-runtime= [
     "pallet-preimage/try-runtime",
     "pallet-identity/try-runtime",
     "pallet-xcm/try-runtime",
-    "cumulus-pallet-dmp-queue/try-runtime",
     "pallet-asset-registry/try-runtime",
     "pallet-transaction-multi-payment/try-runtime",
     "pallet-relaychain-info/try-runtime",
@@ -363,7 +369,6 @@ try-runtime= [
     "warehouse-liquidity-mining/try-runtime",
     "pallet-omnipool-liquidity-mining/try-runtime",
     "pallet-circuit-breaker/try-runtime",
-    "pallet-xcm-rate-limiter/try-runtime",
     "pallet-otc/try-runtime",
     "pallet-route-executor/try-runtime",
     "pallet-dynamic-fees/try-runtime",
@@ -381,5 +386,6 @@ try-runtime= [
     "pallet-referrals/try-runtime",
     "pallet-evm-accounts/try-runtime",
     "pallet-xyk-liquidity-mining/try-runtime",
+    "pallet-message-queue/try-runtime",
     "pallet-state-trie-migration/try-runtime",
 ]
diff --git a/runtime/hydradx/src/assets.rs b/runtime/hydradx/src/assets.rs
index f921580b2..5ff3de9fb 100644
--- a/runtime/hydradx/src/assets.rs
+++ b/runtime/hydradx/src/assets.rs
@@ -18,17 +18,16 @@
 use super::*;
 use crate::system::NativeAssetId;
 
-use frame_support::traits::Defensive;
 use hydradx_adapters::{
 	AssetFeeOraclePriceProvider, EmaOraclePriceAdapter, FreezableNFT, MultiCurrencyLockedBalance, OmnipoolHookAdapter,
-	OracleAssetVolumeProvider, PriceAdjustmentAdapter, StableswapHooksAdapter, VestingInfo,
+	OracleAssetVolumeProvider, PriceAdjustmentAdapter, RelayChainBlockHashProvider, RelayChainBlockNumberProvider,
+	StableswapHooksAdapter, VestingInfo,
 };
 
-use hydradx_adapters::{RelayChainBlockHashProvider, RelayChainBlockNumberProvider};
-use hydradx_traits::{
+pub use hydradx_traits::{
 	registry::Inspect,
 	router::{inverse_route, PoolType, Trade},
-	AccountIdFor, AssetKind, AssetPairAccountIdFor, NativePriceOracle, OnTradeHandler, OraclePeriod, Source,
+	AccountIdFor, AssetKind, AssetPairAccountIdFor, Liquidity, NativePriceOracle, OnTradeHandler, OraclePeriod, Source,
 };
 use pallet_currencies::BasicCurrencyAdapter;
 use pallet_omnipool::{
@@ -38,11 +37,10 @@ use pallet_omnipool::{
 use pallet_otc::NamedReserveIdentifier;
 use pallet_stableswap::weights::WeightInfo as StableswapWeights;
 use pallet_transaction_multi_payment::{AddTxAssetOnAccount, RemoveTxAssetOnKilled};
-use primitives::constants::chain::XYK_SOURCE;
-use primitives::constants::time::DAYS;
 use primitives::constants::{
-	chain::OMNIPOOL_SOURCE,
+	chain::{OMNIPOOL_SOURCE, XYK_SOURCE},
 	currency::{NATIVE_EXISTENTIAL_DEPOSIT, UNITS},
+	time::DAYS,
 };
 use sp_runtime::{traits::Zero, DispatchError, DispatchResult, FixedPointNumber};
 
@@ -53,19 +51,23 @@ use frame_support::{
 	sp_runtime::traits::{One, PhantomData},
 	sp_runtime::{FixedU128, Perbill, Permill},
 	traits::{
-		AsEnsureOriginWithArg, ConstU32, Contains, Currency, EnsureOrigin, Imbalance, LockIdentifier,
+		AsEnsureOriginWithArg, ConstU32, Contains, Currency, Defensive, EnsureOrigin, Imbalance, LockIdentifier,
 		NeverEnsureOrigin, OnUnbalanced,
 	},
 	BoundedVec, PalletId,
 };
 use frame_system::{EnsureRoot, EnsureSigned, RawOrigin};
-use orml_traits::currency::{MultiCurrency, MultiLockableCurrency, MutationHooks, OnDeposit, OnTransfer};
-use orml_traits::{GetByKey, Happened};
+use orml_traits::{
+	currency::{MultiCurrency, MultiLockableCurrency, MutationHooks, OnDeposit, OnTransfer},
+	GetByKey, Happened,
+};
 use pallet_dynamic_fees::types::FeeParams;
 use pallet_lbp::weights::WeightInfo as LbpWeights;
 use pallet_route_executor::{weights::WeightInfo as RouterWeights, AmmTradeWeights, MAX_NUMBER_OF_TRADES};
-use pallet_staking::types::{Action, Point};
-use pallet_staking::SigmoidPercentage;
+use pallet_staking::{
+	types::{Action, Point},
+	SigmoidPercentage,
+};
 use pallet_xyk::weights::WeightInfo as XykWeights;
 use sp_std::num::NonZeroU16;
 
@@ -93,18 +95,18 @@ parameter_types! {
 
 impl pallet_balances::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
-	type WeightInfo = weights::balances::HydraWeight<Runtime>;
+	type WeightInfo = weights::pallet_balances::HydraWeight<Runtime>;
 	type Balance = Balance;
 	type DustRemoval = DustRemovalAdapter;
 	type ExistentialDeposit = NativeExistentialDeposit;
 	type AccountStore = System;
 	type ReserveIdentifier = [u8; 8];
-	type RuntimeHoldReason = ();
+	type RuntimeHoldReason = RuntimeHoldReason;
 	type FreezeIdentifier = ();
 	type MaxLocks = MaxLocks;
 	type MaxReserves = MaxReserves;
-	type MaxHolds = MaxHolds;
 	type MaxFreezes = MaxFreezes;
+	type RuntimeFreezeReason = ();
 }
 
 pub struct CurrencyHooks;
@@ -309,7 +311,7 @@ impl orml_tokens::Config for Runtime {
 	type Balance = Balance;
 	type Amount = Amount;
 	type CurrencyId = AssetId;
-	type WeightInfo = weights::tokens::HydraWeight<Runtime>;
+	type WeightInfo = weights::orml_tokens::HydraWeight<Runtime>;
 	type ExistentialDeposits = AssetRegistry;
 	type CurrencyHooks = CurrencyHooks;
 	type MaxLocks = MaxLocks;
@@ -326,7 +328,7 @@ impl pallet_currencies::Config for Runtime {
 	type MultiCurrency = Tokens;
 	type NativeCurrency = BasicCurrencyAdapter<Runtime, Balances, Amount, BlockNumber>;
 	type GetNativeCurrencyId = NativeAssetId;
-	type WeightInfo = weights::currencies::HydraWeight<Runtime>;
+	type WeightInfo = weights::pallet_currencies::HydraWeight<Runtime>;
 }
 
 pub struct RootAsVestingPallet;
@@ -359,7 +361,7 @@ impl orml_vesting::Config for Runtime {
 	type Currency = Balances;
 	type MinVestedTransfer = MinVestedTransfer;
 	type VestedTransferOrigin = RootAsVestingPallet;
-	type WeightInfo = weights::vesting::HydraWeight<Runtime>;
+	type WeightInfo = weights::orml_vesting::HydraWeight<Runtime>;
 	type MaxVestingSchedules = MaxVestingSchedules;
 	type BlockNumberProvider = RelayChainBlockNumberProvider<Runtime>;
 }
@@ -371,7 +373,7 @@ parameter_types! {
 impl pallet_claims::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type Prefix = ClaimMessagePrefix;
-	type WeightInfo = weights::claims::HydraWeight<Runtime>;
+	type WeightInfo = weights::pallet_claims::HydraWeight<Runtime>;
 	type Currency = Balances;
 	type CurrencyBalance = Balance;
 }
@@ -396,7 +398,7 @@ impl pallet_asset_registry::Config for Runtime {
 	type MinStringLimit = MinRegistryStrLimit;
 	type SequentialIdStartAt = SequentialIdOffset;
 	type RegExternalWeightMultiplier = RegExternalWeightMultiplier;
-	type WeightInfo = weights::registry::HydraWeight<Runtime>;
+	type WeightInfo = weights::pallet_asset_registry::HydraWeight<Runtime>;
 }
 
 parameter_types! {
@@ -463,7 +465,7 @@ impl pallet_omnipool::Config for Runtime {
 	type CollectionId = CollectionId;
 	type NFTCollectionId = OmnipoolCollectionId;
 	type NFTHandler = Uniques;
-	type WeightInfo = weights::omnipool::HydraWeight<Runtime>;
+	type WeightInfo = weights::pallet_omnipool::HydraWeight<Runtime>;
 	type OmnipoolHooks = OmnipoolHookAdapter<Self::RuntimeOrigin, NativeAssetId, LRNA, Runtime>;
 	type PriceBarrier = (
 		EnsurePriceWithin<
@@ -508,7 +510,7 @@ impl pallet_circuit_breaker::Config for Runtime {
 	type DefaultMaxAddLiquidityLimitPerBlock = DefaultMaxLiquidityLimitPerBlock;
 	type DefaultMaxRemoveLiquidityLimitPerBlock = DefaultMaxLiquidityLimitPerBlock;
 	type OmnipoolHubAsset = LRNA;
-	type WeightInfo = weights::circuit_breaker::HydraWeight<Runtime>;
+	type WeightInfo = weights::pallet_circuit_breaker::HydraWeight<Runtime>;
 }
 
 parameter_types! {
@@ -540,7 +542,7 @@ impl pallet_ema_oracle::Config for Runtime {
 	/// With every asset trading against LRNA we will only have as many pairs as there will be assets, so
 	/// 40 seems a decent upper bound for the foreseeable future.
 	type MaxUniqueEntries = ConstU32<40>;
-	type WeightInfo = weights::ema_oracle::HydraWeight<Runtime>;
+	type WeightInfo = weights::pallet_ema_oracle::HydraWeight<Runtime>;
 	#[cfg(feature = "runtime-benchmarks")]
 	/// Should take care of the overhead introduced by `OracleWhitelist`.
 	type BenchmarkHelper = RegisterAsset<Runtime>;
@@ -568,7 +570,7 @@ impl pallet_duster::Config for Runtime {
 	type Reward = DustingReward;
 	type NativeCurrencyId = NativeAssetId;
 	type BlacklistUpdateOrigin = SuperMajorityTechCommittee;
-	type WeightInfo = ();
+	type WeightInfo = weights::pallet_duster::HydraWeight<Runtime>;
 }
 
 parameter_types! {
@@ -617,7 +619,7 @@ impl pallet_omnipool_liquidity_mining::Config for Runtime {
 	type OracleSource = OmnipoolLMOracleSource;
 	type OraclePeriod = OmnipoolLMOraclePeriod;
 	type PriceOracle = EmaOracle;
-	type WeightInfo = weights::omnipool_lm::HydraWeight<Runtime>;
+	type WeightInfo = weights::pallet_omnipool_liquidity_mining::HydraWeight<Runtime>;
 }
 
 parameter_types! {
@@ -664,7 +666,7 @@ impl pallet_xyk_liquidity_mining::Config for Runtime {
 	type NonDustableWhitelistHandler = Duster;
 	type AMM = XYK;
 	type AssetRegistry = AssetRegistry;
-	type WeightInfo = weights::xyk_lm::HydraWeight<Runtime>;
+	type WeightInfo = weights::pallet_xyk_liquidity_mining::HydraWeight<Runtime>;
 }
 
 // The reason why there is difference between PROD and benchmark is that it is not possible
@@ -780,7 +782,7 @@ impl pallet_dca::Config for Runtime {
 	type NamedReserveId = NamedReserveId;
 	type WeightToFee = WeightToFee;
 	type AmmTradeWeights = RouterWeightInfo;
-	type WeightInfo = weights::dca::HydraWeight<Runtime>;
+	type WeightInfo = weights::pallet_dca::HydraWeight<Runtime>;
 	#[cfg(not(feature = "runtime-benchmarks"))]
 	type NativePriceOracle = AssetFeeOraclePriceProvider<
 		NativeAssetId,
@@ -812,8 +814,8 @@ impl RouterWeightInfo {
 		num_of_calc_sell: u32,
 		num_of_execute_sell: u32,
 	) -> Weight {
-		weights::route_executor::HydraWeight::<Runtime>::calculate_and_execute_sell_in_lbp(num_of_calc_sell)
-			.saturating_sub(weights::lbp::HydraWeight::<Runtime>::router_execution_sell(
+		weights::pallet_route_executor::HydraWeight::<Runtime>::calculate_and_execute_sell_in_lbp(num_of_calc_sell)
+			.saturating_sub(weights::pallet_lbp::HydraWeight::<Runtime>::router_execution_sell(
 				num_of_calc_sell.saturating_add(num_of_execute_sell),
 				num_of_execute_sell,
 			))
@@ -823,15 +825,15 @@ impl RouterWeightInfo {
 		num_of_calc_buy: u32,
 		num_of_execute_buy: u32,
 	) -> Weight {
-		let router_weight = weights::route_executor::HydraWeight::<Runtime>::calculate_and_execute_buy_in_lbp(
+		let router_weight = weights::pallet_route_executor::HydraWeight::<Runtime>::calculate_and_execute_buy_in_lbp(
 			num_of_calc_buy,
 			num_of_execute_buy,
 		);
 		// Handle this case separately. router_execution_buy provides incorrect weight for the case when only calculate_buy is executed.
 		let lbp_weight = if (num_of_calc_buy, num_of_execute_buy) == (1, 0) {
-			weights::lbp::HydraWeight::<Runtime>::calculate_buy()
+			weights::pallet_lbp::HydraWeight::<Runtime>::calculate_buy()
 		} else {
-			weights::lbp::HydraWeight::<Runtime>::router_execution_buy(
+			weights::pallet_lbp::HydraWeight::<Runtime>::router_execution_buy(
 				num_of_calc_buy.saturating_add(num_of_execute_buy),
 				num_of_execute_buy,
 			)
@@ -843,9 +845,9 @@ impl RouterWeightInfo {
 		let number_of_times_calculate_sell_amounts_executed = 5; //4 calculations + in the validation
 		let number_of_times_execute_sell_amounts_executed = 0; //We do have it once executed in the validation of the route, but it is without writing to database (as rolled back), and since we pay back successful set_route, we just keep this overhead
 
-		let set_route_overweight = weights::route_executor::HydraWeight::<Runtime>::set_route_for_xyk();
+		let set_route_overweight = weights::pallet_route_executor::HydraWeight::<Runtime>::set_route_for_xyk();
 
-		set_route_overweight.saturating_sub(weights::xyk::HydraWeight::<Runtime>::router_execution_sell(
+		set_route_overweight.saturating_sub(weights::pallet_xyk::HydraWeight::<Runtime>::router_execution_sell(
 			number_of_times_calculate_sell_amounts_executed,
 			number_of_times_execute_sell_amounts_executed,
 		))
@@ -863,7 +865,7 @@ impl AmmTradeWeights<Trade<AssetId>> for RouterWeightInfo {
 			weight.saturating_accrue(Self::sell_and_calculate_sell_trade_amounts_overhead_weight(0, 1));
 
 			let amm_weight = match trade.pool {
-				PoolType::Omnipool => weights::omnipool::HydraWeight::<Runtime>::router_execution_sell(c, e)
+				PoolType::Omnipool => weights::pallet_omnipool::HydraWeight::<Runtime>::router_execution_sell(c, e)
 					.saturating_add(
 						<OmnipoolHookAdapter<RuntimeOrigin, NativeAssetId, LRNA, Runtime> as OmnipoolHooks<
 							RuntimeOrigin,
@@ -880,9 +882,11 @@ impl AmmTradeWeights<Trade<AssetId>> for RouterWeightInfo {
 							Balance,
 						>>::on_liquidity_changed_weight(),
 					),
-				PoolType::LBP => weights::lbp::HydraWeight::<Runtime>::router_execution_sell(c, e),
-				PoolType::Stableswap(_) => weights::stableswap::HydraWeight::<Runtime>::router_execution_sell(c, e),
-				PoolType::XYK => weights::xyk::HydraWeight::<Runtime>::router_execution_sell(c, e)
+				PoolType::LBP => weights::pallet_lbp::HydraWeight::<Runtime>::router_execution_sell(c, e),
+				PoolType::Stableswap(_) => {
+					weights::pallet_stableswap::HydraWeight::<Runtime>::router_execution_sell(c, e)
+				}
+				PoolType::XYK => weights::pallet_xyk::HydraWeight::<Runtime>::router_execution_sell(c, e)
 					.saturating_add(<Runtime as pallet_xyk::Config>::AMMHandler::on_trade_weight()),
 			};
 			weight.saturating_accrue(amm_weight);
@@ -901,7 +905,7 @@ impl AmmTradeWeights<Trade<AssetId>> for RouterWeightInfo {
 			weight.saturating_accrue(Self::buy_and_calculate_buy_trade_amounts_overhead_weight(0, 1));
 
 			let amm_weight = match trade.pool {
-				PoolType::Omnipool => weights::omnipool::HydraWeight::<Runtime>::router_execution_buy(c, e)
+				PoolType::Omnipool => weights::pallet_omnipool::HydraWeight::<Runtime>::router_execution_buy(c, e)
 					.saturating_add(
 						<OmnipoolHookAdapter<RuntimeOrigin, NativeAssetId, LRNA, Runtime> as OmnipoolHooks<
 							RuntimeOrigin,
@@ -918,9 +922,11 @@ impl AmmTradeWeights<Trade<AssetId>> for RouterWeightInfo {
 							Balance,
 						>>::on_liquidity_changed_weight(),
 					),
-				PoolType::LBP => weights::lbp::HydraWeight::<Runtime>::router_execution_buy(c, e),
-				PoolType::Stableswap(_) => weights::stableswap::HydraWeight::<Runtime>::router_execution_buy(c, e),
-				PoolType::XYK => weights::xyk::HydraWeight::<Runtime>::router_execution_buy(c, e)
+				PoolType::LBP => weights::pallet_lbp::HydraWeight::<Runtime>::router_execution_buy(c, e),
+				PoolType::Stableswap(_) => {
+					weights::pallet_stableswap::HydraWeight::<Runtime>::router_execution_buy(c, e)
+				}
+				PoolType::XYK => weights::pallet_xyk::HydraWeight::<Runtime>::router_execution_buy(c, e)
 					.saturating_add(<Runtime as pallet_xyk::Config>::AMMHandler::on_trade_weight()),
 			};
 			weight.saturating_accrue(amm_weight);
@@ -939,10 +945,12 @@ impl AmmTradeWeights<Trade<AssetId>> for RouterWeightInfo {
 			weight.saturating_accrue(Self::buy_and_calculate_buy_trade_amounts_overhead_weight(1, 0));
 
 			let amm_weight = match trade.pool {
-				PoolType::Omnipool => weights::omnipool::HydraWeight::<Runtime>::router_execution_buy(c, e),
-				PoolType::LBP => weights::lbp::HydraWeight::<Runtime>::router_execution_buy(c, e),
-				PoolType::Stableswap(_) => weights::stableswap::HydraWeight::<Runtime>::router_execution_buy(c, e),
-				PoolType::XYK => weights::xyk::HydraWeight::<Runtime>::router_execution_buy(c, e)
+				PoolType::Omnipool => weights::pallet_omnipool::HydraWeight::<Runtime>::router_execution_buy(c, e),
+				PoolType::LBP => weights::pallet_lbp::HydraWeight::<Runtime>::router_execution_buy(c, e),
+				PoolType::Stableswap(_) => {
+					weights::pallet_stableswap::HydraWeight::<Runtime>::router_execution_buy(c, e)
+				}
+				PoolType::XYK => weights::pallet_xyk::HydraWeight::<Runtime>::router_execution_buy(c, e)
 					.saturating_add(<Runtime as pallet_xyk::Config>::AMMHandler::on_trade_weight()),
 			};
 			weight.saturating_accrue(amm_weight);
@@ -961,10 +969,12 @@ impl AmmTradeWeights<Trade<AssetId>> for RouterWeightInfo {
 			weight.saturating_accrue(Self::sell_and_calculate_sell_trade_amounts_overhead_weight(1, 1));
 
 			let amm_weight = match trade.pool {
-				PoolType::Omnipool => weights::omnipool::HydraWeight::<Runtime>::router_execution_sell(c, e),
-				PoolType::LBP => weights::lbp::HydraWeight::<Runtime>::router_execution_sell(c, e),
-				PoolType::Stableswap(_) => weights::stableswap::HydraWeight::<Runtime>::router_execution_sell(c, e),
-				PoolType::XYK => weights::xyk::HydraWeight::<Runtime>::router_execution_sell(c, e)
+				PoolType::Omnipool => weights::pallet_omnipool::HydraWeight::<Runtime>::router_execution_sell(c, e),
+				PoolType::LBP => weights::pallet_lbp::HydraWeight::<Runtime>::router_execution_sell(c, e),
+				PoolType::Stableswap(_) => {
+					weights::pallet_stableswap::HydraWeight::<Runtime>::router_execution_sell(c, e)
+				}
+				PoolType::XYK => weights::pallet_xyk::HydraWeight::<Runtime>::router_execution_sell(c, e)
 					.saturating_add(<Runtime as pallet_xyk::Config>::AMMHandler::on_trade_weight()),
 			};
 			weight.saturating_accrue(amm_weight);
@@ -983,10 +993,12 @@ impl AmmTradeWeights<Trade<AssetId>> for RouterWeightInfo {
 			weight.saturating_accrue(Self::buy_and_calculate_buy_trade_amounts_overhead_weight(2, 1));
 
 			let amm_weight = match trade.pool {
-				PoolType::Omnipool => weights::omnipool::HydraWeight::<Runtime>::router_execution_buy(c, e),
-				PoolType::LBP => weights::lbp::HydraWeight::<Runtime>::router_execution_buy(c, e),
-				PoolType::Stableswap(_) => weights::stableswap::HydraWeight::<Runtime>::router_execution_buy(c, e),
-				PoolType::XYK => weights::xyk::HydraWeight::<Runtime>::router_execution_buy(c, e)
+				PoolType::Omnipool => weights::pallet_omnipool::HydraWeight::<Runtime>::router_execution_buy(c, e),
+				PoolType::LBP => weights::pallet_lbp::HydraWeight::<Runtime>::router_execution_buy(c, e),
+				PoolType::Stableswap(_) => {
+					weights::pallet_stableswap::HydraWeight::<Runtime>::router_execution_buy(c, e)
+				}
+				PoolType::XYK => weights::pallet_xyk::HydraWeight::<Runtime>::router_execution_buy(c, e)
 					.saturating_add(<Runtime as pallet_xyk::Config>::AMMHandler::on_trade_weight()),
 			};
 			weight.saturating_accrue(amm_weight);
@@ -1008,16 +1020,18 @@ impl AmmTradeWeights<Trade<AssetId>> for RouterWeightInfo {
 
 		//For the stored route we expect a worst case with max number of trades in the most expensive pool which is stableswap
 		//We have have two sell calculation for that, normal and inverse
-		weights::stableswap::HydraWeight::<Runtime>::router_execution_sell(2, 0)
+		weights::pallet_stableswap::HydraWeight::<Runtime>::router_execution_sell(2, 0)
 			.checked_mul(MAX_NUMBER_OF_TRADES.into());
 
 		//Calculate sell amounts for the new route
 		for trade in route {
 			let amm_weight = match trade.pool {
-				PoolType::Omnipool => weights::omnipool::HydraWeight::<Runtime>::router_execution_sell(1, 0),
-				PoolType::LBP => weights::lbp::HydraWeight::<Runtime>::router_execution_sell(1, 0),
-				PoolType::Stableswap(_) => weights::stableswap::HydraWeight::<Runtime>::router_execution_sell(1, 0),
-				PoolType::XYK => weights::xyk::HydraWeight::<Runtime>::router_execution_sell(1, 0),
+				PoolType::Omnipool => weights::pallet_omnipool::HydraWeight::<Runtime>::router_execution_sell(1, 0),
+				PoolType::LBP => weights::pallet_lbp::HydraWeight::<Runtime>::router_execution_sell(1, 0),
+				PoolType::Stableswap(_) => {
+					weights::pallet_stableswap::HydraWeight::<Runtime>::router_execution_sell(1, 0)
+				}
+				PoolType::XYK => weights::pallet_xyk::HydraWeight::<Runtime>::router_execution_sell(1, 0),
 			};
 			weight.saturating_accrue(amm_weight);
 		}
@@ -1025,10 +1039,12 @@ impl AmmTradeWeights<Trade<AssetId>> for RouterWeightInfo {
 		//Calculate sell amounts for the inversed new route
 		for trade in inverse_route(route.to_vec()) {
 			let amm_weight = match trade.pool {
-				PoolType::Omnipool => weights::omnipool::HydraWeight::<Runtime>::router_execution_sell(1, 0),
-				PoolType::LBP => weights::lbp::HydraWeight::<Runtime>::router_execution_sell(1, 0),
-				PoolType::Stableswap(_) => weights::stableswap::HydraWeight::<Runtime>::router_execution_sell(1, 0),
-				PoolType::XYK => weights::xyk::HydraWeight::<Runtime>::router_execution_sell(1, 0),
+				PoolType::Omnipool => weights::pallet_omnipool::HydraWeight::<Runtime>::router_execution_sell(1, 0),
+				PoolType::LBP => weights::pallet_lbp::HydraWeight::<Runtime>::router_execution_sell(1, 0),
+				PoolType::Stableswap(_) => {
+					weights::pallet_stableswap::HydraWeight::<Runtime>::router_execution_sell(1, 0)
+				}
+				PoolType::XYK => weights::pallet_xyk::HydraWeight::<Runtime>::router_execution_sell(1, 0),
 			};
 			weight.saturating_accrue(amm_weight);
 		}
@@ -1038,7 +1054,7 @@ impl AmmTradeWeights<Trade<AssetId>> for RouterWeightInfo {
 
 	fn force_insert_route_weight() -> Weight {
 		//Since we don't have any AMM specific thing in the extrinsic, we just return the plain weight
-		weights::route_executor::HydraWeight::<Runtime>::force_insert_route()
+		weights::pallet_route_executor::HydraWeight::<Runtime>::force_insert_route()
 	}
 }
 
@@ -1071,7 +1087,7 @@ impl pallet_otc::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type ExistentialDeposits = AssetRegistry;
 	type ExistentialDepositMultiplier = ExistentialDepositMultiplier;
-	type WeightInfo = weights::otc::HydraWeight<Runtime>;
+	type WeightInfo = weights::pallet_otc::HydraWeight<Runtime>;
 }
 
 // Dynamic fees
@@ -1215,7 +1231,7 @@ impl pallet_stableswap::Config for Runtime {
 	type MinPoolLiquidity = MinPoolLiquidity;
 	type MinTradingLimit = MinTradingLimit;
 	type AmplificationRange = StableswapAmplificationRange;
-	type WeightInfo = weights::stableswap::HydraWeight<Runtime>;
+	type WeightInfo = weights::pallet_stableswap::HydraWeight<Runtime>;
 	#[cfg(feature = "runtime-benchmarks")]
 	type BenchmarkHelper = RegisterAsset<Runtime>;
 }
@@ -1245,7 +1261,7 @@ impl pallet_bonds::Config for Runtime {
 	type AssetTypeWhitelist = AssetTypeWhitelist;
 	type ProtocolFee = ProtocolFee;
 	type FeeReceiver = TreasuryAccount;
-	type WeightInfo = weights::bonds::HydraWeight<Runtime>;
+	type WeightInfo = weights::pallet_bonds::HydraWeight<Runtime>;
 }
 
 // Staking
@@ -1304,7 +1320,7 @@ impl pallet_staking::Config for Runtime {
 	type ReferendumInfo = pallet_staking::integrations::democracy::ReferendumStatus<Runtime>;
 	type MaxPointsPerAction = PointsPerAction;
 	type Vesting = VestingInfo<Runtime>;
-	type WeightInfo = weights::staking::HydraWeight<Runtime>;
+	type WeightInfo = weights::pallet_staking::HydraWeight<Runtime>;
 	type MinSlash = StakingMinSlash;
 
 	#[cfg(feature = "runtime-benchmarks")]
@@ -1338,7 +1354,7 @@ impl pallet_lbp::Config for Runtime {
 	type CreatePoolOrigin = SuperMajorityTechCommittee;
 	type LBPWeightFunction = pallet_lbp::LBPWeightFunction;
 	type AssetPairAccountId = AssetPairAccountId<Self>;
-	type WeightInfo = weights::lbp::HydraWeight<Runtime>;
+	type WeightInfo = weights::pallet_lbp::HydraWeight<Runtime>;
 	type MinTradingLimit = MinTradingLimit;
 	type MinPoolLiquidity = MinPoolLiquidity;
 	type MaxInRatio = MaxInRatio;
@@ -1358,7 +1374,7 @@ impl pallet_xyk::Config for Runtime {
 	type AssetPairAccountId = AssetPairAccountId<Self>;
 	type Currency = Currencies;
 	type NativeAssetId = NativeAssetId;
-	type WeightInfo = weights::xyk::HydraWeight<Runtime>;
+	type WeightInfo = weights::pallet_xyk::HydraWeight<Runtime>;
 	type GetExchangeFee = XYKExchangeFee;
 	type MinTradingLimit = MinTradingLimit;
 	type MinPoolLiquidity = MinPoolLiquidity;
@@ -1400,7 +1416,7 @@ impl pallet_referrals::Config for Runtime {
 	type LevelVolumeAndRewardPercentages = ReferralsLevelVolumeAndRewards;
 	type ExternalAccount = ReferralsExternalRewardAccount;
 	type SeedNativeAmount = ReferralsSeedAmount;
-	type WeightInfo = weights::referrals::HydraWeight<Runtime>;
+	type WeightInfo = weights::pallet_referrals::HydraWeight<Runtime>;
 	#[cfg(feature = "runtime-benchmarks")]
 	type BenchmarkHelper = ReferralsBenchmarkHelper;
 }
diff --git a/runtime/hydradx/src/evm/evm_fee.rs b/runtime/hydradx/src/evm/evm_fee.rs
index e27782ca3..237994144 100644
--- a/runtime/hydradx/src/evm/evm_fee.rs
+++ b/runtime/hydradx/src/evm/evm_fee.rs
@@ -134,7 +134,7 @@ where
 		corrected_fee: U256,
 		_base_fee: U256,
 		already_withdrawn: Self::LiquidityInfo,
-	) -> Self::LiquidityInfo {
+	) -> Result<Self::LiquidityInfo, Error<T>> {
 		if let Some(paid) = already_withdrawn {
 			let account_id = T::AddressMapping::into_account_id(*who);
 
@@ -177,9 +177,9 @@ where
 				asset_id: paid.asset_id,
 				price: paid.price,
 			});
-			return None;
+			return Ok(None);
 		}
-		None
+		Ok(None)
 	}
 
 	fn pay_priority_fee(tip: Self::LiquidityInfo) {
diff --git a/runtime/hydradx/src/evm/mod.rs b/runtime/hydradx/src/evm/mod.rs
index f7778ed0b..04c15eab1 100644
--- a/runtime/hydradx/src/evm/mod.rs
+++ b/runtime/hydradx/src/evm/mod.rs
@@ -27,6 +27,7 @@ pub use crate::{
 	AssetLocation, Aura, NORMAL_DISPATCH_RATIO,
 };
 use crate::{NativeAssetId, LRNA};
+pub use fp_evm::GenesisAccount as EvmGenesisAccount;
 use frame_support::{
 	parameter_types,
 	traits::{Defensive, FindAuthor},
@@ -41,10 +42,6 @@ use orml_tokens::CurrencyAdapter;
 use pallet_currencies::fungibles::FungibleCurrencies;
 use pallet_evm::EnsureAddressTruncated;
 use pallet_transaction_payment::Multiplier;
-use polkadot_xcm::{
-	latest::MultiLocation,
-	prelude::{AccountKey20, PalletInstance, Parachain, X3},
-};
 use primitives::{constants::chain::MAXIMUM_BLOCK_WEIGHT, AssetId};
 use sp_core::{Get, U256};
 
@@ -75,12 +72,12 @@ parameter_types! {
 }
 
 const MOONBEAM_PARA_ID: u32 = 2004;
-pub const WETH_ASSET_LOCATION: AssetLocation = AssetLocation(MultiLocation {
+pub const WETH_ASSET_LOCATION: AssetLocation = AssetLocation(polkadot_xcm::v3::MultiLocation {
 	parents: 1,
-	interior: X3(
-		Parachain(MOONBEAM_PARA_ID),
-		PalletInstance(110),
-		AccountKey20 {
+	interior: polkadot_xcm::v3::prelude::X3(
+		polkadot_xcm::v3::prelude::Parachain(MOONBEAM_PARA_ID),
+		polkadot_xcm::v3::prelude::PalletInstance(110),
+		polkadot_xcm::v3::prelude::AccountKey20 {
 			network: None,
 			key: hex!["ab3f0245b83feb11d15aaffefd7ad465a59817ed"],
 		},
@@ -126,6 +123,8 @@ parameter_types! {
 	pub GasLimitStorageGrowthRatio: u64 = 366;
 
 	pub const OracleEvmPeriod: OraclePeriod = OraclePeriod::Short;
+
+	pub const SuicideQuickClearLimit: u32 = 0;
 }
 
 impl pallet_evm::Config for crate::Runtime {
@@ -165,6 +164,7 @@ impl pallet_evm::Config for crate::Runtime {
 	type GasLimitStorageGrowthRatio = GasLimitStorageGrowthRatio;
 	type Timestamp = crate::Timestamp;
 	type WeightInfo = pallet_evm::weights::SubstrateWeight<crate::Runtime>;
+	type SuicideQuickClearLimit = SuicideQuickClearLimit;
 }
 
 impl pallet_evm_chain_id::Config for crate::Runtime {}
@@ -188,7 +188,7 @@ impl pallet_evm_accounts::Config for crate::Runtime {
 	type FeeMultiplier = sp_core::ConstU32<50>;
 	type EvmNonceProvider = EvmNonceProvider;
 	type ControllerOrigin = crate::SuperMajorityTechCommittee;
-	type WeightInfo = crate::weights::evm_accounts::HydraWeight<crate::Runtime>;
+	type WeightInfo = crate::weights::pallet_evm_accounts::HydraWeight<crate::Runtime>;
 }
 
 parameter_types! {
@@ -212,5 +212,5 @@ impl pallet_dynamic_evm_fee::Config for crate::Runtime {
 		OracleEvmPeriod,
 	>;
 	type WethAssetId = WethAssetId;
-	type WeightInfo = crate::weights::dynamic_evm_fee::HydraWeight<crate::Runtime>;
+	type WeightInfo = crate::weights::pallet_dynamic_evm_fee::HydraWeight<crate::Runtime>;
 }
diff --git a/runtime/hydradx/src/evm/runner.rs b/runtime/hydradx/src/evm/runner.rs
index 13d8443a6..d2ab5a951 100644
--- a/runtime/hydradx/src/evm/runner.rs
+++ b/runtime/hydradx/src/evm/runner.rs
@@ -24,7 +24,7 @@
 //!
 //! Shamelessly copied from pallet-evm and modified to support multi-currency fees.
 use crate::evm::WethAssetId;
-use fp_evm::{Account, InvalidEvmTransactionError};
+use fp_evm::{Account, TransactionValidationError};
 use frame_support::traits::Get;
 use hydradx_traits::AccountFeeCurrencyBalanceInCurrency;
 use pallet_evm::runner::Runner;
@@ -41,7 +41,7 @@ impl<T, R, B> Runner<T> for WrapRunner<T, R, B>
 where
 	T: Config,
 	R: Runner<T>,
-	<R as pallet_evm::Runner<T>>::Error: core::convert::From<InvalidEvmTransactionError>,
+	<R as pallet_evm::Runner<T>>::Error: core::convert::From<TransactionValidationError>,
 	B: AccountFeeCurrencyBalanceInCurrency<AssetId, T::AccountId, Output = (Balance, Weight)>,
 {
 	type Error = R::Error;
diff --git a/runtime/hydradx/src/governance.rs b/runtime/hydradx/src/governance.rs
index 3a5b034fc..670a68f5e 100644
--- a/runtime/hydradx/src/governance.rs
+++ b/runtime/hydradx/src/governance.rs
@@ -17,17 +17,21 @@
 
 use super::*;
 use primitives::constants::{
-	currency::{deposit, CENTS, DOLLARS},
+	currency::{deposit, CENTS, DOLLARS, UNITS},
 	time::{DAYS, HOURS},
 };
 
 use frame_support::{
 	parameter_types,
 	sp_runtime::{Perbill, Percent, Permill},
-	traits::{ConstU32, EitherOfDiverse, LockIdentifier, NeverEnsureOrigin, PrivilegeCmp},
+	traits::{
+		fungible::HoldConsideration, tokens::UnityAssetBalanceConversion, ConstU32, EitherOfDiverse,
+		LinearStoragePrice, LockIdentifier, PrivilegeCmp,
+	},
 	PalletId,
 };
 use frame_system::{EnsureRoot, EnsureSigned};
+use sp_runtime::traits::IdentityLookup;
 use sp_staking::currency_to_vote::U128CurrencyToVote;
 use sp_std::cmp::Ordering;
 
@@ -40,6 +44,64 @@ parameter_types! {
 	pub const Burn: Permill = Permill::from_percent(0);
 	pub const TreasuryPalletId: PalletId = PalletId(*b"py/trsry");
 	pub const MaxApprovals: u32 =  100;
+	pub const TreasuryPayoutPeriod: u32 = 30 * DAYS;
+}
+
+pub struct PayFromTreasuryAccount;
+
+impl frame_support::traits::tokens::Pay for PayFromTreasuryAccount {
+	type Balance = Balance;
+	type Beneficiary = AccountId;
+	type AssetKind = ();
+	type Id = ();
+	type Error = sp_runtime::DispatchError;
+
+	#[cfg(not(feature = "runtime-benchmarks"))]
+	fn pay(
+		who: &Self::Beneficiary,
+		_asset_kind: Self::AssetKind,
+		amount: Self::Balance,
+	) -> Result<Self::Id, Self::Error> {
+		let _ = <Balances as frame_support::traits::fungible::Mutate<_>>::transfer(
+			&TreasuryAccount::get(),
+			who,
+			amount,
+			frame_support::traits::tokens::Preservation::Expendable,
+		)?;
+		Ok(())
+	}
+
+	#[cfg(feature = "runtime-benchmarks")]
+	fn pay(
+		who: &Self::Beneficiary,
+		_asset_kind: Self::AssetKind,
+		amount: Self::Balance,
+	) -> Result<Self::Id, Self::Error> {
+		// In case of benchmarks, we adjust the value by multiplying it by 1_000_000_000_000, otherwise it fails with BelowMinimum limit error, because
+		// treasury benchmarks uses only 100 as the amount.
+		let _ = <Balances as frame_support::traits::fungible::Mutate<_>>::transfer(
+			&TreasuryAccount::get(),
+			who,
+			amount * 1_000_000_000_000,
+			frame_support::traits::tokens::Preservation::Expendable,
+		)?;
+		Ok(())
+	}
+
+	fn check_payment(_id: Self::Id) -> frame_support::traits::tokens::PaymentStatus {
+		frame_support::traits::tokens::PaymentStatus::Success
+	}
+
+	#[cfg(feature = "runtime-benchmarks")]
+	fn ensure_successful(_: &Self::Beneficiary, _: Self::AssetKind, amount: Self::Balance) {
+		<Balances as frame_support::traits::fungible::Mutate<_>>::mint_into(
+			&TreasuryAccount::get(),
+			amount * 1_000_000_000_000,
+		)
+		.unwrap();
+	}
+	#[cfg(feature = "runtime-benchmarks")]
+	fn ensure_concluded(_: Self::Id) {}
 }
 
 impl pallet_treasury::Config for Runtime {
@@ -55,24 +117,41 @@ impl pallet_treasury::Config for Runtime {
 	type Burn = Burn;
 	type PalletId = TreasuryPalletId;
 	type BurnDestination = ();
-	type WeightInfo = weights::treasury::HydraWeight<Runtime>;
+	type WeightInfo = weights::pallet_treasury::HydraWeight<Runtime>;
 	type SpendFunds = ();
 	type MaxApprovals = MaxApprovals;
-	type SpendOrigin = NeverEnsureOrigin<Balance>;
+	#[cfg(not(feature = "runtime-benchmarks"))]
+	type SpendOrigin = frame_support::traits::NeverEnsureOrigin<Balance>;
+	#[cfg(feature = "runtime-benchmarks")]
+	type SpendOrigin =
+		frame_system::EnsureWithSuccess<EnsureRoot<AccountId>, AccountId, crate::benches::BenchmarkMaxBalance>;
+	type AssetKind = (); // set to () to support only the native currency
+	type Beneficiary = AccountId;
+	type BeneficiaryLookup = IdentityLookup<AccountId>;
+	type Paymaster = PayFromTreasuryAccount;
+	type BalanceConverter = UnityAssetBalanceConversion;
+	type PayoutPeriod = TreasuryPayoutPeriod;
+	#[cfg(feature = "runtime-benchmarks")]
+	type BenchmarkHelper = (); // default impl is enough because we support only the native currency
 }
 
 parameter_types! {
 	pub PreimageBaseDeposit: Balance = deposit(2, 64);
 	pub PreimageByteDeposit: Balance = deposit(0, 1);
+	pub const PreimageHoldReason: RuntimeHoldReason = RuntimeHoldReason::Preimage(pallet_preimage::HoldReason::Preimage);
 }
 
 impl pallet_preimage::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
-	type WeightInfo = weights::preimage::HydraWeight<Runtime>;
+	type WeightInfo = weights::pallet_preimage::HydraWeight<Runtime>;
 	type Currency = Balances;
 	type ManagerOrigin = EnsureRoot<AccountId>;
-	type BaseDeposit = PreimageBaseDeposit;
-	type ByteDeposit = PreimageByteDeposit;
+	type Consideration = HoldConsideration<
+		AccountId,
+		Balances,
+		PreimageHoldReason,
+		LinearStoragePrice<PreimageBaseDeposit, PreimageByteDeposit, Balance>,
+	>;
 }
 
 /// Used the compare the privilege of an origin inside the scheduler.
@@ -111,7 +190,7 @@ impl pallet_scheduler::Config for Runtime {
 	type ScheduleOrigin = MoreThanHalfCouncil;
 	type OriginPrivilegeCmp = OriginPrivilegeCmp;
 	type MaxScheduledPerBlock = MaxScheduledPerBlock;
-	type WeightInfo = weights::scheduler::HydraWeight<Runtime>;
+	type WeightInfo = weights::pallet_scheduler::HydraWeight<Runtime>;
 	type Preimages = Preimage;
 }
 
@@ -131,7 +210,7 @@ impl pallet_collective::Config<CouncilCollective> for Runtime {
 	type MaxProposals = CouncilMaxProposals;
 	type MaxMembers = CouncilMaxMembers;
 	type DefaultVote = pallet_collective::PrimeDefaultVote;
-	type WeightInfo = weights::council::HydraWeight<Runtime>;
+	type WeightInfo = weights::pallet_collective_council::HydraWeight<Runtime>;
 	type MaxProposalWeight = MaxProposalWeight;
 	type SetMembersOrigin = EnsureRoot<AccountId>;
 }
@@ -151,7 +230,7 @@ impl pallet_collective::Config<TechnicalCollective> for Runtime {
 	type MaxProposals = TechnicalMaxProposals;
 	type MaxMembers = TechnicalMaxMembers;
 	type DefaultVote = pallet_collective::PrimeDefaultVote;
-	type WeightInfo = weights::technical_committee::HydraWeight<Runtime>;
+	type WeightInfo = weights::pallet_collective_technical_committee::HydraWeight<Runtime>;
 	type MaxProposalWeight = MaxProposalWeight;
 	type SetMembersOrigin = EnsureRoot<AccountId>;
 }
@@ -217,7 +296,7 @@ parameter_types! {
 }
 
 impl pallet_democracy::Config for Runtime {
-	type WeightInfo = weights::democracy::HydraWeight<Runtime>;
+	type WeightInfo = weights::pallet_democracy::HydraWeight<Runtime>;
 	type RuntimeEvent = RuntimeEvent;
 	type Scheduler = Scheduler;
 	type Preimages = Preimage;
@@ -291,7 +370,7 @@ impl pallet_elections_phragmen::Config for Runtime {
 	type TermDuration = TermDuration;
 	type MaxCandidates = MaxElectionCandidates;
 	type MaxVoters = MaxElectionVoters;
-	type WeightInfo = weights::elections::HydraWeight<Runtime>;
+	type WeightInfo = weights::pallet_elections_phragmen::HydraWeight<Runtime>;
 	type MaxVotesPerVoter = MaxVotesPerVoter;
 }
 
@@ -302,6 +381,7 @@ parameter_types! {
 	pub const TipReportDepositBase: Balance = 10 * DOLLARS;
 	pub const TipReportDepositPerByte: Balance = CENTS;
 	pub const MaximumReasonLength: u32 = 1024;
+	pub const MaxTipAmount: u128 = 5_000_000 * UNITS; // ~$100k
 }
 
 impl pallet_tips::Config for Runtime {
@@ -311,6 +391,7 @@ impl pallet_tips::Config for Runtime {
 	type TipCountdown = TipCountdown;
 	type TipFindersFee = TipFindersFee;
 	type TipReportDepositBase = TipReportDepositBase;
+	type MaxTipAmount = MaxTipAmount;
 	type Tippers = Elections;
-	type WeightInfo = weights::tips::HydraWeight<Runtime>;
+	type WeightInfo = weights::pallet_tips::HydraWeight<Runtime>;
 }
diff --git a/runtime/hydradx/src/lib.rs b/runtime/hydradx/src/lib.rs
index 9ed880600..30cfc4382 100644
--- a/runtime/hydradx/src/lib.rs
+++ b/runtime/hydradx/src/lib.rs
@@ -29,7 +29,6 @@ include!(concat!(env!("OUT_DIR"), "/wasm_binary.rs"));
 mod tests;
 
 mod benchmarking;
-mod migrations;
 pub mod weights;
 
 mod assets;
@@ -44,7 +43,6 @@ pub use governance::*;
 pub use system::*;
 pub use xcm::*;
 
-use crate::sp_api_hidden_includes_construct_runtime::hidden_include::traits::Hooks;
 use codec::{Decode, Encode};
 use hydradx_traits::evm::InspectEvmAccounts;
 use sp_api::impl_runtime_apis;
@@ -59,18 +57,24 @@ use sp_runtime::{
 	ApplyExtrinsicResult, Permill,
 };
 
-use sp_std::convert::From;
-use sp_std::prelude::*;
+use sp_std::{convert::From, prelude::*};
 #[cfg(feature = "std")]
 use sp_version::NativeVersion;
 use sp_version::RuntimeVersion;
 // A few exports that help ease life for downstream crates.
-use frame_support::{construct_runtime, weights::Weight};
+use frame_support::{
+	construct_runtime,
+	genesis_builder_helper::{build_config, create_default_config},
+	pallet_prelude::Hooks,
+	parameter_types,
+	weights::Weight,
+};
 pub use hex_literal::hex;
 /// Import HydraDX pallets
 pub use pallet_claims;
 use pallet_ethereum::{Transaction as EthereumTransaction, TransactionStatus};
 use pallet_evm::{Account as EVMAccount, FeeCalculator, GasWeightMapping, Runner};
+pub use pallet_genesis_history::Chain;
 pub use primitives::{
 	AccountId, Amount, AssetId, Balance, BlockNumber, CollectionId, Hash, Index, ItemId, Price, Signature,
 };
@@ -109,7 +113,7 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: create_runtime_str!("hydradx"),
 	impl_name: create_runtime_str!("hydradx"),
 	authoring_version: 1,
-	spec_version: 241,
+	spec_version: 243,
 	impl_version: 0,
 	apis: RUNTIME_API_VERSIONS,
 	transaction_version: 1,
@@ -143,6 +147,8 @@ construct_runtime!(
 		//NOTE: 5 - is used by Scheduler which must be after cumulus_pallet_parachain_system
 		Balances: pallet_balances = 7,
 		TransactionPayment: pallet_transaction_payment exclude_parts { Config } = 9,
+		// due to multi payment pallet prices, this needs to be initialized at the very beginning
+		MultiTransactionPayment: pallet_transaction_multi_payment = 203,
 		Treasury: pallet_treasury = 11,
 		Utility: pallet_utility = 13,
 		Preimage: pallet_preimage = 15,
@@ -178,7 +184,6 @@ construct_runtime!(
 		LBP: pallet_lbp = 73,
 		XYK: pallet_xyk = 74,
 		Referrals: pallet_referrals = 75,
-		XcmRateLimiter: pallet_xcm_rate_limiter = 76,
 
 		// ORML related modules
 		Tokens: orml_tokens = 77,
@@ -195,22 +200,23 @@ construct_runtime!(
 		XYKLiquidityMining: pallet_xyk_liquidity_mining = 95,
 		XYKWarehouseLM: warehouse_liquidity_mining::<Instance2> = 96,
 
-		// Parachain
-		ParachainSystem: cumulus_pallet_parachain_system exclude_parts { Config } = 103,
-		ParachainInfo: parachain_info = 105,
-
-		//NOTE: Scheduler must be after ParachainSystem otherwise RelayChainBlockNumberProvider
+		RelayChainInfo: pallet_relaychain_info = 201,
+		//NOTE: DCA pallet should be declared before ParachainSystem pallet,
+		//otherwise there is no data about relay chain parent hash
+		DCA: pallet_dca = 66,
+		//NOTE: Scheduler must be before ParachainSystem otherwise RelayChainBlockNumberProvider
 		//will return 0 as current block number when used with Scheduler(democracy).
 		Scheduler: pallet_scheduler = 5,
 
-		//NOTE: DCA pallet should be declared after ParachainSystem pallet,
-		//otherwise there is no data about relay chain parent hash
-		DCA: pallet_dca = 66,
+		// Parachain
+		ParachainSystem: cumulus_pallet_parachain_system exclude_parts { Config } = 103,
+		ParachainInfo: staging_parachain_info = 105,
 
 		PolkadotXcm: pallet_xcm = 107,
 		CumulusXcm: cumulus_pallet_xcm = 109,
 		XcmpQueue: cumulus_pallet_xcmp_queue exclude_parts { Call } = 111,
-		DmpQueue: cumulus_pallet_dmp_queue = 113,
+		// 113 was used by DmpQueue which is now replaced by MessageQueue
+		MessageQueue: pallet_message_queue = 114,
 
 		// ORML XCM
 		OrmlXcm: orml_xcm = 135,
@@ -225,9 +231,7 @@ construct_runtime!(
 		AuraExt: cumulus_pallet_aura_ext = 169,
 
 		// Warehouse - let's allocate indices 100+ for warehouse pallets
-		RelayChainInfo: pallet_relaychain_info = 201,
 		EmaOracle: pallet_ema_oracle = 202,
-		MultiTransactionPayment: pallet_transaction_multi_payment = 203,
 	}
 );
 
@@ -263,10 +267,21 @@ pub type Executive = frame_executive::Executive<
 	Block,
 	frame_system::ChainContext<Runtime>,
 	Runtime,
-	AllPalletsReversedWithSystemFirst,
-	(migrations::OnRuntimeUpgradeMigration,),
+	AllPalletsWithSystem,
+	(
+		frame_support::migrations::RemovePallet<DmpQueuePalletName, <Runtime as frame_system::Config>::DbWeight>,
+		frame_support::migrations::RemovePallet<XcmRateLimiterPalletName, <Runtime as frame_system::Config>::DbWeight>,
+		cumulus_pallet_xcmp_queue::migration::v4::MigrationToV4<Runtime>,
+		pallet_identity::migration::versioned::V0ToV1<Runtime, 450u64>, // We have currently 379 identities in basllisk, so limit of 450 should be enough
+	),
 >;
 
+// TODO: Remove after the v1.7.2 upgrade
+parameter_types! {
+	pub const DmpQueuePalletName: &'static str = "DmpQueue";
+	pub const XcmRateLimiterPalletName: &'static str = "XcmRateLimiter";
+}
+
 impl_runtime_apis! {
 	impl sp_api::Core<Block> for Runtime {
 		fn version() -> RuntimeVersion {
@@ -687,47 +702,15 @@ impl_runtime_apis! {
 			Vec<frame_benchmarking::BenchmarkList>,
 			Vec<frame_support::traits::StorageInfo>,
 		) {
-			use frame_benchmarking::{list_benchmark, Benchmarking, BenchmarkList};
+			use frame_benchmarking::{Benchmarking, BenchmarkList};
 			use frame_support::traits::StorageInfoTrait;
 			use orml_benchmarking::list_benchmark as orml_list_benchmark;
+
 			use frame_system_benchmarking::Pallet as SystemBench;
+			use pallet_xcm::benchmarking::Pallet as PalletXcmExtrinsiscsBenchmark;
 
 			let mut list = Vec::<BenchmarkList>::new();
-
-			list_benchmark!(list, extra, frame_system, SystemBench::<Runtime>);
-			list_benchmark!(list, extra, pallet_balances, Balances);
-			list_benchmark!(list, extra, pallet_collator_selection, CollatorSelection);
-			list_benchmark!(list, extra, pallet_timestamp, Timestamp);
-			list_benchmark!(list, extra, pallet_treasury, Treasury);
-			list_benchmark!(list, extra, pallet_preimage, Preimage);
-			list_benchmark!(list, extra, pallet_scheduler, Scheduler);
-			list_benchmark!(list, extra, pallet_identity, Identity);
-			list_benchmark!(list, extra, pallet_tips, Tips);
-			list_benchmark!(list, extra, pallet_proxy, Proxy);
-			list_benchmark!(list, extra, pallet_utility, Utility);
-			list_benchmark!(list, extra, pallet_democracy, Democracy);
-			list_benchmark!(list, extra, pallet_elections_phragmen, Elections);
-			list_benchmark!(list, extra, council, Council);
-			list_benchmark!(list, extra, tech, TechnicalCommittee);
-			list_benchmark!(list, extra, pallet_omnipool_liquidity_mining, OmnipoolLiquidityMining);
-			list_benchmark!(list, extra, pallet_circuit_breaker, CircuitBreaker);
-			list_benchmark!(list, extra, pallet_bonds, Bonds);
-			list_benchmark!(list, extra, pallet_stableswap, Stableswap);
-			list_benchmark!(list, extra, pallet_state_trie_migration, StateTrieMigration);
-
-			list_benchmark!(list, extra, pallet_asset_registry, AssetRegistry);
-			list_benchmark!(list, extra, pallet_claims, Claims);
-			list_benchmark!(list, extra, pallet_ema_oracle, EmaOracle);
-			list_benchmark!(list, extra, pallet_staking, Staking);
-			list_benchmark!(list, extra, pallet_lbp, LBP);
-			list_benchmark!(list, extra, pallet_referrals, Referrals);
-			list_benchmark!(list, extra, pallet_evm_accounts, EVMAccounts);
-
-			list_benchmark!(list, extra, cumulus_pallet_xcmp_queue, XcmpQueue);
-			list_benchmark!(list, extra, pallet_transaction_pause, TransactionPause);
-
-			list_benchmark!(list, extra, pallet_otc, OTC);
-			list_benchmark!(list, extra, pallet_xcm, PolkadotXcm);
+			list_benchmarks!(list, extra);
 
 			orml_list_benchmark!(list, extra, pallet_currencies, benchmarking::currencies);
 			orml_list_benchmark!(list, extra, orml_tokens, benchmarking::tokens);
@@ -749,10 +732,13 @@ impl_runtime_apis! {
 		fn dispatch_benchmark(
 			config: frame_benchmarking::BenchmarkConfig
 		) -> Result<Vec<frame_benchmarking::BenchmarkBatch>, sp_runtime::RuntimeString> {
-			use frame_benchmarking::{BenchmarkError, Benchmarking, BenchmarkBatch, add_benchmark};
+			use frame_benchmarking::{BenchmarkError, Benchmarking, BenchmarkBatch};
 			use frame_support::traits::TrackedStorageKey;
 			use orml_benchmarking::add_benchmark as orml_add_benchmark;
+			use pallet_xcm::benchmarking::Pallet as PalletXcmExtrinsiscsBenchmark;
 			use frame_system_benchmarking::Pallet as SystemBench;
+			use cumulus_primitives_core::ParaId;
+
 			impl frame_system_benchmarking::Config for Runtime {
 				fn setup_set_code_requirements(code: &sp_std::vec::Vec<u8>) -> Result<(), BenchmarkError> {
 					ParachainSystem::initialize_for_set_code_benchmark(code.len() as u32);
@@ -764,6 +750,35 @@ impl_runtime_apis! {
 				}
 			}
 
+			parameter_types! {
+				pub const RandomParaId: ParaId = ParaId::new(22_222_222);
+				pub const ExistentialDeposit: u128 = 0;
+			}
+
+			use polkadot_xcm::latest::prelude::{Location, AssetId, Fungible, Asset, Parent};
+
+			impl pallet_xcm::benchmarking::Config for Runtime {
+				fn reachable_dest() -> Option<Location> {
+					Some(Parent.into())
+				}
+
+				fn teleportable_asset_and_dest() -> Option<(Asset, Location)> {
+					Some((
+						Asset {
+							fun: Fungible(ExistentialDeposit::get()),
+							id: AssetId(Parent.into())
+						},
+						Parent.into(),
+					))
+				}
+
+				fn reserve_transferable_asset_and_dest() -> Option<(Asset, Location)> {
+					// TODO: https://github.com/galacticcouncil/HydraDX-node/issues/840
+					// fix it in next upgrade > 1.7.2
+					None
+				}
+			}
+
 			let whitelist: Vec<TrackedStorageKey> = vec![
 				// Block Number
 				hex!("26aa394eea5630e07c48ae0c9558cef702a5c1b19ab7a04f536c519aca4983ac").to_vec().into(),
@@ -779,41 +794,7 @@ impl_runtime_apis! {
 
 			let mut batches = Vec::<BenchmarkBatch>::new();
 			let params = (&config, &whitelist);
-
-			// Substrate pallets
-			add_benchmark!(params, batches, frame_system, SystemBench::<Runtime>);
-			add_benchmark!(params, batches, pallet_balances, Balances);
-			add_benchmark!(params, batches, pallet_collator_selection, CollatorSelection);
-			add_benchmark!(params, batches, pallet_timestamp, Timestamp);
-			add_benchmark!(params, batches, pallet_treasury, Treasury);
-			add_benchmark!(params, batches, pallet_preimage, Preimage);
-			add_benchmark!(params, batches, pallet_scheduler, Scheduler);
-			add_benchmark!(params, batches, pallet_identity, Identity);
-			add_benchmark!(params, batches, pallet_tips, Tips);
-			add_benchmark!(params, batches, pallet_proxy, Proxy);
-			add_benchmark!(params, batches, pallet_utility, Utility);
-			add_benchmark!(params, batches, pallet_democracy, Democracy);
-			add_benchmark!(params, batches, pallet_elections_phragmen, Elections);
-			add_benchmark!(params, batches, council, Council);
-			add_benchmark!(params, batches, tech, TechnicalCommittee);
-			add_benchmark!(params, batches, pallet_omnipool_liquidity_mining, OmnipoolLiquidityMining);
-			add_benchmark!(params, batches, pallet_circuit_breaker, CircuitBreaker);
-			add_benchmark!(params, batches, pallet_asset_registry, AssetRegistry);
-			add_benchmark!(params, batches, pallet_claims, Claims);
-			add_benchmark!(params, batches, pallet_ema_oracle, EmaOracle);
-			add_benchmark!(params, batches, pallet_bonds, Bonds);
-			add_benchmark!(params, batches, pallet_staking, Staking);
-			add_benchmark!(params, batches, pallet_lbp, LBP);
-			add_benchmark!(params, batches, pallet_stableswap, Stableswap);
-			add_benchmark!(params, batches, pallet_referrals, Referrals);
-			add_benchmark!(params, batches, pallet_evm_accounts, EVMAccounts);
-			add_benchmark!(params, batches, pallet_state_trie_migration, StateTrieMigration);
-
-			add_benchmark!(params, batches, cumulus_pallet_xcmp_queue, XcmpQueue);
-			add_benchmark!(params, batches, pallet_transaction_pause, TransactionPause);
-
-			add_benchmark!(params, batches, pallet_otc, OTC);
-			add_benchmark!(params, batches, pallet_xcm, PolkadotXcm);
+			add_benchmarks!(params, batches);
 
 			orml_add_benchmark!(params, batches, pallet_currencies, benchmarking::currencies);
 			orml_add_benchmark!(params, batches, orml_tokens, benchmarking::tokens);
@@ -831,6 +812,59 @@ impl_runtime_apis! {
 			Ok(batches)
 		}
 	}
+
+	impl sp_genesis_builder::GenesisBuilder<Block> for Runtime {
+		fn create_default_config() -> Vec<u8> {
+			create_default_config::<RuntimeGenesisConfig>()
+		}
+
+		fn build_config(config: Vec<u8>) -> sp_genesis_builder::Result {
+			build_config::<RuntimeGenesisConfig>(config)
+		}
+	}
+}
+
+#[cfg(feature = "runtime-benchmarks")]
+mod benches {
+	frame_support::parameter_types! {
+		pub const BenchmarkMaxBalance: crate::Balance = crate::Balance::max_value();
+	}
+	frame_benchmarking::define_benchmarks!(
+		[pallet_lbp, LBP]
+		[pallet_asset_registry, AssetRegistry]
+		[pallet_omnipool_liquidity_mining, OmnipoolLiquidityMining]
+		[pallet_transaction_pause, TransactionPause]
+		[pallet_ema_oracle, EmaOracle]
+		[pallet_circuit_breaker, CircuitBreaker]
+		[pallet_bonds, Bonds]
+		[pallet_stableswap, Stableswap]
+		[pallet_claims, Claims]
+		[pallet_staking, Staking]
+		[pallet_referrals, Referrals]
+		[pallet_evm_accounts, EVMAccounts]
+		[pallet_otc, OTC]
+		[pallet_state_trie_migration, StateTrieMigration]
+		[frame_system, SystemBench::<Runtime>]
+		[pallet_balances, Balances]
+		[pallet_timestamp, Timestamp]
+		[pallet_democracy, Democracy]
+		[pallet_elections_phragmen, Elections]
+		[pallet_treasury, Treasury]
+		[pallet_scheduler, Scheduler]
+		[pallet_utility, Utility]
+		[pallet_tips, Tips]
+		[pallet_identity, Identity]
+		[pallet_collective_council, Council]
+		[pallet_collective_technical_committee, TechnicalCommittee]
+		[cumulus_pallet_xcmp_queue, XcmpQueue]
+		[pallet_message_queue, MessageQueue]
+		[pallet_preimage, Preimage]
+		[pallet_multisig, Multisig]
+		[pallet_proxy, Proxy]
+		[cumulus_pallet_parachain_system, ParachainSystem]
+		[pallet_collator_selection, CollatorSelection]
+		[pallet_xcm, PalletXcmExtrinsiscsBenchmark::<Runtime>]
+	);
 }
 
 struct CheckInherents;
diff --git a/runtime/hydradx/src/migrations.rs b/runtime/hydradx/src/migrations.rs
deleted file mode 100644
index 1a3fa767c..000000000
--- a/runtime/hydradx/src/migrations.rs
+++ /dev/null
@@ -1,51 +0,0 @@
-use crate::Runtime;
-use frame_support::{traits::OnRuntimeUpgrade, weights::Weight};
-use pallet_evm_chain_id::ChainId;
-#[cfg(feature = "try-runtime")]
-use sp_std::prelude::*;
-
-pub struct OnRuntimeUpgradeMigration;
-
-impl OnRuntimeUpgrade for OnRuntimeUpgradeMigration {
-	#[cfg(feature = "try-runtime")]
-	fn pre_upgrade() -> Result<Vec<u8>, sp_runtime::DispatchError> {
-		log::info!("PreMigrate Collator Selection Pallet start");
-		let number_of_invulnerables = pallet_collator_selection::migration::v1::MigrateToV1::<Runtime>::pre_upgrade()?;
-		log::info!("PreMigrate Collator Selection Pallet end");
-		Ok(number_of_invulnerables)
-	}
-
-	fn on_runtime_upgrade() -> Weight {
-		let mut weight: Weight = Weight::zero();
-
-		log::info!("Migrate Collator Selection Pallet to v1 start");
-		weight = weight
-			.saturating_add(pallet_collator_selection::migration::v1::MigrateToV1::<Runtime>::on_runtime_upgrade());
-		log::info!("Migrate Collator Selection Pallet to v1 end");
-
-		log::info!("Migrate Unknown Tokens Pallet to v2 start");
-		weight = weight.saturating_add(orml_unknown_tokens::Migration::<Runtime>::on_runtime_upgrade());
-		log::info!("Migrate Unknown Tokens Pallet to v2 end");
-
-		log::info!("Migrate pallet xyk-liquidity-mining to v1 start");
-		weight = weight.saturating_add(pallet_xyk_liquidity_mining::migration::migrate_to_v1::<Runtime>());
-		log::info!("Migrate pallet xyk-liquidity-mining to v1 end");
-
-		let evm_id: u64 = 222_222u64;
-		ChainId::<Runtime>::put(evm_id);
-		weight = weight.saturating_add(<Runtime as frame_system::Config>::DbWeight::get().reads_writes(0, 1));
-
-		weight = weight.saturating_add(pallet_referrals::migration::preregister_parachain_codes::<Runtime>());
-
-		weight
-	}
-
-	#[cfg(feature = "try-runtime")]
-	fn post_upgrade(state: Vec<u8>) -> Result<(), sp_runtime::DispatchError> {
-		log::info!("PostMigrate Collator Selection Pallet start");
-		let migration_result = pallet_collator_selection::migration::v1::MigrateToV1::<Runtime>::post_upgrade(state);
-		log::info!("PostMigrate Collator Selection Pallet end");
-
-		migration_result
-	}
-}
diff --git a/runtime/hydradx/src/system.rs b/runtime/hydradx/src/system.rs
index f09f5a9a2..77231cf04 100644
--- a/runtime/hydradx/src/system.rs
+++ b/runtime/hydradx/src/system.rs
@@ -22,7 +22,7 @@ use pallet_transaction_payment::{Multiplier, TargetedFeeAdjustment};
 use primitives::constants::{
 	chain::{CORE_ASSET_ID, MAXIMUM_BLOCK_WEIGHT},
 	currency::{deposit, CENTS, DOLLARS, MILLICENTS},
-	time::{HOURS, SLOT_DURATION},
+	time::{DAYS, HOURS, SLOT_DURATION},
 };
 
 use codec::{Decode, Encode, MaxEncodedLen};
@@ -40,7 +40,7 @@ use frame_support::{
 	},
 	PalletId,
 };
-use frame_system::EnsureSignedBy;
+use frame_system::EnsureRoot;
 use hydradx_adapters::{OraclePriceProvider, RelayChainBlockNumberProvider};
 use scale_info::TypeInfo;
 
@@ -76,7 +76,7 @@ impl Contains<RuntimeCall> for CallFilter {
 			}
 		}
 		// filter transfers of HDX to the omnipool account
-		if let RuntimeCall::Balances(pallet_balances::Call::transfer { dest, .. })
+		if let RuntimeCall::Balances(pallet_balances::Call::transfer_allow_death { dest, .. })
 		| RuntimeCall::Balances(pallet_balances::Call::transfer_keep_alive { dest, .. })
 		| RuntimeCall::Balances(pallet_balances::Call::transfer_all { dest, .. })
 		| RuntimeCall::Currencies(pallet_currencies::Call::transfer_native_currency { dest, .. }) = call
@@ -143,6 +143,8 @@ parameter_types! {
 }
 
 impl frame_system::Config for Runtime {
+	/// The ubiquitous event type.
+	type RuntimeEvent = RuntimeEvent;
 	/// The basic call filter to use in dispatchable.
 	type BaseCallFilter = CallFilter;
 	type BlockWeights = BlockWeights;
@@ -151,10 +153,9 @@ impl frame_system::Config for Runtime {
 	type RuntimeOrigin = RuntimeOrigin;
 	/// The aggregated dispatch type that is available for extrinsics.
 	type RuntimeCall = RuntimeCall;
+	type RuntimeTask = RuntimeTask;
 	/// The index type for storing how many extrinsics an account has signed.
 	type Nonce = Index;
-	/// The index type for blocks.
-	type Block = Block;
 	/// The type for hashing blocks and tries.
 	type Hash = Hash;
 	/// The hashing algorithm used.
@@ -163,8 +164,8 @@ impl frame_system::Config for Runtime {
 	type AccountId = AccountId;
 	/// The lookup mechanism to get account ID from whatever is passed in dispatchers.
 	type Lookup = IdentityLookup<AccountId>;
-	/// The ubiquitous event type.
-	type RuntimeEvent = RuntimeEvent;
+	/// The index type for blocks.
+	type Block = Block;
 	/// Maximum number of block number to block hash mappings to keep (oldest pruned first).
 	type BlockHashCount = BlockHashCount;
 	/// The weight of database operations that the runtime can invoke.
@@ -184,7 +185,7 @@ impl frame_system::Config for Runtime {
 	/// What to do if an account is fully reaped from the system.
 	type OnKilledAccount = ();
 	/// Weight information for the extrinsics of this pallet.
-	type SystemWeightInfo = weights::system::HydraWeight<Runtime>;
+	type SystemWeightInfo = weights::frame_system::HydraWeight<Runtime>;
 	type SS58Prefix = SS58Prefix;
 	type OnSetCode = cumulus_pallet_parachain_system::ParachainSetCode<Self>;
 	type MaxConsumers = frame_support::traits::ConstU32<16>;
@@ -199,7 +200,7 @@ impl pallet_timestamp::Config for Runtime {
 	type Moment = u64;
 	type OnTimestampSet = ();
 	type MinimumPeriod = MinimumPeriod;
-	type WeightInfo = weights::timestamp::HydraWeight<Runtime>;
+	type WeightInfo = weights::pallet_timestamp::HydraWeight<Runtime>;
 }
 
 parameter_types! {
@@ -212,11 +213,12 @@ impl cumulus_pallet_parachain_system::Config for Runtime {
 	type OnSystemEvent = pallet_relaychain_info::OnValidationDataHandler<Runtime>;
 	type SelfParaId = ParachainInfo;
 	type OutboundXcmpMessageSource = XcmpQueue;
-	type DmpMessageHandler = DmpQueue;
 	type ReservedDmpWeight = ReservedDmpWeight;
 	type XcmpMessageHandler = XcmpQueue;
 	type ReservedXcmpWeight = ReservedXcmpWeight;
 	type CheckAssociatedRelayNumber = cumulus_pallet_parachain_system::RelayNumberStrictlyIncreases;
+	type DmpQueue = frame_support::traits::EnqueueWithOrigin<MessageQueue, RelayOrigin>;
+	type WeightInfo = weights::cumulus_pallet_parachain_system::HydraWeight<Runtime>;
 }
 
 parameter_types! {
@@ -230,7 +232,7 @@ impl pallet_aura::Config for Runtime {
 	type AllowMultipleBlocksPerSlot = ConstBool<false>;
 }
 
-impl parachain_info::Config for Runtime {}
+impl staging_parachain_info::Config for Runtime {}
 
 impl cumulus_pallet_aura_ext::Config for Runtime {}
 
@@ -250,14 +252,17 @@ impl pallet_collator_selection::Config for Runtime {
 	type Currency = Balances;
 	type UpdateOrigin = MoreThanHalfCouncil;
 	type PotId = PotId;
+	#[cfg(not(feature = "runtime-benchmarks"))]
 	type MaxCandidates = MaxCandidates;
+	#[cfg(feature = "runtime-benchmarks")]
+	type MaxCandidates = ConstU32<20>;
 	type MaxInvulnerables = MaxInvulnerables;
 	// should be a multiple of session or things will get inconsistent
 	type KickThreshold = Period;
 	type ValidatorId = <Self as frame_system::Config>::AccountId;
 	type ValidatorIdOf = pallet_collator_selection::IdentityCollator;
 	type ValidatorRegistration = Session;
-	type WeightInfo = weights::collator_selection::HydraWeight<Runtime>;
+	type WeightInfo = weights::pallet_collator_selection::HydraWeight<Runtime>;
 	type MinEligibleCollators = ConstU32<4>;
 }
 
@@ -285,31 +290,40 @@ impl pallet_utility::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type RuntimeCall = RuntimeCall;
 	type PalletsOrigin = OriginCaller;
-	type WeightInfo = weights::utility::HydraWeight<Runtime>;
+	type WeightInfo = weights::pallet_utility::HydraWeight<Runtime>;
 }
 
 parameter_types! {
 	pub const BasicDeposit: Balance = 5 * DOLLARS;
-	pub const FieldDeposit: Balance = DOLLARS;
+	pub const ByteDeposit: Balance = DOLLARS / 10;
 	pub const SubAccountDeposit: Balance = 5 * DOLLARS;
 	pub const MaxSubAccounts: u32 = 100;
 	pub const MaxAdditionalFields: u32 = 100;
 	pub const MaxRegistrars: u32 = 20;
+	pub const PendingUserNameExpiration: u32 = 7 * DAYS;
+	pub const MaxSuffixLength: u32 = 7;
+	pub const MaxUsernameLength: u32 = 32;
 }
 
 impl pallet_identity::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type Currency = Balances;
 	type BasicDeposit = BasicDeposit;
-	type FieldDeposit = FieldDeposit;
+	type ByteDeposit = ByteDeposit;
 	type SubAccountDeposit = SubAccountDeposit;
 	type MaxSubAccounts = MaxSubAccounts;
-	type MaxAdditionalFields = MaxAdditionalFields;
+	type IdentityInformation = pallet_identity::legacy::IdentityInfo<MaxAdditionalFields>;
 	type MaxRegistrars = MaxRegistrars;
 	type Slashed = Treasury;
 	type ForceOrigin = MoreThanHalfCouncil;
 	type RegistrarOrigin = MoreThanHalfCouncil;
-	type WeightInfo = weights::identity::HydraWeight<Runtime>;
+	type OffchainSignature = Signature;
+	type SigningPublicKey = <Signature as sp_runtime::traits::Verify>::Signer;
+	type UsernameAuthorityOrigin = EnsureRoot<AccountId>;
+	type PendingUsernameExpiration = PendingUserNameExpiration;
+	type MaxSuffixLength = MaxSuffixLength;
+	type MaxUsernameLength = MaxUsernameLength;
+	type WeightInfo = weights::pallet_identity::HydraWeight<Runtime>;
 }
 
 /// The type used to represent the kinds of proxying allowed.
@@ -392,7 +406,7 @@ impl pallet_proxy::Config for Runtime {
 	type ProxyDepositBase = ProxyDepositBase;
 	type ProxyDepositFactor = ProxyDepositFactor;
 	type MaxProxies = MaxProxies;
-	type WeightInfo = weights::proxy::HydraWeight<Runtime>;
+	type WeightInfo = weights::pallet_proxy::HydraWeight<Runtime>;
 	type MaxPending = MaxPending;
 	type CallHasher = BlakeTwo256;
 	type AnnouncementDepositBase = AnnouncementDepositBase;
@@ -412,7 +426,7 @@ impl pallet_multisig::Config for Runtime {
 	type DepositBase = DepositBase;
 	type DepositFactor = DepositFactor;
 	type MaxSignatories = MaxSignatories;
-	type WeightInfo = ();
+	type WeightInfo = weights::pallet_multisig::HydraWeight<Runtime>;
 }
 
 impl pallet_genesis_history::Config for Runtime {}
@@ -482,7 +496,7 @@ impl pallet_transaction_multi_payment::Config for Runtime {
 	type Currencies = Currencies;
 	type RouteProvider = Router;
 	type OraclePriceProvider = OraclePriceProvider<AssetId, EmaOracle, LRNA>;
-	type WeightInfo = weights::payment::HydraWeight<Runtime>;
+	type WeightInfo = weights::pallet_transaction_multi_payment::HydraWeight<Runtime>;
 	type NativeAssetId = NativeAssetId;
 	type EvmAssetId = evm::WethAssetId;
 	type InspectEvmAccounts = EVMAccounts;
@@ -530,7 +544,7 @@ impl pallet_collator_rewards::Config for Runtime {
 impl pallet_transaction_pause::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type UpdateOrigin = SuperMajorityTechCommittee;
-	type WeightInfo = weights::transaction_pause::HydraWeight<Runtime>;
+	type WeightInfo = weights::pallet_transaction_pause::HydraWeight<Runtime>;
 }
 
 pub struct TechCommAccounts;
@@ -549,11 +563,15 @@ parameter_types! {
 
 impl pallet_state_trie_migration::Config for Runtime {
 	type ControlOrigin = SuperMajorityTechCommittee;
-	type SignedFilter = EnsureSignedBy<TechCommAccounts, AccountId>;
+	#[cfg(not(feature = "runtime-benchmarks"))]
+	type SignedFilter = frame_system::EnsureSignedBy<TechCommAccounts, AccountId>;
+	#[cfg(feature = "runtime-benchmarks")]
+	type SignedFilter = frame_system::EnsureSigned<Self::AccountId>;
 	type RuntimeEvent = RuntimeEvent;
 	type Currency = Balances;
+	type RuntimeHoldReason = RuntimeHoldReason;
 	type MaxKeyLen = MaxKeyLen;
 	type SignedDepositPerItem = MigrationSignedDepositPerItem;
 	type SignedDepositBase = MigrationSignedDepositBase;
-	type WeightInfo = weights::state_trie::HydraWeight<Runtime>;
+	type WeightInfo = weights::pallet_state_trie_migration::HydraWeight<Runtime>;
 }
diff --git a/runtime/hydradx/src/tests.rs b/runtime/hydradx/src/tests.rs
index 0367d2097..7c975f228 100644
--- a/runtime/hydradx/src/tests.rs
+++ b/runtime/hydradx/src/tests.rs
@@ -49,7 +49,7 @@ fn extrinsic_base_fee_is_correct() {
 #[ignore]
 // Useful to calculate how much single transfer costs in native currency with fee components breakdown
 fn transfer_cost() {
-	let call = pallet_balances::Call::<Runtime>::transfer {
+	let call = pallet_balances::Call::<Runtime>::transfer_allow_death {
 		dest: AccountId::new([0; 32]),
 		value: Default::default(),
 	};
diff --git a/runtime/hydradx/src/weights/collator_selection.rs b/runtime/hydradx/src/weights/collator_selection.rs
deleted file mode 100644
index efb4407a0..000000000
--- a/runtime/hydradx/src/weights/collator_selection.rs
+++ /dev/null
@@ -1,214 +0,0 @@
-// This file is part of HydraDX.
-
-// Copyright (C) 2020-2023  Intergalactic, Limited (GIB).
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! Autogenerated weights for `pallet_collator_selection`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-02-15, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: 1024
-
-// Executed Command:
-// target/release/hydradx
-// benchmark
-// pallet
-// --chain=dev
-// --steps=10
-// --repeat=30
-// --wasm-execution=compiled
-// --heap-pages=4096
-// --template=.maintain/pallet-weight-template-no-back.hbs
-// --pallet=pallet_collator_selection
-// --output=./weights/collator_selection.rs
-// --extrinsic=*
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `pallet_collator_selection`.
-pub struct HydraWeight<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_collator_selection::WeightInfo for HydraWeight<T> {
-	/// Storage: `Session::NextKeys` (r:50 w:0)
-	/// Proof: `Session::NextKeys` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// Storage: `CollatorSelection::Invulnerables` (r:0 w:1)
-	/// Proof: `CollatorSelection::Invulnerables` (`max_values`: Some(1), `max_size`: Some(1601), added: 2096, mode: `MaxEncodedLen`)
-	/// The range of component `b` is `[1, 50]`.
-	fn set_invulnerables(b: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `205 + b * (79 ±0)`
-		//  Estimated: `1194 + b * (2554 ±0)`
-		// Minimum execution time: 20_628_000 picoseconds.
-		Weight::from_parts(19_568_734, 1194)
-			// Standard Error: 7_340
-			.saturating_add(Weight::from_parts(3_478_925, 0).saturating_mul(b.into()))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(b.into())))
-			.saturating_add(T::DbWeight::get().writes(1))
-			.saturating_add(Weight::from_parts(0, 2554).saturating_mul(b.into()))
-	}
-	/// Storage: `Session::NextKeys` (r:1 w:0)
-	/// Proof: `Session::NextKeys` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// Storage: `CollatorSelection::Invulnerables` (r:1 w:1)
-	/// Proof: `CollatorSelection::Invulnerables` (`max_values`: Some(1), `max_size`: Some(1601), added: 2096, mode: `MaxEncodedLen`)
-	/// Storage: `CollatorSelection::Candidates` (r:1 w:1)
-	/// Proof: `CollatorSelection::Candidates` (`max_values`: Some(1), `max_size`: Some(2401), added: 2896, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:1)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// The range of component `b` is `[1, 49]`.
-	/// The range of component `c` is `[1, 49]`.
-	fn add_invulnerable(b: u32, c: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1444 + b * (32 ±0) + c * (48 ±0)`
-		//  Estimated: `4909 + b * (32 ±0) + c * (48 ±0)`
-		// Minimum execution time: 62_617_000 picoseconds.
-		Weight::from_parts(62_633_538, 4909)
-			// Standard Error: 1_299
-			.saturating_add(Weight::from_parts(19_587, 0).saturating_mul(b.into()))
-			// Standard Error: 1_299
-			.saturating_add(Weight::from_parts(43_332, 0).saturating_mul(c.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(3))
-			.saturating_add(Weight::from_parts(0, 32).saturating_mul(b.into()))
-			.saturating_add(Weight::from_parts(0, 48).saturating_mul(c.into()))
-	}
-	/// Storage: `CollatorSelection::Candidates` (r:1 w:0)
-	/// Proof: `CollatorSelection::Candidates` (`max_values`: Some(1), `max_size`: Some(2401), added: 2896, mode: `MaxEncodedLen`)
-	/// Storage: `CollatorSelection::Invulnerables` (r:1 w:1)
-	/// Proof: `CollatorSelection::Invulnerables` (`max_values`: Some(1), `max_size`: Some(1601), added: 2096, mode: `MaxEncodedLen`)
-	/// The range of component `b` is `[5, 50]`.
-	fn remove_invulnerable(b: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `285 + b * (32 ±0)`
-		//  Estimated: `3886`
-		// Minimum execution time: 22_662_000 picoseconds.
-		Weight::from_parts(23_030_075, 3886)
-			// Standard Error: 939
-			.saturating_add(Weight::from_parts(41_972, 0).saturating_mul(b.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `CollatorSelection::DesiredCandidates` (r:0 w:1)
-	/// Proof: `CollatorSelection::DesiredCandidates` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	fn set_desired_candidates() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 11_095_000 picoseconds.
-		Weight::from_parts(11_241_000, 0)
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `CollatorSelection::CandidacyBond` (r:0 w:1)
-	/// Proof: `CollatorSelection::CandidacyBond` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
-	fn set_candidacy_bond() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 11_004_000 picoseconds.
-		Weight::from_parts(11_197_000, 0)
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `CollatorSelection::Candidates` (r:1 w:1)
-	/// Proof: `CollatorSelection::Candidates` (`max_values`: Some(1), `max_size`: Some(2401), added: 2896, mode: `MaxEncodedLen`)
-	/// Storage: `CollatorSelection::DesiredCandidates` (r:1 w:0)
-	/// Proof: `CollatorSelection::DesiredCandidates` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	/// Storage: `CollatorSelection::Invulnerables` (r:1 w:0)
-	/// Proof: `CollatorSelection::Invulnerables` (`max_values`: Some(1), `max_size`: Some(1601), added: 2096, mode: `MaxEncodedLen`)
-	/// Storage: `Session::NextKeys` (r:1 w:0)
-	/// Proof: `Session::NextKeys` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// Storage: `CollatorSelection::CandidacyBond` (r:1 w:0)
-	/// Proof: `CollatorSelection::CandidacyBond` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
-	/// Storage: `CollatorSelection::LastAuthoredBlock` (r:0 w:1)
-	/// Proof: `CollatorSelection::LastAuthoredBlock` (`max_values`: None, `max_size`: Some(44), added: 2519, mode: `MaxEncodedLen`)
-	/// The range of component `c` is `[1, 49]`.
-	fn register_as_candidate(c: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `730 + c * (60 ±0)`
-		//  Estimated: `4213 + c * (59 ±0)`
-		// Minimum execution time: 55_657_000 picoseconds.
-		Weight::from_parts(57_084_118, 4213)
-			// Standard Error: 2_209
-			.saturating_add(Weight::from_parts(101_671, 0).saturating_mul(c.into()))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(2))
-			.saturating_add(Weight::from_parts(0, 59).saturating_mul(c.into()))
-	}
-	/// Storage: `CollatorSelection::Candidates` (r:1 w:1)
-	/// Proof: `CollatorSelection::Candidates` (`max_values`: Some(1), `max_size`: Some(2401), added: 2896, mode: `MaxEncodedLen`)
-	/// Storage: `CollatorSelection::Invulnerables` (r:1 w:0)
-	/// Proof: `CollatorSelection::Invulnerables` (`max_values`: Some(1), `max_size`: Some(1601), added: 2096, mode: `MaxEncodedLen`)
-	/// Storage: `CollatorSelection::LastAuthoredBlock` (r:0 w:1)
-	/// Proof: `CollatorSelection::LastAuthoredBlock` (`max_values`: None, `max_size`: Some(44), added: 2519, mode: `MaxEncodedLen`)
-	/// The range of component `c` is `[3, 50]`.
-	fn leave_intent(c: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `556 + c * (50 ±0)`
-		//  Estimated: `3886`
-		// Minimum execution time: 46_120_000 picoseconds.
-		Weight::from_parts(46_397_357, 3886)
-			// Standard Error: 1_574
-			.saturating_add(Weight::from_parts(90_362, 0).saturating_mul(c.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `System::Account` (r:2 w:2)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `System::BlockWeight` (r:1 w:1)
-	/// Proof: `System::BlockWeight` (`max_values`: Some(1), `max_size`: Some(48), added: 543, mode: `MaxEncodedLen`)
-	/// Storage: `CollatorSelection::LastAuthoredBlock` (r:0 w:1)
-	/// Proof: `CollatorSelection::LastAuthoredBlock` (`max_values`: None, `max_size`: Some(44), added: 2519, mode: `MaxEncodedLen`)
-	fn note_author() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `192`
-		//  Estimated: `6196`
-		// Minimum execution time: 63_730_000 picoseconds.
-		Weight::from_parts(64_351_000, 6196)
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(4))
-	}
-	/// Storage: `CollatorSelection::Candidates` (r:1 w:0)
-	/// Proof: `CollatorSelection::Candidates` (`max_values`: Some(1), `max_size`: Some(2401), added: 2896, mode: `MaxEncodedLen`)
-	/// Storage: `CollatorSelection::LastAuthoredBlock` (r:50 w:0)
-	/// Proof: `CollatorSelection::LastAuthoredBlock` (`max_values`: None, `max_size`: Some(44), added: 2519, mode: `MaxEncodedLen`)
-	/// Storage: `CollatorSelection::Invulnerables` (r:1 w:0)
-	/// Proof: `CollatorSelection::Invulnerables` (`max_values`: Some(1), `max_size`: Some(1601), added: 2096, mode: `MaxEncodedLen`)
-	/// Storage: `System::BlockWeight` (r:1 w:1)
-	/// Proof: `System::BlockWeight` (`max_values`: Some(1), `max_size`: Some(48), added: 543, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:44 w:44)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// The range of component `r` is `[1, 50]`.
-	/// The range of component `c` is `[1, 50]`.
-	fn new_session(r: u32, c: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1276 + c * (98 ±0) + r * (116 ±0)`
-		//  Estimated: `3886 + c * (2519 ±0) + r * (2603 ±0)`
-		// Minimum execution time: 28_836_000 picoseconds.
-		Weight::from_parts(29_061_000, 3886)
-			// Standard Error: 714_438
-			.saturating_add(Weight::from_parts(16_538_136, 0).saturating_mul(c.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(c.into())))
-			.saturating_add(T::DbWeight::get().writes(1))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(c.into())))
-			.saturating_add(Weight::from_parts(0, 2519).saturating_mul(c.into()))
-			.saturating_add(Weight::from_parts(0, 2603).saturating_mul(r.into()))
-	}
-}
\ No newline at end of file
diff --git a/runtime/hydradx/src/weights/cumulus_pallet_parachain_system.rs b/runtime/hydradx/src/weights/cumulus_pallet_parachain_system.rs
new file mode 100644
index 000000000..40fe12423
--- /dev/null
+++ b/runtime/hydradx/src/weights/cumulus_pallet_parachain_system.rs
@@ -0,0 +1,83 @@
+// This file is part of HydraDX.
+
+// Copyright (C) 2020-2023  Intergalactic, Limited (GIB).
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+
+//! Autogenerated weights for `cumulus_pallet_parachain_system`
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-05-23, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! WORST CASE MAP SIZE: `1000000`
+//! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024`
+
+// Executed Command:
+// ./target/release/hydradx
+// benchmark
+// pallet
+// --wasm-execution=compiled
+// --pallet
+// *
+// --extrinsic
+// *
+// --heap-pages
+// 4096
+// --steps
+// 50
+// --repeat
+// 20
+// --template=scripts/pallet-weight-template.hbs
+// --output
+// weights/
+
+#![cfg_attr(rustfmt, rustfmt_skip)]
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+#![allow(missing_docs)]
+
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
+use core::marker::PhantomData;
+
+/// Weights for `cumulus_pallet_parachain_system`.
+pub struct WeightInfo<T>(PhantomData<T>);
+
+/// Weights for `cumulus_pallet_parachain_system` using the HydraDX node and recommended hardware.
+pub struct HydraWeight<T>(PhantomData<T>);
+impl<T: frame_system::Config> cumulus_pallet_parachain_system::WeightInfo for HydraWeight<T> {
+	/// Storage: `ParachainSystem::LastDmqMqcHead` (r:1 w:1)
+	/// Proof: `ParachainSystem::LastDmqMqcHead` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `MessageQueue::BookStateFor` (r:1 w:1)
+	/// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	/// Storage: `MessageQueue::ServiceHead` (r:1 w:1)
+	/// Proof: `MessageQueue::ServiceHead` (`max_values`: Some(1), `max_size`: Some(5), added: 500, mode: `MaxEncodedLen`)
+	/// Storage: `ParachainSystem::ProcessedDownwardMessages` (r:0 w:1)
+	/// Proof: `ParachainSystem::ProcessedDownwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `MessageQueue::Pages` (r:0 w:1000)
+	/// Proof: `MessageQueue::Pages` (`max_values`: None, `max_size`: Some(134193), added: 136668, mode: `MaxEncodedLen`)
+	/// The range of component `n` is `[0, 1000]`.
+	fn enqueue_inbound_downward_messages(n: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `152`
+		//  Estimated: `3517`
+		// Minimum execution time: 2_595_000 picoseconds.
+		Weight::from_parts(2_639_000, 3517)
+			// Standard Error: 29_324
+			.saturating_add(Weight::from_parts(333_213_013, 0).saturating_mul(n.into()))
+			.saturating_add(T::DbWeight::get().reads(3_u64))
+			.saturating_add(T::DbWeight::get().writes(4_u64))
+			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(n.into())))
+	}
+}
\ No newline at end of file
diff --git a/runtime/hydradx/src/weights/cumulus_pallet_xcmp_queue.rs b/runtime/hydradx/src/weights/cumulus_pallet_xcmp_queue.rs
new file mode 100644
index 000000000..6b9dd8d79
--- /dev/null
+++ b/runtime/hydradx/src/weights/cumulus_pallet_xcmp_queue.rs
@@ -0,0 +1,165 @@
+// This file is part of HydraDX.
+
+// Copyright (C) 2020-2023  Intergalactic, Limited (GIB).
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+
+//! Autogenerated weights for `cumulus_pallet_xcmp_queue`
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-05-23, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! WORST CASE MAP SIZE: `1000000`
+//! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024`
+
+// Executed Command:
+// ./target/release/hydradx
+// benchmark
+// pallet
+// --wasm-execution=compiled
+// --pallet
+// *
+// --extrinsic
+// *
+// --heap-pages
+// 4096
+// --steps
+// 50
+// --repeat
+// 20
+// --template=scripts/pallet-weight-template.hbs
+// --output
+// weights/
+
+#![cfg_attr(rustfmt, rustfmt_skip)]
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+#![allow(missing_docs)]
+
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
+use core::marker::PhantomData;
+
+/// Weights for `cumulus_pallet_xcmp_queue`.
+pub struct WeightInfo<T>(PhantomData<T>);
+
+/// Weights for `cumulus_pallet_xcmp_queue` using the HydraDX node and recommended hardware.
+pub struct HydraWeight<T>(PhantomData<T>);
+impl<T: frame_system::Config> cumulus_pallet_xcmp_queue::WeightInfo for HydraWeight<T> {
+	/// Storage: `XcmpQueue::QueueConfig` (r:1 w:1)
+	/// Proof: `XcmpQueue::QueueConfig` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	fn set_config_with_u32() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `142`
+		//  Estimated: `1627`
+		// Minimum execution time: 5_674_000 picoseconds.
+		Weight::from_parts(5_888_000, 1627)
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
+	}
+	/// Storage: `XcmpQueue::QueueConfig` (r:1 w:0)
+	/// Proof: `XcmpQueue::QueueConfig` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `MessageQueue::BookStateFor` (r:1 w:1)
+	/// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	/// Storage: `MessageQueue::ServiceHead` (r:1 w:1)
+	/// Proof: `MessageQueue::ServiceHead` (`max_values`: Some(1), `max_size`: Some(5), added: 500, mode: `MaxEncodedLen`)
+	/// Storage: `XcmpQueue::InboundXcmpSuspended` (r:1 w:0)
+	/// Proof: `XcmpQueue::InboundXcmpSuspended` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `MessageQueue::Pages` (r:0 w:1)
+	/// Proof: `MessageQueue::Pages` (`max_values`: None, `max_size`: Some(134193), added: 136668, mode: `MaxEncodedLen`)
+	fn enqueue_xcmp_message() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `218`
+		//  Estimated: `3517`
+		// Minimum execution time: 15_775_000 picoseconds.
+		Weight::from_parts(16_085_000, 3517)
+			.saturating_add(T::DbWeight::get().reads(4_u64))
+			.saturating_add(T::DbWeight::get().writes(3_u64))
+	}
+	/// Storage: `XcmpQueue::OutboundXcmpStatus` (r:1 w:1)
+	/// Proof: `XcmpQueue::OutboundXcmpStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	fn suspend_channel() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `142`
+		//  Estimated: `1627`
+		// Minimum execution time: 3_240_000 picoseconds.
+		Weight::from_parts(3_353_000, 1627)
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
+	}
+	/// Storage: `XcmpQueue::OutboundXcmpStatus` (r:1 w:1)
+	/// Proof: `XcmpQueue::OutboundXcmpStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	fn resume_channel() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `177`
+		//  Estimated: `1662`
+		// Minimum execution time: 3_923_000 picoseconds.
+		Weight::from_parts(4_120_000, 1662)
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
+	}
+	fn take_first_concatenated_xcm() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `0`
+		//  Estimated: `0`
+		// Minimum execution time: 9_208_000 picoseconds.
+		Weight::from_parts(9_370_000, 0)
+	}
+	/// Storage: UNKNOWN KEY `0x7b3237373ffdfeb1cab4222e3b520d6b345d8e88afa015075c945637c07e8f20` (r:1 w:1)
+	/// Proof: UNKNOWN KEY `0x7b3237373ffdfeb1cab4222e3b520d6b345d8e88afa015075c945637c07e8f20` (r:1 w:1)
+	/// Storage: UNKNOWN KEY `0x7b3237373ffdfeb1cab4222e3b520d6bedc49980ba3aa32b0a189290fd036649` (r:1 w:1)
+	/// Proof: UNKNOWN KEY `0x7b3237373ffdfeb1cab4222e3b520d6bedc49980ba3aa32b0a189290fd036649` (r:1 w:1)
+	/// Storage: `MessageQueue::BookStateFor` (r:1 w:1)
+	/// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	/// Storage: `MessageQueue::ServiceHead` (r:1 w:1)
+	/// Proof: `MessageQueue::ServiceHead` (`max_values`: Some(1), `max_size`: Some(5), added: 500, mode: `MaxEncodedLen`)
+	/// Storage: `XcmpQueue::QueueConfig` (r:1 w:0)
+	/// Proof: `XcmpQueue::QueueConfig` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `XcmpQueue::InboundXcmpSuspended` (r:1 w:0)
+	/// Proof: `XcmpQueue::InboundXcmpSuspended` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `MessageQueue::Pages` (r:0 w:1)
+	/// Proof: `MessageQueue::Pages` (`max_values`: None, `max_size`: Some(134193), added: 136668, mode: `MaxEncodedLen`)
+	fn on_idle_good_msg() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `134455`
+		//  Estimated: `137920`
+		// Minimum execution time: 204_087_000 picoseconds.
+		Weight::from_parts(205_689_000, 137920)
+			.saturating_add(T::DbWeight::get().reads(6_u64))
+			.saturating_add(T::DbWeight::get().writes(5_u64))
+	}
+	/// Storage: UNKNOWN KEY `0x7b3237373ffdfeb1cab4222e3b520d6b345d8e88afa015075c945637c07e8f20` (r:1 w:1)
+	/// Proof: UNKNOWN KEY `0x7b3237373ffdfeb1cab4222e3b520d6b345d8e88afa015075c945637c07e8f20` (r:1 w:1)
+	/// Storage: UNKNOWN KEY `0x7b3237373ffdfeb1cab4222e3b520d6bedc49980ba3aa32b0a189290fd036649` (r:1 w:1)
+	/// Proof: UNKNOWN KEY `0x7b3237373ffdfeb1cab4222e3b520d6bedc49980ba3aa32b0a189290fd036649` (r:1 w:1)
+	/// Storage: `MessageQueue::BookStateFor` (r:1 w:1)
+	/// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	/// Storage: `MessageQueue::ServiceHead` (r:1 w:1)
+	/// Proof: `MessageQueue::ServiceHead` (`max_values`: Some(1), `max_size`: Some(5), added: 500, mode: `MaxEncodedLen`)
+	/// Storage: `XcmpQueue::QueueConfig` (r:1 w:0)
+	/// Proof: `XcmpQueue::QueueConfig` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `XcmpQueue::InboundXcmpSuspended` (r:1 w:0)
+	/// Proof: `XcmpQueue::InboundXcmpSuspended` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `MessageQueue::Pages` (r:0 w:1)
+	/// Proof: `MessageQueue::Pages` (`max_values`: None, `max_size`: Some(134193), added: 136668, mode: `MaxEncodedLen`)
+	fn on_idle_large_msg() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `65852`
+		//  Estimated: `69317`
+		// Minimum execution time: 116_628_000 picoseconds.
+		Weight::from_parts(117_388_000, 69317)
+			.saturating_add(T::DbWeight::get().reads(6_u64))
+			.saturating_add(T::DbWeight::get().writes(5_u64))
+	}
+}
\ No newline at end of file
diff --git a/runtime/hydradx/src/weights/dynamic_evm_fee.rs b/runtime/hydradx/src/weights/dynamic_evm_fee.rs
deleted file mode 100644
index dad1ab154..000000000
--- a/runtime/hydradx/src/weights/dynamic_evm_fee.rs
+++ /dev/null
@@ -1,74 +0,0 @@
-// This file is part of HydraDX.
-
-// Copyright (C) 2020-2023  Intergalactic, Limited (GIB).
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! Autogenerated weights for `pallet_dynamic_evm_fee`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-02-23, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: 1024
-
-// Executed Command:
-// target/release/hydradx
-// benchmark
-// pallet
-// --chain=dev
-// --steps=10
-// --repeat=30
-// --wasm-execution=compiled
-// --heap-pages=4096
-// --template=.maintain/pallet-weight-template-no-back.hbs
-// --pallet=pallet-dynamic-evm-fee
-// --output=dyn.rs
-// --extrinsic=*
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `pallet_dynamic_evm_fee`.
-pub struct HydraWeight<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_dynamic_evm_fee::WeightInfo for HydraWeight<T> {
-    /// Storage: `DynamicEvmFee::BaseFeePerGas` (r:1 w:1)
-    /// Proof: `DynamicEvmFee::BaseFeePerGas` (`max_values`: Some(1), `max_size`: Some(32), added: 527, mode: `MaxEncodedLen`)
-    /// Storage: `TransactionPayment::NextFeeMultiplier` (r:1 w:0)
-    /// Proof: `TransactionPayment::NextFeeMultiplier` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
-    /// Storage: `AssetRegistry::NextAssetId` (r:1 w:0)
-    /// Proof: `AssetRegistry::NextAssetId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-    /// Storage: `AssetRegistry::LocationAssets` (r:1 w:0)
-    /// Proof: `AssetRegistry::LocationAssets` (`max_values`: None, `max_size`: Some(622), added: 3097, mode: `MaxEncodedLen`)
-    /// Storage: `MultiTransactionPayment::AcceptedCurrencies` (r:1 w:0)
-    /// Proof: `MultiTransactionPayment::AcceptedCurrencies` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
-    /// Storage: `Router::Routes` (r:1 w:0)
-    /// Proof: `Router::Routes` (`max_values`: None, `max_size`: Some(90), added: 2565, mode: `MaxEncodedLen`)
-    /// Storage: `EmaOracle::Oracles` (r:4 w:0)
-    /// Proof: `EmaOracle::Oracles` (`max_values`: None, `max_size`: Some(177), added: 2652, mode: `MaxEncodedLen`)
-    fn on_initialize() -> Weight {
-        // Proof Size summary in bytes:
-        //  Measured:  `2709`
-        //  Estimated: `11598`
-        // Minimum execution time: 73_589_000 picoseconds.
-        Weight::from_parts(74_453_000, 11598)
-            .saturating_add(T::DbWeight::get().reads(10))
-            .saturating_add(T::DbWeight::get().writes(1))
-    }
-}
\ No newline at end of file
diff --git a/runtime/hydradx/src/weights/system.rs b/runtime/hydradx/src/weights/frame_system.rs
similarity index 53%
rename from runtime/hydradx/src/weights/system.rs
rename to runtime/hydradx/src/weights/frame_system.rs
index 57270ed7c..72d4f547c 100644
--- a/runtime/hydradx/src/weights/system.rs
+++ b/runtime/hydradx/src/weights/frame_system.rs
@@ -15,37 +15,46 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+
 //! Autogenerated weights for `frame_system`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-02-15, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-05-23, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: 1024
+//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024`
 
 // Executed Command:
-// target/release/hydradx
+// ./target/release/hydradx
 // benchmark
 // pallet
-// --chain=dev
-// --steps=10
-// --repeat=30
 // --wasm-execution=compiled
-// --heap-pages=4096
-// --template=.maintain/pallet-weight-template-no-back.hbs
-// --pallet=frame-system
-// --output=./weights/system.rs
-// --extrinsic=*
+// --pallet
+// *
+// --extrinsic
+// *
+// --heap-pages
+// 4096
+// --steps
+// 50
+// --repeat
+// 20
+// --template=scripts/pallet-weight-template.hbs
+// --output
+// weights/
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
 #![allow(missing_docs)]
 
-use frame_support::{traits::Get, weights::Weight};
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
 use core::marker::PhantomData;
 
-/// Weight functions for `frame_system`.
+/// Weights for `frame_system`.
+pub struct WeightInfo<T>(PhantomData<T>);
+
+/// Weights for `frame_system` using the HydraDX node and recommended hardware.
 pub struct HydraWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> frame_system::WeightInfo for HydraWeight<T> {
 	/// The range of component `b` is `[0, 3932160]`.
@@ -53,20 +62,20 @@ impl<T: frame_system::Config> frame_system::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 3_612_000 picoseconds.
-		Weight::from_parts(3_700_000, 0)
+		// Minimum execution time: 2_952_000 picoseconds.
+		Weight::from_parts(2_985_000, 0)
 			// Standard Error: 0
-			.saturating_add(Weight::from_parts(406, 0).saturating_mul(b.into()))
+			.saturating_add(Weight::from_parts(410, 0).saturating_mul(b.into()))
 	}
 	/// The range of component `b` is `[0, 3932160]`.
 	fn remark_with_event(b: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 11_260_000 picoseconds.
-		Weight::from_parts(11_496_000, 0)
-			// Standard Error: 1
-			.saturating_add(Weight::from_parts(1_444, 0).saturating_mul(b.into()))
+		// Minimum execution time: 7_401_000 picoseconds.
+		Weight::from_parts(7_577_000, 0)
+			// Standard Error: 0
+			.saturating_add(Weight::from_parts(1_433, 0).saturating_mul(b.into()))
 	}
 	/// Storage: `System::Digest` (r:1 w:1)
 	/// Proof: `System::Digest` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
@@ -76,10 +85,10 @@ impl<T: frame_system::Config> frame_system::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `1485`
-		// Minimum execution time: 6_621_000 picoseconds.
-		Weight::from_parts(6_809_000, 1485)
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(2))
+		// Minimum execution time: 5_067_000 picoseconds.
+		Weight::from_parts(5_260_000, 1485)
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
 	/// Storage: `ParachainSystem::ValidationData` (r:1 w:0)
 	/// Proof: `ParachainSystem::ValidationData` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
@@ -97,10 +106,10 @@ impl<T: frame_system::Config> frame_system::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `198`
 		//  Estimated: `1683`
-		// Minimum execution time: 117_242_692_000 picoseconds.
-		Weight::from_parts(118_784_037_000, 1683)
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(3))
+		// Minimum execution time: 120_537_211_000 picoseconds.
+		Weight::from_parts(121_688_931_000, 1683)
+			.saturating_add(T::DbWeight::get().reads(4_u64))
+			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
 	/// Proof: `Skipped::Metadata` (`max_values`: None, `max_size`: None, mode: `Measured`)
@@ -109,10 +118,10 @@ impl<T: frame_system::Config> frame_system::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 3_808_000 picoseconds.
-		Weight::from_parts(3_867_000, 0)
-			// Standard Error: 3_843
-			.saturating_add(Weight::from_parts(894_266, 0).saturating_mul(i.into()))
+		// Minimum execution time: 2_967_000 picoseconds.
+		Weight::from_parts(3_024_000, 0)
+			// Standard Error: 1_792
+			.saturating_add(Weight::from_parts(846_447, 0).saturating_mul(i.into()))
 			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(i.into())))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
@@ -122,10 +131,10 @@ impl<T: frame_system::Config> frame_system::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 3_791_000 picoseconds.
-		Weight::from_parts(3_854_000, 0)
-			// Standard Error: 1_362
-			.saturating_add(Weight::from_parts(614_354, 0).saturating_mul(i.into()))
+		// Minimum execution time: 2_951_000 picoseconds.
+		Weight::from_parts(2_997_000, 0)
+			// Standard Error: 763
+			.saturating_add(Weight::from_parts(582_917, 0).saturating_mul(i.into()))
 			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(i.into())))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
@@ -133,14 +142,47 @@ impl<T: frame_system::Config> frame_system::WeightInfo for HydraWeight<T> {
 	/// The range of component `p` is `[0, 1000]`.
 	fn kill_prefix(p: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `119 + p * (69 ±0)`
-		//  Estimated: `130 + p * (70 ±0)`
-		// Minimum execution time: 7_002_000 picoseconds.
-		Weight::from_parts(7_100_000, 130)
-			// Standard Error: 1_619
-			.saturating_add(Weight::from_parts(1_101_962, 0).saturating_mul(p.into()))
+		//  Measured:  `173 + p * (69 ±0)`
+		//  Estimated: `153 + p * (70 ±0)`
+		// Minimum execution time: 5_739_000 picoseconds.
+		Weight::from_parts(5_865_000, 153)
+			// Standard Error: 892
+			.saturating_add(Weight::from_parts(1_034_334, 0).saturating_mul(p.into()))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(p.into())))
 			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(p.into())))
 			.saturating_add(Weight::from_parts(0, 70).saturating_mul(p.into()))
 	}
+	/// Storage: `System::AuthorizedUpgrade` (r:0 w:1)
+	/// Proof: `System::AuthorizedUpgrade` (`max_values`: Some(1), `max_size`: Some(33), added: 528, mode: `MaxEncodedLen`)
+	fn authorize_upgrade() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `0`
+		//  Estimated: `0`
+		// Minimum execution time: 10_017_000 picoseconds.
+		Weight::from_parts(10_283_000, 0)
+			.saturating_add(T::DbWeight::get().writes(1_u64))
+	}
+	/// Storage: `System::AuthorizedUpgrade` (r:1 w:1)
+	/// Proof: `System::AuthorizedUpgrade` (`max_values`: Some(1), `max_size`: Some(33), added: 528, mode: `MaxEncodedLen`)
+	/// Storage: `ParachainSystem::ValidationData` (r:1 w:0)
+	/// Proof: `ParachainSystem::ValidationData` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `ParachainSystem::UpgradeRestrictionSignal` (r:1 w:0)
+	/// Proof: `ParachainSystem::UpgradeRestrictionSignal` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `ParachainSystem::PendingValidationCode` (r:1 w:1)
+	/// Proof: `ParachainSystem::PendingValidationCode` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `ParachainSystem::HostConfiguration` (r:1 w:0)
+	/// Proof: `ParachainSystem::HostConfiguration` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `ParachainSystem::NewValidationCode` (r:0 w:1)
+	/// Proof: `ParachainSystem::NewValidationCode` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `ParachainSystem::DidSetValidationCode` (r:0 w:1)
+	/// Proof: `ParachainSystem::DidSetValidationCode` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	fn apply_authorized_upgrade() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `220`
+		//  Estimated: `1705`
+		// Minimum execution time: 120_705_546_000 picoseconds.
+		Weight::from_parts(122_782_260_000, 1705)
+			.saturating_add(T::DbWeight::get().reads(5_u64))
+			.saturating_add(T::DbWeight::get().writes(4_u64))
+	}
 }
\ No newline at end of file
diff --git a/runtime/hydradx/src/weights/identity.rs b/runtime/hydradx/src/weights/identity.rs
deleted file mode 100644
index 7144de19c..000000000
--- a/runtime/hydradx/src/weights/identity.rs
+++ /dev/null
@@ -1,341 +0,0 @@
-// This file is part of HydraDX.
-
-// Copyright (C) 2020-2023  Intergalactic, Limited (GIB).
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! Autogenerated weights for `pallet_identity`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-02-15, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: 1024
-
-// Executed Command:
-// target/release/hydradx
-// benchmark
-// pallet
-// --chain=dev
-// --steps=10
-// --repeat=30
-// --wasm-execution=compiled
-// --heap-pages=4096
-// --template=.maintain/pallet-weight-template-no-back.hbs
-// --pallet=pallet-identity
-// --output=./weights/identity.rs
-// --extrinsic=*
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `pallet_identity`.
-pub struct HydraWeight<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_identity::WeightInfo for HydraWeight<T> {
-	/// Storage: `Identity::Registrars` (r:1 w:1)
-	/// Proof: `Identity::Registrars` (`max_values`: Some(1), `max_size`: Some(1141), added: 1636, mode: `MaxEncodedLen`)
-	/// The range of component `r` is `[1, 19]`.
-	fn add_registrar(r: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `32 + r * (57 ±0)`
-		//  Estimated: `2626`
-		// Minimum execution time: 17_261_000 picoseconds.
-		Weight::from_parts(18_025_223, 2626)
-			// Standard Error: 3_087
-			.saturating_add(Weight::from_parts(88_219, 0).saturating_mul(r.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Identity::IdentityOf` (r:1 w:1)
-	/// Proof: `Identity::IdentityOf` (`max_values`: None, `max_size`: Some(7538), added: 10013, mode: `MaxEncodedLen`)
-	/// The range of component `r` is `[1, 20]`.
-	/// The range of component `x` is `[0, 100]`.
-	fn set_identity(r: u32, x: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `442 + r * (5 ±0)`
-		//  Estimated: `11003`
-		// Minimum execution time: 44_163_000 picoseconds.
-		Weight::from_parts(42_727_355, 11003)
-			// Standard Error: 4_678
-			.saturating_add(Weight::from_parts(103_190, 0).saturating_mul(r.into()))
-			// Standard Error: 897
-			.saturating_add(Weight::from_parts(697_595, 0).saturating_mul(x.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Identity::IdentityOf` (r:1 w:0)
-	/// Proof: `Identity::IdentityOf` (`max_values`: None, `max_size`: Some(7538), added: 10013, mode: `MaxEncodedLen`)
-	/// Storage: `Identity::SubsOf` (r:1 w:1)
-	/// Proof: `Identity::SubsOf` (`max_values`: None, `max_size`: Some(3258), added: 5733, mode: `MaxEncodedLen`)
-	/// Storage: `Identity::SuperOf` (r:100 w:100)
-	/// Proof: `Identity::SuperOf` (`max_values`: None, `max_size`: Some(114), added: 2589, mode: `MaxEncodedLen`)
-	/// The range of component `s` is `[0, 100]`.
-	fn set_subs_new(s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `101`
-		//  Estimated: `11003 + s * (2589 ±0)`
-		// Minimum execution time: 14_699_000 picoseconds.
-		Weight::from_parts(29_345_813, 11003)
-			// Standard Error: 14_245
-			.saturating_add(Weight::from_parts(4_057_797, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(s.into())))
-			.saturating_add(T::DbWeight::get().writes(1))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s.into())))
-			.saturating_add(Weight::from_parts(0, 2589).saturating_mul(s.into()))
-	}
-	/// Storage: `Identity::IdentityOf` (r:1 w:0)
-	/// Proof: `Identity::IdentityOf` (`max_values`: None, `max_size`: Some(7538), added: 10013, mode: `MaxEncodedLen`)
-	/// Storage: `Identity::SubsOf` (r:1 w:1)
-	/// Proof: `Identity::SubsOf` (`max_values`: None, `max_size`: Some(3258), added: 5733, mode: `MaxEncodedLen`)
-	/// Storage: `Identity::SuperOf` (r:0 w:100)
-	/// Proof: `Identity::SuperOf` (`max_values`: None, `max_size`: Some(114), added: 2589, mode: `MaxEncodedLen`)
-	/// The range of component `p` is `[0, 100]`.
-	fn set_subs_old(p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `193 + p * (32 ±0)`
-		//  Estimated: `11003`
-		// Minimum execution time: 14_679_000 picoseconds.
-		Weight::from_parts(27_894_942, 11003)
-			// Standard Error: 12_742
-			.saturating_add(Weight::from_parts(1_675_500, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(p.into())))
-	}
-	/// Storage: `Identity::SubsOf` (r:1 w:1)
-	/// Proof: `Identity::SubsOf` (`max_values`: None, `max_size`: Some(3258), added: 5733, mode: `MaxEncodedLen`)
-	/// Storage: `Identity::IdentityOf` (r:1 w:1)
-	/// Proof: `Identity::IdentityOf` (`max_values`: None, `max_size`: Some(7538), added: 10013, mode: `MaxEncodedLen`)
-	/// Storage: `Identity::SuperOf` (r:0 w:100)
-	/// Proof: `Identity::SuperOf` (`max_values`: None, `max_size`: Some(114), added: 2589, mode: `MaxEncodedLen`)
-	/// The range of component `r` is `[1, 20]`.
-	/// The range of component `s` is `[0, 100]`.
-	/// The range of component `x` is `[0, 100]`.
-	fn clear_identity(r: u32, s: u32, x: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `468 + r * (5 ±0) + s * (32 ±0) + x * (66 ±0)`
-		//  Estimated: `11003`
-		// Minimum execution time: 78_695_000 picoseconds.
-		Weight::from_parts(41_668_144, 11003)
-			// Standard Error: 7_894
-			.saturating_add(Weight::from_parts(85_933, 0).saturating_mul(r.into()))
-			// Standard Error: 1_517
-			.saturating_add(Weight::from_parts(1_590_914, 0).saturating_mul(s.into()))
-			// Standard Error: 1_517
-			.saturating_add(Weight::from_parts(375_705, 0).saturating_mul(x.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s.into())))
-	}
-	/// Storage: `Identity::Registrars` (r:1 w:0)
-	/// Proof: `Identity::Registrars` (`max_values`: Some(1), `max_size`: Some(1141), added: 1636, mode: `MaxEncodedLen`)
-	/// Storage: `Identity::IdentityOf` (r:1 w:1)
-	/// Proof: `Identity::IdentityOf` (`max_values`: None, `max_size`: Some(7538), added: 10013, mode: `MaxEncodedLen`)
-	/// The range of component `r` is `[1, 20]`.
-	/// The range of component `x` is `[0, 100]`.
-	fn request_judgement(r: u32, x: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `365 + r * (57 ±0) + x * (66 ±0)`
-		//  Estimated: `11003`
-		// Minimum execution time: 44_784_000 picoseconds.
-		Weight::from_parts(43_971_070, 11003)
-			// Standard Error: 5_047
-			.saturating_add(Weight::from_parts(80_761, 0).saturating_mul(r.into()))
-			// Standard Error: 968
-			.saturating_add(Weight::from_parts(702_450, 0).saturating_mul(x.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Identity::IdentityOf` (r:1 w:1)
-	/// Proof: `Identity::IdentityOf` (`max_values`: None, `max_size`: Some(7538), added: 10013, mode: `MaxEncodedLen`)
-	/// The range of component `r` is `[1, 20]`.
-	/// The range of component `x` is `[0, 100]`.
-	fn cancel_request(r: u32, x: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `396 + x * (66 ±0)`
-		//  Estimated: `11003`
-		// Minimum execution time: 41_076_000 picoseconds.
-		Weight::from_parts(40_739_871, 11003)
-			// Standard Error: 6_026
-			.saturating_add(Weight::from_parts(54_796, 0).saturating_mul(r.into()))
-			// Standard Error: 1_156
-			.saturating_add(Weight::from_parts(702_783, 0).saturating_mul(x.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Identity::Registrars` (r:1 w:1)
-	/// Proof: `Identity::Registrars` (`max_values`: Some(1), `max_size`: Some(1141), added: 1636, mode: `MaxEncodedLen`)
-	/// The range of component `r` is `[1, 19]`.
-	fn set_fee(r: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `89 + r * (57 ±0)`
-		//  Estimated: `2626`
-		// Minimum execution time: 11_308_000 picoseconds.
-		Weight::from_parts(11_832_550, 2626)
-			// Standard Error: 2_040
-			.saturating_add(Weight::from_parts(72_446, 0).saturating_mul(r.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Identity::Registrars` (r:1 w:1)
-	/// Proof: `Identity::Registrars` (`max_values`: Some(1), `max_size`: Some(1141), added: 1636, mode: `MaxEncodedLen`)
-	/// The range of component `r` is `[1, 19]`.
-	fn set_account_id(r: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `89 + r * (57 ±0)`
-		//  Estimated: `2626`
-		// Minimum execution time: 11_782_000 picoseconds.
-		Weight::from_parts(12_164_081, 2626)
-			// Standard Error: 1_710
-			.saturating_add(Weight::from_parts(69_398, 0).saturating_mul(r.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Identity::Registrars` (r:1 w:1)
-	/// Proof: `Identity::Registrars` (`max_values`: Some(1), `max_size`: Some(1141), added: 1636, mode: `MaxEncodedLen`)
-	/// The range of component `r` is `[1, 19]`.
-	fn set_fields(r: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `89 + r * (57 ±0)`
-		//  Estimated: `2626`
-		// Minimum execution time: 11_490_000 picoseconds.
-		Weight::from_parts(11_819_190, 2626)
-			// Standard Error: 1_612
-			.saturating_add(Weight::from_parts(65_269, 0).saturating_mul(r.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Identity::Registrars` (r:1 w:0)
-	/// Proof: `Identity::Registrars` (`max_values`: Some(1), `max_size`: Some(1141), added: 1636, mode: `MaxEncodedLen`)
-	/// Storage: `Identity::IdentityOf` (r:1 w:1)
-	/// Proof: `Identity::IdentityOf` (`max_values`: None, `max_size`: Some(7538), added: 10013, mode: `MaxEncodedLen`)
-	/// The range of component `r` is `[1, 19]`.
-	/// The range of component `x` is `[0, 100]`.
-	fn provide_judgement(r: u32, x: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `443 + r * (57 ±0) + x * (66 ±0)`
-		//  Estimated: `11003`
-		// Minimum execution time: 32_212_000 picoseconds.
-		Weight::from_parts(30_951_168, 11003)
-			// Standard Error: 5_657
-			.saturating_add(Weight::from_parts(98_160, 0).saturating_mul(r.into()))
-			// Standard Error: 1_016
-			.saturating_add(Weight::from_parts(1_087_740, 0).saturating_mul(x.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Identity::SubsOf` (r:1 w:1)
-	/// Proof: `Identity::SubsOf` (`max_values`: None, `max_size`: Some(3258), added: 5733, mode: `MaxEncodedLen`)
-	/// Storage: `Identity::IdentityOf` (r:1 w:1)
-	/// Proof: `Identity::IdentityOf` (`max_values`: None, `max_size`: Some(7538), added: 10013, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:2 w:2)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `Identity::SuperOf` (r:0 w:100)
-	/// Proof: `Identity::SuperOf` (`max_values`: None, `max_size`: Some(114), added: 2589, mode: `MaxEncodedLen`)
-	/// The range of component `r` is `[1, 20]`.
-	/// The range of component `s` is `[0, 100]`.
-	/// The range of component `x` is `[0, 100]`.
-	fn kill_identity(r: u32, s: u32, x: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `760 + r * (16 ±0) + s * (32 ±0) + x * (66 ±0)`
-		//  Estimated: `11003`
-		// Minimum execution time: 102_051_000 picoseconds.
-		Weight::from_parts(67_588_586, 11003)
-			// Standard Error: 12_409
-			.saturating_add(Weight::from_parts(167_208, 0).saturating_mul(r.into()))
-			// Standard Error: 2_384
-			.saturating_add(Weight::from_parts(1_609_560, 0).saturating_mul(s.into()))
-			// Standard Error: 2_384
-			.saturating_add(Weight::from_parts(344_185, 0).saturating_mul(x.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(4))
-			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s.into())))
-	}
-	/// Storage: `Identity::IdentityOf` (r:1 w:0)
-	/// Proof: `Identity::IdentityOf` (`max_values`: None, `max_size`: Some(7538), added: 10013, mode: `MaxEncodedLen`)
-	/// Storage: `Identity::SuperOf` (r:1 w:1)
-	/// Proof: `Identity::SuperOf` (`max_values`: None, `max_size`: Some(114), added: 2589, mode: `MaxEncodedLen`)
-	/// Storage: `Identity::SubsOf` (r:1 w:1)
-	/// Proof: `Identity::SubsOf` (`max_values`: None, `max_size`: Some(3258), added: 5733, mode: `MaxEncodedLen`)
-	/// The range of component `s` is `[0, 99]`.
-	fn add_sub(s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `428 + s * (36 ±0)`
-		//  Estimated: `11003`
-		// Minimum execution time: 40_751_000 picoseconds.
-		Weight::from_parts(44_490_675, 11003)
-			// Standard Error: 3_411
-			.saturating_add(Weight::from_parts(72_803, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `Identity::IdentityOf` (r:1 w:0)
-	/// Proof: `Identity::IdentityOf` (`max_values`: None, `max_size`: Some(7538), added: 10013, mode: `MaxEncodedLen`)
-	/// Storage: `Identity::SuperOf` (r:1 w:1)
-	/// Proof: `Identity::SuperOf` (`max_values`: None, `max_size`: Some(114), added: 2589, mode: `MaxEncodedLen`)
-	/// The range of component `s` is `[1, 100]`.
-	fn rename_sub(s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `563 + s * (3 ±0)`
-		//  Estimated: `11003`
-		// Minimum execution time: 19_092_000 picoseconds.
-		Weight::from_parts(20_893_870, 11003)
-			// Standard Error: 1_498
-			.saturating_add(Weight::from_parts(29_141, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Identity::IdentityOf` (r:1 w:0)
-	/// Proof: `Identity::IdentityOf` (`max_values`: None, `max_size`: Some(7538), added: 10013, mode: `MaxEncodedLen`)
-	/// Storage: `Identity::SuperOf` (r:1 w:1)
-	/// Proof: `Identity::SuperOf` (`max_values`: None, `max_size`: Some(114), added: 2589, mode: `MaxEncodedLen`)
-	/// Storage: `Identity::SubsOf` (r:1 w:1)
-	/// Proof: `Identity::SubsOf` (`max_values`: None, `max_size`: Some(3258), added: 5733, mode: `MaxEncodedLen`)
-	/// The range of component `s` is `[1, 100]`.
-	fn remove_sub(s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `611 + s * (35 ±0)`
-		//  Estimated: `11003`
-		// Minimum execution time: 44_470_000 picoseconds.
-		Weight::from_parts(46_580_204, 11003)
-			// Standard Error: 1_811
-			.saturating_add(Weight::from_parts(51_699, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `Identity::SuperOf` (r:1 w:1)
-	/// Proof: `Identity::SuperOf` (`max_values`: None, `max_size`: Some(114), added: 2589, mode: `MaxEncodedLen`)
-	/// Storage: `Identity::SubsOf` (r:1 w:1)
-	/// Proof: `Identity::SubsOf` (`max_values`: None, `max_size`: Some(3258), added: 5733, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:1 w:0)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// The range of component `s` is `[0, 99]`.
-	fn quit_sub(s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `638 + s * (38 ±0)`
-		//  Estimated: `6723`
-		// Minimum execution time: 33_030_000 picoseconds.
-		Weight::from_parts(35_034_240, 6723)
-			// Standard Error: 1_832
-			.saturating_add(Weight::from_parts(54_735, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-}
\ No newline at end of file
diff --git a/runtime/hydradx/src/weights/mod.rs b/runtime/hydradx/src/weights/mod.rs
index 0673c3f59..f85b0b80c 100644
--- a/runtime/hydradx/src/weights/mod.rs
+++ b/runtime/hydradx/src/weights/mod.rs
@@ -1,42 +1,45 @@
-pub mod balances;
-pub mod bonds;
-pub mod circuit_breaker;
-pub mod claims;
-pub mod collator_selection;
-pub mod council;
-pub mod currencies;
-pub mod dca;
-pub mod democracy;
-pub mod duster;
-pub mod dynamic_evm_fee;
-pub mod elections;
-pub mod ema_oracle;
-pub mod evm_accounts;
-pub mod identity;
-pub mod lbp;
-pub mod omnipool;
-pub mod omnipool_lm;
-pub mod otc;
-pub mod payment;
-pub mod preimage;
-pub mod proxy;
-pub mod referrals;
-pub mod registry;
-pub mod route_executor;
-pub mod scheduler;
-pub mod stableswap;
-pub mod staking;
-pub mod state_trie;
-pub mod system;
-pub mod technical_committee;
-pub mod timestamp;
-pub mod tips;
-pub mod tokens;
-pub mod transaction_pause;
-pub mod treasury;
-pub mod utility;
-pub mod vesting;
-pub mod xcm;
-pub mod xcmp_queue;
-pub mod xyk;
-pub mod xyk_lm;
+pub mod cumulus_pallet_parachain_system;
+pub mod cumulus_pallet_xcmp_queue;
+pub mod frame_system;
+pub mod orml_tokens;
+pub mod orml_vesting;
+pub mod pallet_asset_registry;
+pub mod pallet_balances;
+pub mod pallet_bonds;
+pub mod pallet_circuit_breaker;
+pub mod pallet_claims;
+pub mod pallet_collator_selection;
+pub mod pallet_collective_council;
+pub mod pallet_collective_technical_committee;
+pub mod pallet_currencies;
+pub mod pallet_dca;
+pub mod pallet_democracy;
+pub mod pallet_duster;
+pub mod pallet_dynamic_evm_fee;
+pub mod pallet_elections_phragmen;
+pub mod pallet_ema_oracle;
+pub mod pallet_evm_accounts;
+pub mod pallet_identity;
+pub mod pallet_lbp;
+pub mod pallet_message_queue;
+pub mod pallet_multisig;
+pub mod pallet_omnipool;
+pub mod pallet_omnipool_liquidity_mining;
+pub mod pallet_otc;
+pub mod pallet_preimage;
+pub mod pallet_proxy;
+pub mod pallet_referrals;
+pub mod pallet_route_executor;
+pub mod pallet_scheduler;
+pub mod pallet_stableswap;
+pub mod pallet_staking;
+pub mod pallet_state_trie_migration;
+pub mod pallet_timestamp;
+pub mod pallet_tips;
+pub mod pallet_transaction_multi_payment;
+pub mod pallet_transaction_pause;
+pub mod pallet_treasury;
+pub mod pallet_utility;
+pub mod pallet_xcm;
+pub mod pallet_xyk;
+pub mod pallet_xyk_liquidity_mining;
diff --git a/runtime/hydradx/src/weights/tokens.rs b/runtime/hydradx/src/weights/orml_tokens.rs
similarity index 86%
rename from runtime/hydradx/src/weights/tokens.rs
rename to runtime/hydradx/src/weights/orml_tokens.rs
index 51a44f5c7..2c98146ec 100644
--- a/runtime/hydradx/src/weights/tokens.rs
+++ b/runtime/hydradx/src/weights/orml_tokens.rs
@@ -15,37 +15,46 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+
 //! Autogenerated weights for `orml_tokens`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-02-15, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-05-23, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: 1024
+//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024`
 
 // Executed Command:
-// target/release/hydradx
+// ./target/release/hydradx
 // benchmark
 // pallet
-// --chain=dev
-// --steps=10
-// --repeat=30
 // --wasm-execution=compiled
-// --heap-pages=4096
-// --template=.maintain/pallet-weight-template-no-back.hbs
-// --pallet=orml_tokens
-// --output=./weights/tokens.rs
-// --extrinsic=*
+// --pallet
+// *
+// --extrinsic
+// *
+// --heap-pages
+// 4096
+// --steps
+// 50
+// --repeat
+// 20
+// --template=scripts/pallet-weight-template.hbs
+// --output
+// weights/
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
 #![allow(missing_docs)]
 
-use frame_support::{traits::Get, weights::Weight};
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
 use core::marker::PhantomData;
 
-/// Weight functions for `orml_tokens`.
+/// Weights for `orml_tokens`.
+pub struct WeightInfo<T>(PhantomData<T>);
+
+/// Weights for `orml_tokens` using the HydraDX node and recommended hardware.
 pub struct HydraWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> orml_tokens::WeightInfo for HydraWeight<T> {
 	/// Storage: `Duster::AccountBlacklist` (r:1 w:0)
@@ -72,12 +81,12 @@ impl<T: frame_system::Config> orml_tokens::WeightInfo for HydraWeight<T> {
 	/// Proof: `AssetRegistry::ExistentialDepositCounter` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
 	fn transfer() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3102`
+		//  Measured:  `3205`
 		//  Estimated: `11322`
-		// Minimum execution time: 282_258_000 picoseconds.
-		Weight::from_parts(285_181_000, 11322)
-			.saturating_add(T::DbWeight::get().reads(21))
-			.saturating_add(T::DbWeight::get().writes(9))
+		// Minimum execution time: 232_476_000 picoseconds.
+		Weight::from_parts(233_663_000, 11322)
+			.saturating_add(T::DbWeight::get().reads(21_u64))
+			.saturating_add(T::DbWeight::get().writes(9_u64))
 	}
 	/// Storage: `Tokens::Accounts` (r:4 w:4)
 	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
@@ -103,12 +112,12 @@ impl<T: frame_system::Config> orml_tokens::WeightInfo for HydraWeight<T> {
 	/// Proof: `AssetRegistry::ExistentialDepositCounter` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
 	fn transfer_all() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3154`
+		//  Measured:  `3257`
 		//  Estimated: `11322`
-		// Minimum execution time: 286_100_000 picoseconds.
-		Weight::from_parts(287_775_000, 11322)
-			.saturating_add(T::DbWeight::get().reads(21))
-			.saturating_add(T::DbWeight::get().writes(9))
+		// Minimum execution time: 236_104_000 picoseconds.
+		Weight::from_parts(237_656_000, 11322)
+			.saturating_add(T::DbWeight::get().reads(21_u64))
+			.saturating_add(T::DbWeight::get().writes(9_u64))
 	}
 	/// Storage: `Duster::AccountBlacklist` (r:1 w:0)
 	/// Proof: `Duster::AccountBlacklist` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
@@ -134,12 +143,12 @@ impl<T: frame_system::Config> orml_tokens::WeightInfo for HydraWeight<T> {
 	/// Proof: `AssetRegistry::ExistentialDepositCounter` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
 	fn transfer_keep_alive() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3152`
+		//  Measured:  `3255`
 		//  Estimated: `11322`
-		// Minimum execution time: 198_176_000 picoseconds.
-		Weight::from_parts(199_598_000, 11322)
-			.saturating_add(T::DbWeight::get().reads(21))
-			.saturating_add(T::DbWeight::get().writes(8))
+		// Minimum execution time: 161_927_000 picoseconds.
+		Weight::from_parts(163_592_000, 11322)
+			.saturating_add(T::DbWeight::get().reads(21_u64))
+			.saturating_add(T::DbWeight::get().writes(8_u64))
 	}
 	/// Storage: `Duster::AccountBlacklist` (r:1 w:0)
 	/// Proof: `Duster::AccountBlacklist` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
@@ -165,12 +174,12 @@ impl<T: frame_system::Config> orml_tokens::WeightInfo for HydraWeight<T> {
 	/// Proof: `AssetRegistry::ExistentialDepositCounter` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
 	fn force_transfer() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3154`
+		//  Measured:  `3257`
 		//  Estimated: `11322`
-		// Minimum execution time: 282_695_000 picoseconds.
-		Weight::from_parts(284_482_000, 11322)
-			.saturating_add(T::DbWeight::get().reads(21))
-			.saturating_add(T::DbWeight::get().writes(9))
+		// Minimum execution time: 232_442_000 picoseconds.
+		Weight::from_parts(233_954_000, 11322)
+			.saturating_add(T::DbWeight::get().reads(21_u64))
+			.saturating_add(T::DbWeight::get().writes(9_u64))
 	}
 	/// Storage: `Tokens::Accounts` (r:1 w:1)
 	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
@@ -186,11 +195,11 @@ impl<T: frame_system::Config> orml_tokens::WeightInfo for HydraWeight<T> {
 	/// Proof: `MultiTransactionPayment::AcceptedCurrencies` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
 	fn set_balance() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2143`
+		//  Measured:  `2213`
 		//  Estimated: `3593`
-		// Minimum execution time: 67_017_000 picoseconds.
-		Weight::from_parts(67_929_000, 3593)
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(3))
+		// Minimum execution time: 53_851_000 picoseconds.
+		Weight::from_parts(54_455_000, 3593)
+			.saturating_add(T::DbWeight::get().reads(6_u64))
+			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
 }
\ No newline at end of file
diff --git a/runtime/hydradx/src/weights/vesting.rs b/runtime/hydradx/src/weights/orml_vesting.rs
similarity index 70%
rename from runtime/hydradx/src/weights/vesting.rs
rename to runtime/hydradx/src/weights/orml_vesting.rs
index c8c72e4dd..10b472663 100644
--- a/runtime/hydradx/src/weights/vesting.rs
+++ b/runtime/hydradx/src/weights/orml_vesting.rs
@@ -15,37 +15,46 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+
 //! Autogenerated weights for `orml_vesting`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-02-15, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-05-23, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: 1024
+//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024`
 
 // Executed Command:
-// target/release/hydradx
+// ./target/release/hydradx
 // benchmark
 // pallet
-// --chain=dev
-// --steps=10
-// --repeat=30
 // --wasm-execution=compiled
-// --heap-pages=4096
-// --template=.maintain/pallet-weight-template-no-back.hbs
-// --pallet=orml_vesting
-// --output=./weights/vesting.rs
-// --extrinsic=*
+// --pallet
+// *
+// --extrinsic
+// *
+// --heap-pages
+// 4096
+// --steps
+// 50
+// --repeat
+// 20
+// --template=scripts/pallet-weight-template.hbs
+// --output
+// weights/
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
 #![allow(missing_docs)]
 
-use frame_support::{traits::Get, weights::Weight};
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
 use core::marker::PhantomData;
 
-/// Weight functions for `orml_vesting`.
+/// Weights for `orml_vesting`.
+pub struct WeightInfo<T>(PhantomData<T>);
+
+/// Weights for `orml_vesting` using the HydraDX node and recommended hardware.
 pub struct HydraWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> orml_vesting::WeightInfo for HydraWeight<T> {
 	/// Storage: `Vesting::VestingSchedules` (r:1 w:1)
@@ -58,12 +67,12 @@ impl<T: frame_system::Config> orml_vesting::WeightInfo for HydraWeight<T> {
 	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(49), added: 2524, mode: `MaxEncodedLen`)
 	fn vested_transfer() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1918`
+		//  Measured:  `1888`
 		//  Estimated: `6315`
-		// Minimum execution time: 118_969_000 picoseconds.
-		Weight::from_parts(120_010_000, 6315)
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(4))
+		// Minimum execution time: 93_625_000 picoseconds.
+		Weight::from_parts(94_750_000, 6315)
+			.saturating_add(T::DbWeight::get().reads(5_u64))
+			.saturating_add(T::DbWeight::get().writes(4_u64))
 	}
 	/// Storage: `Vesting::VestingSchedules` (r:1 w:1)
 	/// Proof: `Vesting::VestingSchedules` (`max_values`: None, `max_size`: Some(2850), added: 5325, mode: `MaxEncodedLen`)
@@ -74,14 +83,14 @@ impl<T: frame_system::Config> orml_vesting::WeightInfo for HydraWeight<T> {
 	/// The range of component `i` is `[1, 100]`.
 	fn claim(i: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2037 + i * (18 ±0)`
+		//  Measured:  `2007 + i * (18 ±0)`
 		//  Estimated: `6315`
-		// Minimum execution time: 66_914_000 picoseconds.
-		Weight::from_parts(68_653_438, 6315)
-			// Standard Error: 1_016
-			.saturating_add(Weight::from_parts(84_943, 0).saturating_mul(i.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(2))
+		// Minimum execution time: 53_425_000 picoseconds.
+		Weight::from_parts(55_058_378, 6315)
+			// Standard Error: 551
+			.saturating_add(Weight::from_parts(98_382, 0).saturating_mul(i.into()))
+			.saturating_add(T::DbWeight::get().reads(3_u64))
+			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
 	/// Storage: `System::Account` (r:1 w:1)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
@@ -94,13 +103,13 @@ impl<T: frame_system::Config> orml_vesting::WeightInfo for HydraWeight<T> {
 	/// The range of component `i` is `[1, 100]`.
 	fn update_vesting_schedules(i: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1619`
+		//  Measured:  `1589`
 		//  Estimated: `4764`
-		// Minimum execution time: 58_382_000 picoseconds.
-		Weight::from_parts(59_008_204, 4764)
-			// Standard Error: 546
-			.saturating_add(Weight::from_parts(82_456, 0).saturating_mul(i.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(3))
+		// Minimum execution time: 45_123_000 picoseconds.
+		Weight::from_parts(46_153_805, 4764)
+			// Standard Error: 356
+			.saturating_add(Weight::from_parts(95_410, 0).saturating_mul(i.into()))
+			.saturating_add(T::DbWeight::get().reads(3_u64))
+			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
 }
\ No newline at end of file
diff --git a/runtime/hydradx/src/weights/registry.rs b/runtime/hydradx/src/weights/pallet_asset_registry.rs
similarity index 69%
rename from runtime/hydradx/src/weights/registry.rs
rename to runtime/hydradx/src/weights/pallet_asset_registry.rs
index 26c0398c7..18a0799dd 100644
--- a/runtime/hydradx/src/weights/registry.rs
+++ b/runtime/hydradx/src/weights/pallet_asset_registry.rs
@@ -15,41 +15,48 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+
 //! Autogenerated weights for `pallet_asset_registry`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-02-15, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-05-23, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: 1024
+//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024`
 
 // Executed Command:
-// target/release/hydradx
+// ./target/release/hydradx
 // benchmark
 // pallet
-// --chain=dev
-// --steps=10
-// --repeat=30
 // --wasm-execution=compiled
-// --heap-pages=4096
-// --template=.maintain/pallet-weight-template-no-back.hbs
-// --pallet=pallet_asset_registry
-// --output=./weights/registry.rs
-// --extrinsic=*
+// --pallet
+// *
+// --extrinsic
+// *
+// --heap-pages
+// 4096
+// --steps
+// 50
+// --repeat
+// 20
+// --template=scripts/pallet-weight-template.hbs
+// --output
+// weights/
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
 #![allow(missing_docs)]
 
-use frame_support::{traits::Get, weights::Weight};
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
 use core::marker::PhantomData;
 
-use pallet_asset_registry::weights::WeightInfo;
+/// Weights for `pallet_asset_registry`.
+pub struct WeightInfo<T>(PhantomData<T>);
 
-/// Weight functions for `pallet_asset_registry`.
+/// Weights for `pallet_asset_registry` using the HydraDX node and recommended hardware.
 pub struct HydraWeight<T>(PhantomData<T>);
-impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
+impl<T: frame_system::Config> pallet_asset_registry::WeightInfo for HydraWeight<T> {
 	/// Storage: `AssetRegistry::Assets` (r:1 w:1)
 	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
 	/// Storage: `AssetRegistry::AssetIds` (r:1 w:1)
@@ -60,12 +67,12 @@ impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
 	/// Proof: `AssetRegistry::AssetLocations` (`max_values`: None, `max_size`: Some(622), added: 3097, mode: `MaxEncodedLen`)
 	fn register() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `322`
+		//  Measured:  `388`
 		//  Estimated: `4087`
-		// Minimum execution time: 40_579_000 picoseconds.
-		Weight::from_parts(41_148_000, 4087)
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(4))
+		// Minimum execution time: 33_258_000 picoseconds.
+		Weight::from_parts(33_840_000, 4087)
+			.saturating_add(T::DbWeight::get().reads(3_u64))
+			.saturating_add(T::DbWeight::get().writes(4_u64))
 	}
 	/// Storage: `AssetRegistry::Assets` (r:1 w:1)
 	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
@@ -77,15 +84,13 @@ impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
 	/// Proof: `AssetRegistry::LocationAssets` (`max_values`: None, `max_size`: Some(622), added: 3097, mode: `MaxEncodedLen`)
 	fn update() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `551`
+		//  Measured:  `617`
 		//  Estimated: `4087`
-		// Minimum execution time: 48_132_000 picoseconds.
-		Weight::from_parts(48_483_000, 4087)
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(5))
+		// Minimum execution time: 40_246_000 picoseconds.
+		Weight::from_parts(40_839_000, 4087)
+			.saturating_add(T::DbWeight::get().reads(3_u64))
+			.saturating_add(T::DbWeight::get().writes(5_u64))
 	}
-	/// Storage: `System::Account` (r:2 w:2)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	/// Storage: `AssetRegistry::NextAssetId` (r:1 w:1)
 	/// Proof: `AssetRegistry::NextAssetId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	/// Storage: `AssetRegistry::LocationAssets` (r:1 w:1)
@@ -96,12 +101,12 @@ impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
 	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
 	fn register_external() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `477`
-		//  Estimated: `6196`
-		// Minimum execution time: 80_033_000 picoseconds.
-		Weight::from_parts(80_684_000, 6196)
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(6))
+		//  Measured:  `301`
+		//  Estimated: `4087`
+		// Minimum execution time: 23_496_000 picoseconds.
+		Weight::from_parts(23_982_000, 4087)
+			.saturating_add(T::DbWeight::get().reads(2_u64))
+			.saturating_add(T::DbWeight::get().writes(4_u64))
 	}
 	/// Storage: `AssetRegistry::Assets` (r:1 w:0)
 	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
@@ -109,22 +114,22 @@ impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
 	/// Proof: `AssetRegistry::BannedAssets` (`max_values`: None, `max_size`: Some(20), added: 2495, mode: `MaxEncodedLen`)
 	fn ban_asset() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `361`
+		//  Measured:  `427`
 		//  Estimated: `3590`
-		// Minimum execution time: 21_799_000 picoseconds.
-		Weight::from_parts(22_232_000, 3590)
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
+		// Minimum execution time: 17_542_000 picoseconds.
+		Weight::from_parts(17_999_000, 3590)
+			.saturating_add(T::DbWeight::get().reads(2_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	/// Storage: `AssetRegistry::BannedAssets` (r:1 w:1)
 	/// Proof: `AssetRegistry::BannedAssets` (`max_values`: None, `max_size`: Some(20), added: 2495, mode: `MaxEncodedLen`)
 	fn unban_asset() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `254`
+		//  Measured:  `320`
 		//  Estimated: `3485`
-		// Minimum execution time: 18_853_000 picoseconds.
-		Weight::from_parts(19_166_000, 3485)
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
+		// Minimum execution time: 14_891_000 picoseconds.
+		Weight::from_parts(15_319_000, 3485)
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-}
+}
\ No newline at end of file
diff --git a/runtime/hydradx/src/weights/balances.rs b/runtime/hydradx/src/weights/pallet_balances.rs
similarity index 58%
rename from runtime/hydradx/src/weights/balances.rs
rename to runtime/hydradx/src/weights/pallet_balances.rs
index 82d13eb48..87535feb6 100644
--- a/runtime/hydradx/src/weights/balances.rs
+++ b/runtime/hydradx/src/weights/pallet_balances.rs
@@ -15,37 +15,46 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+
 //! Autogenerated weights for `pallet_balances`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-02-15, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-05-23, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: 1024
+//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024`
 
 // Executed Command:
-// target/release/hydradx
+// ./target/release/hydradx
 // benchmark
 // pallet
-// --chain=dev
-// --steps=10
-// --repeat=30
 // --wasm-execution=compiled
-// --heap-pages=4096
-// --template=.maintain/pallet-weight-template-no-back.hbs
-// --pallet=pallet_balances
-// --output=./weights/balances.rs
-// --extrinsic=*
+// --pallet
+// *
+// --extrinsic
+// *
+// --heap-pages
+// 4096
+// --steps
+// 50
+// --repeat
+// 20
+// --template=scripts/pallet-weight-template.hbs
+// --output
+// weights/
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
 #![allow(missing_docs)]
 
-use frame_support::{traits::Get, weights::Weight};
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
 use core::marker::PhantomData;
 
-/// Weight functions for `pallet_balances`.
+/// Weights for `pallet_balances`.
+pub struct WeightInfo<T>(PhantomData<T>);
+
+/// Weights for `pallet_balances` using the HydraDX node and recommended hardware.
 pub struct HydraWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> pallet_balances::WeightInfo for HydraWeight<T> {
 	/// Storage: `System::Account` (r:2 w:2)
@@ -54,10 +63,10 @@ impl<T: frame_system::Config> pallet_balances::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `103`
 		//  Estimated: `6196`
-		// Minimum execution time: 95_388_000 picoseconds.
-		Weight::from_parts(96_245_000, 6196)
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
+		// Minimum execution time: 71_487_000 picoseconds.
+		Weight::from_parts(71_988_000, 6196)
+			.saturating_add(T::DbWeight::get().reads(2_u64))
+			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
 	/// Storage: `System::Account` (r:1 w:1)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
@@ -65,10 +74,10 @@ impl<T: frame_system::Config> pallet_balances::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `3593`
-		// Minimum execution time: 56_336_000 picoseconds.
-		Weight::from_parts(56_960_000, 3593)
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
+		// Minimum execution time: 44_826_000 picoseconds.
+		Weight::from_parts(45_268_000, 3593)
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	/// Storage: `System::Account` (r:1 w:1)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
@@ -76,10 +85,10 @@ impl<T: frame_system::Config> pallet_balances::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `174`
 		//  Estimated: `3593`
-		// Minimum execution time: 23_156_000 picoseconds.
-		Weight::from_parts(23_520_000, 3593)
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
+		// Minimum execution time: 18_696_000 picoseconds.
+		Weight::from_parts(19_084_000, 3593)
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	/// Storage: `System::Account` (r:1 w:1)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
@@ -87,10 +96,10 @@ impl<T: frame_system::Config> pallet_balances::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `174`
 		//  Estimated: `3593`
-		// Minimum execution time: 32_737_000 picoseconds.
-		Weight::from_parts(33_142_000, 3593)
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
+		// Minimum execution time: 24_875_000 picoseconds.
+		Weight::from_parts(25_461_000, 3593)
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	/// Storage: `System::Account` (r:3 w:3)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
@@ -98,10 +107,10 @@ impl<T: frame_system::Config> pallet_balances::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `206`
 		//  Estimated: `8799`
-		// Minimum execution time: 97_418_000 picoseconds.
-		Weight::from_parts(98_398_000, 8799)
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(3))
+		// Minimum execution time: 73_484_000 picoseconds.
+		Weight::from_parts(74_356_000, 8799)
+			.saturating_add(T::DbWeight::get().reads(3_u64))
+			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
 	/// Storage: `System::Account` (r:1 w:1)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
@@ -109,10 +118,10 @@ impl<T: frame_system::Config> pallet_balances::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `3593`
-		// Minimum execution time: 70_382_000 picoseconds.
-		Weight::from_parts(71_293_000, 3593)
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
+		// Minimum execution time: 55_533_000 picoseconds.
+		Weight::from_parts(56_121_000, 3593)
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	/// Storage: `System::Account` (r:1 w:1)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
@@ -120,24 +129,34 @@ impl<T: frame_system::Config> pallet_balances::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `174`
 		//  Estimated: `3593`
-		// Minimum execution time: 26_552_000 picoseconds.
-		Weight::from_parts(26_832_000, 3593)
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
+		// Minimum execution time: 21_695_000 picoseconds.
+		Weight::from_parts(22_271_000, 3593)
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: `System::Account` (r:1000 w:1000)
+	/// Storage: `System::Account` (r:999 w:999)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	/// The range of component `u` is `[1, 1000]`.
 	fn upgrade_accounts(u: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0 + u * (136 ±0)`
 		//  Estimated: `990 + u * (2603 ±0)`
-		// Minimum execution time: 24_327_000 picoseconds.
-		Weight::from_parts(24_625_000, 990)
-			// Standard Error: 18_294
-			.saturating_add(Weight::from_parts(18_506_542, 0).saturating_mul(u.into()))
+		// Minimum execution time: 20_314_000 picoseconds.
+		Weight::from_parts(20_426_000, 990)
+			// Standard Error: 10_360
+			.saturating_add(Weight::from_parts(15_044_736, 0).saturating_mul(u.into()))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(u.into())))
 			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(u.into())))
 			.saturating_add(Weight::from_parts(0, 2603).saturating_mul(u.into()))
 	}
+	/// Storage: `Balances::InactiveIssuance` (r:1 w:0)
+	/// Proof: `Balances::InactiveIssuance` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	fn force_adjust_total_issuance() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `0`
+		//  Estimated: `1501`
+		// Minimum execution time: 8_117_000 picoseconds.
+		Weight::from_parts(8_302_000, 1501)
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+	}
 }
\ No newline at end of file
diff --git a/runtime/hydradx/src/weights/bonds.rs b/runtime/hydradx/src/weights/pallet_bonds.rs
similarity index 84%
rename from runtime/hydradx/src/weights/bonds.rs
rename to runtime/hydradx/src/weights/pallet_bonds.rs
index 73b8867e0..6ea57d61f 100644
--- a/runtime/hydradx/src/weights/bonds.rs
+++ b/runtime/hydradx/src/weights/pallet_bonds.rs
@@ -15,37 +15,46 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+
 //! Autogenerated weights for `pallet_bonds`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-02-15, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-05-23, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: 1024
+//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024`
 
 // Executed Command:
-// target/release/hydradx
+// ./target/release/hydradx
 // benchmark
 // pallet
-// --chain=dev
-// --steps=10
-// --repeat=30
 // --wasm-execution=compiled
-// --heap-pages=4096
-// --template=.maintain/pallet-weight-template-no-back.hbs
-// --pallet=pallet_bonds
-// --output=./weights/bonds.rs
-// --extrinsic=*
+// --pallet
+// *
+// --extrinsic
+// *
+// --heap-pages
+// 4096
+// --steps
+// 50
+// --repeat
+// 20
+// --template=scripts/pallet-weight-template.hbs
+// --output
+// weights/
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
 #![allow(missing_docs)]
 
-use frame_support::{traits::Get, weights::Weight};
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
 use core::marker::PhantomData;
 
-/// Weight functions for `pallet_bonds`.
+/// Weights for `pallet_bonds`.
+pub struct WeightInfo<T>(PhantomData<T>);
+
+/// Weights for `pallet_bonds` using the HydraDX node and recommended hardware.
 pub struct HydraWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> pallet_bonds::WeightInfo for HydraWeight<T> {
 	/// Storage: `AssetRegistry::Assets` (r:1 w:1)
@@ -80,12 +89,12 @@ impl<T: frame_system::Config> pallet_bonds::WeightInfo for HydraWeight<T> {
 	/// Proof: `Bonds::Bonds` (`max_values`: None, `max_size`: Some(32), added: 2507, mode: `MaxEncodedLen`)
 	fn issue() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1327`
+		//  Measured:  `1393`
 		//  Estimated: `8799`
-		// Minimum execution time: 295_545_000 picoseconds.
-		Weight::from_parts(297_850_000, 8799)
-			.saturating_add(T::DbWeight::get().reads(16))
-			.saturating_add(T::DbWeight::get().writes(12))
+		// Minimum execution time: 233_669_000 picoseconds.
+		Weight::from_parts(235_504_000, 8799)
+			.saturating_add(T::DbWeight::get().reads(16_u64))
+			.saturating_add(T::DbWeight::get().writes(12_u64))
 	}
 	/// Storage: `Bonds::Bonds` (r:1 w:0)
 	/// Proof: `Bonds::Bonds` (`max_values`: None, `max_size`: Some(32), added: 2507, mode: `MaxEncodedLen`)
@@ -109,11 +118,11 @@ impl<T: frame_system::Config> pallet_bonds::WeightInfo for HydraWeight<T> {
 	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(49), added: 2524, mode: `MaxEncodedLen`)
 	fn redeem() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1744`
+		//  Measured:  `1810`
 		//  Estimated: `8799`
-		// Minimum execution time: 215_448_000 picoseconds.
-		Weight::from_parts(216_795_000, 8799)
-			.saturating_add(T::DbWeight::get().reads(12))
-			.saturating_add(T::DbWeight::get().writes(7))
+		// Minimum execution time: 175_138_000 picoseconds.
+		Weight::from_parts(176_054_000, 8799)
+			.saturating_add(T::DbWeight::get().reads(12_u64))
+			.saturating_add(T::DbWeight::get().writes(7_u64))
 	}
 }
\ No newline at end of file
diff --git a/runtime/hydradx/src/weights/circuit_breaker.rs b/runtime/hydradx/src/weights/pallet_circuit_breaker.rs
similarity index 71%
rename from runtime/hydradx/src/weights/circuit_breaker.rs
rename to runtime/hydradx/src/weights/pallet_circuit_breaker.rs
index bb2901ac9..d2e8c563f 100644
--- a/runtime/hydradx/src/weights/circuit_breaker.rs
+++ b/runtime/hydradx/src/weights/pallet_circuit_breaker.rs
@@ -15,72 +15,81 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+
 //! Autogenerated weights for `pallet_circuit_breaker`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-02-15, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-05-23, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: 1024
+//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024`
 
 // Executed Command:
-// target/release/hydradx
+// ./target/release/hydradx
 // benchmark
 // pallet
-// --chain=dev
-// --steps=10
-// --repeat=30
 // --wasm-execution=compiled
-// --heap-pages=4096
-// --template=.maintain/pallet-weight-template-no-back.hbs
-// --pallet=pallet_circuit_breaker
-// --output=./weights/circuit_breaker.rs
-// --extrinsic=*
+// --pallet
+// *
+// --extrinsic
+// *
+// --heap-pages
+// 4096
+// --steps
+// 50
+// --repeat
+// 20
+// --template=scripts/pallet-weight-template.hbs
+// --output
+// weights/
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
 #![allow(missing_docs)]
 
-use frame_support::{traits::Get, weights::Weight};
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
 use core::marker::PhantomData;
 
-/// Weight functions for `pallet_circuit_breaker`.
+/// Weights for `pallet_circuit_breaker`.
+pub struct WeightInfo<T>(PhantomData<T>);
+
+/// Weights for `pallet_circuit_breaker` using the HydraDX node and recommended hardware.
 pub struct HydraWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> pallet_circuit_breaker::WeightInfo for HydraWeight<T> {
 	/// The range of component `n` is `[0, 400]`.
 	/// The range of component `m` is `[0, 400]`.
 	fn on_finalize(n: u32, m: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `81 + m * (113 ±0) + n * (56 ±0)`
+		//  Measured:  `64 + m * (113 ±0) + n * (56 ±0)`
 		//  Estimated: `0`
-		// Minimum execution time: 337_114_000 picoseconds.
-		Weight::from_parts(338_524_000, 0)
-			// Standard Error: 18_748
-			.saturating_add(Weight::from_parts(304_800, 0).saturating_mul(n.into()))
-			// Standard Error: 18_748
-			.saturating_add(Weight::from_parts(1_167_299, 0).saturating_mul(m.into()))
+		// Minimum execution time: 306_621_000 picoseconds.
+		Weight::from_parts(308_251_000, 0)
+			// Standard Error: 8_989
+			.saturating_add(Weight::from_parts(270_702, 0).saturating_mul(n.into()))
+			// Standard Error: 8_989
+			.saturating_add(Weight::from_parts(1_049_170, 0).saturating_mul(m.into()))
 	}
 	fn on_finalize_single_liquidity_limit_entry() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `208`
 		//  Estimated: `0`
-		// Minimum execution time: 9_057_000 picoseconds.
-		Weight::from_parts(9_236_000, 0)
+		// Minimum execution time: 8_112_000 picoseconds.
+		Weight::from_parts(8_381_000, 0)
 	}
 	fn on_finalize_single_trade_limit_entry() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `208`
 		//  Estimated: `0`
-		// Minimum execution time: 9_038_000 picoseconds.
-		Weight::from_parts(9_276_000, 0)
+		// Minimum execution time: 8_194_000 picoseconds.
+		Weight::from_parts(8_399_000, 0)
 	}
 	fn on_finalize_empty() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `208`
 		//  Estimated: `0`
-		// Minimum execution time: 8_991_000 picoseconds.
-		Weight::from_parts(9_236_000, 0)
+		// Minimum execution time: 8_191_000 picoseconds.
+		Weight::from_parts(8_373_000, 0)
 	}
 	/// Storage: `CircuitBreaker::TradeVolumeLimitPerAsset` (r:0 w:1)
 	/// Proof: `CircuitBreaker::TradeVolumeLimitPerAsset` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
@@ -88,9 +97,9 @@ impl<T: frame_system::Config> pallet_circuit_breaker::WeightInfo for HydraWeight
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 12_675_000 picoseconds.
-		Weight::from_parts(12_914_000, 0)
-			.saturating_add(T::DbWeight::get().writes(1))
+		// Minimum execution time: 8_818_000 picoseconds.
+		Weight::from_parts(9_140_000, 0)
+			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	/// Storage: `CircuitBreaker::LiquidityAddLimitPerAsset` (r:0 w:1)
 	/// Proof: `CircuitBreaker::LiquidityAddLimitPerAsset` (`max_values`: None, `max_size`: Some(29), added: 2504, mode: `MaxEncodedLen`)
@@ -98,9 +107,9 @@ impl<T: frame_system::Config> pallet_circuit_breaker::WeightInfo for HydraWeight
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 12_902_000 picoseconds.
-		Weight::from_parts(13_224_000, 0)
-			.saturating_add(T::DbWeight::get().writes(1))
+		// Minimum execution time: 8_841_000 picoseconds.
+		Weight::from_parts(9_081_000, 0)
+			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	/// Storage: `CircuitBreaker::LiquidityRemoveLimitPerAsset` (r:0 w:1)
 	/// Proof: `CircuitBreaker::LiquidityRemoveLimitPerAsset` (`max_values`: None, `max_size`: Some(29), added: 2504, mode: `MaxEncodedLen`)
@@ -108,9 +117,9 @@ impl<T: frame_system::Config> pallet_circuit_breaker::WeightInfo for HydraWeight
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 12_583_000 picoseconds.
-		Weight::from_parts(12_901_000, 0)
-			.saturating_add(T::DbWeight::get().writes(1))
+		// Minimum execution time: 9_089_000 picoseconds.
+		Weight::from_parts(9_231_000, 0)
+			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	/// Storage: `CircuitBreaker::LiquidityAddLimitPerAsset` (r:1 w:0)
 	/// Proof: `CircuitBreaker::LiquidityAddLimitPerAsset` (`max_values`: None, `max_size`: Some(29), added: 2504, mode: `MaxEncodedLen`)
@@ -124,10 +133,10 @@ impl<T: frame_system::Config> pallet_circuit_breaker::WeightInfo for HydraWeight
 		// Proof Size summary in bytes:
 		//  Measured:  `262`
 		//  Estimated: `3517`
-		// Minimum execution time: 20_836_000 picoseconds.
-		Weight::from_parts(21_079_000, 3517)
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(2))
+		// Minimum execution time: 20_016_000 picoseconds.
+		Weight::from_parts(20_252_000, 3517)
+			.saturating_add(T::DbWeight::get().reads(4_u64))
+			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
 	/// Storage: `CircuitBreaker::LiquidityAddLimitPerAsset` (r:1 w:0)
 	/// Proof: `CircuitBreaker::LiquidityAddLimitPerAsset` (`max_values`: None, `max_size`: Some(29), added: 2504, mode: `MaxEncodedLen`)
@@ -141,10 +150,10 @@ impl<T: frame_system::Config> pallet_circuit_breaker::WeightInfo for HydraWeight
 		// Proof Size summary in bytes:
 		//  Measured:  `208`
 		//  Estimated: `3517`
-		// Minimum execution time: 17_939_000 picoseconds.
-		Weight::from_parts(18_095_000, 3517)
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(2))
+		// Minimum execution time: 17_308_000 picoseconds.
+		Weight::from_parts(17_647_000, 3517)
+			.saturating_add(T::DbWeight::get().reads(4_u64))
+			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
 	/// Storage: `CircuitBreaker::AllowedTradeVolumeLimitPerAsset` (r:2 w:2)
 	/// Proof: `CircuitBreaker::AllowedTradeVolumeLimitPerAsset` (`max_values`: None, `max_size`: Some(68), added: 2543, mode: `MaxEncodedLen`)
@@ -154,9 +163,9 @@ impl<T: frame_system::Config> pallet_circuit_breaker::WeightInfo for HydraWeight
 		// Proof Size summary in bytes:
 		//  Measured:  `208`
 		//  Estimated: `6076`
-		// Minimum execution time: 18_569_000 picoseconds.
-		Weight::from_parts(18_816_000, 6076)
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(2))
+		// Minimum execution time: 17_387_000 picoseconds.
+		Weight::from_parts(17_667_000, 6076)
+			.saturating_add(T::DbWeight::get().reads(4_u64))
+			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
 }
\ No newline at end of file
diff --git a/runtime/hydradx/src/weights/claims.rs b/runtime/hydradx/src/weights/pallet_claims.rs
similarity index 65%
rename from runtime/hydradx/src/weights/claims.rs
rename to runtime/hydradx/src/weights/pallet_claims.rs
index e32c1935b..6f9128b56 100644
--- a/runtime/hydradx/src/weights/claims.rs
+++ b/runtime/hydradx/src/weights/pallet_claims.rs
@@ -15,41 +15,48 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+
 //! Autogenerated weights for `pallet_claims`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-02-15, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-05-23, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: 1024
+//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024`
 
 // Executed Command:
-// target/release/hydradx
+// ./target/release/hydradx
 // benchmark
 // pallet
-// --chain=dev
-// --steps=10
-// --repeat=30
 // --wasm-execution=compiled
-// --heap-pages=4096
-// --template=.maintain/pallet-weight-template-no-back.hbs
-// --pallet=pallet_claims
-// --output=./weights/claims.rs
-// --extrinsic=*
+// --pallet
+// *
+// --extrinsic
+// *
+// --heap-pages
+// 4096
+// --steps
+// 50
+// --repeat
+// 20
+// --template=scripts/pallet-weight-template.hbs
+// --output
+// weights/
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
 #![allow(missing_docs)]
 
-use frame_support::{traits::Get, weights::Weight};
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
 use core::marker::PhantomData;
 
-use pallet_claims::weights::WeightInfo;
+/// Weights for `pallet_claims`.
+pub struct WeightInfo<T>(PhantomData<T>);
 
-/// Weight functions for `pallet_claims`.
+/// Weights for `pallet_claims` using the HydraDX node and recommended hardware.
 pub struct HydraWeight<T>(PhantomData<T>);
-impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
+impl<T: frame_system::Config> pallet_claims::WeightInfo for HydraWeight<T> {
 	/// Storage: `Claims::Claims` (r:1 w:1)
 	/// Proof: `Claims::Claims` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
 	/// Storage: `System::Account` (r:1 w:1)
@@ -58,9 +65,9 @@ impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `382`
 		//  Estimated: `3593`
-		// Minimum execution time: 82_475_000 picoseconds.
-		Weight::from_parts(82_992_000, 3593)
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
+		// Minimum execution time: 69_254_000 picoseconds.
+		Weight::from_parts(69_849_000, 3593)
+			.saturating_add(T::DbWeight::get().reads(2_u64))
+			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
-}
+}
\ No newline at end of file
diff --git a/runtime/hydradx/src/weights/pallet_collator_selection.rs b/runtime/hydradx/src/weights/pallet_collator_selection.rs
new file mode 100644
index 000000000..78b8bc8b9
--- /dev/null
+++ b/runtime/hydradx/src/weights/pallet_collator_selection.rs
@@ -0,0 +1,281 @@
+// This file is part of HydraDX.
+
+// Copyright (C) 2020-2023  Intergalactic, Limited (GIB).
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+
+//! Autogenerated weights for `pallet_collator_selection`
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-05-23, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! WORST CASE MAP SIZE: `1000000`
+//! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024`
+
+// Executed Command:
+// ./target/release/hydradx
+// benchmark
+// pallet
+// --wasm-execution=compiled
+// --pallet
+// *
+// --extrinsic
+// *
+// --heap-pages
+// 4096
+// --steps
+// 50
+// --repeat
+// 20
+// --template=scripts/pallet-weight-template.hbs
+// --output
+// weights/
+
+#![cfg_attr(rustfmt, rustfmt_skip)]
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+#![allow(missing_docs)]
+
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
+use core::marker::PhantomData;
+
+/// Weights for `pallet_collator_selection`.
+pub struct WeightInfo<T>(PhantomData<T>);
+
+/// Weights for `pallet_collator_selection` using the HydraDX node and recommended hardware.
+pub struct HydraWeight<T>(PhantomData<T>);
+impl<T: frame_system::Config> pallet_collator_selection::WeightInfo for HydraWeight<T> {
+	/// Storage: `Session::NextKeys` (r:50 w:0)
+	/// Proof: `Session::NextKeys` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `CollatorSelection::Invulnerables` (r:0 w:1)
+	/// Proof: `CollatorSelection::Invulnerables` (`max_values`: Some(1), `max_size`: Some(1601), added: 2096, mode: `MaxEncodedLen`)
+	/// The range of component `b` is `[1, 50]`.
+	fn set_invulnerables(b: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `208 + b * (79 ±0)`
+		//  Estimated: `1196 + b * (2554 ±0)`
+		// Minimum execution time: 15_743_000 picoseconds.
+		Weight::from_parts(15_167_427, 1196)
+			// Standard Error: 4_300
+			.saturating_add(Weight::from_parts(3_162_423, 0).saturating_mul(b.into()))
+			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(b.into())))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
+			.saturating_add(Weight::from_parts(0, 2554).saturating_mul(b.into()))
+	}
+	/// Storage: `Session::NextKeys` (r:1 w:0)
+	/// Proof: `Session::NextKeys` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `CollatorSelection::Invulnerables` (r:1 w:1)
+	/// Proof: `CollatorSelection::Invulnerables` (`max_values`: Some(1), `max_size`: Some(1601), added: 2096, mode: `MaxEncodedLen`)
+	/// Storage: `CollatorSelection::CandidateList` (r:1 w:1)
+	/// Proof: `CollatorSelection::CandidateList` (`max_values`: Some(1), `max_size`: Some(961), added: 1456, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:1 w:1)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// The range of component `b` is `[1, 49]`.
+	/// The range of component `c` is `[1, 19]`.
+	fn add_invulnerable(b: u32, c: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `960 + b * (40 ±0) + c * (48 ±0)`
+		//  Estimated: `4440 + b * (42 ±0) + c * (47 ±0)`
+		// Minimum execution time: 45_723_000 picoseconds.
+		Weight::from_parts(45_113_873, 4440)
+			// Standard Error: 948
+			.saturating_add(Weight::from_parts(88_517, 0).saturating_mul(b.into()))
+			// Standard Error: 2_497
+			.saturating_add(Weight::from_parts(34_319, 0).saturating_mul(c.into()))
+			.saturating_add(T::DbWeight::get().reads(4_u64))
+			.saturating_add(T::DbWeight::get().writes(3_u64))
+			.saturating_add(Weight::from_parts(0, 42).saturating_mul(b.into()))
+			.saturating_add(Weight::from_parts(0, 47).saturating_mul(c.into()))
+	}
+	/// Storage: `CollatorSelection::CandidateList` (r:1 w:0)
+	/// Proof: `CollatorSelection::CandidateList` (`max_values`: Some(1), `max_size`: Some(961), added: 1456, mode: `MaxEncodedLen`)
+	/// Storage: `CollatorSelection::Invulnerables` (r:1 w:1)
+	/// Proof: `CollatorSelection::Invulnerables` (`max_values`: Some(1), `max_size`: Some(1601), added: 2096, mode: `MaxEncodedLen`)
+	/// The range of component `b` is `[5, 50]`.
+	fn remove_invulnerable(b: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `285 + b * (32 ±0)`
+		//  Estimated: `3086`
+		// Minimum execution time: 15_522_000 picoseconds.
+		Weight::from_parts(16_201_540, 3086)
+			// Standard Error: 553
+			.saturating_add(Weight::from_parts(40_189, 0).saturating_mul(b.into()))
+			.saturating_add(T::DbWeight::get().reads(2_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
+	}
+	/// Storage: `CollatorSelection::DesiredCandidates` (r:0 w:1)
+	/// Proof: `CollatorSelection::DesiredCandidates` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	fn set_desired_candidates() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `0`
+		//  Estimated: `0`
+		// Minimum execution time: 6_784_000 picoseconds.
+		Weight::from_parts(7_000_000, 0)
+			.saturating_add(T::DbWeight::get().writes(1_u64))
+	}
+	/// Storage: `CollatorSelection::CandidacyBond` (r:1 w:1)
+	/// Proof: `CollatorSelection::CandidacyBond` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	/// Storage: `CollatorSelection::CandidateList` (r:1 w:1)
+	/// Proof: `CollatorSelection::CandidateList` (`max_values`: Some(1), `max_size`: Some(961), added: 1456, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:20 w:20)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `CollatorSelection::LastAuthoredBlock` (r:0 w:20)
+	/// Proof: `CollatorSelection::LastAuthoredBlock` (`max_values`: None, `max_size`: Some(44), added: 2519, mode: `MaxEncodedLen`)
+	/// The range of component `c` is `[0, 20]`.
+	/// The range of component `k` is `[0, 20]`.
+	fn set_candidacy_bond(c: u32, k: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `0 + c * (179 ±0) + k * (128 ±0)`
+		//  Estimated: `3593 + c * (848 ±30) + k * (848 ±30)`
+		// Minimum execution time: 12_499_000 picoseconds.
+		Weight::from_parts(12_731_000, 3593)
+			// Standard Error: 175_471
+			.saturating_add(Weight::from_parts(6_014_330, 0).saturating_mul(c.into()))
+			// Standard Error: 175_471
+			.saturating_add(Weight::from_parts(5_851_056, 0).saturating_mul(k.into()))
+			.saturating_add(T::DbWeight::get().reads(2_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
+			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(c.into())))
+			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(k.into())))
+			.saturating_add(Weight::from_parts(0, 848).saturating_mul(c.into()))
+			.saturating_add(Weight::from_parts(0, 848).saturating_mul(k.into()))
+	}
+	/// Storage: `CollatorSelection::CandidacyBond` (r:1 w:0)
+	/// Proof: `CollatorSelection::CandidacyBond` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	/// Storage: `CollatorSelection::CandidateList` (r:1 w:1)
+	/// Proof: `CollatorSelection::CandidateList` (`max_values`: Some(1), `max_size`: Some(961), added: 1456, mode: `MaxEncodedLen`)
+	/// The range of component `c` is `[3, 20]`.
+	fn update_bond(c: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `495 + c * (48 ±0)`
+		//  Estimated: `2446`
+		// Minimum execution time: 30_841_000 picoseconds.
+		Weight::from_parts(31_422_744, 2446)
+			// Standard Error: 3_508
+			.saturating_add(Weight::from_parts(84_246, 0).saturating_mul(c.into()))
+			.saturating_add(T::DbWeight::get().reads(2_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
+	}
+	/// Storage: `CollatorSelection::CandidateList` (r:1 w:1)
+	/// Proof: `CollatorSelection::CandidateList` (`max_values`: Some(1), `max_size`: Some(961), added: 1456, mode: `MaxEncodedLen`)
+	/// Storage: `CollatorSelection::Invulnerables` (r:1 w:0)
+	/// Proof: `CollatorSelection::Invulnerables` (`max_values`: Some(1), `max_size`: Some(1601), added: 2096, mode: `MaxEncodedLen`)
+	/// Storage: `Session::NextKeys` (r:1 w:0)
+	/// Proof: `Session::NextKeys` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `CollatorSelection::CandidacyBond` (r:1 w:0)
+	/// Proof: `CollatorSelection::CandidacyBond` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	/// Storage: `CollatorSelection::LastAuthoredBlock` (r:0 w:1)
+	/// Proof: `CollatorSelection::LastAuthoredBlock` (`max_values`: None, `max_size`: Some(44), added: 2519, mode: `MaxEncodedLen`)
+	/// The range of component `c` is `[1, 19]`.
+	fn register_as_candidate(c: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `716 + c * (61 ±0)`
+		//  Estimated: `4181 + c * (61 ±0)`
+		// Minimum execution time: 41_443_000 picoseconds.
+		Weight::from_parts(42_435_773, 4181)
+			// Standard Error: 2_363
+			.saturating_add(Weight::from_parts(155_478, 0).saturating_mul(c.into()))
+			.saturating_add(T::DbWeight::get().reads(4_u64))
+			.saturating_add(T::DbWeight::get().writes(2_u64))
+			.saturating_add(Weight::from_parts(0, 61).saturating_mul(c.into()))
+	}
+	/// Storage: `CollatorSelection::Invulnerables` (r:1 w:0)
+	/// Proof: `CollatorSelection::Invulnerables` (`max_values`: Some(1), `max_size`: Some(1601), added: 2096, mode: `MaxEncodedLen`)
+	/// Storage: `CollatorSelection::CandidacyBond` (r:1 w:0)
+	/// Proof: `CollatorSelection::CandidacyBond` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	/// Storage: `Session::NextKeys` (r:1 w:0)
+	/// Proof: `Session::NextKeys` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `CollatorSelection::CandidateList` (r:1 w:1)
+	/// Proof: `CollatorSelection::CandidateList` (`max_values`: Some(1), `max_size`: Some(961), added: 1456, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:1 w:1)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `CollatorSelection::LastAuthoredBlock` (r:0 w:2)
+	/// Proof: `CollatorSelection::LastAuthoredBlock` (`max_values`: None, `max_size`: Some(44), added: 2519, mode: `MaxEncodedLen`)
+	/// The range of component `c` is `[3, 20]`.
+	fn take_candidate_slot(c: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `816 + c * (61 ±0)`
+		//  Estimated: `4281 + c * (61 ±0)`
+		// Minimum execution time: 62_318_000 picoseconds.
+		Weight::from_parts(63_110_494, 4281)
+			// Standard Error: 2_620
+			.saturating_add(Weight::from_parts(126_958, 0).saturating_mul(c.into()))
+			.saturating_add(T::DbWeight::get().reads(5_u64))
+			.saturating_add(T::DbWeight::get().writes(4_u64))
+			.saturating_add(Weight::from_parts(0, 61).saturating_mul(c.into()))
+	}
+	/// Storage: `CollatorSelection::CandidateList` (r:1 w:1)
+	/// Proof: `CollatorSelection::CandidateList` (`max_values`: Some(1), `max_size`: Some(961), added: 1456, mode: `MaxEncodedLen`)
+	/// Storage: `CollatorSelection::Invulnerables` (r:1 w:0)
+	/// Proof: `CollatorSelection::Invulnerables` (`max_values`: Some(1), `max_size`: Some(1601), added: 2096, mode: `MaxEncodedLen`)
+	/// Storage: `CollatorSelection::LastAuthoredBlock` (r:0 w:1)
+	/// Proof: `CollatorSelection::LastAuthoredBlock` (`max_values`: None, `max_size`: Some(44), added: 2519, mode: `MaxEncodedLen`)
+	/// The range of component `c` is `[3, 20]`.
+	fn leave_intent(c: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `507 + c * (48 ±0)`
+		//  Estimated: `3086`
+		// Minimum execution time: 35_326_000 picoseconds.
+		Weight::from_parts(36_271_261, 3086)
+			// Standard Error: 1_988
+			.saturating_add(Weight::from_parts(114_463, 0).saturating_mul(c.into()))
+			.saturating_add(T::DbWeight::get().reads(2_u64))
+			.saturating_add(T::DbWeight::get().writes(2_u64))
+	}
+	/// Storage: `System::Account` (r:2 w:2)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `System::BlockWeight` (r:1 w:1)
+	/// Proof: `System::BlockWeight` (`max_values`: Some(1), `max_size`: Some(48), added: 543, mode: `MaxEncodedLen`)
+	/// Storage: `CollatorSelection::LastAuthoredBlock` (r:0 w:1)
+	/// Proof: `CollatorSelection::LastAuthoredBlock` (`max_values`: None, `max_size`: Some(44), added: 2519, mode: `MaxEncodedLen`)
+	fn note_author() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `195`
+		//  Estimated: `6196`
+		// Minimum execution time: 51_400_000 picoseconds.
+		Weight::from_parts(51_952_000, 6196)
+			.saturating_add(T::DbWeight::get().reads(3_u64))
+			.saturating_add(T::DbWeight::get().writes(4_u64))
+	}
+	/// Storage: `CollatorSelection::CandidateList` (r:1 w:0)
+	/// Proof: `CollatorSelection::CandidateList` (`max_values`: Some(1), `max_size`: Some(961), added: 1456, mode: `MaxEncodedLen`)
+	/// Storage: `CollatorSelection::LastAuthoredBlock` (r:20 w:0)
+	/// Proof: `CollatorSelection::LastAuthoredBlock` (`max_values`: None, `max_size`: Some(44), added: 2519, mode: `MaxEncodedLen`)
+	/// Storage: `CollatorSelection::Invulnerables` (r:1 w:0)
+	/// Proof: `CollatorSelection::Invulnerables` (`max_values`: Some(1), `max_size`: Some(1601), added: 2096, mode: `MaxEncodedLen`)
+	/// Storage: `CollatorSelection::DesiredCandidates` (r:1 w:0)
+	/// Proof: `CollatorSelection::DesiredCandidates` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `System::BlockWeight` (r:1 w:1)
+	/// Proof: `System::BlockWeight` (`max_values`: Some(1), `max_size`: Some(48), added: 543, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:18 w:18)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// The range of component `r` is `[1, 20]`.
+	/// The range of component `c` is `[1, 20]`.
+	fn new_session(r: u32, c: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `469 + c * (98 ±0) + r * (134 ±0)`
+		//  Estimated: `3086 + c * (2519 ±2) + r * (2571 ±3)`
+		// Minimum execution time: 24_841_000 picoseconds.
+		Weight::from_parts(25_165_000, 3086)
+			// Standard Error: 302_481
+			.saturating_add(Weight::from_parts(13_592_124, 0).saturating_mul(c.into()))
+			.saturating_add(T::DbWeight::get().reads(5_u64))
+			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(c.into())))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
+			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(c.into())))
+			.saturating_add(Weight::from_parts(0, 2519).saturating_mul(c.into()))
+			.saturating_add(Weight::from_parts(0, 2571).saturating_mul(r.into()))
+	}
+}
\ No newline at end of file
diff --git a/runtime/hydradx/src/weights/council.rs b/runtime/hydradx/src/weights/pallet_collective_council.rs
similarity index 60%
rename from runtime/hydradx/src/weights/council.rs
rename to runtime/hydradx/src/weights/pallet_collective_council.rs
index caa01468f..ff44cde9c 100644
--- a/runtime/hydradx/src/weights/council.rs
+++ b/runtime/hydradx/src/weights/pallet_collective_council.rs
@@ -15,41 +15,48 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! Autogenerated weights for `council`
+
+//! Autogenerated weights for `pallet_collective_council`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-02-15, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-05-23, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: 1024
+//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024`
 
 // Executed Command:
-// target/release/hydradx
+// ./target/release/hydradx
 // benchmark
 // pallet
-// --chain=dev
-// --steps=10
-// --repeat=30
 // --wasm-execution=compiled
-// --heap-pages=4096
-// --template=.maintain/pallet-weight-template-no-back.hbs
-// --pallet=council
-// --output=./weights/council.rs
-// --extrinsic=*
+// --pallet
+// *
+// --extrinsic
+// *
+// --heap-pages
+// 4096
+// --steps
+// 50
+// --repeat
+// 20
+// --template=scripts/pallet-weight-template.hbs
+// --output
+// weights/
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
 #![allow(missing_docs)]
 
-use frame_support::{traits::Get, weights::Weight};
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
 use core::marker::PhantomData;
 
-use pallet_collective::WeightInfo;
+/// Weights for `pallet_collective_council`.
+pub struct WeightInfo<T>(PhantomData<T>);
 
-/// Weight functions for `council`.
+/// Weights for `pallet_collective_council` using the HydraDX node and recommended hardware.
 pub struct HydraWeight<T>(PhantomData<T>);
-impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
+impl<T: frame_system::Config> pallet_collective::WeightInfo for HydraWeight<T> {
 	/// Storage: `Council::Members` (r:1 w:1)
 	/// Proof: `Council::Members` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `Council::Proposals` (r:1 w:0)
@@ -64,19 +71,19 @@ impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
 	fn set_members(m: u32, _n: u32, p: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0 + m * (992 ±0) + p * (405 ±0)`
-		//  Estimated: `10288 + m * (587 ±12) + p * (2585 ±5)`
-		// Minimum execution time: 13_811_000 picoseconds.
-		Weight::from_parts(13_892_000, 10288)
-			// Standard Error: 175_369
-			.saturating_add(Weight::from_parts(2_946_800, 0).saturating_mul(m.into()))
-			// Standard Error: 76_976
-			.saturating_add(Weight::from_parts(4_083_732, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
+		//  Estimated: `4558 + m * (591 ±6) + p * (2676 ±2)`
+		// Minimum execution time: 11_286_000 picoseconds.
+		Weight::from_parts(11_629_000, 4558)
+			// Standard Error: 85_794
+			.saturating_add(Weight::from_parts(2_799_641, 0).saturating_mul(m.into()))
+			// Standard Error: 37_600
+			.saturating_add(Weight::from_parts(3_968_568, 0).saturating_mul(p.into()))
+			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(p.into())))
-			.saturating_add(T::DbWeight::get().writes(2))
+			.saturating_add(T::DbWeight::get().writes(2_u64))
 			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(p.into())))
-			.saturating_add(Weight::from_parts(0, 587).saturating_mul(m.into()))
-			.saturating_add(Weight::from_parts(0, 2585).saturating_mul(p.into()))
+			.saturating_add(Weight::from_parts(0, 591).saturating_mul(m.into()))
+			.saturating_add(Weight::from_parts(0, 2676).saturating_mul(p.into()))
 	}
 	/// Storage: `Council::Members` (r:1 w:0)
 	/// Proof: `Council::Members` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
@@ -84,15 +91,15 @@ impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
 	/// The range of component `m` is `[1, 13]`.
 	fn execute(b: u32, m: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `104 + m * (32 ±0)`
-		//  Estimated: `1589 + m * (32 ±0)`
-		// Minimum execution time: 21_838_000 picoseconds.
-		Weight::from_parts(21_813_079, 1589)
-			// Standard Error: 23
-			.saturating_add(Weight::from_parts(1_429, 0).saturating_mul(b.into()))
-			// Standard Error: 1_981
-			.saturating_add(Weight::from_parts(26_339, 0).saturating_mul(m.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
+		//  Measured:  `142 + m * (32 ±0)`
+		//  Estimated: `1627 + m * (32 ±0)`
+		// Minimum execution time: 16_578_000 picoseconds.
+		Weight::from_parts(16_660_936, 1627)
+			// Standard Error: 18
+			.saturating_add(Weight::from_parts(1_387, 0).saturating_mul(b.into()))
+			// Standard Error: 1_464
+			.saturating_add(Weight::from_parts(30_655, 0).saturating_mul(m.into()))
+			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(Weight::from_parts(0, 32).saturating_mul(m.into()))
 	}
 	/// Storage: `Council::Members` (r:1 w:0)
@@ -103,15 +110,15 @@ impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
 	/// The range of component `m` is `[1, 13]`.
 	fn propose_execute(b: u32, m: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `104 + m * (32 ±0)`
-		//  Estimated: `3569 + m * (32 ±0)`
-		// Minimum execution time: 25_493_000 picoseconds.
-		Weight::from_parts(25_297_365, 3569)
-			// Standard Error: 28
-			.saturating_add(Weight::from_parts(1_433, 0).saturating_mul(b.into()))
-			// Standard Error: 2_368
-			.saturating_add(Weight::from_parts(52_183, 0).saturating_mul(m.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
+		//  Measured:  `142 + m * (32 ±0)`
+		//  Estimated: `3607 + m * (32 ±0)`
+		// Minimum execution time: 20_205_000 picoseconds.
+		Weight::from_parts(20_185_000, 3607)
+			// Standard Error: 22
+			.saturating_add(Weight::from_parts(1_317, 0).saturating_mul(b.into()))
+			// Standard Error: 1_838
+			.saturating_add(Weight::from_parts(41_944, 0).saturating_mul(m.into()))
+			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(Weight::from_parts(0, 32).saturating_mul(m.into()))
 	}
 	/// Storage: `Council::Members` (r:1 w:0)
@@ -129,18 +136,18 @@ impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
 	/// The range of component `p` is `[1, 30]`.
 	fn propose_proposed(b: u32, m: u32, p: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `269 + m * (32 ±0) + p * (46 ±0)`
-		//  Estimated: `3676 + m * (33 ±0) + p * (48 ±0)`
-		// Minimum execution time: 32_929_000 picoseconds.
-		Weight::from_parts(33_435_771, 3676)
-			// Standard Error: 121
-			.saturating_add(Weight::from_parts(2_403, 0).saturating_mul(b.into()))
-			// Standard Error: 4_207
-			.saturating_add(Weight::from_parts(303_367, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(4))
+		//  Measured:  `240 + m * (32 ±0) + p * (47 ±0)`
+		//  Estimated: `3698 + m * (33 ±0) + p * (47 ±0)`
+		// Minimum execution time: 25_452_000 picoseconds.
+		Weight::from_parts(26_669_888, 3698)
+			// Standard Error: 55
+			.saturating_add(Weight::from_parts(2_010, 0).saturating_mul(b.into()))
+			// Standard Error: 1_915
+			.saturating_add(Weight::from_parts(265_793, 0).saturating_mul(p.into()))
+			.saturating_add(T::DbWeight::get().reads(4_u64))
+			.saturating_add(T::DbWeight::get().writes(4_u64))
 			.saturating_add(Weight::from_parts(0, 33).saturating_mul(m.into()))
-			.saturating_add(Weight::from_parts(0, 48).saturating_mul(p.into()))
+			.saturating_add(Weight::from_parts(0, 47).saturating_mul(p.into()))
 	}
 	/// Storage: `Council::Members` (r:1 w:0)
 	/// Proof: `Council::Members` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
@@ -149,14 +156,14 @@ impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
 	/// The range of component `m` is `[5, 13]`.
 	fn vote(m: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `638 + m * (64 ±0)`
-		//  Estimated: `4103 + m * (64 ±0)`
-		// Minimum execution time: 26_460_000 picoseconds.
-		Weight::from_parts(26_812_332, 4103)
-			// Standard Error: 3_093
-			.saturating_add(Weight::from_parts(29_350, 0).saturating_mul(m.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
+		//  Measured:  `676 + m * (64 ±0)`
+		//  Estimated: `4141 + m * (64 ±0)`
+		// Minimum execution time: 22_344_000 picoseconds.
+		Weight::from_parts(22_666_034, 4141)
+			// Standard Error: 2_409
+			.saturating_add(Weight::from_parts(43_981, 0).saturating_mul(m.into()))
+			.saturating_add(T::DbWeight::get().reads(2_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
 			.saturating_add(Weight::from_parts(0, 64).saturating_mul(m.into()))
 	}
 	/// Storage: `Council::Voting` (r:1 w:1)
@@ -171,17 +178,17 @@ impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
 	/// The range of component `p` is `[1, 30]`.
 	fn close_early_disapproved(m: u32, p: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `298 + m * (64 ±0) + p * (43 ±0)`
-		//  Estimated: `3710 + m * (70 ±0) + p * (44 ±0)`
-		// Minimum execution time: 34_584_000 picoseconds.
-		Weight::from_parts(34_586_760, 3710)
-			// Standard Error: 9_925
-			.saturating_add(Weight::from_parts(93_668, 0).saturating_mul(m.into()))
-			// Standard Error: 3_040
-			.saturating_add(Weight::from_parts(263_683, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(3))
-			.saturating_add(Weight::from_parts(0, 70).saturating_mul(m.into()))
+		//  Measured:  `230 + m * (64 ±0) + p * (46 ±0)`
+		//  Estimated: `3706 + m * (73 ±0) + p * (44 ±0)`
+		// Minimum execution time: 26_533_000 picoseconds.
+		Weight::from_parts(27_124_630, 3706)
+			// Standard Error: 4_230
+			.saturating_add(Weight::from_parts(68_876, 0).saturating_mul(m.into()))
+			// Standard Error: 1_367
+			.saturating_add(Weight::from_parts(235_789, 0).saturating_mul(p.into()))
+			.saturating_add(T::DbWeight::get().reads(3_u64))
+			.saturating_add(T::DbWeight::get().writes(3_u64))
+			.saturating_add(Weight::from_parts(0, 73).saturating_mul(m.into()))
 			.saturating_add(Weight::from_parts(0, 44).saturating_mul(p.into()))
 	}
 	/// Storage: `Council::Voting` (r:1 w:1)
@@ -197,21 +204,21 @@ impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
 	/// The range of component `p` is `[1, 30]`.
 	fn close_early_approved(b: u32, m: u32, p: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `543 + m * (64 ±0) + p * (56 ±0)`
-		//  Estimated: `3803 + b * (1 ±0) + m * (73 ±1) + p * (58 ±0)`
-		// Minimum execution time: 49_680_000 picoseconds.
-		Weight::from_parts(50_379_903, 3803)
-			// Standard Error: 120
-			.saturating_add(Weight::from_parts(589, 0).saturating_mul(b.into()))
-			// Standard Error: 13_657
-			.saturating_add(Weight::from_parts(65_319, 0).saturating_mul(m.into()))
-			// Standard Error: 4_179
-			.saturating_add(Weight::from_parts(296_427, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(3))
+		//  Measured:  `287 + b * (1 ±0) + m * (64 ±0) + p * (63 ±0)`
+		//  Estimated: `3673 + b * (1 ±0) + m * (79 ±0) + p * (60 ±0)`
+		// Minimum execution time: 38_440_000 picoseconds.
+		Weight::from_parts(39_162_301, 3673)
+			// Standard Error: 86
+			.saturating_add(Weight::from_parts(712, 0).saturating_mul(b.into()))
+			// Standard Error: 9_216
+			.saturating_add(Weight::from_parts(58_487, 0).saturating_mul(m.into()))
+			// Standard Error: 2_985
+			.saturating_add(Weight::from_parts(256_797, 0).saturating_mul(p.into()))
+			.saturating_add(T::DbWeight::get().reads(4_u64))
+			.saturating_add(T::DbWeight::get().writes(3_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(b.into()))
-			.saturating_add(Weight::from_parts(0, 73).saturating_mul(m.into()))
-			.saturating_add(Weight::from_parts(0, 58).saturating_mul(p.into()))
+			.saturating_add(Weight::from_parts(0, 79).saturating_mul(m.into()))
+			.saturating_add(Weight::from_parts(0, 60).saturating_mul(p.into()))
 	}
 	/// Storage: `Council::Voting` (r:1 w:1)
 	/// Proof: `Council::Voting` (`max_values`: None, `max_size`: None, mode: `Measured`)
@@ -227,17 +234,17 @@ impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
 	/// The range of component `p` is `[1, 30]`.
 	fn close_disapproved(m: u32, p: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `318 + m * (64 ±0) + p * (43 ±0)`
-		//  Estimated: `3730 + m * (70 ±0) + p * (44 ±0)`
-		// Minimum execution time: 37_700_000 picoseconds.
-		Weight::from_parts(38_156_308, 3730)
-			// Standard Error: 10_153
-			.saturating_add(Weight::from_parts(60_234, 0).saturating_mul(m.into()))
-			// Standard Error: 3_109
-			.saturating_add(Weight::from_parts(263_287, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(3))
-			.saturating_add(Weight::from_parts(0, 70).saturating_mul(m.into()))
+		//  Measured:  `250 + m * (64 ±0) + p * (46 ±0)`
+		//  Estimated: `3726 + m * (73 ±0) + p * (44 ±0)`
+		// Minimum execution time: 28_400_000 picoseconds.
+		Weight::from_parts(29_248_623, 3726)
+			// Standard Error: 4_444
+			.saturating_add(Weight::from_parts(61_742, 0).saturating_mul(m.into()))
+			// Standard Error: 1_436
+			.saturating_add(Weight::from_parts(232_658, 0).saturating_mul(p.into()))
+			.saturating_add(T::DbWeight::get().reads(4_u64))
+			.saturating_add(T::DbWeight::get().writes(3_u64))
+			.saturating_add(Weight::from_parts(0, 73).saturating_mul(m.into()))
 			.saturating_add(Weight::from_parts(0, 44).saturating_mul(p.into()))
 	}
 	/// Storage: `Council::Voting` (r:1 w:1)
@@ -255,21 +262,21 @@ impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
 	/// The range of component `p` is `[1, 30]`.
 	fn close_approved(b: u32, m: u32, p: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `563 + m * (64 ±0) + p * (56 ±0)`
-		//  Estimated: `3823 + b * (1 ±0) + m * (73 ±1) + p * (58 ±0)`
-		// Minimum execution time: 52_927_000 picoseconds.
-		Weight::from_parts(54_289_519, 3823)
-			// Standard Error: 189
-			.saturating_add(Weight::from_parts(215, 0).saturating_mul(b.into()))
-			// Standard Error: 21_474
-			.saturating_add(Weight::from_parts(60_622, 0).saturating_mul(m.into()))
-			// Standard Error: 6_571
-			.saturating_add(Weight::from_parts(292_243, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(3))
+		//  Measured:  `307 + b * (1 ±0) + m * (64 ±0) + p * (63 ±0)`
+		//  Estimated: `3693 + b * (1 ±0) + m * (79 ±0) + p * (60 ±0)`
+		// Minimum execution time: 40_214_000 picoseconds.
+		Weight::from_parts(41_333_979, 3693)
+			// Standard Error: 96
+			.saturating_add(Weight::from_parts(683, 0).saturating_mul(b.into()))
+			// Standard Error: 10_270
+			.saturating_add(Weight::from_parts(65_332, 0).saturating_mul(m.into()))
+			// Standard Error: 3_326
+			.saturating_add(Weight::from_parts(262_392, 0).saturating_mul(p.into()))
+			.saturating_add(T::DbWeight::get().reads(5_u64))
+			.saturating_add(T::DbWeight::get().writes(3_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(b.into()))
-			.saturating_add(Weight::from_parts(0, 73).saturating_mul(m.into()))
-			.saturating_add(Weight::from_parts(0, 58).saturating_mul(p.into()))
+			.saturating_add(Weight::from_parts(0, 79).saturating_mul(m.into()))
+			.saturating_add(Weight::from_parts(0, 60).saturating_mul(p.into()))
 	}
 	/// Storage: `Council::Proposals` (r:1 w:1)
 	/// Proof: `Council::Proposals` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
@@ -280,14 +287,14 @@ impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
 	/// The range of component `p` is `[1, 30]`.
 	fn disapprove_proposal(p: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `260 + p * (32 ±0)`
-		//  Estimated: `1745 + p * (32 ±0)`
-		// Minimum execution time: 22_476_000 picoseconds.
-		Weight::from_parts(23_113_774, 1745)
-			// Standard Error: 2_083
-			.saturating_add(Weight::from_parts(201_829, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(3))
+		//  Measured:  `298 + p * (32 ±0)`
+		//  Estimated: `1783 + p * (32 ±0)`
+		// Minimum execution time: 16_958_000 picoseconds.
+		Weight::from_parts(18_103_927, 1783)
+			// Standard Error: 1_669
+			.saturating_add(Weight::from_parts(186_175, 0).saturating_mul(p.into()))
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().writes(3_u64))
 			.saturating_add(Weight::from_parts(0, 32).saturating_mul(p.into()))
 	}
-}
+}
\ No newline at end of file
diff --git a/runtime/hydradx/src/weights/technical_committee.rs b/runtime/hydradx/src/weights/pallet_collective_technical_committee.rs
similarity index 62%
rename from runtime/hydradx/src/weights/technical_committee.rs
rename to runtime/hydradx/src/weights/pallet_collective_technical_committee.rs
index f8e7d2eb2..aba61868a 100644
--- a/runtime/hydradx/src/weights/technical_committee.rs
+++ b/runtime/hydradx/src/weights/pallet_collective_technical_committee.rs
@@ -15,41 +15,48 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-//! Autogenerated weights for `tech`
+
+//! Autogenerated weights for `pallet_collective_technical_committee`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-02-15, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-05-23, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: 1024
+//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024`
 
 // Executed Command:
-// target/release/hydradx
+// ./target/release/hydradx
 // benchmark
 // pallet
-// --chain=dev
-// --steps=10
-// --repeat=30
 // --wasm-execution=compiled
-// --heap-pages=4096
-// --template=.maintain/pallet-weight-template-no-back.hbs
-// --pallet=tech
-// --output=./weights/technical_committee.rs
-// --extrinsic=*
+// --pallet
+// *
+// --extrinsic
+// *
+// --heap-pages
+// 4096
+// --steps
+// 50
+// --repeat
+// 20
+// --template=scripts/pallet-weight-template.hbs
+// --output
+// weights/
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
 #![allow(missing_docs)]
 
-use frame_support::{traits::Get, weights::Weight};
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
 use core::marker::PhantomData;
 
-use pallet_collective::WeightInfo;
+/// Weights for `pallet_collective_technical_committee`.
+pub struct WeightInfo<T>(PhantomData<T>);
 
-/// Weight functions for `tech`.
+/// Weights for `pallet_collective_technical_committee` using the HydraDX node and recommended hardware.
 pub struct HydraWeight<T>(PhantomData<T>);
-impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
+impl<T: frame_system::Config> pallet_collective::WeightInfo for HydraWeight<T> {
 	/// Storage: `TechnicalCommittee::Members` (r:1 w:1)
 	/// Proof: `TechnicalCommittee::Members` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `TechnicalCommittee::Proposals` (r:1 w:0)
@@ -64,19 +71,19 @@ impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
 	fn set_members(m: u32, _n: u32, p: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0 + m * (672 ±0) + p * (310 ±0)`
-		//  Estimated: `7085 + m * (396 ±7) + p * (2539 ±3)`
-		// Minimum execution time: 13_876_000 picoseconds.
-		Weight::from_parts(14_129_000, 7085)
-			// Standard Error: 155_547
-			.saturating_add(Weight::from_parts(2_657_114, 0).saturating_mul(m.into()))
-			// Standard Error: 78_133
-			.saturating_add(Weight::from_parts(4_151_945, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
+		//  Estimated: `4294 + m * (398 ±6) + p * (2601 ±3)`
+		// Minimum execution time: 9_616_000 picoseconds.
+		Weight::from_parts(9_877_000, 4294)
+			// Standard Error: 79_646
+			.saturating_add(Weight::from_parts(2_589_295, 0).saturating_mul(m.into()))
+			// Standard Error: 40_276
+			.saturating_add(Weight::from_parts(3_788_958, 0).saturating_mul(p.into()))
+			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(p.into())))
-			.saturating_add(T::DbWeight::get().writes(2))
+			.saturating_add(T::DbWeight::get().writes(2_u64))
 			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(p.into())))
-			.saturating_add(Weight::from_parts(0, 396).saturating_mul(m.into()))
-			.saturating_add(Weight::from_parts(0, 2539).saturating_mul(p.into()))
+			.saturating_add(Weight::from_parts(0, 398).saturating_mul(m.into()))
+			.saturating_add(Weight::from_parts(0, 2601).saturating_mul(p.into()))
 	}
 	/// Storage: `TechnicalCommittee::Members` (r:1 w:0)
 	/// Proof: `TechnicalCommittee::Members` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
@@ -85,14 +92,14 @@ impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
 	fn execute(b: u32, m: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `70 + m * (32 ±0)`
-		//  Estimated: `1555 + m * (32 ±0)`
-		// Minimum execution time: 22_086_000 picoseconds.
-		Weight::from_parts(22_142_927, 1555)
-			// Standard Error: 27
-			.saturating_add(Weight::from_parts(1_188, 0).saturating_mul(b.into()))
-			// Standard Error: 3_174
-			.saturating_add(Weight::from_parts(24_985, 0).saturating_mul(m.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
+		//  Estimated: `1554 + m * (32 ±0)`
+		// Minimum execution time: 16_076_000 picoseconds.
+		Weight::from_parts(16_132_471, 1554)
+			// Standard Error: 18
+			.saturating_add(Weight::from_parts(1_291, 0).saturating_mul(b.into()))
+			// Standard Error: 1_971
+			.saturating_add(Weight::from_parts(33_929, 0).saturating_mul(m.into()))
+			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(Weight::from_parts(0, 32).saturating_mul(m.into()))
 	}
 	/// Storage: `TechnicalCommittee::Members` (r:1 w:0)
@@ -104,14 +111,14 @@ impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
 	fn propose_execute(b: u32, m: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `70 + m * (32 ±0)`
-		//  Estimated: `3535 + m * (32 ±0)`
-		// Minimum execution time: 25_870_000 picoseconds.
-		Weight::from_parts(25_809_413, 3535)
-			// Standard Error: 26
-			.saturating_add(Weight::from_parts(1_349, 0).saturating_mul(b.into()))
-			// Standard Error: 3_065
-			.saturating_add(Weight::from_parts(39_651, 0).saturating_mul(m.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
+		//  Estimated: `3534 + m * (32 ±0)`
+		// Minimum execution time: 19_545_000 picoseconds.
+		Weight::from_parts(19_640_829, 3534)
+			// Standard Error: 20
+			.saturating_add(Weight::from_parts(1_179, 0).saturating_mul(b.into()))
+			// Standard Error: 2_162
+			.saturating_add(Weight::from_parts(53_156, 0).saturating_mul(m.into()))
+			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(Weight::from_parts(0, 32).saturating_mul(m.into()))
 	}
 	/// Storage: `TechnicalCommittee::Members` (r:1 w:0)
@@ -129,20 +136,20 @@ impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
 	/// The range of component `p` is `[1, 20]`.
 	fn propose_proposed(b: u32, m: u32, p: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `156 + m * (32 ±0) + p * (50 ±0)`
-		//  Estimated: `3574 + m * (32 ±0) + p * (53 ±0)`
-		// Minimum execution time: 33_389_000 picoseconds.
-		Weight::from_parts(33_070_270, 3574)
-			// Standard Error: 101
-			.saturating_add(Weight::from_parts(2_087, 0).saturating_mul(b.into()))
-			// Standard Error: 12_061
-			.saturating_add(Weight::from_parts(57_103, 0).saturating_mul(m.into()))
-			// Standard Error: 5_380
-			.saturating_add(Weight::from_parts(365_489, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(4))
+		//  Measured:  `177 + m * (32 ±0) + p * (50 ±0)`
+		//  Estimated: `3603 + m * (32 ±0) + p * (51 ±0)`
+		// Minimum execution time: 24_738_000 picoseconds.
+		Weight::from_parts(24_878_771, 3603)
+			// Standard Error: 57
+			.saturating_add(Weight::from_parts(2_030, 0).saturating_mul(b.into()))
+			// Standard Error: 6_810
+			.saturating_add(Weight::from_parts(25_109, 0).saturating_mul(m.into()))
+			// Standard Error: 3_000
+			.saturating_add(Weight::from_parts(316_328, 0).saturating_mul(p.into()))
+			.saturating_add(T::DbWeight::get().reads(4_u64))
+			.saturating_add(T::DbWeight::get().writes(4_u64))
 			.saturating_add(Weight::from_parts(0, 32).saturating_mul(m.into()))
-			.saturating_add(Weight::from_parts(0, 53).saturating_mul(p.into()))
+			.saturating_add(Weight::from_parts(0, 51).saturating_mul(p.into()))
 	}
 	/// Storage: `TechnicalCommittee::Members` (r:1 w:0)
 	/// Proof: `TechnicalCommittee::Members` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
@@ -153,12 +160,12 @@ impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `538 + m * (64 ±0)`
 		//  Estimated: `4003 + m * (64 ±0)`
-		// Minimum execution time: 26_815_000 picoseconds.
-		Weight::from_parts(27_021_617, 4003)
-			// Standard Error: 4_949
-			.saturating_add(Weight::from_parts(61_849, 0).saturating_mul(m.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
+		// Minimum execution time: 20_889_000 picoseconds.
+		Weight::from_parts(21_391_520, 4003)
+			// Standard Error: 2_823
+			.saturating_add(Weight::from_parts(52_007, 0).saturating_mul(m.into()))
+			.saturating_add(T::DbWeight::get().reads(2_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
 			.saturating_add(Weight::from_parts(0, 64).saturating_mul(m.into()))
 	}
 	/// Storage: `TechnicalCommittee::Voting` (r:1 w:1)
@@ -173,18 +180,18 @@ impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
 	/// The range of component `p` is `[1, 20]`.
 	fn close_early_disapproved(m: u32, p: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `208 + m * (64 ±0) + p * (49 ±0)`
-		//  Estimated: `3640 + m * (69 ±0) + p * (50 ±0)`
-		// Minimum execution time: 35_042_000 picoseconds.
-		Weight::from_parts(36_087_417, 3640)
-			// Standard Error: 12_149
-			.saturating_add(Weight::from_parts(3_876, 0).saturating_mul(m.into()))
-			// Standard Error: 3_989
-			.saturating_add(Weight::from_parts(297_818, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(3))
-			.saturating_add(Weight::from_parts(0, 69).saturating_mul(m.into()))
-			.saturating_add(Weight::from_parts(0, 50).saturating_mul(p.into()))
+		//  Measured:  `138 + m * (64 ±0) + p * (53 ±0)`
+		//  Estimated: `3607 + m * (72 ±0) + p * (51 ±0)`
+		// Minimum execution time: 25_576_000 picoseconds.
+		Weight::from_parts(26_386_679, 3607)
+			// Standard Error: 5_989
+			.saturating_add(Weight::from_parts(49_264, 0).saturating_mul(m.into()))
+			// Standard Error: 2_018
+			.saturating_add(Weight::from_parts(272_822, 0).saturating_mul(p.into()))
+			.saturating_add(T::DbWeight::get().reads(3_u64))
+			.saturating_add(T::DbWeight::get().writes(3_u64))
+			.saturating_add(Weight::from_parts(0, 72).saturating_mul(m.into()))
+			.saturating_add(Weight::from_parts(0, 51).saturating_mul(p.into()))
 	}
 	/// Storage: `TechnicalCommittee::Voting` (r:1 w:1)
 	/// Proof: `TechnicalCommittee::Voting` (`max_values`: None, `max_size`: None, mode: `Measured`)
@@ -199,21 +206,21 @@ impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
 	/// The range of component `p` is `[1, 20]`.
 	fn close_early_approved(b: u32, m: u32, p: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `290 + b * (1 ±0) + m * (64 ±0) + p * (65 ±0)`
-		//  Estimated: `3656 + b * (1 ±0) + m * (69 ±1) + p * (66 ±0)`
-		// Minimum execution time: 50_836_000 picoseconds.
-		Weight::from_parts(50_461_445, 3656)
-			// Standard Error: 117
-			.saturating_add(Weight::from_parts(1_279, 0).saturating_mul(b.into()))
-			// Standard Error: 18_953
-			.saturating_add(Weight::from_parts(100_270, 0).saturating_mul(m.into()))
-			// Standard Error: 6_210
-			.saturating_add(Weight::from_parts(330_642, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(3))
+		//  Measured:  `354 + b * (1 ±0) + m * (64 ±0) + p * (65 ±0)`
+		//  Estimated: `3720 + b * (1 ±0) + m * (69 ±1) + p * (67 ±0)`
+		// Minimum execution time: 37_239_000 picoseconds.
+		Weight::from_parts(38_650_447, 3720)
+			// Standard Error: 60
+			.saturating_add(Weight::from_parts(775, 0).saturating_mul(b.into()))
+			// Standard Error: 9_335
+			.saturating_add(Weight::from_parts(1_446, 0).saturating_mul(m.into()))
+			// Standard Error: 3_152
+			.saturating_add(Weight::from_parts(297_389, 0).saturating_mul(p.into()))
+			.saturating_add(T::DbWeight::get().reads(4_u64))
+			.saturating_add(T::DbWeight::get().writes(3_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(b.into()))
 			.saturating_add(Weight::from_parts(0, 69).saturating_mul(m.into()))
-			.saturating_add(Weight::from_parts(0, 66).saturating_mul(p.into()))
+			.saturating_add(Weight::from_parts(0, 67).saturating_mul(p.into()))
 	}
 	/// Storage: `TechnicalCommittee::Voting` (r:1 w:1)
 	/// Proof: `TechnicalCommittee::Voting` (`max_values`: None, `max_size`: None, mode: `Measured`)
@@ -229,18 +236,18 @@ impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
 	/// The range of component `p` is `[1, 20]`.
 	fn close_disapproved(m: u32, p: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `228 + m * (64 ±0) + p * (49 ±0)`
-		//  Estimated: `3660 + m * (69 ±0) + p * (50 ±0)`
-		// Minimum execution time: 38_419_000 picoseconds.
-		Weight::from_parts(39_480_671, 3660)
-			// Standard Error: 14_633
-			.saturating_add(Weight::from_parts(23_963, 0).saturating_mul(m.into()))
-			// Standard Error: 4_805
-			.saturating_add(Weight::from_parts(275_614, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(3))
-			.saturating_add(Weight::from_parts(0, 69).saturating_mul(m.into()))
-			.saturating_add(Weight::from_parts(0, 50).saturating_mul(p.into()))
+		//  Measured:  `158 + m * (64 ±0) + p * (53 ±0)`
+		//  Estimated: `3627 + m * (72 ±0) + p * (51 ±0)`
+		// Minimum execution time: 27_216_000 picoseconds.
+		Weight::from_parts(27_995_790, 3627)
+			// Standard Error: 6_780
+			.saturating_add(Weight::from_parts(65_739, 0).saturating_mul(m.into()))
+			// Standard Error: 2_284
+			.saturating_add(Weight::from_parts(275_133, 0).saturating_mul(p.into()))
+			.saturating_add(T::DbWeight::get().reads(4_u64))
+			.saturating_add(T::DbWeight::get().writes(3_u64))
+			.saturating_add(Weight::from_parts(0, 72).saturating_mul(m.into()))
+			.saturating_add(Weight::from_parts(0, 51).saturating_mul(p.into()))
 	}
 	/// Storage: `TechnicalCommittee::Voting` (r:1 w:1)
 	/// Proof: `TechnicalCommittee::Voting` (`max_values`: None, `max_size`: None, mode: `Measured`)
@@ -257,21 +264,21 @@ impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
 	/// The range of component `p` is `[1, 20]`.
 	fn close_approved(b: u32, m: u32, p: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `310 + b * (1 ±0) + m * (64 ±0) + p * (65 ±0)`
-		//  Estimated: `3676 + b * (1 ±0) + m * (69 ±1) + p * (66 ±0)`
-		// Minimum execution time: 53_648_000 picoseconds.
-		Weight::from_parts(54_698_175, 3676)
-			// Standard Error: 135
-			.saturating_add(Weight::from_parts(1_012, 0).saturating_mul(b.into()))
-			// Standard Error: 21_972
-			.saturating_add(Weight::from_parts(50_246, 0).saturating_mul(m.into()))
-			// Standard Error: 7_199
-			.saturating_add(Weight::from_parts(311_701, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(3))
+		//  Measured:  `374 + b * (1 ±0) + m * (64 ±0) + p * (65 ±0)`
+		//  Estimated: `3740 + b * (1 ±0) + m * (69 ±1) + p * (67 ±0)`
+		// Minimum execution time: 39_231_000 picoseconds.
+		Weight::from_parts(40_142_591, 3740)
+			// Standard Error: 61
+			.saturating_add(Weight::from_parts(918, 0).saturating_mul(b.into()))
+			// Standard Error: 9_490
+			.saturating_add(Weight::from_parts(57_925, 0).saturating_mul(m.into()))
+			// Standard Error: 3_205
+			.saturating_add(Weight::from_parts(295_348, 0).saturating_mul(p.into()))
+			.saturating_add(T::DbWeight::get().reads(5_u64))
+			.saturating_add(T::DbWeight::get().writes(3_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(b.into()))
 			.saturating_add(Weight::from_parts(0, 69).saturating_mul(m.into()))
-			.saturating_add(Weight::from_parts(0, 66).saturating_mul(p.into()))
+			.saturating_add(Weight::from_parts(0, 67).saturating_mul(p.into()))
 	}
 	/// Storage: `TechnicalCommittee::Proposals` (r:1 w:1)
 	/// Proof: `TechnicalCommittee::Proposals` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
@@ -284,12 +291,12 @@ impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `226 + p * (32 ±0)`
 		//  Estimated: `1711 + p * (32 ±0)`
-		// Minimum execution time: 22_647_000 picoseconds.
-		Weight::from_parts(23_173_979, 1711)
-			// Standard Error: 3_421
-			.saturating_add(Weight::from_parts(222_829, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(3))
+		// Minimum execution time: 16_476_000 picoseconds.
+		Weight::from_parts(17_143_541, 1711)
+			// Standard Error: 1_630
+			.saturating_add(Weight::from_parts(228_198, 0).saturating_mul(p.into()))
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().writes(3_u64))
 			.saturating_add(Weight::from_parts(0, 32).saturating_mul(p.into()))
 	}
-}
+}
\ No newline at end of file
diff --git a/runtime/hydradx/src/weights/currencies.rs b/runtime/hydradx/src/weights/pallet_currencies.rs
similarity index 73%
rename from runtime/hydradx/src/weights/currencies.rs
rename to runtime/hydradx/src/weights/pallet_currencies.rs
index 429c4d4cd..2b2a6579b 100644
--- a/runtime/hydradx/src/weights/currencies.rs
+++ b/runtime/hydradx/src/weights/pallet_currencies.rs
@@ -15,37 +15,46 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+
 //! Autogenerated weights for `pallet_currencies`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-02-15, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-05-23, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: 1024
+//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024`
 
 // Executed Command:
-// target/release/hydradx
+// ./target/release/hydradx
 // benchmark
 // pallet
-// --chain=dev
-// --steps=10
-// --repeat=30
 // --wasm-execution=compiled
-// --heap-pages=4096
-// --template=.maintain/pallet-weight-template-no-back.hbs
-// --pallet=pallet-currencies
-// --output=./weights/currencies.rs
-// --extrinsic=*
+// --pallet
+// *
+// --extrinsic
+// *
+// --heap-pages
+// 4096
+// --steps
+// 50
+// --repeat
+// 20
+// --template=scripts/pallet-weight-template.hbs
+// --output
+// weights/
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
 #![allow(missing_docs)]
 
-use frame_support::{traits::Get, weights::Weight};
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
 use core::marker::PhantomData;
 
-/// Weight functions for `pallet_currencies`.
+/// Weights for `pallet_currencies`.
+pub struct WeightInfo<T>(PhantomData<T>);
+
+/// Weights for `pallet_currencies` using the HydraDX node and recommended hardware.
 pub struct HydraWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> pallet_currencies::WeightInfo for HydraWeight<T> {
 	/// Storage: `Duster::AccountBlacklist` (r:1 w:0)
@@ -64,23 +73,23 @@ impl<T: frame_system::Config> pallet_currencies::WeightInfo for HydraWeight<T> {
 	/// Proof: `MultiTransactionPayment::AcceptedCurrencies` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
 	fn transfer_non_native_currency() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2513`
+		//  Measured:  `2649`
 		//  Estimated: `6156`
-		// Minimum execution time: 108_145_000 picoseconds.
-		Weight::from_parts(109_086_000, 6156)
-			.saturating_add(T::DbWeight::get().reads(8))
-			.saturating_add(T::DbWeight::get().writes(4))
+		// Minimum execution time: 89_816_000 picoseconds.
+		Weight::from_parts(90_275_000, 6156)
+			.saturating_add(T::DbWeight::get().reads(8_u64))
+			.saturating_add(T::DbWeight::get().writes(4_u64))
 	}
 	/// Storage: `System::Account` (r:1 w:1)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn transfer_native_currency() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1672`
+		//  Measured:  `1642`
 		//  Estimated: `3593`
-		// Minimum execution time: 89_180_000 picoseconds.
-		Weight::from_parts(89_986_000, 3593)
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
+		// Minimum execution time: 70_873_000 picoseconds.
+		Weight::from_parts(71_750_000, 3593)
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	/// Storage: `AssetRegistry::BannedAssets` (r:1 w:0)
 	/// Proof: `AssetRegistry::BannedAssets` (`max_values`: None, `max_size`: Some(20), added: 2495, mode: `MaxEncodedLen`)
@@ -98,33 +107,33 @@ impl<T: frame_system::Config> pallet_currencies::WeightInfo for HydraWeight<T> {
 	/// Proof: `MultiTransactionPayment::AcceptedCurrencies` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
 	fn update_balance_non_native_currency() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2143`
+		//  Measured:  `2213`
 		//  Estimated: `3593`
-		// Minimum execution time: 78_116_000 picoseconds.
-		Weight::from_parts(78_984_000, 3593)
-			.saturating_add(T::DbWeight::get().reads(7))
-			.saturating_add(T::DbWeight::get().writes(3))
+		// Minimum execution time: 62_719_000 picoseconds.
+		Weight::from_parts(63_335_000, 3593)
+			.saturating_add(T::DbWeight::get().reads(7_u64))
+			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
 	/// Storage: `System::Account` (r:1 w:1)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn update_balance_native_currency_creating() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1532`
+		//  Measured:  `1502`
 		//  Estimated: `3593`
-		// Minimum execution time: 52_733_000 picoseconds.
-		Weight::from_parts(53_610_000, 3593)
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
+		// Minimum execution time: 38_419_000 picoseconds.
+		Weight::from_parts(39_090_000, 3593)
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	/// Storage: `System::Account` (r:1 w:1)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn update_balance_native_currency_killing() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1620`
+		//  Measured:  `1590`
 		//  Estimated: `3593`
-		// Minimum execution time: 52_641_000 picoseconds.
-		Weight::from_parts(53_186_000, 3593)
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
+		// Minimum execution time: 40_366_000 picoseconds.
+		Weight::from_parts(41_238_000, 3593)
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 }
\ No newline at end of file
diff --git a/runtime/hydradx/src/weights/dca.rs b/runtime/hydradx/src/weights/pallet_dca.rs
similarity index 81%
rename from runtime/hydradx/src/weights/dca.rs
rename to runtime/hydradx/src/weights/pallet_dca.rs
index 143e19da8..c8886746b 100644
--- a/runtime/hydradx/src/weights/dca.rs
+++ b/runtime/hydradx/src/weights/pallet_dca.rs
@@ -15,13 +15,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+
 //! Autogenerated weights for `pallet_dca`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-02-15, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-05-24, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: 1024
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
 
 // Executed Command:
 // target/release/hydradx
@@ -32,9 +33,9 @@
 // --repeat=30
 // --wasm-execution=compiled
 // --heap-pages=4096
-// --template=.maintain/pallet-weight-template-no-back.hbs
-// --pallet=pallet_dca
-// --output=./weights/dca.rs
+// --template=scripts/pallet-weight-template.hbs
+// --pallet=pallet-dca
+// --output=weights/dca.rs
 // --extrinsic=*
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
@@ -42,14 +43,15 @@
 #![allow(unused_imports)]
 #![allow(missing_docs)]
 
-use frame_support::{traits::Get, weights::Weight};
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
 use core::marker::PhantomData;
 
-use pallet_dca::weights::WeightInfo;
+/// Weights for `pallet_dca`.
+pub struct WeightInfo<T>(PhantomData<T>);
 
-/// Weight functions for `pallet_dca`.
+/// Weights for `pallet_dca` using the HydraDX node and recommended hardware.
 pub struct HydraWeight<T>(PhantomData<T>);
-impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
+impl<T: frame_system::Config> pallet_dca::WeightInfo for HydraWeight<T> {
 	/// Storage: `DCA::ScheduleIdsPerBlock` (r:12 w:2)
 	/// Proof: `DCA::ScheduleIdsPerBlock` (`max_values`: None, `max_size`: Some(101), added: 2576, mode: `MaxEncodedLen`)
 	/// Storage: `DCA::Schedules` (r:1 w:0)
@@ -64,12 +66,12 @@ impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
 	/// Proof: `DCA::RetriesOnError` (`max_values`: None, `max_size`: Some(21), added: 2496, mode: `MaxEncodedLen`)
 	fn on_initialize_with_buy_trade() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `54411`
+		//  Measured:  `54485`
 		//  Estimated: `31902`
-		// Minimum execution time: 237_105_000 picoseconds.
-		Weight::from_parts(240_959_000, 31902)
-			.saturating_add(T::DbWeight::get().reads(17))
-			.saturating_add(T::DbWeight::get().writes(7))
+		// Minimum execution time: 207_153_000 picoseconds.
+		Weight::from_parts(209_471_000, 31902)
+			.saturating_add(T::DbWeight::get().reads(17_u64))
+			.saturating_add(T::DbWeight::get().writes(7_u64))
 	}
 	/// Storage: `DCA::ScheduleIdsPerBlock` (r:12 w:2)
 	/// Proof: `DCA::ScheduleIdsPerBlock` (`max_values`: None, `max_size`: Some(101), added: 2576, mode: `MaxEncodedLen`)
@@ -85,12 +87,12 @@ impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
 	/// Proof: `DCA::RetriesOnError` (`max_values`: None, `max_size`: Some(21), added: 2496, mode: `MaxEncodedLen`)
 	fn on_initialize_with_sell_trade() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `54411`
+		//  Measured:  `54593`
 		//  Estimated: `31902`
-		// Minimum execution time: 238_379_000 picoseconds.
-		Weight::from_parts(241_004_000, 31902)
-			.saturating_add(T::DbWeight::get().reads(17))
-			.saturating_add(T::DbWeight::get().writes(7))
+		// Minimum execution time: 206_729_000 picoseconds.
+		Weight::from_parts(210_115_000, 31902)
+			.saturating_add(T::DbWeight::get().reads(17_u64))
+			.saturating_add(T::DbWeight::get().writes(7_u64))
 	}
 	/// Storage: `DCA::ScheduleIdsPerBlock` (r:1 w:0)
 	/// Proof: `DCA::ScheduleIdsPerBlock` (`max_values`: None, `max_size`: Some(101), added: 2576, mode: `MaxEncodedLen`)
@@ -98,9 +100,9 @@ impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `1075`
 		//  Estimated: `3566`
-		// Minimum execution time: 17_306_000 picoseconds.
-		Weight::from_parts(17_642_000, 3566)
-			.saturating_add(T::DbWeight::get().reads(1))
+		// Minimum execution time: 14_273_000 picoseconds.
+		Weight::from_parts(14_864_000, 3566)
+			.saturating_add(T::DbWeight::get().reads(1_u64))
 	}
 	/// Storage: `MultiTransactionPayment::AcceptedCurrencies` (r:1 w:0)
 	/// Proof: `MultiTransactionPayment::AcceptedCurrencies` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
@@ -126,12 +128,12 @@ impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
 	/// Proof: `DCA::RemainingAmounts` (`max_values`: None, `max_size`: Some(36), added: 2511, mode: `MaxEncodedLen`)
 	fn schedule() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `52552`
+		//  Measured:  `52618`
 		//  Estimated: `29326`
-		// Minimum execution time: 174_494_000 picoseconds.
-		Weight::from_parts(176_197_000, 29326)
-			.saturating_add(T::DbWeight::get().reads(17))
-			.saturating_add(T::DbWeight::get().writes(8))
+		// Minimum execution time: 153_135_000 picoseconds.
+		Weight::from_parts(155_526_000, 29326)
+			.saturating_add(T::DbWeight::get().reads(17_u64))
+			.saturating_add(T::DbWeight::get().writes(8_u64))
 	}
 	/// Storage: `DCA::Schedules` (r:1 w:1)
 	/// Proof: `DCA::Schedules` (`max_values`: None, `max_size`: Some(191), added: 2666, mode: `MaxEncodedLen`)
@@ -149,11 +151,11 @@ impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
 	/// Proof: `DCA::ScheduleOwnership` (`max_values`: None, `max_size`: Some(60), added: 2535, mode: `MaxEncodedLen`)
 	fn terminate() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2526`
+		//  Measured:  `2492`
 		//  Estimated: `4714`
-		// Minimum execution time: 80_303_000 picoseconds.
-		Weight::from_parts(81_183_000, 4714)
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(7))
+		// Minimum execution time: 70_794_000 picoseconds.
+		Weight::from_parts(71_685_000, 4714)
+			.saturating_add(T::DbWeight::get().reads(5_u64))
+			.saturating_add(T::DbWeight::get().writes(7_u64))
 	}
-}
+}
\ No newline at end of file
diff --git a/runtime/hydradx/src/weights/democracy.rs b/runtime/hydradx/src/weights/pallet_democracy.rs
similarity index 74%
rename from runtime/hydradx/src/weights/democracy.rs
rename to runtime/hydradx/src/weights/pallet_democracy.rs
index 932b44d6c..4c1ad0cb3 100644
--- a/runtime/hydradx/src/weights/democracy.rs
+++ b/runtime/hydradx/src/weights/pallet_democracy.rs
@@ -15,39 +15,41 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+
 //! Autogenerated weights for `pallet_democracy`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-05-25, STEPS: `5`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-05-29, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: 1024
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
 
 // Executed Command:
 // target/release/hydradx
 // benchmark
 // pallet
-// --pallet=pallet-democracy
+// --chain=dev
+// --steps=10
+// --repeat=30
 // --wasm-execution=compiled
 // --heap-pages=4096
-// --chain=dev
+// --template=scripts/pallet-weight-template.hbs
+// --pallet=pallet-democracy
+// --output=weights/democracy.rs
 // --extrinsic=*
-// --steps=5
-// --repeat=20
-// --output
-// democracy.rs
-// --template
-// .maintain/pallet-weight-template-no-back.hbs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
 #![allow(missing_docs)]
 
-use frame_support::{traits::Get, weights::Weight};
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
 use core::marker::PhantomData;
 
-/// Weight functions for `pallet_democracy`.
+/// Weights for `pallet_democracy`.
+pub struct WeightInfo<T>(PhantomData<T>);
+
+/// Weights for `pallet_democracy` using the HydraDX node and recommended hardware.
 pub struct HydraWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> pallet_democracy::WeightInfo for HydraWeight<T> {
 	/// Storage: `Democracy::PublicPropCount` (r:1 w:1)
@@ -62,10 +64,10 @@ impl<T: frame_system::Config> pallet_democracy::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `4688`
 		//  Estimated: `18187`
-		// Minimum execution time: 50_527_000 picoseconds.
-		Weight::from_parts(51_295_000, 18187)
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(3))
+		// Minimum execution time: 41_701_000 picoseconds.
+		Weight::from_parts(42_235_000, 18187)
+			.saturating_add(T::DbWeight::get().reads(3_u64))
+			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
 	/// Storage: `Democracy::DepositOf` (r:1 w:1)
 	/// Proof: `Democracy::DepositOf` (`max_values`: None, `max_size`: Some(3230), added: 5705, mode: `MaxEncodedLen`)
@@ -73,10 +75,10 @@ impl<T: frame_system::Config> pallet_democracy::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `3443`
 		//  Estimated: `6695`
-		// Minimum execution time: 45_099_000 picoseconds.
-		Weight::from_parts(46_045_000, 6695)
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
+		// Minimum execution time: 39_489_000 picoseconds.
+		Weight::from_parts(40_100_000, 6695)
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	/// Storage: `Democracy::ReferendumInfoOf` (r:100 w:1)
 	/// Proof: `Democracy::ReferendumInfoOf` (`max_values`: None, `max_size`: Some(201), added: 2676, mode: `MaxEncodedLen`)
@@ -96,10 +98,10 @@ impl<T: frame_system::Config> pallet_democracy::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `15343`
 		//  Estimated: `268590`
-		// Minimum execution time: 426_463_000 picoseconds.
-		Weight::from_parts(429_976_000, 268590)
-			.saturating_add(T::DbWeight::get().reads(107))
-			.saturating_add(T::DbWeight::get().writes(5))
+		// Minimum execution time: 415_574_000 picoseconds.
+		Weight::from_parts(419_090_000, 268590)
+			.saturating_add(T::DbWeight::get().reads(107_u64))
+			.saturating_add(T::DbWeight::get().writes(5_u64))
 	}
 	/// Storage: `Democracy::ReferendumInfoOf` (r:100 w:1)
 	/// Proof: `Democracy::ReferendumInfoOf` (`max_values`: None, `max_size`: Some(201), added: 2676, mode: `MaxEncodedLen`)
@@ -119,10 +121,10 @@ impl<T: frame_system::Config> pallet_democracy::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `15365`
 		//  Estimated: `268590`
-		// Minimum execution time: 425_272_000 picoseconds.
-		Weight::from_parts(429_892_000, 268590)
-			.saturating_add(T::DbWeight::get().reads(107))
-			.saturating_add(T::DbWeight::get().writes(5))
+		// Minimum execution time: 415_249_000 picoseconds.
+		Weight::from_parts(422_003_000, 268590)
+			.saturating_add(T::DbWeight::get().reads(107_u64))
+			.saturating_add(T::DbWeight::get().writes(5_u64))
 	}
 	/// Storage: `Democracy::ReferendumInfoOf` (r:1 w:1)
 	/// Proof: `Democracy::ReferendumInfoOf` (`max_values`: None, `max_size`: Some(201), added: 2676, mode: `MaxEncodedLen`)
@@ -134,10 +136,10 @@ impl<T: frame_system::Config> pallet_democracy::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `249`
 		//  Estimated: `3666`
-		// Minimum execution time: 33_659_000 picoseconds.
-		Weight::from_parts(34_179_000, 3666)
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(3))
+		// Minimum execution time: 27_483_000 picoseconds.
+		Weight::from_parts(28_007_000, 3666)
+			.saturating_add(T::DbWeight::get().reads(3_u64))
+			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
 	/// Storage: `Democracy::PublicProps` (r:1 w:1)
 	/// Proof: `Democracy::PublicProps` (`max_values`: Some(1), `max_size`: Some(16702), added: 17197, mode: `MaxEncodedLen`)
@@ -157,10 +159,10 @@ impl<T: frame_system::Config> pallet_democracy::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `6191`
 		//  Estimated: `18187`
-		// Minimum execution time: 126_645_000 picoseconds.
-		Weight::from_parts(127_366_000, 18187)
-			.saturating_add(T::DbWeight::get().reads(9))
-			.saturating_add(T::DbWeight::get().writes(8))
+		// Minimum execution time: 107_718_000 picoseconds.
+		Weight::from_parts(108_453_000, 18187)
+			.saturating_add(T::DbWeight::get().reads(9_u64))
+			.saturating_add(T::DbWeight::get().writes(8_u64))
 	}
 	/// Storage: `Democracy::NextExternal` (r:1 w:1)
 	/// Proof: `Democracy::NextExternal` (`max_values`: Some(1), `max_size`: Some(132), added: 627, mode: `MaxEncodedLen`)
@@ -170,10 +172,10 @@ impl<T: frame_system::Config> pallet_democracy::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `3276`
 		//  Estimated: `6703`
-		// Minimum execution time: 15_098_000 picoseconds.
-		Weight::from_parts(15_379_000, 6703)
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
+		// Minimum execution time: 13_141_000 picoseconds.
+		Weight::from_parts(13_507_000, 6703)
+			.saturating_add(T::DbWeight::get().reads(2_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	/// Storage: `Democracy::NextExternal` (r:0 w:1)
 	/// Proof: `Democracy::NextExternal` (`max_values`: Some(1), `max_size`: Some(132), added: 627, mode: `MaxEncodedLen`)
@@ -181,9 +183,9 @@ impl<T: frame_system::Config> pallet_democracy::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 5_201_000 picoseconds.
-		Weight::from_parts(5_361_000, 0)
-			.saturating_add(T::DbWeight::get().writes(1))
+		// Minimum execution time: 3_720_000 picoseconds.
+		Weight::from_parts(3_904_000, 0)
+			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	/// Storage: `Democracy::NextExternal` (r:0 w:1)
 	/// Proof: `Democracy::NextExternal` (`max_values`: Some(1), `max_size`: Some(132), added: 627, mode: `MaxEncodedLen`)
@@ -191,9 +193,9 @@ impl<T: frame_system::Config> pallet_democracy::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 5_258_000 picoseconds.
-		Weight::from_parts(5_480_000, 0)
-			.saturating_add(T::DbWeight::get().writes(1))
+		// Minimum execution time: 3_862_000 picoseconds.
+		Weight::from_parts(4_053_000, 0)
+			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	/// Storage: `Democracy::NextExternal` (r:1 w:1)
 	/// Proof: `Democracy::NextExternal` (`max_values`: Some(1), `max_size`: Some(132), added: 627, mode: `MaxEncodedLen`)
@@ -207,10 +209,10 @@ impl<T: frame_system::Config> pallet_democracy::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `147`
 		//  Estimated: `3518`
-		// Minimum execution time: 33_763_000 picoseconds.
-		Weight::from_parts(34_266_000, 3518)
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(5))
+		// Minimum execution time: 25_432_000 picoseconds.
+		Weight::from_parts(25_892_000, 3518)
+			.saturating_add(T::DbWeight::get().reads(3_u64))
+			.saturating_add(T::DbWeight::get().writes(5_u64))
 	}
 	/// Storage: `Democracy::NextExternal` (r:1 w:1)
 	/// Proof: `Democracy::NextExternal` (`max_values`: Some(1), `max_size`: Some(132), added: 627, mode: `MaxEncodedLen`)
@@ -222,10 +224,10 @@ impl<T: frame_system::Config> pallet_democracy::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `3377`
 		//  Estimated: `6703`
-		// Minimum execution time: 35_851_000 picoseconds.
-		Weight::from_parts(36_523_000, 6703)
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(3))
+		// Minimum execution time: 28_422_000 picoseconds.
+		Weight::from_parts(28_931_000, 6703)
+			.saturating_add(T::DbWeight::get().reads(3_u64))
+			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
 	/// Storage: `Democracy::PublicProps` (r:1 w:1)
 	/// Proof: `Democracy::PublicProps` (`max_values`: Some(1), `max_size`: Some(16702), added: 17197, mode: `MaxEncodedLen`)
@@ -239,10 +241,10 @@ impl<T: frame_system::Config> pallet_democracy::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `6076`
 		//  Estimated: `18187`
-		// Minimum execution time: 103_076_000 picoseconds.
-		Weight::from_parts(103_818_000, 18187)
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(5))
+		// Minimum execution time: 87_703_000 picoseconds.
+		Weight::from_parts(88_416_000, 18187)
+			.saturating_add(T::DbWeight::get().reads(5_u64))
+			.saturating_add(T::DbWeight::get().writes(5_u64))
 	}
 	/// Storage: `Democracy::MetadataOf` (r:1 w:1)
 	/// Proof: `Democracy::MetadataOf` (`max_values`: None, `max_size`: Some(53), added: 2528, mode: `MaxEncodedLen`)
@@ -252,10 +254,10 @@ impl<T: frame_system::Config> pallet_democracy::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `181`
 		//  Estimated: `3518`
-		// Minimum execution time: 25_877_000 picoseconds.
-		Weight::from_parts(26_184_000, 3518)
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(2))
+		// Minimum execution time: 20_107_000 picoseconds.
+		Weight::from_parts(20_377_000, 3518)
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
 	/// Storage: `Democracy::LowestUnbaked` (r:1 w:1)
 	/// Proof: `Democracy::LowestUnbaked` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
@@ -266,15 +268,15 @@ impl<T: frame_system::Config> pallet_democracy::WeightInfo for HydraWeight<T> {
 	/// The range of component `r` is `[0, 99]`.
 	fn on_initialize_base(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `108 + r * (86 ±0)`
+		//  Measured:  `125 + r * (86 ±0)`
 		//  Estimated: `1489 + r * (2676 ±0)`
-		// Minimum execution time: 5_855_000 picoseconds.
-		Weight::from_parts(8_300_318, 1489)
-			// Standard Error: 14_328
-			.saturating_add(Weight::from_parts(3_304_411, 0).saturating_mul(r.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
+		// Minimum execution time: 3_840_000 picoseconds.
+		Weight::from_parts(7_774_936, 1489)
+			// Standard Error: 9_193
+			.saturating_add(Weight::from_parts(3_259_471, 0).saturating_mul(r.into()))
+			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r.into())))
-			.saturating_add(T::DbWeight::get().writes(1))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
 			.saturating_add(Weight::from_parts(0, 2676).saturating_mul(r.into()))
 	}
 	/// Storage: `Democracy::LowestUnbaked` (r:1 w:1)
@@ -292,15 +294,15 @@ impl<T: frame_system::Config> pallet_democracy::WeightInfo for HydraWeight<T> {
 	/// The range of component `r` is `[0, 99]`.
 	fn on_initialize_base_with_launch_period(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `108 + r * (86 ±0)`
+		//  Measured:  `125 + r * (86 ±0)`
 		//  Estimated: `18187 + r * (2676 ±0)`
-		// Minimum execution time: 10_208_000 picoseconds.
-		Weight::from_parts(12_634_279, 18187)
-			// Standard Error: 14_516
-			.saturating_add(Weight::from_parts(3_326_229, 0).saturating_mul(r.into()))
-			.saturating_add(T::DbWeight::get().reads(5))
+		// Minimum execution time: 6_495_000 picoseconds.
+		Weight::from_parts(10_267_498, 18187)
+			// Standard Error: 9_509
+			.saturating_add(Weight::from_parts(3_264_278, 0).saturating_mul(r.into()))
+			.saturating_add(T::DbWeight::get().reads(5_u64))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r.into())))
-			.saturating_add(T::DbWeight::get().writes(1))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
 			.saturating_add(Weight::from_parts(0, 2676).saturating_mul(r.into()))
 	}
 	/// Storage: `Democracy::VotingOf` (r:3 w:3)
@@ -314,15 +316,15 @@ impl<T: frame_system::Config> pallet_democracy::WeightInfo for HydraWeight<T> {
 	/// The range of component `r` is `[0, 99]`.
 	fn delegate(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `658 + r * (108 ±0)`
+		//  Measured:  `677 + r * (108 ±0)`
 		//  Estimated: `19800 + r * (2676 ±0)`
-		// Minimum execution time: 50_071_000 picoseconds.
-		Weight::from_parts(52_010_011, 19800)
-			// Standard Error: 17_101
-			.saturating_add(Weight::from_parts(4_250_107, 0).saturating_mul(r.into()))
-			.saturating_add(T::DbWeight::get().reads(5))
+		// Minimum execution time: 43_812_000 picoseconds.
+		Weight::from_parts(46_935_837, 19800)
+			// Standard Error: 11_136
+			.saturating_add(Weight::from_parts(4_198_915, 0).saturating_mul(r.into()))
+			.saturating_add(T::DbWeight::get().reads(5_u64))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r.into())))
-			.saturating_add(T::DbWeight::get().writes(4))
+			.saturating_add(T::DbWeight::get().writes(4_u64))
 			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(r.into())))
 			.saturating_add(Weight::from_parts(0, 2676).saturating_mul(r.into()))
 	}
@@ -333,15 +335,15 @@ impl<T: frame_system::Config> pallet_democracy::WeightInfo for HydraWeight<T> {
 	/// The range of component `r` is `[0, 99]`.
 	fn undelegate(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `356 + r * (108 ±0)`
+		//  Measured:  `373 + r * (108 ±0)`
 		//  Estimated: `13530 + r * (2676 ±0)`
-		// Minimum execution time: 24_466_000 picoseconds.
-		Weight::from_parts(25_636_550, 13530)
-			// Standard Error: 10_634
-			.saturating_add(Weight::from_parts(4_222_922, 0).saturating_mul(r.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
+		// Minimum execution time: 20_720_000 picoseconds.
+		Weight::from_parts(20_631_640, 13530)
+			// Standard Error: 8_748
+			.saturating_add(Weight::from_parts(4_193_472, 0).saturating_mul(r.into()))
+			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(r.into())))
-			.saturating_add(T::DbWeight::get().writes(2))
+			.saturating_add(T::DbWeight::get().writes(2_u64))
 			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(r.into())))
 			.saturating_add(Weight::from_parts(0, 2676).saturating_mul(r.into()))
 	}
@@ -351,9 +353,9 @@ impl<T: frame_system::Config> pallet_democracy::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 5_113_000 picoseconds.
-		Weight::from_parts(5_199_000, 0)
-			.saturating_add(T::DbWeight::get().writes(1))
+		// Minimum execution time: 4_235_000 picoseconds.
+		Weight::from_parts(4_396_000, 0)
+			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	/// Storage: `Democracy::VotingOf` (r:1 w:1)
 	/// Proof: `Democracy::VotingOf` (`max_values`: None, `max_size`: Some(3795), added: 6270, mode: `MaxEncodedLen`)
@@ -368,12 +370,12 @@ impl<T: frame_system::Config> pallet_democracy::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `432`
 		//  Estimated: `7260`
-		// Minimum execution time: 29_581_000 picoseconds.
-		Weight::from_parts(36_996_886, 7260)
-			// Standard Error: 20_361
-			.saturating_add(Weight::from_parts(151_394, 0).saturating_mul(r.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(3))
+		// Minimum execution time: 26_209_000 picoseconds.
+		Weight::from_parts(35_136_293, 7260)
+			// Standard Error: 8_398
+			.saturating_add(Weight::from_parts(78_899, 0).saturating_mul(r.into()))
+			.saturating_add(T::DbWeight::get().reads(4_u64))
+			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
 	/// Storage: `Democracy::VotingOf` (r:1 w:1)
 	/// Proof: `Democracy::VotingOf` (`max_values`: None, `max_size`: Some(3795), added: 6270, mode: `MaxEncodedLen`)
@@ -388,12 +390,12 @@ impl<T: frame_system::Config> pallet_democracy::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `432 + r * (22 ±0)`
 		//  Estimated: `7260`
-		// Minimum execution time: 44_527_000 picoseconds.
-		Weight::from_parts(45_266_020, 7260)
-			// Standard Error: 2_210
-			.saturating_add(Weight::from_parts(33_482, 0).saturating_mul(r.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(3))
+		// Minimum execution time: 37_733_000 picoseconds.
+		Weight::from_parts(38_316_728, 7260)
+			// Standard Error: 1_094
+			.saturating_add(Weight::from_parts(52_536, 0).saturating_mul(r.into()))
+			.saturating_add(T::DbWeight::get().reads(4_u64))
+			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
 	/// Storage: `Democracy::ReferendumInfoOf` (r:1 w:1)
 	/// Proof: `Democracy::ReferendumInfoOf` (`max_values`: None, `max_size`: Some(201), added: 2676, mode: `MaxEncodedLen`)
@@ -410,14 +412,14 @@ impl<T: frame_system::Config> pallet_democracy::WeightInfo for HydraWeight<T> {
 	/// The range of component `r` is `[1, 100]`.
 	fn remove_vote(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1357 + r * (49 ±0)`
+		//  Measured:  `1503 + r * (46 ±0)`
 		//  Estimated: `7260`
-		// Minimum execution time: 48_374_000 picoseconds.
-		Weight::from_parts(50_088_430, 7260)
-			// Standard Error: 6_689
-			.saturating_add(Weight::from_parts(153_944, 0).saturating_mul(r.into()))
-			.saturating_add(T::DbWeight::get().reads(7))
-			.saturating_add(T::DbWeight::get().writes(4))
+		// Minimum execution time: 48_213_000 picoseconds.
+		Weight::from_parts(51_366_745, 7260)
+			// Standard Error: 4_640
+			.saturating_add(Weight::from_parts(131_667, 0).saturating_mul(r.into()))
+			.saturating_add(T::DbWeight::get().reads(7_u64))
+			.saturating_add(T::DbWeight::get().writes(4_u64))
 	}
 	/// Storage: `Democracy::ReferendumInfoOf` (r:1 w:1)
 	/// Proof: `Democracy::ReferendumInfoOf` (`max_values`: None, `max_size`: Some(201), added: 2676, mode: `MaxEncodedLen`)
@@ -434,29 +436,31 @@ impl<T: frame_system::Config> pallet_democracy::WeightInfo for HydraWeight<T> {
 	/// The range of component `r` is `[1, 100]`.
 	fn remove_other_vote(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1357 + r * (49 ±0)`
+		//  Measured:  `1503 + r * (46 ±0)`
 		//  Estimated: `7260`
-		// Minimum execution time: 48_503_000 picoseconds.
-		Weight::from_parts(50_287_183, 7260)
-			// Standard Error: 7_659
-			.saturating_add(Weight::from_parts(148_784, 0).saturating_mul(r.into()))
-			.saturating_add(T::DbWeight::get().reads(7))
-			.saturating_add(T::DbWeight::get().writes(4))
+		// Minimum execution time: 48_122_000 picoseconds.
+		Weight::from_parts(51_591_726, 7260)
+			// Standard Error: 4_962
+			.saturating_add(Weight::from_parts(133_813, 0).saturating_mul(r.into()))
+			.saturating_add(T::DbWeight::get().reads(7_u64))
+			.saturating_add(T::DbWeight::get().writes(4_u64))
 	}
 	/// Storage: `Democracy::NextExternal` (r:1 w:0)
 	/// Proof: `Democracy::NextExternal` (`max_values`: Some(1), `max_size`: Some(132), added: 627, mode: `MaxEncodedLen`)
 	/// Storage: `Preimage::StatusFor` (r:1 w:0)
 	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:0)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(75), added: 2550, mode: `MaxEncodedLen`)
 	/// Storage: `Democracy::MetadataOf` (r:0 w:1)
 	/// Proof: `Democracy::MetadataOf` (`max_values`: None, `max_size`: Some(53), added: 2528, mode: `MaxEncodedLen`)
 	fn set_external_metadata() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `287`
 		//  Estimated: `3556`
-		// Minimum execution time: 22_206_000 picoseconds.
-		Weight::from_parts(22_814_000, 3556)
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
+		// Minimum execution time: 20_454_000 picoseconds.
+		Weight::from_parts(20_805_000, 3556)
+			.saturating_add(T::DbWeight::get().reads(3_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	/// Storage: `Democracy::NextExternal` (r:1 w:0)
 	/// Proof: `Democracy::NextExternal` (`max_values`: Some(1), `max_size`: Some(132), added: 627, mode: `MaxEncodedLen`)
@@ -466,25 +470,27 @@ impl<T: frame_system::Config> pallet_democracy::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `147`
 		//  Estimated: `3518`
-		// Minimum execution time: 20_103_000 picoseconds.
-		Weight::from_parts(20_369_000, 3518)
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
+		// Minimum execution time: 16_223_000 picoseconds.
+		Weight::from_parts(16_478_000, 3518)
+			.saturating_add(T::DbWeight::get().reads(2_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	/// Storage: `Democracy::PublicProps` (r:1 w:0)
 	/// Proof: `Democracy::PublicProps` (`max_values`: Some(1), `max_size`: Some(16702), added: 17197, mode: `MaxEncodedLen`)
 	/// Storage: `Preimage::StatusFor` (r:1 w:0)
 	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:0)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(75), added: 2550, mode: `MaxEncodedLen`)
 	/// Storage: `Democracy::MetadataOf` (r:0 w:1)
 	/// Proof: `Democracy::MetadataOf` (`max_values`: None, `max_size`: Some(53), added: 2528, mode: `MaxEncodedLen`)
 	fn set_proposal_metadata() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `4842`
 		//  Estimated: `18187`
-		// Minimum execution time: 44_452_000 picoseconds.
-		Weight::from_parts(44_885_000, 18187)
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
+		// Minimum execution time: 42_358_000 picoseconds.
+		Weight::from_parts(42_867_000, 18187)
+			.saturating_add(T::DbWeight::get().reads(3_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	/// Storage: `Democracy::PublicProps` (r:1 w:0)
 	/// Proof: `Democracy::PublicProps` (`max_values`: Some(1), `max_size`: Some(16702), added: 17197, mode: `MaxEncodedLen`)
@@ -494,23 +500,25 @@ impl<T: frame_system::Config> pallet_democracy::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `4706`
 		//  Estimated: `18187`
-		// Minimum execution time: 41_016_000 picoseconds.
-		Weight::from_parts(41_785_000, 18187)
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
+		// Minimum execution time: 37_064_000 picoseconds.
+		Weight::from_parts(37_477_000, 18187)
+			.saturating_add(T::DbWeight::get().reads(2_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	/// Storage: `Preimage::StatusFor` (r:1 w:0)
 	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:0)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(75), added: 2550, mode: `MaxEncodedLen`)
 	/// Storage: `Democracy::MetadataOf` (r:0 w:1)
 	/// Proof: `Democracy::MetadataOf` (`max_values`: None, `max_size`: Some(53), added: 2528, mode: `MaxEncodedLen`)
 	fn set_referendum_metadata() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `211`
 		//  Estimated: `3556`
-		// Minimum execution time: 19_472_000 picoseconds.
-		Weight::from_parts(20_015_000, 3556)
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
+		// Minimum execution time: 18_290_000 picoseconds.
+		Weight::from_parts(18_660_000, 3556)
+			.saturating_add(T::DbWeight::get().reads(2_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	/// Storage: `Democracy::ReferendumInfoOf` (r:1 w:0)
 	/// Proof: `Democracy::ReferendumInfoOf` (`max_values`: None, `max_size`: Some(201), added: 2676, mode: `MaxEncodedLen`)
@@ -520,9 +528,9 @@ impl<T: frame_system::Config> pallet_democracy::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `159`
 		//  Estimated: `3666`
-		// Minimum execution time: 22_448_000 picoseconds.
-		Weight::from_parts(22_700_000, 3666)
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
+		// Minimum execution time: 18_955_000 picoseconds.
+		Weight::from_parts(19_323_000, 3666)
+			.saturating_add(T::DbWeight::get().reads(2_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 }
\ No newline at end of file
diff --git a/runtime/hydradx/src/weights/duster.rs b/runtime/hydradx/src/weights/pallet_duster.rs
similarity index 71%
rename from runtime/hydradx/src/weights/duster.rs
rename to runtime/hydradx/src/weights/pallet_duster.rs
index d57ad0429..67e855672 100644
--- a/runtime/hydradx/src/weights/duster.rs
+++ b/runtime/hydradx/src/weights/pallet_duster.rs
@@ -15,41 +15,48 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+
 //! Autogenerated weights for `pallet_duster`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-02-15, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-05-23, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: 1024
+//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024`
 
 // Executed Command:
-// target/release/hydradx
+// ./target/release/hydradx
 // benchmark
 // pallet
-// --chain=dev
-// --steps=10
-// --repeat=30
 // --wasm-execution=compiled
-// --heap-pages=4096
-// --template=.maintain/pallet-weight-template-no-back.hbs
-// --pallet=pallet_duster
-// --output=./weights/duster.rs
-// --extrinsic=*
+// --pallet
+// *
+// --extrinsic
+// *
+// --heap-pages
+// 4096
+// --steps
+// 50
+// --repeat
+// 20
+// --template=scripts/pallet-weight-template.hbs
+// --output
+// weights/
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
 #![allow(missing_docs)]
 
-use frame_support::{traits::Get, weights::Weight};
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
 use core::marker::PhantomData;
 
-use pallet_duster::weights::WeightInfo;
+/// Weights for `pallet_duster`.
+pub struct WeightInfo<T>(PhantomData<T>);
 
-/// Weight functions for `pallet_duster`.
+/// Weights for `pallet_duster` using the HydraDX node and recommended hardware.
 pub struct HydraWeight<T>(PhantomData<T>);
-impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
+impl<T: frame_system::Config> pallet_duster::WeightInfo for HydraWeight<T> {
 	/// Storage: `Duster::AccountBlacklist` (r:1 w:0)
 	/// Proof: `Duster::AccountBlacklist` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
 	/// Storage: `AssetRegistry::Assets` (r:1 w:0)
@@ -68,32 +75,32 @@ impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
 	/// Proof: `MultiTransactionPayment::AccountCurrencyMap` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
 	fn dust_account() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2554`
+		//  Measured:  `2690`
 		//  Estimated: `6156`
-		// Minimum execution time: 99_580_000 picoseconds.
-		Weight::from_parts(100_367_000, 6156)
-			.saturating_add(T::DbWeight::get().reads(8))
-			.saturating_add(T::DbWeight::get().writes(4))
+		// Minimum execution time: 84_500_000 picoseconds.
+		Weight::from_parts(85_254_000, 6156)
+			.saturating_add(T::DbWeight::get().reads(8_u64))
+			.saturating_add(T::DbWeight::get().writes(4_u64))
 	}
 	/// Storage: `Duster::AccountBlacklist` (r:0 w:1)
 	/// Proof: `Duster::AccountBlacklist` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
 	fn add_nondustable_account() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1012`
+		//  Measured:  `1016`
 		//  Estimated: `0`
-		// Minimum execution time: 20_681_000 picoseconds.
-		Weight::from_parts(21_171_000, 0)
-			.saturating_add(T::DbWeight::get().writes(1))
+		// Minimum execution time: 16_109_000 picoseconds.
+		Weight::from_parts(16_551_000, 0)
+			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	/// Storage: `Duster::AccountBlacklist` (r:1 w:1)
 	/// Proof: `Duster::AccountBlacklist` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
 	fn remove_nondustable_account() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1300`
+		//  Measured:  `1370`
 		//  Estimated: `3513`
-		// Minimum execution time: 26_184_000 picoseconds.
-		Weight::from_parts(26_513_000, 3513)
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
+		// Minimum execution time: 20_814_000 picoseconds.
+		Weight::from_parts(21_277_000, 3513)
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-}
+}
\ No newline at end of file
diff --git a/runtime/hydradx/src/weights/pallet_dynamic_evm_fee.rs b/runtime/hydradx/src/weights/pallet_dynamic_evm_fee.rs
new file mode 100644
index 000000000..7eebdff7c
--- /dev/null
+++ b/runtime/hydradx/src/weights/pallet_dynamic_evm_fee.rs
@@ -0,0 +1,83 @@
+// This file is part of HydraDX.
+
+// Copyright (C) 2020-2023  Intergalactic, Limited (GIB).
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+
+//! Autogenerated weights for `pallet_dynamic_evm_fee`
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-05-23, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! WORST CASE MAP SIZE: `1000000`
+//! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024`
+
+// Executed Command:
+// ./target/release/hydradx
+// benchmark
+// pallet
+// --wasm-execution=compiled
+// --pallet
+// *
+// --extrinsic
+// *
+// --heap-pages
+// 4096
+// --steps
+// 50
+// --repeat
+// 20
+// --template=scripts/pallet-weight-template.hbs
+// --output
+// weights/
+
+#![cfg_attr(rustfmt, rustfmt_skip)]
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+#![allow(missing_docs)]
+
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
+use core::marker::PhantomData;
+
+/// Weights for `pallet_dynamic_evm_fee`.
+pub struct WeightInfo<T>(PhantomData<T>);
+
+/// Weights for `pallet_dynamic_evm_fee` using the HydraDX node and recommended hardware.
+pub struct HydraWeight<T>(PhantomData<T>);
+impl<T: frame_system::Config> pallet_dynamic_evm_fee::WeightInfo for HydraWeight<T> {
+	/// Storage: `DynamicEvmFee::BaseFeePerGas` (r:1 w:1)
+	/// Proof: `DynamicEvmFee::BaseFeePerGas` (`max_values`: Some(1), `max_size`: Some(32), added: 527, mode: `MaxEncodedLen`)
+	/// Storage: `TransactionPayment::NextFeeMultiplier` (r:1 w:0)
+	/// Proof: `TransactionPayment::NextFeeMultiplier` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::NextAssetId` (r:1 w:0)
+	/// Proof: `AssetRegistry::NextAssetId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::LocationAssets` (r:1 w:0)
+	/// Proof: `AssetRegistry::LocationAssets` (`max_values`: None, `max_size`: Some(622), added: 3097, mode: `MaxEncodedLen`)
+	/// Storage: `MultiTransactionPayment::AcceptedCurrencies` (r:1 w:0)
+	/// Proof: `MultiTransactionPayment::AcceptedCurrencies` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
+	/// Storage: `Router::Routes` (r:1 w:0)
+	/// Proof: `Router::Routes` (`max_values`: None, `max_size`: Some(90), added: 2565, mode: `MaxEncodedLen`)
+	/// Storage: `EmaOracle::Oracles` (r:4 w:0)
+	/// Proof: `EmaOracle::Oracles` (`max_values`: None, `max_size`: Some(177), added: 2652, mode: `MaxEncodedLen`)
+	fn on_initialize() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `2746`
+		//  Estimated: `11598`
+		// Minimum execution time: 66_128_000 picoseconds.
+		Weight::from_parts(66_561_000, 11598)
+			.saturating_add(T::DbWeight::get().reads(10_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
+	}
+}
\ No newline at end of file
diff --git a/runtime/hydradx/src/weights/elections.rs b/runtime/hydradx/src/weights/pallet_elections_phragmen.rs
similarity index 70%
rename from runtime/hydradx/src/weights/elections.rs
rename to runtime/hydradx/src/weights/pallet_elections_phragmen.rs
index f6e5501fc..8d64e0ca1 100644
--- a/runtime/hydradx/src/weights/elections.rs
+++ b/runtime/hydradx/src/weights/pallet_elections_phragmen.rs
@@ -15,37 +15,46 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+
 //! Autogenerated weights for `pallet_elections_phragmen`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-02-23, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-05-23, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: 1024
+//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024`
 
 // Executed Command:
-// target/release/hydradx
+// ./target/release/hydradx
 // benchmark
 // pallet
-// --chain=dev
-// --steps=10
-// --repeat=30
 // --wasm-execution=compiled
-// --heap-pages=4096
-// --template=.maintain/pallet-weight-template-no-back.hbs
-// --pallet=pallet-elections-phragmen
-// --output=weights-1.1.0/elections.rs
-// --extrinsic=*
+// --pallet
+// *
+// --extrinsic
+// *
+// --heap-pages
+// 4096
+// --steps
+// 50
+// --repeat
+// 20
+// --template=scripts/pallet-weight-template.hbs
+// --output
+// weights/
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
 #![allow(missing_docs)]
 
-use frame_support::{traits::Get, weights::Weight};
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
 use core::marker::PhantomData;
 
-/// Weight functions for `pallet_elections_phragmen`.
+/// Weights for `pallet_elections_phragmen`.
+pub struct WeightInfo<T>(PhantomData<T>);
+
+/// Weights for `pallet_elections_phragmen` using the HydraDX node and recommended hardware.
 pub struct HydraWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> pallet_elections_phragmen::WeightInfo for HydraWeight<T> {
 	/// Storage: `Elections::Candidates` (r:1 w:0)
@@ -63,14 +72,14 @@ impl<T: frame_system::Config> pallet_elections_phragmen::WeightInfo for HydraWei
 	/// The range of component `v` is `[1, 10]`.
 	fn vote_equal(v: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `430 + v * (80 ±0)`
+		//  Measured:  `429 + v * (80 ±0)`
 		//  Estimated: `4764 + v * (80 ±0)`
-		// Minimum execution time: 42_972_000 picoseconds.
-		Weight::from_parts(43_345_925, 4764)
-			// Standard Error: 4_070
-			.saturating_add(Weight::from_parts(114_697, 0).saturating_mul(v.into()))
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(2))
+		// Minimum execution time: 36_244_000 picoseconds.
+		Weight::from_parts(36_933_151, 4764)
+			// Standard Error: 3_050
+			.saturating_add(Weight::from_parts(159_413, 0).saturating_mul(v.into()))
+			.saturating_add(T::DbWeight::get().reads(6_u64))
+			.saturating_add(T::DbWeight::get().writes(2_u64))
 			.saturating_add(Weight::from_parts(0, 80).saturating_mul(v.into()))
 	}
 	/// Storage: `Elections::Candidates` (r:1 w:0)
@@ -90,12 +99,12 @@ impl<T: frame_system::Config> pallet_elections_phragmen::WeightInfo for HydraWei
 		// Proof Size summary in bytes:
 		//  Measured:  `399 + v * (80 ±0)`
 		//  Estimated: `4764 + v * (80 ±0)`
-		// Minimum execution time: 59_265_000 picoseconds.
-		Weight::from_parts(59_871_116, 4764)
-			// Standard Error: 4_590
-			.saturating_add(Weight::from_parts(86_886, 0).saturating_mul(v.into()))
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(2))
+		// Minimum execution time: 49_114_000 picoseconds.
+		Weight::from_parts(49_630_628, 4764)
+			// Standard Error: 4_204
+			.saturating_add(Weight::from_parts(143_952, 0).saturating_mul(v.into()))
+			.saturating_add(T::DbWeight::get().reads(6_u64))
+			.saturating_add(T::DbWeight::get().writes(2_u64))
 			.saturating_add(Weight::from_parts(0, 80).saturating_mul(v.into()))
 	}
 	/// Storage: `Elections::Candidates` (r:1 w:0)
@@ -115,12 +124,12 @@ impl<T: frame_system::Config> pallet_elections_phragmen::WeightInfo for HydraWei
 		// Proof Size summary in bytes:
 		//  Measured:  `431 + v * (80 ±0)`
 		//  Estimated: `4764 + v * (80 ±0)`
-		// Minimum execution time: 59_321_000 picoseconds.
-		Weight::from_parts(59_769_987, 4764)
-			// Standard Error: 5_117
-			.saturating_add(Weight::from_parts(87_357, 0).saturating_mul(v.into()))
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(2))
+		// Minimum execution time: 49_152_000 picoseconds.
+		Weight::from_parts(49_743_138, 4764)
+			// Standard Error: 2_931
+			.saturating_add(Weight::from_parts(108_094, 0).saturating_mul(v.into()))
+			.saturating_add(T::DbWeight::get().reads(6_u64))
+			.saturating_add(T::DbWeight::get().writes(2_u64))
 			.saturating_add(Weight::from_parts(0, 80).saturating_mul(v.into()))
 	}
 	/// Storage: `Elections::Voting` (r:1 w:1)
@@ -133,10 +142,10 @@ impl<T: frame_system::Config> pallet_elections_phragmen::WeightInfo for HydraWei
 		// Proof Size summary in bytes:
 		//  Measured:  `761`
 		//  Estimated: `4764`
-		// Minimum execution time: 61_217_000 picoseconds.
-		Weight::from_parts(61_805_000, 4764)
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(2))
+		// Minimum execution time: 49_563_000 picoseconds.
+		Weight::from_parts(49_816_000, 4764)
+			.saturating_add(T::DbWeight::get().reads(3_u64))
+			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
 	/// Storage: `Elections::Candidates` (r:1 w:1)
 	/// Proof: `Elections::Candidates` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
@@ -147,14 +156,14 @@ impl<T: frame_system::Config> pallet_elections_phragmen::WeightInfo for HydraWei
 	/// The range of component `c` is `[1, 100]`.
 	fn submit_candidacy(c: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2147 + c * (48 ±0)`
-		//  Estimated: `3632 + c * (48 ±0)`
-		// Minimum execution time: 44_619_000 picoseconds.
-		Weight::from_parts(45_215_178, 3632)
-			// Standard Error: 1_011
-			.saturating_add(Weight::from_parts(56_084, 0).saturating_mul(c.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(1))
+		//  Measured:  `2148 + c * (48 ±0)`
+		//  Estimated: `3633 + c * (48 ±0)`
+		// Minimum execution time: 36_312_000 picoseconds.
+		Weight::from_parts(36_895_151, 3633)
+			// Standard Error: 383
+			.saturating_add(Weight::from_parts(55_138, 0).saturating_mul(c.into()))
+			.saturating_add(T::DbWeight::get().reads(3_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
 			.saturating_add(Weight::from_parts(0, 48).saturating_mul(c.into()))
 	}
 	/// Storage: `Elections::Candidates` (r:1 w:1)
@@ -162,14 +171,14 @@ impl<T: frame_system::Config> pallet_elections_phragmen::WeightInfo for HydraWei
 	/// The range of component `c` is `[1, 100]`.
 	fn renounce_candidacy_candidate(c: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `350 + c * (48 ±0)`
-		//  Estimated: `1835 + c * (48 ±0)`
-		// Minimum execution time: 40_339_000 picoseconds.
-		Weight::from_parts(40_813_195, 1835)
-			// Standard Error: 712
-			.saturating_add(Weight::from_parts(35_439, 0).saturating_mul(c.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
+		//  Measured:  `351 + c * (48 ±0)`
+		//  Estimated: `1836 + c * (48 ±0)`
+		// Minimum execution time: 31_400_000 picoseconds.
+		Weight::from_parts(32_059_256, 1836)
+			// Standard Error: 303
+			.saturating_add(Weight::from_parts(37_579, 0).saturating_mul(c.into()))
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
 			.saturating_add(Weight::from_parts(0, 48).saturating_mul(c.into()))
 	}
 	/// Storage: `Elections::Members` (r:1 w:1)
@@ -184,12 +193,12 @@ impl<T: frame_system::Config> pallet_elections_phragmen::WeightInfo for HydraWei
 	/// Proof: `Council::Members` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn renounce_candidacy_members() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2379`
-		//  Estimated: `3864`
-		// Minimum execution time: 55_730_000 picoseconds.
-		Weight::from_parts(56_491_000, 3864)
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(4))
+		//  Measured:  `2417`
+		//  Estimated: `3902`
+		// Minimum execution time: 43_953_000 picoseconds.
+		Weight::from_parts(44_501_000, 3902)
+			.saturating_add(T::DbWeight::get().reads(4_u64))
+			.saturating_add(T::DbWeight::get().writes(4_u64))
 	}
 	/// Storage: `Elections::RunnersUp` (r:1 w:1)
 	/// Proof: `Elections::RunnersUp` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
@@ -197,10 +206,10 @@ impl<T: frame_system::Config> pallet_elections_phragmen::WeightInfo for HydraWei
 		// Proof Size summary in bytes:
 		//  Measured:  `1491`
 		//  Estimated: `2976`
-		// Minimum execution time: 40_384_000 picoseconds.
-		Weight::from_parts(40_834_000, 2976)
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
+		// Minimum execution time: 31_618_000 picoseconds.
+		Weight::from_parts(32_155_000, 2976)
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	/// Storage: `Benchmark::Override` (r:0 w:0)
 	/// Proof: `Benchmark::Override` (`max_values`: None, `max_size`: None, mode: `Measured`)
@@ -225,14 +234,14 @@ impl<T: frame_system::Config> pallet_elections_phragmen::WeightInfo for HydraWei
 	/// Proof: `Council::Members` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn remove_member_with_replacement() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2519`
+		//  Measured:  `2557`
 		//  Estimated: `6196`
-		// Minimum execution time: 85_896_000 picoseconds.
-		Weight::from_parts(87_103_000, 6196)
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(6))
+		// Minimum execution time: 63_946_000 picoseconds.
+		Weight::from_parts(64_791_000, 6196)
+			.saturating_add(T::DbWeight::get().reads(6_u64))
+			.saturating_add(T::DbWeight::get().writes(6_u64))
 	}
-	/// Storage: `Elections::Voting` (r:769 w:768)
+	/// Storage: `Elections::Voting` (r:385 w:384)
 	/// Proof: `Elections::Voting` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `Elections::Members` (r:1 w:0)
 	/// Proof: `Elections::Members` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
@@ -240,26 +249,29 @@ impl<T: frame_system::Config> pallet_elections_phragmen::WeightInfo for HydraWei
 	/// Proof: `Elections::RunnersUp` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	/// Storage: `Elections::Candidates` (r:1 w:0)
 	/// Proof: `Elections::Candidates` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `Balances::Locks` (r:768 w:768)
+	/// Storage: `Balances::Locks` (r:384 w:384)
 	/// Proof: `Balances::Locks` (`max_values`: None, `max_size`: Some(1299), added: 3774, mode: `MaxEncodedLen`)
-	/// Storage: `Balances::Freezes` (r:768 w:0)
+	/// Storage: `Balances::Freezes` (r:384 w:0)
 	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(49), added: 2524, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:768 w:768)
+	/// Storage: `System::Account` (r:384 w:384)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	/// The range of component `v` is `[384, 768]`.
 	/// The range of component `d` is `[0, 384]`.
-	fn clean_defunct_voters(v: u32, _d: u32, ) -> Weight {
+	fn clean_defunct_voters(v: u32, d: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3296 + v * (618 ±0)`
-		//  Estimated: `6665 + v * (3774 ±0)`
-		// Minimum execution time: 30_522_311_000 picoseconds.
-		Weight::from_parts(30_569_802_000, 6665)
-			// Standard Error: 620_586
-			.saturating_add(Weight::from_parts(48_149_815, 0).saturating_mul(v.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().reads((4_u64).saturating_mul(v.into())))
-			.saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(v.into())))
-			.saturating_add(Weight::from_parts(0, 3774).saturating_mul(v.into()))
+		//  Measured:  `0 + d * (631 ±0) + v * (56 ±0)`
+		//  Estimated: `32254 + d * (3774 ±1) + v * (24 ±0)`
+		// Minimum execution time: 8_457_000 picoseconds.
+		Weight::from_parts(8_788_000, 32254)
+			// Standard Error: 7_917
+			.saturating_add(Weight::from_parts(95_538, 0).saturating_mul(v.into()))
+			// Standard Error: 17_240
+			.saturating_add(Weight::from_parts(53_550_731, 0).saturating_mul(d.into()))
+			.saturating_add(T::DbWeight::get().reads(4_u64))
+			.saturating_add(T::DbWeight::get().reads((4_u64).saturating_mul(d.into())))
+			.saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(d.into())))
+			.saturating_add(Weight::from_parts(0, 3774).saturating_mul(d.into()))
+			.saturating_add(Weight::from_parts(0, 24).saturating_mul(v.into()))
 	}
 	/// Storage: `Elections::Candidates` (r:1 w:1)
 	/// Proof: `Elections::Candidates` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
@@ -284,21 +296,21 @@ impl<T: frame_system::Config> pallet_elections_phragmen::WeightInfo for HydraWei
 	/// The range of component `e` is `[768, 7680]`.
 	fn election_phragmen(c: u32, v: u32, e: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `0 + e * (27 ±0) + v * (411 ±0)`
-		//  Estimated: `278080 + c * (2122 ±13) + e * (11 ±0) + v * (2542 ±7)`
-		// Minimum execution time: 3_573_523_000 picoseconds.
-		Weight::from_parts(3_583_430_000, 278080)
-			// Standard Error: 910_658
-			.saturating_add(Weight::from_parts(17_639_114, 0).saturating_mul(v.into()))
-			// Standard Error: 95_028
-			.saturating_add(Weight::from_parts(953_135, 0).saturating_mul(e.into()))
-			.saturating_add(T::DbWeight::get().reads(47))
+		//  Measured:  `0 + c * (29 ±0) + e * (27 ±0) + v * (414 ±0)`
+		//  Estimated: `278118 + c * (2215 ±6) + e * (13 ±0) + v * (2571 ±3)`
+		// Minimum execution time: 2_799_548_000 picoseconds.
+		Weight::from_parts(2_809_003_000, 278118)
+			// Standard Error: 651_515
+			.saturating_add(Weight::from_parts(22_380_902, 0).saturating_mul(v.into()))
+			// Standard Error: 67_968
+			.saturating_add(Weight::from_parts(1_617_533, 0).saturating_mul(e.into()))
+			.saturating_add(T::DbWeight::get().reads(31_u64))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(c.into())))
 			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(v.into())))
-			.saturating_add(T::DbWeight::get().writes(6))
+			.saturating_add(T::DbWeight::get().writes(6_u64))
 			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(c.into())))
-			.saturating_add(Weight::from_parts(0, 2122).saturating_mul(c.into()))
-			.saturating_add(Weight::from_parts(0, 11).saturating_mul(e.into()))
-			.saturating_add(Weight::from_parts(0, 2542).saturating_mul(v.into()))
+			.saturating_add(Weight::from_parts(0, 2215).saturating_mul(c.into()))
+			.saturating_add(Weight::from_parts(0, 13).saturating_mul(e.into()))
+			.saturating_add(Weight::from_parts(0, 2571).saturating_mul(v.into()))
 	}
 }
\ No newline at end of file
diff --git a/runtime/hydradx/src/weights/ema_oracle.rs b/runtime/hydradx/src/weights/pallet_ema_oracle.rs
similarity index 60%
rename from runtime/hydradx/src/weights/ema_oracle.rs
rename to runtime/hydradx/src/weights/pallet_ema_oracle.rs
index 521b361eb..78967acd2 100644
--- a/runtime/hydradx/src/weights/ema_oracle.rs
+++ b/runtime/hydradx/src/weights/pallet_ema_oracle.rs
@@ -15,62 +15,73 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+
 //! Autogenerated weights for `pallet_ema_oracle`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-03-05, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-05-23, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: 1024
+//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024`
 
 // Executed Command:
-// target/release/hydradx
+// ./target/release/hydradx
 // benchmark
 // pallet
-// --chain=dev
-// --steps=10
-// --repeat=30
 // --wasm-execution=compiled
-// --heap-pages=4096
-// --template=.maintain/pallet-weight-template-no-back.hbs
-// --pallet=pallet-ema-oracle
-// --output=weights-1.1.0/oracle.rs
-// --extrinsic=*
+// --pallet
+// *
+// --extrinsic
+// *
+// --heap-pages
+// 4096
+// --steps
+// 50
+// --repeat
+// 20
+// --template=scripts/pallet-weight-template.hbs
+// --output
+// weights/
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
 #![allow(missing_docs)]
 
-use frame_support::{traits::Get, weights::Weight};
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
 use core::marker::PhantomData;
 
-use pallet_ema_oracle::weights::WeightInfo;
+/// Weights for `pallet_ema_oracle`.
+pub struct WeightInfo<T>(PhantomData<T>);
 
-/// Weight functions for `pallet_ema_oracle`.
+/// Weights for `pallet_ema_oracle` using the HydraDX node and recommended hardware.
 pub struct HydraWeight<T>(PhantomData<T>);
-impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
+impl<T: frame_system::Config> pallet_ema_oracle::WeightInfo for HydraWeight<T> {
 	/// Storage: `EmaOracle::WhitelistedAssets` (r:1 w:1)
 	/// Proof: `EmaOracle::WhitelistedAssets` (`max_values`: Some(1), `max_size`: Some(641), added: 1136, mode: `MaxEncodedLen`)
 	fn add_oracle() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `860`
 		//  Estimated: `2126`
-		// Minimum execution time: 21_341_000 picoseconds.
-		Weight::from_parts(21_667_000, 2126)
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
+		// Minimum execution time: 15_633_000 picoseconds.
+		Weight::from_parts(15_827_000, 2126)
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	/// Storage: `EmaOracle::WhitelistedAssets` (r:1 w:1)
 	/// Proof: `EmaOracle::WhitelistedAssets` (`max_values`: Some(1), `max_size`: Some(641), added: 1136, mode: `MaxEncodedLen`)
+	/// Storage: `EmaOracle::Accumulator` (r:1 w:1)
+	/// Proof: `EmaOracle::Accumulator` (`max_values`: Some(1), `max_size`: Some(5921), added: 6416, mode: `MaxEncodedLen`)
+	/// Storage: `EmaOracle::Oracles` (r:0 w:3)
+	/// Proof: `EmaOracle::Oracles` (`max_values`: None, `max_size`: Some(177), added: 2652, mode: `MaxEncodedLen`)
 	fn remove_oracle() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `876`
-		//  Estimated: `2126`
-		// Minimum execution time: 21_553_000 picoseconds.
-		Weight::from_parts(21_866_000, 2126)
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
+		//  Estimated: `7406`
+		// Minimum execution time: 31_307_000 picoseconds.
+		Weight::from_parts(31_799_000, 7406)
+			.saturating_add(T::DbWeight::get().reads(2_u64))
+			.saturating_add(T::DbWeight::get().writes(5_u64))
 	}
 	/// Storage: `EmaOracle::Accumulator` (r:1 w:0)
 	/// Proof: `EmaOracle::Accumulator` (`max_values`: Some(1), `max_size`: Some(5921), added: 6416, mode: `MaxEncodedLen`)
@@ -78,9 +89,9 @@ impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `208`
 		//  Estimated: `7406`
-		// Minimum execution time: 3_165_000 picoseconds.
-		Weight::from_parts(3_271_000, 7406)
-			.saturating_add(T::DbWeight::get().reads(1))
+		// Minimum execution time: 2_253_000 picoseconds.
+		Weight::from_parts(2_365_000, 7406)
+			.saturating_add(T::DbWeight::get().reads(1_u64))
 	}
 	/// Storage: `EmaOracle::Accumulator` (r:1 w:1)
 	/// Proof: `EmaOracle::Accumulator` (`max_values`: Some(1), `max_size`: Some(5921), added: 6416, mode: `MaxEncodedLen`)
@@ -89,15 +100,15 @@ impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
 	/// The range of component `b` is `[1, 39]`.
 	fn on_finalize_multiple_tokens(b: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `304 + b * (626 ±0)`
+		//  Measured:  `305 + b * (626 ±0)`
 		//  Estimated: `7406 + b * (7956 ±0)`
-		// Minimum execution time: 48_505_000 picoseconds.
-		Weight::from_parts(12_673_348, 7406)
-			// Standard Error: 31_644
-			.saturating_add(Weight::from_parts(36_427_193, 0).saturating_mul(b.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
+		// Minimum execution time: 44_581_000 picoseconds.
+		Weight::from_parts(9_813_697, 7406)
+			// Standard Error: 19_578
+			.saturating_add(Weight::from_parts(33_915_148, 0).saturating_mul(b.into()))
+			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(b.into())))
-			.saturating_add(T::DbWeight::get().writes(1))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
 			.saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(b.into())))
 			.saturating_add(Weight::from_parts(0, 7956).saturating_mul(b.into()))
 	}
@@ -108,14 +119,14 @@ impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
 	/// The range of component `b` is `[1, 39]`.
 	fn on_trade_multiple_tokens(b: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `751 + b * (163 ±0)`
+		//  Measured:  `821 + b * (164 ±0)`
 		//  Estimated: `7406`
-		// Minimum execution time: 18_943_000 picoseconds.
-		Weight::from_parts(19_294_596, 7406)
-			// Standard Error: 3_556
-			.saturating_add(Weight::from_parts(423_769, 0).saturating_mul(b.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(1))
+		// Minimum execution time: 16_199_000 picoseconds.
+		Weight::from_parts(17_137_924, 7406)
+			// Standard Error: 2_536
+			.saturating_add(Weight::from_parts(402_614, 0).saturating_mul(b.into()))
+			.saturating_add(T::DbWeight::get().reads(3_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	/// Storage: `AssetRegistry::Assets` (r:2 w:0)
 	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
@@ -124,14 +135,14 @@ impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
 	/// The range of component `b` is `[1, 39]`.
 	fn on_liquidity_changed_multiple_tokens(b: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `751 + b * (163 ±0)`
+		//  Measured:  `821 + b * (164 ±0)`
 		//  Estimated: `7406`
-		// Minimum execution time: 19_079_000 picoseconds.
-		Weight::from_parts(19_403_394, 7406)
-			// Standard Error: 3_730
-			.saturating_add(Weight::from_parts(422_560, 0).saturating_mul(b.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(1))
+		// Minimum execution time: 16_217_000 picoseconds.
+		Weight::from_parts(17_087_683, 7406)
+			// Standard Error: 2_611
+			.saturating_add(Weight::from_parts(406_220, 0).saturating_mul(b.into()))
+			.saturating_add(T::DbWeight::get().reads(3_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	/// Storage: `EmaOracle::Oracles` (r:2 w:0)
 	/// Proof: `EmaOracle::Oracles` (`max_values`: None, `max_size`: Some(177), added: 2652, mode: `MaxEncodedLen`)
@@ -139,8 +150,8 @@ impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `638`
 		//  Estimated: `6294`
-		// Minimum execution time: 18_991_000 picoseconds.
-		Weight::from_parts(19_258_000, 6294)
-			.saturating_add(T::DbWeight::get().reads(2))
+		// Minimum execution time: 17_768_000 picoseconds.
+		Weight::from_parts(18_090_000, 6294)
+			.saturating_add(T::DbWeight::get().reads(2_u64))
 	}
-}
+}
\ No newline at end of file
diff --git a/runtime/hydradx/src/weights/evm_accounts.rs b/runtime/hydradx/src/weights/pallet_evm_accounts.rs
similarity index 65%
rename from runtime/hydradx/src/weights/evm_accounts.rs
rename to runtime/hydradx/src/weights/pallet_evm_accounts.rs
index c33686093..e378bb693 100644
--- a/runtime/hydradx/src/weights/evm_accounts.rs
+++ b/runtime/hydradx/src/weights/pallet_evm_accounts.rs
@@ -1,6 +1,6 @@
 // This file is part of HydraDX.
 
-// Copyright (C) 2020-2024  Intergalactic, Limited (GIB).
+// Copyright (C) 2020-2023  Intergalactic, Limited (GIB).
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,45 +15,48 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+
 //! Autogenerated weights for `pallet_evm_accounts`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-02-21, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-05-23, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: 1024
+//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024`
 
 // Executed Command:
-// target/release/hydradx
+// ./target/release/hydradx
 // benchmark
 // pallet
-// --chain=dev
-// --steps=10
-// --repeat=30
 // --wasm-execution=compiled
-// --heap-pages=4096
-// --template=.maintain/pallet-weight-template-no-back.hbs
-// --pallet=pallet-evm-accounts
-// --output=weights-1.1.0/evm-accounts.rs
-// --extrinsic=*
+// --pallet
+// *
+// --extrinsic
+// *
+// --heap-pages
+// 4096
+// --steps
+// 50
+// --repeat
+// 20
+// --template=scripts/pallet-weight-template.hbs
+// --output
+// weights/
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
 #![allow(missing_docs)]
 
-use frame_support::{
-	traits::Get,
-	weights::{constants::RocksDbWeight, Weight},
-};
-use sp_std::marker::PhantomData;
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
+use core::marker::PhantomData;
 
-use pallet_evm_accounts::weights::WeightInfo;
+/// Weights for `pallet_evm_accounts`.
+pub struct WeightInfo<T>(PhantomData<T>);
 
-/// Weights for pallet_evm_accounts using the hydraDX node and recommended hardware.
+/// Weights for `pallet_evm_accounts` using the HydraDX node and recommended hardware.
 pub struct HydraWeight<T>(PhantomData<T>);
-
-impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
+impl<T: frame_system::Config> pallet_evm_accounts::WeightInfo for HydraWeight<T> {
 	/// Storage: `EVMAccounts::AccountExtension` (r:1 w:1)
 	/// Proof: `EVMAccounts::AccountExtension` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
 	/// Storage: `System::Account` (r:1 w:0)
@@ -64,14 +67,16 @@ impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
 	/// Proof: `AssetRegistry::LocationAssets` (`max_values`: None, `max_size`: Some(622), added: 3097, mode: `MaxEncodedLen`)
 	/// Storage: `Tokens::Accounts` (r:1 w:0)
 	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::Assets` (r:1 w:0)
+	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
 	fn bind_evm_address() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `479`
+		//  Measured:  `545`
 		//  Estimated: `4087`
-		// Minimum execution time: 36_357_000 picoseconds.
-		Weight::from_parts(36_601_000, 4087)
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(1))
+		// Minimum execution time: 32_109_000 picoseconds.
+		Weight::from_parts(32_705_000, 4087)
+			.saturating_add(T::DbWeight::get().reads(6_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	/// Storage: `EVMAccounts::ContractDeployer` (r:0 w:1)
 	/// Proof: `EVMAccounts::ContractDeployer` (`max_values`: None, `max_size`: Some(36), added: 2511, mode: `MaxEncodedLen`)
@@ -79,9 +84,9 @@ impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 13_157_000 picoseconds.
-		Weight::from_parts(13_481_000, 0)
-			.saturating_add(T::DbWeight::get().writes(1))
+		// Minimum execution time: 9_574_000 picoseconds.
+		Weight::from_parts(9_760_000, 0)
+			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	/// Storage: `EVMAccounts::ContractDeployer` (r:0 w:1)
 	/// Proof: `EVMAccounts::ContractDeployer` (`max_values`: None, `max_size`: Some(36), added: 2511, mode: `MaxEncodedLen`)
@@ -89,9 +94,9 @@ impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 13_196_000 picoseconds.
-		Weight::from_parts(13_517_000, 0)
-			.saturating_add(T::DbWeight::get().writes(1))
+		// Minimum execution time: 9_344_000 picoseconds.
+		Weight::from_parts(9_633_000, 0)
+			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	/// Storage: `EVMAccounts::ContractDeployer` (r:0 w:1)
 	/// Proof: `EVMAccounts::ContractDeployer` (`max_values`: None, `max_size`: Some(36), added: 2511, mode: `MaxEncodedLen`)
@@ -99,8 +104,8 @@ impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 13_153_000 picoseconds.
-		Weight::from_parts(13_380_000, 0)
-			.saturating_add(T::DbWeight::get().writes(1))
+		// Minimum execution time: 9_421_000 picoseconds.
+		Weight::from_parts(9_685_000, 0)
+			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-}
+}
\ No newline at end of file
diff --git a/runtime/hydradx/src/weights/pallet_identity.rs b/runtime/hydradx/src/weights/pallet_identity.rs
new file mode 100644
index 000000000..ff1b56687
--- /dev/null
+++ b/runtime/hydradx/src/weights/pallet_identity.rs
@@ -0,0 +1,422 @@
+// This file is part of HydraDX.
+
+// Copyright (C) 2020-2023  Intergalactic, Limited (GIB).
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+
+//! Autogenerated weights for `pallet_identity`
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-05-23, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! WORST CASE MAP SIZE: `1000000`
+//! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024`
+
+// Executed Command:
+// ./target/release/hydradx
+// benchmark
+// pallet
+// --wasm-execution=compiled
+// --pallet
+// *
+// --extrinsic
+// *
+// --heap-pages
+// 4096
+// --steps
+// 50
+// --repeat
+// 20
+// --template=scripts/pallet-weight-template.hbs
+// --output
+// weights/
+
+#![cfg_attr(rustfmt, rustfmt_skip)]
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+#![allow(missing_docs)]
+
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
+use core::marker::PhantomData;
+
+/// Weights for `pallet_identity`.
+pub struct WeightInfo<T>(PhantomData<T>);
+
+/// Weights for `pallet_identity` using the HydraDX node and recommended hardware.
+pub struct HydraWeight<T>(PhantomData<T>);
+impl<T: frame_system::Config> pallet_identity::WeightInfo for HydraWeight<T> {
+	/// Storage: `Identity::Registrars` (r:1 w:1)
+	/// Proof: `Identity::Registrars` (`max_values`: Some(1), `max_size`: Some(1141), added: 1636, mode: `MaxEncodedLen`)
+	/// The range of component `r` is `[1, 19]`.
+	fn add_registrar(r: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `32 + r * (57 ±0)`
+		//  Estimated: `2626`
+		// Minimum execution time: 11_399_000 picoseconds.
+		Weight::from_parts(12_166_388, 2626)
+			// Standard Error: 1_302
+			.saturating_add(Weight::from_parts(96_642, 0).saturating_mul(r.into()))
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
+	}
+	/// Storage: `Identity::IdentityOf` (r:1 w:1)
+	/// Proof: `Identity::IdentityOf` (`max_values`: None, `max_size`: Some(7572), added: 10047, mode: `MaxEncodedLen`)
+	/// The range of component `r` is `[1, 20]`.
+	fn set_identity(r: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `6978 + r * (5 ±0)`
+		//  Estimated: `11037`
+		// Minimum execution time: 148_518_000 picoseconds.
+		Weight::from_parts(150_083_538, 11037)
+			// Standard Error: 4_409
+			.saturating_add(Weight::from_parts(129_118, 0).saturating_mul(r.into()))
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
+	}
+	/// Storage: `Identity::IdentityOf` (r:1 w:0)
+	/// Proof: `Identity::IdentityOf` (`max_values`: None, `max_size`: Some(7572), added: 10047, mode: `MaxEncodedLen`)
+	/// Storage: `Identity::SubsOf` (r:1 w:1)
+	/// Proof: `Identity::SubsOf` (`max_values`: None, `max_size`: Some(3258), added: 5733, mode: `MaxEncodedLen`)
+	/// Storage: `Identity::SuperOf` (r:100 w:100)
+	/// Proof: `Identity::SuperOf` (`max_values`: None, `max_size`: Some(114), added: 2589, mode: `MaxEncodedLen`)
+	/// The range of component `s` is `[0, 100]`.
+	fn set_subs_new(s: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `101`
+		//  Estimated: `11037 + s * (2589 ±0)`
+		// Minimum execution time: 13_292_000 picoseconds.
+		Weight::from_parts(30_159_846, 11037)
+			// Standard Error: 4_226
+			.saturating_add(Weight::from_parts(3_730_074, 0).saturating_mul(s.into()))
+			.saturating_add(T::DbWeight::get().reads(2_u64))
+			.saturating_add(T::DbWeight::get().reads((1_u64).saturating_mul(s.into())))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
+			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s.into())))
+			.saturating_add(Weight::from_parts(0, 2589).saturating_mul(s.into()))
+	}
+	/// Storage: `Identity::IdentityOf` (r:1 w:0)
+	/// Proof: `Identity::IdentityOf` (`max_values`: None, `max_size`: Some(7572), added: 10047, mode: `MaxEncodedLen`)
+	/// Storage: `Identity::SubsOf` (r:1 w:1)
+	/// Proof: `Identity::SubsOf` (`max_values`: None, `max_size`: Some(3258), added: 5733, mode: `MaxEncodedLen`)
+	/// Storage: `Identity::SuperOf` (r:0 w:100)
+	/// Proof: `Identity::SuperOf` (`max_values`: None, `max_size`: Some(114), added: 2589, mode: `MaxEncodedLen`)
+	/// The range of component `p` is `[0, 100]`.
+	fn set_subs_old(p: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `194 + p * (32 ±0)`
+		//  Estimated: `11037`
+		// Minimum execution time: 13_191_000 picoseconds.
+		Weight::from_parts(28_624_050, 11037)
+			// Standard Error: 3_555
+			.saturating_add(Weight::from_parts(1_507_049, 0).saturating_mul(p.into()))
+			.saturating_add(T::DbWeight::get().reads(2_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
+			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(p.into())))
+	}
+	/// Storage: `Identity::SubsOf` (r:1 w:1)
+	/// Proof: `Identity::SubsOf` (`max_values`: None, `max_size`: Some(3258), added: 5733, mode: `MaxEncodedLen`)
+	/// Storage: `Identity::IdentityOf` (r:1 w:1)
+	/// Proof: `Identity::IdentityOf` (`max_values`: None, `max_size`: Some(7572), added: 10047, mode: `MaxEncodedLen`)
+	/// Storage: `Identity::SuperOf` (r:0 w:100)
+	/// Proof: `Identity::SuperOf` (`max_values`: None, `max_size`: Some(114), added: 2589, mode: `MaxEncodedLen`)
+	/// The range of component `r` is `[1, 20]`.
+	/// The range of component `s` is `[0, 100]`.
+	fn clear_identity(r: u32, s: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `7070 + r * (5 ±0) + s * (32 ±0)`
+		//  Estimated: `11037`
+		// Minimum execution time: 70_387_000 picoseconds.
+		Weight::from_parts(72_882_357, 11037)
+			// Standard Error: 4_326
+			.saturating_add(Weight::from_parts(58_615, 0).saturating_mul(r.into()))
+			// Standard Error: 844
+			.saturating_add(Weight::from_parts(1_488_740, 0).saturating_mul(s.into()))
+			.saturating_add(T::DbWeight::get().reads(2_u64))
+			.saturating_add(T::DbWeight::get().writes(2_u64))
+			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s.into())))
+	}
+	/// Storage: `Identity::Registrars` (r:1 w:0)
+	/// Proof: `Identity::Registrars` (`max_values`: Some(1), `max_size`: Some(1141), added: 1636, mode: `MaxEncodedLen`)
+	/// Storage: `Identity::IdentityOf` (r:1 w:1)
+	/// Proof: `Identity::IdentityOf` (`max_values`: None, `max_size`: Some(7572), added: 10047, mode: `MaxEncodedLen`)
+	/// The range of component `r` is `[1, 20]`.
+	fn request_judgement(r: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `6968 + r * (57 ±0)`
+		//  Estimated: `11037`
+		// Minimum execution time: 100_892_000 picoseconds.
+		Weight::from_parts(101_830_018, 11037)
+			// Standard Error: 2_693
+			.saturating_add(Weight::from_parts(90_776, 0).saturating_mul(r.into()))
+			.saturating_add(T::DbWeight::get().reads(2_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
+	}
+	/// Storage: `Identity::IdentityOf` (r:1 w:1)
+	/// Proof: `Identity::IdentityOf` (`max_values`: None, `max_size`: Some(7572), added: 10047, mode: `MaxEncodedLen`)
+	/// The range of component `r` is `[1, 20]`.
+	fn cancel_request(r: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `6999`
+		//  Estimated: `11037`
+		// Minimum execution time: 99_703_000 picoseconds.
+		Weight::from_parts(100_598_712, 11037)
+			// Standard Error: 3_753
+			.saturating_add(Weight::from_parts(70_359, 0).saturating_mul(r.into()))
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
+	}
+	/// Storage: `Identity::Registrars` (r:1 w:1)
+	/// Proof: `Identity::Registrars` (`max_values`: Some(1), `max_size`: Some(1141), added: 1636, mode: `MaxEncodedLen`)
+	/// The range of component `r` is `[1, 19]`.
+	fn set_fee(r: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `89 + r * (57 ±0)`
+		//  Estimated: `2626`
+		// Minimum execution time: 8_651_000 picoseconds.
+		Weight::from_parts(9_046_946, 2626)
+			// Standard Error: 1_126
+			.saturating_add(Weight::from_parts(70_865, 0).saturating_mul(r.into()))
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
+	}
+	/// Storage: `Identity::Registrars` (r:1 w:1)
+	/// Proof: `Identity::Registrars` (`max_values`: Some(1), `max_size`: Some(1141), added: 1636, mode: `MaxEncodedLen`)
+	/// The range of component `r` is `[1, 19]`.
+	fn set_account_id(r: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `89 + r * (57 ±0)`
+		//  Estimated: `2626`
+		// Minimum execution time: 8_849_000 picoseconds.
+		Weight::from_parts(9_173_114, 2626)
+			// Standard Error: 917
+			.saturating_add(Weight::from_parts(64_377, 0).saturating_mul(r.into()))
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
+	}
+	/// Storage: `Identity::Registrars` (r:1 w:1)
+	/// Proof: `Identity::Registrars` (`max_values`: Some(1), `max_size`: Some(1141), added: 1636, mode: `MaxEncodedLen`)
+	/// The range of component `r` is `[1, 19]`.
+	fn set_fields(r: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `89 + r * (57 ±0)`
+		//  Estimated: `2626`
+		// Minimum execution time: 8_609_000 picoseconds.
+		Weight::from_parts(9_018_408, 2626)
+			// Standard Error: 970
+			.saturating_add(Weight::from_parts(68_040, 0).saturating_mul(r.into()))
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
+	}
+	/// Storage: `Identity::Registrars` (r:1 w:0)
+	/// Proof: `Identity::Registrars` (`max_values`: Some(1), `max_size`: Some(1141), added: 1636, mode: `MaxEncodedLen`)
+	/// Storage: `Identity::IdentityOf` (r:1 w:1)
+	/// Proof: `Identity::IdentityOf` (`max_values`: None, `max_size`: Some(7572), added: 10047, mode: `MaxEncodedLen`)
+	/// The range of component `r` is `[1, 19]`.
+	fn provide_judgement(r: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `7046 + r * (57 ±0)`
+		//  Estimated: `11037`
+		// Minimum execution time: 128_104_000 picoseconds.
+		Weight::from_parts(129_536_412, 11037)
+			// Standard Error: 2_778
+			.saturating_add(Weight::from_parts(75_146, 0).saturating_mul(r.into()))
+			.saturating_add(T::DbWeight::get().reads(2_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
+	}
+	/// Storage: `Identity::SubsOf` (r:1 w:1)
+	/// Proof: `Identity::SubsOf` (`max_values`: None, `max_size`: Some(3258), added: 5733, mode: `MaxEncodedLen`)
+	/// Storage: `Identity::IdentityOf` (r:1 w:1)
+	/// Proof: `Identity::IdentityOf` (`max_values`: None, `max_size`: Some(7572), added: 10047, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:2 w:2)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `Identity::SuperOf` (r:0 w:100)
+	/// Proof: `Identity::SuperOf` (`max_values`: None, `max_size`: Some(114), added: 2589, mode: `MaxEncodedLen`)
+	/// The range of component `r` is `[1, 20]`.
+	/// The range of component `s` is `[0, 100]`.
+	fn kill_identity(r: u32, s: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `7364 + r * (15 ±0) + s * (32 ±0)`
+		//  Estimated: `11037`
+		// Minimum execution time: 87_418_000 picoseconds.
+		Weight::from_parts(89_157_672, 11037)
+			// Standard Error: 6_894
+			.saturating_add(Weight::from_parts(93_123, 0).saturating_mul(r.into()))
+			// Standard Error: 1_345
+			.saturating_add(Weight::from_parts(1_498_176, 0).saturating_mul(s.into()))
+			.saturating_add(T::DbWeight::get().reads(4_u64))
+			.saturating_add(T::DbWeight::get().writes(4_u64))
+			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(s.into())))
+	}
+	/// Storage: `Identity::IdentityOf` (r:1 w:0)
+	/// Proof: `Identity::IdentityOf` (`max_values`: None, `max_size`: Some(7572), added: 10047, mode: `MaxEncodedLen`)
+	/// Storage: `Identity::SuperOf` (r:1 w:1)
+	/// Proof: `Identity::SuperOf` (`max_values`: None, `max_size`: Some(114), added: 2589, mode: `MaxEncodedLen`)
+	/// Storage: `Identity::SubsOf` (r:1 w:1)
+	/// Proof: `Identity::SubsOf` (`max_values`: None, `max_size`: Some(3258), added: 5733, mode: `MaxEncodedLen`)
+	/// The range of component `s` is `[0, 99]`.
+	fn add_sub(s: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `475 + s * (36 ±0)`
+		//  Estimated: `11037`
+		// Minimum execution time: 33_079_000 picoseconds.
+		Weight::from_parts(37_832_839, 11037)
+			// Standard Error: 1_074
+			.saturating_add(Weight::from_parts(54_799, 0).saturating_mul(s.into()))
+			.saturating_add(T::DbWeight::get().reads(3_u64))
+			.saturating_add(T::DbWeight::get().writes(2_u64))
+	}
+	/// Storage: `Identity::IdentityOf` (r:1 w:0)
+	/// Proof: `Identity::IdentityOf` (`max_values`: None, `max_size`: Some(7572), added: 10047, mode: `MaxEncodedLen`)
+	/// Storage: `Identity::SuperOf` (r:1 w:1)
+	/// Proof: `Identity::SuperOf` (`max_values`: None, `max_size`: Some(114), added: 2589, mode: `MaxEncodedLen`)
+	/// The range of component `s` is `[1, 100]`.
+	fn rename_sub(s: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `591 + s * (3 ±0)`
+		//  Estimated: `11037`
+		// Minimum execution time: 17_296_000 picoseconds.
+		Weight::from_parts(19_263_422, 11037)
+			// Standard Error: 565
+			.saturating_add(Weight::from_parts(19_326, 0).saturating_mul(s.into()))
+			.saturating_add(T::DbWeight::get().reads(2_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
+	}
+	/// Storage: `Identity::IdentityOf` (r:1 w:0)
+	/// Proof: `Identity::IdentityOf` (`max_values`: None, `max_size`: Some(7572), added: 10047, mode: `MaxEncodedLen`)
+	/// Storage: `Identity::SuperOf` (r:1 w:1)
+	/// Proof: `Identity::SuperOf` (`max_values`: None, `max_size`: Some(114), added: 2589, mode: `MaxEncodedLen`)
+	/// Storage: `Identity::SubsOf` (r:1 w:1)
+	/// Proof: `Identity::SubsOf` (`max_values`: None, `max_size`: Some(3258), added: 5733, mode: `MaxEncodedLen`)
+	/// The range of component `s` is `[1, 100]`.
+	fn remove_sub(s: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `638 + s * (35 ±0)`
+		//  Estimated: `11037`
+		// Minimum execution time: 36_750_000 picoseconds.
+		Weight::from_parts(39_404_724, 11037)
+			// Standard Error: 734
+			.saturating_add(Weight::from_parts(41_165, 0).saturating_mul(s.into()))
+			.saturating_add(T::DbWeight::get().reads(3_u64))
+			.saturating_add(T::DbWeight::get().writes(2_u64))
+	}
+	/// Storage: `Identity::SuperOf` (r:1 w:1)
+	/// Proof: `Identity::SuperOf` (`max_values`: None, `max_size`: Some(114), added: 2589, mode: `MaxEncodedLen`)
+	/// Storage: `Identity::SubsOf` (r:1 w:1)
+	/// Proof: `Identity::SubsOf` (`max_values`: None, `max_size`: Some(3258), added: 5733, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:1 w:0)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// The range of component `s` is `[0, 99]`.
+	fn quit_sub(s: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `704 + s * (37 ±0)`
+		//  Estimated: `6723`
+		// Minimum execution time: 28_363_000 picoseconds.
+		Weight::from_parts(30_544_314, 6723)
+			// Standard Error: 781
+			.saturating_add(Weight::from_parts(47_628, 0).saturating_mul(s.into()))
+			.saturating_add(T::DbWeight::get().reads(3_u64))
+			.saturating_add(T::DbWeight::get().writes(2_u64))
+	}
+	/// Storage: `Identity::UsernameAuthorities` (r:0 w:1)
+	/// Proof: `Identity::UsernameAuthorities` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	fn add_username_authority() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `0`
+		//  Estimated: `0`
+		// Minimum execution time: 9_266_000 picoseconds.
+		Weight::from_parts(9_524_000, 0)
+			.saturating_add(T::DbWeight::get().writes(1_u64))
+	}
+	/// Storage: `Identity::UsernameAuthorities` (r:1 w:1)
+	/// Proof: `Identity::UsernameAuthorities` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	fn remove_username_authority() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `80`
+		//  Estimated: `3517`
+		// Minimum execution time: 11_923_000 picoseconds.
+		Weight::from_parts(12_167_000, 3517)
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
+	}
+	/// Storage: `Identity::UsernameAuthorities` (r:1 w:1)
+	/// Proof: `Identity::UsernameAuthorities` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	/// Storage: `Identity::AccountOfUsername` (r:1 w:1)
+	/// Proof: `Identity::AccountOfUsername` (`max_values`: None, `max_size`: Some(81), added: 2556, mode: `MaxEncodedLen`)
+	/// Storage: `Identity::PendingUsernames` (r:1 w:0)
+	/// Proof: `Identity::PendingUsernames` (`max_values`: None, `max_size`: Some(85), added: 2560, mode: `MaxEncodedLen`)
+	/// Storage: `Identity::IdentityOf` (r:1 w:1)
+	/// Proof: `Identity::IdentityOf` (`max_values`: None, `max_size`: Some(7572), added: 10047, mode: `MaxEncodedLen`)
+	fn set_username_for() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `80`
+		//  Estimated: `11037`
+		// Minimum execution time: 66_614_000 picoseconds.
+		Weight::from_parts(67_277_000, 11037)
+			.saturating_add(T::DbWeight::get().reads(4_u64))
+			.saturating_add(T::DbWeight::get().writes(3_u64))
+	}
+	/// Storage: `Identity::PendingUsernames` (r:1 w:1)
+	/// Proof: `Identity::PendingUsernames` (`max_values`: None, `max_size`: Some(85), added: 2560, mode: `MaxEncodedLen`)
+	/// Storage: `Identity::IdentityOf` (r:1 w:1)
+	/// Proof: `Identity::IdentityOf` (`max_values`: None, `max_size`: Some(7572), added: 10047, mode: `MaxEncodedLen`)
+	/// Storage: `Identity::AccountOfUsername` (r:0 w:1)
+	/// Proof: `Identity::AccountOfUsername` (`max_values`: None, `max_size`: Some(81), added: 2556, mode: `MaxEncodedLen`)
+	fn accept_username() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `115`
+		//  Estimated: `11037`
+		// Minimum execution time: 26_815_000 picoseconds.
+		Weight::from_parts(27_250_000, 11037)
+			.saturating_add(T::DbWeight::get().reads(2_u64))
+			.saturating_add(T::DbWeight::get().writes(3_u64))
+	}
+	/// Storage: `Identity::PendingUsernames` (r:1 w:1)
+	/// Proof: `Identity::PendingUsernames` (`max_values`: None, `max_size`: Some(85), added: 2560, mode: `MaxEncodedLen`)
+	fn remove_expired_approval() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `115`
+		//  Estimated: `3550`
+		// Minimum execution time: 16_590_000 picoseconds.
+		Weight::from_parts(16_962_000, 3550)
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
+	}
+	/// Storage: `Identity::AccountOfUsername` (r:1 w:0)
+	/// Proof: `Identity::AccountOfUsername` (`max_values`: None, `max_size`: Some(81), added: 2556, mode: `MaxEncodedLen`)
+	/// Storage: `Identity::IdentityOf` (r:1 w:1)
+	/// Proof: `Identity::IdentityOf` (`max_values`: None, `max_size`: Some(7572), added: 10047, mode: `MaxEncodedLen`)
+	fn set_primary_username() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `257`
+		//  Estimated: `11037`
+		// Minimum execution time: 22_033_000 picoseconds.
+		Weight::from_parts(22_650_000, 11037)
+			.saturating_add(T::DbWeight::get().reads(2_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
+	}
+	/// Storage: `Identity::AccountOfUsername` (r:1 w:1)
+	/// Proof: `Identity::AccountOfUsername` (`max_values`: None, `max_size`: Some(81), added: 2556, mode: `MaxEncodedLen`)
+	/// Storage: `Identity::IdentityOf` (r:1 w:0)
+	/// Proof: `Identity::IdentityOf` (`max_values`: None, `max_size`: Some(7572), added: 10047, mode: `MaxEncodedLen`)
+	fn remove_dangling_username() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `98`
+		//  Estimated: `11037`
+		// Minimum execution time: 14_896_000 picoseconds.
+		Weight::from_parts(15_302_000, 11037)
+			.saturating_add(T::DbWeight::get().reads(2_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
+	}
+}
\ No newline at end of file
diff --git a/runtime/hydradx/src/weights/lbp.rs b/runtime/hydradx/src/weights/pallet_lbp.rs
similarity index 79%
rename from runtime/hydradx/src/weights/lbp.rs
rename to runtime/hydradx/src/weights/pallet_lbp.rs
index 2a4238477..926bc9431 100644
--- a/runtime/hydradx/src/weights/lbp.rs
+++ b/runtime/hydradx/src/weights/pallet_lbp.rs
@@ -15,41 +15,48 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+
 //! Autogenerated weights for `pallet_lbp`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-02-15, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-05-23, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: 1024
+//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024`
 
 // Executed Command:
-// target/release/hydradx
+// ./target/release/hydradx
 // benchmark
 // pallet
-// --chain=dev
-// --steps=10
-// --repeat=30
 // --wasm-execution=compiled
-// --heap-pages=4096
-// --template=.maintain/pallet-weight-template-no-back.hbs
-// --pallet=pallet_lbp
-// --output=./weights/lbp.rs
-// --extrinsic=*
+// --pallet
+// *
+// --extrinsic
+// *
+// --heap-pages
+// 4096
+// --steps
+// 50
+// --repeat
+// 20
+// --template=scripts/pallet-weight-template.hbs
+// --output
+// weights/
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
 #![allow(missing_docs)]
 
-use frame_support::{traits::Get, weights::Weight};
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
 use core::marker::PhantomData;
 
-use pallet_lbp::weights::WeightInfo;
+/// Weights for `pallet_lbp`.
+pub struct WeightInfo<T>(PhantomData<T>);
 
-/// Weight functions for `pallet_lbp`.
+/// Weights for `pallet_lbp` using the HydraDX node and recommended hardware.
 pub struct HydraWeight<T>(PhantomData<T>);
-impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
+impl<T: frame_system::Config> pallet_lbp::WeightInfo for HydraWeight<T> {
 	/// Storage: `LBP::PoolData` (r:1 w:1)
 	/// Proof: `LBP::PoolData` (`max_values`: None, `max_size`: Some(163), added: 2638, mode: `MaxEncodedLen`)
 	/// Storage: `LBP::FeeCollectorWithAsset` (r:1 w:1)
@@ -70,12 +77,12 @@ impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
 	/// Proof: `MultiTransactionPayment::AcceptedCurrencies` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
 	fn create_pool() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1178`
+		//  Measured:  `1311`
 		//  Estimated: `11322`
-		// Minimum execution time: 162_938_000 picoseconds.
-		Weight::from_parts(164_251_000, 11322)
-			.saturating_add(T::DbWeight::get().reads(15))
-			.saturating_add(T::DbWeight::get().writes(8))
+		// Minimum execution time: 131_482_000 picoseconds.
+		Weight::from_parts(132_832_000, 11322)
+			.saturating_add(T::DbWeight::get().reads(15_u64))
+			.saturating_add(T::DbWeight::get().writes(8_u64))
 	}
 	/// Storage: `LBP::PoolData` (r:1 w:1)
 	/// Proof: `LBP::PoolData` (`max_values`: None, `max_size`: Some(163), added: 2638, mode: `MaxEncodedLen`)
@@ -83,12 +90,12 @@ impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
 	/// Proof: `LBP::FeeCollectorWithAsset` (`max_values`: None, `max_size`: Some(69), added: 2544, mode: `MaxEncodedLen`)
 	fn update_pool_data() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `351`
+		//  Measured:  `417`
 		//  Estimated: `3628`
-		// Minimum execution time: 30_041_000 picoseconds.
-		Weight::from_parts(30_468_000, 3628)
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(3))
+		// Minimum execution time: 24_822_000 picoseconds.
+		Weight::from_parts(25_218_000, 3628)
+			.saturating_add(T::DbWeight::get().reads(2_u64))
+			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
 	/// Storage: `LBP::PoolData` (r:1 w:0)
 	/// Proof: `LBP::PoolData` (`max_values`: None, `max_size`: Some(163), added: 2638, mode: `MaxEncodedLen`)
@@ -104,12 +111,12 @@ impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn add_liquidity() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1439`
+		//  Measured:  `1572`
 		//  Estimated: `11322`
-		// Minimum execution time: 118_411_000 picoseconds.
-		Weight::from_parts(119_467_000, 11322)
-			.saturating_add(T::DbWeight::get().reads(11))
-			.saturating_add(T::DbWeight::get().writes(4))
+		// Minimum execution time: 99_136_000 picoseconds.
+		Weight::from_parts(99_953_000, 11322)
+			.saturating_add(T::DbWeight::get().reads(11_u64))
+			.saturating_add(T::DbWeight::get().writes(4_u64))
 	}
 	/// Storage: `LBP::PoolData` (r:1 w:1)
 	/// Proof: `LBP::PoolData` (`max_values`: None, `max_size`: Some(163), added: 2638, mode: `MaxEncodedLen`)
@@ -131,12 +138,12 @@ impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
 	/// Proof: `LBP::FeeCollectorWithAsset` (`max_values`: None, `max_size`: Some(69), added: 2544, mode: `MaxEncodedLen`)
 	fn remove_liquidity() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1554`
+		//  Measured:  `1687`
 		//  Estimated: `11322`
-		// Minimum execution time: 153_550_000 picoseconds.
-		Weight::from_parts(154_890_000, 11322)
-			.saturating_add(T::DbWeight::get().reads(13))
-			.saturating_add(T::DbWeight::get().writes(8))
+		// Minimum execution time: 129_681_000 picoseconds.
+		Weight::from_parts(131_072_000, 11322)
+			.saturating_add(T::DbWeight::get().reads(13_u64))
+			.saturating_add(T::DbWeight::get().writes(8_u64))
 	}
 	/// Storage: `Tokens::Accounts` (r:5 w:5)
 	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
@@ -154,12 +161,12 @@ impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn sell() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1844`
+		//  Measured:  `1977`
 		//  Estimated: `13905`
-		// Minimum execution time: 243_058_000 picoseconds.
-		Weight::from_parts(244_292_000, 13905)
-			.saturating_add(T::DbWeight::get().reads(16))
-			.saturating_add(T::DbWeight::get().writes(7))
+		// Minimum execution time: 229_471_000 picoseconds.
+		Weight::from_parts(231_032_000, 13905)
+			.saturating_add(T::DbWeight::get().reads(16_u64))
+			.saturating_add(T::DbWeight::get().writes(7_u64))
 	}
 	/// Storage: `LBP::PoolData` (r:1 w:0)
 	/// Proof: `LBP::PoolData` (`max_values`: None, `max_size`: Some(163), added: 2638, mode: `MaxEncodedLen`)
@@ -177,12 +184,12 @@ impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn buy() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1844`
+		//  Measured:  `1977`
 		//  Estimated: `13905`
-		// Minimum execution time: 242_758_000 picoseconds.
-		Weight::from_parts(244_140_000, 13905)
-			.saturating_add(T::DbWeight::get().reads(16))
-			.saturating_add(T::DbWeight::get().writes(7))
+		// Minimum execution time: 230_204_000 picoseconds.
+		Weight::from_parts(231_446_000, 13905)
+			.saturating_add(T::DbWeight::get().reads(16_u64))
+			.saturating_add(T::DbWeight::get().writes(7_u64))
 	}
 	/// Storage: `LBP::PoolData` (r:1 w:0)
 	/// Proof: `LBP::PoolData` (`max_values`: None, `max_size`: Some(163), added: 2638, mode: `MaxEncodedLen`)
@@ -202,15 +209,15 @@ impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
 	/// The range of component `e` is `[0, 1]`.
 	fn router_execution_sell(c: u32, e: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `756 + e * (1088 ±0)`
-		//  Estimated: `6156 + e * (7749 ±251_795_645_551_580_832)`
-		// Minimum execution time: 66_583_000 picoseconds.
-		Weight::from_parts(67_060_000, 6156)
-			// Standard Error: 587_908
-			.saturating_add(Weight::from_parts(2_276_829, 0).saturating_mul(c.into()))
-			// Standard Error: 1_290_627
-			.saturating_add(Weight::from_parts(183_046_701, 0).saturating_mul(e.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
+		//  Measured:  `822 + e * (1155 ±0)`
+		//  Estimated: `8799 + e * (7749 ±0)`
+		// Minimum execution time: 86_477_000 picoseconds.
+		Weight::from_parts(87_284_000, 8799)
+			// Standard Error: 227_219
+			.saturating_add(Weight::from_parts(978_707, 0).saturating_mul(c.into()))
+			// Standard Error: 506_080
+			.saturating_add(Weight::from_parts(145_385_809, 0).saturating_mul(e.into()))
+			.saturating_add(T::DbWeight::get().reads(3_u64))
 			.saturating_add(T::DbWeight::get().reads((13_u64).saturating_mul(e.into())))
 			.saturating_add(T::DbWeight::get().writes((7_u64).saturating_mul(e.into())))
 			.saturating_add(Weight::from_parts(0, 7749).saturating_mul(e.into()))
@@ -233,18 +240,18 @@ impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
 	/// The range of component `e` is `[0, 1]`.
 	fn router_execution_buy(c: u32, e: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `756 + e * (1088 ±0)`
-		//  Estimated: `6156 + e * (7749 ±0)`
-		// Minimum execution time: 117_561_000 picoseconds.
-		Weight::from_parts(118_264_000, 6156)
-			// Standard Error: 751_682
-			.saturating_add(Weight::from_parts(3_708_043, 0).saturating_mul(c.into()))
-			// Standard Error: 2_482_101
-			.saturating_add(Weight::from_parts(155_294_743, 0).saturating_mul(e.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
+		//  Measured:  `822 + e * (1155 ±0)`
+		//  Estimated: `6156 + e * (8544 ±4_363_391_150_632_390)`
+		// Minimum execution time: 157_384_000 picoseconds.
+		Weight::from_parts(158_861_000, 6156)
+			// Standard Error: 426_842
+			.saturating_add(Weight::from_parts(2_861_447, 0).saturating_mul(c.into()))
+			// Standard Error: 1_439_449
+			.saturating_add(Weight::from_parts(107_641_350, 0).saturating_mul(e.into()))
+			.saturating_add(T::DbWeight::get().reads(3_u64))
 			.saturating_add(T::DbWeight::get().reads((13_u64).saturating_mul(e.into())))
 			.saturating_add(T::DbWeight::get().writes((7_u64).saturating_mul(e.into())))
-			.saturating_add(Weight::from_parts(0, 7749).saturating_mul(e.into()))
+			.saturating_add(Weight::from_parts(0, 8544).saturating_mul(e.into()))
 	}
 	/// Storage: `LBP::PoolData` (r:1 w:0)
 	/// Proof: `LBP::PoolData` (`max_values`: None, `max_size`: Some(163), added: 2638, mode: `MaxEncodedLen`)
@@ -252,10 +259,10 @@ impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
 	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
 	fn calculate_buy() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `756`
+		//  Measured:  `822`
 		//  Estimated: `6156`
-		// Minimum execution time: 66_616_000 picoseconds.
-		Weight::from_parts(67_128_000, 6156)
-			.saturating_add(T::DbWeight::get().reads(3))
+		// Minimum execution time: 88_840_000 picoseconds.
+		Weight::from_parts(89_569_000, 6156)
+			.saturating_add(T::DbWeight::get().reads(3_u64))
 	}
-}
+}
\ No newline at end of file
diff --git a/runtime/hydradx/src/weights/pallet_message_queue.rs b/runtime/hydradx/src/weights/pallet_message_queue.rs
new file mode 100644
index 000000000..4b61714b9
--- /dev/null
+++ b/runtime/hydradx/src/weights/pallet_message_queue.rs
@@ -0,0 +1,183 @@
+// This file is part of HydraDX.
+
+// Copyright (C) 2020-2023  Intergalactic, Limited (GIB).
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+
+//! Autogenerated weights for `pallet_message_queue`
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-05-23, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! WORST CASE MAP SIZE: `1000000`
+//! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024`
+
+// Executed Command:
+// ./target/release/hydradx
+// benchmark
+// pallet
+// --wasm-execution=compiled
+// --pallet
+// *
+// --extrinsic
+// *
+// --heap-pages
+// 4096
+// --steps
+// 50
+// --repeat
+// 20
+// --template=scripts/pallet-weight-template.hbs
+// --output
+// weights/
+
+#![cfg_attr(rustfmt, rustfmt_skip)]
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+#![allow(missing_docs)]
+
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
+use core::marker::PhantomData;
+
+/// Weights for `pallet_message_queue`.
+pub struct WeightInfo<T>(PhantomData<T>);
+
+/// Weights for `pallet_message_queue` using the HydraDX node and recommended hardware.
+pub struct HydraWeight<T>(PhantomData<T>);
+impl<T: frame_system::Config> pallet_message_queue::WeightInfo for HydraWeight<T> {
+	/// Storage: `MessageQueue::ServiceHead` (r:1 w:0)
+	/// Proof: `MessageQueue::ServiceHead` (`max_values`: Some(1), `max_size`: Some(5), added: 500, mode: `MaxEncodedLen`)
+	/// Storage: `MessageQueue::BookStateFor` (r:2 w:2)
+	/// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	fn ready_ring_knit() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `294`
+		//  Estimated: `6044`
+		// Minimum execution time: 15_012_000 picoseconds.
+		Weight::from_parts(15_338_000, 6044)
+			.saturating_add(T::DbWeight::get().reads(3_u64))
+			.saturating_add(T::DbWeight::get().writes(2_u64))
+	}
+	/// Storage: `MessageQueue::BookStateFor` (r:2 w:2)
+	/// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	/// Storage: `MessageQueue::ServiceHead` (r:1 w:1)
+	/// Proof: `MessageQueue::ServiceHead` (`max_values`: Some(1), `max_size`: Some(5), added: 500, mode: `MaxEncodedLen`)
+	fn ready_ring_unknit() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `289`
+		//  Estimated: `6044`
+		// Minimum execution time: 13_429_000 picoseconds.
+		Weight::from_parts(13_758_000, 6044)
+			.saturating_add(T::DbWeight::get().reads(3_u64))
+			.saturating_add(T::DbWeight::get().writes(3_u64))
+	}
+	/// Storage: `MessageQueue::BookStateFor` (r:1 w:1)
+	/// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	fn service_queue_base() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `76`
+		//  Estimated: `3517`
+		// Minimum execution time: 5_484_000 picoseconds.
+		Weight::from_parts(5_641_000, 3517)
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
+	}
+	/// Storage: `MessageQueue::Pages` (r:1 w:1)
+	/// Proof: `MessageQueue::Pages` (`max_values`: None, `max_size`: Some(134193), added: 136668, mode: `MaxEncodedLen`)
+	fn service_page_base_completion() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `143`
+		//  Estimated: `137658`
+		// Minimum execution time: 8_251_000 picoseconds.
+		Weight::from_parts(8_563_000, 137658)
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
+	}
+	/// Storage: `MessageQueue::Pages` (r:1 w:1)
+	/// Proof: `MessageQueue::Pages` (`max_values`: None, `max_size`: Some(134193), added: 136668, mode: `MaxEncodedLen`)
+	fn service_page_base_no_completion() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `143`
+		//  Estimated: `137658`
+		// Minimum execution time: 8_267_000 picoseconds.
+		Weight::from_parts(8_556_000, 137658)
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
+	}
+	/// Storage: `MessageQueue::BookStateFor` (r:0 w:1)
+	/// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	/// Storage: `MessageQueue::Pages` (r:0 w:1)
+	/// Proof: `MessageQueue::Pages` (`max_values`: None, `max_size`: Some(134193), added: 136668, mode: `MaxEncodedLen`)
+	fn service_page_item() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `0`
+		//  Estimated: `0`
+		// Minimum execution time: 277_206_000 picoseconds.
+		Weight::from_parts(279_349_000, 0)
+			.saturating_add(T::DbWeight::get().writes(2_u64))
+	}
+	/// Storage: `MessageQueue::ServiceHead` (r:1 w:1)
+	/// Proof: `MessageQueue::ServiceHead` (`max_values`: Some(1), `max_size`: Some(5), added: 500, mode: `MaxEncodedLen`)
+	/// Storage: `MessageQueue::BookStateFor` (r:1 w:0)
+	/// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	fn bump_service_head() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `242`
+		//  Estimated: `3517`
+		// Minimum execution time: 8_602_000 picoseconds.
+		Weight::from_parts(8_764_000, 3517)
+			.saturating_add(T::DbWeight::get().reads(2_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
+	}
+	/// Storage: `MessageQueue::BookStateFor` (r:1 w:1)
+	/// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	/// Storage: `MessageQueue::Pages` (r:1 w:1)
+	/// Proof: `MessageQueue::Pages` (`max_values`: None, `max_size`: Some(134193), added: 136668, mode: `MaxEncodedLen`)
+	fn reap_page() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `134345`
+		//  Estimated: `137658`
+		// Minimum execution time: 101_898_000 picoseconds.
+		Weight::from_parts(102_451_000, 137658)
+			.saturating_add(T::DbWeight::get().reads(2_u64))
+			.saturating_add(T::DbWeight::get().writes(2_u64))
+	}
+	/// Storage: `MessageQueue::BookStateFor` (r:1 w:1)
+	/// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	/// Storage: `MessageQueue::Pages` (r:1 w:1)
+	/// Proof: `MessageQueue::Pages` (`max_values`: None, `max_size`: Some(134193), added: 136668, mode: `MaxEncodedLen`)
+	fn execute_overweight_page_removed() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `134345`
+		//  Estimated: `137658`
+		// Minimum execution time: 139_941_000 picoseconds.
+		Weight::from_parts(140_920_000, 137658)
+			.saturating_add(T::DbWeight::get().reads(2_u64))
+			.saturating_add(T::DbWeight::get().writes(2_u64))
+	}
+	/// Storage: `MessageQueue::BookStateFor` (r:1 w:1)
+	/// Proof: `MessageQueue::BookStateFor` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
+	/// Storage: `MessageQueue::Pages` (r:1 w:1)
+	/// Proof: `MessageQueue::Pages` (`max_values`: None, `max_size`: Some(134193), added: 136668, mode: `MaxEncodedLen`)
+	fn execute_overweight_page_updated() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `134345`
+		//  Estimated: `137658`
+		// Minimum execution time: 201_758_000 picoseconds.
+		Weight::from_parts(202_959_000, 137658)
+			.saturating_add(T::DbWeight::get().reads(2_u64))
+			.saturating_add(T::DbWeight::get().writes(2_u64))
+	}
+}
\ No newline at end of file
diff --git a/runtime/hydradx/src/weights/pallet_multisig.rs b/runtime/hydradx/src/weights/pallet_multisig.rs
new file mode 100644
index 000000000..b0a86acd6
--- /dev/null
+++ b/runtime/hydradx/src/weights/pallet_multisig.rs
@@ -0,0 +1,165 @@
+// This file is part of HydraDX.
+
+// Copyright (C) 2020-2023  Intergalactic, Limited (GIB).
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+
+//! Autogenerated weights for `pallet_multisig`
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-05-23, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! WORST CASE MAP SIZE: `1000000`
+//! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024`
+
+// Executed Command:
+// ./target/release/hydradx
+// benchmark
+// pallet
+// --wasm-execution=compiled
+// --pallet
+// *
+// --extrinsic
+// *
+// --heap-pages
+// 4096
+// --steps
+// 50
+// --repeat
+// 20
+// --template=scripts/pallet-weight-template.hbs
+// --output
+// weights/
+
+#![cfg_attr(rustfmt, rustfmt_skip)]
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+#![allow(missing_docs)]
+
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
+use core::marker::PhantomData;
+
+/// Weights for `pallet_multisig`.
+pub struct WeightInfo<T>(PhantomData<T>);
+
+/// Weights for `pallet_multisig` using the HydraDX node and recommended hardware.
+pub struct HydraWeight<T>(PhantomData<T>);
+impl<T: frame_system::Config> pallet_multisig::WeightInfo for HydraWeight<T> {
+	/// The range of component `z` is `[0, 10000]`.
+	fn as_multi_threshold_1(z: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `0`
+		//  Estimated: `0`
+		// Minimum execution time: 13_646_000 picoseconds.
+		Weight::from_parts(14_094_950, 0)
+			// Standard Error: 1
+			.saturating_add(Weight::from_parts(536, 0).saturating_mul(z.into()))
+	}
+	/// Storage: `Multisig::Multisigs` (r:1 w:1)
+	/// Proof: `Multisig::Multisigs` (`max_values`: None, `max_size`: Some(3346), added: 5821, mode: `MaxEncodedLen`)
+	/// The range of component `s` is `[2, 100]`.
+	/// The range of component `z` is `[0, 10000]`.
+	fn as_multi_create(s: u32, z: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `329 + s * (2 ±0)`
+		//  Estimated: `6811`
+		// Minimum execution time: 44_497_000 picoseconds.
+		Weight::from_parts(38_694_710, 6811)
+			// Standard Error: 355
+			.saturating_add(Weight::from_parts(62_482, 0).saturating_mul(s.into()))
+			// Standard Error: 3
+			.saturating_add(Weight::from_parts(1_243, 0).saturating_mul(z.into()))
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
+	}
+	/// Storage: `Multisig::Multisigs` (r:1 w:1)
+	/// Proof: `Multisig::Multisigs` (`max_values`: None, `max_size`: Some(3346), added: 5821, mode: `MaxEncodedLen`)
+	/// The range of component `s` is `[3, 100]`.
+	/// The range of component `z` is `[0, 10000]`.
+	fn as_multi_approve(s: u32, z: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `348`
+		//  Estimated: `6811`
+		// Minimum execution time: 29_818_000 picoseconds.
+		Weight::from_parts(23_896_991, 6811)
+			// Standard Error: 308
+			.saturating_add(Weight::from_parts(67_118, 0).saturating_mul(s.into()))
+			// Standard Error: 3
+			.saturating_add(Weight::from_parts(1_214, 0).saturating_mul(z.into()))
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
+	}
+	/// Storage: `Multisig::Multisigs` (r:1 w:1)
+	/// Proof: `Multisig::Multisigs` (`max_values`: None, `max_size`: Some(3346), added: 5821, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:1 w:1)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// The range of component `s` is `[2, 100]`.
+	/// The range of component `z` is `[0, 10000]`.
+	fn as_multi_complete(s: u32, z: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `454 + s * (33 ±0)`
+		//  Estimated: `6811`
+		// Minimum execution time: 50_415_000 picoseconds.
+		Weight::from_parts(42_334_029, 6811)
+			// Standard Error: 411
+			.saturating_add(Weight::from_parts(87_049, 0).saturating_mul(s.into()))
+			// Standard Error: 4
+			.saturating_add(Weight::from_parts(1_296, 0).saturating_mul(z.into()))
+			.saturating_add(T::DbWeight::get().reads(2_u64))
+			.saturating_add(T::DbWeight::get().writes(2_u64))
+	}
+	/// Storage: `Multisig::Multisigs` (r:1 w:1)
+	/// Proof: `Multisig::Multisigs` (`max_values`: None, `max_size`: Some(3346), added: 5821, mode: `MaxEncodedLen`)
+	/// The range of component `s` is `[2, 100]`.
+	fn approve_as_multi_create(s: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `329 + s * (2 ±0)`
+		//  Estimated: `6811`
+		// Minimum execution time: 35_414_000 picoseconds.
+		Weight::from_parts(36_557_160, 6811)
+			// Standard Error: 468
+			.saturating_add(Weight::from_parts(67_651, 0).saturating_mul(s.into()))
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
+	}
+	/// Storage: `Multisig::Multisigs` (r:1 w:1)
+	/// Proof: `Multisig::Multisigs` (`max_values`: None, `max_size`: Some(3346), added: 5821, mode: `MaxEncodedLen`)
+	/// The range of component `s` is `[2, 100]`.
+	fn approve_as_multi_approve(s: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `348`
+		//  Estimated: `6811`
+		// Minimum execution time: 20_806_000 picoseconds.
+		Weight::from_parts(21_885_106, 6811)
+			// Standard Error: 419
+			.saturating_add(Weight::from_parts(64_268, 0).saturating_mul(s.into()))
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
+	}
+	/// Storage: `Multisig::Multisigs` (r:1 w:1)
+	/// Proof: `Multisig::Multisigs` (`max_values`: None, `max_size`: Some(3346), added: 5821, mode: `MaxEncodedLen`)
+	/// The range of component `s` is `[2, 100]`.
+	fn cancel_as_multi(s: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `520 + s * (1 ±0)`
+		//  Estimated: `6811`
+		// Minimum execution time: 36_191_000 picoseconds.
+		Weight::from_parts(37_320_032, 6811)
+			// Standard Error: 492
+			.saturating_add(Weight::from_parts(69_067, 0).saturating_mul(s.into()))
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
+	}
+}
\ No newline at end of file
diff --git a/runtime/hydradx/src/weights/omnipool.rs b/runtime/hydradx/src/weights/pallet_omnipool.rs
similarity index 89%
rename from runtime/hydradx/src/weights/omnipool.rs
rename to runtime/hydradx/src/weights/pallet_omnipool.rs
index 8cd6318d1..984d637c1 100644
--- a/runtime/hydradx/src/weights/omnipool.rs
+++ b/runtime/hydradx/src/weights/pallet_omnipool.rs
@@ -15,37 +15,46 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+
 //! Autogenerated weights for `pallet_omnipool`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-02-15, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-05-23, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: 1024
+//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024`
 
 // Executed Command:
-// target/release/hydradx
+// ./target/release/hydradx
 // benchmark
 // pallet
-// --chain=dev
-// --steps=10
-// --repeat=30
 // --wasm-execution=compiled
-// --heap-pages=4096
-// --template=.maintain/pallet-weight-template-no-back.hbs
-// --pallet=pallet_omnipool
-// --output=./weights/omnipool.rs
-// --extrinsic=*
+// --pallet
+// *
+// --extrinsic
+// *
+// --heap-pages
+// 4096
+// --steps
+// 50
+// --repeat
+// 20
+// --template=scripts/pallet-weight-template.hbs
+// --output
+// weights/
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
 #![allow(missing_docs)]
 
-use frame_support::{traits::Get, weights::Weight};
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
 use core::marker::PhantomData;
 
-/// Weight functions for `pallet_omnipool`.
+/// Weights for `pallet_omnipool`.
+pub struct WeightInfo<T>(PhantomData<T>);
+
+/// Weights for `pallet_omnipool` using the HydraDX node and recommended hardware.
 pub struct HydraWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> pallet_omnipool::WeightInfo for HydraWeight<T> {
 	/// Storage: `Omnipool::Assets` (r:1 w:1)
@@ -76,12 +85,12 @@ impl<T: frame_system::Config> pallet_omnipool::WeightInfo for HydraWeight<T> {
 	/// Proof: `Omnipool::Positions` (`max_values`: None, `max_size`: Some(100), added: 2575, mode: `MaxEncodedLen`)
 	fn add_token() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3028`
+		//  Measured:  `3132`
 		//  Estimated: `7406`
-		// Minimum execution time: 146_309_000 picoseconds.
-		Weight::from_parts(147_552_000, 7406)
-			.saturating_add(T::DbWeight::get().reads(13))
-			.saturating_add(T::DbWeight::get().writes(10))
+		// Minimum execution time: 129_176_000 picoseconds.
+		Weight::from_parts(130_298_000, 7406)
+			.saturating_add(T::DbWeight::get().reads(13_u64))
+			.saturating_add(T::DbWeight::get().writes(10_u64))
 	}
 	/// Storage: `Tokens::Accounts` (r:3 w:3)
 	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
@@ -125,12 +134,12 @@ impl<T: frame_system::Config> pallet_omnipool::WeightInfo for HydraWeight<T> {
 	/// Proof: `Omnipool::Positions` (`max_values`: None, `max_size`: Some(100), added: 2575, mode: `MaxEncodedLen`)
 	fn add_liquidity() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `4178`
+		//  Measured:  `4348`
 		//  Estimated: `8739`
-		// Minimum execution time: 236_030_000 picoseconds.
-		Weight::from_parts(237_610_000, 8739)
-			.saturating_add(T::DbWeight::get().reads(23))
-			.saturating_add(T::DbWeight::get().writes(14))
+		// Minimum execution time: 204_599_000 picoseconds.
+		Weight::from_parts(205_728_000, 8739)
+			.saturating_add(T::DbWeight::get().reads(23_u64))
+			.saturating_add(T::DbWeight::get().writes(14_u64))
 	}
 	/// Storage: `Uniques::Asset` (r:1 w:1)
 	/// Proof: `Uniques::Asset` (`max_values`: None, `max_size`: Some(146), added: 2621, mode: `MaxEncodedLen`)
@@ -176,12 +185,12 @@ impl<T: frame_system::Config> pallet_omnipool::WeightInfo for HydraWeight<T> {
 	/// Proof: `Uniques::ItemPriceOf` (`max_values`: None, `max_size`: Some(113), added: 2588, mode: `MaxEncodedLen`)
 	fn remove_liquidity() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `7089`
+		//  Measured:  `7259`
 		//  Estimated: `11322`
-		// Minimum execution time: 316_738_000 picoseconds.
-		Weight::from_parts(319_501_000, 11322)
-			.saturating_add(T::DbWeight::get().reads(26))
-			.saturating_add(T::DbWeight::get().writes(16))
+		// Minimum execution time: 275_044_000 picoseconds.
+		Weight::from_parts(276_562_000, 11322)
+			.saturating_add(T::DbWeight::get().reads(26_u64))
+			.saturating_add(T::DbWeight::get().writes(16_u64))
 	}
 	/// Storage: `Tokens::Accounts` (r:5 w:5)
 	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
@@ -195,7 +204,7 @@ impl<T: frame_system::Config> pallet_omnipool::WeightInfo for HydraWeight<T> {
 	/// Proof: `Duster::AccountBlacklist` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
 	/// Storage: `AssetRegistry::BannedAssets` (r:2 w:0)
 	/// Proof: `AssetRegistry::BannedAssets` (`max_values`: None, `max_size`: Some(20), added: 2495, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:2 w:0)
+	/// Storage: `AssetRegistry::Assets` (r:4 w:0)
 	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
 	/// Storage: `System::Account` (r:3 w:2)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
@@ -233,12 +242,12 @@ impl<T: frame_system::Config> pallet_omnipool::WeightInfo for HydraWeight<T> {
 	/// Proof: `Referrals::CounterForPendingConversions` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	fn sell() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `7327`
+		//  Measured:  `7619`
 		//  Estimated: `13905`
-		// Minimum execution time: 360_954_000 picoseconds.
-		Weight::from_parts(362_880_000, 13905)
-			.saturating_add(T::DbWeight::get().reads(39))
-			.saturating_add(T::DbWeight::get().writes(23))
+		// Minimum execution time: 327_772_000 picoseconds.
+		Weight::from_parts(329_562_000, 13905)
+			.saturating_add(T::DbWeight::get().reads(41_u64))
+			.saturating_add(T::DbWeight::get().writes(23_u64))
 	}
 	/// Storage: `Omnipool::Assets` (r:3 w:3)
 	/// Proof: `Omnipool::Assets` (`max_values`: None, `max_size`: Some(85), added: 2560, mode: `MaxEncodedLen`)
@@ -252,7 +261,7 @@ impl<T: frame_system::Config> pallet_omnipool::WeightInfo for HydraWeight<T> {
 	/// Proof: `Duster::AccountBlacklist` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
 	/// Storage: `AssetRegistry::BannedAssets` (r:2 w:0)
 	/// Proof: `AssetRegistry::BannedAssets` (`max_values`: None, `max_size`: Some(20), added: 2495, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:2 w:0)
+	/// Storage: `AssetRegistry::Assets` (r:4 w:0)
 	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
 	/// Storage: `System::Account` (r:3 w:2)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
@@ -290,23 +299,23 @@ impl<T: frame_system::Config> pallet_omnipool::WeightInfo for HydraWeight<T> {
 	/// Proof: `Referrals::CounterForPendingConversions` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
 	fn buy() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `7327`
+		//  Measured:  `7619`
 		//  Estimated: `13905`
-		// Minimum execution time: 364_573_000 picoseconds.
-		Weight::from_parts(365_989_000, 13905)
-			.saturating_add(T::DbWeight::get().reads(39))
-			.saturating_add(T::DbWeight::get().writes(23))
+		// Minimum execution time: 327_371_000 picoseconds.
+		Weight::from_parts(328_952_000, 13905)
+			.saturating_add(T::DbWeight::get().reads(41_u64))
+			.saturating_add(T::DbWeight::get().writes(23_u64))
 	}
 	/// Storage: `Omnipool::Assets` (r:1 w:1)
 	/// Proof: `Omnipool::Assets` (`max_values`: None, `max_size`: Some(85), added: 2560, mode: `MaxEncodedLen`)
 	fn set_asset_tradable_state() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1305`
+		//  Measured:  `1309`
 		//  Estimated: `3550`
-		// Minimum execution time: 32_736_000 picoseconds.
-		Weight::from_parts(33_138_000, 3550)
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
+		// Minimum execution time: 27_719_000 picoseconds.
+		Weight::from_parts(28_329_000, 3550)
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	/// Storage: `Omnipool::Assets` (r:1 w:0)
 	/// Proof: `Omnipool::Assets` (`max_values`: None, `max_size`: Some(85), added: 2560, mode: `MaxEncodedLen`)
@@ -326,12 +335,12 @@ impl<T: frame_system::Config> pallet_omnipool::WeightInfo for HydraWeight<T> {
 	/// Proof: `MultiTransactionPayment::AcceptedCurrencies` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
 	fn refund_refused_asset() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2510`
+		//  Measured:  `2646`
 		//  Estimated: `6196`
-		// Minimum execution time: 122_163_000 picoseconds.
-		Weight::from_parts(123_392_000, 6196)
-			.saturating_add(T::DbWeight::get().reads(10))
-			.saturating_add(T::DbWeight::get().writes(5))
+		// Minimum execution time: 99_820_000 picoseconds.
+		Weight::from_parts(100_687_000, 6196)
+			.saturating_add(T::DbWeight::get().reads(10_u64))
+			.saturating_add(T::DbWeight::get().writes(5_u64))
 	}
 	/// Storage: `Omnipool::Positions` (r:1 w:1)
 	/// Proof: `Omnipool::Positions` (`max_values`: None, `max_size`: Some(100), added: 2575, mode: `MaxEncodedLen`)
@@ -347,23 +356,23 @@ impl<T: frame_system::Config> pallet_omnipool::WeightInfo for HydraWeight<T> {
 	/// Proof: `Uniques::ItemPriceOf` (`max_values`: None, `max_size`: Some(113), added: 2588, mode: `MaxEncodedLen`)
 	fn sacrifice_position() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2876`
+		//  Measured:  `2914`
 		//  Estimated: `3655`
-		// Minimum execution time: 75_629_000 picoseconds.
-		Weight::from_parts(76_582_000, 3655)
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(6))
+		// Minimum execution time: 66_207_000 picoseconds.
+		Weight::from_parts(66_955_000, 3655)
+			.saturating_add(T::DbWeight::get().reads(4_u64))
+			.saturating_add(T::DbWeight::get().writes(6_u64))
 	}
 	/// Storage: `Omnipool::Assets` (r:1 w:1)
 	/// Proof: `Omnipool::Assets` (`max_values`: None, `max_size`: Some(85), added: 2560, mode: `MaxEncodedLen`)
 	fn set_asset_weight_cap() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1305`
+		//  Measured:  `1309`
 		//  Estimated: `3550`
-		// Minimum execution time: 32_944_000 picoseconds.
-		Weight::from_parts(33_586_000, 3550)
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
+		// Minimum execution time: 28_043_000 picoseconds.
+		Weight::from_parts(28_560_000, 3550)
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	/// Storage: `Omnipool::Assets` (r:1 w:1)
 	/// Proof: `Omnipool::Assets` (`max_values`: None, `max_size`: Some(85), added: 2560, mode: `MaxEncodedLen`)
@@ -389,12 +398,12 @@ impl<T: frame_system::Config> pallet_omnipool::WeightInfo for HydraWeight<T> {
 	/// Proof: `EmaOracle::Accumulator` (`max_values`: Some(1), `max_size`: Some(5921), added: 6416, mode: `MaxEncodedLen`)
 	fn withdraw_protocol_liquidity() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `4205`
+		//  Measured:  `4341`
 		//  Estimated: `8739`
-		// Minimum execution time: 174_415_000 picoseconds.
-		Weight::from_parts(174_998_000, 8739)
-			.saturating_add(T::DbWeight::get().reads(15))
-			.saturating_add(T::DbWeight::get().writes(8))
+		// Minimum execution time: 146_266_000 picoseconds.
+		Weight::from_parts(147_681_000, 8739)
+			.saturating_add(T::DbWeight::get().reads(15_u64))
+			.saturating_add(T::DbWeight::get().writes(8_u64))
 	}
 	/// Storage: `Omnipool::Assets` (r:1 w:1)
 	/// Proof: `Omnipool::Assets` (`max_values`: None, `max_size`: Some(85), added: 2560, mode: `MaxEncodedLen`)
@@ -418,12 +427,12 @@ impl<T: frame_system::Config> pallet_omnipool::WeightInfo for HydraWeight<T> {
 	/// Proof: `MultiTransactionPayment::AcceptedCurrencies` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
 	fn remove_token() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3296`
+		//  Measured:  `3432`
 		//  Estimated: `11322`
-		// Minimum execution time: 175_638_000 picoseconds.
-		Weight::from_parts(176_841_000, 11322)
-			.saturating_add(T::DbWeight::get().reads(16))
-			.saturating_add(T::DbWeight::get().writes(8))
+		// Minimum execution time: 145_092_000 picoseconds.
+		Weight::from_parts(146_152_000, 11322)
+			.saturating_add(T::DbWeight::get().reads(16_u64))
+			.saturating_add(T::DbWeight::get().writes(8_u64))
 	}
 	/// Storage: `Omnipool::Assets` (r:3 w:3)
 	/// Proof: `Omnipool::Assets` (`max_values`: None, `max_size`: Some(85), added: 2560, mode: `MaxEncodedLen`)
@@ -437,7 +446,7 @@ impl<T: frame_system::Config> pallet_omnipool::WeightInfo for HydraWeight<T> {
 	/// Proof: `Duster::AccountBlacklist` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
 	/// Storage: `AssetRegistry::BannedAssets` (r:2 w:0)
 	/// Proof: `AssetRegistry::BannedAssets` (`max_values`: None, `max_size`: Some(20), added: 2495, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:2 w:0)
+	/// Storage: `AssetRegistry::Assets` (r:4 w:0)
 	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
 	/// Storage: `System::Account` (r:3 w:2)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
@@ -473,14 +482,14 @@ impl<T: frame_system::Config> pallet_omnipool::WeightInfo for HydraWeight<T> {
 	/// The range of component `e` is `[0, 1]`.
 	fn router_execution_sell(_c: u32, e: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1974 + e * (4936 ±0)`
-		//  Estimated: `6156 + e * (7749 ±201_913_854_157_949_888)`
-		// Minimum execution time: 48_921_000 picoseconds.
-		Weight::from_parts(51_507_911, 6156)
-			// Standard Error: 122_017
-			.saturating_add(Weight::from_parts(316_472_235, 0).saturating_mul(e.into()))
-			.saturating_add(T::DbWeight::get().reads(7))
-			.saturating_add(T::DbWeight::get().reads((29_u64).saturating_mul(e.into())))
+		//  Measured:  `1978 + e * (5140 ±0)`
+		//  Estimated: `11390 + e * (7749 ±0)`
+		// Minimum execution time: 44_566_000 picoseconds.
+		Weight::from_parts(46_051_604, 11390)
+			// Standard Error: 113_379
+			.saturating_add(Weight::from_parts(283_478_583, 0).saturating_mul(e.into()))
+			.saturating_add(T::DbWeight::get().reads(7_u64))
+			.saturating_add(T::DbWeight::get().reads((31_u64).saturating_mul(e.into())))
 			.saturating_add(T::DbWeight::get().writes((21_u64).saturating_mul(e.into())))
 			.saturating_add(Weight::from_parts(0, 7749).saturating_mul(e.into()))
 	}
@@ -496,7 +505,7 @@ impl<T: frame_system::Config> pallet_omnipool::WeightInfo for HydraWeight<T> {
 	/// Proof: `Duster::AccountBlacklist` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
 	/// Storage: `AssetRegistry::BannedAssets` (r:2 w:0)
 	/// Proof: `AssetRegistry::BannedAssets` (`max_values`: None, `max_size`: Some(20), added: 2495, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:2 w:0)
+	/// Storage: `AssetRegistry::Assets` (r:4 w:0)
 	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
 	/// Storage: `System::Account` (r:3 w:2)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
@@ -532,13 +541,13 @@ impl<T: frame_system::Config> pallet_omnipool::WeightInfo for HydraWeight<T> {
 	/// The range of component `e` is `[0, 1]`.
 	fn router_execution_buy(c: u32, _e: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `6910`
+		//  Measured:  `7118`
 		//  Estimated: `13905`
-		// Minimum execution time: 350_132_000 picoseconds.
-		Weight::from_parts(340_475_478, 13905)
-			// Standard Error: 178_513
-			.saturating_add(Weight::from_parts(13_719_977, 0).saturating_mul(c.into()))
-			.saturating_add(T::DbWeight::get().reads(36))
-			.saturating_add(T::DbWeight::get().writes(21))
+		// Minimum execution time: 312_903_000 picoseconds.
+		Weight::from_parts(305_669_455, 13905)
+			// Standard Error: 152_808
+			.saturating_add(Weight::from_parts(12_462_813, 0).saturating_mul(c.into()))
+			.saturating_add(T::DbWeight::get().reads(38_u64))
+			.saturating_add(T::DbWeight::get().writes(21_u64))
 	}
 }
\ No newline at end of file
diff --git a/runtime/hydradx/src/weights/omnipool_lm.rs b/runtime/hydradx/src/weights/pallet_omnipool_liquidity_mining.rs
similarity index 85%
rename from runtime/hydradx/src/weights/omnipool_lm.rs
rename to runtime/hydradx/src/weights/pallet_omnipool_liquidity_mining.rs
index 85f3c7f77..0ce1a51ed 100644
--- a/runtime/hydradx/src/weights/omnipool_lm.rs
+++ b/runtime/hydradx/src/weights/pallet_omnipool_liquidity_mining.rs
@@ -15,37 +15,46 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+
 //! Autogenerated weights for `pallet_omnipool_liquidity_mining`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-05-20, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-05-23, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: 1024
+//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024`
 
 // Executed Command:
-// target/release/hydradx
+// ./target/release/hydradx
 // benchmark
 // pallet
-// --chain=dev
-// --steps=10
-// --repeat=30
 // --wasm-execution=compiled
-// --heap-pages=4096
-// --template=.maintain/pallet-weight-template-no-back.hbs
-// --pallet=pallet_omnipool_liquidity_mining
-// --output=./omnipool_lm.rs
-// --extrinsic=*
+// --pallet
+// *
+// --extrinsic
+// *
+// --heap-pages
+// 4096
+// --steps
+// 50
+// --repeat
+// 20
+// --template=scripts/pallet-weight-template.hbs
+// --output
+// weights/
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
 #![allow(missing_docs)]
 
-use frame_support::{traits::Get, weights::Weight};
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
 use core::marker::PhantomData;
 
-/// Weight functions for `pallet_omnipool_liquidity_mining`.
+/// Weights for `pallet_omnipool_liquidity_mining`.
+pub struct WeightInfo<T>(PhantomData<T>);
+
+/// Weights for `pallet_omnipool_liquidity_mining` using the HydraDX node and recommended hardware.
 pub struct HydraWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> pallet_omnipool_liquidity_mining::WeightInfo for HydraWeight<T> {
 	/// Storage: `AssetRegistry::Assets` (r:2 w:0)
@@ -62,10 +71,10 @@ impl<T: frame_system::Config> pallet_omnipool_liquidity_mining::WeightInfo for H
 		// Proof Size summary in bytes:
 		//  Measured:  `557`
 		//  Estimated: `6196`
-		// Minimum execution time: 100_684_000 picoseconds.
-		Weight::from_parts(101_977_000, 6196)
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(5))
+		// Minimum execution time: 80_933_000 picoseconds.
+		Weight::from_parts(81_673_000, 6196)
+			.saturating_add(T::DbWeight::get().reads(5_u64))
+			.saturating_add(T::DbWeight::get().writes(5_u64))
 	}
 	/// Storage: `OmnipoolWarehouseLM::GlobalFarm` (r:1 w:1)
 	/// Proof: `OmnipoolWarehouseLM::GlobalFarm` (`max_values`: None, `max_size`: Some(205), added: 2680, mode: `MaxEncodedLen`)
@@ -77,10 +86,10 @@ impl<T: frame_system::Config> pallet_omnipool_liquidity_mining::WeightInfo for H
 		// Proof Size summary in bytes:
 		//  Measured:  `964`
 		//  Estimated: `6196`
-		// Minimum execution time: 97_032_000 picoseconds.
-		Weight::from_parts(97_943_000, 6196)
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(4))
+		// Minimum execution time: 79_070_000 picoseconds.
+		Weight::from_parts(79_648_000, 6196)
+			.saturating_add(T::DbWeight::get().reads(4_u64))
+			.saturating_add(T::DbWeight::get().writes(4_u64))
 	}
 	/// Storage: `Omnipool::Assets` (r:1 w:0)
 	/// Proof: `Omnipool::Assets` (`max_values`: None, `max_size`: Some(85), added: 2560, mode: `MaxEncodedLen`)
@@ -102,10 +111,10 @@ impl<T: frame_system::Config> pallet_omnipool_liquidity_mining::WeightInfo for H
 		// Proof Size summary in bytes:
 		//  Measured:  `2337`
 		//  Estimated: `6294`
-		// Minimum execution time: 135_573_000 picoseconds.
-		Weight::from_parts(136_872_000, 6294)
-			.saturating_add(T::DbWeight::get().reads(9))
-			.saturating_add(T::DbWeight::get().writes(6))
+		// Minimum execution time: 123_093_000 picoseconds.
+		Weight::from_parts(124_230_000, 6294)
+			.saturating_add(T::DbWeight::get().reads(9_u64))
+			.saturating_add(T::DbWeight::get().writes(6_u64))
 	}
 	/// Storage: `Omnipool::Assets` (r:1 w:0)
 	/// Proof: `Omnipool::Assets` (`max_values`: None, `max_size`: Some(85), added: 2560, mode: `MaxEncodedLen`)
@@ -125,10 +134,10 @@ impl<T: frame_system::Config> pallet_omnipool_liquidity_mining::WeightInfo for H
 		// Proof Size summary in bytes:
 		//  Measured:  `2507`
 		//  Estimated: `6294`
-		// Minimum execution time: 141_083_000 picoseconds.
-		Weight::from_parts(141_874_000, 6294)
-			.saturating_add(T::DbWeight::get().reads(9))
-			.saturating_add(T::DbWeight::get().writes(4))
+		// Minimum execution time: 126_053_000 picoseconds.
+		Weight::from_parts(127_134_000, 6294)
+			.saturating_add(T::DbWeight::get().reads(9_u64))
+			.saturating_add(T::DbWeight::get().writes(4_u64))
 	}
 	/// Storage: `OmnipoolWarehouseLM::ActiveYieldFarm` (r:1 w:1)
 	/// Proof: `OmnipoolWarehouseLM::ActiveYieldFarm` (`max_values`: None, `max_size`: Some(44), added: 2519, mode: `MaxEncodedLen`)
@@ -146,10 +155,10 @@ impl<T: frame_system::Config> pallet_omnipool_liquidity_mining::WeightInfo for H
 		// Proof Size summary in bytes:
 		//  Measured:  `2146`
 		//  Estimated: `6294`
-		// Minimum execution time: 133_964_000 picoseconds.
-		Weight::from_parts(135_366_000, 6294)
-			.saturating_add(T::DbWeight::get().reads(8))
-			.saturating_add(T::DbWeight::get().writes(5))
+		// Minimum execution time: 120_037_000 picoseconds.
+		Weight::from_parts(120_995_000, 6294)
+			.saturating_add(T::DbWeight::get().reads(8_u64))
+			.saturating_add(T::DbWeight::get().writes(5_u64))
 	}
 	/// Storage: `Omnipool::Assets` (r:1 w:0)
 	/// Proof: `Omnipool::Assets` (`max_values`: None, `max_size`: Some(85), added: 2560, mode: `MaxEncodedLen`)
@@ -169,10 +178,10 @@ impl<T: frame_system::Config> pallet_omnipool_liquidity_mining::WeightInfo for H
 		// Proof Size summary in bytes:
 		//  Measured:  `2543`
 		//  Estimated: `6294`
-		// Minimum execution time: 135_773_000 picoseconds.
-		Weight::from_parts(137_186_000, 6294)
-			.saturating_add(T::DbWeight::get().reads(9))
-			.saturating_add(T::DbWeight::get().writes(5))
+		// Minimum execution time: 124_191_000 picoseconds.
+		Weight::from_parts(124_920_000, 6294)
+			.saturating_add(T::DbWeight::get().reads(9_u64))
+			.saturating_add(T::DbWeight::get().writes(5_u64))
 	}
 	/// Storage: `OmnipoolWarehouseLM::ActiveYieldFarm` (r:1 w:0)
 	/// Proof: `OmnipoolWarehouseLM::ActiveYieldFarm` (`max_values`: None, `max_size`: Some(44), added: 2519, mode: `MaxEncodedLen`)
@@ -186,10 +195,10 @@ impl<T: frame_system::Config> pallet_omnipool_liquidity_mining::WeightInfo for H
 		// Proof Size summary in bytes:
 		//  Measured:  `924`
 		//  Estimated: `6196`
-		// Minimum execution time: 85_400_000 picoseconds.
-		Weight::from_parts(86_202_000, 6196)
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(4))
+		// Minimum execution time: 75_542_000 picoseconds.
+		Weight::from_parts(75_959_000, 6196)
+			.saturating_add(T::DbWeight::get().reads(5_u64))
+			.saturating_add(T::DbWeight::get().writes(4_u64))
 	}
 	/// Storage: `Uniques::Asset` (r:2 w:2)
 	/// Proof: `Uniques::Asset` (`max_values`: None, `max_size`: Some(146), added: 2621, mode: `MaxEncodedLen`)
@@ -225,10 +234,10 @@ impl<T: frame_system::Config> pallet_omnipool_liquidity_mining::WeightInfo for H
 		// Proof Size summary in bytes:
 		//  Measured:  `4072`
 		//  Estimated: `11598`
-		// Minimum execution time: 229_442_000 picoseconds.
-		Weight::from_parts(231_314_000, 11598)
-			.saturating_add(T::DbWeight::get().reads(17))
-			.saturating_add(T::DbWeight::get().writes(14))
+		// Minimum execution time: 207_096_000 picoseconds.
+		Weight::from_parts(208_255_000, 11598)
+			.saturating_add(T::DbWeight::get().reads(17_u64))
+			.saturating_add(T::DbWeight::get().writes(14_u64))
 	}
 	/// Storage: `Uniques::Asset` (r:2 w:0)
 	/// Proof: `Uniques::Asset` (`max_values`: None, `max_size`: Some(146), added: 2621, mode: `MaxEncodedLen`)
@@ -254,10 +263,10 @@ impl<T: frame_system::Config> pallet_omnipool_liquidity_mining::WeightInfo for H
 		// Proof Size summary in bytes:
 		//  Measured:  `4381`
 		//  Estimated: `11598`
-		// Minimum execution time: 187_814_000 picoseconds.
-		Weight::from_parts(188_943_000, 11598)
-			.saturating_add(T::DbWeight::get().reads(15))
-			.saturating_add(T::DbWeight::get().writes(5))
+		// Minimum execution time: 171_971_000 picoseconds.
+		Weight::from_parts(173_516_000, 11598)
+			.saturating_add(T::DbWeight::get().reads(15_u64))
+			.saturating_add(T::DbWeight::get().writes(5_u64))
 	}
 	/// Storage: `Uniques::Asset` (r:1 w:0)
 	/// Proof: `Uniques::Asset` (`max_values`: None, `max_size`: Some(146), added: 2621, mode: `MaxEncodedLen`)
@@ -277,10 +286,10 @@ impl<T: frame_system::Config> pallet_omnipool_liquidity_mining::WeightInfo for H
 		// Proof Size summary in bytes:
 		//  Measured:  `2946`
 		//  Estimated: `8799`
-		// Minimum execution time: 187_946_000 picoseconds.
-		Weight::from_parts(189_503_000, 8799)
-			.saturating_add(T::DbWeight::get().reads(10))
-			.saturating_add(T::DbWeight::get().writes(6))
+		// Minimum execution time: 165_734_000 picoseconds.
+		Weight::from_parts(167_004_000, 8799)
+			.saturating_add(T::DbWeight::get().reads(10_u64))
+			.saturating_add(T::DbWeight::get().writes(6_u64))
 	}
 	/// Storage: `Uniques::Asset` (r:2 w:2)
 	/// Proof: `Uniques::Asset` (`max_values`: None, `max_size`: Some(146), added: 2621, mode: `MaxEncodedLen`)
@@ -310,9 +319,9 @@ impl<T: frame_system::Config> pallet_omnipool_liquidity_mining::WeightInfo for H
 		// Proof Size summary in bytes:
 		//  Measured:  `3940`
 		//  Estimated: `8799`
-		// Minimum execution time: 284_785_000 picoseconds.
-		Weight::from_parts(286_696_000, 8799)
-			.saturating_add(T::DbWeight::get().reads(15))
-			.saturating_add(T::DbWeight::get().writes(15))
+		// Minimum execution time: 250_173_000 picoseconds.
+		Weight::from_parts(251_222_000, 8799)
+			.saturating_add(T::DbWeight::get().reads(15_u64))
+			.saturating_add(T::DbWeight::get().writes(15_u64))
 	}
 }
\ No newline at end of file
diff --git a/runtime/hydradx/src/weights/otc.rs b/runtime/hydradx/src/weights/pallet_otc.rs
similarity index 77%
rename from runtime/hydradx/src/weights/otc.rs
rename to runtime/hydradx/src/weights/pallet_otc.rs
index 9911cb4cd..90abcc0ff 100644
--- a/runtime/hydradx/src/weights/otc.rs
+++ b/runtime/hydradx/src/weights/pallet_otc.rs
@@ -15,41 +15,48 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+
 //! Autogenerated weights for `pallet_otc`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-02-15, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-05-23, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: 1024
+//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024`
 
 // Executed Command:
-// target/release/hydradx
+// ./target/release/hydradx
 // benchmark
 // pallet
-// --chain=dev
-// --steps=10
-// --repeat=30
 // --wasm-execution=compiled
-// --heap-pages=4096
-// --template=.maintain/pallet-weight-template-no-back.hbs
-// --pallet=pallet_otc
-// --output=./weights/otc.rs
-// --extrinsic=*
+// --pallet
+// *
+// --extrinsic
+// *
+// --heap-pages
+// 4096
+// --steps
+// 50
+// --repeat
+// 20
+// --template=scripts/pallet-weight-template.hbs
+// --output
+// weights/
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
 #![allow(missing_docs)]
 
-use frame_support::{traits::Get, weights::Weight};
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
 use core::marker::PhantomData;
 
-use pallet_otc::weights::WeightInfo;
+/// Weights for `pallet_otc`.
+pub struct WeightInfo<T>(PhantomData<T>);
 
-/// Weight functions for `pallet_otc`.
+/// Weights for `pallet_otc` using the HydraDX node and recommended hardware.
 pub struct HydraWeight<T>(PhantomData<T>);
-impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
+impl<T: frame_system::Config> pallet_otc::WeightInfo for HydraWeight<T> {
 	/// Storage: `AssetRegistry::Assets` (r:2 w:0)
 	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
 	/// Storage: `OTC::NextOrderId` (r:1 w:1)
@@ -62,12 +69,12 @@ impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
 	/// Proof: `OTC::Orders` (`max_values`: None, `max_size`: Some(93), added: 2568, mode: `MaxEncodedLen`)
 	fn place_order() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `897`
+		//  Measured:  `963`
 		//  Estimated: `6190`
-		// Minimum execution time: 55_411_000 picoseconds.
-		Weight::from_parts(56_027_000, 6190)
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(4))
+		// Minimum execution time: 46_410_000 picoseconds.
+		Weight::from_parts(46_985_000, 6190)
+			.saturating_add(T::DbWeight::get().reads(5_u64))
+			.saturating_add(T::DbWeight::get().writes(4_u64))
 	}
 	/// Storage: `OTC::Orders` (r:1 w:1)
 	/// Proof: `OTC::Orders` (`max_values`: None, `max_size`: Some(93), added: 2568, mode: `MaxEncodedLen`)
@@ -85,12 +92,12 @@ impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
 	/// Proof: `Tokens::Reserves` (`max_values`: None, `max_size`: Some(1261), added: 3736, mode: `MaxEncodedLen`)
 	fn partial_fill_order() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1882`
+		//  Measured:  `2034`
 		//  Estimated: `11322`
-		// Minimum execution time: 138_653_000 picoseconds.
-		Weight::from_parts(139_630_000, 11322)
-			.saturating_add(T::DbWeight::get().reads(14))
-			.saturating_add(T::DbWeight::get().writes(6))
+		// Minimum execution time: 116_670_000 picoseconds.
+		Weight::from_parts(117_660_000, 11322)
+			.saturating_add(T::DbWeight::get().reads(14_u64))
+			.saturating_add(T::DbWeight::get().writes(6_u64))
 	}
 	/// Storage: `OTC::Orders` (r:1 w:1)
 	/// Proof: `OTC::Orders` (`max_values`: None, `max_size`: Some(93), added: 2568, mode: `MaxEncodedLen`)
@@ -108,12 +115,12 @@ impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
 	/// Proof: `Tokens::Reserves` (`max_values`: None, `max_size`: Some(1261), added: 3736, mode: `MaxEncodedLen`)
 	fn fill_order() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1882`
+		//  Measured:  `2034`
 		//  Estimated: `11322`
-		// Minimum execution time: 135_774_000 picoseconds.
-		Weight::from_parts(137_332_000, 11322)
-			.saturating_add(T::DbWeight::get().reads(14))
-			.saturating_add(T::DbWeight::get().writes(6))
+		// Minimum execution time: 114_236_000 picoseconds.
+		Weight::from_parts(114_837_000, 11322)
+			.saturating_add(T::DbWeight::get().reads(14_u64))
+			.saturating_add(T::DbWeight::get().writes(6_u64))
 	}
 	/// Storage: `OTC::Orders` (r:1 w:1)
 	/// Proof: `OTC::Orders` (`max_values`: None, `max_size`: Some(93), added: 2568, mode: `MaxEncodedLen`)
@@ -125,11 +132,11 @@ impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
 	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
 	fn cancel_order() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1131`
+		//  Measured:  `1197`
 		//  Estimated: `4726`
-		// Minimum execution time: 50_061_000 picoseconds.
-		Weight::from_parts(50_721_000, 4726)
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(3))
+		// Minimum execution time: 41_852_000 picoseconds.
+		Weight::from_parts(42_296_000, 4726)
+			.saturating_add(T::DbWeight::get().reads(4_u64))
+			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
-}
+}
\ No newline at end of file
diff --git a/runtime/hydradx/src/weights/pallet_preimage.rs b/runtime/hydradx/src/weights/pallet_preimage.rs
new file mode 100644
index 000000000..cc8aee33e
--- /dev/null
+++ b/runtime/hydradx/src/weights/pallet_preimage.rs
@@ -0,0 +1,256 @@
+// This file is part of HydraDX.
+
+// Copyright (C) 2020-2023  Intergalactic, Limited (GIB).
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+
+//! Autogenerated weights for `pallet_preimage`
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-05-23, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! WORST CASE MAP SIZE: `1000000`
+//! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024`
+
+// Executed Command:
+// ./target/release/hydradx
+// benchmark
+// pallet
+// --wasm-execution=compiled
+// --pallet
+// *
+// --extrinsic
+// *
+// --heap-pages
+// 4096
+// --steps
+// 50
+// --repeat
+// 20
+// --template=scripts/pallet-weight-template.hbs
+// --output
+// weights/
+
+#![cfg_attr(rustfmt, rustfmt_skip)]
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+#![allow(missing_docs)]
+
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
+use core::marker::PhantomData;
+
+/// Weights for `pallet_preimage`.
+pub struct WeightInfo<T>(PhantomData<T>);
+
+/// Weights for `pallet_preimage` using the HydraDX node and recommended hardware.
+pub struct HydraWeight<T>(PhantomData<T>);
+impl<T: frame_system::Config> pallet_preimage::WeightInfo for HydraWeight<T> {
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
+	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(75), added: 2550, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::PreimageFor` (r:0 w:1)
+	/// Proof: `Preimage::PreimageFor` (`max_values`: None, `max_size`: Some(4194344), added: 4196819, mode: `MaxEncodedLen`)
+	/// The range of component `s` is `[0, 4194304]`.
+	fn note_preimage(s: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `109`
+		//  Estimated: `3556`
+		// Minimum execution time: 18_738_000 picoseconds.
+		Weight::from_parts(18_982_000, 3556)
+			// Standard Error: 1
+			.saturating_add(Weight::from_parts(1_986, 0).saturating_mul(s.into()))
+			.saturating_add(T::DbWeight::get().reads(2_u64))
+			.saturating_add(T::DbWeight::get().writes(2_u64))
+	}
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
+	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(75), added: 2550, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::PreimageFor` (r:0 w:1)
+	/// Proof: `Preimage::PreimageFor` (`max_values`: None, `max_size`: Some(4194344), added: 4196819, mode: `MaxEncodedLen`)
+	/// The range of component `s` is `[0, 4194304]`.
+	fn note_requested_preimage(s: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `173`
+		//  Estimated: `3556`
+		// Minimum execution time: 20_168_000 picoseconds.
+		Weight::from_parts(20_415_000, 3556)
+			// Standard Error: 1
+			.saturating_add(Weight::from_parts(1_985, 0).saturating_mul(s.into()))
+			.saturating_add(T::DbWeight::get().reads(2_u64))
+			.saturating_add(T::DbWeight::get().writes(2_u64))
+	}
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
+	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(75), added: 2550, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::PreimageFor` (r:0 w:1)
+	/// Proof: `Preimage::PreimageFor` (`max_values`: None, `max_size`: Some(4194344), added: 4196819, mode: `MaxEncodedLen`)
+	/// The range of component `s` is `[0, 4194304]`.
+	fn note_no_deposit_preimage(s: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `173`
+		//  Estimated: `3556`
+		// Minimum execution time: 19_009_000 picoseconds.
+		Weight::from_parts(19_256_000, 3556)
+			// Standard Error: 1
+			.saturating_add(Weight::from_parts(1_994, 0).saturating_mul(s.into()))
+			.saturating_add(T::DbWeight::get().reads(2_u64))
+			.saturating_add(T::DbWeight::get().writes(2_u64))
+	}
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
+	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(75), added: 2550, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::PreimageFor` (r:0 w:1)
+	/// Proof: `Preimage::PreimageFor` (`max_values`: None, `max_size`: Some(4194344), added: 4196819, mode: `MaxEncodedLen`)
+	fn unnote_preimage() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `239`
+		//  Estimated: `3556`
+		// Minimum execution time: 27_592_000 picoseconds.
+		Weight::from_parts(28_396_000, 3556)
+			.saturating_add(T::DbWeight::get().reads(2_u64))
+			.saturating_add(T::DbWeight::get().writes(2_u64))
+	}
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
+	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(75), added: 2550, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::PreimageFor` (r:0 w:1)
+	/// Proof: `Preimage::PreimageFor` (`max_values`: None, `max_size`: Some(4194344), added: 4196819, mode: `MaxEncodedLen`)
+	fn unnote_no_deposit_preimage() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `211`
+		//  Estimated: `3556`
+		// Minimum execution time: 28_722_000 picoseconds.
+		Weight::from_parts(29_613_000, 3556)
+			.saturating_add(T::DbWeight::get().reads(2_u64))
+			.saturating_add(T::DbWeight::get().writes(2_u64))
+	}
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
+	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(75), added: 2550, mode: `MaxEncodedLen`)
+	fn request_preimage() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `239`
+		//  Estimated: `3556`
+		// Minimum execution time: 24_756_000 picoseconds.
+		Weight::from_parts(25_638_000, 3556)
+			.saturating_add(T::DbWeight::get().reads(2_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
+	}
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
+	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(75), added: 2550, mode: `MaxEncodedLen`)
+	fn request_no_deposit_preimage() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `211`
+		//  Estimated: `3556`
+		// Minimum execution time: 16_915_000 picoseconds.
+		Weight::from_parts(17_589_000, 3556)
+			.saturating_add(T::DbWeight::get().reads(2_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
+	}
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
+	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(75), added: 2550, mode: `MaxEncodedLen`)
+	fn request_unnoted_preimage() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `109`
+		//  Estimated: `3556`
+		// Minimum execution time: 15_906_000 picoseconds.
+		Weight::from_parts(16_554_000, 3556)
+			.saturating_add(T::DbWeight::get().reads(2_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
+	}
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
+	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(75), added: 2550, mode: `MaxEncodedLen`)
+	fn request_requested_preimage() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `173`
+		//  Estimated: `3556`
+		// Minimum execution time: 12_522_000 picoseconds.
+		Weight::from_parts(12_867_000, 3556)
+			.saturating_add(T::DbWeight::get().reads(2_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
+	}
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
+	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(75), added: 2550, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::PreimageFor` (r:0 w:1)
+	/// Proof: `Preimage::PreimageFor` (`max_values`: None, `max_size`: Some(4194344), added: 4196819, mode: `MaxEncodedLen`)
+	fn unrequest_preimage() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `211`
+		//  Estimated: `3556`
+		// Minimum execution time: 26_228_000 picoseconds.
+		Weight::from_parts(26_977_000, 3556)
+			.saturating_add(T::DbWeight::get().reads(2_u64))
+			.saturating_add(T::DbWeight::get().writes(2_u64))
+	}
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
+	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(75), added: 2550, mode: `MaxEncodedLen`)
+	fn unrequest_unnoted_preimage() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `173`
+		//  Estimated: `3556`
+		// Minimum execution time: 12_510_000 picoseconds.
+		Weight::from_parts(12_831_000, 3556)
+			.saturating_add(T::DbWeight::get().reads(2_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
+	}
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
+	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(75), added: 2550, mode: `MaxEncodedLen`)
+	fn unrequest_multi_referenced_preimage() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `173`
+		//  Estimated: `3556`
+		// Minimum execution time: 12_446_000 picoseconds.
+		Weight::from_parts(12_729_000, 3556)
+			.saturating_add(T::DbWeight::get().reads(2_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
+	}
+	/// Storage: `Preimage::StatusFor` (r:1023 w:1023)
+	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:1023 w:1023)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:0 w:1023)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(75), added: 2550, mode: `MaxEncodedLen`)
+	/// The range of component `n` is `[1, 1024]`.
+	fn ensure_updated(n: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `0 + n * (227 ±0)`
+		//  Estimated: `990 + n * (2603 ±0)`
+		// Minimum execution time: 26_986_000 picoseconds.
+		Weight::from_parts(27_317_000, 990)
+			// Standard Error: 20_274
+			.saturating_add(Weight::from_parts(20_561_895, 0).saturating_mul(n.into()))
+			.saturating_add(T::DbWeight::get().reads((2_u64).saturating_mul(n.into())))
+			.saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(n.into())))
+			.saturating_add(Weight::from_parts(0, 2603).saturating_mul(n.into()))
+	}
+}
\ No newline at end of file
diff --git a/runtime/hydradx/src/weights/proxy.rs b/runtime/hydradx/src/weights/pallet_proxy.rs
similarity index 62%
rename from runtime/hydradx/src/weights/proxy.rs
rename to runtime/hydradx/src/weights/pallet_proxy.rs
index efa83756f..cce1c1d76 100644
--- a/runtime/hydradx/src/weights/proxy.rs
+++ b/runtime/hydradx/src/weights/pallet_proxy.rs
@@ -15,37 +15,46 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+
 //! Autogenerated weights for `pallet_proxy`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-02-15, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-05-23, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: 1024
+//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024`
 
 // Executed Command:
-// target/release/hydradx
+// ./target/release/hydradx
 // benchmark
 // pallet
-// --chain=dev
-// --steps=10
-// --repeat=30
 // --wasm-execution=compiled
-// --heap-pages=4096
-// --template=.maintain/pallet-weight-template-no-back.hbs
-// --pallet=pallet-proxy
-// --output=./weights/proxy.rs
-// --extrinsic=*
+// --pallet
+// *
+// --extrinsic
+// *
+// --heap-pages
+// 4096
+// --steps
+// 50
+// --repeat
+// 20
+// --template=scripts/pallet-weight-template.hbs
+// --output
+// weights/
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
 #![allow(missing_docs)]
 
-use frame_support::{traits::Get, weights::Weight};
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
 use core::marker::PhantomData;
 
-/// Weight functions for `pallet_proxy`.
+/// Weights for `pallet_proxy`.
+pub struct WeightInfo<T>(PhantomData<T>);
+
+/// Weights for `pallet_proxy` using the HydraDX node and recommended hardware.
 pub struct HydraWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> pallet_proxy::WeightInfo for HydraWeight<T> {
 	/// Storage: `Proxy::Proxies` (r:1 w:0)
@@ -55,11 +64,11 @@ impl<T: frame_system::Config> pallet_proxy::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `293 + p * (37 ±0)`
 		//  Estimated: `4706`
-		// Minimum execution time: 23_362_000 picoseconds.
-		Weight::from_parts(23_716_894, 4706)
-			// Standard Error: 1_411
-			.saturating_add(Weight::from_parts(31_936, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
+		// Minimum execution time: 17_741_000 picoseconds.
+		Weight::from_parts(18_338_487, 4706)
+			// Standard Error: 949
+			.saturating_add(Weight::from_parts(38_218, 0).saturating_mul(p.into()))
+			.saturating_add(T::DbWeight::get().reads(1_u64))
 	}
 	/// Storage: `Proxy::Proxies` (r:1 w:0)
 	/// Proof: `Proxy::Proxies` (`max_values`: None, `max_size`: Some(1241), added: 3716, mode: `MaxEncodedLen`)
@@ -73,14 +82,14 @@ impl<T: frame_system::Config> pallet_proxy::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `620 + a * (68 ±0) + p * (37 ±0)`
 		//  Estimated: `5698`
-		// Minimum execution time: 51_500_000 picoseconds.
-		Weight::from_parts(51_077_709, 5698)
-			// Standard Error: 2_902
-			.saturating_add(Weight::from_parts(168_254, 0).saturating_mul(a.into()))
-			// Standard Error: 3_017
-			.saturating_add(Weight::from_parts(29_333, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(2))
+		// Minimum execution time: 40_952_000 picoseconds.
+		Weight::from_parts(41_130_569, 5698)
+			// Standard Error: 1_451
+			.saturating_add(Weight::from_parts(156_513, 0).saturating_mul(a.into()))
+			// Standard Error: 1_499
+			.saturating_add(Weight::from_parts(23_247, 0).saturating_mul(p.into()))
+			.saturating_add(T::DbWeight::get().reads(3_u64))
+			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
 	/// Storage: `Proxy::Announcements` (r:1 w:1)
 	/// Proof: `Proxy::Announcements` (`max_values`: None, `max_size`: Some(2233), added: 4708, mode: `MaxEncodedLen`)
@@ -92,12 +101,12 @@ impl<T: frame_system::Config> pallet_proxy::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `535 + a * (68 ±0)`
 		//  Estimated: `5698`
-		// Minimum execution time: 34_322_000 picoseconds.
-		Weight::from_parts(34_848_430, 5698)
-			// Standard Error: 2_484
-			.saturating_add(Weight::from_parts(157_646, 0).saturating_mul(a.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
+		// Minimum execution time: 27_851_000 picoseconds.
+		Weight::from_parts(28_784_492, 5698)
+			// Standard Error: 1_292
+			.saturating_add(Weight::from_parts(157_827, 0).saturating_mul(a.into()))
+			.saturating_add(T::DbWeight::get().reads(2_u64))
+			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
 	/// Storage: `Proxy::Announcements` (r:1 w:1)
 	/// Proof: `Proxy::Announcements` (`max_values`: None, `max_size`: Some(2233), added: 4708, mode: `MaxEncodedLen`)
@@ -109,12 +118,12 @@ impl<T: frame_system::Config> pallet_proxy::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `535 + a * (68 ±0)`
 		//  Estimated: `5698`
-		// Minimum execution time: 34_010_000 picoseconds.
-		Weight::from_parts(34_723_018, 5698)
-			// Standard Error: 2_442
-			.saturating_add(Weight::from_parts(164_732, 0).saturating_mul(a.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
+		// Minimum execution time: 27_876_000 picoseconds.
+		Weight::from_parts(28_484_364, 5698)
+			// Standard Error: 1_233
+			.saturating_add(Weight::from_parts(164_720, 0).saturating_mul(a.into()))
+			.saturating_add(T::DbWeight::get().reads(2_u64))
+			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
 	/// Storage: `Proxy::Proxies` (r:1 w:0)
 	/// Proof: `Proxy::Proxies` (`max_values`: None, `max_size`: Some(1241), added: 3716, mode: `MaxEncodedLen`)
@@ -128,14 +137,14 @@ impl<T: frame_system::Config> pallet_proxy::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `552 + a * (68 ±0) + p * (37 ±0)`
 		//  Estimated: `5698`
-		// Minimum execution time: 46_184_000 picoseconds.
-		Weight::from_parts(45_983_861, 5698)
-			// Standard Error: 2_006
-			.saturating_add(Weight::from_parts(172_287, 0).saturating_mul(a.into()))
-			// Standard Error: 2_086
-			.saturating_add(Weight::from_parts(26_773, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(2))
+		// Minimum execution time: 36_786_000 picoseconds.
+		Weight::from_parts(36_167_647, 5698)
+			// Standard Error: 1_151
+			.saturating_add(Weight::from_parts(161_136, 0).saturating_mul(a.into()))
+			// Standard Error: 1_190
+			.saturating_add(Weight::from_parts(28_671, 0).saturating_mul(p.into()))
+			.saturating_add(T::DbWeight::get().reads(3_u64))
+			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
 	/// Storage: `Proxy::Proxies` (r:1 w:1)
 	/// Proof: `Proxy::Proxies` (`max_values`: None, `max_size`: Some(1241), added: 3716, mode: `MaxEncodedLen`)
@@ -144,12 +153,12 @@ impl<T: frame_system::Config> pallet_proxy::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `293 + p * (37 ±0)`
 		//  Estimated: `4706`
-		// Minimum execution time: 35_158_000 picoseconds.
-		Weight::from_parts(35_671_577, 4706)
-			// Standard Error: 1_904
-			.saturating_add(Weight::from_parts(43_085, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
+		// Minimum execution time: 27_070_000 picoseconds.
+		Weight::from_parts(27_656_061, 4706)
+			// Standard Error: 1_038
+			.saturating_add(Weight::from_parts(39_781, 0).saturating_mul(p.into()))
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	/// Storage: `Proxy::Proxies` (r:1 w:1)
 	/// Proof: `Proxy::Proxies` (`max_values`: None, `max_size`: Some(1241), added: 3716, mode: `MaxEncodedLen`)
@@ -158,12 +167,12 @@ impl<T: frame_system::Config> pallet_proxy::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `293 + p * (37 ±0)`
 		//  Estimated: `4706`
-		// Minimum execution time: 35_277_000 picoseconds.
-		Weight::from_parts(36_469_179, 4706)
-			// Standard Error: 4_286
-			.saturating_add(Weight::from_parts(13_586, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
+		// Minimum execution time: 26_944_000 picoseconds.
+		Weight::from_parts(27_943_805, 4706)
+			// Standard Error: 1_860
+			.saturating_add(Weight::from_parts(41_168, 0).saturating_mul(p.into()))
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	/// Storage: `Proxy::Proxies` (r:1 w:1)
 	/// Proof: `Proxy::Proxies` (`max_values`: None, `max_size`: Some(1241), added: 3716, mode: `MaxEncodedLen`)
@@ -172,12 +181,12 @@ impl<T: frame_system::Config> pallet_proxy::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `293 + p * (37 ±0)`
 		//  Estimated: `4706`
-		// Minimum execution time: 31_983_000 picoseconds.
-		Weight::from_parts(32_492_459, 4706)
-			// Standard Error: 1_600
-			.saturating_add(Weight::from_parts(30_213, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
+		// Minimum execution time: 26_237_000 picoseconds.
+		Weight::from_parts(26_768_642, 4706)
+			// Standard Error: 947
+			.saturating_add(Weight::from_parts(38_137, 0).saturating_mul(p.into()))
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	/// Storage: `Proxy::Proxies` (r:1 w:1)
 	/// Proof: `Proxy::Proxies` (`max_values`: None, `max_size`: Some(1241), added: 3716, mode: `MaxEncodedLen`)
@@ -186,12 +195,12 @@ impl<T: frame_system::Config> pallet_proxy::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `305`
 		//  Estimated: `4706`
-		// Minimum execution time: 37_955_000 picoseconds.
-		Weight::from_parts(38_652_892, 4706)
-			// Standard Error: 2_122
-			.saturating_add(Weight::from_parts(14_074, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
+		// Minimum execution time: 29_406_000 picoseconds.
+		Weight::from_parts(30_103_342, 4706)
+			// Standard Error: 883
+			.saturating_add(Weight::from_parts(11_166, 0).saturating_mul(p.into()))
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	/// Storage: `Proxy::Proxies` (r:1 w:1)
 	/// Proof: `Proxy::Proxies` (`max_values`: None, `max_size`: Some(1241), added: 3716, mode: `MaxEncodedLen`)
@@ -200,11 +209,11 @@ impl<T: frame_system::Config> pallet_proxy::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `330 + p * (37 ±0)`
 		//  Estimated: `4706`
-		// Minimum execution time: 32_767_000 picoseconds.
-		Weight::from_parts(33_326_886, 4706)
-			// Standard Error: 1_559
-			.saturating_add(Weight::from_parts(38_563, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
+		// Minimum execution time: 26_909_000 picoseconds.
+		Weight::from_parts(27_669_215, 4706)
+			// Standard Error: 944
+			.saturating_add(Weight::from_parts(31_859, 0).saturating_mul(p.into()))
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 }
\ No newline at end of file
diff --git a/runtime/hydradx/src/weights/referrals.rs b/runtime/hydradx/src/weights/pallet_referrals.rs
similarity index 79%
rename from runtime/hydradx/src/weights/referrals.rs
rename to runtime/hydradx/src/weights/pallet_referrals.rs
index 43620ecf6..703c9c2fb 100644
--- a/runtime/hydradx/src/weights/referrals.rs
+++ b/runtime/hydradx/src/weights/pallet_referrals.rs
@@ -15,41 +15,48 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+
 //! Autogenerated weights for `pallet_referrals`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-02-15, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-05-23, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: 1024
+//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024`
 
 // Executed Command:
-// target/release/hydradx
+// ./target/release/hydradx
 // benchmark
 // pallet
-// --chain=dev
-// --steps=10
-// --repeat=30
 // --wasm-execution=compiled
-// --heap-pages=4096
-// --template=.maintain/pallet-weight-template-no-back.hbs
-// --pallet=pallet_referrals
-// --output=./weights/referrlas.rs
-// --extrinsic=*
+// --pallet
+// *
+// --extrinsic
+// *
+// --heap-pages
+// 4096
+// --steps
+// 50
+// --repeat
+// 20
+// --template=scripts/pallet-weight-template.hbs
+// --output
+// weights/
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
 #![allow(missing_docs)]
 
-use frame_support::{traits::Get, weights::Weight};
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
 use core::marker::PhantomData;
 
-use pallet_referrals::weights::WeightInfo;
+/// Weights for `pallet_referrals`.
+pub struct WeightInfo<T>(PhantomData<T>);
 
-/// Weight functions for `pallet_referrals`.
+/// Weights for `pallet_referrals` using the HydraDX node and recommended hardware.
 pub struct HydraWeight<T>(PhantomData<T>);
-impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
+impl<T: frame_system::Config> pallet_referrals::WeightInfo for HydraWeight<T> {
 	/// Storage: `Referrals::ReferralAccounts` (r:1 w:1)
 	/// Proof: `Referrals::ReferralAccounts` (`max_values`: None, `max_size`: Some(59), added: 2534, mode: `MaxEncodedLen`)
 	/// Storage: `Referrals::ReferralCodes` (r:1 w:1)
@@ -60,12 +67,12 @@ impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
 	/// Proof: `Referrals::Referrer` (`max_values`: None, `max_size`: Some(65), added: 2540, mode: `MaxEncodedLen`)
 	fn register_code() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `284`
+		//  Measured:  `318`
 		//  Estimated: `6196`
-		// Minimum execution time: 63_867_000 picoseconds.
-		Weight::from_parts(64_488_000, 6196)
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(5))
+		// Minimum execution time: 58_712_000 picoseconds.
+		Weight::from_parts(59_464_000, 6196)
+			.saturating_add(T::DbWeight::get().reads(4_u64))
+			.saturating_add(T::DbWeight::get().writes(5_u64))
 	}
 	/// Storage: `Referrals::ReferralCodes` (r:1 w:0)
 	/// Proof: `Referrals::ReferralCodes` (`max_values`: None, `max_size`: Some(59), added: 2534, mode: `MaxEncodedLen`)
@@ -73,12 +80,12 @@ impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
 	/// Proof: `Referrals::LinkedAccounts` (`max_values`: None, `max_size`: Some(80), added: 2555, mode: `MaxEncodedLen`)
 	fn link_code() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `194`
+		//  Measured:  `228`
 		//  Estimated: `3545`
-		// Minimum execution time: 21_841_000 picoseconds.
-		Weight::from_parts(22_151_000, 3545)
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
+		// Minimum execution time: 17_123_000 picoseconds.
+		Weight::from_parts(17_546_000, 3545)
+			.saturating_add(T::DbWeight::get().reads(2_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	/// Storage: `Tokens::Accounts` (r:2 w:2)
 	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
@@ -94,7 +101,7 @@ impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
 	/// Proof: `EmaOracle::Oracles` (`max_values`: None, `max_size`: Some(177), added: 2652, mode: `MaxEncodedLen`)
 	/// Storage: `AssetRegistry::BannedAssets` (r:1 w:0)
 	/// Proof: `AssetRegistry::BannedAssets` (`max_values`: None, `max_size`: Some(20), added: 2495, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:1 w:0)
+	/// Storage: `AssetRegistry::Assets` (r:3 w:0)
 	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
 	/// Storage: `EmaOracle::Accumulator` (r:1 w:1)
 	/// Proof: `EmaOracle::Accumulator` (`max_values`: Some(1), `max_size`: Some(5921), added: 6416, mode: `MaxEncodedLen`)
@@ -120,12 +127,12 @@ impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
 	/// Proof: `MultiTransactionPayment::AccountCurrencyMap` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
 	fn convert() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2088`
-		//  Estimated: `7406`
-		// Minimum execution time: 295_663_000 picoseconds.
-		Weight::from_parts(297_036_000, 7406)
-			.saturating_add(T::DbWeight::get().reads(25))
-			.saturating_add(T::DbWeight::get().writes(15))
+		//  Measured:  `2226`
+		//  Estimated: `8790`
+		// Minimum execution time: 263_297_000 picoseconds.
+		Weight::from_parts(264_892_000, 8790)
+			.saturating_add(T::DbWeight::get().reads(27_u64))
+			.saturating_add(T::DbWeight::get().writes(15_u64))
 	}
 	/// Storage: `Referrals::PendingConversions` (r:1 w:0)
 	/// Proof: `Referrals::PendingConversions` (`max_values`: None, `max_size`: Some(20), added: 2495, mode: `MaxEncodedLen`)
@@ -141,22 +148,22 @@ impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
 	/// Proof: `Referrals::Referrer` (`max_values`: None, `max_size`: Some(65), added: 2540, mode: `MaxEncodedLen`)
 	fn claim_rewards() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `655`
+		//  Measured:  `689`
 		//  Estimated: `6196`
-		// Minimum execution time: 88_579_000 picoseconds.
-		Weight::from_parts(89_353_000, 6196)
-			.saturating_add(T::DbWeight::get().reads(7))
-			.saturating_add(T::DbWeight::get().writes(6))
+		// Minimum execution time: 77_361_000 picoseconds.
+		Weight::from_parts(78_136_000, 6196)
+			.saturating_add(T::DbWeight::get().reads(7_u64))
+			.saturating_add(T::DbWeight::get().writes(6_u64))
 	}
 	/// Storage: `Referrals::AssetRewards` (r:1 w:1)
 	/// Proof: `Referrals::AssetRewards` (`max_values`: None, `max_size`: Some(49), added: 2524, mode: `MaxEncodedLen`)
 	fn set_reward_percentage() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `42`
+		//  Measured:  `76`
 		//  Estimated: `3514`
-		// Minimum execution time: 15_398_000 picoseconds.
-		Weight::from_parts(15_676_000, 3514)
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
+		// Minimum execution time: 11_771_000 picoseconds.
+		Weight::from_parts(11_990_000, 3514)
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-}
+}
\ No newline at end of file
diff --git a/runtime/hydradx/src/weights/route_executor.rs b/runtime/hydradx/src/weights/pallet_route_executor.rs
similarity index 79%
rename from runtime/hydradx/src/weights/route_executor.rs
rename to runtime/hydradx/src/weights/pallet_route_executor.rs
index 10f017e21..5d80faffe 100644
--- a/runtime/hydradx/src/weights/route_executor.rs
+++ b/runtime/hydradx/src/weights/pallet_route_executor.rs
@@ -15,13 +15,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+
 //! Autogenerated weights for `pallet_route_executor`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-03-18, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-05-24, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: 1024
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
 
 // Executed Command:
 // target/release/hydradx
@@ -32,9 +33,9 @@
 // --repeat=30
 // --wasm-execution=compiled
 // --heap-pages=4096
-// --template=.maintain/pallet-weight-template-no-back.hbs
-// --pallet=pallet_route-executor
-// --output=re2.rs
+// --template=scripts/pallet-weight-template.hbs
+// --pallet=pallet-route-executor
+// --output=weights/route_executor.rs
 // --extrinsic=*
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
@@ -42,37 +43,40 @@
 #![allow(unused_imports)]
 #![allow(missing_docs)]
 
-use frame_support::{traits::Get, weights::Weight};
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
 use core::marker::PhantomData;
 
-/// Weight functions for `pallet_route_executor`.
+/// Weights for `pallet_route_executor`.
+pub struct WeightInfo<T>(PhantomData<T>);
+
+/// Weights for `pallet_route_executor` using the HydraDX node and recommended hardware.
 pub struct HydraWeight<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_route_executor::weights::WeightInfo for HydraWeight<T> {
+impl<T: frame_system::Config> pallet_route_executor::WeightInfo for HydraWeight<T> {
 	/// Storage: `LBP::PoolData` (r:1 w:0)
 	/// Proof: `LBP::PoolData` (`max_values`: None, `max_size`: Some(163), added: 2638, mode: `MaxEncodedLen`)
 	/// Storage: `Tokens::Accounts` (r:5 w:5)
 	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
 	/// Storage: `System::Account` (r:3 w:1)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::Assets` (r:2 w:0)
+	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
 	/// Storage: `Tokens::Locks` (r:1 w:1)
 	/// Proof: `Tokens::Locks` (`max_values`: None, `max_size`: Some(1261), added: 3736, mode: `MaxEncodedLen`)
 	/// Storage: `Duster::AccountBlacklist` (r:2 w:0)
 	/// Proof: `Duster::AccountBlacklist` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
 	/// Storage: `AssetRegistry::BannedAssets` (r:2 w:0)
 	/// Proof: `AssetRegistry::BannedAssets` (`max_values`: None, `max_size`: Some(20), added: 2495, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:2 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
 	/// The range of component `c` is `[0, 1]`.
 	fn calculate_and_execute_sell_in_lbp(c: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3436`
+		//  Measured:  `3535`
 		//  Estimated: `13905`
-		// Minimum execution time: 344_173_000 picoseconds.
-		Weight::from_parts(347_378_169, 13905)
-			// Standard Error: 131_839
-			.saturating_add(Weight::from_parts(49_213_080, 0).saturating_mul(c.into()))
-			.saturating_add(T::DbWeight::get().reads(16))
-			.saturating_add(T::DbWeight::get().writes(7))
+		// Minimum execution time: 353_367_000 picoseconds.
+		Weight::from_parts(356_268_786, 13905)
+			// Standard Error: 166_444
+			.saturating_add(Weight::from_parts(71_565_213, 0).saturating_mul(c.into()))
+			.saturating_add(T::DbWeight::get().reads(16_u64))
+			.saturating_add(T::DbWeight::get().writes(7_u64))
 	}
 	/// Storage: `LBP::PoolData` (r:1 w:0)
 	/// Proof: `LBP::PoolData` (`max_values`: None, `max_size`: Some(163), added: 2638, mode: `MaxEncodedLen`)
@@ -80,27 +84,27 @@ impl<T: frame_system::Config> pallet_route_executor::weights::WeightInfo for Hyd
 	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
 	/// Storage: `System::Account` (r:3 w:1)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `AssetRegistry::Assets` (r:2 w:0)
+	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
 	/// Storage: `Tokens::Locks` (r:1 w:1)
 	/// Proof: `Tokens::Locks` (`max_values`: None, `max_size`: Some(1261), added: 3736, mode: `MaxEncodedLen`)
 	/// Storage: `Duster::AccountBlacklist` (r:2 w:0)
 	/// Proof: `Duster::AccountBlacklist` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
 	/// Storage: `AssetRegistry::BannedAssets` (r:2 w:0)
 	/// Proof: `AssetRegistry::BannedAssets` (`max_values`: None, `max_size`: Some(20), added: 2495, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:2 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
 	/// The range of component `c` is `[1, 2]`.
 	/// The range of component `b` is `[0, 1]`.
 	fn calculate_and_execute_buy_in_lbp(c: u32, b: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1604 + b * (1837 ±0)`
-		//  Estimated: `6156 + b * (7749 ±251_795_645_551_580_832)`
-		// Minimum execution time: 75_692_000 picoseconds.
-		Weight::from_parts(76_409_000, 6156)
-			// Standard Error: 611_234
-			.saturating_add(Weight::from_parts(2_382_471, 0).saturating_mul(c.into()))
-			// Standard Error: 1_341_833
-			.saturating_add(Weight::from_parts(272_805_599, 0).saturating_mul(b.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
+		//  Measured:  `1637 + b * (1923 ±0)`
+		//  Estimated: `6156 + b * (7749 ±245_709_589_663_843_264)`
+		// Minimum execution time: 94_954_000 picoseconds.
+		Weight::from_parts(95_935_000, 6156)
+			// Standard Error: 916_176
+			.saturating_add(Weight::from_parts(3_538_176, 0).saturating_mul(c.into()))
+			// Standard Error: 2_011_269
+			.saturating_add(Weight::from_parts(271_193_375, 0).saturating_mul(b.into()))
+			.saturating_add(T::DbWeight::get().reads(3_u64))
 			.saturating_add(T::DbWeight::get().reads((13_u64).saturating_mul(b.into())))
 			.saturating_add(T::DbWeight::get().writes((7_u64).saturating_mul(b.into())))
 			.saturating_add(Weight::from_parts(0, 7749).saturating_mul(b.into()))
@@ -129,12 +133,12 @@ impl<T: frame_system::Config> pallet_route_executor::weights::WeightInfo for Hyd
 	/// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
 	fn set_route_for_xyk() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `6326`
+		//  Measured:  `6426`
 		//  Estimated: `39735`
-		// Minimum execution time: 2_263_303_000 picoseconds.
-		Weight::from_parts(2_275_623_000, 39735)
-			.saturating_add(T::DbWeight::get().reads(55))
-			.saturating_add(T::DbWeight::get().writes(1))
+		// Minimum execution time: 1_873_189_000 picoseconds.
+		Weight::from_parts(1_884_759_000, 39735)
+			.saturating_add(T::DbWeight::get().reads(55_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	/// Storage: `Router::Routes` (r:0 w:1)
 	/// Proof: `Router::Routes` (`max_values`: None, `max_size`: Some(90), added: 2565, mode: `MaxEncodedLen`)
@@ -142,8 +146,8 @@ impl<T: frame_system::Config> pallet_route_executor::weights::WeightInfo for Hyd
 		// Proof Size summary in bytes:
 		//  Measured:  `1012`
 		//  Estimated: `0`
-		// Minimum execution time: 29_861_000 picoseconds.
-		Weight::from_parts(30_303_000, 0)
-			.saturating_add(T::DbWeight::get().writes(1))
+		// Minimum execution time: 25_395_000 picoseconds.
+		Weight::from_parts(25_888_000, 0)
+			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 }
\ No newline at end of file
diff --git a/runtime/hydradx/src/weights/scheduler.rs b/runtime/hydradx/src/weights/pallet_scheduler.rs
similarity index 59%
rename from runtime/hydradx/src/weights/scheduler.rs
rename to runtime/hydradx/src/weights/pallet_scheduler.rs
index d39faa62a..ba8d895fc 100644
--- a/runtime/hydradx/src/weights/scheduler.rs
+++ b/runtime/hydradx/src/weights/pallet_scheduler.rs
@@ -15,37 +15,46 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+
 //! Autogenerated weights for `pallet_scheduler`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-02-15, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-05-23, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: 1024
+//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024`
 
 // Executed Command:
-// target/release/hydradx
+// ./target/release/hydradx
 // benchmark
 // pallet
-// --chain=dev
-// --steps=10
-// --repeat=30
 // --wasm-execution=compiled
-// --heap-pages=4096
-// --template=.maintain/pallet-weight-template-no-back.hbs
-// --pallet=pallet_scheduler
-// --output=./weights/scheduler.rs
-// --extrinsic=*
+// --pallet
+// *
+// --extrinsic
+// *
+// --heap-pages
+// 4096
+// --steps
+// 50
+// --repeat
+// 20
+// --template=scripts/pallet-weight-template.hbs
+// --output
+// weights/
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
 #![allow(missing_docs)]
 
-use frame_support::{traits::Get, weights::Weight};
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
 use core::marker::PhantomData;
 
-/// Weight functions for `pallet_scheduler`.
+/// Weights for `pallet_scheduler`.
+pub struct WeightInfo<T>(PhantomData<T>);
+
+/// Weights for `pallet_scheduler` using the HydraDX node and recommended hardware.
 pub struct HydraWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> pallet_scheduler::WeightInfo for HydraWeight<T> {
 	/// Storage: `Scheduler::IncompleteSince` (r:1 w:1)
@@ -54,10 +63,10 @@ impl<T: frame_system::Config> pallet_scheduler::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `31`
 		//  Estimated: `1489`
-		// Minimum execution time: 4_766_000 picoseconds.
-		Weight::from_parts(4_908_000, 1489)
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
+		// Minimum execution time: 3_113_000 picoseconds.
+		Weight::from_parts(3_195_000, 1489)
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	/// Storage: `Scheduler::Agenda` (r:1 w:1)
 	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(38963), added: 41438, mode: `MaxEncodedLen`)
@@ -66,35 +75,37 @@ impl<T: frame_system::Config> pallet_scheduler::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `78 + s * (177 ±0)`
 		//  Estimated: `42428`
-		// Minimum execution time: 4_580_000 picoseconds.
-		Weight::from_parts(7_795_367, 42428)
-			// Standard Error: 6_252
-			.saturating_add(Weight::from_parts(905_945, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
+		// Minimum execution time: 4_409_000 picoseconds.
+		Weight::from_parts(8_541_812, 42428)
+			// Standard Error: 1_956
+			.saturating_add(Weight::from_parts(464_495, 0).saturating_mul(s.into()))
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	fn service_task_base() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 8_057_000 picoseconds.
-		Weight::from_parts(8_214_000, 0)
+		// Minimum execution time: 4_444_000 picoseconds.
+		Weight::from_parts(4_628_000, 0)
 	}
 	/// Storage: `Preimage::PreimageFor` (r:1 w:1)
 	/// Proof: `Preimage::PreimageFor` (`max_values`: None, `max_size`: Some(4194344), added: 4196819, mode: `Measured`)
-	/// Storage: `Preimage::StatusFor` (r:1 w:1)
+	/// Storage: `Preimage::StatusFor` (r:1 w:0)
 	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`)
+	/// Storage: `Preimage::RequestStatusFor` (r:1 w:1)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(75), added: 2550, mode: `MaxEncodedLen`)
 	/// The range of component `s` is `[128, 4194304]`.
 	fn service_task_fetched(s: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `246 + s * (1 ±0)`
-		//  Estimated: `3709 + s * (1 ±0)`
-		// Minimum execution time: 27_147_000 picoseconds.
-		Weight::from_parts(27_475_000, 3709)
-			// Standard Error: 19
-			.saturating_add(Weight::from_parts(1_397, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
+		//  Estimated: `3711 + s * (1 ±0)`
+		// Minimum execution time: 22_139_000 picoseconds.
+		Weight::from_parts(22_415_000, 3711)
+			// Standard Error: 1
+			.saturating_add(Weight::from_parts(1_251, 0).saturating_mul(s.into()))
+			.saturating_add(T::DbWeight::get().reads(3_u64))
+			.saturating_add(T::DbWeight::get().writes(2_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(s.into()))
 	}
 	/// Storage: `Scheduler::Lookup` (r:0 w:1)
@@ -103,30 +114,30 @@ impl<T: frame_system::Config> pallet_scheduler::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 10_368_000 picoseconds.
-		Weight::from_parts(10_520_000, 0)
-			.saturating_add(T::DbWeight::get().writes(1))
+		// Minimum execution time: 6_750_000 picoseconds.
+		Weight::from_parts(6_944_000, 0)
+			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	fn service_task_periodic() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 7_981_000 picoseconds.
-		Weight::from_parts(8_201_000, 0)
+		// Minimum execution time: 4_487_000 picoseconds.
+		Weight::from_parts(4_588_000, 0)
 	}
 	fn execute_dispatch_signed() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 4_335_000 picoseconds.
-		Weight::from_parts(4_499_000, 0)
+		// Minimum execution time: 3_474_000 picoseconds.
+		Weight::from_parts(3_624_000, 0)
 	}
 	fn execute_dispatch_unsigned() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 4_214_000 picoseconds.
-		Weight::from_parts(4_391_000, 0)
+		// Minimum execution time: 3_330_000 picoseconds.
+		Weight::from_parts(3_439_000, 0)
 	}
 	/// Storage: `Scheduler::Agenda` (r:1 w:1)
 	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(38963), added: 41438, mode: `MaxEncodedLen`)
@@ -135,12 +146,12 @@ impl<T: frame_system::Config> pallet_scheduler::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `78 + s * (177 ±0)`
 		//  Estimated: `42428`
-		// Minimum execution time: 17_694_000 picoseconds.
-		Weight::from_parts(21_031_139, 42428)
-			// Standard Error: 6_108
-			.saturating_add(Weight::from_parts(896_821, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
+		// Minimum execution time: 13_523_000 picoseconds.
+		Weight::from_parts(17_859_084, 42428)
+			// Standard Error: 1_925
+			.saturating_add(Weight::from_parts(473_779, 0).saturating_mul(s.into()))
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	/// Storage: `Scheduler::Agenda` (r:1 w:1)
 	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(38963), added: 41438, mode: `MaxEncodedLen`)
@@ -151,12 +162,12 @@ impl<T: frame_system::Config> pallet_scheduler::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `78 + s * (177 ±0)`
 		//  Estimated: `42428`
-		// Minimum execution time: 24_274_000 picoseconds.
-		Weight::from_parts(23_345_538, 42428)
-			// Standard Error: 1_887
-			.saturating_add(Weight::from_parts(1_577_518, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(2))
+		// Minimum execution time: 19_275_000 picoseconds.
+		Weight::from_parts(18_685_362, 42428)
+			// Standard Error: 996
+			.saturating_add(Weight::from_parts(725_805, 0).saturating_mul(s.into()))
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
 	/// Storage: `Scheduler::Lookup` (r:1 w:1)
 	/// Proof: `Scheduler::Lookup` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
@@ -165,14 +176,14 @@ impl<T: frame_system::Config> pallet_scheduler::WeightInfo for HydraWeight<T> {
 	/// The range of component `s` is `[0, 49]`.
 	fn schedule_named(s: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `192 + s * (187 ±0)`
+		//  Measured:  `255 + s * (185 ±0)`
 		//  Estimated: `42428`
-		// Minimum execution time: 22_839_000 picoseconds.
-		Weight::from_parts(26_341_432, 42428)
-			// Standard Error: 6_685
-			.saturating_add(Weight::from_parts(941_746, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
+		// Minimum execution time: 17_927_000 picoseconds.
+		Weight::from_parts(23_005_508, 42428)
+			// Standard Error: 2_702
+			.saturating_add(Weight::from_parts(507_478, 0).saturating_mul(s.into()))
+			.saturating_add(T::DbWeight::get().reads(2_u64))
+			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
 	/// Storage: `Scheduler::Lookup` (r:1 w:1)
 	/// Proof: `Scheduler::Lookup` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
@@ -181,13 +192,13 @@ impl<T: frame_system::Config> pallet_scheduler::WeightInfo for HydraWeight<T> {
 	/// The range of component `s` is `[1, 50]`.
 	fn cancel_named(s: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `263 + s * (186 ±0)`
+		//  Measured:  `281 + s * (185 ±0)`
 		//  Estimated: `42428`
-		// Minimum execution time: 26_360_000 picoseconds.
-		Weight::from_parts(25_724_190, 42428)
-			// Standard Error: 3_550
-			.saturating_add(Weight::from_parts(1_590_016, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
+		// Minimum execution time: 21_054_000 picoseconds.
+		Weight::from_parts(21_319_060, 42428)
+			// Standard Error: 1_118
+			.saturating_add(Weight::from_parts(746_371, 0).saturating_mul(s.into()))
+			.saturating_add(T::DbWeight::get().reads(2_u64))
+			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
 }
\ No newline at end of file
diff --git a/runtime/hydradx/src/weights/stableswap.rs b/runtime/hydradx/src/weights/pallet_stableswap.rs
similarity index 82%
rename from runtime/hydradx/src/weights/stableswap.rs
rename to runtime/hydradx/src/weights/pallet_stableswap.rs
index d507ae37e..7e1ed6650 100644
--- a/runtime/hydradx/src/weights/stableswap.rs
+++ b/runtime/hydradx/src/weights/pallet_stableswap.rs
@@ -15,41 +15,48 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+
 //! Autogenerated weights for `pallet_stableswap`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-02-15, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-05-23, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: 1024
+//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024`
 
 // Executed Command:
-// target/release/hydradx
+// ./target/release/hydradx
 // benchmark
 // pallet
-// --chain=dev
-// --steps=10
-// --repeat=30
 // --wasm-execution=compiled
-// --heap-pages=4096
-// --template=.maintain/pallet-weight-template-no-back.hbs
-// --pallet=pallet_stableswap
-// --output=./weights/stableswap.rs
-// --extrinsic=*
+// --pallet
+// *
+// --extrinsic
+// *
+// --heap-pages
+// 4096
+// --steps
+// 50
+// --repeat
+// 20
+// --template=scripts/pallet-weight-template.hbs
+// --output
+// weights/
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
 #![allow(missing_docs)]
 
-use frame_support::{traits::Get, weights::Weight};
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
 use core::marker::PhantomData;
 
-use pallet_stableswap::weights::WeightInfo;
+/// Weights for `pallet_stableswap`.
+pub struct WeightInfo<T>(PhantomData<T>);
 
-/// Weight functions for `pallet_stableswap`.
+/// Weights for `pallet_stableswap` using the HydraDX node and recommended hardware.
 pub struct HydraWeight<T>(PhantomData<T>);
-impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
+impl<T: frame_system::Config> pallet_stableswap::WeightInfo for HydraWeight<T> {
 	/// Storage: `Stableswap::Pools` (r:1 w:1)
 	/// Proof: `Stableswap::Pools` (`max_values`: None, `max_size`: Some(57), added: 2532, mode: `MaxEncodedLen`)
 	/// Storage: `AssetRegistry::Assets` (r:6 w:0)
@@ -58,12 +65,12 @@ impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
 	/// Proof: `Duster::AccountBlacklist` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
 	fn create_pool() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `789`
+		//  Measured:  `855`
 		//  Estimated: `16590`
-		// Minimum execution time: 53_155_000 picoseconds.
-		Weight::from_parts(53_722_000, 16590)
-			.saturating_add(T::DbWeight::get().reads(7))
-			.saturating_add(T::DbWeight::get().writes(2))
+		// Minimum execution time: 42_284_000 picoseconds.
+		Weight::from_parts(42_906_000, 16590)
+			.saturating_add(T::DbWeight::get().reads(7_u64))
+			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
 	/// Storage: `Stableswap::Pools` (r:1 w:0)
 	/// Proof: `Stableswap::Pools` (`max_values`: None, `max_size`: Some(57), added: 2532, mode: `MaxEncodedLen`)
@@ -89,12 +96,12 @@ impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
 	/// Proof: `EmaOracle::Accumulator` (`max_values`: Some(1), `max_size`: Some(5921), added: 6416, mode: `MaxEncodedLen`)
 	fn add_liquidity() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3339`
+		//  Measured:  `3471`
 		//  Estimated: `29403`
-		// Minimum execution time: 1_155_933_000 picoseconds.
-		Weight::from_parts(1_159_202_000, 29403)
-			.saturating_add(T::DbWeight::get().reads(35))
-			.saturating_add(T::DbWeight::get().writes(14))
+		// Minimum execution time: 1_342_534_000 picoseconds.
+		Weight::from_parts(1_346_186_000, 29403)
+			.saturating_add(T::DbWeight::get().reads(35_u64))
+			.saturating_add(T::DbWeight::get().writes(14_u64))
 	}
 	/// Storage: `Stableswap::AssetTradability` (r:1 w:0)
 	/// Proof: `Stableswap::AssetTradability` (`max_values`: None, `max_size`: Some(41), added: 2516, mode: `MaxEncodedLen`)
@@ -120,12 +127,12 @@ impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
 	/// Proof: `EmaOracle::Accumulator` (`max_values`: Some(1), `max_size`: Some(5921), added: 6416, mode: `MaxEncodedLen`)
 	fn add_liquidity_shares() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3207`
+		//  Measured:  `3339`
 		//  Estimated: `19071`
-		// Minimum execution time: 775_198_000 picoseconds.
-		Weight::from_parts(779_737_000, 19071)
-			.saturating_add(T::DbWeight::get().reads(23))
-			.saturating_add(T::DbWeight::get().writes(6))
+		// Minimum execution time: 896_494_000 picoseconds.
+		Weight::from_parts(900_100_000, 19071)
+			.saturating_add(T::DbWeight::get().reads(23_u64))
+			.saturating_add(T::DbWeight::get().writes(6_u64))
 	}
 	/// Storage: `Stableswap::AssetTradability` (r:1 w:0)
 	/// Proof: `Stableswap::AssetTradability` (`max_values`: None, `max_size`: Some(41), added: 2516, mode: `MaxEncodedLen`)
@@ -151,12 +158,12 @@ impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
 	/// Proof: `MultiTransactionPayment::AccountCurrencyMap` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
 	fn remove_liquidity_one_asset() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3231`
+		//  Measured:  `3363`
 		//  Estimated: `19071`
-		// Minimum execution time: 807_519_000 picoseconds.
-		Weight::from_parts(811_614_000, 19071)
-			.saturating_add(T::DbWeight::get().reads(22))
-			.saturating_add(T::DbWeight::get().writes(7))
+		// Minimum execution time: 921_757_000 picoseconds.
+		Weight::from_parts(924_632_000, 19071)
+			.saturating_add(T::DbWeight::get().reads(22_u64))
+			.saturating_add(T::DbWeight::get().writes(7_u64))
 	}
 	/// Storage: `Stableswap::AssetTradability` (r:1 w:0)
 	/// Proof: `Stableswap::AssetTradability` (`max_values`: None, `max_size`: Some(41), added: 2516, mode: `MaxEncodedLen`)
@@ -182,12 +189,12 @@ impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
 	/// Proof: `EmaOracle::Accumulator` (`max_values`: Some(1), `max_size`: Some(5921), added: 6416, mode: `MaxEncodedLen`)
 	fn withdraw_asset_amount() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3231`
+		//  Measured:  `3363`
 		//  Estimated: `19071`
-		// Minimum execution time: 1_061_520_000 picoseconds.
-		Weight::from_parts(1_068_689_000, 19071)
-			.saturating_add(T::DbWeight::get().reads(23))
-			.saturating_add(T::DbWeight::get().writes(6))
+		// Minimum execution time: 1_266_805_000 picoseconds.
+		Weight::from_parts(1_272_407_000, 19071)
+			.saturating_add(T::DbWeight::get().reads(23_u64))
+			.saturating_add(T::DbWeight::get().writes(6_u64))
 	}
 	/// Storage: `Stableswap::AssetTradability` (r:2 w:0)
 	/// Proof: `Stableswap::AssetTradability` (`max_values`: None, `max_size`: Some(41), added: 2516, mode: `MaxEncodedLen`)
@@ -195,7 +202,7 @@ impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
 	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
 	/// Storage: `Stableswap::Pools` (r:1 w:0)
 	/// Proof: `Stableswap::Pools` (`max_values`: None, `max_size`: Some(57), added: 2532, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:5 w:0)
+	/// Storage: `AssetRegistry::Assets` (r:6 w:0)
 	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
 	/// Storage: `Duster::AccountBlacklist` (r:2 w:0)
 	/// Proof: `Duster::AccountBlacklist` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
@@ -213,12 +220,12 @@ impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
 	/// Proof: `MultiTransactionPayment::AccountCurrencyMap` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
 	fn sell() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3269`
+		//  Measured:  `3426`
 		//  Estimated: `19071`
-		// Minimum execution time: 767_301_000 picoseconds.
-		Weight::from_parts(771_963_000, 19071)
-			.saturating_add(T::DbWeight::get().reads(24))
-			.saturating_add(T::DbWeight::get().writes(7))
+		// Minimum execution time: 863_718_000 picoseconds.
+		Weight::from_parts(866_668_000, 19071)
+			.saturating_add(T::DbWeight::get().reads(25_u64))
+			.saturating_add(T::DbWeight::get().writes(7_u64))
 	}
 	/// Storage: `Stableswap::AssetTradability` (r:2 w:0)
 	/// Proof: `Stableswap::AssetTradability` (`max_values`: None, `max_size`: Some(41), added: 2516, mode: `MaxEncodedLen`)
@@ -226,7 +233,7 @@ impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
 	/// Proof: `Stableswap::Pools` (`max_values`: None, `max_size`: Some(57), added: 2532, mode: `MaxEncodedLen`)
 	/// Storage: `Tokens::Accounts` (r:7 w:4)
 	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:5 w:0)
+	/// Storage: `AssetRegistry::Assets` (r:6 w:0)
 	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
 	/// Storage: `Duster::AccountBlacklist` (r:2 w:0)
 	/// Proof: `Duster::AccountBlacklist` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
@@ -244,12 +251,12 @@ impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
 	/// Proof: `EmaOracle::Accumulator` (`max_values`: Some(1), `max_size`: Some(5921), added: 6416, mode: `MaxEncodedLen`)
 	fn buy() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3239`
+		//  Measured:  `3396`
 		//  Estimated: `19071`
-		// Minimum execution time: 745_716_000 picoseconds.
-		Weight::from_parts(748_811_000, 19071)
-			.saturating_add(T::DbWeight::get().reads(25))
-			.saturating_add(T::DbWeight::get().writes(6))
+		// Minimum execution time: 846_241_000 picoseconds.
+		Weight::from_parts(850_907_000, 19071)
+			.saturating_add(T::DbWeight::get().reads(26_u64))
+			.saturating_add(T::DbWeight::get().writes(6_u64))
 	}
 	/// Storage: `Stableswap::Pools` (r:1 w:0)
 	/// Proof: `Stableswap::Pools` (`max_values`: None, `max_size`: Some(57), added: 2532, mode: `MaxEncodedLen`)
@@ -259,10 +266,10 @@ impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `291`
 		//  Estimated: `3522`
-		// Minimum execution time: 25_044_000 picoseconds.
-		Weight::from_parts(25_584_000, 3522)
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
+		// Minimum execution time: 20_725_000 picoseconds.
+		Weight::from_parts(21_012_000, 3522)
+			.saturating_add(T::DbWeight::get().reads(2_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	/// Storage: `Stableswap::Pools` (r:1 w:1)
 	/// Proof: `Stableswap::Pools` (`max_values`: None, `max_size`: Some(57), added: 2532, mode: `MaxEncodedLen`)
@@ -270,10 +277,10 @@ impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `291`
 		//  Estimated: `3522`
-		// Minimum execution time: 22_703_000 picoseconds.
-		Weight::from_parts(23_093_000, 3522)
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
+		// Minimum execution time: 18_190_000 picoseconds.
+		Weight::from_parts(18_524_000, 3522)
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	/// Storage: `Stableswap::Pools` (r:1 w:1)
 	/// Proof: `Stableswap::Pools` (`max_values`: None, `max_size`: Some(57), added: 2532, mode: `MaxEncodedLen`)
@@ -281,16 +288,16 @@ impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `291`
 		//  Estimated: `3522`
-		// Minimum execution time: 24_632_000 picoseconds.
-		Weight::from_parts(24_919_000, 3522)
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
+		// Minimum execution time: 19_133_000 picoseconds.
+		Weight::from_parts(19_315_000, 3522)
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	/// Storage: `Stableswap::Pools` (r:1 w:0)
 	/// Proof: `Stableswap::Pools` (`max_values`: None, `max_size`: Some(57), added: 2532, mode: `MaxEncodedLen`)
 	/// Storage: `Tokens::Accounts` (r:7 w:4)
 	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:5 w:0)
+	/// Storage: `AssetRegistry::Assets` (r:6 w:0)
 	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
 	/// Storage: `Stableswap::AssetTradability` (r:2 w:0)
 	/// Proof: `Stableswap::AssetTradability` (`max_values`: None, `max_size`: Some(41), added: 2516, mode: `MaxEncodedLen`)
@@ -310,24 +317,26 @@ impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
 	/// Proof: `MultiTransactionPayment::AccountCurrencyMap` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
 	/// The range of component `c` is `[1, 2]`.
 	/// The range of component `e` is `[0, 1]`.
-	fn router_execution_sell(_c: u32, e: u32, ) -> Weight {
+	fn router_execution_sell(c: u32, e: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1555 + e * (1714 ±0)`
-		//  Estimated: `13990 + e * (5797 ±245_709_589_663_843_264)`
-		// Minimum execution time: 314_654_000 picoseconds.
-		Weight::from_parts(321_208_138, 13990)
-			// Standard Error: 305_814
-			.saturating_add(Weight::from_parts(731_985_555, 0).saturating_mul(e.into()))
-			.saturating_add(T::DbWeight::get().reads(11))
-			.saturating_add(T::DbWeight::get().reads((13_u64).saturating_mul(e.into())))
+		//  Measured:  `1621 + e * (1805 ±0)`
+		//  Estimated: `13990 + e * (5166 ±0)`
+		// Minimum execution time: 376_396_000 picoseconds.
+		Weight::from_parts(353_453_826, 13990)
+			// Standard Error: 838_992
+			.saturating_add(Weight::from_parts(12_974_831, 0).saturating_mul(c.into()))
+			// Standard Error: 838_992
+			.saturating_add(Weight::from_parts(852_434_060, 0).saturating_mul(e.into()))
+			.saturating_add(T::DbWeight::get().reads(11_u64))
+			.saturating_add(T::DbWeight::get().reads((14_u64).saturating_mul(e.into())))
 			.saturating_add(T::DbWeight::get().writes((7_u64).saturating_mul(e.into())))
-			.saturating_add(Weight::from_parts(0, 5797).saturating_mul(e.into()))
+			.saturating_add(Weight::from_parts(0, 5166).saturating_mul(e.into()))
 	}
 	/// Storage: `Stableswap::Pools` (r:1 w:0)
 	/// Proof: `Stableswap::Pools` (`max_values`: None, `max_size`: Some(57), added: 2532, mode: `MaxEncodedLen`)
 	/// Storage: `Tokens::Accounts` (r:7 w:4)
 	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:5 w:0)
+	/// Storage: `AssetRegistry::Assets` (r:6 w:0)
 	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
 	/// Storage: `Stableswap::AssetTradability` (r:2 w:0)
 	/// Proof: `Stableswap::AssetTradability` (`max_values`: None, `max_size`: Some(41), added: 2516, mode: `MaxEncodedLen`)
@@ -349,17 +358,17 @@ impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
 	/// The range of component `e` is `[0, 1]`.
 	fn router_execution_buy(c: u32, e: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1554 + e * (1685 ±0)`
-		//  Estimated: `13990 + e * (5797 ±201_913_854_157_949_888)`
-		// Minimum execution time: 312_997_000 picoseconds.
-		Weight::from_parts(314_359_000, 13990)
-			// Standard Error: 3_248_945
-			.saturating_add(Weight::from_parts(12_345_948, 0).saturating_mul(c.into()))
-			// Standard Error: 7_132_362
-			.saturating_add(Weight::from_parts(468_057_036, 0).saturating_mul(e.into()))
-			.saturating_add(T::DbWeight::get().reads(11))
-			.saturating_add(T::DbWeight::get().reads((14_u64).saturating_mul(e.into())))
+		//  Measured:  `1620 + e * (1776 ±0)`
+		//  Estimated: `13990 + e * (5166 ±0)`
+		// Minimum execution time: 375_050_000 picoseconds.
+		Weight::from_parts(376_366_000, 13990)
+			// Standard Error: 1_073_561
+			.saturating_add(Weight::from_parts(3_994_783, 0).saturating_mul(c.into()))
+			// Standard Error: 2_391_123
+			.saturating_add(Weight::from_parts(488_537_240, 0).saturating_mul(e.into()))
+			.saturating_add(T::DbWeight::get().reads(11_u64))
+			.saturating_add(T::DbWeight::get().reads((15_u64).saturating_mul(e.into())))
 			.saturating_add(T::DbWeight::get().writes((6_u64).saturating_mul(e.into())))
-			.saturating_add(Weight::from_parts(0, 5797).saturating_mul(e.into()))
+			.saturating_add(Weight::from_parts(0, 5166).saturating_mul(e.into()))
 	}
-}
+}
\ No newline at end of file
diff --git a/runtime/hydradx/src/weights/staking.rs b/runtime/hydradx/src/weights/pallet_staking.rs
similarity index 85%
rename from runtime/hydradx/src/weights/staking.rs
rename to runtime/hydradx/src/weights/pallet_staking.rs
index aaa45c247..76fe85383 100644
--- a/runtime/hydradx/src/weights/staking.rs
+++ b/runtime/hydradx/src/weights/pallet_staking.rs
@@ -15,39 +15,41 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+
 //! Autogenerated weights for `pallet_staking`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-05-28, STEPS: `5`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-05-29, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: 1024
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
 
 // Executed Command:
 // target/release/hydradx
 // benchmark
 // pallet
-// --pallet=pallet-staking
+// --chain=dev
+// --steps=10
+// --repeat=30
 // --wasm-execution=compiled
 // --heap-pages=4096
-// --chain=dev
+// --template=scripts/pallet-weight-template.hbs
+// --pallet=pallet-staking
+// --output=weights/staking.rs
 // --extrinsic=*
-// --steps=5
-// --repeat=20
-// --output
-// staking.rs
-// --template
-// .maintain/pallet-weight-template-no-back.hbs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
 #![allow(missing_docs)]
 
-use frame_support::{traits::Get, weights::Weight};
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
 use core::marker::PhantomData;
 
-/// Weight functions for `pallet_staking`.
+/// Weights for `pallet_staking`.
+pub struct WeightInfo<T>(PhantomData<T>);
+
+/// Weights for `pallet_staking` using the HydraDX node and recommended hardware.
 pub struct HydraWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> pallet_staking::WeightInfo for HydraWeight<T> {
 	/// Storage: `Staking::Staking` (r:1 w:1)
@@ -62,10 +64,10 @@ impl<T: frame_system::Config> pallet_staking::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `516`
 		//  Estimated: `3655`
-		// Minimum execution time: 44_025_000 picoseconds.
-		Weight::from_parts(44_526_000, 3655)
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(3))
+		// Minimum execution time: 34_969_000 picoseconds.
+		Weight::from_parts(35_577_000, 3655)
+			.saturating_add(T::DbWeight::get().reads(3_u64))
+			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
 	/// Storage: `Staking::Staking` (r:1 w:1)
 	/// Proof: `Staking::Staking` (`max_values`: Some(1), `max_size`: Some(48), added: 543, mode: `MaxEncodedLen`)
@@ -91,10 +93,10 @@ impl<T: frame_system::Config> pallet_staking::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `1274`
 		//  Estimated: `6196`
-		// Minimum execution time: 107_700_000 picoseconds.
-		Weight::from_parts(108_591_000, 6196)
-			.saturating_add(T::DbWeight::get().reads(10))
-			.saturating_add(T::DbWeight::get().writes(8))
+		// Minimum execution time: 89_837_000 picoseconds.
+		Weight::from_parts(90_522_000, 6196)
+			.saturating_add(T::DbWeight::get().reads(10_u64))
+			.saturating_add(T::DbWeight::get().writes(8_u64))
 	}
 	/// Storage: `Staking::Staking` (r:1 w:1)
 	/// Proof: `Staking::Staking` (`max_values`: Some(1), `max_size`: Some(48), added: 543, mode: `MaxEncodedLen`)
@@ -118,10 +120,10 @@ impl<T: frame_system::Config> pallet_staking::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `3379`
 		//  Estimated: `268590`
-		// Minimum execution time: 278_610_000 picoseconds.
-		Weight::from_parts(281_290_000, 268590)
-			.saturating_add(T::DbWeight::get().reads(109))
-			.saturating_add(T::DbWeight::get().writes(6))
+		// Minimum execution time: 260_523_000 picoseconds.
+		Weight::from_parts(264_621_000, 268590)
+			.saturating_add(T::DbWeight::get().reads(109_u64))
+			.saturating_add(T::DbWeight::get().writes(6_u64))
 	}
 	/// Storage: `Staking::Staking` (r:1 w:1)
 	/// Proof: `Staking::Staking` (`max_values`: Some(1), `max_size`: Some(48), added: 543, mode: `MaxEncodedLen`)
@@ -145,10 +147,10 @@ impl<T: frame_system::Config> pallet_staking::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `3379`
 		//  Estimated: `268590`
-		// Minimum execution time: 271_066_000 picoseconds.
-		Weight::from_parts(273_326_000, 268590)
-			.saturating_add(T::DbWeight::get().reads(109))
-			.saturating_add(T::DbWeight::get().writes(6))
+		// Minimum execution time: 256_924_000 picoseconds.
+		Weight::from_parts(260_188_000, 268590)
+			.saturating_add(T::DbWeight::get().reads(109_u64))
+			.saturating_add(T::DbWeight::get().writes(6_u64))
 	}
 	/// Storage: `Staking::Staking` (r:1 w:1)
 	/// Proof: `Staking::Staking` (`max_values`: Some(1), `max_size`: Some(48), added: 543, mode: `MaxEncodedLen`)
@@ -176,9 +178,9 @@ impl<T: frame_system::Config> pallet_staking::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `1431`
 		//  Estimated: `6196`
-		// Minimum execution time: 160_374_000 picoseconds.
-		Weight::from_parts(161_515_000, 6196)
-			.saturating_add(T::DbWeight::get().reads(10))
-			.saturating_add(T::DbWeight::get().writes(10))
+		// Minimum execution time: 136_034_000 picoseconds.
+		Weight::from_parts(137_189_000, 6196)
+			.saturating_add(T::DbWeight::get().reads(10_u64))
+			.saturating_add(T::DbWeight::get().writes(10_u64))
 	}
 }
\ No newline at end of file
diff --git a/runtime/hydradx/src/weights/state_trie.rs b/runtime/hydradx/src/weights/pallet_state_trie_migration.rs
similarity index 53%
rename from runtime/hydradx/src/weights/state_trie.rs
rename to runtime/hydradx/src/weights/pallet_state_trie_migration.rs
index 6320cb122..8e03f10af 100644
--- a/runtime/hydradx/src/weights/state_trie.rs
+++ b/runtime/hydradx/src/weights/pallet_state_trie_migration.rs
@@ -15,111 +15,132 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+
 //! Autogenerated weights for `pallet_state_trie_migration`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-01-26, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-05-23, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024`
 
 // Executed Command:
-// target/release/hydradx
+// ./target/release/hydradx
 // benchmark
 // pallet
-// --chain=dev
-// --steps=10
-// --repeat=30
 // --wasm-execution=compiled
-// --heap-pages=4096
-// --template=.maintain/pallet-weight-template-no-back.hbs
-// --pallet=pallet-state-trie-migration
-// --output=weights-1.1.0/state_trie.rs
-// --extrinsic=*
+// --pallet
+// *
+// --extrinsic
+// *
+// --heap-pages
+// 4096
+// --steps
+// 50
+// --repeat
+// 20
+// --template=scripts/pallet-weight-template.hbs
+// --output
+// weights/
 
+#![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
-#![allow(clippy::unnecessary_cast)]
+#![allow(missing_docs)]
 
-use frame_support::{traits::Get, weights::Weight};
-use sp_std::marker::PhantomData;
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
+use core::marker::PhantomData;
 
-use pallet_state_trie_migration::weights::WeightInfo;
+/// Weights for `pallet_state_trie_migration`.
+pub struct WeightInfo<T>(PhantomData<T>);
 
 /// Weights for `pallet_state_trie_migration` using the HydraDX node and recommended hardware.
 pub struct HydraWeight<T>(PhantomData<T>);
-impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
+impl<T: frame_system::Config> pallet_state_trie_migration::WeightInfo for HydraWeight<T> {
 	/// Storage: `StateTrieMigration::SignedMigrationMaxLimits` (r:1 w:0)
 	/// Proof: `StateTrieMigration::SignedMigrationMaxLimits` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Holds` (r:1 w:0)
+	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(85), added: 2560, mode: `MaxEncodedLen`)
 	/// Storage: `StateTrieMigration::MigrationProcess` (r:1 w:1)
 	/// Proof: `StateTrieMigration::MigrationProcess` (`max_values`: Some(1), `max_size`: Some(1042), added: 1537, mode: `MaxEncodedLen`)
 	fn continue_migrate() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `141`
-		//  Estimated: `2527`
-		// Minimum execution time: 23_654_000 picoseconds.
-		Weight::from_parts(24_101_000, 2527)
-			.saturating_add(T::DbWeight::get().reads(2_u64))
+		//  Measured:  `174`
+		//  Estimated: `3550`
+		// Minimum execution time: 24_739_000 picoseconds.
+		Weight::from_parts(25_378_000, 3550)
+			.saturating_add(T::DbWeight::get().reads(3_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	/// Storage: `StateTrieMigration::SignedMigrationMaxLimits` (r:1 w:0)
 	/// Proof: `StateTrieMigration::SignedMigrationMaxLimits` (`max_values`: Some(1), `max_size`: Some(8), added: 503, mode: `MaxEncodedLen`)
 	fn continue_migrate_wrong_witness() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `109`
+		//  Measured:  `142`
 		//  Estimated: `1493`
-		// Minimum execution time: 7_170_000 picoseconds.
-		Weight::from_parts(7_487_000, 1493).saturating_add(T::DbWeight::get().reads(1_u64))
+		// Minimum execution time: 5_190_000 picoseconds.
+		Weight::from_parts(5_356_000, 1493)
+			.saturating_add(T::DbWeight::get().reads(1_u64))
 	}
+	/// Storage: `Balances::Holds` (r:1 w:0)
+	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(85), added: 2560, mode: `MaxEncodedLen`)
 	fn migrate_custom_top_success() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 13_335_000 picoseconds.
-		Weight::from_parts(13_596_000, 0)
+		//  Estimated: `3550`
+		// Minimum execution time: 14_750_000 picoseconds.
+		Weight::from_parts(14_989_000, 3550)
+			.saturating_add(T::DbWeight::get().reads(1_u64))
 	}
+	/// Storage: `Balances::Holds` (r:1 w:1)
+	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(85), added: 2560, mode: `MaxEncodedLen`)
 	/// Storage: UNKNOWN KEY `0x666f6f` (r:1 w:1)
 	/// Proof: UNKNOWN KEY `0x666f6f` (r:1 w:1)
 	fn migrate_custom_top_fail() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `146`
-		//  Estimated: `3611`
-		// Minimum execution time: 40_202_000 picoseconds.
-		Weight::from_parts(40_793_000, 3611)
-			.saturating_add(T::DbWeight::get().reads(1_u64))
-			.saturating_add(T::DbWeight::get().writes(1_u64))
+		//  Measured:  `179`
+		//  Estimated: `3644`
+		// Minimum execution time: 76_510_000 picoseconds.
+		Weight::from_parts(77_694_000, 3644)
+			.saturating_add(T::DbWeight::get().reads(2_u64))
+			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
+	/// Storage: `Balances::Holds` (r:1 w:0)
+	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(85), added: 2560, mode: `MaxEncodedLen`)
 	fn migrate_custom_child_success() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 13_441_000 picoseconds.
-		Weight::from_parts(13_910_000, 0)
+		//  Estimated: `3550`
+		// Minimum execution time: 15_002_000 picoseconds.
+		Weight::from_parts(15_332_000, 3550)
+			.saturating_add(T::DbWeight::get().reads(1_u64))
 	}
+	/// Storage: `Balances::Holds` (r:1 w:1)
+	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(85), added: 2560, mode: `MaxEncodedLen`)
 	/// Storage: UNKNOWN KEY `0x666f6f` (r:1 w:1)
 	/// Proof: UNKNOWN KEY `0x666f6f` (r:1 w:1)
 	fn migrate_custom_child_fail() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `106`
 		//  Estimated: `3571`
-		// Minimum execution time: 39_284_000 picoseconds.
-		Weight::from_parts(39_823_000, 3571)
-			.saturating_add(T::DbWeight::get().reads(1_u64))
-			.saturating_add(T::DbWeight::get().writes(1_u64))
+		// Minimum execution time: 78_788_000 picoseconds.
+		Weight::from_parts(79_332_000, 3571)
+			.saturating_add(T::DbWeight::get().reads(2_u64))
+			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
 	/// Storage: UNKNOWN KEY `0x6b6579` (r:1 w:1)
 	/// Proof: UNKNOWN KEY `0x6b6579` (r:1 w:1)
 	/// The range of component `v` is `[1, 4194304]`.
-	fn process_top_key(v: u32) -> Weight {
+	fn process_top_key(v: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `262 + v * (1 ±0)`
-		//  Estimated: `3725 + v * (1 ±0)`
-		// Minimum execution time: 6_940_000 picoseconds.
-		Weight::from_parts(7_084_000, 3725)
-			// Standard Error: 2
-			.saturating_add(Weight::from_parts(1_372, 0).saturating_mul(v.into()))
+		//  Measured:  `295 + v * (1 ±0)`
+		//  Estimated: `3760 + v * (1 ±0)`
+		// Minimum execution time: 6_272_000 picoseconds.
+		Weight::from_parts(6_354_000, 3760)
+			// Standard Error: 5
+			.saturating_add(Weight::from_parts(1_777, 0).saturating_mul(v.into()))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 			.saturating_add(Weight::from_parts(0, 1).saturating_mul(v.into()))
 	}
-}
+}
\ No newline at end of file
diff --git a/runtime/hydradx/src/weights/timestamp.rs b/runtime/hydradx/src/weights/pallet_timestamp.rs
similarity index 65%
rename from runtime/hydradx/src/weights/timestamp.rs
rename to runtime/hydradx/src/weights/pallet_timestamp.rs
index 07f6fac65..d53aace17 100644
--- a/runtime/hydradx/src/weights/timestamp.rs
+++ b/runtime/hydradx/src/weights/pallet_timestamp.rs
@@ -15,37 +15,46 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+
 //! Autogenerated weights for `pallet_timestamp`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-02-15, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-05-23, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: 1024
+//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024`
 
 // Executed Command:
-// target/release/hydradx
+// ./target/release/hydradx
 // benchmark
 // pallet
-// --chain=dev
-// --steps=10
-// --repeat=30
 // --wasm-execution=compiled
-// --heap-pages=4096
-// --template=.maintain/pallet-weight-template-no-back.hbs
-// --pallet=pallet_timestamp
-// --output=./weights/timestamp.rs
-// --extrinsic=*
+// --pallet
+// *
+// --extrinsic
+// *
+// --heap-pages
+// 4096
+// --steps
+// 50
+// --repeat
+// 20
+// --template=scripts/pallet-weight-template.hbs
+// --output
+// weights/
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
 #![allow(missing_docs)]
 
-use frame_support::{traits::Get, weights::Weight};
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
 use core::marker::PhantomData;
 
-/// Weight functions for `pallet_timestamp`.
+/// Weights for `pallet_timestamp`.
+pub struct WeightInfo<T>(PhantomData<T>);
+
+/// Weights for `pallet_timestamp` using the HydraDX node and recommended hardware.
 pub struct HydraWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> pallet_timestamp::WeightInfo for HydraWeight<T> {
 	/// Storage: `Timestamp::Now` (r:1 w:1)
@@ -54,16 +63,16 @@ impl<T: frame_system::Config> pallet_timestamp::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `42`
 		//  Estimated: `1493`
-		// Minimum execution time: 9_400_000 picoseconds.
-		Weight::from_parts(9_641_000, 1493)
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
+		// Minimum execution time: 6_253_000 picoseconds.
+		Weight::from_parts(6_598_000, 1493)
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	fn on_finalize() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `94`
 		//  Estimated: `0`
-		// Minimum execution time: 4_863_000 picoseconds.
-		Weight::from_parts(5_000_000, 0)
+		// Minimum execution time: 3_659_000 picoseconds.
+		Weight::from_parts(3_726_000, 0)
 	}
 }
\ No newline at end of file
diff --git a/runtime/hydradx/src/weights/tips.rs b/runtime/hydradx/src/weights/pallet_tips.rs
similarity index 64%
rename from runtime/hydradx/src/weights/tips.rs
rename to runtime/hydradx/src/weights/pallet_tips.rs
index 0fb0fe607..0a255e8e1 100644
--- a/runtime/hydradx/src/weights/tips.rs
+++ b/runtime/hydradx/src/weights/pallet_tips.rs
@@ -15,37 +15,46 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+
 //! Autogenerated weights for `pallet_tips`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-02-23, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-05-23, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: 1024
+//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024`
 
 // Executed Command:
-// target/release/hydradx
+// ./target/release/hydradx
 // benchmark
 // pallet
-// --chain=dev
-// --steps=10
-// --repeat=30
 // --wasm-execution=compiled
-// --heap-pages=4096
-// --template=.maintain/pallet-weight-template-no-back.hbs
-// --pallet=pallet-tips
-// --output=weights-1.1.0/tips.rs
-// --extrinsic=*
+// --pallet
+// *
+// --extrinsic
+// *
+// --heap-pages
+// 4096
+// --steps
+// 50
+// --repeat
+// 20
+// --template=scripts/pallet-weight-template.hbs
+// --output
+// weights/
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
 #![allow(missing_docs)]
 
-use frame_support::{traits::Get, weights::Weight};
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
 use core::marker::PhantomData;
 
-/// Weight functions for `pallet_tips`.
+/// Weights for `pallet_tips`.
+pub struct WeightInfo<T>(PhantomData<T>);
+
+/// Weights for `pallet_tips` using the HydraDX node and recommended hardware.
 pub struct HydraWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> pallet_tips::WeightInfo for HydraWeight<T> {
 	/// Storage: `Tips::Reasons` (r:1 w:1)
@@ -57,12 +66,12 @@ impl<T: frame_system::Config> pallet_tips::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `42`
 		//  Estimated: `3507`
-		// Minimum execution time: 42_222_000 picoseconds.
-		Weight::from_parts(43_017_038, 3507)
-			// Standard Error: 67
-			.saturating_add(Weight::from_parts(1_804, 0).saturating_mul(r.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
+		// Minimum execution time: 34_160_000 picoseconds.
+		Weight::from_parts(34_779_615, 3507)
+			// Standard Error: 31
+			.saturating_add(Weight::from_parts(1_854, 0).saturating_mul(r.into()))
+			.saturating_add(T::DbWeight::get().reads(2_u64))
+			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
 	/// Storage: `Tips::Tips` (r:1 w:1)
 	/// Proof: `Tips::Tips` (`max_values`: None, `max_size`: None, mode: `Measured`)
@@ -72,10 +81,10 @@ impl<T: frame_system::Config> pallet_tips::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `259`
 		//  Estimated: `3724`
-		// Minimum execution time: 39_351_000 picoseconds.
-		Weight::from_parts(39_842_000, 3724)
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(2))
+		// Minimum execution time: 32_135_000 picoseconds.
+		Weight::from_parts(32_556_000, 3724)
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
 	/// Storage: `Elections::Members` (r:1 w:0)
 	/// Proof: `Elections::Members` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
@@ -89,14 +98,14 @@ impl<T: frame_system::Config> pallet_tips::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `438 + t * (64 ±0)`
 		//  Estimated: `3903 + t * (64 ±0)`
-		// Minimum execution time: 27_937_000 picoseconds.
-		Weight::from_parts(28_197_538, 3903)
-			// Standard Error: 46
-			.saturating_add(Weight::from_parts(1_523, 0).saturating_mul(r.into()))
-			// Standard Error: 3_893
-			.saturating_add(Weight::from_parts(35_746, 0).saturating_mul(t.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
+		// Minimum execution time: 22_419_000 picoseconds.
+		Weight::from_parts(22_904_326, 3903)
+			// Standard Error: 21
+			.saturating_add(Weight::from_parts(1_466, 0).saturating_mul(r.into()))
+			// Standard Error: 1_777
+			.saturating_add(Weight::from_parts(23_466, 0).saturating_mul(t.into()))
+			.saturating_add(T::DbWeight::get().reads(2_u64))
+			.saturating_add(T::DbWeight::get().writes(2_u64))
 			.saturating_add(Weight::from_parts(0, 64).saturating_mul(t.into()))
 	}
 	/// Storage: `Elections::Members` (r:1 w:0)
@@ -108,12 +117,12 @@ impl<T: frame_system::Config> pallet_tips::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `659 + t * (112 ±0)`
 		//  Estimated: `4124 + t * (112 ±0)`
-		// Minimum execution time: 21_986_000 picoseconds.
-		Weight::from_parts(22_229_525, 4124)
-			// Standard Error: 2_907
-			.saturating_add(Weight::from_parts(175_185, 0).saturating_mul(t.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
+		// Minimum execution time: 18_422_000 picoseconds.
+		Weight::from_parts(18_783_121, 4124)
+			// Standard Error: 2_372
+			.saturating_add(Weight::from_parts(185_984, 0).saturating_mul(t.into()))
+			.saturating_add(T::DbWeight::get().reads(2_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
 			.saturating_add(Weight::from_parts(0, 112).saturating_mul(t.into()))
 	}
 	/// Storage: `Tips::Tips` (r:1 w:1)
@@ -128,14 +137,14 @@ impl<T: frame_system::Config> pallet_tips::WeightInfo for HydraWeight<T> {
 	fn close_tip(t: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `801 + t * (112 ±0)`
-		//  Estimated: `6196 + t * (110 ±0)`
-		// Minimum execution time: 84_369_000 picoseconds.
-		Weight::from_parts(85_179_519, 6196)
-			// Standard Error: 11_612
-			.saturating_add(Weight::from_parts(168_131, 0).saturating_mul(t.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(4))
-			.saturating_add(Weight::from_parts(0, 110).saturating_mul(t.into()))
+		//  Estimated: `6196 + t * (112 ±0)`
+		// Minimum execution time: 66_434_000 picoseconds.
+		Weight::from_parts(67_523_302, 6196)
+			// Standard Error: 5_956
+			.saturating_add(Weight::from_parts(170_435, 0).saturating_mul(t.into()))
+			.saturating_add(T::DbWeight::get().reads(4_u64))
+			.saturating_add(T::DbWeight::get().writes(4_u64))
+			.saturating_add(Weight::from_parts(0, 112).saturating_mul(t.into()))
 	}
 	/// Storage: `Tips::Tips` (r:1 w:1)
 	/// Proof: `Tips::Tips` (`max_values`: None, `max_size`: None, mode: `Measured`)
@@ -146,11 +155,11 @@ impl<T: frame_system::Config> pallet_tips::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `307`
 		//  Estimated: `3772`
-		// Minimum execution time: 20_933_000 picoseconds.
-		Weight::from_parts(21_193_736, 3772)
-			// Standard Error: 1_766
-			.saturating_add(Weight::from_parts(18_154, 0).saturating_mul(t.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(2))
+		// Minimum execution time: 16_734_000 picoseconds.
+		Weight::from_parts(17_127_713, 3772)
+			// Standard Error: 1_067
+			.saturating_add(Weight::from_parts(5_614, 0).saturating_mul(t.into()))
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
 }
\ No newline at end of file
diff --git a/runtime/hydradx/src/weights/payment.rs b/runtime/hydradx/src/weights/pallet_transaction_multi_payment.rs
similarity index 64%
rename from runtime/hydradx/src/weights/payment.rs
rename to runtime/hydradx/src/weights/pallet_transaction_multi_payment.rs
index ea5ffdff8..65f273132 100644
--- a/runtime/hydradx/src/weights/payment.rs
+++ b/runtime/hydradx/src/weights/pallet_transaction_multi_payment.rs
@@ -1,6 +1,6 @@
 // This file is part of HydraDX.
 
-// Copyright (C) 2020-2024  Intergalactic, Limited (GIB).
+// Copyright (C) 2020-2023  Intergalactic, Limited (GIB).
 // SPDX-License-Identifier: Apache-2.0
 
 // Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,62 +15,69 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+
 //! Autogenerated weights for `pallet_transaction_multi_payment`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-03-17, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-05-23, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: 1024
+//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024`
 
 // Executed Command:
-// target/release/hydradx
+// ./target/release/hydradx
 // benchmark
 // pallet
-// --chain=dev
-// --steps=10
-// --repeat=30
 // --wasm-execution=compiled
-// --heap-pages=4096
-// --template=.maintain/pallet-weight-template-no-back.hbs
-// --pallet=pallet-transaction-multi-payment
-// --output=weights-1.1.0/payment.rs
-// --extrinsic=*
+// --pallet
+// *
+// --extrinsic
+// *
+// --heap-pages
+// 4096
+// --steps
+// 50
+// --repeat
+// 20
+// --template=scripts/pallet-weight-template.hbs
+// --output
+// weights/
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
 #![allow(missing_docs)]
 
-use frame_support::{traits::Get, weights::Weight};
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
 use core::marker::PhantomData;
 
-use pallet_transaction_multi_payment::weights::WeightInfo;
+/// Weights for `pallet_transaction_multi_payment`.
+pub struct WeightInfo<T>(PhantomData<T>);
 
-/// Weight functions for `pallet_transaction_multi_payment`.
+/// Weights for `pallet_transaction_multi_payment` using the HydraDX node and recommended hardware.
 pub struct HydraWeight<T>(PhantomData<T>);
-impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
+impl<T: frame_system::Config> pallet_transaction_multi_payment::WeightInfo for HydraWeight<T> {
 	/// Storage: `MultiTransactionPayment::AcceptedCurrencies` (r:1 w:1)
 	/// Proof: `MultiTransactionPayment::AcceptedCurrencies` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
 	fn add_currency() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1176`
+		//  Measured:  `1180`
 		//  Estimated: `3493`
-		// Minimum execution time: 24_211_000 picoseconds.
-		Weight::from_parts(24_571_000, 3493)
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
+		// Minimum execution time: 19_243_000 picoseconds.
+		Weight::from_parts(19_945_000, 3493)
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	/// Storage: `MultiTransactionPayment::AcceptedCurrencies` (r:1 w:1)
 	/// Proof: `MultiTransactionPayment::AcceptedCurrencies` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
 	fn remove_currency() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1207`
+		//  Measured:  `1211`
 		//  Estimated: `3493`
-		// Minimum execution time: 24_768_000 picoseconds.
-		Weight::from_parts(24_992_000, 3493)
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
+		// Minimum execution time: 20_151_000 picoseconds.
+		Weight::from_parts(20_486_000, 3493)
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	/// Storage: `MultiTransactionPayment::AcceptedCurrencies` (r:1 w:0)
 	/// Proof: `MultiTransactionPayment::AcceptedCurrencies` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
@@ -78,12 +85,12 @@ impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
 	/// Proof: `MultiTransactionPayment::AccountCurrencyMap` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
 	fn set_currency() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1241`
+		//  Measured:  `1245`
 		//  Estimated: `3493`
-		// Minimum execution time: 31_064_000 picoseconds.
-		Weight::from_parts(31_466_000, 3493)
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
+		// Minimum execution time: 24_924_000 picoseconds.
+		Weight::from_parts(25_169_000, 3493)
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	/// Storage: `Router::Routes` (r:1 w:0)
 	/// Proof: `Router::Routes` (`max_values`: None, `max_size`: Some(90), added: 2565, mode: `MaxEncodedLen`)
@@ -91,11 +98,11 @@ impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
 	/// Proof: `EmaOracle::Oracles` (`max_values`: None, `max_size`: Some(177), added: 2652, mode: `MaxEncodedLen`)
 	fn get_oracle_price() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3221`
+		//  Measured:  `3225`
 		//  Estimated: `27510`
-		// Minimum execution time: 94_272_000 picoseconds.
-		Weight::from_parts(95_196_000, 27510)
-			.saturating_add(T::DbWeight::get().reads(11))
+		// Minimum execution time: 89_268_000 picoseconds.
+		Weight::from_parts(90_513_000, 27510)
+			.saturating_add(T::DbWeight::get().reads(11_u64))
 	}
 	/// Storage: `AssetRegistry::NextAssetId` (r:1 w:0)
 	/// Proof: `AssetRegistry::NextAssetId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
@@ -105,11 +112,11 @@ impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
 	/// Proof: `MultiTransactionPayment::AccountCurrencyMap` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
 	fn reset_payment_currency() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1280`
+		//  Measured:  `1317`
 		//  Estimated: `4087`
-		// Minimum execution time: 28_830_000 picoseconds.
-		Weight::from_parts(29_378_000, 4087)
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
+		// Minimum execution time: 22_192_000 picoseconds.
+		Weight::from_parts(22_762_000, 4087)
+			.saturating_add(T::DbWeight::get().reads(2_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-}
+}
\ No newline at end of file
diff --git a/runtime/hydradx/src/weights/transaction_pause.rs b/runtime/hydradx/src/weights/pallet_transaction_pause.rs
similarity index 64%
rename from runtime/hydradx/src/weights/transaction_pause.rs
rename to runtime/hydradx/src/weights/pallet_transaction_pause.rs
index 37995911f..178691fd4 100644
--- a/runtime/hydradx/src/weights/transaction_pause.rs
+++ b/runtime/hydradx/src/weights/pallet_transaction_pause.rs
@@ -15,59 +15,68 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+
 //! Autogenerated weights for `pallet_transaction_pause`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-02-15, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-05-23, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: 1024
+//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024`
 
 // Executed Command:
-// target/release/hydradx
+// ./target/release/hydradx
 // benchmark
 // pallet
-// --chain=dev
-// --steps=10
-// --repeat=30
 // --wasm-execution=compiled
-// --heap-pages=4096
-// --template=.maintain/pallet-weight-template-no-back.hbs
-// --pallet=pallet_transaction_pause
-// --output=./weights/transaction_pause.rs
-// --extrinsic=*
+// --pallet
+// *
+// --extrinsic
+// *
+// --heap-pages
+// 4096
+// --steps
+// 50
+// --repeat
+// 20
+// --template=scripts/pallet-weight-template.hbs
+// --output
+// weights/
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
 #![allow(missing_docs)]
 
-use frame_support::{traits::Get, weights::Weight};
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
 use core::marker::PhantomData;
 
-/// Weight functions for `pallet_transaction_pause`.
+/// Weights for `pallet_transaction_pause`.
+pub struct WeightInfo<T>(PhantomData<T>);
+
+/// Weights for `pallet_transaction_pause` using the HydraDX node and recommended hardware.
 pub struct HydraWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> pallet_transaction_pause::WeightInfo for HydraWeight<T> {
 	/// Storage: `TransactionPause::PausedTransactions` (r:1 w:1)
 	/// Proof: `TransactionPause::PausedTransactions` (`max_values`: None, `max_size`: Some(90), added: 2565, mode: `MaxEncodedLen`)
 	fn pause_transaction() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `147`
+		//  Measured:  `109`
 		//  Estimated: `3555`
-		// Minimum execution time: 16_343_000 picoseconds.
-		Weight::from_parts(16_726_000, 3555)
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
+		// Minimum execution time: 10_806_000 picoseconds.
+		Weight::from_parts(10_995_000, 3555)
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	/// Storage: `TransactionPause::PausedTransactions` (r:1 w:1)
 	/// Proof: `TransactionPause::PausedTransactions` (`max_values`: None, `max_size`: Some(90), added: 2565, mode: `MaxEncodedLen`)
 	fn unpause_transaction() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `198`
+		//  Measured:  `160`
 		//  Estimated: `3555`
-		// Minimum execution time: 17_899_000 picoseconds.
-		Weight::from_parts(18_371_000, 3555)
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
+		// Minimum execution time: 12_641_000 picoseconds.
+		Weight::from_parts(13_122_000, 3555)
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 }
\ No newline at end of file
diff --git a/runtime/hydradx/src/weights/pallet_treasury.rs b/runtime/hydradx/src/weights/pallet_treasury.rs
new file mode 100644
index 000000000..24d51e0a5
--- /dev/null
+++ b/runtime/hydradx/src/weights/pallet_treasury.rs
@@ -0,0 +1,201 @@
+// This file is part of HydraDX.
+
+// Copyright (C) 2020-2023  Intergalactic, Limited (GIB).
+// SPDX-License-Identifier: Apache-2.0
+
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+
+//! Autogenerated weights for `pallet_treasury`
+//!
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-05-23, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! WORST CASE MAP SIZE: `1000000`
+//! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024`
+
+// Executed Command:
+// ./target/release/hydradx
+// benchmark
+// pallet
+// --wasm-execution=compiled
+// --pallet
+// *
+// --extrinsic
+// *
+// --heap-pages
+// 4096
+// --steps
+// 50
+// --repeat
+// 20
+// --template=scripts/pallet-weight-template.hbs
+// --output
+// weights/
+
+#![cfg_attr(rustfmt, rustfmt_skip)]
+#![allow(unused_parens)]
+#![allow(unused_imports)]
+#![allow(missing_docs)]
+
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
+use core::marker::PhantomData;
+
+/// Weights for `pallet_treasury`.
+pub struct WeightInfo<T>(PhantomData<T>);
+
+/// Weights for `pallet_treasury` using the HydraDX node and recommended hardware.
+pub struct HydraWeight<T>(PhantomData<T>);
+impl<T: frame_system::Config> pallet_treasury::WeightInfo for HydraWeight<T> {
+	/// Storage: `Treasury::ProposalCount` (r:1 w:1)
+	/// Proof: `Treasury::ProposalCount` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Treasury::Approvals` (r:1 w:1)
+	/// Proof: `Treasury::Approvals` (`max_values`: Some(1), `max_size`: Some(402), added: 897, mode: `MaxEncodedLen`)
+	/// Storage: `Treasury::Proposals` (r:0 w:1)
+	/// Proof: `Treasury::Proposals` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
+	fn spend_local() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `109`
+		//  Estimated: `1887`
+		// Minimum execution time: 14_347_000 picoseconds.
+		Weight::from_parts(14_682_000, 1887)
+			.saturating_add(T::DbWeight::get().reads(2_u64))
+			.saturating_add(T::DbWeight::get().writes(3_u64))
+	}
+	/// Storage: `Treasury::ProposalCount` (r:1 w:1)
+	/// Proof: `Treasury::ProposalCount` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Treasury::Proposals` (r:0 w:1)
+	/// Proof: `Treasury::Proposals` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
+	fn propose_spend() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `210`
+		//  Estimated: `1489`
+		// Minimum execution time: 29_707_000 picoseconds.
+		Weight::from_parts(30_262_000, 1489)
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().writes(2_u64))
+	}
+	/// Storage: `Treasury::Proposals` (r:1 w:1)
+	/// Proof: `Treasury::Proposals` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:2 w:2)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	fn reject_proposal() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `471`
+		//  Estimated: `6196`
+		// Minimum execution time: 43_672_000 picoseconds.
+		Weight::from_parts(44_114_000, 6196)
+			.saturating_add(T::DbWeight::get().reads(3_u64))
+			.saturating_add(T::DbWeight::get().writes(3_u64))
+	}
+	/// Storage: `Treasury::Proposals` (r:1 w:0)
+	/// Proof: `Treasury::Proposals` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
+	/// Storage: `Treasury::Approvals` (r:1 w:1)
+	/// Proof: `Treasury::Approvals` (`max_values`: Some(1), `max_size`: Some(402), added: 897, mode: `MaxEncodedLen`)
+	/// The range of component `p` is `[0, 99]`.
+	fn approve_proposal(p: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `537 + p * (8 ±0)`
+		//  Estimated: `3573`
+		// Minimum execution time: 11_873_000 picoseconds.
+		Weight::from_parts(15_247_026, 3573)
+			// Standard Error: 986
+			.saturating_add(Weight::from_parts(35_716, 0).saturating_mul(p.into()))
+			.saturating_add(T::DbWeight::get().reads(2_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
+	}
+	/// Storage: `Treasury::Approvals` (r:1 w:1)
+	/// Proof: `Treasury::Approvals` (`max_values`: Some(1), `max_size`: Some(402), added: 897, mode: `MaxEncodedLen`)
+	fn remove_approval() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `194`
+		//  Estimated: `1887`
+		// Minimum execution time: 7_594_000 picoseconds.
+		Weight::from_parts(7_876_000, 1887)
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
+	}
+	/// Storage: `System::Account` (r:199 w:199)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `Treasury::Deactivated` (r:1 w:1)
+	/// Proof: `Treasury::Deactivated` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::InactiveIssuance` (r:1 w:1)
+	/// Proof: `Balances::InactiveIssuance` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
+	/// Storage: `Treasury::Approvals` (r:1 w:1)
+	/// Proof: `Treasury::Approvals` (`max_values`: Some(1), `max_size`: Some(402), added: 897, mode: `MaxEncodedLen`)
+	/// Storage: `Treasury::Proposals` (r:99 w:99)
+	/// Proof: `Treasury::Proposals` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
+	/// The range of component `p` is `[0, 99]`.
+	fn on_initialize_proposals(p: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `375 + p * (253 ±0)`
+		//  Estimated: `3593 + p * (5206 ±0)`
+		// Minimum execution time: 22_846_000 picoseconds.
+		Weight::from_parts(30_925_894, 3593)
+			// Standard Error: 17_594
+			.saturating_add(Weight::from_parts(36_106_995, 0).saturating_mul(p.into()))
+			.saturating_add(T::DbWeight::get().reads(4_u64))
+			.saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(p.into())))
+			.saturating_add(T::DbWeight::get().writes(4_u64))
+			.saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(p.into())))
+			.saturating_add(Weight::from_parts(0, 5206).saturating_mul(p.into()))
+	}
+	/// Storage: `Treasury::SpendCount` (r:1 w:1)
+	/// Proof: `Treasury::SpendCount` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Treasury::Spends` (r:0 w:1)
+	/// Proof: `Treasury::Spends` (`max_values`: None, `max_size`: Some(69), added: 2544, mode: `MaxEncodedLen`)
+	fn spend() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `109`
+		//  Estimated: `1489`
+		// Minimum execution time: 12_454_000 picoseconds.
+		Weight::from_parts(12_784_000, 1489)
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().writes(2_u64))
+	}
+	/// Storage: `Treasury::Spends` (r:1 w:1)
+	/// Proof: `Treasury::Spends` (`max_values`: None, `max_size`: Some(69), added: 2544, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:2 w:2)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	fn payout() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `382`
+		//  Estimated: `6196`
+		// Minimum execution time: 59_855_000 picoseconds.
+		Weight::from_parts(60_501_000, 6196)
+			.saturating_add(T::DbWeight::get().reads(3_u64))
+			.saturating_add(T::DbWeight::get().writes(3_u64))
+	}
+	/// Storage: `Treasury::Spends` (r:1 w:1)
+	/// Proof: `Treasury::Spends` (`max_values`: None, `max_size`: Some(69), added: 2544, mode: `MaxEncodedLen`)
+	fn check_status() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `227`
+		//  Estimated: `3534`
+		// Minimum execution time: 15_984_000 picoseconds.
+		Weight::from_parts(16_232_000, 3534)
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
+	}
+	/// Storage: `Treasury::Spends` (r:1 w:1)
+	/// Proof: `Treasury::Spends` (`max_values`: None, `max_size`: Some(69), added: 2544, mode: `MaxEncodedLen`)
+	fn void_spend() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `227`
+		//  Estimated: `3534`
+		// Minimum execution time: 14_109_000 picoseconds.
+		Weight::from_parts(14_541_000, 3534)
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
+	}
+}
\ No newline at end of file
diff --git a/runtime/hydradx/src/weights/utility.rs b/runtime/hydradx/src/weights/pallet_utility.rs
similarity index 60%
rename from runtime/hydradx/src/weights/utility.rs
rename to runtime/hydradx/src/weights/pallet_utility.rs
index b986763e2..4f0a0fc0c 100644
--- a/runtime/hydradx/src/weights/utility.rs
+++ b/runtime/hydradx/src/weights/pallet_utility.rs
@@ -15,37 +15,46 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+
 //! Autogenerated weights for `pallet_utility`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-02-15, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-05-23, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: 1024
+//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024`
 
 // Executed Command:
-// target/release/hydradx
+// ./target/release/hydradx
 // benchmark
 // pallet
-// --chain=dev
-// --steps=10
-// --repeat=30
 // --wasm-execution=compiled
-// --heap-pages=4096
-// --template=.maintain/pallet-weight-template-no-back.hbs
-// --pallet=pallet_utility
-// --output=./weights/utility.rs
-// --extrinsic=*
+// --pallet
+// *
+// --extrinsic
+// *
+// --heap-pages
+// 4096
+// --steps
+// 50
+// --repeat
+// 20
+// --template=scripts/pallet-weight-template.hbs
+// --output
+// weights/
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
 #![allow(missing_docs)]
 
-use frame_support::{traits::Get, weights::Weight};
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
 use core::marker::PhantomData;
 
-/// Weight functions for `pallet_utility`.
+/// Weights for `pallet_utility`.
+pub struct WeightInfo<T>(PhantomData<T>);
+
+/// Weights for `pallet_utility` using the HydraDX node and recommended hardware.
 pub struct HydraWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> pallet_utility::WeightInfo for HydraWeight<T> {
 	/// The range of component `c` is `[0, 1000]`.
@@ -53,43 +62,43 @@ impl<T: frame_system::Config> pallet_utility::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 10_239_000 picoseconds.
-		Weight::from_parts(9_506_750, 0)
-			// Standard Error: 4_964
-			.saturating_add(Weight::from_parts(6_554_896, 0).saturating_mul(c.into()))
+		// Minimum execution time: 6_513_000 picoseconds.
+		Weight::from_parts(2_561_294, 0)
+			// Standard Error: 2_717
+			.saturating_add(Weight::from_parts(3_594_647, 0).saturating_mul(c.into()))
 	}
 	fn as_derivative() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 7_602_000 picoseconds.
-		Weight::from_parts(7_828_000, 0)
+		// Minimum execution time: 6_469_000 picoseconds.
+		Weight::from_parts(6_636_000, 0)
 	}
 	/// The range of component `c` is `[0, 1000]`.
 	fn batch_all(c: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 10_351_000 picoseconds.
-		Weight::from_parts(19_343_913, 0)
-			// Standard Error: 5_903
-			.saturating_add(Weight::from_parts(6_958_305, 0).saturating_mul(c.into()))
+		// Minimum execution time: 6_539_000 picoseconds.
+		Weight::from_parts(7_618_449, 0)
+			// Standard Error: 2_626
+			.saturating_add(Weight::from_parts(3_897_612, 0).saturating_mul(c.into()))
 	}
 	fn dispatch_as() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 13_448_000 picoseconds.
-		Weight::from_parts(13_627_000, 0)
+		// Minimum execution time: 8_898_000 picoseconds.
+		Weight::from_parts(9_127_000, 0)
 	}
 	/// The range of component `c` is `[0, 1000]`.
 	fn force_batch(c: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 10_282_000 picoseconds.
-		Weight::from_parts(21_770_041, 0)
-			// Standard Error: 6_324
-			.saturating_add(Weight::from_parts(6_570_955, 0).saturating_mul(c.into()))
+		// Minimum execution time: 6_313_000 picoseconds.
+		Weight::from_parts(5_143_287, 0)
+			// Standard Error: 2_490
+			.saturating_add(Weight::from_parts(3_599_498, 0).saturating_mul(c.into()))
 	}
 }
\ No newline at end of file
diff --git a/runtime/hydradx/src/weights/xcm.rs b/runtime/hydradx/src/weights/pallet_xcm.rs
similarity index 65%
rename from runtime/hydradx/src/weights/xcm.rs
rename to runtime/hydradx/src/weights/pallet_xcm.rs
index 183f43b07..c9c9fd7ac 100644
--- a/runtime/hydradx/src/weights/xcm.rs
+++ b/runtime/hydradx/src/weights/pallet_xcm.rs
@@ -15,37 +15,46 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+
 //! Autogenerated weights for `pallet_xcm`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-02-15, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-05-23, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: 1024
+//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024`
 
 // Executed Command:
-// target/release/hydradx
+// ./target/release/hydradx
 // benchmark
 // pallet
-// --chain=dev
-// --steps=10
-// --repeat=30
 // --wasm-execution=compiled
-// --heap-pages=4096
-// --template=.maintain/pallet-weight-template-no-back.hbs
-// --pallet=pallet-xcm
-// --output=./weights/xcm.rs
-// --extrinsic=*
+// --pallet
+// *
+// --extrinsic
+// *
+// --heap-pages
+// 4096
+// --steps
+// 50
+// --repeat
+// 20
+// --template=scripts/pallet-weight-template.hbs
+// --output
+// weights/
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
 #![allow(missing_docs)]
 
-use frame_support::{traits::Get, weights::Weight};
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
 use core::marker::PhantomData;
 
-/// Weight functions for `pallet_xcm`.
+/// Weights for `pallet_xcm`.
+pub struct WeightInfo<T>(PhantomData<T>);
+
+/// Weights for `pallet_xcm` using the HydraDX node and recommended hardware.
 pub struct HydraWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> pallet_xcm::WeightInfo for HydraWeight<T> {
 	/// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
@@ -62,10 +71,10 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `145`
 		//  Estimated: `3610`
-		// Minimum execution time: 38_630_000 picoseconds.
-		Weight::from_parts(39_297_000, 3610)
-			.saturating_add(T::DbWeight::get().reads(5))
-			.saturating_add(T::DbWeight::get().writes(2))
+		// Minimum execution time: 25_608_000 picoseconds.
+		Weight::from_parts(26_239_000, 3610)
+			.saturating_add(T::DbWeight::get().reads(5_u64))
+			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
 	/// Storage: `Benchmark::Override` (r:0 w:0)
 	/// Proof: `Benchmark::Override` (`max_values`: None, `max_size`: None, mode: `Measured`)
@@ -76,34 +85,40 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for HydraWeight<T> {
 		// Minimum execution time: 18_446_744_073_709_551_000 picoseconds.
 		Weight::from_parts(18_446_744_073_709_551_000, 0)
 	}
-	/// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
-	/// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `Benchmark::Override` (r:0 w:0)
+	/// Proof: `Benchmark::Override` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn reserve_transfer_assets() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `69`
-		//  Estimated: `1489`
-		// Minimum execution time: 30_159_000 picoseconds.
-		Weight::from_parts(30_412_000, 1489)
-			.saturating_add(T::DbWeight::get().reads(1))
+		//  Measured:  `0`
+		//  Estimated: `0`
+		// Minimum execution time: 18_446_744_073_709_551_000 picoseconds.
+		Weight::from_parts(18_446_744_073_709_551_000, 0)
 	}
 	/// Storage: `Benchmark::Override` (r:0 w:0)
 	/// Proof: `Benchmark::Override` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	fn execute() -> Weight {
+	fn transfer_assets() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
 		// Minimum execution time: 18_446_744_073_709_551_000 picoseconds.
 		Weight::from_parts(18_446_744_073_709_551_000, 0)
 	}
+	fn execute() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `0`
+		//  Estimated: `0`
+		// Minimum execution time: 10_507_000 picoseconds.
+		Weight::from_parts(10_801_000, 0)
+	}
 	/// Storage: `PolkadotXcm::SupportedVersion` (r:0 w:1)
 	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn force_xcm_version() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 13_988_000 picoseconds.
-		Weight::from_parts(14_343_000, 0)
-			.saturating_add(T::DbWeight::get().writes(1))
+		// Minimum execution time: 10_030_000 picoseconds.
+		Weight::from_parts(10_369_000, 0)
+			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	/// Storage: `PolkadotXcm::SafeXcmVersion` (r:0 w:1)
 	/// Proof: `PolkadotXcm::SafeXcmVersion` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
@@ -111,9 +126,9 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 5_051_000 picoseconds.
-		Weight::from_parts(5_221_000, 0)
-			.saturating_add(T::DbWeight::get().writes(1))
+		// Minimum execution time: 3_622_000 picoseconds.
+		Weight::from_parts(3_786_000, 0)
+			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	/// Storage: `PolkadotXcm::VersionNotifiers` (r:1 w:1)
 	/// Proof: `PolkadotXcm::VersionNotifiers` (`max_values`: None, `max_size`: None, mode: `Measured`)
@@ -135,10 +150,10 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `145`
 		//  Estimated: `3610`
-		// Minimum execution time: 45_381_000 picoseconds.
-		Weight::from_parts(45_916_000, 3610)
-			.saturating_add(T::DbWeight::get().reads(7))
-			.saturating_add(T::DbWeight::get().writes(5))
+		// Minimum execution time: 32_757_000 picoseconds.
+		Weight::from_parts(33_308_000, 3610)
+			.saturating_add(T::DbWeight::get().reads(7_u64))
+			.saturating_add(T::DbWeight::get().writes(5_u64))
 	}
 	/// Storage: `PolkadotXcm::VersionNotifiers` (r:1 w:1)
 	/// Proof: `PolkadotXcm::VersionNotifiers` (`max_values`: None, `max_size`: None, mode: `Measured`)
@@ -158,10 +173,10 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `328`
 		//  Estimated: `3793`
-		// Minimum execution time: 44_926_000 picoseconds.
-		Weight::from_parts(45_579_000, 3793)
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().writes(4))
+		// Minimum execution time: 33_735_000 picoseconds.
+		Weight::from_parts(34_032_000, 3793)
+			.saturating_add(T::DbWeight::get().reads(6_u64))
+			.saturating_add(T::DbWeight::get().writes(4_u64))
 	}
 	/// Storage: `PolkadotXcm::XcmExecutionSuspended` (r:0 w:1)
 	/// Proof: `PolkadotXcm::XcmExecutionSuspended` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
@@ -169,41 +184,41 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 4_986_000 picoseconds.
-		Weight::from_parts(5_153_000, 0)
-			.saturating_add(T::DbWeight::get().writes(1))
+		// Minimum execution time: 3_635_000 picoseconds.
+		Weight::from_parts(3_791_000, 0)
+			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
-	/// Storage: `PolkadotXcm::SupportedVersion` (r:4 w:2)
+	/// Storage: `PolkadotXcm::SupportedVersion` (r:5 w:2)
 	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn migrate_supported_version() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `167`
-		//  Estimated: `11057`
-		// Minimum execution time: 23_374_000 picoseconds.
-		Weight::from_parts(24_225_000, 11057)
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(2))
+		//  Measured:  `125`
+		//  Estimated: `13490`
+		// Minimum execution time: 23_554_000 picoseconds.
+		Weight::from_parts(23_975_000, 13490)
+			.saturating_add(T::DbWeight::get().reads(5_u64))
+			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
-	/// Storage: `PolkadotXcm::VersionNotifiers` (r:4 w:2)
+	/// Storage: `PolkadotXcm::VersionNotifiers` (r:5 w:2)
 	/// Proof: `PolkadotXcm::VersionNotifiers` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn migrate_version_notifiers() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `171`
-		//  Estimated: `11061`
-		// Minimum execution time: 23_394_000 picoseconds.
-		Weight::from_parts(24_116_000, 11061)
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(2))
+		//  Measured:  `129`
+		//  Estimated: `13494`
+		// Minimum execution time: 23_816_000 picoseconds.
+		Weight::from_parts(24_477_000, 13494)
+			.saturating_add(T::DbWeight::get().reads(5_u64))
+			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
-	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:5 w:0)
+	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:6 w:0)
 	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn already_notified_target() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `178`
-		//  Estimated: `13543`
-		// Minimum execution time: 24_948_000 picoseconds.
-		Weight::from_parts(25_329_000, 13543)
-			.saturating_add(T::DbWeight::get().reads(5))
+		//  Estimated: `16018`
+		// Minimum execution time: 26_544_000 picoseconds.
+		Weight::from_parts(27_025_000, 16018)
+			.saturating_add(T::DbWeight::get().reads(6_u64))
 	}
 	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:2 w:1)
 	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
@@ -221,33 +236,33 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `212`
 		//  Estimated: `6152`
-		// Minimum execution time: 40_668_000 picoseconds.
-		Weight::from_parts(41_385_000, 6152)
-			.saturating_add(T::DbWeight::get().reads(7))
-			.saturating_add(T::DbWeight::get().writes(3))
+		// Minimum execution time: 31_656_000 picoseconds.
+		Weight::from_parts(32_180_000, 6152)
+			.saturating_add(T::DbWeight::get().reads(7_u64))
+			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
-	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:3 w:0)
+	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:4 w:0)
 	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn notify_target_migration_fail() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `172`
-		//  Estimated: `8587`
-		// Minimum execution time: 13_397_000 picoseconds.
-		Weight::from_parts(13_608_000, 8587)
-			.saturating_add(T::DbWeight::get().reads(3))
+		//  Estimated: `11062`
+		// Minimum execution time: 15_817_000 picoseconds.
+		Weight::from_parts(15_997_000, 11062)
+			.saturating_add(T::DbWeight::get().reads(4_u64))
 	}
-	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:4 w:2)
+	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:5 w:2)
 	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn migrate_version_notify_targets() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `178`
-		//  Estimated: `11068`
-		// Minimum execution time: 24_281_000 picoseconds.
-		Weight::from_parts(24_768_000, 11068)
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(2))
+		//  Measured:  `136`
+		//  Estimated: `13501`
+		// Minimum execution time: 24_645_000 picoseconds.
+		Weight::from_parts(25_287_000, 13501)
+			.saturating_add(T::DbWeight::get().reads(5_u64))
+			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
-	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:4 w:2)
+	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:5 w:2)
 	/// Proof: `PolkadotXcm::VersionNotifyTargets` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	/// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
 	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
@@ -261,11 +276,35 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for HydraWeight<T> {
 	/// Proof: `ParachainSystem::PendingUpwardMessages` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
 	fn migrate_and_notify_old_targets() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `254`
-		//  Estimated: `11144`
-		// Minimum execution time: 50_481_000 picoseconds.
-		Weight::from_parts(51_043_000, 11144)
-			.saturating_add(T::DbWeight::get().reads(9))
-			.saturating_add(T::DbWeight::get().writes(4))
+		//  Measured:  `212`
+		//  Estimated: `13577`
+		// Minimum execution time: 42_396_000 picoseconds.
+		Weight::from_parts(42_908_000, 13577)
+			.saturating_add(T::DbWeight::get().reads(10_u64))
+			.saturating_add(T::DbWeight::get().writes(4_u64))
+	}
+	/// Storage: `PolkadotXcm::QueryCounter` (r:1 w:1)
+	/// Proof: `PolkadotXcm::QueryCounter` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `PolkadotXcm::Queries` (r:0 w:1)
+	/// Proof: `PolkadotXcm::Queries` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	fn new_query() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `69`
+		//  Estimated: `1554`
+		// Minimum execution time: 5_356_000 picoseconds.
+		Weight::from_parts(5_526_000, 1554)
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().writes(2_u64))
+	}
+	/// Storage: `PolkadotXcm::Queries` (r:1 w:1)
+	/// Proof: `PolkadotXcm::Queries` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	fn take_response() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `7706`
+		//  Estimated: `11171`
+		// Minimum execution time: 34_538_000 picoseconds.
+		Weight::from_parts(35_078_000, 11171)
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 }
\ No newline at end of file
diff --git a/runtime/hydradx/src/weights/xyk.rs b/runtime/hydradx/src/weights/pallet_xyk.rs
similarity index 82%
rename from runtime/hydradx/src/weights/xyk.rs
rename to runtime/hydradx/src/weights/pallet_xyk.rs
index 7a8c24f45..29a74b934 100644
--- a/runtime/hydradx/src/weights/xyk.rs
+++ b/runtime/hydradx/src/weights/pallet_xyk.rs
@@ -15,41 +15,50 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+
 //! Autogenerated weights for `pallet_xyk`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-02-15, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-05-23, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: 1024
+//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024`
 
 // Executed Command:
-// target/release/hydradx
+// ./target/release/hydradx
 // benchmark
 // pallet
-// --chain=dev
-// --steps=10
-// --repeat=30
 // --wasm-execution=compiled
-// --heap-pages=4096
-// --template=.maintain/pallet-weight-template-no-back.hbs
-// --pallet=pallet_xyk
-// --output=./weights/xyk.rs
-// --extrinsic=*
+// --pallet
+// *
+// --extrinsic
+// *
+// --heap-pages
+// 4096
+// --steps
+// 50
+// --repeat
+// 20
+// --template=scripts/pallet-weight-template.hbs
+// --output
+// weights/
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
 #![allow(missing_docs)]
 
-use frame_support::{traits::Get, weights::Weight};
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
 use core::marker::PhantomData;
 
-use pallet_xyk::weights::WeightInfo;
+/// Weights for `pallet_xyk`.
+pub struct WeightInfo<T>(PhantomData<T>);
 
-/// Weight functions for `pallet_xyk`.
+/// Weights for `pallet_xyk` using the HydraDX node and recommended hardware.
 pub struct HydraWeight<T>(PhantomData<T>);
-impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
+impl<T: frame_system::Config> pallet_xyk::WeightInfo for HydraWeight<T> {
+	/// Storage: `AssetRegistry::Assets` (r:3 w:1)
+	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
 	/// Storage: `LBP::PoolData` (r:1 w:0)
 	/// Proof: `LBP::PoolData` (`max_values`: None, `max_size`: Some(163), added: 2638, mode: `MaxEncodedLen`)
 	/// Storage: `XYK::ShareToken` (r:1 w:1)
@@ -64,8 +73,6 @@ impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
 	/// Proof: `Duster::AccountBlacklist` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
 	/// Storage: `AssetRegistry::BannedAssets` (r:4 w:0)
 	/// Proof: `AssetRegistry::BannedAssets` (`max_values`: None, `max_size`: Some(20), added: 2495, mode: `MaxEncodedLen`)
-	/// Storage: `AssetRegistry::Assets` (r:3 w:1)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
 	/// Storage: `MultiTransactionPayment::AccountCurrencyMap` (r:3 w:0)
 	/// Proof: `MultiTransactionPayment::AccountCurrencyMap` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
 	/// Storage: `MultiTransactionPayment::AcceptedCurrencyPrice` (r:1 w:0)
@@ -88,12 +95,12 @@ impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
 	/// Proof: `XYK::PoolAssets` (`max_values`: None, `max_size`: Some(56), added: 2531, mode: `MaxEncodedLen`)
 	fn create_pool() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3522`
+		//  Measured:  `3659`
 		//  Estimated: `19071`
-		// Minimum execution time: 588_643_000 picoseconds.
-		Weight::from_parts(592_313_000, 19071)
-			.saturating_add(T::DbWeight::get().reads(33))
-			.saturating_add(T::DbWeight::get().writes(20))
+		// Minimum execution time: 479_166_000 picoseconds.
+		Weight::from_parts(482_391_000, 19071)
+			.saturating_add(T::DbWeight::get().reads(33_u64))
+			.saturating_add(T::DbWeight::get().writes(20_u64))
 	}
 	/// Storage: `XYK::ShareToken` (r:1 w:0)
 	/// Proof: `XYK::ShareToken` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
@@ -121,16 +128,16 @@ impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
 	/// Proof: `MultiTransactionPayment::AcceptedCurrencyPrice` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
 	/// Storage: `Tokens::TotalIssuance` (r:1 w:1)
 	/// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
-	/// Storage: `EmaOracle::Accumulator` (r:1 w:1)
-	/// Proof: `EmaOracle::Accumulator` (`max_values`: Some(1), `max_size`: Some(5921), added: 6416, mode: `MaxEncodedLen`)
+	/// Storage: `EmaOracle::WhitelistedAssets` (r:1 w:0)
+	/// Proof: `EmaOracle::WhitelistedAssets` (`max_values`: Some(1), `max_size`: Some(641), added: 1136, mode: `MaxEncodedLen`)
 	fn add_liquidity() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `4159`
+		//  Measured:  `4295`
 		//  Estimated: `19071`
-		// Minimum execution time: 353_004_000 picoseconds.
-		Weight::from_parts(354_898_000, 19071)
-			.saturating_add(T::DbWeight::get().reads(27))
-			.saturating_add(T::DbWeight::get().writes(14))
+		// Minimum execution time: 295_185_000 picoseconds.
+		Weight::from_parts(297_223_000, 19071)
+			.saturating_add(T::DbWeight::get().reads(27_u64))
+			.saturating_add(T::DbWeight::get().writes(13_u64))
 	}
 	/// Storage: `XYK::ShareToken` (r:1 w:1)
 	/// Proof: `XYK::ShareToken` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
@@ -158,18 +165,18 @@ impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
 	/// Proof: `AssetRegistry::ExistentialDepositCounter` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
 	/// Storage: `Tokens::TotalIssuance` (r:1 w:1)
 	/// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
-	/// Storage: `EmaOracle::Accumulator` (r:1 w:1)
-	/// Proof: `EmaOracle::Accumulator` (`max_values`: Some(1), `max_size`: Some(5921), added: 6416, mode: `MaxEncodedLen`)
+	/// Storage: `EmaOracle::WhitelistedAssets` (r:1 w:0)
+	/// Proof: `EmaOracle::WhitelistedAssets` (`max_values`: Some(1), `max_size`: Some(641), added: 1136, mode: `MaxEncodedLen`)
 	/// Storage: `XYK::PoolAssets` (r:0 w:1)
 	/// Proof: `XYK::PoolAssets` (`max_values`: None, `max_size`: Some(56), added: 2531, mode: `MaxEncodedLen`)
 	fn remove_liquidity() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `4208`
+		//  Measured:  `4345`
 		//  Estimated: `19071`
-		// Minimum execution time: 523_229_000 picoseconds.
-		Weight::from_parts(525_459_000, 19071)
-			.saturating_add(T::DbWeight::get().reads(29))
-			.saturating_add(T::DbWeight::get().writes(18))
+		// Minimum execution time: 431_770_000 picoseconds.
+		Weight::from_parts(434_368_000, 19071)
+			.saturating_add(T::DbWeight::get().reads(29_u64))
+			.saturating_add(T::DbWeight::get().writes(17_u64))
 	}
 	/// Storage: `XYK::ShareToken` (r:1 w:0)
 	/// Proof: `XYK::ShareToken` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
@@ -193,16 +200,16 @@ impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
 	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(49), added: 2524, mode: `MaxEncodedLen`)
 	/// Storage: `MultiTransactionPayment::AcceptedCurrencyPrice` (r:1 w:0)
 	/// Proof: `MultiTransactionPayment::AcceptedCurrencyPrice` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
-	/// Storage: `EmaOracle::Accumulator` (r:1 w:1)
-	/// Proof: `EmaOracle::Accumulator` (`max_values`: Some(1), `max_size`: Some(5921), added: 6416, mode: `MaxEncodedLen`)
+	/// Storage: `EmaOracle::WhitelistedAssets` (r:1 w:0)
+	/// Proof: `EmaOracle::WhitelistedAssets` (`max_values`: Some(1), `max_size`: Some(641), added: 1136, mode: `MaxEncodedLen`)
 	fn sell() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `4057`
+		//  Measured:  `4194`
 		//  Estimated: `16488`
-		// Minimum execution time: 306_824_000 picoseconds.
-		Weight::from_parts(308_832_000, 16488)
-			.saturating_add(T::DbWeight::get().reads(24))
-			.saturating_add(T::DbWeight::get().writes(11))
+		// Minimum execution time: 257_210_000 picoseconds.
+		Weight::from_parts(259_165_000, 16488)
+			.saturating_add(T::DbWeight::get().reads(24_u64))
+			.saturating_add(T::DbWeight::get().writes(10_u64))
 	}
 	/// Storage: `XYK::ShareToken` (r:1 w:0)
 	/// Proof: `XYK::ShareToken` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
@@ -226,16 +233,16 @@ impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
 	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(49), added: 2524, mode: `MaxEncodedLen`)
 	/// Storage: `AssetRegistry::ExistentialDepositCounter` (r:1 w:1)
 	/// Proof: `AssetRegistry::ExistentialDepositCounter` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
-	/// Storage: `EmaOracle::Accumulator` (r:1 w:1)
-	/// Proof: `EmaOracle::Accumulator` (`max_values`: Some(1), `max_size`: Some(5921), added: 6416, mode: `MaxEncodedLen`)
+	/// Storage: `EmaOracle::WhitelistedAssets` (r:1 w:0)
+	/// Proof: `EmaOracle::WhitelistedAssets` (`max_values`: Some(1), `max_size`: Some(641), added: 1136, mode: `MaxEncodedLen`)
 	fn buy() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `4057`
+		//  Measured:  `4194`
 		//  Estimated: `16488`
-		// Minimum execution time: 305_679_000 picoseconds.
-		Weight::from_parts(306_896_000, 16488)
-			.saturating_add(T::DbWeight::get().reads(24))
-			.saturating_add(T::DbWeight::get().writes(11))
+		// Minimum execution time: 256_649_000 picoseconds.
+		Weight::from_parts(257_410_000, 16488)
+			.saturating_add(T::DbWeight::get().reads(24_u64))
+			.saturating_add(T::DbWeight::get().writes(10_u64))
 	}
 	/// Storage: `XYK::ShareToken` (r:1 w:0)
 	/// Proof: `XYK::ShareToken` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
@@ -259,23 +266,23 @@ impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
 	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(49), added: 2524, mode: `MaxEncodedLen`)
 	/// Storage: `MultiTransactionPayment::AcceptedCurrencyPrice` (r:1 w:0)
 	/// Proof: `MultiTransactionPayment::AcceptedCurrencyPrice` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
-	/// Storage: `EmaOracle::Accumulator` (r:1 w:1)
-	/// Proof: `EmaOracle::Accumulator` (`max_values`: Some(1), `max_size`: Some(5921), added: 6416, mode: `MaxEncodedLen`)
+	/// Storage: `EmaOracle::WhitelistedAssets` (r:1 w:0)
+	/// Proof: `EmaOracle::WhitelistedAssets` (`max_values`: Some(1), `max_size`: Some(641), added: 1136, mode: `MaxEncodedLen`)
 	/// The range of component `c` is `[1, 2]`.
 	/// The range of component `e` is `[0, 1]`.
 	fn router_execution_sell(c: u32, e: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1187 + e * (2870 ±0)`
-		//  Estimated: `6156 + e * (10332 ±52_268_479_977_062_104)`
-		// Minimum execution time: 25_878_000 picoseconds.
-		Weight::from_parts(9_649_436, 6156)
-			// Standard Error: 80_766
-			.saturating_add(Weight::from_parts(8_443_704, 0).saturating_mul(c.into()))
-			// Standard Error: 80_766
-			.saturating_add(Weight::from_parts(289_624_454, 0).saturating_mul(e.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
+		//  Measured:  `1221 + e * (2973 ±0)`
+		//  Estimated: `8799 + e * (10332 ±0)`
+		// Minimum execution time: 24_501_000 picoseconds.
+		Weight::from_parts(10_206_077, 8799)
+			// Standard Error: 76_653
+			.saturating_add(Weight::from_parts(7_446_454, 0).saturating_mul(c.into()))
+			// Standard Error: 76_653
+			.saturating_add(Weight::from_parts(241_285_864, 0).saturating_mul(e.into()))
+			.saturating_add(T::DbWeight::get().reads(3_u64))
 			.saturating_add(T::DbWeight::get().reads((21_u64).saturating_mul(e.into())))
-			.saturating_add(T::DbWeight::get().writes((11_u64).saturating_mul(e.into())))
+			.saturating_add(T::DbWeight::get().writes((10_u64).saturating_mul(e.into())))
 			.saturating_add(Weight::from_parts(0, 10332).saturating_mul(e.into()))
 	}
 	/// Storage: `XYK::ShareToken` (r:1 w:0)
@@ -300,23 +307,23 @@ impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
 	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(49), added: 2524, mode: `MaxEncodedLen`)
 	/// Storage: `AssetRegistry::ExistentialDepositCounter` (r:1 w:1)
 	/// Proof: `AssetRegistry::ExistentialDepositCounter` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
-	/// Storage: `EmaOracle::Accumulator` (r:1 w:1)
-	/// Proof: `EmaOracle::Accumulator` (`max_values`: Some(1), `max_size`: Some(5921), added: 6416, mode: `MaxEncodedLen`)
+	/// Storage: `EmaOracle::WhitelistedAssets` (r:1 w:0)
+	/// Proof: `EmaOracle::WhitelistedAssets` (`max_values`: Some(1), `max_size`: Some(641), added: 1136, mode: `MaxEncodedLen`)
 	/// The range of component `c` is `[1, 3]`.
 	/// The range of component `e` is `[0, 1]`.
 	fn router_execution_buy(c: u32, e: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1187 + e * (2870 ±0)`
-		//  Estimated: `6156 + e * (10332 ±0)`
-		// Minimum execution time: 33_714_000 picoseconds.
-		Weight::from_parts(11_014_445, 6156)
-			// Standard Error: 41_799
-			.saturating_add(Weight::from_parts(7_776_697, 0).saturating_mul(c.into()))
-			// Standard Error: 70_916
-			.saturating_add(Weight::from_parts(287_790_853, 0).saturating_mul(e.into()))
-			.saturating_add(T::DbWeight::get().reads(3))
+		//  Measured:  `1221 + e * (2973 ±0)`
+		//  Estimated: `6156 + e * (10332 ±94_653_459_118_620)`
+		// Minimum execution time: 31_769_000 picoseconds.
+		Weight::from_parts(9_820_195, 6156)
+			// Standard Error: 25_963
+			.saturating_add(Weight::from_parts(7_544_497, 0).saturating_mul(c.into()))
+			// Standard Error: 43_217
+			.saturating_add(Weight::from_parts(239_839_406, 0).saturating_mul(e.into()))
+			.saturating_add(T::DbWeight::get().reads(3_u64))
 			.saturating_add(T::DbWeight::get().reads((21_u64).saturating_mul(e.into())))
-			.saturating_add(T::DbWeight::get().writes((11_u64).saturating_mul(e.into())))
+			.saturating_add(T::DbWeight::get().writes((10_u64).saturating_mul(e.into())))
 			.saturating_add(Weight::from_parts(0, 10332).saturating_mul(e.into()))
 	}
-}
+}
\ No newline at end of file
diff --git a/runtime/hydradx/src/weights/xyk_lm.rs b/runtime/hydradx/src/weights/pallet_xyk_liquidity_mining.rs
similarity index 87%
rename from runtime/hydradx/src/weights/xyk_lm.rs
rename to runtime/hydradx/src/weights/pallet_xyk_liquidity_mining.rs
index 542e63def..75005c448 100644
--- a/runtime/hydradx/src/weights/xyk_lm.rs
+++ b/runtime/hydradx/src/weights/pallet_xyk_liquidity_mining.rs
@@ -15,39 +15,48 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+
 //! Autogenerated weights for `pallet_xyk_liquidity_mining`
 //!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-05-20, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
+//! DATE: 2024-05-23, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
 //! WORST CASE MAP SIZE: `1000000`
 //! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: 1024
+//! WASM-EXECUTION: `Compiled`, CHAIN: `None`, DB CACHE: `1024`
 
 // Executed Command:
-// target/release/hydradx
+// ./target/release/hydradx
 // benchmark
 // pallet
-// --chain=dev
-// --steps=10
-// --repeat=30
 // --wasm-execution=compiled
-// --heap-pages=4096
-// --template=.maintain/pallet-weight-template-no-back.hbs
-// --pallet=pallet-xyk-liquidity-mining
-// --output=xyk_lm.rs
-// --extrinsic=*
+// --pallet
+// *
+// --extrinsic
+// *
+// --heap-pages
+// 4096
+// --steps
+// 50
+// --repeat
+// 20
+// --template=scripts/pallet-weight-template.hbs
+// --output
+// weights/
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
 #![allow(missing_docs)]
 
-use frame_support::{traits::Get, weights::Weight};
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
 use core::marker::PhantomData;
 
-/// Weight functions for `pallet_xyk_liquidity_mining`.
+/// Weights for `pallet_xyk_liquidity_mining`.
+pub struct WeightInfo<T>(PhantomData<T>);
+
+/// Weights for `pallet_xyk_liquidity_mining` using the HydraDX node and recommended hardware.
 pub struct HydraWeight<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_xyk_liquidity_mining::weights::WeightInfo for HydraWeight<T> {
+impl<T: frame_system::Config> pallet_xyk_liquidity_mining::WeightInfo for HydraWeight<T> {
 	/// Storage: `AssetRegistry::Assets` (r:2 w:0)
 	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
 	/// Storage: `Duster::AccountBlacklist` (r:1 w:1)
@@ -74,12 +83,12 @@ impl<T: frame_system::Config> pallet_xyk_liquidity_mining::weights::WeightInfo f
 	/// Proof: `XYKWarehouseLM::GlobalFarm` (`max_values`: None, `max_size`: Some(205), added: 2680, mode: `MaxEncodedLen`)
 	fn create_global_farm() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3132`
+		//  Measured:  `3102`
 		//  Estimated: `11402`
-		// Minimum execution time: 327_053_000 picoseconds.
-		Weight::from_parts(328_522_000, 11402)
-			.saturating_add(T::DbWeight::get().reads(19))
-			.saturating_add(T::DbWeight::get().writes(12))
+		// Minimum execution time: 277_908_000 picoseconds.
+		Weight::from_parts(279_339_000, 11402)
+			.saturating_add(T::DbWeight::get().reads(19_u64))
+			.saturating_add(T::DbWeight::get().writes(12_u64))
 	}
 	/// Storage: `XYKWarehouseLM::GlobalFarm` (r:1 w:1)
 	/// Proof: `XYKWarehouseLM::GlobalFarm` (`max_values`: None, `max_size`: Some(205), added: 2680, mode: `MaxEncodedLen`)
@@ -97,12 +106,12 @@ impl<T: frame_system::Config> pallet_xyk_liquidity_mining::weights::WeightInfo f
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn update_global_farm() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `4347`
+		//  Measured:  `4351`
 		//  Estimated: `6156`
-		// Minimum execution time: 114_712_000 picoseconds.
-		Weight::from_parts(115_729_000, 6156)
-			.saturating_add(T::DbWeight::get().reads(8))
-			.saturating_add(T::DbWeight::get().writes(3))
+		// Minimum execution time: 103_336_000 picoseconds.
+		Weight::from_parts(104_299_000, 6156)
+			.saturating_add(T::DbWeight::get().reads(8_u64))
+			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
 	/// Storage: `XYKWarehouseLM::GlobalFarm` (r:1 w:1)
 	/// Proof: `XYKWarehouseLM::GlobalFarm` (`max_values`: None, `max_size`: Some(205), added: 2680, mode: `MaxEncodedLen`)
@@ -126,12 +135,12 @@ impl<T: frame_system::Config> pallet_xyk_liquidity_mining::weights::WeightInfo f
 	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(49), added: 2524, mode: `MaxEncodedLen`)
 	fn terminate_global_farm() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3844`
+		//  Measured:  `3814`
 		//  Estimated: `6196`
-		// Minimum execution time: 193_389_000 picoseconds.
-		Weight::from_parts(194_871_000, 6196)
-			.saturating_add(T::DbWeight::get().reads(12))
-			.saturating_add(T::DbWeight::get().writes(8))
+		// Minimum execution time: 172_009_000 picoseconds.
+		Weight::from_parts(173_139_000, 6196)
+			.saturating_add(T::DbWeight::get().reads(12_u64))
+			.saturating_add(T::DbWeight::get().writes(8_u64))
 	}
 	/// Storage: `XYK::ShareToken` (r:1 w:0)
 	/// Proof: `XYK::ShareToken` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
@@ -145,12 +154,12 @@ impl<T: frame_system::Config> pallet_xyk_liquidity_mining::weights::WeightInfo f
 	/// Proof: `XYKWarehouseLM::YieldFarm` (`max_values`: None, `max_size`: Some(226), added: 2701, mode: `MaxEncodedLen`)
 	fn create_yield_farm() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1548`
+		//  Measured:  `1586`
 		//  Estimated: `3670`
-		// Minimum execution time: 52_039_000 picoseconds.
-		Weight::from_parts(52_555_000, 3670)
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().writes(4))
+		// Minimum execution time: 47_538_000 picoseconds.
+		Weight::from_parts(48_206_000, 3670)
+			.saturating_add(T::DbWeight::get().reads(4_u64))
+			.saturating_add(T::DbWeight::get().writes(4_u64))
 	}
 	/// Storage: `XYK::ShareToken` (r:1 w:0)
 	/// Proof: `XYK::ShareToken` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
@@ -174,12 +183,12 @@ impl<T: frame_system::Config> pallet_xyk_liquidity_mining::weights::WeightInfo f
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn update_yield_farm() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `4829`
+		//  Measured:  `4867`
 		//  Estimated: `6156`
-		// Minimum execution time: 141_226_000 picoseconds.
-		Weight::from_parts(142_343_000, 6156)
-			.saturating_add(T::DbWeight::get().reads(11))
-			.saturating_add(T::DbWeight::get().writes(4))
+		// Minimum execution time: 127_361_000 picoseconds.
+		Weight::from_parts(128_178_000, 6156)
+			.saturating_add(T::DbWeight::get().reads(11_u64))
+			.saturating_add(T::DbWeight::get().writes(4_u64))
 	}
 	/// Storage: `XYKWarehouseLM::ActiveYieldFarm` (r:1 w:1)
 	/// Proof: `XYKWarehouseLM::ActiveYieldFarm` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
@@ -201,12 +210,12 @@ impl<T: frame_system::Config> pallet_xyk_liquidity_mining::weights::WeightInfo f
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn stop_yield_farm() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `4663`
+		//  Measured:  `4667`
 		//  Estimated: `6156`
-		// Minimum execution time: 136_519_000 picoseconds.
-		Weight::from_parts(137_186_000, 6156)
-			.saturating_add(T::DbWeight::get().reads(10))
-			.saturating_add(T::DbWeight::get().writes(5))
+		// Minimum execution time: 122_100_000 picoseconds.
+		Weight::from_parts(123_315_000, 6156)
+			.saturating_add(T::DbWeight::get().reads(10_u64))
+			.saturating_add(T::DbWeight::get().writes(5_u64))
 	}
 	/// Storage: `XYKWarehouseLM::ActiveYieldFarm` (r:1 w:0)
 	/// Proof: `XYKWarehouseLM::ActiveYieldFarm` (`max_values`: None, `max_size`: Some(72), added: 2547, mode: `MaxEncodedLen`)
@@ -226,12 +235,12 @@ impl<T: frame_system::Config> pallet_xyk_liquidity_mining::weights::WeightInfo f
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn terminate_yield_farm() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `4710`
+		//  Measured:  `4714`
 		//  Estimated: `6156`
-		// Minimum execution time: 107_427_000 picoseconds.
-		Weight::from_parts(108_289_000, 6156)
-			.saturating_add(T::DbWeight::get().reads(9))
-			.saturating_add(T::DbWeight::get().writes(4))
+		// Minimum execution time: 99_990_000 picoseconds.
+		Weight::from_parts(100_957_000, 6156)
+			.saturating_add(T::DbWeight::get().reads(9_u64))
+			.saturating_add(T::DbWeight::get().writes(4_u64))
 	}
 	/// Storage: `XYK::ShareToken` (r:1 w:0)
 	/// Proof: `XYK::ShareToken` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
@@ -269,12 +278,12 @@ impl<T: frame_system::Config> pallet_xyk_liquidity_mining::weights::WeightInfo f
 	/// Proof: `XYKWarehouseLM::Deposit` (`max_values`: None, `max_size`: Some(413), added: 2888, mode: `MaxEncodedLen`)
 	fn deposit_shares() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `5998`
+		//  Measured:  `6036`
 		//  Estimated: `16488`
-		// Minimum execution time: 241_173_000 picoseconds.
-		Weight::from_parts(243_115_000, 16488)
-			.saturating_add(T::DbWeight::get().reads(24))
-			.saturating_add(T::DbWeight::get().writes(11))
+		// Minimum execution time: 218_921_000 picoseconds.
+		Weight::from_parts(220_788_000, 16488)
+			.saturating_add(T::DbWeight::get().reads(24_u64))
+			.saturating_add(T::DbWeight::get().writes(11_u64))
 	}
 	/// Storage: `Uniques::Asset` (r:1 w:0)
 	/// Proof: `Uniques::Asset` (`max_values`: None, `max_size`: Some(146), added: 2621, mode: `MaxEncodedLen`)
@@ -304,12 +313,12 @@ impl<T: frame_system::Config> pallet_xyk_liquidity_mining::weights::WeightInfo f
 	/// Proof: `XYK::TotalLiquidity` (`max_values`: None, `max_size`: Some(64), added: 2539, mode: `MaxEncodedLen`)
 	fn redeposit_shares() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `6927`
+		//  Measured:  `6965`
 		//  Estimated: `11322`
-		// Minimum execution time: 182_433_000 picoseconds.
-		Weight::from_parts(184_726_000, 11322)
-			.saturating_add(T::DbWeight::get().reads(16))
-			.saturating_add(T::DbWeight::get().writes(5))
+		// Minimum execution time: 169_802_000 picoseconds.
+		Weight::from_parts(170_914_000, 11322)
+			.saturating_add(T::DbWeight::get().reads(16_u64))
+			.saturating_add(T::DbWeight::get().writes(5_u64))
 	}
 	/// Storage: `Uniques::Asset` (r:1 w:0)
 	/// Proof: `Uniques::Asset` (`max_values`: None, `max_size`: Some(146), added: 2621, mode: `MaxEncodedLen`)
@@ -333,12 +342,12 @@ impl<T: frame_system::Config> pallet_xyk_liquidity_mining::weights::WeightInfo f
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn claim_rewards() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `6802`
+		//  Measured:  `6806`
 		//  Estimated: `8739`
-		// Minimum execution time: 194_422_000 picoseconds.
-		Weight::from_parts(195_807_000, 8739)
-			.saturating_add(T::DbWeight::get().reads(14))
-			.saturating_add(T::DbWeight::get().writes(6))
+		// Minimum execution time: 174_694_000 picoseconds.
+		Weight::from_parts(176_187_000, 8739)
+			.saturating_add(T::DbWeight::get().reads(14_u64))
+			.saturating_add(T::DbWeight::get().writes(6_u64))
 	}
 	/// Storage: `Uniques::Asset` (r:1 w:1)
 	/// Proof: `Uniques::Asset` (`max_values`: None, `max_size`: Some(146), added: 2621, mode: `MaxEncodedLen`)
@@ -380,12 +389,12 @@ impl<T: frame_system::Config> pallet_xyk_liquidity_mining::weights::WeightInfo f
 	/// Proof: `Uniques::ItemPriceOf` (`max_values`: None, `max_size`: Some(113), added: 2588, mode: `MaxEncodedLen`)
 	fn withdraw_shares() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `6475`
+		//  Measured:  `6479`
 		//  Estimated: `13905`
-		// Minimum execution time: 417_341_000 picoseconds.
-		Weight::from_parts(420_709_000, 13905)
-			.saturating_add(T::DbWeight::get().reads(28))
-			.saturating_add(T::DbWeight::get().writes(16))
+		// Minimum execution time: 369_769_000 picoseconds.
+		Weight::from_parts(371_613_000, 13905)
+			.saturating_add(T::DbWeight::get().reads(28_u64))
+			.saturating_add(T::DbWeight::get().writes(16_u64))
 	}
 	/// Storage: `XYK::ShareToken` (r:1 w:0)
 	/// Proof: `XYK::ShareToken` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
@@ -409,11 +418,11 @@ impl<T: frame_system::Config> pallet_xyk_liquidity_mining::weights::WeightInfo f
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn resume_yield_farm() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `5121`
+		//  Measured:  `5159`
 		//  Estimated: `6156`
-		// Minimum execution time: 137_649_000 picoseconds.
-		Weight::from_parts(138_885_000, 6156)
-			.saturating_add(T::DbWeight::get().reads(11))
-			.saturating_add(T::DbWeight::get().writes(5))
+		// Minimum execution time: 127_095_000 picoseconds.
+		Weight::from_parts(128_067_000, 6156)
+			.saturating_add(T::DbWeight::get().reads(11_u64))
+			.saturating_add(T::DbWeight::get().writes(5_u64))
 	}
 }
\ No newline at end of file
diff --git a/runtime/hydradx/src/weights/preimage.rs b/runtime/hydradx/src/weights/preimage.rs
deleted file mode 100644
index 60afab1b5..000000000
--- a/runtime/hydradx/src/weights/preimage.rs
+++ /dev/null
@@ -1,204 +0,0 @@
-// This file is part of HydraDX.
-
-// Copyright (C) 2020-2023  Intergalactic, Limited (GIB).
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! Autogenerated weights for `pallet_preimage`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-02-15, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: 1024
-
-// Executed Command:
-// target/release/hydradx
-// benchmark
-// pallet
-// --chain=dev
-// --steps=10
-// --repeat=30
-// --wasm-execution=compiled
-// --heap-pages=4096
-// --template=.maintain/pallet-weight-template-no-back.hbs
-// --pallet=pallet-preimage
-// --output=./weights/preimage.rs
-// --extrinsic=*
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `pallet_preimage`.
-pub struct HydraWeight<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_preimage::WeightInfo for HydraWeight<T> {
-	/// Storage: `Preimage::StatusFor` (r:1 w:1)
-	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`)
-	/// Storage: `Preimage::PreimageFor` (r:0 w:1)
-	/// Proof: `Preimage::PreimageFor` (`max_values`: None, `max_size`: Some(4194344), added: 4196819, mode: `MaxEncodedLen`)
-	/// The range of component `s` is `[0, 4194304]`.
-	fn note_preimage(s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `210`
-		//  Estimated: `3556`
-		// Minimum execution time: 41_276_000 picoseconds.
-		Weight::from_parts(41_498_000, 3556)
-			// Standard Error: 1
-			.saturating_add(Weight::from_parts(1_985, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `Preimage::StatusFor` (r:1 w:1)
-	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`)
-	/// Storage: `Preimage::PreimageFor` (r:0 w:1)
-	/// Proof: `Preimage::PreimageFor` (`max_values`: None, `max_size`: Some(4194344), added: 4196819, mode: `MaxEncodedLen`)
-	/// The range of component `s` is `[0, 4194304]`.
-	fn note_requested_preimage(s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `173`
-		//  Estimated: `3556`
-		// Minimum execution time: 23_090_000 picoseconds.
-		Weight::from_parts(23_405_000, 3556)
-			// Standard Error: 9
-			.saturating_add(Weight::from_parts(2_041, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `Preimage::StatusFor` (r:1 w:1)
-	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`)
-	/// Storage: `Preimage::PreimageFor` (r:0 w:1)
-	/// Proof: `Preimage::PreimageFor` (`max_values`: None, `max_size`: Some(4194344), added: 4196819, mode: `MaxEncodedLen`)
-	/// The range of component `s` is `[0, 4194304]`.
-	fn note_no_deposit_preimage(s: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `173`
-		//  Estimated: `3556`
-		// Minimum execution time: 22_229_000 picoseconds.
-		Weight::from_parts(8_603_845, 3556)
-			// Standard Error: 8
-			.saturating_add(Weight::from_parts(1_999, 0).saturating_mul(s.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `Preimage::StatusFor` (r:1 w:1)
-	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`)
-	/// Storage: `Preimage::PreimageFor` (r:0 w:1)
-	/// Proof: `Preimage::PreimageFor` (`max_values`: None, `max_size`: Some(4194344), added: 4196819, mode: `MaxEncodedLen`)
-	fn unnote_preimage() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `356`
-		//  Estimated: `3556`
-		// Minimum execution time: 53_648_000 picoseconds.
-		Weight::from_parts(55_277_000, 3556)
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `Preimage::StatusFor` (r:1 w:1)
-	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`)
-	/// Storage: `Preimage::PreimageFor` (r:0 w:1)
-	/// Proof: `Preimage::PreimageFor` (`max_values`: None, `max_size`: Some(4194344), added: 4196819, mode: `MaxEncodedLen`)
-	fn unnote_no_deposit_preimage() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `211`
-		//  Estimated: `3556`
-		// Minimum execution time: 31_781_000 picoseconds.
-		Weight::from_parts(32_720_000, 3556)
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `Preimage::StatusFor` (r:1 w:1)
-	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`)
-	fn request_preimage() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `255`
-		//  Estimated: `3556`
-		// Minimum execution time: 28_938_000 picoseconds.
-		Weight::from_parts(29_985_000, 3556)
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Preimage::StatusFor` (r:1 w:1)
-	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`)
-	fn request_no_deposit_preimage() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `211`
-		//  Estimated: `3556`
-		// Minimum execution time: 17_683_000 picoseconds.
-		Weight::from_parts(18_217_000, 3556)
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Preimage::StatusFor` (r:1 w:1)
-	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`)
-	fn request_unnoted_preimage() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `109`
-		//  Estimated: `3556`
-		// Minimum execution time: 18_566_000 picoseconds.
-		Weight::from_parts(19_082_000, 3556)
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Preimage::StatusFor` (r:1 w:1)
-	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`)
-	fn request_requested_preimage() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `173`
-		//  Estimated: `3556`
-		// Minimum execution time: 12_526_000 picoseconds.
-		Weight::from_parts(12_808_000, 3556)
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Preimage::StatusFor` (r:1 w:1)
-	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`)
-	/// Storage: `Preimage::PreimageFor` (r:0 w:1)
-	/// Proof: `Preimage::PreimageFor` (`max_values`: None, `max_size`: Some(4194344), added: 4196819, mode: `MaxEncodedLen`)
-	fn unrequest_preimage() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `211`
-		//  Estimated: `3556`
-		// Minimum execution time: 29_887_000 picoseconds.
-		Weight::from_parts(30_842_000, 3556)
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `Preimage::StatusFor` (r:1 w:1)
-	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`)
-	fn unrequest_unnoted_preimage() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `173`
-		//  Estimated: `3556`
-		// Minimum execution time: 12_510_000 picoseconds.
-		Weight::from_parts(12_886_000, 3556)
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Preimage::StatusFor` (r:1 w:1)
-	/// Proof: `Preimage::StatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`)
-	fn unrequest_multi_referenced_preimage() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `173`
-		//  Estimated: `3556`
-		// Minimum execution time: 12_820_000 picoseconds.
-		Weight::from_parts(13_056_000, 3556)
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-}
\ No newline at end of file
diff --git a/runtime/hydradx/src/weights/treasury.rs b/runtime/hydradx/src/weights/treasury.rs
deleted file mode 100644
index 0e1a664bd..000000000
--- a/runtime/hydradx/src/weights/treasury.rs
+++ /dev/null
@@ -1,136 +0,0 @@
-// This file is part of HydraDX.
-
-// Copyright (C) 2020-2023  Intergalactic, Limited (GIB).
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! Autogenerated weights for `pallet_treasury`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-02-15, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: 1024
-
-// Executed Command:
-// target/release/hydradx
-// benchmark
-// pallet
-// --chain=dev
-// --steps=10
-// --repeat=30
-// --wasm-execution=compiled
-// --heap-pages=4096
-// --template=.maintain/pallet-weight-template-no-back.hbs
-// --pallet=pallet_treasury
-// --output=./weights/treasury.rs
-// --extrinsic=*
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `pallet_treasury`.
-pub struct HydraWeight<T>(PhantomData<T>);
-impl<T: frame_system::Config> pallet_treasury::WeightInfo for HydraWeight<T> {
-	fn spend() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0`
-		//  Estimated: `0`
-		// Minimum execution time: 377_000 picoseconds.
-		Weight::from_parts(415_000, 0)
-	}
-	/// Storage: `Treasury::ProposalCount` (r:1 w:1)
-	/// Proof: `Treasury::ProposalCount` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	/// Storage: `Treasury::Proposals` (r:0 w:1)
-	/// Proof: `Treasury::Proposals` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
-	fn propose_spend() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `210`
-		//  Estimated: `1489`
-		// Minimum execution time: 37_853_000 picoseconds.
-		Weight::from_parts(38_512_000, 1489)
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(2))
-	}
-	/// Storage: `Treasury::Proposals` (r:1 w:1)
-	/// Proof: `Treasury::Proposals` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
-	/// Storage: `System::Account` (r:2 w:2)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	fn reject_proposal() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `471`
-		//  Estimated: `6196`
-		// Minimum execution time: 56_828_000 picoseconds.
-		Weight::from_parts(57_266_000, 6196)
-			.saturating_add(T::DbWeight::get().reads(3))
-			.saturating_add(T::DbWeight::get().writes(3))
-	}
-	/// Storage: `Treasury::Proposals` (r:1 w:0)
-	/// Proof: `Treasury::Proposals` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
-	/// Storage: `Treasury::Approvals` (r:1 w:1)
-	/// Proof: `Treasury::Approvals` (`max_values`: Some(1), `max_size`: Some(402), added: 897, mode: `MaxEncodedLen`)
-	/// The range of component `p` is `[0, 99]`.
-	fn approve_proposal(p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `571 + p * (7 ±0)`
-		//  Estimated: `3573`
-		// Minimum execution time: 14_617_000 picoseconds.
-		Weight::from_parts(17_552_607, 3573)
-			// Standard Error: 2_701
-			.saturating_add(Weight::from_parts(41_981, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `Treasury::Approvals` (r:1 w:1)
-	/// Proof: `Treasury::Approvals` (`max_values`: Some(1), `max_size`: Some(402), added: 897, mode: `MaxEncodedLen`)
-	fn remove_approval() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `194`
-		//  Estimated: `1887`
-		// Minimum execution time: 9_955_000 picoseconds.
-		Weight::from_parts(10_322_000, 1887)
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `System::Account` (r:201 w:201)
-	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
-	/// Storage: `Treasury::Deactivated` (r:1 w:1)
-	/// Proof: `Treasury::Deactivated` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
-	/// Storage: `Balances::InactiveIssuance` (r:1 w:1)
-	/// Proof: `Balances::InactiveIssuance` (`max_values`: Some(1), `max_size`: Some(16), added: 511, mode: `MaxEncodedLen`)
-	/// Storage: `Treasury::Approvals` (r:1 w:1)
-	/// Proof: `Treasury::Approvals` (`max_values`: Some(1), `max_size`: Some(402), added: 897, mode: `MaxEncodedLen`)
-	/// Storage: `Treasury::Proposals` (r:100 w:100)
-	/// Proof: `Treasury::Proposals` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
-	/// The range of component `p` is `[0, 100]`.
-	fn on_initialize_proposals(p: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `316 + p * (253 ±0)`
-		//  Estimated: `3593 + p * (5206 ±0)`
-		// Minimum execution time: 38_716_000 picoseconds.
-		Weight::from_parts(47_514_413, 3593)
-			// Standard Error: 29_010
-			.saturating_add(Weight::from_parts(50_516_662, 0).saturating_mul(p.into()))
-			.saturating_add(T::DbWeight::get().reads(4))
-			.saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(p.into())))
-			.saturating_add(T::DbWeight::get().writes(4))
-			.saturating_add(T::DbWeight::get().writes((3_u64).saturating_mul(p.into())))
-			.saturating_add(Weight::from_parts(0, 5206).saturating_mul(p.into()))
-	}
-}
\ No newline at end of file
diff --git a/runtime/hydradx/src/weights/xcmp_queue.rs b/runtime/hydradx/src/weights/xcmp_queue.rs
deleted file mode 100644
index 1f3673e35..000000000
--- a/runtime/hydradx/src/weights/xcmp_queue.rs
+++ /dev/null
@@ -1,151 +0,0 @@
-// This file is part of HydraDX.
-
-// Copyright (C) 2020-2023  Intergalactic, Limited (GIB).
-// SPDX-License-Identifier: Apache-2.0
-
-// Licensed under the Apache License, Version 2.0 (the "License");
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://www.apache.org/licenses/LICENSE-2.0
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an "AS IS" BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-
-//! Autogenerated weights for `cumulus_pallet_xcmp_queue`
-//!
-//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 4.0.0-dev
-//! DATE: 2024-02-15, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]`
-//! WORST CASE MAP SIZE: `1000000`
-//! HOSTNAME: `bench-bot`, CPU: `Intel(R) Core(TM) i7-7700K CPU @ 4.20GHz`
-//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: 1024
-
-// Executed Command:
-// target/release/hydradx
-// benchmark
-// pallet
-// --chain=dev
-// --steps=10
-// --repeat=30
-// --wasm-execution=compiled
-// --heap-pages=4096
-// --template=.maintain/pallet-weight-template-no-back.hbs
-// --pallet=cumulus-pallet-xcmp-queue
-// --output=./weights/xcmp_queue.rs
-// --extrinsic=*
-
-#![cfg_attr(rustfmt, rustfmt_skip)]
-#![allow(unused_parens)]
-#![allow(unused_imports)]
-#![allow(missing_docs)]
-
-use frame_support::{traits::Get, weights::Weight};
-use core::marker::PhantomData;
-
-/// Weight functions for `cumulus_pallet_xcmp_queue`.
-pub struct HydraWeight<T>(PhantomData<T>);
-impl<T: frame_system::Config> cumulus_pallet_xcmp_queue::WeightInfo for HydraWeight<T> {
-	/// Storage: `XcmpQueue::QueueConfig` (r:1 w:1)
-	/// Proof: `XcmpQueue::QueueConfig` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	fn set_config_with_u32() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `142`
-		//  Estimated: `1627`
-		// Minimum execution time: 7_816_000 picoseconds.
-		Weight::from_parts(8_016_000, 1627)
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `XcmpQueue::QueueConfig` (r:1 w:1)
-	/// Proof: `XcmpQueue::QueueConfig` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	fn set_config_with_weight() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `142`
-		//  Estimated: `1627`
-		// Minimum execution time: 7_869_000 picoseconds.
-		Weight::from_parts(8_072_000, 1627)
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-	}
-	/// Storage: `XcmpQueue::QueueConfig` (r:1 w:0)
-	/// Proof: `XcmpQueue::QueueConfig` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `XcmpQueue::QueueSuspended` (r:1 w:0)
-	/// Proof: `XcmpQueue::QueueSuspended` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `XcmpQueue::DeferredQueueSuspended` (r:1 w:0)
-	/// Proof: `XcmpQueue::DeferredQueueSuspended` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `XcmpQueue::DeferredIndices` (r:1 w:1)
-	/// Proof: `XcmpQueue::DeferredIndices` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// Storage: `XcmpQueue::DeferredMessageBuckets` (r:3 w:3)
-	/// Proof: `XcmpQueue::DeferredMessageBuckets` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// Storage: `XcmpQueue::CounterForOverweight` (r:1 w:1)
-	/// Proof: `XcmpQueue::CounterForOverweight` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
-	/// Storage: `XcmpQueue::OverweightCount` (r:1 w:1)
-	/// Proof: `XcmpQueue::OverweightCount` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
-	/// Storage: `XcmpQueue::Overweight` (r:60 w:60)
-	/// Proof: `XcmpQueue::Overweight` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// The range of component `b` is `[1, 3]`.
-	fn service_deferred(b: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `6275 + b * (324357 ±0)`
-		//  Estimated: `9740 + b * (373857 ±0)`
-		// Minimum execution time: 33_398_415_000 picoseconds.
-		Weight::from_parts(57_262_807, 9740)
-			// Standard Error: 7_265_843
-			.saturating_add(Weight::from_parts(33_588_589_234, 0).saturating_mul(b.into()))
-			.saturating_add(T::DbWeight::get().reads(6))
-			.saturating_add(T::DbWeight::get().reads((21_u64).saturating_mul(b.into())))
-			.saturating_add(T::DbWeight::get().writes(3))
-			.saturating_add(T::DbWeight::get().writes((21_u64).saturating_mul(b.into())))
-			.saturating_add(Weight::from_parts(0, 373857).saturating_mul(b.into()))
-	}
-	/// Storage: `XcmpQueue::DeferredMessageBuckets` (r:1 w:1)
-	/// Proof: `XcmpQueue::DeferredMessageBuckets` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// The range of component `m` is `[1, 20]`.
-	fn discard_deferred_bucket(m: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `252 + m * (16216 ±0)`
-		//  Estimated: `3716 + m * (16216 ±0)`
-		// Minimum execution time: 1_285_382_000 picoseconds.
-		Weight::from_parts(242_447_351, 3716)
-			// Standard Error: 426_683
-			.saturating_add(Weight::from_parts(1_106_936_264, 0).saturating_mul(m.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-			.saturating_add(Weight::from_parts(0, 16216).saturating_mul(m.into()))
-	}
-	/// Storage: `XcmpQueue::DeferredMessageBuckets` (r:1 w:1)
-	/// Proof: `XcmpQueue::DeferredMessageBuckets` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// The range of component `m` is `[1, 20]`.
-	fn discard_deferred_individual(m: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `252 + m * (16216 ±0)`
-		//  Estimated: `3716 + m * (16216 ±0)`
-		// Minimum execution time: 1_351_709_000 picoseconds.
-		Weight::from_parts(116_677_544, 3716)
-			// Standard Error: 375_367
-			.saturating_add(Weight::from_parts(1_225_618_925, 0).saturating_mul(m.into()))
-			.saturating_add(T::DbWeight::get().reads(1))
-			.saturating_add(T::DbWeight::get().writes(1))
-			.saturating_add(Weight::from_parts(0, 16216).saturating_mul(m.into()))
-	}
-	/// Storage: `XcmpQueue::DeferredIndices` (r:1 w:1)
-	/// Proof: `XcmpQueue::DeferredIndices` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// Storage: `XcmpQueue::DeferredMessageBuckets` (r:1 w:1)
-	/// Proof: `XcmpQueue::DeferredMessageBuckets` (`max_values`: None, `max_size`: None, mode: `Measured`)
-	/// The range of component `m` is `[1, 20]`.
-	fn try_place_in_deferred_queue(m: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `0 + m * (16216 ±0)`
-		//  Estimated: `9724 + m * (15020 ±55)`
-		// Minimum execution time: 107_020_000 picoseconds.
-		Weight::from_parts(128_836_899, 9724)
-			// Standard Error: 222_629
-			.saturating_add(Weight::from_parts(6_772_210, 0).saturating_mul(m.into()))
-			.saturating_add(T::DbWeight::get().reads(2))
-			.saturating_add(T::DbWeight::get().writes(2))
-			.saturating_add(Weight::from_parts(0, 15020).saturating_mul(m.into()))
-	}
-}
\ No newline at end of file
diff --git a/runtime/hydradx/src/xcm.rs b/runtime/hydradx/src/xcm.rs
index 0f7c5d5cd..2384cfaa5 100644
--- a/runtime/hydradx/src/xcm.rs
+++ b/runtime/hydradx/src/xcm.rs
@@ -1,31 +1,30 @@
 use super::*;
-use sp_std::marker::PhantomData;
 
 use codec::MaxEncodedLen;
-use hydradx_adapters::{
-	MultiCurrencyTrader, RelayChainBlockNumberProvider, ReroutingMultiCurrencyAdapter, ToFeeReceiver,
-};
+use hydradx_adapters::{MultiCurrencyTrader, ReroutingMultiCurrencyAdapter, ToFeeReceiver};
 use pallet_transaction_multi_payment::DepositAll;
-use primitives::AssetId; // shadow glob import of polkadot_xcm::v3::prelude::AssetId
+use primitives::{AssetId, Price};
+use sp_std::marker::PhantomData; // shadow glob import of polkadot_xcm::v3::prelude::AssetId
 
-use cumulus_primitives_core::ParaId;
+use cumulus_primitives_core::{AggregateMessageOrigin, ParaId};
 use frame_support::{
 	parameter_types,
 	sp_runtime::traits::{AccountIdConversion, Convert},
-	traits::{ConstU32, Contains, ContainsPair, Everything, Get, Nothing},
+	traits::{ConstU32, Contains, ContainsPair, Everything, Get, Nothing, TransformOrigin},
 	PalletId,
 };
-use frame_system::EnsureRoot;
-use hydradx_adapters::xcm_exchange::XcmAssetExchanger;
-use hydradx_adapters::xcm_execute_filter::AllowTransferAndSwap;
+use hydradx_adapters::{xcm_exchange::XcmAssetExchanger, xcm_execute_filter::AllowTransferAndSwap};
 use orml_traits::{location::AbsoluteReserveProvider, parameter_type_with_key};
 use orml_xcm_support::{DepositToAlternative, IsNativeConcrete, MultiNativeAsset};
 use pallet_evm::AddressMapping;
+pub use pallet_xcm::GenesisConfig as XcmGenesisConfig;
 use pallet_xcm::XcmPassthrough;
+use parachains_common::message_queue::{NarrowOriginToSibling, ParaIdToSibling};
 use polkadot_parachain::primitives::{RelayChainBlockNumber, Sibling};
-use polkadot_xcm::v3::{prelude::*, Weight as XcmWeight};
-use primitives::Price;
+use polkadot_xcm::v3::MultiLocation;
+use polkadot_xcm::v4::{prelude::*, Asset, InteriorLocation, Weight as XcmWeight};
 use scale_info::TypeInfo;
+use sp_runtime::{traits::MaybeEquivalence, Perbill};
 use xcm_builder::{
 	AccountId32Aliases, AllowKnownQueryResponses, AllowSubscriptionsFrom, AllowTopLevelPaidExecutionFrom,
 	DescribeAllTerminal, DescribeFamily, EnsureXcmOrigin, FixedWeightBounds, HashedDescription, ParentIsPreset,
@@ -35,7 +34,22 @@ use xcm_builder::{
 use xcm_executor::{Config, XcmExecutor};
 
 #[derive(Debug, Default, Encode, Decode, Clone, PartialEq, Eq, TypeInfo, MaxEncodedLen)]
-pub struct AssetLocation(pub polkadot_xcm::v3::MultiLocation);
+pub struct AssetLocation(pub polkadot_xcm::v3::Location);
+
+impl From<AssetLocation> for Option<Location> {
+	fn from(location: AssetLocation) -> Option<Location> {
+		xcm_builder::V4V3LocationConverter::convert_back(&location.0)
+	}
+}
+
+impl TryFrom<Location> for AssetLocation {
+	type Error = ();
+
+	fn try_from(value: Location) -> Result<Self, Self::Error> {
+		let loc: MultiLocation = value.try_into()?;
+		Ok(AssetLocation(loc))
+	}
+}
 
 pub type LocalOriginToLocation = SignedToAccountId32<RuntimeOrigin, AccountId, RelayNetwork>;
 
@@ -56,7 +70,12 @@ pub type Barrier = (
 );
 
 parameter_types! {
-	pub SelfLocation: MultiLocation = MultiLocation::new(1, X1(Parachain(ParachainInfo::get().into())));
+	pub const RelayOrigin: AggregateMessageOrigin = AggregateMessageOrigin::Parent;
+}
+
+use sp_std::sync::Arc;
+parameter_types! {
+	pub SelfLocation: Location = Location::new(1, cumulus_primitives_core::Junctions::X1(Arc::new([cumulus_primitives_core::Junction::Parachain(ParachainInfo::get().into());1])));
 }
 
 parameter_types! {
@@ -64,7 +83,7 @@ parameter_types! {
 
 	pub RelayChainOrigin: RuntimeOrigin = cumulus_pallet_xcm::Origin::Relay.into();
 
-	pub Ancestry: MultiLocation = Parachain(ParachainInfo::parachain_id().into()).into();
+	pub Ancestry: Location = Parachain(ParachainInfo::parachain_id().into()).into();
 }
 
 /// This is the type we use to convert an (incoming) XCM origin into a local `Origin` instance,
@@ -98,25 +117,24 @@ parameter_types! {
 	pub const MaxXcmDepth: u16 = 5;
 	pub const MaxNumberOfInstructions: u16 = 100;
 
-	pub UniversalLocation: InteriorMultiLocation = X2(GlobalConsensus(RelayNetwork::get()), Parachain(ParachainInfo::parachain_id().into()));
-
-	pub AssetHubLocation: MultiLocation = (Parent, Parachain(1000)).into();
+	pub UniversalLocation: InteriorLocation = [GlobalConsensus(RelayNetwork::get()), Parachain(ParachainInfo::parachain_id().into())].into();
+	pub AssetHubLocation: Location = (Parent, Parachain(ASSET_HUB_PARA_ID)).into();
 }
 
 /// Matches foreign assets from a given origin.
 /// Foreign assets are assets bridged from other consensus systems. i.e parents > 1.
 pub struct IsForeignNativeAssetFrom<Origin>(PhantomData<Origin>);
-impl<Origin> ContainsPair<MultiAsset, MultiLocation> for IsForeignNativeAssetFrom<Origin>
+impl<Origin> ContainsPair<Asset, Location> for IsForeignNativeAssetFrom<Origin>
 where
-	Origin: Get<MultiLocation>,
+	Origin: Get<Location>,
 {
-	fn contains(asset: &MultiAsset, origin: &MultiLocation) -> bool {
+	fn contains(asset: &Asset, origin: &Location) -> bool {
 		let loc = Origin::get();
 		&loc == origin
 			&& matches!(
 				asset,
-				MultiAsset {
-					id: Concrete(MultiLocation { parents: 2, .. }),
+				Asset {
+					id: AssetId(Location { parents: 2, .. }),
 					fun: Fungible(_),
 				},
 			)
@@ -169,6 +187,7 @@ impl Config for XcmConfig {
 	type CallDispatcher = RuntimeCall;
 	type SafeCallFilter = SafeCallFilter;
 	type Aliasers = Nothing;
+	type TransactionalProcessor = xcm_builder::FrameTransactionalProcessor;
 }
 
 impl cumulus_pallet_xcm::Config for Runtime {
@@ -180,36 +199,25 @@ parameter_types! {
 	pub const MaxDeferredMessages: u32 = 20;
 	pub const MaxDeferredBuckets: u32 = 1_000;
 	pub const MaxBucketsProcessed: u32 = 3;
+	pub const MaxInboundSuspended: u32 = 1_000;
 }
 
 impl cumulus_pallet_xcmp_queue::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
-	type XcmExecutor = XcmExecutor<XcmConfig>;
 	type ChannelInfo = ParachainSystem;
 	type VersionWrapper = PolkadotXcm;
-	type ExecuteOverweightOrigin = EnsureRoot<AccountId>;
 	type ControllerOrigin = MoreThanHalfTechCommittee;
 	type ControllerOriginConverter = XcmOriginToCallOrigin;
-	type PriceForSiblingDelivery = ();
-	type WeightInfo = weights::xcmp_queue::HydraWeight<Runtime>;
-	type ExecuteDeferredOrigin = EnsureRoot<AccountId>;
-	type MaxDeferredMessages = MaxDeferredMessages;
-	type MaxDeferredBuckets = MaxDeferredBuckets;
-	type MaxBucketsProcessed = MaxBucketsProcessed;
-	type RelayChainBlockNumberProvider = RelayChainBlockNumberProvider<Runtime>;
-	type XcmDeferFilter = XcmRateLimiter;
-}
-
-impl cumulus_pallet_dmp_queue::Config for Runtime {
-	type RuntimeEvent = RuntimeEvent;
-	type XcmExecutor = XcmExecutor<XcmConfig>;
-	type ExecuteOverweightOrigin = EnsureRoot<AccountId>;
+	type PriceForSiblingDelivery = polkadot_runtime_common::xcm_sender::NoPriceForMessageDelivery<ParaId>;
+	type WeightInfo = weights::cumulus_pallet_xcmp_queue::HydraWeight<Runtime>;
+	type XcmpQueue = TransformOrigin<MessageQueue, AggregateMessageOrigin, ParaId, ParaIdToSibling>;
+	type MaxInboundSuspended = MaxInboundSuspended;
 }
 
 const ASSET_HUB_PARA_ID: u32 = 1000;
 
 parameter_type_with_key! {
-	pub ParachainMinFee: |location: MultiLocation| -> Option<u128> {
+	pub ParachainMinFee: |location: Location| -> Option<u128> {
 		#[allow(clippy::match_ref_pats)] // false positive
 		match (location.parents, location.first_interior()) {
 			(1, Some(Parachain(ASSET_HUB_PARA_ID))) => Some(50_000_000),
@@ -223,16 +231,18 @@ impl orml_xtokens::Config for Runtime {
 	type Balance = Balance;
 	type CurrencyId = AssetId;
 	type CurrencyIdConvert = CurrencyIdConvert;
-	type AccountIdToMultiLocation = AccountIdToMultiLocation;
+	type AccountIdToLocation = AccountIdToMultiLocation;
 	type SelfLocation = SelfLocation;
 	type XcmExecutor = XcmExecutor<XcmConfig>;
 	type Weigher = FixedWeightBounds<BaseXcmWeight, RuntimeCall, MaxInstructions>;
 	type BaseXcmWeight = BaseXcmWeight;
 	type MaxAssetsForTransfer = MaxAssetsForTransfer;
-	type MultiLocationsFilter = Everything;
+	type LocationsFilter = Everything;
 	type ReserveProvider = AbsoluteReserveProvider;
 	type MinXcmFee = ParachainMinFee;
 	type UniversalLocation = UniversalLocation;
+	type RateLimiter = (); // do not use rate limiter
+	type RateLimiterId = ();
 }
 
 impl orml_unknown_tokens::Config for Runtime {
@@ -244,11 +254,6 @@ impl orml_xcm::Config for Runtime {
 	type SovereignOrigin = MoreThanHalfCouncil;
 }
 
-#[cfg(feature = "runtime-benchmarks")]
-parameter_types! {
-	pub ReachableDest: Option<MultiLocation> = Some(Parent.into());
-}
-
 impl pallet_xcm::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
 	type Currency = Balances;
@@ -269,9 +274,7 @@ impl pallet_xcm::Config for Runtime {
 	type TrustedLockers = ();
 	type SovereignAccountOf = ();
 	type MaxLockers = ConstU32<8>;
-	type WeightInfo = weights::xcm::HydraWeight<Runtime>;
-	#[cfg(feature = "runtime-benchmarks")]
-	type ReachableDest = ReachableDest;
+	type WeightInfo = weights::pallet_xcm::HydraWeight<Runtime>;
 	type AdminOrigin = MajorityOfCouncil;
 	type MaxRemoteLockConsumers = ConstU32<0>;
 	type RemoteLockConsumerIdentifier = ();
@@ -297,75 +300,89 @@ fn defer_duration_configuration() {
 parameter_types! {
 	pub DeferDuration: RelayChainBlockNumber = 600 * 36; // 36 hours
 	pub MaxDeferDuration: RelayChainBlockNumber = 600 * 24 * 10; // 10 days
+
+	pub MessageQueueServiceWeight: Weight = Perbill::from_percent(25) * BlockWeights::get().max_block;
+	pub const MessageQueueMaxStale: u32 = 8;
+	pub const MessageQueueHeapSize: u32 = 128 * 1048;
 }
 
-impl pallet_xcm_rate_limiter::Config for Runtime {
+impl pallet_message_queue::Config for Runtime {
 	type RuntimeEvent = RuntimeEvent;
-	type AssetId = AssetId;
-	type DeferDuration = DeferDuration;
-	type MaxDeferDuration = MaxDeferDuration;
-	type RelayBlockNumberProvider = RelayChainBlockNumberProvider<Runtime>;
-	type CurrencyIdConvert = CurrencyIdConvert;
-	type RateLimitFor = pallet_asset_registry::XcmRateLimitsInRegistry<Runtime>;
+	type WeightInfo = weights::pallet_message_queue::HydraWeight<Runtime>;
+	#[cfg(feature = "runtime-benchmarks")]
+	type MessageProcessor =
+		pallet_message_queue::mock_helpers::NoopMessageProcessor<cumulus_primitives_core::AggregateMessageOrigin>;
+	#[cfg(not(feature = "runtime-benchmarks"))]
+	type MessageProcessor = xcm_builder::ProcessXcmMessage<AggregateMessageOrigin, XcmExecutor<XcmConfig>, RuntimeCall>;
+	type Size = u32;
+	type QueueChangeHandler = NarrowOriginToSibling<XcmpQueue>;
+	type QueuePausedQuery = NarrowOriginToSibling<XcmpQueue>;
+	type HeapSize = MessageQueueHeapSize;
+	type MaxStale = MessageQueueMaxStale;
+	type ServiceWeight = MessageQueueServiceWeight;
 }
 
 pub struct CurrencyIdConvert;
 use crate::evm::ExtendedAddressMapping;
 use primitives::constants::chain::CORE_ASSET_ID;
 
-impl Convert<AssetId, Option<MultiLocation>> for CurrencyIdConvert {
-	fn convert(id: AssetId) -> Option<MultiLocation> {
+impl Convert<AssetId, Option<Location>> for CurrencyIdConvert {
+	fn convert(id: AssetId) -> Option<Location> {
 		match id {
-			CORE_ASSET_ID => Some(MultiLocation::new(
-				1,
-				X2(Parachain(ParachainInfo::get().into()), GeneralIndex(id.into())),
-			)),
-			_ => AssetRegistry::asset_to_location(id).map(|loc| loc.0),
+			CORE_ASSET_ID => Some(Location {
+				parents: 1,
+				interior: [Parachain(ParachainInfo::get().into()), GeneralIndex(id.into())].into(),
+			}),
+			_ => {
+				let loc = AssetRegistry::asset_to_location(id);
+				if let Some(location) = loc {
+					location.into()
+				} else {
+					None
+				}
+			}
 		}
 	}
 }
 
-impl Convert<MultiLocation, Option<AssetId>> for CurrencyIdConvert {
-	fn convert(location: MultiLocation) -> Option<AssetId> {
-		match location {
-			MultiLocation {
-				parents,
-				interior: X2(Parachain(id), GeneralIndex(index)),
-			} if parents == 1 && ParaId::from(id) == ParachainInfo::get() && (index as u32) == CORE_ASSET_ID => {
-				// Handling native asset for this parachain
+impl Convert<Location, Option<AssetId>> for CurrencyIdConvert {
+	fn convert(location: Location) -> Option<AssetId> {
+		let Location { parents, interior } = location.clone();
+
+		match interior {
+			Junctions::X2(a)
+				if parents == 1
+					&& a.contains(&GeneralIndex(CORE_ASSET_ID.into()))
+					&& a.contains(&Parachain(ParachainInfo::get().into())) =>
+			{
 				Some(CORE_ASSET_ID)
 			}
-			// handle reanchor canonical location: https://github.com/paritytech/polkadot/pull/4470
-			MultiLocation {
-				parents: 0,
-				interior: X1(GeneralIndex(index)),
-			} if (index as u32) == CORE_ASSET_ID => Some(CORE_ASSET_ID),
-			// delegate to asset-registry
-			_ => AssetRegistry::location_to_asset(AssetLocation(location)),
+			Junctions::X1(a) if parents == 0 && a.contains(&GeneralIndex(CORE_ASSET_ID.into())) => Some(CORE_ASSET_ID),
+			_ => {
+				let location: Option<AssetLocation> = location.try_into().ok();
+				if let Some(location) = location {
+					AssetRegistry::location_to_asset(location)
+				} else {
+					None
+				}
+			}
 		}
 	}
 }
 
-impl Convert<MultiAsset, Option<AssetId>> for CurrencyIdConvert {
-	fn convert(asset: MultiAsset) -> Option<AssetId> {
-		if let MultiAsset {
-			id: Concrete(location), ..
-		} = asset
-		{
-			Self::convert(location)
-		} else {
-			None
-		}
+impl Convert<Asset, Option<AssetId>> for CurrencyIdConvert {
+	fn convert(asset: Asset) -> Option<AssetId> {
+		Self::convert(asset.id.0)
 	}
 }
 
 pub struct AccountIdToMultiLocation;
-impl Convert<AccountId, MultiLocation> for AccountIdToMultiLocation {
-	fn convert(account: AccountId) -> MultiLocation {
-		X1(AccountId32 {
+impl Convert<AccountId, Location> for AccountIdToMultiLocation {
+	fn convert(account: AccountId) -> Location {
+		[AccountId32 {
 			network: None,
 			id: account.into(),
-		})
+		}]
 		.into()
 	}
 }
@@ -399,14 +416,18 @@ use xcm_executor::traits::ConvertLocation;
 /// Converts Account20 (ethereum) addresses to AccountId32 (substrate) addresses.
 pub struct EvmAddressConversion<Network>(PhantomData<Network>);
 impl<Network: Get<Option<NetworkId>>> ConvertLocation<AccountId> for EvmAddressConversion<Network> {
-	fn convert_location(location: &MultiLocation) -> Option<AccountId> {
-		match location {
-			MultiLocation {
-				parents: 0,
-				interior: X1(AccountKey20 { network: _, key }),
-			} => {
-				let account_32 = ExtendedAddressMapping::into_account_id(H160::from(key));
-				Some(account_32)
+	fn convert_location(location: &Location) -> Option<AccountId> {
+		let Location { parents, interior } = location;
+		match interior {
+			Junctions::X1(a) if *parents == 0 => {
+				let j = a.as_ref()[0];
+				match j {
+					AccountKey20 { network: _, key } => {
+						let account_32 = ExtendedAddressMapping::into_account_id(H160::from(key));
+						Some(account_32)
+					}
+					_ => None,
+				}
 			}
 			_ => None,
 		}
diff --git a/rust-toolchain b/rust-toolchain
index dacd22ff5..fa4029d55 100644
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -1,5 +1,5 @@
 [toolchain]
 channel = "1.75.0"
-components = [ "rustfmt", "clippy" ]
+components = [ "rustfmt", "clippy", "rust-src" ]
 targets = [ "wasm32-unknown-unknown" ]
 profile = "minimal"
diff --git a/scraper/Cargo.toml b/scraper/Cargo.toml
index 0778e7776..a7c66357f 100644
--- a/scraper/Cargo.toml
+++ b/scraper/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "scraper"
-version = "1.2.3"
+version = "1.2.4"
 description = "Scraper tool"
 authors = ["GalacticCouncil"]
 edition = "2021"
diff --git a/scraper/src/lib.rs b/scraper/src/lib.rs
index 71d31e596..8e112aea6 100644
--- a/scraper/src/lib.rs
+++ b/scraper/src/lib.rs
@@ -148,7 +148,7 @@ fn extend_externalities_should_work() {
 			hydradx_runtime::Balances::free_balance(hydradx_runtime::AccountId::from(BOB)),
 			0
 		);
-		assert_ok!(hydradx_runtime::Balances::transfer(
+		assert_ok!(hydradx_runtime::Balances::transfer_allow_death(
 			hydradx_runtime::RuntimeOrigin::signed(ALICE.into()),
 			BOB.into(),
 			1_000_000_000_000,
@@ -179,7 +179,7 @@ fn save_and_load_externalities_should_work() {
 			hydradx_runtime::Balances::free_balance(hydradx_runtime::AccountId::from(BOB)),
 			0
 		);
-		assert_ok!(hydradx_runtime::Balances::transfer(
+		assert_ok!(hydradx_runtime::Balances::transfer_allow_death(
 			hydradx_runtime::RuntimeOrigin::signed(ALICE.into()),
 			BOB.into(),
 			1_000_000_000_000,
diff --git a/scripts/benchmark.all.sh b/scripts/benchmark.all.sh
deleted file mode 100755
index 80efc96c0..000000000
--- a/scripts/benchmark.all.sh
+++ /dev/null
@@ -1,57 +0,0 @@
-#!/bin/bash
-
-pallets=(
-"pallet-balances:balances"
-"pallet-bonds:bonds"
-"pallet-circuit-breaker:circuit_breaker"
-"pallet-claims:claims"
-"pallet-collator-selection:collator_selection"
-"council:council"
-"pallet-currencies:currencies"
-"pallet-dca:dca"
-"pallet-democracy:democracy"
-"pallet-duster:duster"
-"pallet-ema-oracle:ema_oracle"
-"pallet-identity:identity"
-"pallet-lbp:lbp"
-"pallet-omnipool:omnipool"
-"pallet-omnipool-liquidity-mining:omnipool_lm"
-"pallet-otc:otc"
-"pallet-transaction-multi-payment:payment"
-"pallet-preimage:preimage"
-"pallet-proxy:proxy"
-"pallet-asset-registry:registry"
-"pallet-route-executor:route_executor"
-"pallet-scheduler:scheduler"
-"pallet-stableswap:stableswap"
-"pallet-staking:staking"
-"frame-system:system"
-"tech:technical_committee"
-"pallet-timestamp:timestamp"
-"orml-tokens:tokens"
-"pallet-transaction-pause:transaction_pause"
-"pallet-treasury:treasury"
-"pallet-utility:utility"
-"orml-vesting:vesting"
-"pallet-xcm:xcm"
-"cumulus-pallet-xcmp-queue:xcmp_queue"
-"pallet-xyk:xyk"
-"pallet-referrals:referrals"
-)
-
-command="cargo run --bin hydradx --release --features=runtime-benchmarks -- benchmark pallet --pallet=[pallet] --wasm-execution=compiled --heap-pages=4096 --chain=dev --extrinsic='*' --steps=5 --repeat=20 --output [output].rs --template .maintain/pallet-weight-template-no-back.hbs"
-
-for string in "${pallets[@]}"; do
-
-  IFS=':' read -ra subvalues <<< "$string"
-
-  pallet="${subvalues[0]}"
-  output="${subvalues[1]}"
-
-  echo "Running benchmark for ${pallet}"
-
-  replaced_command="${command/\[pallet\]/$pallet}"
-  replaced_command="${replaced_command/\[output\]/$output}"
-
-  eval "$replaced_command"
-done
diff --git a/scripts/benchmarking.sh b/scripts/benchmarking.sh
new file mode 100755
index 000000000..6d41af562
--- /dev/null
+++ b/scripts/benchmarking.sh
@@ -0,0 +1,94 @@
+#!/usr/bin/env bash
+# Created by Moonbeam/Purestake Developers. Shamelessly copied from Moonbeam's benchmarking script
+# Original repository: https://github.com/moonbeam-foundation/moonbeam
+
+# This script can be used for running HydraDX's benchmarks.
+#
+# The hydradx binary is required to be compiled with --features=runtime-benchmarks
+# in release mode.
+
+set -e
+
+BINARY="./target/release/hydradx"
+STEPS=50
+REPEAT=20
+
+if [[ ! -f "${BINARY}" ]]; then
+    echo "binary '${BINARY}' does not exist."
+    echo "ensure that the hydradx binary is compiled with '--features=runtime-benchmarks' and in release mode."
+    exit 1
+fi
+
+function help {
+    echo "USAGE:"
+    echo "  ${0} [<pallet> <benchmark>] [--check]"
+    echo ""
+    echo "EXAMPLES:"
+    echo "  ${0}                       " "list all benchmarks and provide a selection to choose from"
+    echo "  ${0} --check               " "list all benchmarks and provide a selection to choose from, runs in 'check' mode (reduced steps and repetitions)"
+    echo "  ${0} foo bar               " "run a benchmark for pallet 'foo' and benchmark 'bar'"
+    echo "  ${0} foo bar --check       " "run a benchmark for pallet 'foo' and benchmark 'bar' in 'check' mode (reduced steps and repetitions)"
+    echo "  ${0} --all         " "run a benchmark for all pallets"
+    echo "  ${0} --all --check " "run a benchmark for all pallets in 'check' mode (reduced steps and repetitions)"
+}
+
+function choose_and_bench {
+    while read benchmark; do
+        options+=("$benchmark")
+    done < <(${BINARY} benchmark pallet --list | sed 1d)
+
+    options+=('EXIT')
+
+    select opt in "${options[@]}"; do
+        IFS=', ' read -ra parts <<< "${opt}"
+        [[ "${opt}" == 'EXIT' ]] && exit 0
+
+        bench "${parts[0]}" "${parts[1]}" "${1}"
+        break
+    done
+}
+
+function bench {
+    OUTPUT=${4:-weights.rs}
+    echo "benchmarking '${1}::${2}' --check=${3}, writing results to '${OUTPUT}'"
+
+    # Check enabled
+    if [[ "${3}" -eq 1 ]]; then
+        STEPS=16
+        REPEAT=1
+    fi
+
+    WASMTIME_BACKTRACE_DETAILS=1 ${BINARY} benchmark pallet \
+        --wasm-execution=compiled \
+        --pallet "${1}" \
+        --extrinsic "${2}" \
+        --heap-pages 4096 \
+        --steps "${STEPS}" \
+        --repeat "${REPEAT}" \
+        --template=scripts/pallet-weight-template.hbs \
+        --output "${OUTPUT}"
+}
+
+if [[ "${@}" =~ "--help" ]]; then
+    help
+else
+    CHECK=0
+    if [[ "${@}" =~ "--check" ]]; then
+        CHECK=1
+        set -o noglob && set -- ${@/'--check'} && set +o noglob
+    fi
+
+    ALL=0
+    if [[ "${@}" =~ "--all" ]]; then
+        ALL=1
+    fi
+
+    if [[ "${ALL}" -eq 1 ]]; then
+        mkdir -p weights/
+        bench '*' '*' "${CHECK}" "weights/"
+    elif [[ $# -ne 2 ]]; then
+        choose_and_bench "${CHECK}"
+    else
+        bench "${1}" "${2}" "${CHECK}"
+    fi
+fi
\ No newline at end of file
diff --git a/scripts/check_performance.sh b/scripts/check_performance.sh
deleted file mode 100755
index fab05e359..000000000
--- a/scripts/check_performance.sh
+++ /dev/null
@@ -1,96 +0,0 @@
-#!/bin/bash
-
-# Need to run from the top-level node directory
-[ -d ".maintain" ] || {
-  echo "This script must be executed from the top level node directory"
-  exit 1
-}
-
-echo "HydraDX node - Simple Performance check"
-echo "---------------------------------------"
-
-echo
-echo "Prerequisites"
-
-echo -n "Python version >= 3.8 ..... "
-
-PYTHON=python3
-
-command -v $PYTHON >/dev/null 2>&1 || {
-  echo "python3 required. Please install first"
-  exit 1
-}
-
-if ! $PYTHON -c 'import sys; assert sys.version_info >= (3,8)' >/dev/null 2>&1; then
-  echo "Python version 3.8 or higher required."
-  exit 1
-fi
-
-echo "OK ($($PYTHON --version))"
-
-echo -n "Toolchain ...... "
-TOOLCHAIN=$(rustup show active-toolchain)
-
-if [[ $TOOLCHAIN == "nightly"* ]]; then
-  echo "OK ($TOOLCHAIN)"
-else
-  echo "Nightly toolchain required"
-  echo "Current toolchain $TOOLCHAIN"
-  exit 1
-fi
-
-EXPECTED_BENCHWIZARD_VERSION="0.5.2"
-
-echo -n "benchwizard >= $EXPECTED_BENCHWIZARD_VERSION ..... "
-
-$PYTHON -m bench_wizard >/dev/null 2>&1 || {
-  echo "benchwizard required. benchwizard is cli tool developed by HydraDX dev to streamline substrate benchmark process."
-  echo "Installation: pip3 install bench-wizard"
-  echo
-  read -p "Do you want to install it now? [Y/n] " -n 1 -r
-  echo # move to a new line
-  if [[ ! $REPLY =~ ^[Yy]$ ]]; then
-    exit 1
-  fi
-
-  pip3 install bench-wizard >/dev/null || {
-    echo "benchwizard installation failed."
-    exit 1
-  }
-}
-
-CURRENT_BENCH_VERSION=$($PYTHON -m bench_wizard version | tr -d '\n')
-
-if [[ $EXPECTED_BENCHWIZARD_VERSION > $CURRENT_BENCH_VERSION ]]; then
-  echo "Please upgrade benchwizard (current version $CURRENT_BENCH_VERSION): pip3 install bench-wizard --upgrade"
-  read -p "Do you want to upgrade it now? [Y/n] " -n 1 -r
-  echo # move to a new line
-  if [[ ! $REPLY =~ ^[Yy]$ ]]; then
-    exit 1
-  fi
-
-  pip3 install bench-wizard --upgrade >/dev/null || {
-    echo "benchwizard upgrade failed."
-    exit 1
-  }
-fi
-
-echo "OK ($($PYTHON -m bench_wizard version))"
-
-echo
-
-# Run the check
-# shellcheck disable=SC2086
-$PYTHON -m bench_wizard pc -p pallet-claims -c local -rf .maintain/bench-check/hydradx-bench-data.json
-
-echo
-
-# Run DB performance check
-echo "Running DB disk performance"
-if [ ! -d ./substrate ];then
-  echo "Cloning substrate ... "
-  git clone  --branch=polkadot-v0.9.16 https://github.com/paritytech/substrate.git ./substrate >/dev/null 2>&1
-fi
-$PYTHON -m bench_wizard db -d ./substrate
-
-echo
diff --git a/.maintain/pallet-weight-template-no-back.hbs b/scripts/pallet-weight-template.hbs
old mode 100644
new mode 100755
similarity index 91%
rename from .maintain/pallet-weight-template-no-back.hbs
rename to scripts/pallet-weight-template.hbs
index f0ab2b887..107c8ea67
--- a/.maintain/pallet-weight-template-no-back.hbs
+++ b/scripts/pallet-weight-template.hbs
@@ -15,13 +15,14 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+{{header}}
 //! Autogenerated weights for `{{pallet}}`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION {{version}}
 //! DATE: {{date}}, STEPS: `{{cmd.steps}}`, REPEAT: `{{cmd.repeat}}`, LOW RANGE: `{{cmd.lowest_range_values}}`, HIGH RANGE: `{{cmd.highest_range_values}}`
 //! WORST CASE MAP SIZE: `{{cmd.worst_case_map_values}}`
 //! HOSTNAME: `{{hostname}}`, CPU: `{{cpuname}}`
-//! WASM-EXECUTION: `{{cmd.wasm_execution}}`, CHAIN: `{{cmd.chain}}`, DB CACHE: {{cmd.db_cache}}
+//! WASM-EXECUTION: `{{cmd.wasm_execution}}`, CHAIN: `{{cmd.chain}}`, DB CACHE: `{{cmd.db_cache}}`
 
 // Executed Command:
 {{#each args as |arg|}}
@@ -33,10 +34,13 @@
 #![allow(unused_imports)]
 #![allow(missing_docs)]
 
-use frame_support::{traits::Get, weights::Weight};
+use frame_support::{traits::Get, weights::{Weight, constants::RocksDbWeight}};
 use core::marker::PhantomData;
 
-/// Weight functions for `{{pallet}}`.
+/// Weights for `{{pallet}}`.
+pub struct WeightInfo<T>(PhantomData<T>);
+
+/// Weights for `{{pallet}}` using the HydraDX node and recommended hardware.
 pub struct HydraWeight<T>(PhantomData<T>);
 impl<T: frame_system::Config> {{pallet}}::WeightInfo for HydraWeight<T> {
 	{{#each benchmarks as |benchmark|}}
@@ -61,13 +65,13 @@ impl<T: frame_system::Config> {{pallet}}::WeightInfo for HydraWeight<T> {
 			.saturating_add(Weight::from_parts({{underscore cw.slope}}, 0).saturating_mul({{cw.name}}.into()))
 			{{/each}}
 			{{#if (ne benchmark.base_reads "0")}}
-			.saturating_add(T::DbWeight::get().reads({{benchmark.base_reads}}))
+			.saturating_add(T::DbWeight::get().reads({{benchmark.base_reads}}_u64))
 			{{/if}}
 			{{#each benchmark.component_reads as |cr|}}
 			.saturating_add(T::DbWeight::get().reads(({{cr.slope}}_u64).saturating_mul({{cr.name}}.into())))
 			{{/each}}
 			{{#if (ne benchmark.base_writes "0")}}
-			.saturating_add(T::DbWeight::get().writes({{benchmark.base_writes}}))
+			.saturating_add(T::DbWeight::get().writes({{benchmark.base_writes}}_u64))
 			{{/if}}
 			{{#each benchmark.component_writes as |cw|}}
 			.saturating_add(T::DbWeight::get().writes(({{cw.slope}}_u64).saturating_mul({{cw.name}}.into())))