diff --git a/Cargo.lock b/Cargo.lock
index 6fa34f48f..f8e2df769 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -68,7 +68,7 @@ dependencies = [
  "cipher 0.4.4",
  "ctr",
  "ghash",
- "subtle 2.4.1",
+ "subtle 2.6.1",
 ]
 
 [[package]]
@@ -206,9 +206,9 @@ dependencies = [
 
 [[package]]
 name = "anyhow"
-version = "1.0.76"
+version = "1.0.86"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59d2a3357dde987206219e78ecfbbb6e8dad06cbb65292758d3270e6254f7355"
+checksum = "b3d1d046238990b9cf5bcde22a3fb3584ee5cf65fb2765f454ed428c7a0063da"
 
 [[package]]
 name = "approx"
@@ -219,6 +219,20 @@ dependencies = [
  "num-traits",
 ]
 
+[[package]]
+name = "aquamarine"
+version = "0.3.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d1da02abba9f9063d786eab1509833ebb2fac0f966862ca59439c76b9c566760"
+dependencies = [
+ "include_dir",
+ "itertools 0.10.5",
+ "proc-macro-error",
+ "proc-macro2",
+ "quote",
+ "syn 1.0.109",
+]
+
 [[package]]
 name = "aquamarine"
 version = "0.5.0"
@@ -503,7 +517,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94893f1e0c6eeab764ade8dc4c0db24caf4fe7cbbaafc0eba0a9030f447b5185"
 dependencies = [
  "num-traits",
- "rand",
+ "rand 0.8.5",
  "rayon",
 ]
 
@@ -547,12 +561,6 @@ dependencies = [
  "nodrop",
 ]
 
-[[package]]
-name = "arrayvec"
-version = "0.5.2"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "23b62fc65de8e4e7f52534fb52b0f3ed04746ae267519eef2a83941e8085068b"
-
 [[package]]
 name = "arrayvec"
 version = "0.7.4"
@@ -767,9 +775,9 @@ checksum = "e1d90cd0b264dfdd8eb5bad0a2c217c1f88fa96a8573f40e7b12de23fb468f46"
 
 [[package]]
 name = "async-trait"
-version = "0.1.75"
+version = "0.1.81"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fdf6721fb0140e4f897002dd086c06f6c27775df19cfe1fccb21181a48fd2c98"
+checksum = "6e0c28dcc82d7c8ead5cb13beb15405b57b8546e93215673ff8ca0349a028107"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -864,7 +872,7 @@ dependencies = [
  "ark-std",
  "dleq_vrf",
  "fflonk",
- "merlin 3.0.0",
+ "merlin",
  "rand_chacha 0.3.1",
  "rand_core 0.6.4",
  "ring 0.1.0",
@@ -898,6 +906,12 @@ version = "0.21.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "35636a1494ede3b646cc98f74f8e62c773a38a659ebc777a2cf26b9b74171df9"
 
+[[package]]
+name = "base64"
+version = "0.22.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "72b3254f16251a8381aa12e40e3c4d2f0199f8c6508fbecb9d91f575e0fbb8c6"
+
 [[package]]
 name = "base64ct"
 version = "1.6.0"
@@ -925,7 +939,7 @@ dependencies = [
 [[package]]
 name = "binary-merkle-tree"
 version = "13.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "hash-db 0.16.0",
  "log",
@@ -967,11 +981,7 @@ version = "2.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "93f2635620bf0b9d4576eb7bb9a38a55df78bd1205d26fa994b25911a69f212f"
 dependencies = [
- "bitcoin_hashes",
- "rand",
- "rand_core 0.6.4",
- "serde",
- "unicode-normalization",
+ "bitcoin_hashes 0.11.0",
 ]
 
 [[package]]
@@ -989,12 +999,28 @@ version = "0.6.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "349f9b6a179ed607305526ca489b34ad0a41aed5f7980fa90eb03160b69598fb"
 
+[[package]]
+name = "bitcoin-internals"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9425c3bf7089c983facbae04de54513cce73b41c7f9ff8c845b54e7bc64ebbfb"
+
 [[package]]
 name = "bitcoin_hashes"
 version = "0.11.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "90064b8dee6815a6470d60bad07bbbaee885c0e12d04177138fa3291a01b7bc4"
 
+[[package]]
+name = "bitcoin_hashes"
+version = "0.13.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1930a4dabfebb8d7d9992db18ebe3ae2876f0a305fab206fd168df931ede293b"
+dependencies = [
+ "bitcoin-internals",
+ "hex-conservative",
+]
+
 [[package]]
 name = "bitflags"
 version = "1.3.2"
@@ -1086,18 +1112,6 @@ dependencies = [
  "constant_time_eq 0.3.0",
 ]
 
-[[package]]
-name = "block-buffer"
-version = "0.7.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c0940dc441f31689269e10ac70eb1002a3a1d3ad1390e030043662eb7fe4688b"
-dependencies = [
- "block-padding",
- "byte-tools",
- "byteorder",
- "generic-array 0.12.4",
-]
-
 [[package]]
 name = "block-buffer"
 version = "0.9.0"
@@ -1116,15 +1130,6 @@ dependencies = [
  "generic-array 0.14.7",
 ]
 
-[[package]]
-name = "block-padding"
-version = "0.1.5"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "fa79dedbb091f449f1f39e53edf88d5dbe95f895dae6135a8d7b881fb5af73f5"
-dependencies = [
- "byte-tools",
-]
-
 [[package]]
 name = "blocking"
 version = "1.5.1"
@@ -1165,7 +1170,7 @@ dependencies = [
 [[package]]
 name = "bp-xcm-bridge-hub-router"
 version = "0.6.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -1199,16 +1204,6 @@ dependencies = [
  "regex-automata 0.1.10",
 ]
 
-[[package]]
-name = "bstr"
-version = "1.8.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "542f33a8835a0884b006a0c3df3dadd99c0c3f296ed26c2fdc8028e01ad6230c"
-dependencies = [
- "memchr",
- "serde",
-]
-
 [[package]]
 name = "build-helper"
 version = "0.1.1"
@@ -1250,9 +1245,9 @@ checksum = "1fd0f2584146f6f2ef48085050886acf353beff7305ebd1ae69500e27c67f64b"
 
 [[package]]
 name = "bytes"
-version = "1.5.0"
+version = "1.7.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a2bd12c1caf447e69cd4528f47f94d203fd2582878ecb9e9465484c4148a8223"
+checksum = "8318a53db07bb3f8dca91a600466bdb3f2eaadeedfdbcf02e1accbad9271ba50"
 
 [[package]]
 name = "bzip2-sys"
@@ -1459,6 +1454,19 @@ dependencies = [
  "unsigned-varint",
 ]
 
+[[package]]
+name = "cid"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "fd94671561e36e4e7de75f753f577edafb0e7c05d6e4547229fdf7938fbcd2c3"
+dependencies = [
+ "core2",
+ "multibase",
+ "multihash 0.18.1",
+ "serde",
+ "unsigned-varint",
+]
+
 [[package]]
 name = "cipher"
 version = "0.2.5"
@@ -1505,14 +1513,9 @@ version = "3.2.25"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4ea181bf566f71cb9a5d17a59e1871af638180a18fb0035c92ae62b705207123"
 dependencies = [
- "atty",
  "bitflags 1.3.2",
- "clap_derive 3.2.25",
  "clap_lex 0.2.4",
  "indexmap 1.9.3",
- "once_cell",
- "strsim 0.10.0",
- "termcolor",
  "textwrap",
 ]
 
@@ -1523,7 +1526,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "90bc066a67923782aa8515dbaea16946c5bcc5addbd668bb80af688e53e548a0"
 dependencies = [
  "clap_builder",
- "clap_derive 4.5.4",
+ "clap_derive",
 ]
 
 [[package]]
@@ -1535,23 +1538,10 @@ dependencies = [
  "anstream",
  "anstyle",
  "clap_lex 0.7.0",
- "strsim 0.11.1",
+ "strsim",
  "terminal_size",
 ]
 
-[[package]]
-name = "clap_derive"
-version = "3.2.25"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "ae6371b8bdc8b7d3959e9cf7b22d4435ef3e79e138688421ec654acf8c81b008"
-dependencies = [
- "heck 0.4.1",
- "proc-macro-error",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "clap_derive"
 version = "4.5.4"
@@ -1607,6 +1597,16 @@ version = "1.0.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "acbf1af155f9b9ef647e42cdc158db4b64a1b61f743629225fde6f3e0be2a7c7"
 
+[[package]]
+name = "combine"
+version = "4.6.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ba5a308b75df32fe02788e748662718f03fde005016435c444eea572398219fd"
+dependencies = [
+ "bytes",
+ "memchr",
+]
+
 [[package]]
 name = "comfy-table"
 version = "7.1.0"
@@ -1630,7 +1630,7 @@ dependencies = [
  "ark-std",
  "fflonk",
  "getrandom_or_panic",
- "merlin 3.0.0",
+ "merlin",
  "rand_chacha 0.3.1",
 ]
 
@@ -1795,7 +1795,7 @@ dependencies = [
  "gimli 0.27.3",
  "hashbrown 0.13.2",
  "log",
- "regalloc2",
+ "regalloc2 0.6.1",
  "smallvec",
  "target-lexicon",
 ]
@@ -1869,6 +1869,21 @@ dependencies = [
  "wasmtime-types",
 ]
 
+[[package]]
+name = "crc"
+version = "3.2.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "69e6e4d7b33a94f0991c26729976b10ebde1d34c3ee82408fb536164fa10d636"
+dependencies = [
+ "crc-catalog",
+]
+
+[[package]]
+name = "crc-catalog"
+version = "2.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "19d374276b40fb8bbdee95aef7c7fa6b5316ec764510eb64b8dd0e2ed0d7e7f5"
+
 [[package]]
 name = "crc32fast"
 version = "1.3.2"
@@ -1970,7 +1985,7 @@ checksum = "0dc92fb57ca44df6db8059111ab3af99a63d5d0f8375d9972e319a379c6bab76"
 dependencies = [
  "generic-array 0.14.7",
  "rand_core 0.6.4",
- "subtle 2.4.1",
+ "subtle 2.6.1",
  "zeroize",
 ]
 
@@ -2002,17 +2017,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b584a330336237c1eecd3e94266efb216c56ed91225d634cb2991c5f3fd1aeab"
 dependencies = [
  "generic-array 0.14.7",
- "subtle 2.4.1",
-]
-
-[[package]]
-name = "crypto-mac"
-version = "0.11.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b1d1a86f49236c215f271d40892d5fc950490551400b02ef360692c29815c714"
-dependencies = [
- "generic-array 0.14.7",
- "subtle 2.4.1",
+ "subtle 2.6.1",
 ]
 
 [[package]]
@@ -2027,7 +2032,7 @@ dependencies = [
 [[package]]
 name = "cumulus-client-cli"
 version = "0.7.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "clap 4.5.4",
  "parity-scale-codec",
@@ -2044,14 +2049,14 @@ dependencies = [
 [[package]]
 name = "cumulus-client-collator"
 version = "0.7.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "cumulus-client-consensus-common",
  "cumulus-client-network",
  "cumulus-primitives-core",
  "futures",
  "parity-scale-codec",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "polkadot-node-primitives",
  "polkadot-node-subsystem",
  "polkadot-overseer",
@@ -2067,7 +2072,7 @@ dependencies = [
 [[package]]
 name = "cumulus-client-consensus-aura"
 version = "0.7.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "async-trait",
  "cumulus-client-collator",
@@ -2109,7 +2114,7 @@ dependencies = [
 [[package]]
 name = "cumulus-client-consensus-common"
 version = "0.7.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "async-trait",
  "cumulus-client-pov-recovery",
@@ -2138,7 +2143,7 @@ dependencies = [
 [[package]]
 name = "cumulus-client-consensus-proposer"
 version = "0.7.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "anyhow",
  "async-trait",
@@ -2153,14 +2158,14 @@ dependencies = [
 [[package]]
 name = "cumulus-client-network"
 version = "0.7.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "async-trait",
  "cumulus-relay-chain-interface",
  "futures",
  "futures-timer",
  "parity-scale-codec",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "polkadot-node-primitives",
  "polkadot-parachain-primitives",
  "polkadot-primitives",
@@ -2176,7 +2181,7 @@ dependencies = [
 [[package]]
 name = "cumulus-client-parachain-inherent"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "async-trait",
  "cumulus-primitives-core",
@@ -2191,8 +2196,8 @@ dependencies = [
  "sp-inherents",
  "sp-runtime",
  "sp-state-machine",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
- "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
+ "sp-storage",
  "sp-trie",
  "tracing",
 ]
@@ -2200,7 +2205,7 @@ dependencies = [
 [[package]]
 name = "cumulus-client-pov-recovery"
 version = "0.7.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "async-trait",
  "cumulus-primitives-core",
@@ -2212,7 +2217,7 @@ dependencies = [
  "polkadot-node-subsystem",
  "polkadot-overseer",
  "polkadot-primitives",
- "rand",
+ "rand 0.8.5",
  "sc-client-api",
  "sc-consensus",
  "sp-consensus",
@@ -2224,7 +2229,7 @@ dependencies = [
 [[package]]
 name = "cumulus-client-service"
 version = "0.7.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "cumulus-client-cli",
  "cumulus-client-collator",
@@ -2253,6 +2258,7 @@ dependencies = [
  "sp-blockchain",
  "sp-consensus",
  "sp-core",
+ "sp-io",
  "sp-runtime",
  "sp-transaction-pool",
 ]
@@ -2260,7 +2266,7 @@ dependencies = [
 [[package]]
 name = "cumulus-pallet-aura-ext"
 version = "0.7.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "cumulus-pallet-parachain-system",
  "frame-support",
@@ -2272,13 +2278,13 @@ dependencies = [
  "sp-application-crypto",
  "sp-consensus-aura",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
 ]
 
 [[package]]
 name = "cumulus-pallet-parachain-system"
 version = "0.7.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "bytes",
  "cumulus-pallet-parachain-system-proc-macro",
@@ -2294,25 +2300,26 @@ dependencies = [
  "pallet-message-queue",
  "parity-scale-codec",
  "polkadot-parachain-primitives",
+ "polkadot-runtime-common",
  "polkadot-runtime-parachains",
  "scale-info",
  "sp-core",
- "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-externalities",
  "sp-inherents",
  "sp-io",
  "sp-runtime",
  "sp-state-machine",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
  "sp-trie",
  "sp-version",
  "staging-xcm",
- "trie-db",
+ "trie-db 0.29.1",
 ]
 
 [[package]]
 name = "cumulus-pallet-parachain-system-proc-macro"
 version = "0.6.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "proc-macro-crate 3.1.0",
  "proc-macro2",
@@ -2323,7 +2330,7 @@ dependencies = [
 [[package]]
 name = "cumulus-pallet-xcm"
 version = "0.7.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "cumulus-primitives-core",
  "frame-support",
@@ -2332,14 +2339,14 @@ dependencies = [
  "scale-info",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
  "staging-xcm",
 ]
 
 [[package]]
 name = "cumulus-pallet-xcmp-queue"
 version = "0.7.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "bounded-collections",
  "bp-xcm-bridge-hub-router",
@@ -2356,7 +2363,7 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
  "staging-xcm",
  "staging-xcm-executor",
 ]
@@ -2364,7 +2371,7 @@ dependencies = [
 [[package]]
 name = "cumulus-primitives-aura"
 version = "0.7.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "parity-scale-codec",
  "polkadot-core-primitives",
@@ -2372,13 +2379,13 @@ dependencies = [
  "sp-api",
  "sp-consensus-aura",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
 ]
 
 [[package]]
 name = "cumulus-primitives-core"
 version = "0.7.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "parity-scale-codec",
  "polkadot-core-primitives",
@@ -2387,7 +2394,7 @@ dependencies = [
  "scale-info",
  "sp-api",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
  "sp-trie",
  "staging-xcm",
 ]
@@ -2395,7 +2402,7 @@ dependencies = [
 [[package]]
 name = "cumulus-primitives-parachain-inherent"
 version = "0.7.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "async-trait",
  "cumulus-primitives-core",
@@ -2403,49 +2410,50 @@ dependencies = [
  "scale-info",
  "sp-core",
  "sp-inherents",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-runtime",
+ "sp-state-machine",
+ "sp-std",
  "sp-trie",
 ]
 
 [[package]]
 name = "cumulus-primitives-proof-size-hostfunction"
 version = "0.2.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
- "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
- "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-externalities",
+ "sp-runtime-interface",
  "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#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "cumulus-primitives-core",
  "futures",
  "parity-scale-codec",
  "sp-inherents",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
  "sp-timestamp",
 ]
 
 [[package]]
 name = "cumulus-primitives-utility"
 version = "0.7.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 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 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
  "staging-xcm",
  "staging-xcm-builder",
  "staging-xcm-executor",
@@ -2454,7 +2462,7 @@ dependencies = [
 [[package]]
 name = "cumulus-relay-chain-inprocess-interface"
 version = "0.7.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "async-trait",
  "cumulus-primitives-core",
@@ -2478,12 +2486,12 @@ dependencies = [
 [[package]]
 name = "cumulus-relay-chain-interface"
 version = "0.7.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "async-trait",
  "cumulus-primitives-core",
  "futures",
- "jsonrpsee-core 0.20.3",
+ "jsonrpsee-core",
  "parity-scale-codec",
  "polkadot-overseer",
  "sc-client-api",
@@ -2496,7 +2504,7 @@ dependencies = [
 [[package]]
 name = "cumulus-relay-chain-minimal-node"
 version = "0.7.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "array-bytes 6.2.2",
  "async-trait",
@@ -2504,7 +2512,7 @@ dependencies = [
  "cumulus-relay-chain-interface",
  "cumulus-relay-chain-rpc-interface",
  "futures",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "polkadot-availability-recovery",
  "polkadot-collator-protocol",
  "polkadot-core-primitives",
@@ -2517,6 +2525,7 @@ dependencies = [
  "polkadot-node-subsystem-util",
  "polkadot-overseer",
  "polkadot-primitives",
+ "polkadot-service",
  "sc-authority-discovery",
  "sc-client-api",
  "sc-network",
@@ -2537,7 +2546,7 @@ dependencies = [
 [[package]]
 name = "cumulus-relay-chain-rpc-interface"
 version = "0.7.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "async-trait",
  "cumulus-primitives-core",
@@ -2545,11 +2554,11 @@ dependencies = [
  "either",
  "futures",
  "futures-timer",
- "jsonrpsee 0.20.3",
+ "jsonrpsee",
  "parity-scale-codec",
  "pin-project",
  "polkadot-overseer",
- "rand",
+ "rand 0.8.5",
  "sc-client-api",
  "sc-rpc-api",
  "sc-service",
@@ -2564,7 +2573,7 @@ dependencies = [
  "sp-core",
  "sp-runtime",
  "sp-state-machine",
- "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-storage",
  "sp-version",
  "thiserror",
  "tokio",
@@ -2576,30 +2585,17 @@ dependencies = [
 [[package]]
 name = "cumulus-test-relay-sproof-builder"
 version = "0.7.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "cumulus-primitives-core",
  "parity-scale-codec",
  "polkadot-primitives",
  "sp-runtime",
  "sp-state-machine",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
  "sp-trie",
 ]
 
-[[package]]
-name = "curve25519-dalek"
-version = "2.1.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4a9b85542f99a2dfa2a1b8e192662741c9859a846b296bef1c92ef9b58b5a216"
-dependencies = [
- "byteorder",
- "digest 0.8.1",
- "rand_core 0.5.1",
- "subtle 2.4.1",
- "zeroize",
-]
-
 [[package]]
 name = "curve25519-dalek"
 version = "3.2.0"
@@ -2609,7 +2605,7 @@ dependencies = [
  "byteorder",
  "digest 0.9.0",
  "rand_core 0.5.1",
- "subtle 2.4.1",
+ "subtle 2.6.1",
  "zeroize",
 ]
 
@@ -2626,7 +2622,7 @@ dependencies = [
  "fiat-crypto",
  "platforms 3.2.0",
  "rustc_version",
- "subtle 2.4.1",
+ "subtle 2.6.1",
  "zeroize",
 ]
 
@@ -2698,6 +2694,19 @@ dependencies = [
  "syn 2.0.61",
 ]
 
+[[package]]
+name = "dashmap"
+version = "5.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "978747c1d849a7d2ee5e8adc0159961c48fb7e5db2f06af6723b80123bb53856"
+dependencies = [
+ "cfg-if",
+ "hashbrown 0.14.3",
+ "lock_api",
+ "once_cell",
+ "parking_lot_core 0.9.9",
+]
+
 [[package]]
 name = "data-encoding"
 version = "2.5.0"
@@ -2792,15 +2801,15 @@ dependencies = [
 
 [[package]]
 name = "derive_more"
-version = "0.99.17"
+version = "0.99.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4fb810d30a7c1953f91334de7244731fc3f3c10d7fe163338a35b9f640960321"
+checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce"
 dependencies = [
  "convert_case 0.4.0",
  "proc-macro2",
  "quote",
  "rustc_version",
- "syn 1.0.109",
+ "syn 2.0.61",
 ]
 
 [[package]]
@@ -2842,7 +2851,7 @@ dependencies = [
  "block-buffer 0.10.4",
  "const-oid",
  "crypto-common",
- "subtle 2.4.1",
+ "subtle 2.6.1",
 ]
 
 [[package]]
@@ -2996,10 +3005,20 @@ dependencies = [
  "digest 0.10.7",
  "elliptic-curve",
  "rfc6979",
- "signature",
+ "serdect",
+ "signature 2.2.0",
  "spki",
 ]
 
+[[package]]
+name = "ed25519"
+version = "1.5.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "91cff35c70bba8a626e3185d8cd48cc11b5437e1a5bcd15b9b5fa3c64b6dfee7"
+dependencies = [
+ "signature 1.6.4",
+]
+
 [[package]]
 name = "ed25519"
 version = "2.2.3"
@@ -3007,7 +3026,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "115531babc129696a58c64a4fef0a8bf9e9698629fb97e9e40767d235cfbcd53"
 dependencies = [
  "pkcs8",
- "signature",
+ "signature 2.2.0",
+]
+
+[[package]]
+name = "ed25519-dalek"
+version = "1.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c762bae6dcaf24c4c84667b8579785430908723d5c889f469d76a41d59cc7a9d"
+dependencies = [
+ "curve25519-dalek 3.2.0",
+ "ed25519 1.5.3",
+ "rand 0.7.3",
+ "serde",
+ "sha2 0.9.9",
+ "zeroize",
 ]
 
 [[package]]
@@ -3017,11 +3050,11 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1f628eaec48bfd21b865dc2950cfa014450c01d2fa2b69a86c2fd5844ec523c0"
 dependencies = [
  "curve25519-dalek 4.1.1",
- "ed25519",
+ "ed25519 2.2.3",
  "rand_core 0.6.4",
  "serde",
  "sha2 0.10.8",
- "subtle 2.4.1",
+ "subtle 2.6.1",
  "zeroize",
 ]
 
@@ -3046,7 +3079,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7d9ce6874da5d4415896cd45ffbc4d1cfc0c4f9c079427bd870742c30f2f65a9"
 dependencies = [
  "curve25519-dalek 4.1.1",
- "ed25519",
+ "ed25519 2.2.3",
  "hashbrown 0.14.3",
  "hex",
  "rand_core 0.6.4",
@@ -3075,7 +3108,8 @@ dependencies = [
  "pkcs8",
  "rand_core 0.6.4",
  "sec1",
- "subtle 2.4.1",
+ "serdect",
+ "subtle 2.6.1",
  "zeroize",
 ]
 
@@ -3097,6 +3131,18 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "enum-as-inner"
+version = "0.6.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "5ffccbb6966c05b32ef8fbac435df276c4ae4d3dc55a8cd0eb9745e6c12f546a"
+dependencies = [
+ "heck 0.4.1",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.61",
+]
+
 [[package]]
 name = "enumflags2"
 version = "0.7.8"
@@ -3302,7 +3348,7 @@ dependencies = [
 [[package]]
 name = "evm"
 version = "0.41.1"
-source = "git+https://github.com/moonbeam-foundation/evm?branch=moonbeam-polkadot-v1.7.2#d8991ec727ad0fb64fe9957a3cd307387a6701e4"
+source = "git+https://github.com/moonbeam-foundation/evm?branch=moonbeam-polkadot-v1.11.0#84c8e431b653888493a2b81d6443cdce05f07c52"
 dependencies = [
  "auto_impl",
  "environmental",
@@ -3333,7 +3379,7 @@ dependencies = [
 [[package]]
 name = "evm-core"
 version = "0.41.0"
-source = "git+https://github.com/moonbeam-foundation/evm?branch=moonbeam-polkadot-v1.7.2#d8991ec727ad0fb64fe9957a3cd307387a6701e4"
+source = "git+https://github.com/moonbeam-foundation/evm?branch=moonbeam-polkadot-v1.11.0#84c8e431b653888493a2b81d6443cdce05f07c52"
 dependencies = [
  "parity-scale-codec",
  "primitive-types",
@@ -3355,7 +3401,7 @@ dependencies = [
 [[package]]
 name = "evm-gasometer"
 version = "0.41.0"
-source = "git+https://github.com/moonbeam-foundation/evm?branch=moonbeam-polkadot-v1.7.2#d8991ec727ad0fb64fe9957a3cd307387a6701e4"
+source = "git+https://github.com/moonbeam-foundation/evm?branch=moonbeam-polkadot-v1.11.0#84c8e431b653888493a2b81d6443cdce05f07c52"
 dependencies = [
  "environmental",
  "evm-core 0.41.0",
@@ -3378,7 +3424,7 @@ dependencies = [
 [[package]]
 name = "evm-runtime"
 version = "0.41.0"
-source = "git+https://github.com/moonbeam-foundation/evm?branch=moonbeam-polkadot-v1.7.2#d8991ec727ad0fb64fe9957a3cd307387a6701e4"
+source = "git+https://github.com/moonbeam-foundation/evm?branch=moonbeam-polkadot-v1.11.0#84c8e431b653888493a2b81d6443cdce05f07c52"
 dependencies = [
  "auto_impl",
  "environmental",
@@ -3422,16 +3468,16 @@ dependencies = [
 ]
 
 [[package]]
-name = "fake-simd"
-version = "0.1.2"
+name = "fallible-iterator"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e88a8acf291dafb59c2d96e8f59828f3838bb1a70398823ade51a84de6a6deed"
+checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7"
 
 [[package]]
 name = "fallible-iterator"
-version = "0.2.0"
+version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4443176a9f2c162692bd3d352d745ef9413eec5782a80d8fd6f8a1ac692a07f7"
+checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649"
 
 [[package]]
 name = "faster-hex"
@@ -3482,7 +3528,7 @@ dependencies = [
 [[package]]
 name = "fc-api"
 version = "1.0.0-dev"
-source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.2#91f1c7a447f987d732f87f86c3e02d506d426a99"
+source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.11.0#45d16ae4c8b32e26fdab8353b704fd59ea0ddb8c"
 dependencies = [
  "async-trait",
  "fp-storage",
@@ -3494,7 +3540,7 @@ dependencies = [
 [[package]]
 name = "fc-consensus"
 version = "2.0.0-dev"
-source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.2#91f1c7a447f987d732f87f86c3e02d506d426a99"
+source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.11.0#45d16ae4c8b32e26fdab8353b704fd59ea0ddb8c"
 dependencies = [
  "async-trait",
  "fp-consensus",
@@ -3510,7 +3556,7 @@ dependencies = [
 [[package]]
 name = "fc-db"
 version = "2.0.0-dev"
-source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.2#91f1c7a447f987d732f87f86c3e02d506d426a99"
+source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.11.0#45d16ae4c8b32e26fdab8353b704fd59ea0ddb8c"
 dependencies = [
  "async-trait",
  "fc-api",
@@ -3519,7 +3565,7 @@ dependencies = [
  "log",
  "parity-db",
  "parity-scale-codec",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "sc-client-db",
  "smallvec",
  "sp-blockchain",
@@ -3531,7 +3577,7 @@ dependencies = [
 [[package]]
 name = "fc-mapping-sync"
 version = "2.0.0-dev"
-source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.2#91f1c7a447f987d732f87f86c3e02d506d426a99"
+source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.11.0#45d16ae4c8b32e26fdab8353b704fd59ea0ddb8c"
 dependencies = [
  "fc-db",
  "fc-storage",
@@ -3540,7 +3586,7 @@ dependencies = [
  "futures",
  "futures-timer",
  "log",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "sc-client-api",
  "sc-utils",
  "sp-api",
@@ -3552,7 +3598,7 @@ dependencies = [
 [[package]]
 name = "fc-rpc"
 version = "2.0.0-dev"
-source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.2#91f1c7a447f987d732f87f86c3e02d506d426a99"
+source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.11.0#45d16ae4c8b32e26fdab8353b704fd59ea0ddb8c"
 dependencies = [
  "ethereum 0.15.0",
  "ethereum-types",
@@ -3566,18 +3612,17 @@ dependencies = [
  "fp-storage",
  "futures",
  "hex",
- "jsonrpsee 0.20.3",
+ "jsonrpsee",
  "libsecp256k1",
  "log",
  "pallet-evm",
  "parity-scale-codec",
  "prometheus",
- "rand",
+ "rand 0.8.5",
  "rlp",
  "sc-client-api",
  "sc-consensus-aura",
  "sc-network",
- "sc-network-common",
  "sc-network-sync",
  "sc-rpc",
  "sc-service",
@@ -3592,12 +3637,12 @@ dependencies = [
  "sp-consensus",
  "sp-consensus-aura",
  "sp-core",
- "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-externalities",
  "sp-inherents",
  "sp-io",
  "sp-runtime",
  "sp-state-machine",
- "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-storage",
  "sp-timestamp",
  "substrate-prometheus-endpoint",
  "thiserror",
@@ -3607,22 +3652,22 @@ dependencies = [
 [[package]]
 name = "fc-rpc-core"
 version = "1.1.0-dev"
-source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.2#91f1c7a447f987d732f87f86c3e02d506d426a99"
+source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.11.0#45d16ae4c8b32e26fdab8353b704fd59ea0ddb8c"
 dependencies = [
  "ethereum 0.15.0",
  "ethereum-types",
- "jsonrpsee 0.20.3",
+ "jsonrpsee",
  "rlp",
  "rustc-hex",
  "serde",
  "serde_json",
- "sp-core-hashing",
+ "sp-crypto-hashing",
 ]
 
 [[package]]
 name = "fc-storage"
 version = "1.0.0-dev"
-source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.2#91f1c7a447f987d732f87f86c3e02d506d426a99"
+source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.11.0#45d16ae4c8b32e26fdab8353b704fd59ea0ddb8c"
 dependencies = [
  "ethereum 0.15.0",
  "ethereum-types",
@@ -3631,10 +3676,9 @@ dependencies = [
  "parity-scale-codec",
  "sc-client-api",
  "sp-api",
- "sp-blockchain",
  "sp-io",
  "sp-runtime",
- "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-storage",
 ]
 
 [[package]]
@@ -3654,7 +3698,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ded41244b729663b1e574f1b4fb731469f69f79c17667b5d776b16cda0479449"
 dependencies = [
  "rand_core 0.6.4",
- "subtle 2.4.1",
+ "subtle 2.6.1",
 ]
 
 [[package]]
@@ -3667,7 +3711,7 @@ dependencies = [
  "ark-poly",
  "ark-serialize",
  "ark-std",
- "merlin 3.0.0",
+ "merlin",
 ]
 
 [[package]]
@@ -3710,7 +3754,7 @@ dependencies = [
  "log",
  "num-traits",
  "parity-scale-codec",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "scale-info",
 ]
 
@@ -3734,7 +3778,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "835c052cb0c08c1acf6ffd71c022172e18723949c8282f2b9f27efbc51e64534"
 dependencies = [
  "byteorder",
- "rand",
+ "rand 0.8.5",
  "rustc-hex",
  "static_assertions",
 ]
@@ -3771,10 +3815,25 @@ version = "1.0.7"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
 
+[[package]]
+name = "foreign-types"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
+dependencies = [
+ "foreign-types-shared",
+]
+
+[[package]]
+name = "foreign-types-shared"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
+
 [[package]]
 name = "fork-tree"
 version = "12.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "parity-scale-codec",
 ]
@@ -3791,7 +3850,7 @@ dependencies = [
 [[package]]
 name = "fp-account"
 version = "1.0.0-dev"
-source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.2#91f1c7a447f987d732f87f86c3e02d506d426a99"
+source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.11.0#45d16ae4c8b32e26fdab8353b704fd59ea0ddb8c"
 dependencies = [
  "hex",
  "impl-serde",
@@ -3803,55 +3862,51 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-runtime-interface",
 ]
 
 [[package]]
 name = "fp-consensus"
 version = "2.0.0-dev"
-source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.2#91f1c7a447f987d732f87f86c3e02d506d426a99"
+source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.11.0#45d16ae4c8b32e26fdab8353b704fd59ea0ddb8c"
 dependencies = [
  "ethereum 0.15.0",
  "parity-scale-codec",
  "sp-core",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "fp-ethereum"
 version = "1.0.0-dev"
-source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.2#91f1c7a447f987d732f87f86c3e02d506d426a99"
+source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.11.0#45d16ae4c8b32e26fdab8353b704fd59ea0ddb8c"
 dependencies = [
  "ethereum 0.15.0",
  "ethereum-types",
  "fp-evm",
  "frame-support",
  "parity-scale-codec",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "fp-evm"
 version = "3.0.0-dev"
-source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.2#91f1c7a447f987d732f87f86c3e02d506d426a99"
+source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.11.0#45d16ae4c8b32e26fdab8353b704fd59ea0ddb8c"
 dependencies = [
  "evm 0.41.1",
  "frame-support",
- "num_enum 0.7.2",
+ "num_enum",
  "parity-scale-codec",
  "scale-info",
  "serde",
  "sp-core",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "fp-rpc"
 version = "3.0.0-dev"
-source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.2#91f1c7a447f987d732f87f86c3e02d506d426a99"
+source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.11.0#45d16ae4c8b32e26fdab8353b704fd59ea0ddb8c"
 dependencies = [
  "ethereum 0.15.0",
  "ethereum-types",
@@ -3862,13 +3917,12 @@ dependencies = [
  "sp-core",
  "sp-runtime",
  "sp-state-machine",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "fp-self-contained"
 version = "1.0.0-dev"
-source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.2#91f1c7a447f987d732f87f86c3e02d506d426a99"
+source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.11.0#45d16ae4c8b32e26fdab8353b704fd59ea0ddb8c"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
@@ -3880,7 +3934,7 @@ dependencies = [
 [[package]]
 name = "fp-storage"
 version = "2.0.0"
-source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.2#91f1c7a447f987d732f87f86c3e02d506d426a99"
+source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.11.0#45d16ae4c8b32e26fdab8353b704fd59ea0ddb8c"
 dependencies = [
  "parity-scale-codec",
  "serde",
@@ -3895,7 +3949,7 @@ checksum = "6c2141d6d6c8512188a7891b4b01590a45f6dac67afb4f255c4124dbb86d4eaa"
 [[package]]
 name = "frame-benchmarking"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "frame-support",
  "frame-support-procedural",
@@ -3911,16 +3965,16 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
- "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-runtime-interface",
+ "sp-std",
+ "sp-storage",
  "static_assertions",
 ]
 
 [[package]]
 name = "frame-benchmarking-cli"
 version = "32.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "Inflector",
  "array-bytes 6.2.2",
@@ -3937,9 +3991,10 @@ dependencies = [
  "linked-hash-map",
  "log",
  "parity-scale-codec",
- "rand",
+ "rand 0.8.5",
  "rand_pcg",
  "sc-block-builder",
+ "sc-chain-spec",
  "sc-cli",
  "sc-client-api",
  "sc-client-db",
@@ -3952,15 +4007,16 @@ dependencies = [
  "sp-blockchain",
  "sp-core",
  "sp-database",
- "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-externalities",
+ "sp-genesis-builder",
  "sp-inherents",
  "sp-io",
  "sp-keystore",
  "sp-runtime",
  "sp-state-machine",
- "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-storage",
  "sp-trie",
- "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-wasm-interface",
  "thiserror",
  "thousands",
 ]
@@ -3968,7 +4024,7 @@ dependencies = [
 [[package]]
 name = "frame-election-provider-solution-type"
 version = "13.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "proc-macro-crate 3.1.0",
  "proc-macro2",
@@ -3979,7 +4035,7 @@ dependencies = [
 [[package]]
 name = "frame-election-provider-support"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "frame-election-provider-solution-type",
  "frame-support",
@@ -3990,14 +4046,15 @@ dependencies = [
  "sp-core",
  "sp-npos-elections",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
 ]
 
 [[package]]
 name = "frame-executive"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
+ "aquamarine 0.3.3",
  "frame-support",
  "frame-system",
  "frame-try-runtime",
@@ -4007,8 +4064,8 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
- "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
+ "sp-tracing",
 ]
 
 [[package]]
@@ -4026,7 +4083,7 @@ dependencies = [
 [[package]]
 name = "frame-metadata-hash-extension"
 version = "0.1.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "array-bytes 6.2.2",
  "docify",
@@ -4041,11 +4098,11 @@ dependencies = [
 [[package]]
 name = "frame-remote-externalities"
 version = "0.35.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "futures",
  "indicatif",
- "jsonrpsee 0.20.3",
+ "jsonrpsee",
  "log",
  "parity-scale-codec",
  "serde",
@@ -4063,9 +4120,9 @@ dependencies = [
 [[package]]
 name = "frame-support"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
- "aquamarine",
+ "aquamarine 0.5.0",
  "array-bytes 6.2.2",
  "bitflags 1.3.2",
  "docify",
@@ -4086,7 +4143,7 @@ dependencies = [
  "sp-arithmetic",
  "sp-core",
  "sp-crypto-hashing-proc-macro",
- "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-debug-derive",
  "sp-genesis-builder",
  "sp-inherents",
  "sp-io",
@@ -4094,8 +4151,8 @@ dependencies = [
  "sp-runtime",
  "sp-staking",
  "sp-state-machine",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
- "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
+ "sp-tracing",
  "sp-weights",
  "static_assertions",
  "tt-call",
@@ -4104,11 +4161,11 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural"
 version = "23.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "Inflector",
  "cfg-expr",
- "derive-syn-parse 0.1.5",
+ "derive-syn-parse 0.2.0",
  "expander 2.0.0",
  "frame-support-procedural-tools",
  "itertools 0.10.5",
@@ -4123,7 +4180,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools"
 version = "10.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "frame-support-procedural-tools-derive",
  "proc-macro-crate 3.1.0",
@@ -4135,7 +4192,7 @@ dependencies = [
 [[package]]
 name = "frame-support-procedural-tools-derive"
 version = "11.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -4145,7 +4202,7 @@ dependencies = [
 [[package]]
 name = "frame-system"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "cfg-if",
  "docify",
@@ -4157,7 +4214,7 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
  "sp-version",
  "sp-weights",
 ]
@@ -4165,7 +4222,7 @@ dependencies = [
 [[package]]
 name = "frame-system-benchmarking"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -4174,13 +4231,13 @@ dependencies = [
  "scale-info",
  "sp-core",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
 ]
 
 [[package]]
 name = "frame-system-rpc-runtime-api"
 version = "26.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -4189,13 +4246,13 @@ dependencies = [
 [[package]]
 name = "frame-try-runtime"
 version = "0.34.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
  "sp-api",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
 ]
 
 [[package]]
@@ -4346,9 +4403,9 @@ checksum = "38d84fa142264698cdce1a9f9172cf383a0c82de1bddcf3092901442c4097004"
 
 [[package]]
 name = "futures-timer"
-version = "3.0.2"
+version = "3.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e64b03909df88034c26dc1547e8970b91f98bdb65165d6a4e9110d94263dbb2c"
+checksum = "f288b0a4f20f9a56b5d1da57e2227c661b7b16168e2f72365f57b63326e29b24"
 
 [[package]]
 name = "futures-util"
@@ -4435,7 +4492,7 @@ version = "0.0.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "6ea1015b5a70616b688dc230cfe50c8af89d972cb132d5a622814d29773b10b9"
 dependencies = [
- "rand",
+ "rand 0.8.5",
  "rand_core 0.6.4",
 ]
 
@@ -4455,7 +4512,7 @@ version = "0.27.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e"
 dependencies = [
- "fallible-iterator",
+ "fallible-iterator 0.2.0",
  "indexmap 1.9.3",
  "stable_deref_trait",
 ]
@@ -4465,6 +4522,10 @@ name = "gimli"
 version = "0.28.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
+dependencies = [
+ "fallible-iterator 0.3.0",
+ "stable_deref_trait",
+]
 
 [[package]]
 name = "glob"
@@ -4472,19 +4533,6 @@ version = "0.3.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d2fabcfbdc87f4758337ca535fb41a6d701b65693ce38287d856d1674551ec9b"
 
-[[package]]
-name = "globset"
-version = "0.4.14"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "57da3b9b5b85bd66f31093f8c408b90a74431672542466497dcbdfdc02034be1"
-dependencies = [
- "aho-corasick",
- "bstr 1.8.0",
- "log",
- "regex-automata 0.4.3",
- "regex-syntax 0.8.2",
-]
-
 [[package]]
 name = "gmp-mpfr-sys"
 version = "1.6.1"
@@ -4495,6 +4543,26 @@ dependencies = [
  "windows-sys 0.42.0",
 ]
 
+[[package]]
+name = "governor"
+version = "0.6.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "68a7f542ee6b35af73b06abc0dad1c1bae89964e4e253bc4b587b91c9637867b"
+dependencies = [
+ "cfg-if",
+ "dashmap",
+ "futures",
+ "futures-timer",
+ "no-std-compat",
+ "nonzero_ext",
+ "parking_lot 0.12.3",
+ "portable-atomic",
+ "quanta",
+ "rand 0.8.5",
+ "smallvec",
+ "spinning_top",
+]
+
 [[package]]
 name = "group"
 version = "0.13.0"
@@ -4503,7 +4571,7 @@ checksum = "f0f9ef7462f7c099f518d754361858f86d8a07af53ba9af0fe635bbccb151a63"
 dependencies = [
  "ff",
  "rand_core 0.6.4",
- "subtle 2.4.1",
+ "subtle 2.6.1",
 ]
 
 [[package]]
@@ -4533,9 +4601,9 @@ checksum = "eabb4a44450da02c90444cf74558da904edde8fb4e9035a9a6a4e15445af0bd7"
 
 [[package]]
 name = "handlebars"
-version = "4.5.0"
+version = "5.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "faa67bab9ff362228eb3d00bd024a4965d8231bbb7921167f0cfa66c6626b225"
+checksum = "d08485b96a0e6393e9e4d1b8d48cf74ad6c063cd905eb33f42c1ce3f0377539b"
 dependencies = [
  "log",
  "pest",
@@ -4638,10 +4706,10 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f24254aa9a54b5c858eaee2f5bccdb46aaf0e486a595ed5fd8f86ba55232a70"
 
 [[package]]
-name = "hex-literal"
-version = "0.3.4"
+name = "hex-conservative"
+version = "0.1.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7ebdb29d2ea9ed0083cd8cece49bbd968021bd99b0849edb4a9a7ee0fdf6a4e0"
+checksum = "212ab92002354b4819390025006c897e8140934349e8635c9b077f47b4dcbd20"
 
 [[package]]
 name = "hex-literal"
@@ -4668,16 +4736,6 @@ dependencies = [
  "digest 0.9.0",
 ]
 
-[[package]]
-name = "hmac"
-version = "0.11.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "2a2a2320eb7ec0ebe8da8f744d7812d9fc4cb4d09344ac01898dbcb6a20ae69b"
-dependencies = [
- "crypto-mac 0.11.1",
- "digest 0.9.0",
-]
-
 [[package]]
 name = "hmac"
 version = "0.12.1"
@@ -4766,7 +4824,7 @@ checksum = "9a3a5bfb195931eeb336b2a7b4d761daec841b97f947d34394601737a7bba5e4"
 
 [[package]]
 name = "hydra-dx-build-script-utils"
-version = "1.0.3"
+version = "1.0.4"
 dependencies = [
  "cargo-lock",
  "platforms 1.1.0",
@@ -4774,7 +4832,7 @@ dependencies = [
 
 [[package]]
 name = "hydra-dx-math"
-version = "8.1.2"
+version = "8.1.3"
 dependencies = [
  "approx",
  "criterion",
@@ -4783,19 +4841,19 @@ dependencies = [
  "parity-scale-codec",
  "primitive-types",
  "proptest",
- "rand",
+ "rand 0.8.5",
  "rand_xoshiro",
  "rug",
  "scale-info",
  "serde",
  "sp-arithmetic",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
- "test-case 2.2.2",
+ "sp-std",
+ "test-case",
 ]
 
 [[package]]
 name = "hydradx"
-version = "13.1.2"
+version = "14.0.0"
 dependencies = [
  "async-trait",
  "clap 4.5.4",
@@ -4825,10 +4883,10 @@ dependencies = [
  "frame-system-rpc-runtime-api",
  "frame-try-runtime",
  "futures",
- "hex-literal 0.3.4",
+ "hex-literal",
  "hydra-dx-build-script-utils",
  "hydradx-runtime",
- "jsonrpsee 0.20.3",
+ "jsonrpsee",
  "log",
  "pallet-transaction-payment-rpc",
  "pallet-transaction-payment-rpc-runtime-api",
@@ -4875,20 +4933,20 @@ dependencies = [
  "sp-runtime",
  "sp-session",
  "sp-state-machine",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
- "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
+ "sp-storage",
  "sp-timestamp",
  "sp-transaction-pool",
  "sp-trie",
  "substrate-frame-rpc-system",
  "substrate-prometheus-endpoint",
  "substrate-state-trie-migration-rpc",
- "trie-db",
+ "trie-db 0.28.0",
 ]
 
 [[package]]
 name = "hydradx-adapters"
-version = "1.3.5"
+version = "1.3.6"
 dependencies = [
  "cumulus-pallet-parachain-system",
  "cumulus-primitives-core",
@@ -4917,7 +4975,7 @@ dependencies = [
  "pallet-referrals",
  "pallet-route-executor",
  "pallet-stableswap",
- "pallet-staking 3.1.1",
+ "pallet-staking 3.1.2",
  "pallet-transaction-multi-payment",
  "pallet-uniques",
  "pallet-xyk",
@@ -4930,7 +4988,7 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
  "staging-xcm",
  "staging-xcm-builder",
  "staging-xcm-executor",
@@ -4938,7 +4996,7 @@ dependencies = [
 
 [[package]]
 name = "hydradx-runtime"
-version = "260.0.0"
+version = "261.0.0"
 dependencies = [
  "cumulus-pallet-aura-ext",
  "cumulus-pallet-parachain-system",
@@ -4961,13 +5019,13 @@ dependencies = [
  "frame-system-benchmarking",
  "frame-system-rpc-runtime-api",
  "frame-try-runtime",
- "hex-literal 0.4.1",
+ "hex-literal",
  "hydra-dx-math",
  "hydradx-adapters",
  "hydradx-traits",
  "log",
  "module-evm-utility-macro",
- "num_enum 0.5.11",
+ "num_enum",
  "orml-benchmarking",
  "orml-tokens",
  "orml-traits",
@@ -4989,7 +5047,7 @@ dependencies = [
  "pallet-collective",
  "pallet-currencies",
  "pallet-dca",
- "pallet-democracy 4.3.1",
+ "pallet-democracy 4.3.2",
  "pallet-duster",
  "pallet-dynamic-evm-fee",
  "pallet-dynamic-fees",
@@ -5024,7 +5082,7 @@ dependencies = [
  "pallet-scheduler",
  "pallet-session",
  "pallet-stableswap",
- "pallet-staking 3.1.1",
+ "pallet-staking 3.1.2",
  "pallet-state-trie-migration",
  "pallet-timestamp",
  "pallet-tips",
@@ -5052,7 +5110,7 @@ dependencies = [
  "sp-block-builder",
  "sp-consensus-aura",
  "sp-core",
- "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-externalities",
  "sp-genesis-builder",
  "sp-inherents",
  "sp-io",
@@ -5060,7 +5118,7 @@ dependencies = [
  "sp-runtime",
  "sp-session",
  "sp-staking",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
  "sp-transaction-pool",
  "sp-trie",
  "sp-version",
@@ -5069,11 +5127,12 @@ dependencies = [
  "staging-xcm-builder",
  "staging-xcm-executor",
  "substrate-wasm-builder",
+ "xcm-fee-payment-runtime-api",
 ]
 
 [[package]]
 name = "hydradx-traits"
-version = "3.7.0"
+version = "3.7.1"
 dependencies = [
  "frame-support",
  "impl-trait-for-tuples",
@@ -5081,7 +5140,7 @@ dependencies = [
  "scale-info",
  "serde",
  "sp-arithmetic",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
 ]
 
 [[package]]
@@ -5119,9 +5178,9 @@ dependencies = [
  "hyper",
  "log",
  "rustls 0.21.10",
- "rustls-native-certs",
+ "rustls-native-certs 0.6.3",
  "tokio",
- "tokio-rustls",
+ "tokio-rustls 0.24.1",
 ]
 
 [[package]]
@@ -5158,6 +5217,16 @@ dependencies = [
  "unicode-normalization",
 ]
 
+[[package]]
+name = "idna"
+version = "0.4.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7d20d6b07bfbc108882d88ed8e37d39636dcc260e15e30c45e6ba089610b917c"
+dependencies = [
+ "unicode-bidi",
+ "unicode-normalization",
+]
+
 [[package]]
 name = "idna"
 version = "0.5.0"
@@ -5432,29 +5501,15 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee"
-version = "0.15.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "8bd0d559d5e679b1ab2f869b486a11182923863b1b3ee8b421763cdd707b783a"
-dependencies = [
- "jsonrpsee-core 0.15.1",
- "jsonrpsee-http-server",
- "jsonrpsee-proc-macros 0.15.1",
- "jsonrpsee-types 0.15.1",
- "jsonrpsee-ws-server",
- "tracing",
-]
-
-[[package]]
-name = "jsonrpsee"
-version = "0.20.3"
+version = "0.22.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "affdc52f7596ccb2d7645231fc6163bb314630c989b64998f3699a28b4d5d4dc"
+checksum = "cfdb12a2381ea5b2e68c3469ec604a007b367778cdb14d09612c8069ebd616ad"
 dependencies = [
- "jsonrpsee-core 0.20.3",
+ "jsonrpsee-core",
  "jsonrpsee-http-client",
- "jsonrpsee-proc-macros 0.20.3",
+ "jsonrpsee-proc-macros",
  "jsonrpsee-server",
- "jsonrpsee-types 0.20.3",
+ "jsonrpsee-types",
  "jsonrpsee-ws-client",
  "tokio",
  "tracing",
@@ -5462,19 +5517,20 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-client-transport"
-version = "0.20.3"
+version = "0.22.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5b005c793122d03217da09af68ba9383363caa950b90d3436106df8cabce935"
+checksum = "4978087a58c3ab02efc5b07c5e5e2803024536106fd5506f558db172c889b3aa"
 dependencies = [
  "futures-util",
  "http",
- "jsonrpsee-core 0.20.3",
+ "jsonrpsee-core",
  "pin-project",
- "rustls-native-certs",
+ "rustls-native-certs 0.7.1",
+ "rustls-pki-types",
  "soketto",
  "thiserror",
  "tokio",
- "tokio-rustls",
+ "tokio-rustls 0.25.0",
  "tokio-util",
  "tracing",
  "url",
@@ -5482,69 +5538,40 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-core"
-version = "0.15.1"
+version = "0.22.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f3dc3e9cf2ba50b7b1d7d76a667619f82846caa39e8e8daa8a4962d74acaddca"
+checksum = "b4b257e1ec385e07b0255dde0b933f948b5c8b8c28d42afda9587c3a967b896d"
 dependencies = [
  "anyhow",
- "arrayvec 0.7.4",
  "async-trait",
  "beef",
- "futures-channel",
+ "futures-timer",
  "futures-util",
- "globset",
- "http",
  "hyper",
- "jsonrpsee-types 0.15.1",
- "lazy_static",
- "parking_lot 0.12.1",
- "rand",
- "rustc-hash",
- "serde",
- "serde_json",
- "soketto",
- "thiserror",
- "tokio",
- "tracing",
- "unicase",
-]
-
-[[package]]
-name = "jsonrpsee-core"
-version = "0.20.3"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "da2327ba8df2fdbd5e897e2b5ed25ce7f299d345b9736b6828814c3dbd1fd47b"
-dependencies = [
- "anyhow",
- "async-lock 2.8.0",
- "async-trait",
- "beef",
- "futures-timer",
- "futures-util",
- "hyper",
- "jsonrpsee-types 0.20.3",
- "parking_lot 0.12.1",
- "rand",
+ "jsonrpsee-types",
+ "parking_lot 0.12.3",
+ "pin-project",
+ "rand 0.8.5",
  "rustc-hash",
  "serde",
  "serde_json",
- "soketto",
  "thiserror",
  "tokio",
+ "tokio-stream",
  "tracing",
 ]
 
 [[package]]
 name = "jsonrpsee-http-client"
-version = "0.20.3"
+version = "0.22.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f80c17f62c7653ce767e3d7288b793dfec920f97067ceb189ebdd3570f2bc20"
+checksum = "1ccf93fc4a0bfe05d851d37d7c32b7f370fe94336b52a2f0efc5f1981895c2e5"
 dependencies = [
  "async-trait",
  "hyper",
  "hyper-rustls",
- "jsonrpsee-core 0.20.3",
- "jsonrpsee-types 0.20.3",
+ "jsonrpsee-core",
+ "jsonrpsee-types",
  "serde",
  "serde_json",
  "thiserror",
@@ -5554,60 +5581,31 @@ dependencies = [
  "url",
 ]
 
-[[package]]
-name = "jsonrpsee-http-server"
-version = "0.15.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "03802f0373a38c2420c70b5144742d800b509e2937edc4afb116434f07120117"
-dependencies = [
- "futures-channel",
- "futures-util",
- "hyper",
- "jsonrpsee-core 0.15.1",
- "jsonrpsee-types 0.15.1",
- "serde",
- "serde_json",
- "tokio",
- "tracing",
- "tracing-futures",
-]
-
-[[package]]
-name = "jsonrpsee-proc-macros"
-version = "0.15.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bd67957d4280217247588ac86614ead007b301ca2fa9f19c19f880a536f029e3"
-dependencies = [
- "proc-macro-crate 1.3.1",
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
 [[package]]
 name = "jsonrpsee-proc-macros"
-version = "0.20.3"
+version = "0.22.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "29110019693a4fa2dbda04876499d098fa16d70eba06b1e6e2b3f1b251419515"
+checksum = "7d0bb047e79a143b32ea03974a6bf59b62c2a4c5f5d42a381c907a8bbb3f75c0"
 dependencies = [
  "heck 0.4.1",
- "proc-macro-crate 1.3.1",
+ "proc-macro-crate 3.1.0",
  "proc-macro2",
  "quote",
- "syn 1.0.109",
+ "syn 2.0.61",
 ]
 
 [[package]]
 name = "jsonrpsee-server"
-version = "0.20.3"
+version = "0.22.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "82c39a00449c9ef3f50b84fc00fc4acba20ef8f559f07902244abf4c15c5ab9c"
+checksum = "12d8b6a9674422a8572e0b0abb12feeb3f2aeda86528c80d0350c2bd0923ab41"
 dependencies = [
  "futures-util",
  "http",
  "hyper",
- "jsonrpsee-core 0.20.3",
- "jsonrpsee-types 0.20.3",
+ "jsonrpsee-core",
+ "jsonrpsee-types",
+ "pin-project",
  "route-recognizer",
  "serde",
  "serde_json",
@@ -5622,75 +5620,41 @@ dependencies = [
 
 [[package]]
 name = "jsonrpsee-types"
-version = "0.15.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e290bba767401b646812f608c099b922d8142603c9e73a50fb192d3ac86f4a0d"
-dependencies = [
- "anyhow",
- "beef",
- "serde",
- "serde_json",
- "thiserror",
- "tracing",
-]
-
-[[package]]
-name = "jsonrpsee-types"
-version = "0.20.3"
+version = "0.22.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5be0be325642e850ed0bdff426674d2e66b2b7117c9be23a7caef68a2902b7d9"
+checksum = "150d6168405890a7a3231a3c74843f58b8959471f6df76078db2619ddee1d07d"
 dependencies = [
  "anyhow",
  "beef",
  "serde",
  "serde_json",
  "thiserror",
- "tracing",
 ]
 
 [[package]]
 name = "jsonrpsee-ws-client"
-version = "0.20.3"
+version = "0.22.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bca9cb3933ccae417eb6b08c3448eb1cb46e39834e5b503e395e5e5bd08546c0"
+checksum = "58b9db2dfd5bb1194b0ce921504df9ceae210a345bc2f6c5a61432089bbab070"
 dependencies = [
  "http",
  "jsonrpsee-client-transport",
- "jsonrpsee-core 0.20.3",
- "jsonrpsee-types 0.20.3",
+ "jsonrpsee-core",
+ "jsonrpsee-types",
  "url",
 ]
 
-[[package]]
-name = "jsonrpsee-ws-server"
-version = "0.15.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d488ba74fb369e5ab68926feb75a483458b88e768d44319f37e4ecad283c7325"
-dependencies = [
- "futures-channel",
- "futures-util",
- "http",
- "jsonrpsee-core 0.15.1",
- "jsonrpsee-types 0.15.1",
- "serde_json",
- "soketto",
- "tokio",
- "tokio-stream",
- "tokio-util",
- "tracing",
- "tracing-futures",
-]
-
 [[package]]
 name = "k256"
-version = "0.13.2"
+version = "0.13.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3f01b677d82ef7a676aa37e099defd83a28e15687112cafdd112d60236b6115b"
+checksum = "956ff9b67e26e1a6a866cb758f12c6f8746208489e3e4a4b5580802f2f0a587b"
 dependencies = [
  "cfg-if",
  "ecdsa",
  "elliptic-curve",
  "once_cell",
+ "serdect",
  "sha2 0.10.8",
 ]
 
@@ -5725,7 +5689,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "bf7a85fe66f9ff9cd74e169fdd2c94c6e1e74c412c99a73b4df3200b5d3760b2"
 dependencies = [
  "kvdb",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
 ]
 
 [[package]]
@@ -5736,7 +5700,7 @@ checksum = "b644c70b92285f66bfc2032922a79000ea30af7bc2ab31902992a5dcb9b434f6"
 dependencies = [
  "kvdb",
  "num_cpus",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "regex",
  "rocksdb",
  "smallvec",
@@ -5864,10 +5828,10 @@ dependencies = [
  "multihash 0.17.0",
  "multistream-select",
  "once_cell",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "pin-project",
  "quick-protobuf",
- "rand",
+ "rand 0.8.5",
  "rw-stream-sink",
  "smallvec",
  "thiserror",
@@ -5884,9 +5848,9 @@ dependencies = [
  "futures",
  "libp2p-core",
  "log",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "smallvec",
- "trust-dns-resolver",
+ "trust-dns-resolver 0.22.0",
 ]
 
 [[package]]
@@ -5918,12 +5882,12 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "276bb57e7af15d8f100d3c11cbdd32c6752b7eef4ba7a18ecf464972c07abcce"
 dependencies = [
  "bs58 0.4.0",
- "ed25519-dalek",
+ "ed25519-dalek 2.1.0",
  "log",
  "multiaddr",
  "multihash 0.17.0",
  "quick-protobuf",
- "rand",
+ "rand 0.8.5",
  "sha2 0.10.8",
  "thiserror",
  "zeroize",
@@ -5948,7 +5912,7 @@ dependencies = [
  "libp2p-swarm",
  "log",
  "quick-protobuf",
- "rand",
+ "rand 0.8.5",
  "sha2 0.10.8",
  "smallvec",
  "thiserror",
@@ -5970,11 +5934,11 @@ dependencies = [
  "libp2p-identity",
  "libp2p-swarm",
  "log",
- "rand",
+ "rand 0.8.5",
  "smallvec",
  "socket2 0.4.10",
  "tokio",
- "trust-dns-proto",
+ "trust-dns-proto 0.22.0",
  "void",
 ]
 
@@ -6006,7 +5970,7 @@ dependencies = [
  "log",
  "once_cell",
  "quick-protobuf",
- "rand",
+ "rand 0.8.5",
  "sha2 0.10.8",
  "snow",
  "static_assertions",
@@ -6028,7 +5992,7 @@ dependencies = [
  "libp2p-core",
  "libp2p-swarm",
  "log",
- "rand",
+ "rand 0.8.5",
  "void",
 ]
 
@@ -6046,9 +6010,9 @@ dependencies = [
  "libp2p-identity",
  "libp2p-tls",
  "log",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "quinn-proto",
- "rand",
+ "rand 0.8.5",
  "rustls 0.20.9",
  "thiserror",
  "tokio",
@@ -6066,7 +6030,7 @@ dependencies = [
  "libp2p-core",
  "libp2p-identity",
  "libp2p-swarm",
- "rand",
+ "rand 0.8.5",
  "smallvec",
 ]
 
@@ -6085,7 +6049,7 @@ dependencies = [
  "libp2p-identity",
  "libp2p-swarm-derive",
  "log",
- "rand",
+ "rand 0.8.5",
  "smallvec",
  "tokio",
  "void",
@@ -6133,7 +6097,7 @@ dependencies = [
  "rustls 0.20.9",
  "thiserror",
  "webpki",
- "x509-parser",
+ "x509-parser 0.14.0",
  "yasna",
 ]
 
@@ -6162,7 +6126,7 @@ dependencies = [
  "futures-rustls",
  "libp2p-core",
  "log",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "quicksink",
  "rw-stream-sink",
  "soketto",
@@ -6222,7 +6186,7 @@ dependencies = [
  "libsecp256k1-core",
  "libsecp256k1-gen-ecmult",
  "libsecp256k1-gen-genmult",
- "rand",
+ "rand 0.8.5",
  "serde",
  "sha2 0.9.9",
  "typenum",
@@ -6236,7 +6200,7 @@ checksum = "5be9b9bb642d8522a44d533eab56c16c738301965504753b03ad1de3425d5451"
 dependencies = [
  "crunchy",
  "digest 0.9.0",
- "subtle 2.4.1",
+ "subtle 2.6.1",
 ]
 
 [[package]]
@@ -6331,6 +6295,61 @@ dependencies = [
  "keystream",
 ]
 
+[[package]]
+name = "litep2p"
+version = "0.5.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f02542ae3a94b4c4ffa37dc56388c923e286afa3bf65452e3984b50b2a2f316"
+dependencies = [
+ "async-trait",
+ "bs58 0.4.0",
+ "bytes",
+ "cid 0.10.1",
+ "ed25519-dalek 1.0.1",
+ "futures",
+ "futures-timer",
+ "hex-literal",
+ "indexmap 2.1.0",
+ "libc",
+ "mockall 0.12.1",
+ "multiaddr",
+ "multihash 0.17.0",
+ "network-interface",
+ "nohash-hasher",
+ "parking_lot 0.12.3",
+ "pin-project",
+ "prost 0.11.9",
+ "prost-build",
+ "quinn",
+ "rand 0.8.5",
+ "rcgen",
+ "ring 0.16.20",
+ "rustls 0.20.9",
+ "serde",
+ "sha2 0.10.8",
+ "simple-dns",
+ "smallvec",
+ "snow",
+ "socket2 0.5.5",
+ "static_assertions",
+ "str0m",
+ "thiserror",
+ "tokio",
+ "tokio-stream",
+ "tokio-tungstenite",
+ "tokio-util",
+ "tracing",
+ "trust-dns-resolver 0.23.2",
+ "uint",
+ "unsigned-varint",
+ "url",
+ "webpki",
+ "x25519-dalek 2.0.0",
+ "x509-parser 0.15.1",
+ "yasna",
+ "zeroize",
+]
+
 [[package]]
 name = "lock_api"
 version = "0.4.11"
@@ -6343,9 +6362,9 @@ dependencies = [
 
 [[package]]
 name = "log"
-version = "0.4.21"
+version = "0.4.22"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "90ed8c1e510134f979dbc4f070f87d4313098b704861a105fe34231c70a3901c"
+checksum = "a7a70ba024b9dc04c27ea2f0c0548feb474ec5c54bba33a7f72f873a39d07b24"
 
 [[package]]
 name = "lru"
@@ -6478,9 +6497,9 @@ checksum = "ffbee8634e0d45d258acb448e7eaab3fce7a0a467395d4d9f228e3c1f01fb2e4"
 
 [[package]]
 name = "matchers"
-version = "0.0.1"
+version = "0.1.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f099785f7595cc4b4553a174ce30dd7589ef93391ff414dbb67f62392b9e0ce1"
+checksum = "8263075bb86c5a1b1427b5ae862e8889656f126e9f77c484496e8b47cf5c5558"
 dependencies = [
  "regex-automata 0.1.10",
 ]
@@ -6575,18 +6594,6 @@ dependencies = [
  "scale-info",
 ]
 
-[[package]]
-name = "merlin"
-version = "2.0.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4e261cf0f8b3c42ded9f7d2bb59dea03aa52bc8a1cbc7482f9fc3fd1229d3b42"
-dependencies = [
- "byteorder",
- "keccak",
- "rand_core 0.5.1",
- "zeroize",
-]
-
 [[package]]
 name = "merlin"
 version = "3.0.0"
@@ -6606,7 +6613,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "69672161530e8aeca1d1400fbf3f1a1747ff60ea604265a4e906c2442df20532"
 dependencies = [
  "futures",
- "rand",
+ "rand 0.8.5",
  "thrift",
 ]
 
@@ -6652,11 +6659,11 @@ dependencies = [
  "hashlink",
  "lioness",
  "log",
- "parking_lot 0.12.1",
- "rand",
+ "parking_lot 0.12.3",
+ "rand 0.8.5",
  "rand_chacha 0.3.1",
  "rand_distr",
- "subtle 2.4.1",
+ "subtle 2.6.1",
  "thiserror",
  "zeroize",
 ]
@@ -6664,7 +6671,7 @@ dependencies = [
 [[package]]
 name = "mmr-gadget"
 version = "29.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "futures",
  "log",
@@ -6683,9 +6690,9 @@ dependencies = [
 [[package]]
 name = "mmr-rpc"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
- "jsonrpsee 0.20.3",
+ "jsonrpsee",
  "parity-scale-codec",
  "serde",
  "sp-api",
@@ -6705,8 +6712,23 @@ dependencies = [
  "downcast",
  "fragile",
  "lazy_static",
- "mockall_derive",
- "predicates",
+ "mockall_derive 0.11.4",
+ "predicates 2.1.5",
+ "predicates-tree",
+]
+
+[[package]]
+name = "mockall"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "43766c2b5203b10de348ffe19f7e54564b64f3d6018ff7648d1e2d6d3a0f0a48"
+dependencies = [
+ "cfg-if",
+ "downcast",
+ "fragile",
+ "lazy_static",
+ "mockall_derive 0.12.1",
+ "predicates 3.1.2",
  "predicates-tree",
 ]
 
@@ -6722,16 +6744,28 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "mockall_derive"
+version = "0.12.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "af7cbce79ec385a1d4f54baa90a76401eb15d9cab93685f62e7e9f942aa00ae2"
+dependencies = [
+ "cfg-if",
+ "proc-macro2",
+ "quote",
+ "syn 2.0.61",
+]
+
 [[package]]
 name = "module-evm-utility"
-version = "2.21.0"
+version = "2.21.1"
 dependencies = [
  "ethereum 0.14.0",
  "evm 0.36.0",
  "evm-gasometer 0.36.0",
  "evm-runtime 0.36.0",
  "sha3",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
 ]
 
 [[package]]
@@ -6797,10 +6831,14 @@ version = "0.18.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "cfd8a792c1694c6da4f68db0a9d707c72bd260994da179e6030a5dcee00bb815"
 dependencies = [
+ "blake2b_simd",
+ "blake2s_simd",
+ "blake3",
  "core2",
  "digest 0.10.7",
  "multihash-derive 0.8.0",
  "sha2 0.10.8",
+ "sha3",
  "unsigned-varint",
 ]
 
@@ -6926,7 +6964,7 @@ version = "0.14.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7bddcd3bf5144b6392de80e04c347cd7fab2508f6df16a85fc496ecd5cec39bc"
 dependencies = [
- "rand",
+ "rand 0.8.5",
 ]
 
 [[package]]
@@ -7001,6 +7039,18 @@ dependencies = [
  "tokio",
 ]
 
+[[package]]
+name = "network-interface"
+version = "1.1.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4a43439bf756eed340bdf8feba761e2d50c7d47175d87545cd5cbe4a137c4d1"
+dependencies = [
+ "cc",
+ "libc",
+ "thiserror",
+ "winapi",
+]
+
 [[package]]
 name = "nix"
 version = "0.24.3"
@@ -7023,6 +7073,12 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "no-std-compat"
+version = "0.4.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b93853da6d84c2e3c7d730d6473e8817692dd89be387eb01b94d7f108ecb5b8c"
+
 [[package]]
 name = "no-std-net"
 version = "0.6.0"
@@ -7051,17 +7107,33 @@ dependencies = [
  "minimal-lexical",
 ]
 
+[[package]]
+name = "nonzero_ext"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "38bf9645c8b145698bb0b18a4637dcacbc421ea49bef2317e4fd8065a387cf21"
+
 [[package]]
 name = "normalize-line-endings"
 version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "61807f77802ff30975e01f4f071c8ba10c022052f98b3294119f3e615d13e5be"
 
+[[package]]
+name = "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"
+version = "0.4.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b05180d69e3da0e530ba2a1dae5110317e49e3b7f3d41be227dc5f92e49ee7af"
+checksum = "35bd024e8b2ff75562e5f34e7f4905839deb4b22955ef5e73d2fea1b9813cb23"
 dependencies = [
  "num-bigint",
  "num-complex",
@@ -7073,20 +7145,19 @@ dependencies = [
 
 [[package]]
 name = "num-bigint"
-version = "0.4.4"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "608e7659b5c3d7cba262d894801b9ec9d00de989e8a82bd4bef91d08da45cdc0"
+checksum = "a5e44f723f1133c9deac646763579fdb3ac745e418f2a7af9cd0c431da1f20b9"
 dependencies = [
- "autocfg",
  "num-integer",
  "num-traits",
 ]
 
 [[package]]
 name = "num-complex"
-version = "0.4.4"
+version = "0.4.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1ba157ca0885411de85d6ca030ba7e2a83a28636056c7c699b07c8b6f7383214"
+checksum = "73f88a1307638156682bada9d7604135552957b7818057dcef22705b4d509495"
 dependencies = [
  "num-traits",
 ]
@@ -7103,19 +7174,18 @@ dependencies = [
 
 [[package]]
 name = "num-integer"
-version = "0.1.45"
+version = "0.1.46"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "225d3389fb3509a24c93f5c29eb6bde2586b98d9f016636dff58d7c6f7569cd9"
+checksum = "7969661fd2958a5cb096e56c8e1ad0444ac2bbcd0061bd28660485a44879858f"
 dependencies = [
- "autocfg",
  "num-traits",
 ]
 
 [[package]]
 name = "num-iter"
-version = "0.1.44"
+version = "0.1.45"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d869c01cc0c455284163fd0092f1f93835385ccab5a98a0dcc497b2f8bf055a9"
+checksum = "1429034a0490724d0075ebb2bc9e875d6503c3cf69e235a8941aa757d83ef5bf"
 dependencies = [
  "autocfg",
  "num-integer",
@@ -7124,11 +7194,10 @@ dependencies = [
 
 [[package]]
 name = "num-rational"
-version = "0.4.1"
+version = "0.4.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0638a1c9d0a3c0914158145bc76cff373a75a627e6ecbfb71cbe6f453a5a19b0"
+checksum = "f83d14da390562dca69fc84082e73e548e1ad308d24accdedd2720017cb37824"
 dependencies = [
- "autocfg",
  "num-bigint",
  "num-integer",
  "num-traits",
@@ -7136,9 +7205,9 @@ dependencies = [
 
 [[package]]
 name = "num-traits"
-version = "0.2.17"
+version = "0.2.19"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "39e3200413f237f41ab11ad6d161bc7239c84dcb631773ccd7de3dfe4b5c267c"
+checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
 dependencies = [
  "autocfg",
  "libm",
@@ -7156,38 +7225,18 @@ dependencies = [
 
 [[package]]
 name = "num_enum"
-version = "0.5.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "1f646caf906c20226733ed5b1374287eb97e3c2a5c227ce668c1f2ce20ae57c9"
-dependencies = [
- "num_enum_derive 0.5.11",
-]
-
-[[package]]
-name = "num_enum"
-version = "0.7.2"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "02339744ee7253741199f897151b38e72257d13802d4ee837285cc2990a90845"
+checksum = "4e613fc340b2220f734a8595782c551f1250e969d87d3be1ae0579e8d4065179"
 dependencies = [
- "num_enum_derive 0.7.2",
+ "num_enum_derive",
 ]
 
 [[package]]
 name = "num_enum_derive"
-version = "0.5.11"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "dcbff9bc912032c62bf65ef1d5aea88983b420f4f839db1e9b0c281a25c9c799"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 1.0.109",
-]
-
-[[package]]
-name = "num_enum_derive"
-version = "0.7.2"
+version = "0.7.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "681030a937600a36906c185595136d26abfebb4aa9c65701cefcaf8578bb982b"
+checksum = "af1844ef2428cc3e1cb900be36181049ef3d3193c63e43026cfe202983b27a56"
 dependencies = [
  "proc-macro-crate 3.1.0",
  "proc-macro2",
@@ -7255,12 +7304,60 @@ version = "0.3.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "624a8340c38c1b80fd549087862da4ba43e08858af025b236e509b6649fc13d5"
 
+[[package]]
+name = "openssl"
+version = "0.10.66"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9529f4786b70a3e8c61e11179af17ab6188ad8d0ded78c5529441ed39d4bd9c1"
+dependencies = [
+ "bitflags 2.4.1",
+ "cfg-if",
+ "foreign-types",
+ "libc",
+ "once_cell",
+ "openssl-macros",
+ "openssl-sys",
+]
+
+[[package]]
+name = "openssl-macros"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a948666b637a0f465e8564c73e89d4dde00d72d4d473cc972f390fc3dcee7d9c"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn 2.0.61",
+]
+
 [[package]]
 name = "openssl-probe"
 version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "ff011a302c396a5197692431fc1948019154afc178baf7d8e37367442a4601cf"
 
+[[package]]
+name = "openssl-src"
+version = "300.3.1+3.3.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7259953d42a81bf137fbbd73bd30a8e1914d6dce43c2b90ed575783a22608b91"
+dependencies = [
+ "cc",
+]
+
+[[package]]
+name = "openssl-sys"
+version = "0.9.103"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7f9e8deee91df40a943c71b917e5874b951d32a802526c85721ce3b776c929d6"
+dependencies = [
+ "cc",
+ "libc",
+ "openssl-src",
+ "pkg-config",
+ "vcpkg",
+]
+
 [[package]]
 name = "option-ext"
 version = "0.2.0"
@@ -7311,8 +7408,8 @@ dependencies = [
 
 [[package]]
 name = "orml-benchmarking"
-version = "0.8.0"
-source = "git+https://github.com/galacticcouncil/open-runtime-module-library?branch=polkadot-v1.7.2#43629abf084fe6d9eae8b3013e13544e00ad912f"
+version = "0.12.0"
+source = "git+https://github.com/galacticcouncil/open-runtime-module-library?branch=polkadot-v1.11.0#0347ec813ce6cf3e1148a3bedcdf4c0a4e85b0da"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -7322,17 +7419,18 @@ dependencies = [
  "scale-info",
  "serde",
  "sp-api",
+ "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
- "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-runtime-interface",
+ "sp-std",
+ "sp-storage",
 ]
 
 [[package]]
 name = "orml-tokens"
-version = "0.8.1"
-source = "git+https://github.com/galacticcouncil/open-runtime-module-library?branch=polkadot-v1.7.2#43629abf084fe6d9eae8b3013e13544e00ad912f"
+version = "0.12.0"
+source = "git+https://github.com/galacticcouncil/open-runtime-module-library?branch=polkadot-v1.11.0#0347ec813ce6cf3e1148a3bedcdf4c0a4e85b0da"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -7343,13 +7441,13 @@ dependencies = [
  "serde",
  "sp-arithmetic",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
 ]
 
 [[package]]
 name = "orml-traits"
-version = "0.8.0"
-source = "git+https://github.com/galacticcouncil/open-runtime-module-library?branch=polkadot-v1.7.2#43629abf084fe6d9eae8b3013e13544e00ad912f"
+version = "0.12.0"
+source = "git+https://github.com/galacticcouncil/open-runtime-module-library?branch=polkadot-v1.11.0#0347ec813ce6cf3e1148a3bedcdf4c0a4e85b0da"
 dependencies = [
  "frame-support",
  "impl-trait-for-tuples",
@@ -7362,14 +7460,14 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
  "staging-xcm",
 ]
 
 [[package]]
 name = "orml-unknown-tokens"
-version = "0.8.0"
-source = "git+https://github.com/galacticcouncil/open-runtime-module-library?branch=polkadot-v1.7.2#43629abf084fe6d9eae8b3013e13544e00ad912f"
+version = "0.12.0"
+source = "git+https://github.com/galacticcouncil/open-runtime-module-library?branch=polkadot-v1.11.0#0347ec813ce6cf3e1148a3bedcdf4c0a4e85b0da"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -7377,14 +7475,14 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "serde",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
  "staging-xcm",
 ]
 
 [[package]]
 name = "orml-utilities"
-version = "0.8.0"
-source = "git+https://github.com/galacticcouncil/open-runtime-module-library?branch=polkadot-v1.7.2#43629abf084fe6d9eae8b3013e13544e00ad912f"
+version = "0.12.0"
+source = "git+https://github.com/galacticcouncil/open-runtime-module-library?branch=polkadot-v1.11.0#0347ec813ce6cf3e1148a3bedcdf4c0a4e85b0da"
 dependencies = [
  "frame-support",
  "parity-scale-codec",
@@ -7393,13 +7491,13 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
 ]
 
 [[package]]
 name = "orml-vesting"
-version = "0.8.0"
-source = "git+https://github.com/galacticcouncil/open-runtime-module-library?branch=polkadot-v1.7.2#43629abf084fe6d9eae8b3013e13544e00ad912f"
+version = "0.12.0"
+source = "git+https://github.com/galacticcouncil/open-runtime-module-library?branch=polkadot-v1.11.0#0347ec813ce6cf3e1148a3bedcdf4c0a4e85b0da"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -7408,41 +7506,41 @@ dependencies = [
  "serde",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
 ]
 
 [[package]]
 name = "orml-xcm"
-version = "0.8.0"
-source = "git+https://github.com/galacticcouncil/open-runtime-module-library?branch=polkadot-v1.7.2#43629abf084fe6d9eae8b3013e13544e00ad912f"
+version = "0.12.0"
+source = "git+https://github.com/galacticcouncil/open-runtime-module-library?branch=polkadot-v1.11.0#0347ec813ce6cf3e1148a3bedcdf4c0a4e85b0da"
 dependencies = [
  "frame-support",
  "frame-system",
  "pallet-xcm",
  "parity-scale-codec",
  "scale-info",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
  "staging-xcm",
 ]
 
 [[package]]
 name = "orml-xcm-support"
-version = "0.8.0"
-source = "git+https://github.com/galacticcouncil/open-runtime-module-library?branch=polkadot-v1.7.2#43629abf084fe6d9eae8b3013e13544e00ad912f"
+version = "0.12.0"
+source = "git+https://github.com/galacticcouncil/open-runtime-module-library?branch=polkadot-v1.11.0#0347ec813ce6cf3e1148a3bedcdf4c0a4e85b0da"
 dependencies = [
  "frame-support",
  "orml-traits",
  "parity-scale-codec",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
  "staging-xcm",
  "staging-xcm-executor",
 ]
 
 [[package]]
 name = "orml-xtokens"
-version = "0.8.0"
-source = "git+https://github.com/galacticcouncil/open-runtime-module-library?branch=polkadot-v1.7.2#43629abf084fe6d9eae8b3013e13544e00ad912f"
+version = "0.12.0"
+source = "git+https://github.com/galacticcouncil/open-runtime-module-library?branch=polkadot-v1.11.0#0347ec813ce6cf3e1148a3bedcdf4c0a4e85b0da"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -7455,7 +7553,7 @@ dependencies = [
  "serde",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
  "staging-xcm",
  "staging-xcm-executor",
 ]
@@ -7466,14 +7564,21 @@ 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#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
  "frame-system",
+ "log",
  "parity-scale-codec",
  "scale-info",
  "sp-api",
@@ -7481,13 +7586,13 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
 ]
 
 [[package]]
 name = "pallet-asset-rate"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -7496,12 +7601,12 @@ dependencies = [
  "scale-info",
  "sp-core",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
 ]
 
 [[package]]
 name = "pallet-asset-registry"
-version = "3.2.4"
+version = "3.2.5"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -7520,7 +7625,7 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
  "staging-xcm",
  "substrate-wasm-builder",
  "test-utils",
@@ -7529,7 +7634,7 @@ dependencies = [
 [[package]]
 name = "pallet-asset-tx-payment"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -7541,13 +7646,13 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
 ]
 
 [[package]]
 name = "pallet-assets"
-version = "29.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+version = "29.1.0"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -7557,13 +7662,13 @@ dependencies = [
  "scale-info",
  "sp-core",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
 ]
 
 [[package]]
 name = "pallet-aura"
 version = "27.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -7574,13 +7679,13 @@ dependencies = [
  "sp-application-crypto",
  "sp-consensus-aura",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
 ]
 
 [[package]]
 name = "pallet-authority-discovery"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -7590,13 +7695,13 @@ dependencies = [
  "sp-application-crypto",
  "sp-authority-discovery",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
 ]
 
 [[package]]
 name = "pallet-authorship"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -7604,13 +7709,13 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
 ]
 
 [[package]]
 name = "pallet-babe"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -7628,15 +7733,15 @@ dependencies = [
  "sp-runtime",
  "sp-session",
  "sp-staking",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
 ]
 
 [[package]]
 name = "pallet-bags-list"
 version = "27.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
- "aquamarine",
+ "aquamarine 0.5.0",
  "docify",
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -7649,14 +7754,14 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
- "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
+ "sp-tracing",
 ]
 
 [[package]]
 name = "pallet-balances"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "docify",
  "frame-benchmarking",
@@ -7666,13 +7771,13 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
 ]
 
 [[package]]
 name = "pallet-beefy"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -7686,13 +7791,13 @@ dependencies = [
  "sp-runtime",
  "sp-session",
  "sp-staking",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
 ]
 
 [[package]]
 name = "pallet-beefy-mmr"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "array-bytes 6.2.2",
  "binary-merkle-tree",
@@ -7711,12 +7816,12 @@ dependencies = [
  "sp-io",
  "sp-runtime",
  "sp-state-machine",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
 ]
 
 [[package]]
 name = "pallet-bonds"
-version = "2.2.3"
+version = "2.2.4"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -7734,14 +7839,14 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
- "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
+ "sp-tracing",
 ]
 
 [[package]]
 name = "pallet-bounties"
 version = "27.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -7753,30 +7858,32 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
 ]
 
 [[package]]
 name = "pallet-broker"
 version = "0.6.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "bitvec",
  "frame-benchmarking",
  "frame-support",
  "frame-system",
+ "log",
  "parity-scale-codec",
  "scale-info",
+ "sp-api",
  "sp-arithmetic",
  "sp-core",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
 ]
 
 [[package]]
 name = "pallet-child-bounties"
 version = "27.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -7789,12 +7896,12 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
 ]
 
 [[package]]
 name = "pallet-circuit-breaker"
-version = "1.1.25"
+version = "1.1.26"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -7812,20 +7919,20 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
- "test-case 3.3.1",
+ "sp-std",
+ "test-case",
  "test-utils",
 ]
 
 [[package]]
 name = "pallet-claims"
-version = "3.4.9"
+version = "3.4.10"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
  "frame-system",
  "hex",
- "hex-literal 0.3.4",
+ "hex-literal",
  "lazy_static",
  "pallet-balances",
  "parity-scale-codec",
@@ -7836,12 +7943,12 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
 ]
 
 [[package]]
 name = "pallet-collator-rewards"
-version = "1.0.8"
+version = "1.0.9"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -7859,14 +7966,14 @@ dependencies = [
  "sp-io",
  "sp-runtime",
  "sp-staking",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
  "substrate-wasm-builder",
 ]
 
 [[package]]
 name = "pallet-collator-selection"
 version = "9.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -7876,17 +7983,17 @@ dependencies = [
  "pallet-balances",
  "pallet-session",
  "parity-scale-codec",
- "rand",
+ "rand 0.8.5",
  "scale-info",
  "sp-runtime",
  "sp-staking",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
 ]
 
 [[package]]
 name = "pallet-collective"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -7897,13 +8004,13 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
 ]
 
 [[package]]
 name = "pallet-conviction-voting"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "assert_matches",
  "frame-benchmarking",
@@ -7914,12 +8021,12 @@ dependencies = [
  "serde",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
 ]
 
 [[package]]
 name = "pallet-currencies"
-version = "2.1.1"
+version = "2.1.2"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -7933,12 +8040,12 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
 ]
 
 [[package]]
 name = "pallet-dca"
-version = "1.6.0"
+version = "1.6.1"
 dependencies = [
  "cumulus-pallet-parachain-system",
  "cumulus-primitives-core",
@@ -7962,22 +8069,22 @@ dependencies = [
  "pretty_assertions",
  "primitive-types",
  "primitives",
- "rand",
+ "rand 0.8.5",
  "scale-info",
  "smallvec",
  "sp-api",
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
- "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
- "test-case 2.2.2",
+ "sp-std",
+ "sp-tracing",
+ "test-case",
  "test-utils",
 ]
 
 [[package]]
 name = "pallet-democracy"
-version = "4.3.1"
+version = "4.3.2"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -7992,13 +8099,13 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
 ]
 
 [[package]]
 name = "pallet-democracy"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8010,12 +8117,12 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
 ]
 
 [[package]]
 name = "pallet-duster"
-version = "3.2.5"
+version = "3.2.6"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8033,13 +8140,13 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
  "substrate-wasm-builder",
 ]
 
 [[package]]
 name = "pallet-dynamic-evm-fee"
-version = "1.0.2"
+version = "1.0.3"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8060,13 +8167,13 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
  "test-utils",
 ]
 
 [[package]]
 name = "pallet-dynamic-fees"
-version = "1.0.4"
+version = "1.0.5"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8080,13 +8187,13 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
 ]
 
 [[package]]
 name = "pallet-election-provider-multi-phase"
 version = "27.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -8095,21 +8202,21 @@ dependencies = [
  "log",
  "pallet-election-provider-support-benchmarking",
  "parity-scale-codec",
- "rand",
+ "rand 0.8.5",
  "scale-info",
  "sp-arithmetic",
  "sp-core",
  "sp-io",
  "sp-npos-elections",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
- "strum 0.24.1",
+ "sp-std",
+ "strum 0.26.3",
 ]
 
 [[package]]
 name = "pallet-election-provider-support-benchmarking"
 version = "27.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -8117,13 +8224,13 @@ dependencies = [
  "parity-scale-codec",
  "sp-npos-elections",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
 ]
 
 [[package]]
 name = "pallet-elections-phragmen"
 version = "29.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8136,12 +8243,12 @@ dependencies = [
  "sp-npos-elections",
  "sp-runtime",
  "sp-staking",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
 ]
 
 [[package]]
 name = "pallet-ema-oracle"
-version = "1.3.2"
+version = "1.3.3"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8159,14 +8266,14 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
  "test-utils",
 ]
 
 [[package]]
 name = "pallet-ethereum"
 version = "4.0.0-dev"
-source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.2#91f1c7a447f987d732f87f86c3e02d506d426a99"
+source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.11.0#45d16ae4c8b32e26fdab8353b704fd59ea0ddb8c"
 dependencies = [
  "environmental",
  "ethereum 0.15.0",
@@ -8184,13 +8291,12 @@ dependencies = [
  "scale-info",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-evm"
 version = "6.0.0-dev"
-source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.2#91f1c7a447f987d732f87f86c3e02d506d426a99"
+source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.11.0#45d16ae4c8b32e26fdab8353b704fd59ea0ddb8c"
 dependencies = [
  "environmental",
  "evm 0.41.1",
@@ -8201,7 +8307,7 @@ dependencies = [
  "frame-system",
  "hash-db 0.16.0",
  "hex",
- "hex-literal 0.4.1",
+ "hex-literal",
  "impl-trait-for-tuples",
  "log",
  "parity-scale-codec",
@@ -8210,17 +8316,16 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "pallet-evm-accounts"
-version = "1.1.2"
+version = "1.1.3"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
  "frame-system",
- "hex-literal 0.4.1",
+ "hex-literal",
  "hydradx-traits",
  "orml-tokens",
  "orml-traits",
@@ -8228,13 +8333,13 @@ dependencies = [
  "scale-info",
  "sp-core",
  "sp-io",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
  "test-utils",
 ]
 
 [[package]]
 name = "pallet-evm-accounts-rpc-runtime-api"
-version = "1.0.0"
+version = "1.0.1"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -8243,7 +8348,7 @@ dependencies = [
 [[package]]
 name = "pallet-evm-chain-id"
 version = "1.0.0-dev"
-source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.2#91f1c7a447f987d732f87f86c3e02d506d426a99"
+source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.11.0#45d16ae4c8b32e26fdab8353b704fd59ea0ddb8c"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -8254,7 +8359,7 @@ dependencies = [
 [[package]]
 name = "pallet-evm-precompile-blake2"
 version = "2.0.0-dev"
-source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.2#91f1c7a447f987d732f87f86c3e02d506d426a99"
+source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.11.0#45d16ae4c8b32e26fdab8353b704fd59ea0ddb8c"
 dependencies = [
  "fp-evm",
 ]
@@ -8262,7 +8367,7 @@ dependencies = [
 [[package]]
 name = "pallet-evm-precompile-bn128"
 version = "2.0.0-dev"
-source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.2#91f1c7a447f987d732f87f86c3e02d506d426a99"
+source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.11.0#45d16ae4c8b32e26fdab8353b704fd59ea0ddb8c"
 dependencies = [
  "fp-evm",
  "sp-core",
@@ -8271,17 +8376,17 @@ dependencies = [
 
 [[package]]
 name = "pallet-evm-precompile-call-permit"
-version = "0.1.1"
+version = "0.1.2"
 dependencies = [
  "derive_more",
  "evm 0.41.1",
  "fp-evm",
  "frame-support",
  "frame-system",
- "hex-literal 0.4.1",
+ "hex-literal",
  "libsecp256k1",
  "log",
- "num_enum 0.5.11",
+ "num_enum",
  "pallet-balances",
  "pallet-evm",
  "pallet-timestamp",
@@ -8295,13 +8400,13 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
 ]
 
 [[package]]
 name = "pallet-evm-precompile-dispatch"
 version = "2.0.0-dev"
-source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.2#91f1c7a447f987d732f87f86c3e02d506d426a99"
+source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.11.0#45d16ae4c8b32e26fdab8353b704fd59ea0ddb8c"
 dependencies = [
  "fp-evm",
  "frame-support",
@@ -8313,7 +8418,7 @@ dependencies = [
 [[package]]
 name = "pallet-evm-precompile-modexp"
 version = "2.0.0-dev"
-source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.2#91f1c7a447f987d732f87f86c3e02d506d426a99"
+source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.11.0#45d16ae4c8b32e26fdab8353b704fd59ea0ddb8c"
 dependencies = [
  "fp-evm",
  "num",
@@ -8322,7 +8427,7 @@ dependencies = [
 [[package]]
 name = "pallet-evm-precompile-simple"
 version = "2.0.0-dev"
-source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.7.2#91f1c7a447f987d732f87f86c3e02d506d426a99"
+source = "git+https://github.com/moonbeam-foundation/frontier?branch=moonbeam-polkadot-v1.11.0#45d16ae4c8b32e26fdab8353b704fd59ea0ddb8c"
 dependencies = [
  "fp-evm",
  "ripemd",
@@ -8332,7 +8437,7 @@ dependencies = [
 [[package]]
 name = "pallet-fast-unstake"
 version = "27.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "docify",
  "frame-benchmarking",
@@ -8345,17 +8450,17 @@ dependencies = [
  "sp-io",
  "sp-runtime",
  "sp-staking",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
 ]
 
 [[package]]
 name = "pallet-genesis-history"
-version = "2.1.2"
+version = "2.1.3"
 dependencies = [
  "derive_more",
  "frame-support",
  "frame-system",
- "hex-literal 0.4.1",
+ "hex-literal",
  "log",
  "parity-scale-codec",
  "scale-info",
@@ -8363,13 +8468,13 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
 ]
 
 [[package]]
 name = "pallet-grandpa"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8386,13 +8491,13 @@ dependencies = [
  "sp-runtime",
  "sp-session",
  "sp-staking",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
 ]
 
 [[package]]
 name = "pallet-identity"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "enumflags2",
  "frame-benchmarking",
@@ -8403,13 +8508,13 @@ dependencies = [
  "scale-info",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
 ]
 
 [[package]]
 name = "pallet-im-online"
 version = "27.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8423,13 +8528,13 @@ dependencies = [
  "sp-io",
  "sp-runtime",
  "sp-staking",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
 ]
 
 [[package]]
 name = "pallet-indices"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8440,12 +8545,12 @@ dependencies = [
  "sp-io",
  "sp-keyring",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
 ]
 
 [[package]]
 name = "pallet-lbp"
-version = "4.8.5"
+version = "4.8.6"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8463,14 +8568,14 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
  "substrate-wasm-builder",
  "test-utils",
 ]
 
 [[package]]
 name = "pallet-liquidity-mining"
-version = "4.4.1"
+version = "4.4.2"
 dependencies = [
  "fixed",
  "frame-support",
@@ -8483,20 +8588,20 @@ dependencies = [
  "parity-scale-codec",
  "pretty_assertions",
  "proptest",
- "rand",
+ "rand 0.8.5",
  "scale-info",
  "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)",
+ "sp-std",
  "test-utils",
 ]
 
 [[package]]
 name = "pallet-membership"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8507,13 +8612,13 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
 ]
 
 [[package]]
 name = "pallet-message-queue"
 version = "31.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "environmental",
  "frame-benchmarking",
@@ -8526,14 +8631,14 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
  "sp-weights",
 ]
 
 [[package]]
 name = "pallet-mmr"
 version = "27.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8545,13 +8650,13 @@ dependencies = [
  "sp-io",
  "sp-mmr-primitives",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
 ]
 
 [[package]]
 name = "pallet-multisig"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8561,12 +8666,12 @@ dependencies = [
  "scale-info",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
 ]
 
 [[package]]
 name = "pallet-nft"
-version = "7.1.4"
+version = "7.1.5"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8581,13 +8686,13 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
 ]
 
 [[package]]
 name = "pallet-nis"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8597,13 +8702,13 @@ dependencies = [
  "sp-arithmetic",
  "sp-core",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
 ]
 
 [[package]]
 name = "pallet-nomination-pools"
 version = "25.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -8615,14 +8720,14 @@ dependencies = [
  "sp-io",
  "sp-runtime",
  "sp-staking",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
- "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
+ "sp-tracing",
 ]
 
 [[package]]
 name = "pallet-nomination-pools-benchmarking"
 version = "26.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -8634,26 +8739,26 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-runtime",
- "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-runtime-interface",
  "sp-staking",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
 ]
 
 [[package]]
 name = "pallet-nomination-pools-runtime-api"
 version = "23.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "pallet-nomination-pools",
  "parity-scale-codec",
  "sp-api",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
 ]
 
 [[package]]
 name = "pallet-offences"
 version = "27.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -8664,13 +8769,13 @@ dependencies = [
  "serde",
  "sp-runtime",
  "sp-staking",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
 ]
 
 [[package]]
 name = "pallet-offences-benchmarking"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -8688,12 +8793,12 @@ dependencies = [
  "scale-info",
  "sp-runtime",
  "sp-staking",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
 ]
 
 [[package]]
 name = "pallet-omnipool"
-version = "4.3.3"
+version = "4.3.4"
 dependencies = [
  "bitflags 1.3.2",
  "frame-benchmarking",
@@ -8714,13 +8819,13 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
- "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
+ "sp-tracing",
 ]
 
 [[package]]
 name = "pallet-omnipool-liquidity-mining"
-version = "2.2.0"
+version = "2.2.1"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8742,12 +8847,12 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
 ]
 
 [[package]]
 name = "pallet-otc"
-version = "2.0.1"
+version = "2.0.2"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8763,13 +8868,13 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
  "test-utils",
 ]
 
 [[package]]
 name = "pallet-otc-settlements"
-version = "1.0.3"
+version = "1.0.4"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8786,7 +8891,7 @@ dependencies = [
  "pallet-otc",
  "pallet-route-executor",
  "parity-scale-codec",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "pretty_assertions",
  "proptest",
  "scale-info",
@@ -8795,14 +8900,32 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
  "test-utils",
 ]
 
+[[package]]
+name = "pallet-parameters"
+version = "0.1.0"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
+dependencies = [
+ "docify",
+ "frame-benchmarking",
+ "frame-support",
+ "frame-system",
+ "parity-scale-codec",
+ "paste",
+ "scale-info",
+ "serde",
+ "sp-core",
+ "sp-runtime",
+ "sp-std",
+]
+
 [[package]]
 name = "pallet-preimage"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8813,13 +8936,13 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
 ]
 
 [[package]]
 name = "pallet-proxy"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8828,13 +8951,13 @@ dependencies = [
  "scale-info",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
 ]
 
 [[package]]
 name = "pallet-ranked-collective"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8847,13 +8970,13 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
 ]
 
 [[package]]
 name = "pallet-recovery"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8862,13 +8985,13 @@ dependencies = [
  "scale-info",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
 ]
 
 [[package]]
 name = "pallet-referenda"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "assert_matches",
  "frame-benchmarking",
@@ -8881,17 +9004,17 @@ dependencies = [
  "sp-arithmetic",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
 ]
 
 [[package]]
 name = "pallet-referrals"
-version = "1.2.5"
+version = "1.2.6"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
  "frame-system",
- "hex-literal 0.3.4",
+ "hex-literal",
  "hydra-dx-math",
  "hydradx-traits",
  "orml-tokens",
@@ -8902,13 +9025,13 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
- "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
+ "sp-tracing",
 ]
 
 [[package]]
 name = "pallet-relaychain-info"
-version = "0.3.4"
+version = "0.3.5"
 dependencies = [
  "cumulus-pallet-parachain-system",
  "cumulus-primitives-core",
@@ -8917,13 +9040,13 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-api",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
 ]
 
 [[package]]
 name = "pallet-root-testing"
 version = "4.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -8932,12 +9055,12 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
 ]
 
 [[package]]
 name = "pallet-route-executor"
-version = "2.6.0"
+version = "2.6.1"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -8956,14 +9079,14 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
  "test-utils",
 ]
 
 [[package]]
 name = "pallet-scheduler"
 version = "29.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "docify",
  "frame-benchmarking",
@@ -8974,14 +9097,14 @@ dependencies = [
  "scale-info",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
  "sp-weights",
 ]
 
 [[package]]
 name = "pallet-session"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -8996,14 +9119,14 @@ dependencies = [
  "sp-session",
  "sp-staking",
  "sp-state-machine",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
  "sp-trie",
 ]
 
 [[package]]
 name = "pallet-session-benchmarking"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -9011,16 +9134,16 @@ dependencies = [
  "pallet-session",
  "pallet-staking 28.0.0",
  "parity-scale-codec",
- "rand",
+ "rand 0.8.5",
  "sp-runtime",
  "sp-session",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
 ]
 
 [[package]]
 name = "pallet-society"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -9032,12 +9155,12 @@ dependencies = [
  "sp-arithmetic",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
 ]
 
 [[package]]
 name = "pallet-stableswap"
-version = "3.6.4"
+version = "3.6.5"
 dependencies = [
  "bitflags 1.3.2",
  "frame-benchmarking",
@@ -9055,14 +9178,14 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
- "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
+ "sp-tracing",
  "test-utils",
 ]
 
 [[package]]
 name = "pallet-staking"
-version = "3.1.1"
+version = "3.1.2"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -9072,7 +9195,7 @@ dependencies = [
  "orml-tokens",
  "orml-traits",
  "pallet-balances",
- "pallet-democracy 4.3.1",
+ "pallet-democracy 4.3.2",
  "pallet-uniques",
  "parity-scale-codec",
  "pretty_assertions",
@@ -9081,13 +9204,13 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
 ]
 
 [[package]]
 name = "pallet-staking"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "frame-benchmarking",
  "frame-election-provider-support",
@@ -9104,13 +9227,13 @@ dependencies = [
  "sp-io",
  "sp-runtime",
  "sp-staking",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
 ]
 
 [[package]]
 name = "pallet-staking-reward-curve"
 version = "11.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "proc-macro-crate 3.1.0",
  "proc-macro2",
@@ -9121,7 +9244,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking-reward-fn"
 version = "19.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "log",
  "sp-arithmetic",
@@ -9130,7 +9253,7 @@ dependencies = [
 [[package]]
 name = "pallet-staking-runtime-api"
 version = "14.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -9140,7 +9263,7 @@ dependencies = [
 [[package]]
 name = "pallet-state-trie-migration"
 version = "29.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -9151,13 +9274,13 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
 ]
 
 [[package]]
 name = "pallet-sudo"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "docify",
  "frame-benchmarking",
@@ -9167,13 +9290,13 @@ dependencies = [
  "scale-info",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
 ]
 
 [[package]]
 name = "pallet-timestamp"
 version = "27.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "docify",
  "frame-benchmarking",
@@ -9185,15 +9308,15 @@ dependencies = [
  "sp-inherents",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
- "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
+ "sp-storage",
  "sp-timestamp",
 ]
 
 [[package]]
 name = "pallet-tips"
 version = "27.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -9206,12 +9329,12 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
 ]
 
 [[package]]
 name = "pallet-transaction-multi-payment"
-version = "10.1.0"
+version = "10.1.1"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -9233,13 +9356,13 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
  "test-utils",
 ]
 
 [[package]]
 name = "pallet-transaction-pause"
-version = "1.0.3"
+version = "1.0.4"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -9255,13 +9378,13 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
 ]
 
 [[package]]
 name = "pallet-transaction-payment"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -9271,15 +9394,15 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
 ]
 
 [[package]]
 name = "pallet-transaction-payment-rpc"
 version = "30.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
- "jsonrpsee 0.20.3",
+ "jsonrpsee",
  "pallet-transaction-payment-rpc-runtime-api",
  "parity-scale-codec",
  "sp-api",
@@ -9293,7 +9416,7 @@ dependencies = [
 [[package]]
 name = "pallet-transaction-payment-rpc-runtime-api"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "pallet-transaction-payment",
  "parity-scale-codec",
@@ -9305,7 +9428,7 @@ dependencies = [
 [[package]]
 name = "pallet-treasury"
 version = "27.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "docify",
  "frame-benchmarking",
@@ -9318,13 +9441,13 @@ dependencies = [
  "serde",
  "sp-core",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
 ]
 
 [[package]]
 name = "pallet-uniques"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -9333,13 +9456,13 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
 ]
 
 [[package]]
 name = "pallet-utility"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -9349,13 +9472,13 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
 ]
 
 [[package]]
 name = "pallet-vesting"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -9364,13 +9487,13 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
 ]
 
 [[package]]
 name = "pallet-whitelist"
 version = "27.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -9379,13 +9502,13 @@ dependencies = [
  "scale-info",
  "sp-api",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
 ]
 
 [[package]]
 name = "pallet-xcm"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "bounded-collections",
  "frame-benchmarking",
@@ -9399,16 +9522,17 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
  "staging-xcm",
  "staging-xcm-builder",
  "staging-xcm-executor",
+ "xcm-fee-payment-runtime-api",
 ]
 
 [[package]]
 name = "pallet-xcm-benchmarks"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -9418,7 +9542,7 @@ dependencies = [
  "scale-info",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
  "staging-xcm",
  "staging-xcm-builder",
  "staging-xcm-executor",
@@ -9426,7 +9550,7 @@ dependencies = [
 
 [[package]]
 name = "pallet-xyk"
-version = "6.5.1"
+version = "6.5.2"
 dependencies = [
  "frame-benchmarking",
  "frame-support",
@@ -9446,13 +9570,13 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
  "substrate-wasm-builder",
 ]
 
 [[package]]
 name = "pallet-xyk-liquidity-mining"
-version = "1.1.13"
+version = "1.1.14"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -9471,13 +9595,13 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
 ]
 
 [[package]]
 name = "parachains-common"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "cumulus-primitives-core",
  "cumulus-primitives-utility",
@@ -9498,18 +9622,31 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
  "staging-parachain-info",
  "staging-xcm",
  "staging-xcm-executor",
  "substrate-wasm-builder",
 ]
 
+[[package]]
+name = "parity-bip39"
+version = "2.0.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "4e69bf016dc406eff7d53a7d3f7cf1c2e72c82b9088aac1118591e36dd2cd3e9"
+dependencies = [
+ "bitcoin_hashes 0.13.0",
+ "rand 0.8.5",
+ "rand_core 0.6.4",
+ "serde",
+ "unicode-normalization",
+]
+
 [[package]]
 name = "parity-db"
-version = "0.4.12"
+version = "0.4.13"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "59e9ab494af9e6e813c72170f0d3c1de1500990d62c97cc05cc7576f91aa402f"
+checksum = "592a28a24b09c9dc20ac8afaa6839abc417c720afe42c12e1e4a9d6aa2508d2e"
 dependencies = [
  "blake2 0.10.6",
  "crc32fast",
@@ -9519,10 +9656,11 @@ dependencies = [
  "log",
  "lz4",
  "memmap2 0.5.10",
- "parking_lot 0.12.1",
- "rand",
+ "parking_lot 0.12.3",
+ "rand 0.8.5",
  "siphasher",
  "snap",
+ "winapi",
 ]
 
 [[package]]
@@ -9583,9 +9721,9 @@ dependencies = [
 
 [[package]]
 name = "parking_lot"
-version = "0.12.1"
+version = "0.12.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
+checksum = "f1bf18183cf54e8d6059647fc3063646a1801cf30896933ec2311622cc4b9a27"
 dependencies = [
  "lock_api",
  "parking_lot_core 0.9.9",
@@ -9625,19 +9763,21 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7924d1d0ad836f665c9065e26d016c673ece3993f30d340068b16f282afc1156"
 
 [[package]]
-name = "paste"
-version = "1.0.14"
+name = "password-hash"
+version = "0.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c"
+checksum = "346f04948ba92c43e8469c1ee6736c7563d71012b17d40745260fe106aac2166"
+dependencies = [
+ "base64ct",
+ "rand_core 0.6.4",
+ "subtle 2.6.1",
+]
 
 [[package]]
-name = "pbkdf2"
-version = "0.8.0"
+name = "paste"
+version = "1.0.14"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "d95f5254224e617595d2cc3cc73ff0a5eaf2637519e25f03388154e9378b6ffa"
-dependencies = [
- "crypto-mac 0.11.1",
-]
+checksum = "de3145af08024dea9fa9914f381a17b8fc6034dfb00f3a84013f7ff43f29ed4c"
 
 [[package]]
 name = "pbkdf2"
@@ -9646,6 +9786,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8ed6a7761f76e3b9f92dfb0a60a6a6477c61024b775147ff0973a02653abaf2"
 dependencies = [
  "digest 0.10.7",
+ "password-hash",
 ]
 
 [[package]]
@@ -9832,7 +9973,7 @@ dependencies = [
 [[package]]
 name = "polkadot-approval-distribution"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "bitvec",
  "futures",
@@ -9845,14 +9986,14 @@ dependencies = [
  "polkadot-node-subsystem",
  "polkadot-node-subsystem-util",
  "polkadot-primitives",
- "rand",
+ "rand 0.8.5",
  "tracing-gum",
 ]
 
 [[package]]
 name = "polkadot-availability-bitfield-distribution"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "always-assert",
  "futures",
@@ -9861,14 +10002,14 @@ dependencies = [
  "polkadot-node-subsystem",
  "polkadot-node-subsystem-util",
  "polkadot-primitives",
- "rand",
+ "rand 0.8.5",
  "tracing-gum",
 ]
 
 [[package]]
 name = "polkadot-availability-distribution"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "derive_more",
  "fatality",
@@ -9880,7 +10021,7 @@ dependencies = [
  "polkadot-node-subsystem",
  "polkadot-node-subsystem-util",
  "polkadot-primitives",
- "rand",
+ "rand 0.8.5",
  "schnellru",
  "sp-core",
  "sp-keystore",
@@ -9891,7 +10032,7 @@ dependencies = [
 [[package]]
 name = "polkadot-availability-recovery"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "async-trait",
  "fatality",
@@ -9903,7 +10044,7 @@ dependencies = [
  "polkadot-node-subsystem",
  "polkadot-node-subsystem-util",
  "polkadot-primitives",
- "rand",
+ "rand 0.8.5",
  "sc-network",
  "schnellru",
  "thiserror",
@@ -9914,7 +10055,7 @@ dependencies = [
 [[package]]
 name = "polkadot-cli"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "cfg-if",
  "clap 4.5.4",
@@ -9934,15 +10075,15 @@ dependencies = [
  "sp-io",
  "sp-keyring",
  "sp-maybe-compressed-blob",
+ "sp-runtime",
  "substrate-build-script-utils",
  "thiserror",
- "try-runtime-cli",
 ]
 
 [[package]]
 name = "polkadot-collator-protocol"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "bitvec",
  "fatality",
@@ -9964,19 +10105,19 @@ dependencies = [
 [[package]]
 name = "polkadot-core-primitives"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-core",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
 ]
 
 [[package]]
 name = "polkadot-dispute-distribution"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "derive_more",
  "fatality",
@@ -10001,7 +10142,7 @@ dependencies = [
 [[package]]
 name = "polkadot-erasure-coding"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "parity-scale-codec",
  "polkadot-node-primitives",
@@ -10015,7 +10156,7 @@ dependencies = [
 [[package]]
 name = "polkadot-gossip-support"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "futures",
  "futures-timer",
@@ -10023,7 +10164,7 @@ dependencies = [
  "polkadot-node-subsystem",
  "polkadot-node-subsystem-util",
  "polkadot-primitives",
- "rand",
+ "rand 0.8.5",
  "rand_chacha 0.3.1",
  "sc-network",
  "sc-network-common",
@@ -10037,7 +10178,7 @@ dependencies = [
 [[package]]
 name = "polkadot-network-bridge"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "always-assert",
  "async-trait",
@@ -10045,7 +10186,7 @@ dependencies = [
  "fatality",
  "futures",
  "parity-scale-codec",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "polkadot-node-metrics",
  "polkadot-node-network-protocol",
  "polkadot-node-subsystem",
@@ -10060,7 +10201,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-collation-generation"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "futures",
  "parity-scale-codec",
@@ -10078,7 +10219,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-approval-voting"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "bitvec",
  "derive_more",
@@ -10086,7 +10227,7 @@ dependencies = [
  "futures-timer",
  "itertools 0.10.5",
  "kvdb",
- "merlin 3.0.0",
+ "merlin",
  "parity-scale-codec",
  "polkadot-node-jaeger",
  "polkadot-node-primitives",
@@ -10094,7 +10235,7 @@ dependencies = [
  "polkadot-node-subsystem-util",
  "polkadot-overseer",
  "polkadot-primitives",
- "rand",
+ "rand 0.8.5",
  "rand_chacha 0.3.1",
  "rand_core 0.6.4",
  "sc-keystore",
@@ -10111,7 +10252,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-av-store"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "bitvec",
  "futures",
@@ -10133,7 +10274,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-backing"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "bitvec",
  "fatality",
@@ -10153,7 +10294,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-bitfield-signing"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "futures",
  "polkadot-node-subsystem",
@@ -10168,7 +10309,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-candidate-validation"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "async-trait",
  "futures",
@@ -10189,7 +10330,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-chain-api"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "futures",
  "polkadot-node-metrics",
@@ -10203,7 +10344,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-chain-selection"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "futures",
  "futures-timer",
@@ -10220,7 +10361,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-dispute-coordinator"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "fatality",
  "futures",
@@ -10239,7 +10380,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-parachains-inherent"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "async-trait",
  "futures",
@@ -10256,7 +10397,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-prospective-parachains"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "bitvec",
  "fatality",
@@ -10273,7 +10414,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-provisioner"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "bitvec",
  "fatality",
@@ -10283,6 +10424,7 @@ dependencies = [
  "polkadot-node-subsystem",
  "polkadot-node-subsystem-util",
  "polkadot-primitives",
+ "schnellru",
  "thiserror",
  "tracing-gum",
 ]
@@ -10290,7 +10432,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-pvf"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "always-assert",
  "array-bytes 6.2.2",
@@ -10298,8 +10440,6 @@ dependencies = [
  "cfg-if",
  "futures",
  "futures-timer",
- "is_executable",
- "libc",
  "parity-scale-codec",
  "pin-project",
  "polkadot-core-primitives",
@@ -10309,11 +10449,9 @@ dependencies = [
  "polkadot-node-subsystem",
  "polkadot-parachain-primitives",
  "polkadot-primitives",
- "rand",
+ "rand 0.8.5",
  "slotmap",
  "sp-core",
- "sp-maybe-compressed-blob",
- "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "tempfile",
  "thiserror",
  "tokio",
@@ -10323,7 +10461,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-pvf-checker"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "futures",
  "polkadot-node-primitives",
@@ -10339,9 +10477,8 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-pvf-common"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
- "cfg-if",
  "cpu-time",
  "futures",
  "landlock",
@@ -10356,9 +10493,9 @@ dependencies = [
  "seccompiler",
  "sp-core",
  "sp-crypto-hashing",
- "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-externalities",
  "sp-io",
- "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-tracing",
  "thiserror",
  "tracing-gum",
 ]
@@ -10366,7 +10503,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-core-runtime-api"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "futures",
  "polkadot-node-metrics",
@@ -10381,16 +10518,17 @@ dependencies = [
 [[package]]
 name = "polkadot-node-jaeger"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "lazy_static",
  "log",
  "mick-jaeger",
  "parity-scale-codec",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "polkadot-node-primitives",
  "polkadot-primitives",
  "sc-network",
+ "sc-network-types",
  "sp-core",
  "thiserror",
  "tokio",
@@ -10399,7 +10537,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-metrics"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "bs58 0.5.0",
  "futures",
@@ -10418,7 +10556,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-network-protocol"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "async-channel 1.9.0",
  "async-trait",
@@ -10431,10 +10569,12 @@ dependencies = [
  "polkadot-node-jaeger",
  "polkadot-node-primitives",
  "polkadot-primitives",
- "rand",
+ "rand 0.8.5",
  "sc-authority-discovery",
  "sc-network",
- "strum 0.24.1",
+ "sc-network-types",
+ "sp-runtime",
+ "strum 0.26.3",
  "thiserror",
  "tracing-gum",
 ]
@@ -10442,7 +10582,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-primitives"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "bitvec",
  "bounded-vec",
@@ -10465,7 +10605,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-subsystem"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "polkadot-node-jaeger",
  "polkadot-node-subsystem-types",
@@ -10475,7 +10615,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-subsystem-types"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "async-trait",
  "bitvec",
@@ -10489,6 +10629,7 @@ dependencies = [
  "polkadot-statement-table",
  "sc-client-api",
  "sc-network",
+ "sc-network-types",
  "sc-transaction-pool-api",
  "smallvec",
  "sp-api",
@@ -10503,7 +10644,7 @@ dependencies = [
 [[package]]
 name = "polkadot-node-subsystem-util"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "async-trait",
  "derive_more",
@@ -10514,7 +10655,7 @@ dependencies = [
  "kvdb",
  "parity-db",
  "parity-scale-codec",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "pin-project",
  "polkadot-node-jaeger",
  "polkadot-node-metrics",
@@ -10525,7 +10666,7 @@ dependencies = [
  "polkadot-overseer",
  "polkadot-primitives",
  "prioritized-metered-channel",
- "rand",
+ "rand 0.8.5",
  "sc-client-api",
  "schnellru",
  "sp-application-crypto",
@@ -10538,13 +10679,13 @@ dependencies = [
 [[package]]
 name = "polkadot-overseer"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "async-trait",
  "futures",
  "futures-timer",
  "orchestra",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "polkadot-node-metrics",
  "polkadot-node-network-protocol",
  "polkadot-node-primitives",
@@ -10560,7 +10701,7 @@ dependencies = [
 [[package]]
 name = "polkadot-parachain-primitives"
 version = "6.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "bounded-collections",
  "derive_more",
@@ -10570,17 +10711,17 @@ dependencies = [
  "serde",
  "sp-core",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
  "sp-weights",
 ]
 
 [[package]]
 name = "polkadot-primitives"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "bitvec",
- "hex-literal 0.4.1",
+ "hex-literal",
  "log",
  "parity-scale-codec",
  "polkadot-core-primitives",
@@ -10598,15 +10739,15 @@ dependencies = [
  "sp-keystore",
  "sp-runtime",
  "sp-staking",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
 ]
 
 [[package]]
 name = "polkadot-rpc"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
- "jsonrpsee 0.20.3",
+ "jsonrpsee",
  "mmr-rpc",
  "pallet-transaction-payment-rpc",
  "polkadot-primitives",
@@ -10637,7 +10778,7 @@ dependencies = [
 [[package]]
 name = "polkadot-runtime-common"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "bitvec",
  "frame-benchmarking",
@@ -10662,7 +10803,6 @@ dependencies = [
  "pallet-transaction-payment",
  "pallet-treasury",
  "pallet-vesting",
- "pallet-xcm-benchmarks",
  "parity-scale-codec",
  "polkadot-primitives",
  "polkadot-runtime-parachains",
@@ -10679,7 +10819,7 @@ dependencies = [
  "sp-runtime",
  "sp-session",
  "sp-staking",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
  "staging-xcm",
  "staging-xcm-builder",
  "staging-xcm-executor",
@@ -10689,20 +10829,20 @@ dependencies = [
 [[package]]
 name = "polkadot-runtime-metrics"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "bs58 0.5.0",
  "frame-benchmarking",
  "parity-scale-codec",
  "polkadot-primitives",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
- "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
+ "sp-tracing",
 ]
 
 [[package]]
 name = "polkadot-runtime-parachains"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "bitflags 1.3.2",
  "bitvec",
@@ -10727,7 +10867,7 @@ dependencies = [
  "polkadot-parachain-primitives",
  "polkadot-primitives",
  "polkadot-runtime-metrics",
- "rand",
+ "rand 0.8.5",
  "rand_chacha 0.3.1",
  "rustc-hex",
  "scale-info",
@@ -10742,7 +10882,7 @@ dependencies = [
  "sp-runtime",
  "sp-session",
  "sp-staking",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
  "staging-xcm",
  "staging-xcm-executor",
  "static_assertions",
@@ -10751,7 +10891,7 @@ dependencies = [
 [[package]]
 name = "polkadot-service"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "async-trait",
  "frame-benchmarking",
@@ -10760,20 +10900,19 @@ dependencies = [
  "frame-system",
  "frame-system-rpc-runtime-api",
  "futures",
- "hex-literal 0.4.1",
+ "hex-literal",
  "is_executable",
  "kvdb",
  "kvdb-rocksdb",
  "log",
  "mmr-gadget",
  "pallet-babe",
- "pallet-im-online",
  "pallet-staking 28.0.0",
  "pallet-transaction-payment",
  "pallet-transaction-payment-rpc-runtime-api",
  "parity-db",
  "parity-scale-codec",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "polkadot-approval-distribution",
  "polkadot-availability-bitfield-distribution",
  "polkadot-availability-distribution",
@@ -10854,21 +10993,23 @@ dependencies = [
  "sp-runtime",
  "sp-session",
  "sp-state-machine",
- "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-storage",
  "sp-timestamp",
  "sp-transaction-pool",
  "sp-version",
  "sp-weights",
+ "staging-xcm",
  "substrate-prometheus-endpoint",
  "thiserror",
  "tracing-gum",
  "westend-runtime",
+ "xcm-fee-payment-runtime-api",
 ]
 
 [[package]]
 name = "polkadot-statement-distribution"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "arrayvec 0.7.4",
  "bitvec",
@@ -10891,7 +11032,7 @@ dependencies = [
 [[package]]
 name = "polkadot-statement-table"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "parity-scale-codec",
  "polkadot-primitives",
@@ -10899,6 +11040,89 @@ dependencies = [
  "tracing-gum",
 ]
 
+[[package]]
+name = "polkavm"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8a3693e5efdb2bf74e449cd25fd777a28bd7ed87e41f5d5da75eb31b4de48b94"
+dependencies = [
+ "libc",
+ "log",
+ "polkavm-assembler",
+ "polkavm-common",
+ "polkavm-linux-raw",
+]
+
+[[package]]
+name = "polkavm-assembler"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1fa96d6d868243acc12de813dd48e756cbadcc8e13964c70d272753266deadc1"
+dependencies = [
+ "log",
+]
+
+[[package]]
+name = "polkavm-common"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1d9428a5cfcc85c5d7b9fc4b6a18c4b802d0173d768182a51cc7751640f08b92"
+dependencies = [
+ "log",
+]
+
+[[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]]
+name = "polkavm-linker"
+version = "0.9.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9c7be503e60cf56c0eb785f90aaba4b583b36bff00e93997d93fef97f9553c39"
+dependencies = [
+ "gimli 0.28.1",
+ "hashbrown 0.14.3",
+ "log",
+ "object 0.32.1",
+ "polkavm-common",
+ "regalloc2 0.9.3",
+ "rustc-demangle",
+]
+
+[[package]]
+name = "polkavm-linux-raw"
+version = "0.9.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26e85d3456948e650dff0cfc85603915847faf893ed1e66b020bb82ef4557120"
+
 [[package]]
 name = "polling"
 version = "2.8.0"
@@ -10972,7 +11196,7 @@ checksum = "5b40af805b3121feab8a3c29f04d8ad262fa8e0561883e7653e024ae4479e6de"
 
 [[package]]
 name = "precompile-utils"
-version = "0.1.1"
+version = "0.1.2"
 dependencies = [
  "affix",
  "derive_more",
@@ -10982,10 +11206,10 @@ dependencies = [
  "frame-support",
  "frame-system",
  "hex",
- "hex-literal 0.4.1",
+ "hex-literal",
  "impl-trait-for-tuples",
  "log",
- "num_enum 0.5.11",
+ "num_enum",
  "pallet-evm",
  "parity-scale-codec",
  "paste",
@@ -10997,7 +11221,7 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
  "sp-weights",
  "staging-xcm",
 ]
@@ -11010,14 +11234,14 @@ dependencies = [
  "fp-evm",
  "frame-support",
  "macrotest",
- "num_enum 0.5.11",
+ "num_enum",
  "precompile-utils",
  "prettyplease 0.1.25",
  "proc-macro2",
  "quote",
  "sha3",
  "sp-core",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
  "syn 1.0.109",
  "trybuild",
 ]
@@ -11036,6 +11260,16 @@ dependencies = [
  "regex",
 ]
 
+[[package]]
+name = "predicates"
+version = "3.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7e9086cc7640c29a356d1a29fd134380bee9d8f79a17410aa76e7ad295f42c97"
+dependencies = [
+ "anstyle",
+ "predicates-core",
+]
+
 [[package]]
 name = "predicates-core"
 version = "1.0.6"
@@ -11098,16 +11332,16 @@ dependencies = [
 
 [[package]]
 name = "primitives"
-version = "6.0.3"
+version = "6.0.4"
 dependencies = [
  "frame-support",
- "hex-literal 0.3.4",
+ "hex-literal",
  "parity-scale-codec",
  "polkadot-primitives",
  "scale-info",
  "serde",
  "sp-core",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
  "static_assertions",
 ]
 
@@ -11201,15 +11435,15 @@ dependencies = [
 
 [[package]]
 name = "prometheus"
-version = "0.13.3"
+version = "0.13.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "449811d15fbdf5ceb5c1144416066429cf82316e2ec8ce0c1f6f8a02e7bbcf8c"
+checksum = "3d33c28a30771f7f96db69893f78b857f7450d7e0237e9c8fc6427a81bae7ed1"
 dependencies = [
  "cfg-if",
  "fnv",
  "lazy_static",
  "memchr",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "thiserror",
 ]
 
@@ -11221,7 +11455,7 @@ checksum = "5d6fa99d535dd930d1249e6c79cb3c2915f9172a540fe2b02a4c8f9ca954721e"
 dependencies = [
  "dtoa",
  "itoa",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "prometheus-client-derive-encode",
 ]
 
@@ -11247,7 +11481,7 @@ dependencies = [
  "bitflags 2.4.1",
  "lazy_static",
  "num-traits",
- "rand",
+ "rand 0.8.5",
  "rand_chacha 0.3.1",
  "rand_xorshift",
  "regex-syntax 0.8.2",
@@ -11342,6 +11576,21 @@ dependencies = [
  "cc",
 ]
 
+[[package]]
+name = "quanta"
+version = "0.12.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e5167a477619228a0b284fac2674e3c388cba90631d7b7de620e6f1fcd08da5"
+dependencies = [
+ "crossbeam-utils",
+ "libc",
+ "once_cell",
+ "raw-cpuid",
+ "wasi 0.11.0+wasi-snapshot-preview1",
+ "web-sys",
+ "winapi",
+]
+
 [[package]]
 name = "quick-error"
 version = "1.2.3"
@@ -11381,6 +11630,24 @@ dependencies = [
  "pin-project-lite 0.1.12",
 ]
 
+[[package]]
+name = "quinn"
+version = "0.9.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2e8b432585672228923edbbf64b8b12c14e1112f62e88737655b4a083dbcd78e"
+dependencies = [
+ "bytes",
+ "pin-project-lite 0.2.13",
+ "quinn-proto",
+ "quinn-udp",
+ "rustc-hash",
+ "rustls 0.20.9",
+ "thiserror",
+ "tokio",
+ "tracing",
+ "webpki",
+]
+
 [[package]]
 name = "quinn-proto"
 version = "0.9.6"
@@ -11388,7 +11655,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "94b0b33c13a79f669c85defaf4c275dc86a0c0372807d0ca3d78e0bb87274863"
 dependencies = [
  "bytes",
- "rand",
+ "rand 0.8.5",
  "ring 0.16.20",
  "rustc-hash",
  "rustls 0.20.9",
@@ -11399,6 +11666,19 @@ dependencies = [
  "webpki",
 ]
 
+[[package]]
+name = "quinn-udp"
+version = "0.3.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "641538578b21f5e5c8ea733b736895576d0fe329bb883b937db6f4d163dbaaf4"
+dependencies = [
+ "libc",
+ "quinn-proto",
+ "socket2 0.4.10",
+ "tracing",
+ "windows-sys 0.42.0",
+]
+
 [[package]]
 name = "quote"
 version = "1.0.36"
@@ -11414,6 +11694,19 @@ 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"
@@ -11470,7 +11763,16 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32cb0b9bc82b0a0876c2dd994a7e7a2683d3e7390ca40e6886785ef0c7e3ee31"
 dependencies = [
  "num-traits",
- "rand",
+ "rand 0.8.5",
+]
+
+[[package]]
+name = "rand_hc"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ca3129af7b92a17112d59ad498c6f81eaf463253766b90396d39ea7a39d6613c"
+dependencies = [
+ "rand_core 0.5.1",
 ]
 
 [[package]]
@@ -11495,9 +11797,18 @@ dependencies = [
 name = "rand_xoshiro"
 version = "0.6.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6f97cdb2a36ed4183de61b2f824cc45c9f1037f28afe0a322e9fff4c108b5aaa"
+checksum = "6f97cdb2a36ed4183de61b2f824cc45c9f1037f28afe0a322e9fff4c108b5aaa"
+dependencies = [
+ "rand_core 0.6.4",
+]
+
+[[package]]
+name = "raw-cpuid"
+version = "11.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cb9ee317cfe3fbd54b36a511efc1edd42e216903c9cd575e686dd68a2ba90d8d"
 dependencies = [
- "rand_core 0.6.4",
+ "bitflags 2.4.1",
 ]
 
 [[package]]
@@ -11611,6 +11922,19 @@ dependencies = [
  "smallvec",
 ]
 
+[[package]]
+name = "regalloc2"
+version = "0.9.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ad156d539c879b7a24a363a2016d77961786e71f48f2e2fc8302a92abd2429a6"
+dependencies = [
+ "hashbrown 0.13.2",
+ "log",
+ "rustc-hash",
+ "slice-group-by",
+ "smallvec",
+]
+
 [[package]]
 name = "regex"
 version = "1.10.2"
@@ -11672,7 +11996,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f8dd2a808d456c4a54e300a23e9f5a67e122c3024119acbfd73e3bf664491cb2"
 dependencies = [
  "hmac 0.12.1",
- "subtle 2.4.1",
+ "subtle 2.6.1",
 ]
 
 [[package]]
@@ -11688,7 +12012,7 @@ dependencies = [
  "blake2 0.10.6",
  "common",
  "fflonk",
- "merlin 3.0.0",
+ "merlin",
 ]
 
 [[package]]
@@ -11764,9 +12088,10 @@ dependencies = [
 [[package]]
 name = "rococo-runtime"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "binary-merkle-tree",
+ "bitvec",
  "frame-benchmarking",
  "frame-executive",
  "frame-metadata-hash-extension",
@@ -11775,7 +12100,7 @@ dependencies = [
  "frame-system-benchmarking",
  "frame-system-rpc-runtime-api",
  "frame-try-runtime",
- "hex-literal 0.4.1",
+ "hex-literal",
  "log",
  "pallet-asset-rate",
  "pallet-authority-discovery",
@@ -11792,7 +12117,6 @@ dependencies = [
  "pallet-elections-phragmen",
  "pallet-grandpa",
  "pallet-identity",
- "pallet-im-online",
  "pallet-indices",
  "pallet-membership",
  "pallet-message-queue",
@@ -11800,6 +12124,7 @@ dependencies = [
  "pallet-multisig",
  "pallet-nis",
  "pallet-offences",
+ "pallet-parameters",
  "pallet-preimage",
  "pallet-proxy",
  "pallet-ranked-collective",
@@ -11831,6 +12156,7 @@ dependencies = [
  "scale-info",
  "serde",
  "serde_derive",
+ "serde_json",
  "smallvec",
  "sp-api",
  "sp-arithmetic",
@@ -11838,6 +12164,7 @@ dependencies = [
  "sp-block-builder",
  "sp-consensus-babe",
  "sp-consensus-beefy",
+ "sp-consensus-grandpa",
  "sp-core",
  "sp-genesis-builder",
  "sp-inherents",
@@ -11847,8 +12174,8 @@ dependencies = [
  "sp-runtime",
  "sp-session",
  "sp-staking",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
- "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
+ "sp-storage",
  "sp-transaction-pool",
  "sp-version",
  "staging-xcm",
@@ -11856,12 +12183,13 @@ dependencies = [
  "staging-xcm-executor",
  "static_assertions",
  "substrate-wasm-builder",
+ "xcm-fee-payment-runtime-api",
 ]
 
 [[package]]
 name = "rococo-runtime-constants"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "frame-support",
  "polkadot-primitives",
@@ -11931,7 +12259,7 @@ dependencies = [
 
 [[package]]
 name = "runtime-integration-tests"
-version = "1.23.6"
+version = "1.23.7"
 dependencies = [
  "cumulus-pallet-aura-ext",
  "cumulus-pallet-parachain-system",
@@ -11951,7 +12279,7 @@ dependencies = [
  "frame-system",
  "frame-system-benchmarking",
  "frame-system-rpc-runtime-api",
- "hex-literal 0.4.1",
+ "hex-literal",
  "hydra-dx-math",
  "hydradx-adapters",
  "hydradx-runtime",
@@ -11974,7 +12302,7 @@ dependencies = [
  "pallet-collective",
  "pallet-currencies",
  "pallet-dca",
- "pallet-democracy 4.3.1",
+ "pallet-democracy 4.3.2",
  "pallet-duster",
  "pallet-dynamic-evm-fee",
  "pallet-dynamic-fees",
@@ -11996,7 +12324,7 @@ dependencies = [
  "pallet-scheduler",
  "pallet-session",
  "pallet-stableswap",
- "pallet-staking 3.1.1",
+ "pallet-staking 3.1.2",
  "pallet-timestamp",
  "pallet-tips",
  "pallet-transaction-multi-payment",
@@ -12027,14 +12355,14 @@ dependencies = [
  "sp-consensus-babe",
  "sp-consensus-beefy",
  "sp-core",
- "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-externalities",
  "sp-inherents",
  "sp-io",
  "sp-offchain",
  "sp-runtime",
  "sp-session",
  "sp-staking",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
  "sp-transaction-pool",
  "sp-trie",
  "sp-version",
@@ -12049,7 +12377,7 @@ dependencies = [
 
 [[package]]
 name = "runtime-mock"
-version = "1.0.0"
+version = "1.0.1"
 dependencies = [
  "frame-remote-externalities",
  "frame-support",
@@ -12059,7 +12387,7 @@ dependencies = [
  "pallet-asset-registry",
  "pallet-omnipool",
  "pallet-stableswap",
- "pallet-staking 3.1.1",
+ "pallet-staking 3.1.2",
  "primitives",
  "scraper",
  "serde",
@@ -12167,10 +12495,24 @@ checksum = "f9d5a6813c0759e4609cd494e8e725babae6a2ca7b62a5536a13daaec6fcb7ba"
 dependencies = [
  "log",
  "ring 0.17.7",
- "rustls-webpki",
+ "rustls-webpki 0.101.7",
  "sct",
 ]
 
+[[package]]
+name = "rustls"
+version = "0.22.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "bf4ef73721ac7bcd79b2b315da7779d8fc09718c6b3d2d1b2d94850eb8c18432"
+dependencies = [
+ "log",
+ "ring 0.17.7",
+ "rustls-pki-types",
+ "rustls-webpki 0.102.6",
+ "subtle 2.6.1",
+ "zeroize",
+]
+
 [[package]]
 name = "rustls-native-certs"
 version = "0.6.3"
@@ -12178,7 +12520,20 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "a9aace74cb666635c918e9c12bc0d348266037aa8eb599b5cba565709a8dff00"
 dependencies = [
  "openssl-probe",
- "rustls-pemfile",
+ "rustls-pemfile 1.0.4",
+ "schannel",
+ "security-framework",
+]
+
+[[package]]
+name = "rustls-native-certs"
+version = "0.7.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a88d6d420651b496bdd98684116959239430022a115c1240e6c3993be0b15fba"
+dependencies = [
+ "openssl-probe",
+ "rustls-pemfile 2.1.2",
+ "rustls-pki-types",
  "schannel",
  "security-framework",
 ]
@@ -12192,6 +12547,22 @@ dependencies = [
  "base64 0.21.5",
 ]
 
+[[package]]
+name = "rustls-pemfile"
+version = "2.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "29993a25686778eb88d4189742cd713c9bce943bc54251a33509dc63cbacf73d"
+dependencies = [
+ "base64 0.22.1",
+ "rustls-pki-types",
+]
+
+[[package]]
+name = "rustls-pki-types"
+version = "1.7.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "976295e77ce332211c0d24d92c0e83e50f5c5f046d11082cea19f3df13a3562d"
+
 [[package]]
 name = "rustls-webpki"
 version = "0.101.7"
@@ -12202,6 +12573,17 @@ dependencies = [
  "untrusted 0.9.0",
 ]
 
+[[package]]
+name = "rustls-webpki"
+version = "0.102.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8e6b52d4fda176fd835fdc55a835d4a89b8499cad995885a21149d5ad62f852e"
+dependencies = [
+ "ring 0.17.7",
+ "rustls-pki-types",
+ "untrusted 0.9.0",
+]
+
 [[package]]
 name = "rustversion"
 version = "1.0.14"
@@ -12269,33 +12651,35 @@ dependencies = [
 [[package]]
 name = "sc-allocator"
 version = "23.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "log",
  "sp-core",
- "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-wasm-interface",
  "thiserror",
 ]
 
 [[package]]
 name = "sc-authority-discovery"
 version = "0.34.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "async-trait",
  "futures",
  "futures-timer",
  "ip_network",
  "libp2p",
+ "linked_hash_set",
  "log",
- "multihash 0.18.1",
+ "multihash 0.17.0",
  "multihash-codetable",
  "parity-scale-codec",
  "prost 0.12.4",
  "prost-build",
- "rand",
+ "rand 0.8.5",
  "sc-client-api",
  "sc-network",
+ "sc-network-types",
  "sp-api",
  "sp-authority-discovery",
  "sp-blockchain",
@@ -12309,7 +12693,7 @@ dependencies = [
 [[package]]
 name = "sc-basic-authorship"
 version = "0.34.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "futures",
  "futures-timer",
@@ -12331,7 +12715,7 @@ dependencies = [
 [[package]]
 name = "sc-block-builder"
 version = "0.33.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "parity-scale-codec",
  "sp-api",
@@ -12345,8 +12729,8 @@ dependencies = [
 
 [[package]]
 name = "sc-chain-spec"
-version = "27.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+version = "28.0.0"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "array-bytes 6.2.2",
  "docify",
@@ -12367,12 +12751,13 @@ dependencies = [
  "sp-io",
  "sp-runtime",
  "sp-state-machine",
+ "sp-tracing",
 ]
 
 [[package]]
 name = "sc-chain-spec-derive"
 version = "11.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "proc-macro-crate 3.1.0",
  "proc-macro2",
@@ -12383,10 +12768,9 @@ dependencies = [
 [[package]]
 name = "sc-cli"
 version = "0.36.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "array-bytes 6.2.2",
- "bip39",
  "chrono",
  "clap 4.5.4",
  "fdlimit",
@@ -12395,8 +12779,9 @@ dependencies = [
  "libp2p-identity",
  "log",
  "names",
+ "parity-bip39",
  "parity-scale-codec",
- "rand",
+ "rand 0.8.5",
  "regex",
  "rpassword",
  "sc-client-api",
@@ -12424,13 +12809,13 @@ dependencies = [
 [[package]]
 name = "sc-client-api"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "fnv",
  "futures",
  "log",
  "parity-scale-codec",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "sc-executor",
  "sc-transaction-pool-api",
  "sc-utils",
@@ -12439,11 +12824,11 @@ dependencies = [
  "sp-consensus",
  "sp-core",
  "sp-database",
- "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-externalities",
  "sp-runtime",
  "sp-state-machine",
  "sp-statement-store",
- "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-storage",
  "sp-trie",
  "substrate-prometheus-endpoint",
 ]
@@ -12451,7 +12836,7 @@ dependencies = [
 [[package]]
 name = "sc-client-db"
 version = "0.35.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "hash-db 0.16.0",
  "kvdb",
@@ -12461,7 +12846,7 @@ dependencies = [
  "log",
  "parity-db",
  "parity-scale-codec",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "sc-client-api",
  "sc-state-db",
  "schnellru",
@@ -12477,16 +12862,16 @@ dependencies = [
 [[package]]
 name = "sc-consensus"
 version = "0.33.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "async-trait",
  "futures",
  "futures-timer",
- "libp2p-identity",
  "log",
- "mockall",
- "parking_lot 0.12.1",
+ "mockall 0.11.4",
+ "parking_lot 0.12.3",
  "sc-client-api",
+ "sc-network-types",
  "sc-utils",
  "serde",
  "sp-api",
@@ -12502,7 +12887,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-aura"
 version = "0.34.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "async-trait",
  "futures",
@@ -12531,7 +12916,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe"
 version = "0.34.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "async-trait",
  "fork-tree",
@@ -12541,7 +12926,7 @@ dependencies = [
  "num-rational",
  "num-traits",
  "parity-scale-codec",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "sc-client-api",
  "sc-consensus",
  "sc-consensus-epochs",
@@ -12567,10 +12952,10 @@ dependencies = [
 [[package]]
 name = "sc-consensus-babe-rpc"
 version = "0.34.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "futures",
- "jsonrpsee 0.20.3",
+ "jsonrpsee",
  "sc-consensus-babe",
  "sc-consensus-epochs",
  "sc-rpc-api",
@@ -12589,7 +12974,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-beefy"
 version = "13.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "array-bytes 6.2.2",
  "async-channel 1.9.0",
@@ -12598,12 +12983,13 @@ dependencies = [
  "futures",
  "log",
  "parity-scale-codec",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "sc-client-api",
  "sc-consensus",
  "sc-network",
  "sc-network-gossip",
  "sc-network-sync",
+ "sc-network-types",
  "sc-utils",
  "sp-api",
  "sp-application-crypto",
@@ -12625,13 +13011,13 @@ dependencies = [
 [[package]]
 name = "sc-consensus-beefy-rpc"
 version = "13.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "futures",
- "jsonrpsee 0.20.3",
+ "jsonrpsee",
  "log",
  "parity-scale-codec",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "sc-consensus-beefy",
  "sc-rpc",
  "serde",
@@ -12644,7 +13030,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-epochs"
 version = "0.33.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "fork-tree",
  "parity-scale-codec",
@@ -12657,7 +13043,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-grandpa"
 version = "0.19.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "ahash 0.8.6",
  "array-bytes 6.2.2",
@@ -12669,8 +13055,8 @@ dependencies = [
  "futures-timer",
  "log",
  "parity-scale-codec",
- "parking_lot 0.12.1",
- "rand",
+ "parking_lot 0.12.3",
+ "rand 0.8.5",
  "sc-block-builder",
  "sc-chain-spec",
  "sc-client-api",
@@ -12679,6 +13065,7 @@ dependencies = [
  "sc-network-common",
  "sc-network-gossip",
  "sc-network-sync",
+ "sc-network-types",
  "sc-telemetry",
  "sc-transaction-pool-api",
  "sc-utils",
@@ -12700,11 +13087,11 @@ dependencies = [
 [[package]]
 name = "sc-consensus-grandpa-rpc"
 version = "0.19.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "finality-grandpa",
  "futures",
- "jsonrpsee 0.20.3",
+ "jsonrpsee",
  "log",
  "parity-scale-codec",
  "sc-client-api",
@@ -12720,7 +13107,7 @@ dependencies = [
 [[package]]
 name = "sc-consensus-slots"
 version = "0.33.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "async-trait",
  "futures",
@@ -12743,59 +13130,72 @@ dependencies = [
 [[package]]
 name = "sc-executor"
 version = "0.32.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "parity-scale-codec",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "sc-executor-common",
+ "sc-executor-polkavm",
  "sc-executor-wasmtime",
  "schnellru",
  "sp-api",
  "sp-core",
- "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-externalities",
  "sp-io",
  "sp-panic-handler",
- "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-runtime-interface",
  "sp-trie",
  "sp-version",
- "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-wasm-interface",
  "tracing",
 ]
 
 [[package]]
 name = "sc-executor-common"
 version = "0.29.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
+ "polkavm",
  "sc-allocator",
  "sp-maybe-compressed-blob",
- "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-wasm-interface",
  "thiserror",
  "wasm-instrument",
 ]
 
+[[package]]
+name = "sc-executor-polkavm"
+version = "0.29.0"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
+dependencies = [
+ "log",
+ "polkavm",
+ "sc-executor-common",
+ "sp-wasm-interface",
+]
+
 [[package]]
 name = "sc-executor-wasmtime"
 version = "0.29.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "anyhow",
  "cfg-if",
  "libc",
  "log",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "rustix 0.36.17",
  "sc-allocator",
  "sc-executor-common",
- "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
- "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-runtime-interface",
+ "sp-wasm-interface",
  "wasmtime",
 ]
 
 [[package]]
 name = "sc-informant"
 version = "0.33.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "ansi_term",
  "futures",
@@ -12812,10 +13212,10 @@ dependencies = [
 [[package]]
 name = "sc-keystore"
 version = "25.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "array-bytes 6.2.2",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "serde_json",
  "sp-application-crypto",
  "sp-core",
@@ -12826,7 +13226,7 @@ dependencies = [
 [[package]]
 name = "sc-mixnet"
 version = "0.4.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "array-bytes 4.2.0",
  "arrayvec 0.7.4",
@@ -12834,14 +13234,14 @@ dependencies = [
  "bytes",
  "futures",
  "futures-timer",
- "libp2p-identity",
  "log",
  "mixnet",
  "multiaddr",
  "parity-scale-codec",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "sc-client-api",
  "sc-network",
+ "sc-network-types",
  "sc-transaction-pool-api",
  "sp-api",
  "sp-consensus",
@@ -12855,13 +13255,14 @@ dependencies = [
 [[package]]
 name = "sc-network"
 version = "0.34.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "array-bytes 6.2.2",
  "async-channel 1.9.0",
  "async-trait",
  "asynchronous-codec",
  "bytes",
+ "cid 0.9.0",
  "either",
  "fnv",
  "futures",
@@ -12869,16 +13270,22 @@ dependencies = [
  "ip_network",
  "libp2p",
  "linked_hash_set",
+ "litep2p",
  "log",
- "mockall",
+ "mockall 0.11.4",
+ "once_cell",
  "parity-scale-codec",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "partial_sort",
  "pin-project",
- "rand",
+ "prost 0.11.9",
+ "prost-build",
+ "rand 0.8.5",
  "sc-client-api",
  "sc-network-common",
+ "sc-network-types",
  "sc-utils",
+ "schnellru",
  "serde",
  "serde_json",
  "smallvec",
@@ -12891,34 +13298,15 @@ dependencies = [
  "tokio",
  "tokio-stream",
  "unsigned-varint",
+ "void",
  "wasm-timer",
  "zeroize",
 ]
 
-[[package]]
-name = "sc-network-bitswap"
-version = "0.33.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
-dependencies = [
- "async-channel 1.9.0",
- "cid",
- "futures",
- "libp2p-identity",
- "log",
- "prost 0.12.4",
- "prost-build",
- "sc-client-api",
- "sc-network",
- "sp-blockchain",
- "sp-runtime",
- "thiserror",
- "unsigned-varint",
-]
-
 [[package]]
 name = "sc-network-common"
 version = "0.33.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "async-trait",
  "bitflags 1.3.2",
@@ -12927,6 +13315,7 @@ dependencies = [
  "parity-scale-codec",
  "prost-build",
  "sc-consensus",
+ "sc-network-types",
  "sp-consensus",
  "sp-consensus-grandpa",
  "sp-runtime",
@@ -12935,7 +13324,7 @@ dependencies = [
 [[package]]
 name = "sc-network-gossip"
 version = "0.34.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "ahash 0.8.6",
  "futures",
@@ -12945,6 +13334,7 @@ dependencies = [
  "sc-network",
  "sc-network-common",
  "sc-network-sync",
+ "sc-network-types",
  "schnellru",
  "sp-runtime",
  "substrate-prometheus-endpoint",
@@ -12954,18 +13344,18 @@ dependencies = [
 [[package]]
 name = "sc-network-light"
 version = "0.33.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "array-bytes 6.2.2",
  "async-channel 1.9.0",
  "futures",
- "libp2p-identity",
  "log",
  "parity-scale-codec",
  "prost 0.12.4",
  "prost-build",
  "sc-client-api",
  "sc-network",
+ "sc-network-types",
  "sp-blockchain",
  "sp-core",
  "sp-runtime",
@@ -12975,7 +13365,7 @@ dependencies = [
 [[package]]
 name = "sc-network-sync"
 version = "0.33.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "array-bytes 6.2.2",
  "async-channel 1.9.0",
@@ -12985,7 +13375,7 @@ dependencies = [
  "futures-timer",
  "libp2p",
  "log",
- "mockall",
+ "mockall 0.11.4",
  "parity-scale-codec",
  "prost 0.12.4",
  "prost-build",
@@ -12993,6 +13383,7 @@ dependencies = [
  "sc-consensus",
  "sc-network",
  "sc-network-common",
+ "sc-network-types",
  "sc-utils",
  "schnellru",
  "smallvec",
@@ -13011,7 +13402,7 @@ dependencies = [
 [[package]]
 name = "sc-network-transactions"
 version = "0.33.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "array-bytes 6.2.2",
  "futures",
@@ -13021,16 +13412,31 @@ dependencies = [
  "sc-network",
  "sc-network-common",
  "sc-network-sync",
+ "sc-network-types",
  "sc-utils",
  "sp-consensus",
  "sp-runtime",
  "substrate-prometheus-endpoint",
 ]
 
+[[package]]
+name = "sc-network-types"
+version = "0.10.0-dev"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
+dependencies = [
+ "bs58 0.4.0",
+ "libp2p-identity",
+ "litep2p",
+ "multiaddr",
+ "multihash 0.17.0",
+ "rand 0.8.5",
+ "thiserror",
+]
+
 [[package]]
 name = "sc-offchain"
 version = "29.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "array-bytes 6.2.2",
  "bytes",
@@ -13044,16 +13450,17 @@ dependencies = [
  "num_cpus",
  "once_cell",
  "parity-scale-codec",
- "parking_lot 0.12.1",
- "rand",
+ "parking_lot 0.12.3",
+ "rand 0.8.5",
  "sc-client-api",
  "sc-network",
  "sc-network-common",
+ "sc-network-types",
  "sc-transaction-pool-api",
  "sc-utils",
  "sp-api",
  "sp-core",
- "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-externalities",
  "sp-keystore",
  "sp-offchain",
  "sp-runtime",
@@ -13064,7 +13471,7 @@ dependencies = [
 [[package]]
 name = "sc-proposer-metrics"
 version = "0.17.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "log",
  "substrate-prometheus-endpoint",
@@ -13073,13 +13480,13 @@ dependencies = [
 [[package]]
 name = "sc-rpc"
 version = "29.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "futures",
- "jsonrpsee 0.20.3",
+ "jsonrpsee",
  "log",
  "parity-scale-codec",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "sc-block-builder",
  "sc-chain-spec",
  "sc-client-api",
@@ -13105,9 +13512,9 @@ dependencies = [
 [[package]]
 name = "sc-rpc-api"
 version = "0.33.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
- "jsonrpsee 0.20.3",
+ "jsonrpsee",
  "parity-scale-codec",
  "sc-chain-spec",
  "sc-mixnet",
@@ -13125,10 +13532,13 @@ dependencies = [
 [[package]]
 name = "sc-rpc-server"
 version = "11.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
+ "futures",
+ "governor",
  "http",
- "jsonrpsee 0.20.3",
+ "hyper",
+ "jsonrpsee",
  "log",
  "serde_json",
  "substrate-prometheus-endpoint",
@@ -13140,21 +13550,23 @@ dependencies = [
 [[package]]
 name = "sc-rpc-spec-v2"
 version = "0.34.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "array-bytes 6.2.2",
  "futures",
  "futures-util",
  "hex",
- "jsonrpsee 0.20.3",
+ "jsonrpsee",
  "log",
  "parity-scale-codec",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
+ "rand 0.8.5",
  "sc-chain-spec",
  "sc-client-api",
  "sc-rpc",
  "sc-transaction-pool-api",
  "sc-utils",
+ "schnellru",
  "serde",
  "sp-api",
  "sp-blockchain",
@@ -13170,19 +13582,19 @@ dependencies = [
 [[package]]
 name = "sc-service"
 version = "0.35.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "async-trait",
  "directories",
  "exit-future",
  "futures",
  "futures-timer",
- "jsonrpsee 0.20.3",
+ "jsonrpsee",
  "log",
  "parity-scale-codec",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "pin-project",
- "rand",
+ "rand 0.8.5",
  "sc-chain-spec",
  "sc-client-api",
  "sc-client-db",
@@ -13191,11 +13603,11 @@ dependencies = [
  "sc-informant",
  "sc-keystore",
  "sc-network",
- "sc-network-bitswap",
  "sc-network-common",
  "sc-network-light",
  "sc-network-sync",
  "sc-network-transactions",
+ "sc-network-types",
  "sc-rpc",
  "sc-rpc-server",
  "sc-rpc-spec-v2",
@@ -13205,18 +13617,19 @@ dependencies = [
  "sc-transaction-pool",
  "sc-transaction-pool-api",
  "sc-utils",
+ "schnellru",
  "serde",
  "serde_json",
  "sp-api",
  "sp-blockchain",
  "sp-consensus",
  "sp-core",
- "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-externalities",
  "sp-keystore",
  "sp-runtime",
  "sp-session",
  "sp-state-machine",
- "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-storage",
  "sp-transaction-pool",
  "sp-transaction-storage-proof",
  "sp-trie",
@@ -13233,18 +13646,18 @@ dependencies = [
 [[package]]
 name = "sc-state-db"
 version = "0.30.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "log",
  "parity-scale-codec",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "sp-core",
 ]
 
 [[package]]
 name = "sc-storage-monitor"
 version = "0.16.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "clap 4.5.4",
  "fs4",
@@ -13257,9 +13670,9 @@ dependencies = [
 [[package]]
 name = "sc-sync-state-rpc"
 version = "0.34.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
- "jsonrpsee 0.20.3",
+ "jsonrpsee",
  "parity-scale-codec",
  "sc-chain-spec",
  "sc-client-api",
@@ -13276,13 +13689,13 @@ dependencies = [
 [[package]]
 name = "sc-sysinfo"
 version = "27.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "derive_more",
  "futures",
  "libc",
  "log",
- "rand",
+ "rand 0.8.5",
  "rand_pcg",
  "regex",
  "sc-telemetry",
@@ -13291,21 +13704,22 @@ dependencies = [
  "sp-core",
  "sp-crypto-hashing",
  "sp-io",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
 ]
 
 [[package]]
 name = "sc-telemetry"
 version = "15.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "chrono",
  "futures",
  "libp2p",
  "log",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "pin-project",
- "rand",
+ "rand 0.8.5",
+ "sc-network",
  "sc-utils",
  "serde",
  "serde_json",
@@ -13316,7 +13730,7 @@ dependencies = [
 [[package]]
 name = "sc-tracing"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "ansi_term",
  "chrono",
@@ -13325,7 +13739,7 @@ dependencies = [
  "libc",
  "log",
  "parity-scale-codec",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "regex",
  "rustc-hash",
  "sc-client-api",
@@ -13336,17 +13750,17 @@ dependencies = [
  "sp-core",
  "sp-rpc",
  "sp-runtime",
- "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-tracing",
  "thiserror",
  "tracing",
- "tracing-log",
+ "tracing-log 0.1.4",
  "tracing-subscriber",
 ]
 
 [[package]]
 name = "sc-tracing-proc-macro"
 version = "11.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "proc-macro-crate 3.1.0",
  "proc-macro2",
@@ -13357,7 +13771,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-pool"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "async-trait",
  "futures",
@@ -13365,7 +13779,7 @@ dependencies = [
  "linked-hash-map",
  "log",
  "parity-scale-codec",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "sc-client-api",
  "sc-transaction-pool-api",
  "sc-utils",
@@ -13375,7 +13789,7 @@ dependencies = [
  "sp-core",
  "sp-crypto-hashing",
  "sp-runtime",
- "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-tracing",
  "sp-transaction-pool",
  "substrate-prometheus-endpoint",
  "thiserror",
@@ -13384,7 +13798,7 @@ dependencies = [
 [[package]]
 name = "sc-transaction-pool-api"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "async-trait",
  "futures",
@@ -13400,14 +13814,14 @@ dependencies = [
 [[package]]
 name = "sc-utils"
 version = "14.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "async-channel 1.9.0",
  "futures",
  "futures-timer",
  "lazy_static",
  "log",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "prometheus",
  "sp-arithmetic",
 ]
@@ -13487,22 +13901,6 @@ dependencies = [
  "hashbrown 0.13.2",
 ]
 
-[[package]]
-name = "schnorrkel"
-version = "0.9.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "021b403afe70d81eea68f6ea12f6b3c9588e5d536a94c3bf80f15e7faa267862"
-dependencies = [
- "arrayref",
- "arrayvec 0.5.2",
- "curve25519-dalek 2.1.3",
- "merlin 2.0.1",
- "rand_core 0.5.1",
- "sha2 0.8.2",
- "subtle 2.4.1",
- "zeroize",
-]
-
 [[package]]
 name = "schnorrkel"
 version = "0.10.2"
@@ -13512,7 +13910,7 @@ dependencies = [
  "arrayref",
  "arrayvec 0.7.4",
  "curve25519-dalek-ng",
- "merlin 3.0.0",
+ "merlin",
  "rand_core 0.6.4",
  "sha2 0.9.9",
  "subtle-ng",
@@ -13530,11 +13928,11 @@ dependencies = [
  "arrayvec 0.7.4",
  "curve25519-dalek 4.1.1",
  "getrandom_or_panic",
- "merlin 3.0.0",
+ "merlin",
  "rand_core 0.6.4",
  "serde_bytes",
  "sha2 0.10.8",
- "subtle 2.4.1",
+ "subtle 2.6.1",
  "zeroize",
 ]
 
@@ -13546,14 +13944,14 @@ checksum = "94143f37725109f92c262ed2cf5e59bce7498c01bcc1502d7b9afe439a4e9f49"
 
 [[package]]
 name = "scraper"
-version = "1.2.4"
+version = "1.2.5"
 dependencies = [
- "clap 3.2.25",
+ "clap 4.5.4",
  "frame-remote-externalities",
  "frame-support",
  "frame-system",
  "hydradx-runtime",
- "jsonrpsee 0.15.1",
+ "jsonrpsee",
  "pallet-balances",
  "parity-scale-codec",
  "serde",
@@ -13580,6 +13978,21 @@ dependencies = [
  "untrusted 0.9.0",
 ]
 
+[[package]]
+name = "sctp-proto"
+version = "0.2.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "b6220f78bb44c15f326b0596113305f6101097a18755d53727a575c97e09fb24"
+dependencies = [
+ "bytes",
+ "crc",
+ "fxhash",
+ "log",
+ "rand 0.8.5",
+ "slab",
+ "thiserror",
+]
+
 [[package]]
 name = "sec1"
 version = "0.7.3"
@@ -13590,7 +14003,8 @@ dependencies = [
  "der",
  "generic-array 0.14.7",
  "pkcs8",
- "subtle 2.4.1",
+ "serdect",
+ "subtle 2.6.1",
  "zeroize",
 ]
 
@@ -13726,6 +14140,16 @@ dependencies = [
  "serde",
 ]
 
+[[package]]
+name = "serdect"
+version = "0.2.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a84f14a19e9a014bb9f4512488d9829a68e04ecabffb0f9904cd1ace94598177"
+dependencies = [
+ "base16ct",
+ "serde",
+]
+
 [[package]]
 name = "sha-1"
 version = "0.9.8"
@@ -13739,6 +14163,18 @@ dependencies = [
  "opaque-debug 0.3.0",
 ]
 
+[[package]]
+name = "sha-1"
+version = "0.10.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f5058ada175748e33390e40e872bd0fe59a19f265d0158daa551c5a88a76009c"
+dependencies = [
+ "cfg-if",
+ "cpufeatures",
+ "digest 0.10.7",
+ "sha1-asm",
+]
+
 [[package]]
 name = "sha1"
 version = "0.10.6"
@@ -13751,15 +14187,12 @@ dependencies = [
 ]
 
 [[package]]
-name = "sha2"
-version = "0.8.2"
+name = "sha1-asm"
+version = "0.5.3"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "a256f46ea78a0c0d9ff00077504903ac881a1dafdc20da66545699e7776b3e69"
+checksum = "286acebaf8b67c1130aedffad26f594eff0c1292389158135327d2e23aed582b"
 dependencies = [
- "block-buffer 0.7.3",
- "digest 0.8.1",
- "fake-simd",
- "opaque-debug 0.2.3",
+ "cc",
 ]
 
 [[package]]
@@ -13820,6 +14253,12 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "signature"
+version = "1.6.4"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "74233d3b3b2f6d4b006dc19dee745e73e2a6bfb6f93607cd3b02bd5b00797d7c"
+
 [[package]]
 name = "signature"
 version = "2.2.0"
@@ -13849,7 +14288,7 @@ version = "2.5.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fa42c91313f1d05da9b26f267f931cf178d4aba455b4c4622dd7355eb80c6640"
 dependencies = [
- "bstr 0.2.17",
+ "bstr",
  "unicode-segmentation",
 ]
 
@@ -13863,10 +14302,20 @@ dependencies = [
  "similar",
 ]
 
+[[package]]
+name = "simple-dns"
+version = "0.5.7"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "cae9a3fcdadafb6d97f4c0e007e4247b114ee0f119f650c3cbf3a8b3a1479694"
+dependencies = [
+ "bitflags 2.4.1",
+]
+
 [[package]]
 name = "simple-mermaid"
-version = "0.1.0"
-source = "git+https://github.com/kianenigma/simple-mermaid.git?rev=e48b187bcfd5cc75111acd9d241f1bd36604344b#e48b187bcfd5cc75111acd9d241f1bd36604344b"
+version = "0.1.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "620a1d43d70e142b1d46a929af51d44f383db9c7a2ec122de2cd992ccfcf3c18"
 
 [[package]]
 name = "siphasher"
@@ -13904,13 +14353,13 @@ dependencies = [
 [[package]]
 name = "slot-range-helper"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "enumn",
  "parity-scale-codec",
  "paste",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
 ]
 
 [[package]]
@@ -13972,16 +14421,16 @@ dependencies = [
  "hmac 0.12.1",
  "itertools 0.11.0",
  "libsecp256k1",
- "merlin 3.0.0",
+ "merlin",
  "no-std-net",
  "nom",
  "num-bigint",
  "num-rational",
  "num-traits",
- "pbkdf2 0.12.2",
+ "pbkdf2",
  "pin-project",
  "poly1305",
- "rand",
+ "rand 0.8.5",
  "rand_chacha 0.3.1",
  "ruzstd",
  "schnorrkel 0.10.2",
@@ -14022,9 +14471,9 @@ dependencies = [
  "log",
  "lru 0.11.1",
  "no-std-net",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "pin-project",
- "rand",
+ "rand 0.8.5",
  "rand_chacha 0.3.1",
  "serde",
  "serde_json",
@@ -14055,7 +14504,7 @@ dependencies = [
  "ring 0.17.7",
  "rustc_version",
  "sha2 0.10.8",
- "subtle 2.4.1",
+ "subtle 2.6.1",
 ]
 
 [[package]]
@@ -14091,14 +14540,14 @@ dependencies = [
  "http",
  "httparse",
  "log",
- "rand",
- "sha-1",
+ "rand 0.8.5",
+ "sha-1 0.9.8",
 ]
 
 [[package]]
 name = "sp-api"
 version = "26.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "hash-db 0.16.0",
  "log",
@@ -14106,11 +14555,12 @@ dependencies = [
  "scale-info",
  "sp-api-proc-macro",
  "sp-core",
- "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-externalities",
  "sp-metadata-ir",
  "sp-runtime",
+ "sp-runtime-interface",
  "sp-state-machine",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
  "sp-trie",
  "sp-version",
  "thiserror",
@@ -14119,7 +14569,7 @@ dependencies = [
 [[package]]
 name = "sp-api-proc-macro"
 version = "15.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "Inflector",
  "blake2 0.10.6",
@@ -14133,27 +14583,28 @@ dependencies = [
 [[package]]
 name = "sp-application-crypto"
 version = "30.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
  "serde",
  "sp-core",
  "sp-io",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
 ]
 
 [[package]]
 name = "sp-arithmetic"
 version = "23.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
+ "docify",
  "integer-sqrt",
  "num-traits",
  "parity-scale-codec",
  "scale-info",
  "serde",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
  "static_assertions",
 ]
 
@@ -14178,36 +14629,34 @@ dependencies = [
 [[package]]
 name = "sp-authority-discovery"
 version = "26.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-api",
  "sp-application-crypto",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "sp-block-builder"
 version = "26.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "sp-api",
  "sp-inherents",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "sp-blockchain"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "futures",
  "log",
  "parity-scale-codec",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "schnellru",
  "sp-api",
  "sp-consensus",
@@ -14220,7 +14669,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus"
 version = "0.32.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "async-trait",
  "futures",
@@ -14235,7 +14684,7 @@ dependencies = [
 [[package]]
 name = "sp-consensus-aura"
 version = "0.32.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -14245,14 +14694,13 @@ dependencies = [
  "sp-consensus-slots",
  "sp-inherents",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-timestamp",
 ]
 
 [[package]]
 name = "sp-consensus-babe"
 version = "0.32.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -14264,14 +14712,13 @@ dependencies = [
  "sp-core",
  "sp-inherents",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-timestamp",
 ]
 
 [[package]]
 name = "sp-consensus-beefy"
 version = "13.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "lazy_static",
  "parity-scale-codec",
@@ -14282,16 +14729,16 @@ dependencies = [
  "sp-core",
  "sp-crypto-hashing",
  "sp-io",
+ "sp-keystore",
  "sp-mmr-primitives",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
- "strum 0.24.1",
+ "strum 0.26.3",
 ]
 
 [[package]]
 name = "sp-consensus-grandpa"
 version = "13.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "finality-grandpa",
  "log",
@@ -14303,29 +14750,26 @@ dependencies = [
  "sp-core",
  "sp-keystore",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "sp-consensus-slots"
 version = "0.32.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
  "serde",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-timestamp",
 ]
 
 [[package]]
 name = "sp-core"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "array-bytes 6.2.2",
  "bandersnatch_vrfs",
- "bip39",
  "bitflags 1.3.2",
  "blake2 0.10.6",
  "bounded-collections",
@@ -14337,25 +14781,27 @@ dependencies = [
  "hash256-std-hasher",
  "impl-serde",
  "itertools 0.10.5",
+ "k256",
  "libsecp256k1",
  "log",
- "merlin 3.0.0",
+ "merlin",
+ "parity-bip39",
  "parity-scale-codec",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "paste",
  "primitive-types",
- "rand",
+ "rand 0.8.5",
  "scale-info",
  "schnorrkel 0.11.4",
  "secp256k1",
  "secrecy",
  "serde",
  "sp-crypto-hashing",
- "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
- "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
- "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
- "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-debug-derive",
+ "sp-externalities",
+ "sp-runtime-interface",
+ "sp-std",
+ "sp-storage",
  "ss58-registry",
  "substrate-bip39",
  "thiserror",
@@ -14364,18 +14810,10 @@ dependencies = [
  "zeroize",
 ]
 
-[[package]]
-name = "sp-core-hashing"
-version = "15.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
-dependencies = [
- "sp-crypto-hashing",
-]
-
 [[package]]
 name = "sp-crypto-ec-utils"
 version = "0.10.0"
-source = "git+https://github.com/paritytech//polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/paritytech/polkadot-sdk#9fecd89880bebec86815e3413327dd8a5f80befd"
 dependencies = [
  "ark-bls12-377",
  "ark-bls12-377-ext",
@@ -14389,14 +14827,13 @@ dependencies = [
  "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?branch=release-polkadot-v1.7.2)",
- "sp-std 14.0.0 (git+https://github.com/paritytech//polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-runtime-interface",
 ]
 
 [[package]]
 name = "sp-crypto-hashing"
-version = "0.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+version = "0.1.0"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "blake2b_simd",
  "byteorder",
@@ -14408,8 +14845,8 @@ dependencies = [
 
 [[package]]
 name = "sp-crypto-hashing-proc-macro"
-version = "0.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+version = "0.1.0"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "quote",
  "sp-crypto-hashing",
@@ -14419,26 +14856,16 @@ dependencies = [
 [[package]]
 name = "sp-database"
 version = "10.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "kvdb",
- "parking_lot 0.12.1",
-]
-
-[[package]]
-name = "sp-debug-derive"
-version = "14.0.0"
-source = "git+https://github.com/paritytech//polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.61",
+ "parking_lot 0.12.3",
 ]
 
 [[package]]
 name = "sp-debug-derive"
 version = "14.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -14448,70 +14875,59 @@ dependencies = [
 [[package]]
 name = "sp-externalities"
 version = "0.25.0"
-source = "git+https://github.com/paritytech//polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
-dependencies = [
- "environmental",
- "parity-scale-codec",
- "sp-std 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?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "environmental",
  "parity-scale-codec",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
- "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-storage",
 ]
 
 [[package]]
 name = "sp-genesis-builder"
-version = "0.7.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+version = "0.8.0"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
+ "parity-scale-codec",
+ "scale-info",
  "serde_json",
  "sp-api",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "sp-inherents"
 version = "26.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "async-trait",
  "impl-trait-for-tuples",
  "parity-scale-codec",
  "scale-info",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "thiserror",
 ]
 
 [[package]]
 name = "sp-io"
 version = "30.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "bytes",
- "ed25519-dalek",
+ "ed25519-dalek 2.1.0",
  "libsecp256k1",
  "log",
  "parity-scale-codec",
+ "polkavm-derive",
  "rustversion",
  "secp256k1",
  "sp-core",
  "sp-crypto-hashing",
- "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-externalities",
  "sp-keystore",
- "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-runtime-interface",
  "sp-state-machine",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
- "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
+ "sp-tracing",
  "sp-trie",
  "tracing",
  "tracing-core",
@@ -14520,29 +14936,28 @@ dependencies = [
 [[package]]
 name = "sp-keyring"
 version = "31.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "sp-core",
  "sp-runtime",
- "strum 0.24.1",
+ "strum 0.26.3",
 ]
 
 [[package]]
 name = "sp-keystore"
 version = "0.34.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "parity-scale-codec",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "sp-core",
- "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
- "thiserror",
+ "sp-externalities",
 ]
 
 [[package]]
 name = "sp-maybe-compressed-blob"
 version = "11.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "thiserror",
  "zstd 0.12.4",
@@ -14551,30 +14966,28 @@ dependencies = [
 [[package]]
 name = "sp-metadata-ir"
 version = "0.6.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "frame-metadata",
  "parity-scale-codec",
  "scale-info",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "sp-mixnet"
 version = "0.4.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 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 = "26.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "ckb-merkle-mountain-range",
  "log",
@@ -14583,16 +14996,15 @@ dependencies = [
  "serde",
  "sp-api",
  "sp-core",
- "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-debug-derive",
  "sp-runtime",
- "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 = "26.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -14600,13 +15012,12 @@ dependencies = [
  "sp-arithmetic",
  "sp-core",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "sp-offchain"
 version = "26.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "sp-api",
  "sp-core",
@@ -14616,7 +15027,7 @@ dependencies = [
 [[package]]
 name = "sp-panic-handler"
 version = "13.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "backtrace",
  "lazy_static",
@@ -14626,7 +15037,7 @@ dependencies = [
 [[package]]
 name = "sp-rpc"
 version = "26.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "rustc-hash",
  "serde",
@@ -14636,7 +15047,7 @@ dependencies = [
 [[package]]
 name = "sp-runtime"
 version = "31.0.1"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "docify",
  "either",
@@ -14645,7 +15056,7 @@ dependencies = [
  "log",
  "parity-scale-codec",
  "paste",
- "rand",
+ "rand 0.8.5",
  "scale-info",
  "serde",
  "simple-mermaid",
@@ -14653,63 +15064,33 @@ dependencies = [
  "sp-arithmetic",
  "sp-core",
  "sp-io",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
  "sp-weights",
 ]
 
 [[package]]
 name = "sp-runtime-interface"
 version = "24.0.0"
-source = "git+https://github.com/paritytech//polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "bytes",
  "impl-trait-for-tuples",
  "parity-scale-codec",
+ "polkavm-derive",
  "primitive-types",
- "sp-externalities 0.25.0 (git+https://github.com/paritytech//polkadot-sdk?branch=release-polkadot-v1.7.2)",
- "sp-runtime-interface-proc-macro 17.0.0 (git+https://github.com/paritytech//polkadot-sdk?branch=release-polkadot-v1.7.2)",
- "sp-std 14.0.0 (git+https://github.com/paritytech//polkadot-sdk?branch=release-polkadot-v1.7.2)",
- "sp-storage 19.0.0 (git+https://github.com/paritytech//polkadot-sdk?branch=release-polkadot-v1.7.2)",
- "sp-tracing 16.0.0 (git+https://github.com/paritytech//polkadot-sdk?branch=release-polkadot-v1.7.2)",
- "sp-wasm-interface 20.0.0 (git+https://github.com/paritytech//polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-externalities",
+ "sp-runtime-interface-proc-macro",
+ "sp-std",
+ "sp-storage",
+ "sp-tracing",
+ "sp-wasm-interface",
  "static_assertions",
 ]
 
-[[package]]
-name = "sp-runtime-interface"
-version = "24.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
-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-proc-macro"
-version = "17.0.0"
-source = "git+https://github.com/paritytech//polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
-dependencies = [
- "Inflector",
- "expander 2.0.0",
- "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?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "Inflector",
  "expander 2.0.0",
@@ -14722,7 +15103,7 @@ dependencies = [
 [[package]]
 name = "sp-session"
 version = "27.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "parity-scale-codec",
  "scale-info",
@@ -14731,13 +15112,12 @@ dependencies = [
  "sp-keystore",
  "sp-runtime",
  "sp-staking",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "sp-staking"
 version = "26.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "impl-trait-for-tuples",
  "parity-scale-codec",
@@ -14745,51 +15125,48 @@ dependencies = [
  "serde",
  "sp-core",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
 ]
 
 [[package]]
 name = "sp-state-machine"
 version = "0.35.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "hash-db 0.16.0",
  "log",
  "parity-scale-codec",
- "parking_lot 0.12.1",
- "rand",
+ "parking_lot 0.12.3",
+ "rand 0.8.5",
  "smallvec",
  "sp-core",
- "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-externalities",
  "sp-panic-handler",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-trie",
  "thiserror",
  "tracing",
- "trie-db",
+ "trie-db 0.29.1",
 ]
 
 [[package]]
 name = "sp-statement-store"
 version = "10.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "aes-gcm",
  "curve25519-dalek 4.1.1",
- "ed25519-dalek",
+ "ed25519-dalek 2.1.0",
  "hkdf",
  "parity-scale-codec",
- "rand",
+ "rand 0.8.5",
  "scale-info",
  "sha2 0.10.8",
  "sp-api",
  "sp-application-crypto",
  "sp-core",
  "sp-crypto-hashing",
- "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-externalities",
  "sp-runtime",
- "sp-runtime-interface 24.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-runtime-interface",
  "thiserror",
  "x25519-dalek 2.0.0",
 ]
@@ -14797,71 +15174,38 @@ dependencies = [
 [[package]]
 name = "sp-std"
 version = "14.0.0"
-source = "git+https://github.com/paritytech//polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
-
-[[package]]
-name = "sp-std"
-version = "14.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
-
-[[package]]
-name = "sp-storage"
-version = "19.0.0"
-source = "git+https://github.com/paritytech//polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
-dependencies = [
- "impl-serde",
- "parity-scale-codec",
- "ref-cast",
- "serde",
- "sp-debug-derive 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)",
-]
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 
 [[package]]
 name = "sp-storage"
 version = "19.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
  "ref-cast",
  "serde",
- "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-debug-derive",
 ]
 
 [[package]]
 name = "sp-timestamp"
 version = "26.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
-dependencies = [
- "async-trait",
- "parity-scale-codec",
- "sp-inherents",
- "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
- "thiserror",
-]
-
-[[package]]
-name = "sp-tracing"
-version = "16.0.0"
-source = "git+https://github.com/paritytech//polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
+ "async-trait",
  "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",
+ "sp-inherents",
+ "sp-runtime",
+ "thiserror",
 ]
 
 [[package]]
 name = "sp-tracing"
 version = "16.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 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",
@@ -14870,7 +15214,7 @@ dependencies = [
 [[package]]
 name = "sp-transaction-pool"
 version = "26.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "sp-api",
  "sp-runtime",
@@ -14879,7 +15223,7 @@ dependencies = [
 [[package]]
 name = "sp-transaction-storage-proof"
 version = "26.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "async-trait",
  "parity-scale-codec",
@@ -14887,14 +15231,13 @@ dependencies = [
  "sp-core",
  "sp-inherents",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "sp-trie",
 ]
 
 [[package]]
 name = "sp-trie"
 version = "29.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "ahash 0.8.6",
  "hash-db 0.16.0",
@@ -14902,23 +15245,22 @@ dependencies = [
  "memory-db",
  "nohash-hasher",
  "parity-scale-codec",
- "parking_lot 0.12.1",
- "rand",
+ "parking_lot 0.12.3",
+ "rand 0.8.5",
  "scale-info",
  "schnellru",
  "sp-core",
- "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-externalities",
  "thiserror",
  "tracing",
- "trie-db",
+ "trie-db 0.29.1",
  "trie-root",
 ]
 
 [[package]]
 name = "sp-version"
 version = "29.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "impl-serde",
  "parity-scale-codec",
@@ -14927,7 +15269,7 @@ dependencies = [
  "serde",
  "sp-crypto-hashing-proc-macro",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
  "sp-version-proc-macro",
  "thiserror",
 ]
@@ -14935,7 +15277,7 @@ dependencies = [
 [[package]]
 name = "sp-version-proc-macro"
 version = "13.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "parity-scale-codec",
  "proc-macro2",
@@ -14946,33 +15288,19 @@ dependencies = [
 [[package]]
 name = "sp-wasm-interface"
 version = "20.0.0"
-source = "git+https://github.com/paritytech//polkadot-sdk?branch=release-polkadot-v1.7.2#c00ca35b403a95e344d03e229b3f85baa3b96c89"
-dependencies = [
- "anyhow",
- "impl-trait-for-tuples",
- "log",
- "parity-scale-codec",
- "sp-std 14.0.0 (git+https://github.com/paritytech//polkadot-sdk?branch=release-polkadot-v1.7.2)",
- "wasmtime",
-]
-
-[[package]]
-name = "sp-wasm-interface"
-version = "20.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "anyhow",
  "impl-trait-for-tuples",
  "log",
  "parity-scale-codec",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
  "wasmtime",
 ]
 
 [[package]]
 name = "sp-weights"
 version = "27.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "bounded-collections",
  "parity-scale-codec",
@@ -14980,8 +15308,7 @@ dependencies = [
  "serde",
  "smallvec",
  "sp-arithmetic",
- "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-debug-derive",
 ]
 
 [[package]]
@@ -15007,6 +15334,15 @@ dependencies = [
  "strum 0.24.1",
 ]
 
+[[package]]
+name = "spinning_top"
+version = "0.3.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d96d2d1d716fb500937168cc09353ffdc7a012be8475ac7308e1bdf0e3923300"
+dependencies = [
+ "lock_api",
+]
+
 [[package]]
 name = "spki"
 version = "0.7.3"
@@ -15041,7 +15377,7 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
 [[package]]
 name = "staging-parachain-info"
 version = "0.7.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "cumulus-primitives-core",
  "frame-support",
@@ -15049,13 +15385,13 @@ dependencies = [
  "parity-scale-codec",
  "scale-info",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
 ]
 
 [[package]]
 name = "staging-xcm"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "array-bytes 6.2.2",
  "bounded-collections",
@@ -15073,7 +15409,7 @@ dependencies = [
 [[package]]
 name = "staging-xcm-builder"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "frame-support",
  "frame-system",
@@ -15086,7 +15422,7 @@ dependencies = [
  "sp-arithmetic",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
  "sp-weights",
  "staging-xcm",
  "staging-xcm-executor",
@@ -15095,7 +15431,7 @@ dependencies = [
 [[package]]
 name = "staging-xcm-executor"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "environmental",
  "frame-benchmarking",
@@ -15108,7 +15444,7 @@ dependencies = [
  "sp-core",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
  "sp-weights",
  "staging-xcm",
 ]
@@ -15147,6 +15483,26 @@ dependencies = [
  "syn 1.0.109",
 ]
 
+[[package]]
+name = "str0m"
+version = "0.5.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "6706347e49b13373f7ddfafad47df7583ed52083d6fc8a594eb2c80497ef959d"
+dependencies = [
+ "combine",
+ "crc",
+ "fastrand 2.0.1",
+ "hmac 0.12.1",
+ "once_cell",
+ "openssl",
+ "openssl-sys",
+ "sctp-proto",
+ "serde",
+ "sha-1 0.10.1",
+ "thiserror",
+ "tracing",
+]
+
 [[package]]
 name = "strobe-rs"
 version = "0.8.1"
@@ -15156,16 +15512,10 @@ dependencies = [
  "bitflags 1.3.2",
  "byteorder",
  "keccak",
- "subtle 2.4.1",
+ "subtle 2.6.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"
@@ -15187,6 +15537,15 @@ version = "0.25.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "290d54ea6f91c969195bdbcd7442c8c2a2ba87da8bf60a7ee86a235d4bc1e125"
 
+[[package]]
+name = "strum"
+version = "0.26.3"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8fec0f0aef304996cf250b31b5a10dee7980c85da9d759361292b8bca5a18f06"
+dependencies = [
+ "strum_macros 0.26.4",
+]
+
 [[package]]
 name = "strum_macros"
 version = "0.24.3"
@@ -15214,15 +15573,27 @@ dependencies = [
 ]
 
 [[package]]
-name = "substrate-bip39"
-version = "0.4.5"
+name = "strum_macros"
+version = "0.26.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e620c7098893ba667438b47169c00aacdd9e7c10e042250ce2b60b087ec97328"
+checksum = "4c6bee85a5a24955dc440386795aa378cd9cf82acd5f764469152d2270e581be"
 dependencies = [
- "hmac 0.11.0",
- "pbkdf2 0.8.0",
- "schnorrkel 0.9.1",
- "sha2 0.9.9",
+ "heck 0.5.0",
+ "proc-macro2",
+ "quote",
+ "rustversion",
+ "syn 2.0.61",
+]
+
+[[package]]
+name = "substrate-bip39"
+version = "0.4.7"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
+dependencies = [
+ "hmac 0.12.1",
+ "pbkdf2",
+ "schnorrkel 0.11.4",
+ "sha2 0.10.8",
  "zeroize",
 ]
 
@@ -15235,23 +15606,23 @@ dependencies = [
  "byteorder",
  "crunchy",
  "lazy_static",
- "rand",
+ "rand 0.8.5",
  "rustc-hex",
 ]
 
 [[package]]
 name = "substrate-build-script-utils"
 version = "11.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 
 [[package]]
 name = "substrate-frame-rpc-system"
 version = "28.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "frame-system-rpc-runtime-api",
  "futures",
- "jsonrpsee 0.20.3",
+ "jsonrpsee",
  "log",
  "parity-scale-codec",
  "sc-rpc-api",
@@ -15266,7 +15637,7 @@ dependencies = [
 [[package]]
 name = "substrate-prometheus-endpoint"
 version = "0.17.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "hyper",
  "log",
@@ -15278,10 +15649,10 @@ dependencies = [
 [[package]]
 name = "substrate-rpc-client"
 version = "0.33.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "async-trait",
- "jsonrpsee 0.20.3",
+ "jsonrpsee",
  "log",
  "sc-rpc-api",
  "serde",
@@ -15291,9 +15662,9 @@ dependencies = [
 [[package]]
 name = "substrate-state-trie-migration-rpc"
 version = "27.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
- "jsonrpsee 0.20.3",
+ "jsonrpsee",
  "parity-scale-codec",
  "sc-client-api",
  "sc-rpc-api",
@@ -15302,13 +15673,13 @@ dependencies = [
  "sp-runtime",
  "sp-state-machine",
  "sp-trie",
- "trie-db",
+ "trie-db 0.29.1",
 ]
 
 [[package]]
 name = "substrate-wasm-builder"
 version = "17.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "array-bytes 6.2.2",
  "build-helper",
@@ -15319,13 +15690,14 @@ dependencies = [
  "merkleized-metadata",
  "parity-scale-codec",
  "parity-wasm",
+ "polkavm-linker",
  "sc-executor",
  "sp-core",
  "sp-io",
  "sp-maybe-compressed-blob",
- "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-tracing",
  "sp-version",
- "strum 0.24.1",
+ "strum 0.26.3",
  "tempfile",
  "toml 0.8.12",
  "walkdir",
@@ -15340,9 +15712,9 @@ checksum = "2d67a5a62ba6e01cb2192ff309324cb4875d0c451d55fe2319433abe7a05a8ee"
 
 [[package]]
 name = "subtle"
-version = "2.4.1"
+version = "2.6.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "6bdef32e8150c2a081110b42772ffe7d7c9032b606bc226c8260fd97e0976601"
+checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292"
 
 [[package]]
 name = "subtle-ng"
@@ -15461,28 +15833,7 @@ version = "2.2.2"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "21d6cf5a7dffb3f9dceec8e6b8ca528d9bd71d36c9f074defb548ce161f598c0"
 dependencies = [
- "test-case-macros 2.2.2",
-]
-
-[[package]]
-name = "test-case"
-version = "3.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eb2550dd13afcd286853192af8601920d959b14c401fcece38071d53bf0768a8"
-dependencies = [
- "test-case-macros 3.3.1",
-]
-
-[[package]]
-name = "test-case-core"
-version = "3.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "adcb7fd841cd518e279be3d5a3eb0636409487998a4aff22f3de87b81e88384f"
-dependencies = [
- "cfg-if",
- "proc-macro2",
- "quote",
- "syn 2.0.61",
+ "test-case-macros",
 ]
 
 [[package]]
@@ -15498,21 +15849,9 @@ dependencies = [
  "syn 1.0.109",
 ]
 
-[[package]]
-name = "test-case-macros"
-version = "3.3.1"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5c89e72a01ed4c579669add59014b9a524d609c0c88c6a585ce37485879f6ffb"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.61",
- "test-case-core",
-]
-
 [[package]]
 name = "test-utils"
-version = "1.1.1"
+version = "1.1.2"
 dependencies = [
  "frame-system",
  "pretty_assertions",
@@ -15526,9 +15865,9 @@ checksum = "222a222a5bfe1bba4a77b45ec488a741b3cb8872e5e499451fd7d0129c9c7c3d"
 
 [[package]]
 name = "thiserror"
-version = "1.0.51"
+version = "1.0.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f11c217e1416d6f036b870f14e0413d480dbf28edbee1f877abaf0206af43bb7"
+checksum = "c0342370b38b6a11b6cc11d6a805569958d54cfa061a29969c3b5ce2ea405724"
 dependencies = [
  "thiserror-impl",
 ]
@@ -15555,9 +15894,9 @@ dependencies = [
 
 [[package]]
 name = "thiserror-impl"
-version = "1.0.51"
+version = "1.0.63"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "01742297787513b79cf8e29d1056ede1313e2420b7b3b15d0a768b4921f549df"
+checksum = "a4558b58466b9ad7ca0f102865eccc95938dca1a74a856f2b57b6629050da261"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -15697,7 +16036,7 @@ dependencies = [
  "libc",
  "mio",
  "num_cpus",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
  "pin-project-lite 0.2.13",
  "signal-hook-registry",
  "socket2 0.5.5",
@@ -15723,7 +16062,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "7f57eb36ecbe0fc510036adff84824dd3c24bb781e21bfa67b69d556aa85214f"
 dependencies = [
  "pin-project",
- "rand",
+ "rand 0.8.5",
  "tokio",
 ]
 
@@ -15737,6 +16076,17 @@ dependencies = [
  "tokio",
 ]
 
+[[package]]
+name = "tokio-rustls"
+version = "0.25.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "775e0c0f0adb3a2f22a00c4745d728b479985fc15ee7ca6a2608388c5569860f"
+dependencies = [
+ "rustls 0.22.4",
+ "rustls-pki-types",
+ "tokio",
+]
+
 [[package]]
 name = "tokio-stream"
 version = "0.1.14"
@@ -15749,11 +16099,26 @@ dependencies = [
  "tokio-util",
 ]
 
+[[package]]
+name = "tokio-tungstenite"
+version = "0.20.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "212d5dcb2a1ce06d81107c3d0ffa3121fe974b73f068c8282cb1c32328113b6c"
+dependencies = [
+ "futures-util",
+ "log",
+ "rustls 0.21.10",
+ "rustls-native-certs 0.6.3",
+ "tokio",
+ "tokio-rustls 0.24.1",
+ "tungstenite",
+]
+
 [[package]]
 name = "tokio-util"
-version = "0.7.10"
+version = "0.7.11"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5419f34732d9eb6ee4c3578b7989078579b7f039cbbb9ca2c4da015749371e15"
+checksum = "9cf6b47b3771c49ac75ad09a6162f53ad4b8088b76ac60e8ec1455b31a189fe1"
 dependencies = [
  "bytes",
  "futures-core",
@@ -15761,7 +16126,6 @@ dependencies = [
  "futures-sink",
  "pin-project-lite 0.2.13",
  "tokio",
- "tracing",
 ]
 
 [[package]]
@@ -15945,7 +16309,7 @@ dependencies = [
 [[package]]
 name = "tracing-gum"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "coarsetime",
  "polkadot-primitives",
@@ -15956,7 +16320,7 @@ dependencies = [
 [[package]]
 name = "tracing-gum-proc-macro"
 version = "5.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "expander 2.0.0",
  "proc-macro-crate 3.1.0",
@@ -15977,36 +16341,33 @@ dependencies = [
 ]
 
 [[package]]
-name = "tracing-serde"
-version = "0.1.3"
+name = "tracing-log"
+version = "0.2.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "bc6b213177105856957181934e4920de57730fc69bf42c37ee5bb664d406d9e1"
+checksum = "ee855f1f400bd0e5c02d150ae5de3840039a3f54b025156404e34c23c03f47c3"
 dependencies = [
- "serde",
+ "log",
+ "once_cell",
  "tracing-core",
 ]
 
 [[package]]
 name = "tracing-subscriber"
-version = "0.2.25"
+version = "0.3.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0e0d2eaa99c3c2e41547cfa109e910a68ea03823cccad4a0525dcbc9b01e8c71"
+checksum = "ad0f048c97dbd9faa9b7df56362b8ebcaa52adb06b498c050d2f4e32f90a7a8b"
 dependencies = [
- "ansi_term",
- "chrono",
- "lazy_static",
  "matchers",
- "parking_lot 0.11.2",
+ "nu-ansi-term",
+ "once_cell",
+ "parking_lot 0.12.3",
  "regex",
- "serde",
- "serde_json",
  "sharded-slab",
  "smallvec",
  "thread_local",
  "tracing",
  "tracing-core",
- "tracing-log",
- "tracing-serde",
+ "tracing-log 0.2.0",
 ]
 
 [[package]]
@@ -16022,6 +16383,18 @@ dependencies = [
  "smallvec",
 ]
 
+[[package]]
+name = "trie-db"
+version = "0.29.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0c992b4f40c234a074d48a757efeabb1a6be88af84c0c23f7ca158950cb0ae7f"
+dependencies = [
+ "hash-db 0.16.0",
+ "log",
+ "rustc-hex",
+ "smallvec",
+]
+
 [[package]]
 name = "trie-root"
 version = "0.18.0"
@@ -16050,14 +16423,14 @@ dependencies = [
  "async-trait",
  "cfg-if",
  "data-encoding",
- "enum-as-inner",
+ "enum-as-inner 0.5.1",
  "futures-channel",
  "futures-io",
  "futures-util",
  "idna 0.2.3",
  "ipnet",
  "lazy_static",
- "rand",
+ "rand 0.8.5",
  "smallvec",
  "socket2 0.4.10",
  "thiserror",
@@ -16067,6 +16440,31 @@ dependencies = [
  "url",
 ]
 
+[[package]]
+name = "trust-dns-proto"
+version = "0.23.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "3119112651c157f4488931a01e586aa459736e9d6046d3bd9105ffb69352d374"
+dependencies = [
+ "async-trait",
+ "cfg-if",
+ "data-encoding",
+ "enum-as-inner 0.6.0",
+ "futures-channel",
+ "futures-io",
+ "futures-util",
+ "idna 0.4.0",
+ "ipnet",
+ "once_cell",
+ "rand 0.8.5",
+ "smallvec",
+ "thiserror",
+ "tinyvec",
+ "tokio",
+ "tracing",
+ "url",
+]
+
 [[package]]
 name = "trust-dns-resolver"
 version = "0.22.0"
@@ -16078,13 +16476,34 @@ dependencies = [
  "ipconfig",
  "lazy_static",
  "lru-cache",
- "parking_lot 0.12.1",
+ "parking_lot 0.12.3",
+ "resolv-conf",
+ "smallvec",
+ "thiserror",
+ "tokio",
+ "tracing",
+ "trust-dns-proto 0.22.0",
+]
+
+[[package]]
+name = "trust-dns-resolver"
+version = "0.23.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "10a3e6c3aff1718b3c73e395d1f35202ba2ffa847c6a62eea0db8fb4cfe30be6"
+dependencies = [
+ "cfg-if",
+ "futures-util",
+ "ipconfig",
+ "lru-cache",
+ "once_cell",
+ "parking_lot 0.12.3",
+ "rand 0.8.5",
  "resolv-conf",
  "smallvec",
  "thiserror",
  "tokio",
  "tracing",
- "trust-dns-proto",
+ "trust-dns-proto 0.23.2",
 ]
 
 [[package]]
@@ -16093,41 +16512,6 @@ version = "0.2.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "e421abadd41a4225275504ea4d6566923418b7f05506fbc9c0fe86ba7396114b"
 
-[[package]]
-name = "try-runtime-cli"
-version = "0.38.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
-dependencies = [
- "async-trait",
- "clap 4.5.4",
- "frame-remote-externalities",
- "hex",
- "log",
- "parity-scale-codec",
- "sc-cli",
- "sc-executor",
- "serde",
- "serde_json",
- "sp-api",
- "sp-consensus-aura",
- "sp-consensus-babe",
- "sp-core",
- "sp-debug-derive 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
- "sp-externalities 0.25.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
- "sp-inherents",
- "sp-io",
- "sp-keystore",
- "sp-rpc",
- "sp-runtime",
- "sp-state-machine",
- "sp-timestamp",
- "sp-transaction-storage-proof",
- "sp-version",
- "sp-weights",
- "substrate-rpc-client",
- "zstd 0.12.4",
-]
-
 [[package]]
 name = "trybuild"
 version = "1.0.86"
@@ -16149,6 +16533,26 @@ version = "1.0.9"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "f4f195fd851901624eee5a58c4bb2b4f06399148fcd0ed336e6f1cb60a9881df"
 
+[[package]]
+name = "tungstenite"
+version = "0.20.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e3dac10fd62eaf6617d3a904ae222845979aec67c615d1c842b4002c7666fb9"
+dependencies = [
+ "byteorder",
+ "bytes",
+ "data-encoding",
+ "http",
+ "httparse",
+ "log",
+ "rand 0.8.5",
+ "rustls 0.21.10",
+ "sha1",
+ "thiserror",
+ "url",
+ "utf-8",
+]
+
 [[package]]
 name = "twox-hash"
 version = "1.6.3"
@@ -16157,7 +16561,7 @@ checksum = "97fee6b57c6a41524a810daee9286c02d7752c4253064d0b05472833a438f675"
 dependencies = [
  "cfg-if",
  "digest 0.10.7",
- "rand",
+ "rand 0.8.5",
  "static_assertions",
 ]
 
@@ -16191,15 +16595,6 @@ version = "0.1.4"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "eaea85b334db583fe3274d12b4cd1880032beab409c0d774be044d4480ab9a94"
 
-[[package]]
-name = "unicase"
-version = "2.7.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f7d2d4dafb69621809a81864c9c1b864479e1235c0dd4e199924b9742439ed89"
-dependencies = [
- "version_check",
-]
-
 [[package]]
 name = "unicode-bidi"
 version = "0.3.14"
@@ -16246,7 +16641,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "fc1de2c688dc15305988b563c3854064043356019f97a4b46276fe734c4f07ea"
 dependencies = [
  "crypto-common",
- "subtle 2.4.1",
+ "subtle 2.6.1",
 ]
 
 [[package]]
@@ -16259,6 +16654,7 @@ dependencies = [
  "bytes",
  "futures-io",
  "futures-util",
+ "tokio-util",
 ]
 
 [[package]]
@@ -16284,6 +16680,12 @@ dependencies = [
  "percent-encoding",
 ]
 
+[[package]]
+name = "utf-8"
+version = "0.7.6"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "09cc8ee72d2a9becf2f2febe0205bbed8fc6615b7cb429ad062dc7b7ddd036a9"
+
 [[package]]
 name = "utf8parse"
 version = "0.2.1"
@@ -16329,7 +16731,7 @@ dependencies = [
  "arrayref",
  "constcat",
  "digest 0.10.7",
- "rand",
+ "rand 0.8.5",
  "rand_chacha 0.3.1",
  "rand_core 0.6.4",
  "sha2 0.10.8",
@@ -16739,7 +17141,7 @@ dependencies = [
  "memfd",
  "memoffset 0.8.0",
  "paste",
- "rand",
+ "rand 0.8.5",
  "rustix 0.36.17",
  "wasmtime-asm-macros",
  "wasmtime-environ",
@@ -16791,7 +17193,7 @@ dependencies = [
 [[package]]
 name = "westend-runtime"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "binary-merkle-tree",
  "bitvec",
@@ -16804,7 +17206,7 @@ dependencies = [
  "frame-system-benchmarking",
  "frame-system-rpc-runtime-api",
  "frame-try-runtime",
- "hex-literal 0.4.1",
+ "hex-literal",
  "log",
  "pallet-asset-rate",
  "pallet-authority-discovery",
@@ -16823,7 +17225,6 @@ dependencies = [
  "pallet-fast-unstake",
  "pallet-grandpa",
  "pallet-identity",
- "pallet-im-online",
  "pallet-indices",
  "pallet-membership",
  "pallet-message-queue",
@@ -16884,8 +17285,8 @@ dependencies = [
  "sp-runtime",
  "sp-session",
  "sp-staking",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
- "sp-storage 19.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
+ "sp-storage",
  "sp-transaction-pool",
  "sp-version",
  "staging-xcm",
@@ -16893,12 +17294,13 @@ dependencies = [
  "staging-xcm-executor",
  "substrate-wasm-builder",
  "westend-runtime-constants",
+ "xcm-fee-payment-runtime-api",
 ]
 
 [[package]]
 name = "westend-runtime-constants"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "frame-support",
  "polkadot-primitives",
@@ -17280,10 +17682,27 @@ dependencies = [
  "time",
 ]
 
+[[package]]
+name = "x509-parser"
+version = "0.15.1"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "7069fba5b66b9193bd2c5d3d4ff12b839118f6bcbef5328efafafb5395cf63da"
+dependencies = [
+ "asn1-rs",
+ "data-encoding",
+ "der-parser",
+ "lazy_static",
+ "nom",
+ "oid-registry",
+ "rusticata-macros",
+ "thiserror",
+ "time",
+]
+
 [[package]]
 name = "xcm-emulator"
 version = "0.5.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "cumulus-pallet-parachain-system",
  "cumulus-pallet-xcmp-queue",
@@ -17308,16 +17727,31 @@ dependencies = [
  "sp-crypto-hashing",
  "sp-io",
  "sp-runtime",
- "sp-std 14.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
- "sp-tracing 16.0.0 (git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2)",
+ "sp-std",
+ "sp-tracing",
  "staging-xcm",
  "staging-xcm-executor",
 ]
 
+[[package]]
+name = "xcm-fee-payment-runtime-api"
+version = "0.1.0"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
+dependencies = [
+ "frame-support",
+ "parity-scale-codec",
+ "scale-info",
+ "sp-api",
+ "sp-runtime",
+ "sp-std",
+ "sp-weights",
+ "staging-xcm",
+]
+
 [[package]]
 name = "xcm-procedural"
 version = "7.0.0"
-source = "git+https://github.com/paritytech/polkadot-sdk?branch=release-polkadot-v1.7.2#e73d252e3e13b27a1127bde9a7c47febf70cc9ab"
+source = "git+https://github.com/galacticcouncil/polkadot-sdk?branch=release-polkadot-v1.11.0-patch#57ad5f7a2d0250540e2123e79f7690fa2e4dec19"
 dependencies = [
  "Inflector",
  "proc-macro2",
@@ -17334,8 +17768,8 @@ dependencies = [
  "futures",
  "log",
  "nohash-hasher",
- "parking_lot 0.12.1",
- "rand",
+ "parking_lot 0.12.3",
+ "rand 0.8.5",
  "static_assertions",
 ]
 
diff --git a/Cargo.toml b/Cargo.toml
index f2af9f50e..f52e83457 100644
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -48,22 +48,59 @@ members = [
 resolver = "2"
 
 [workspace.dependencies]
-log = "0.4.20"
+codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
+scale-info = { version = "2.11.1", default-features = false, features = ["derive"] }
+serde = {version = "1.0.197", default-features = false}
+primitive-types = { version = "0.12.0", default-features = false }
+
+affix = "0.1.2"
+approx = "0.5.1"
 async-trait = "0.1"
+bitflags = "1.3.2"
+cargo-lock = "9.0.0"
+case = "1.0"
+clap = { version = "4.1.8", features = [ "derive" ] }
+criterion = "0.4.0"
+derive_more = "0.99.18"
+environmental = {version = "1.1.2", default-features = false}
+ethabi = { version = "18.0.0", default-features = false }
+fixed = { version = "=1.15.0", default-features = false }
 futures = "0.3.25"
+hex = {version = "0.4.3", default-features = false}
 hex-literal = "0.4.1"
+impl-trait-for-tuples = "0.2.2"
+jsonrpsee = { version = "0.22.5", features = ["server", "macros"] }
+lazy_static = { features = ["spin_no_std"], version = "1.4.0", default-features = false }
+libsecp256k1 = {version = "0.7", default-features = false}
+log = { version = "0.4.20", default-features = false }
+macrotest = "1.0.9"
+num_enum = {version = "0.7.3", default-features = false}
+num-traits = {default-features = false, version = "0.2.14"}
+parking_lot = "0.12.1"
 paste = "1.0.6"
+platforms = "1.1"
+pretty_assertions = "1.4.0"
+prettyplease = "0.1.18"
+proc-macro2 = "1.0"
+proptest = "1.0.40"
+quote = "1.0.20"
+rand = { version = "0.8.5", default-features = false }
+rand_xoshiro = "0.6.0"
+rug = { version = "1.17.0", features = ["num-traits"] }
+rustc-hex = { version = '2.1.0', default-features = false }
+serde_json = "1.0.85"
+sha3 = { version = "0.10.6", default-features = false}
 slices = "0.2.0"
-derive_more = "0.99"
-affix = "0.1.2"
+smallvec = "1.9.0"
 similar-asserts = "1.1.0"
-impl-trait-for-tuples = "0.2.1"
-environmental = {version = "1.1.2", default-features = false}
-hex = {version = "0.4.3", default-features = false}
-sha3 = {version = "0.10", default-features = false}
-serde = {version = "1.0.101", default-features = false}
-libsecp256k1 = {version = "0.7", default-features = false}
-num_enum = {version = "0.5.3", default-features = false}
+static_assertions = "1.1.0"
+syn = { version = "1.0.98", features = [ "extra-traits", "fold", "full", "visit" ] }
+test-case = "2.2.2"
+tokio = { version = "1", features = ["macros", "rt-multi-thread"] }
+toml = "0.5"
+trie-db = "0.28.0"
+trybuild = "1.0"
+
 hydra-dx-math = { path = "math", default-features = false }
 hydradx = { path = "node", default-features = false }
 hydradx-traits = { path = "traits", default-features = false }
@@ -115,381 +152,532 @@ integration-tests = { path = "integration-tests", default-features = false }
 pallet-evm-precompile-call-permit = { path ="precompiles/call-permit", default-features = false }
 precompile-utils = { path ="precompiles/utils", default-features = false }
 
-# Codec
-codec = { package = "parity-scale-codec", version = "3.4.0", default-features = false, features = ["derive"] }
-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", 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 }
-frame-metadata-hash-extension = { 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 }
+frame-benchmarking = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+frame-benchmarking-cli = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+frame-executive = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+frame-remote-externalities = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+frame-support = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false , features = ["tuples-96"]}
+frame-system = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+frame-system-benchmarking = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+frame-system-rpc-runtime-api = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+frame-try-runtime = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+frame-metadata-hash-extension = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+sp-api = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+sp-arithmetic = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+sp-authority-discovery = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+sp-block-builder = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+sp-genesis-builder = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+sp-blockchain = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+sp-consensus = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+sp-consensus-aura = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+sp-consensus-babe = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+sp-consensus-beefy = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sp-core = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+sp-externalities = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+sp-inherents = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+sp-io = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+sp-keystore = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+sp-npos-elections = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+sp-offchain = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+sc-offchain = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+sp-rpc = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+sp-runtime = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+sp-runtime-interface = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+sp-runtime-interface-proc-macro = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+sp-session = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+sp-staking = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+sp-std = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+sp-storage = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+sp-state-machine = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+sp-timestamp = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+sp-tracing = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+sp-transaction-pool = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+sp-trie = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+sp-version = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+sp-weights = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+sp-crypto-hashing= {  git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+sp-crypto-ec-utils= {   git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+sp-wasm-interface= {   git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+
+
+sc-basic-authorship = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+sc-chain-spec = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+sc-cli = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+sc-client-api = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+sc-client-db = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+sc-consensus = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+sc-consensus-aura = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+sc-consensus-grandpa = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+sc-executor = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+sc-keystore = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+sc-network = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+sc-network-sync = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+sc-network-common = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+sc-rpc = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+sc-rpc-api = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+sc-service = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+sc-telemetry = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+sc-tracing = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+sc-transaction-pool = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+sc-transaction-pool-api = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+sc-sysinfo = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
 
 # Substrate Pallets
-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 }
+pallet-aura = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+pallet-authorship = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+pallet-balances = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+pallet-bags-list = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+pallet-collective = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+pallet-elections-phragmen = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+pallet-identity = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+pallet-multisig = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+pallet-preimage = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+pallet-proxy = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+pallet-scheduler = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+pallet-session = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+pallet-sudo = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+pallet-timestamp = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+pallet-tips = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+pallet-transaction-payment = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+pallet-transaction-payment-rpc = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+pallet-treasury = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+pallet-uniques = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+pallet-utility = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+pallet-im-online = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+pallet-message-queue = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+pallet-state-trie-migration = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+
+substrate-build-script-utils = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+substrate-frame-rpc-system = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+substrate-prometheus-endpoint = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+substrate-rpc-client = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+substrate-wasm-builder = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+substrate-state-trie-migration-rpc = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", 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", 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-benchmarking = { git = "https://github.com/galacticcouncil/open-runtime-module-library", branch = "polkadot-v1.11.0", default-features = false }
+orml-currencies = { git = "https://github.com/galacticcouncil/open-runtime-module-library", branch = "polkadot-v1.11.0", default-features = false }
+orml-tokens = { git = "https://github.com/galacticcouncil/open-runtime-module-library", branch = "polkadot-v1.11.0", default-features = false }
+orml-traits = { git = "https://github.com/galacticcouncil/open-runtime-module-library", branch = "polkadot-v1.11.0", default-features = false }
+orml-utilities = { git = "https://github.com/galacticcouncil/open-runtime-module-library", branch = "polkadot-v1.11.0", default-features = false }
+orml-vesting = { git = "https://github.com/galacticcouncil/open-runtime-module-library", branch = "polkadot-v1.11.0", default-features = false }
 
 # orml XCM support
-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 }
+orml-unknown-tokens = { git = "https://github.com/galacticcouncil/open-runtime-module-library", branch = "polkadot-v1.11.0", default-features = false }
+orml-xcm = { git = "https://github.com/galacticcouncil/open-runtime-module-library", branch = "polkadot-v1.11.0", default-features = false }
+orml-xcm-support = { git = "https://github.com/galacticcouncil/open-runtime-module-library", branch = "polkadot-v1.11.0", default-features = false }
+orml-xtokens = { git = "https://github.com/galacticcouncil/open-runtime-module-library", branch = "polkadot-v1.11.0", default-features = false }
 
 # Cumulus dependencies
-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 }
+cumulus-client-cli = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+cumulus-client-collator = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+cumulus-client-consensus-aura = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+cumulus-client-consensus-common = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+cumulus-client-consensus-proposer = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+cumulus-client-network = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+cumulus-client-service = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+cumulus-pallet-aura-ext = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+cumulus-pallet-parachain-system = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+cumulus-pallet-xcm = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+cumulus-pallet-xcmp-queue = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+cumulus-primitives-core = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+cumulus-primitives-parachain-inherent = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+cumulus-primitives-timestamp = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+cumulus-primitives-utility = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+cumulus-relay-chain-inprocess-interface = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+cumulus-relay-chain-interface = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+cumulus-relay-chain-minimal-node = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+cumulus-test-relay-sproof-builder = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+pallet-collator-selection = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+staging-parachain-info = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+xcm-emulator = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+xcm-fee-payment-runtime-api = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+parachains-common = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
 
 # Frontier
-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 }
+fc-consensus = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v1.11.0", default-features = false }
+fc-db = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v1.11.0", default-features = false }
+fc-mapping-sync = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v1.11.0", default-features = false }
+fc-rpc = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v1.11.0", default-features = false }
+fc-rpc-core = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v1.11.0", default-features = false }
+
+fp-consensus = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v1.11.0", default-features = false }
+fp-evm = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v1.11.0", default-features = false }
+fp-rpc = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v1.11.0", default-features = false }
+fp-self-contained = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v1.11.0", default-features = false }
+fp-storage = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v1.11.0", default-features = false }
+
+pallet-ethereum = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v1.11.0", default-features = false }
+pallet-evm = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v1.11.0", default-features = false }
+pallet-evm-chain-id = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v1.11.0", default-features = false }
+pallet-evm-precompile-dispatch = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v1.11.0", default-features = false }
+pallet-evm-precompile-simple = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v1.11.0", default-features = false }
+pallet-evm-precompile-modexp = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v1.11.0", default-features = false }
+pallet-evm-precompile-bn128 = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v1.11.0", default-features = false }
+pallet-evm-precompile-blake2 = { git = "https://github.com/moonbeam-foundation/frontier", branch = "moonbeam-polkadot-v1.11.0", default-features = false }
+evm = { git = "https://github.com/moonbeam-foundation/evm", branch = "moonbeam-polkadot-v1.11.0", default-features = false }
 
 # EVM from acala
 module-evm-utility-macro = { path = "runtime/hydradx/src/evm/evm-utility/macro", default-features = false}
 
+evm-gasometer = { git = "https://github.com/rust-blockchain/evm", rev = "13240a8a551586fdef0b5028ed73af80b248092a", default-features = false }
+evm-runtime = { git = "https://github.com/rust-blockchain/evm", rev = "13240a8a551586fdef0b5028ed73af80b248092a", default-features = false }
+ethereum = { version = "0.14.0", default-features = false, features = ["with-codec"] }
+
 # Polkadot dependencies
-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 =  [
+pallet-xcm = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+polkadot-cli = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+polkadot-core-primitives = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+polkadot-parachain = { package = "polkadot-parachain-primitives", git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false, features =  [
   "wasm-api",
 ]}
-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" }
+polkadot-primitives = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+polkadot-runtime-parachains = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+polkadot-service = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+polkadot-xcm = { package = "staging-xcm", git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+xcm = { package = "staging-xcm", git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+xcm-builder = { package = "staging-xcm-builder", git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+xcm-executor = { package = "staging-xcm-executor", git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch", default-features = false }
+
+polkadot-client = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+polkadot-node-core-pvf = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+polkadot-node-network-protocol = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+polkadot-node-primitives = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+polkadot-node-subsystem = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+polkadot-node-subsystem-util = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+polkadot-overseer = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+polkadot-runtime-common = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" , default-features = false}
+polkadot-statement-table = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+rococo-runtime = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+westend-runtime = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+
+cumulus-client-pov-recovery = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+cumulus-pallet-parachain-system-proc-macro = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+cumulus-relay-chain-rpc-interface = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
 
 
 [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"}
+orml-benchmarking = { git = "https://github.com/galacticcouncil/open-runtime-module-library", branch = "polkadot-v1.11.0"}
+orml-tokens = { git = "https://github.com/galacticcouncil/open-runtime-module-library", branch = "polkadot-v1.11.0"}
+orml-traits = { git = "https://github.com/galacticcouncil/open-runtime-module-library", branch = "polkadot-v1.11.0"}
+orml-utilities = { git = "https://github.com/galacticcouncil/open-runtime-module-library", branch = "polkadot-v1.11.0"}
+orml-vesting = { git = "https://github.com/galacticcouncil/open-runtime-module-library", branch = "polkadot-v1.11.0"}
+orml-unknown-tokens = { git = "https://github.com/galacticcouncil/open-runtime-module-library", branch = "polkadot-v1.11.0"}
+orml-xcm = { git = "https://github.com/galacticcouncil/open-runtime-module-library", branch = "polkadot-v1.11.0"}
+orml-xcm-support = { git = "https://github.com/galacticcouncil/open-runtime-module-library", branch = "polkadot-v1.11.0"}
+orml-xtokens = { git = "https://github.com/galacticcouncil/open-runtime-module-library", branch = "polkadot-v1.11.0"}
 
 [patch."https://github.com/moonbeam-foundation/polkadot-sdk"]
-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" }
-frame-metadata-hash-extension = { 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"}
+frame-benchmarking = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+frame-benchmarking-cli = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+frame-executive = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+frame-remote-externalities = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+frame-support = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+frame-system = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+frame-system-benchmarking = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+frame-system-rpc-runtime-api = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+frame-try-runtime = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+frame-metadata-hash-extension = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sp-api = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sp-arithmetic = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sp-authority-discovery = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sp-block-builder = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sp-genesis-builder = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sp-blockchain = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sp-consensus = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sp-consensus-aura = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sp-consensus-babe = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sp-core = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sp-externalities = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sp-inherents = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sp-io = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sp-keystore = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sp-npos-elections = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sp-offchain = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sc-offchain = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sp-rpc = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sp-runtime = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sp-runtime-interface = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sp-runtime-interface-proc-macro = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sp-wasm-interface = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sp-panic-handler = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sp-database = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sp-session = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sp-staking = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sp-std = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sp-storage = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sp-timestamp = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sp-tracing = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sp-transaction-pool = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sp-trie = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sp-version = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sc-basic-authorship = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sc-chain-spec = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sc-cli = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sc-client-api = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sc-client-db = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sc-consensus = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sc-consensus-aura = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sc-consensus-grandpa = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sc-executor = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sc-keystore = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sc-network = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sc-network-sync = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sc-network-common = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sc-rpc = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sc-rpc-api = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sc-service = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sc-telemetry = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sc-tracing = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sc-transaction-pool = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sc-transaction-pool-api = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sc-sysinfo = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sc-utils = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sp-state-machine = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sp-weights = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch"}
+sp-crypto-hashing= {  git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch"}
 
 # Substrate Pallets
-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" }
+pallet-aura = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+pallet-authorship = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+pallet-balances = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+pallet-collective = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+pallet-elections-phragmen = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+pallet-identity = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+pallet-multisig = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+pallet-preimage = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+pallet-proxy = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+pallet-scheduler = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+pallet-session = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+pallet-sudo = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+pallet-timestamp = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+pallet-tips = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+pallet-transaction-payment = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+pallet-transaction-payment-rpc = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+pallet-treasury = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+pallet-uniques = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+pallet-utility = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+pallet-im-online = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+pallet-message-queue = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch"}
+pallet-state-trie-migration = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch"}
+
+substrate-build-script-utils = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+substrate-frame-rpc-system = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+substrate-prometheus-endpoint = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+substrate-rpc-client = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+substrate-wasm-builder = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+substrate-state-trie-migration-rpc = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
 
 # Cumulus dependencies
-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"}
+cumulus-client-cli = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+cumulus-client-collator = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+cumulus-client-consensus-aura = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+cumulus-client-consensus-common = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+cumulus-client-consensus-proposer = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+cumulus-client-network = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+cumulus-client-service = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+cumulus-pallet-aura-ext = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+cumulus-pallet-parachain-system = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+cumulus-pallet-xcm = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+cumulus-pallet-xcmp-queue = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+cumulus-primitives-core = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+cumulus-primitives-parachain-inherent = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+cumulus-primitives-timestamp = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+cumulus-primitives-utility = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+cumulus-relay-chain-inprocess-interface = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+cumulus-relay-chain-interface = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+cumulus-relay-chain-minimal-node = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+cumulus-test-relay-sproof-builder = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+pallet-collator-selection = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+staging-parachain-info = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+xcm-emulator = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+parachains-common = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch"}
+xcm-fee-payment-runtime-api = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch"  }
 
 # Polkadot dependencies
-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" }
-
-# Check issue: https://github.com/paritytech/arkworks-substrate/issues/9
+pallet-xcm = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+polkadot-cli = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+polkadot-core-primitives = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+polkadot-parachain = { package = "polkadot-parachain-primitives", git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch"}
+polkadot-primitives = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+polkadot-runtime-parachains = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+polkadot-service = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+xcm = { package = "staging-xcm", git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+xcm-builder = { package = "staging-xcm-builder", git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+xcm-executor = { package = "staging-xcm-executor", git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch"  }
+
+polkadot-node-core-pvf = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+polkadot-node-network-protocol = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+polkadot-node-primitives = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+polkadot-node-subsystem = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+polkadot-node-subsystem-util = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+polkadot-overseer = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+polkadot-runtime-common = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+polkadot-statement-table = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+rococo-runtime = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+westend-runtime = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+
+cumulus-client-pov-recovery = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+cumulus-pallet-parachain-system-proc-macro = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+cumulus-relay-chain-rpc-interface = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+
 [patch."https://github.com/paritytech/polkadot-sdk"]
-sp-crypto-ec-utils = { git = "https://github.com/paritytech//polkadot-sdk", branch = "release-polkadot-v1.7.2" }
+frame-benchmarking = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+frame-benchmarking-cli = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+frame-executive = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+frame-remote-externalities = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+frame-support = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+frame-system = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+frame-system-benchmarking = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+frame-system-rpc-runtime-api = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+frame-try-runtime = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+frame-metadata-hash-extension = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sp-api = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sp-arithmetic = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sp-authority-discovery = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sp-block-builder = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sp-genesis-builder = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sp-blockchain = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sp-consensus = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sp-consensus-aura = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sp-consensus-babe = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sp-core = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sp-externalities = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sp-inherents = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sp-io = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sp-keystore = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sp-npos-elections = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sp-offchain = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sc-offchain = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sp-rpc = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sp-runtime = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sp-runtime-interface = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sp-runtime-interface-proc-macro = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sp-wasm-interface = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sp-panic-handler = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sp-database = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sp-session = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sp-staking = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sp-std = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sp-storage = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sp-timestamp = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sp-tracing = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sp-transaction-pool = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sp-trie = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sp-version = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sc-basic-authorship = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sc-chain-spec = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sc-cli = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sc-client-api = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sc-client-db = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sc-consensus = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sc-consensus-aura = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sc-consensus-grandpa = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sc-executor = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sc-keystore = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sc-network = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sc-network-sync = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sc-network-common = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sc-rpc = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sc-rpc-api = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sc-service = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sc-telemetry = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sc-tracing = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sc-transaction-pool = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sc-transaction-pool-api = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sc-sysinfo = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sc-utils = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sp-state-machine = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+sp-weights = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch"}
+sp-crypto-hashing= {  git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch"}
+
+# Substrate Pallets
+pallet-aura = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+pallet-authorship = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+pallet-balances = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+pallet-collective = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+pallet-elections-phragmen = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+pallet-identity = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+pallet-multisig = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+pallet-preimage = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+pallet-proxy = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+pallet-scheduler = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+pallet-session = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+pallet-sudo = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+pallet-timestamp = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+pallet-tips = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+pallet-transaction-payment = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+pallet-transaction-payment-rpc = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+pallet-transaction-payment-rpc-runtime-api = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+pallet-treasury = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+pallet-uniques = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+pallet-utility = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+pallet-im-online = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+pallet-message-queue = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch"}
+pallet-state-trie-migration = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch"}
+
+substrate-build-script-utils = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+substrate-frame-rpc-system = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+substrate-prometheus-endpoint = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+substrate-rpc-client = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+substrate-wasm-builder = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+substrate-state-trie-migration-rpc = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+
+# Cumulus dependencies
+cumulus-client-cli = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+cumulus-client-collator = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+cumulus-client-consensus-aura = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+cumulus-client-consensus-common = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+cumulus-client-consensus-proposer = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+cumulus-client-network = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+cumulus-client-service = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+cumulus-pallet-aura-ext = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+cumulus-pallet-parachain-system = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+cumulus-pallet-xcm = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+cumulus-pallet-xcmp-queue = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+cumulus-primitives-core = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+cumulus-primitives-parachain-inherent = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+cumulus-primitives-timestamp = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+cumulus-primitives-utility = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+cumulus-relay-chain-inprocess-interface = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+cumulus-relay-chain-interface = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+cumulus-relay-chain-minimal-node = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+cumulus-test-relay-sproof-builder = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+pallet-collator-selection = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+staging-parachain-info = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+xcm-emulator = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+parachains-common = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch"}
+xcm-fee-payment-runtime-api = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch"  }
+
+# Polkadot dependencies
+pallet-xcm = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+polkadot-cli = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+polkadot-core-primitives = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+polkadot-parachain = { package = "polkadot-parachain-primitives", git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch"}
+polkadot-primitives = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+polkadot-runtime-parachains = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+polkadot-service = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+xcm = { package = "staging-xcm", git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+xcm-builder = { package = "staging-xcm-builder", git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+xcm-executor = { package = "staging-xcm-executor", git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch"  }
+
+polkadot-node-core-pvf = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+polkadot-node-network-protocol = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+polkadot-node-primitives = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+polkadot-node-subsystem = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+polkadot-node-subsystem-util = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+polkadot-overseer = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+polkadot-runtime-common = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+polkadot-statement-table = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+rococo-runtime = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+westend-runtime = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+
+cumulus-client-pov-recovery = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+cumulus-pallet-parachain-system-proc-macro = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+cumulus-relay-chain-rpc-interface = { git = "https://github.com/galacticcouncil/polkadot-sdk", branch = "release-polkadot-v1.11.0-patch" }
+
diff --git a/integration-tests/Cargo.toml b/integration-tests/Cargo.toml
index fdafaaffb..a5f2455a2 100644
--- a/integration-tests/Cargo.toml
+++ b/integration-tests/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "runtime-integration-tests"
-version = "1.23.6"
+version = "1.23.7"
 description = "Integration tests"
 authors = ["GalacticCouncil"]
 edition = "2021"
@@ -11,7 +11,7 @@ repository = "https://github.com/galacticcouncil/HydraDX-node"
 [dependencies]
 hex-literal = { workspace = true }
 frame-remote-externalities = { workspace = true }
-tokio = { version = "1", features = ["macros", "rt-multi-thread"] }
+tokio = { workspace = true }
 scraper = { workspace = true }
 primitives = { workspace = true }
 hydradx-runtime = { workspace = true }
@@ -134,7 +134,7 @@ polkadot-runtime-parachains = { workspace = true }
 rococo-runtime = { workspace = true }
 
 [dev-dependencies]
-pretty_assertions = "1.2.1"
+pretty_assertions = {  workspace = true }
 pallet-relaychain-info = { workspace = true }
 xcm-emulator = { workspace = true }
 test-utils = { workspace = true }
diff --git a/integration-tests/src/cross_chain_transfer.rs b/integration-tests/src/cross_chain_transfer.rs
index 60f637a77..0231016bb 100644
--- a/integration-tests/src/cross_chain_transfer.rs
+++ b/integration-tests/src/cross_chain_transfer.rs
@@ -1,17 +1,19 @@
 #![cfg(test)]
 use crate::polkadot_test_net::Rococo;
 use crate::polkadot_test_net::*;
+use xcm_emulator::ConvertLocation;
+use xcm_executor::traits::TransferType;
 
 use frame_support::{assert_noop, assert_ok};
 
-use polkadot_xcm::{v4::prelude::*, VersionedAssets, VersionedXcm};
+use polkadot_xcm::{v4::prelude::*, VersionedAssetId, 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 hydradx_runtime::AssetRegistry;
+use hydradx_runtime::{AssetRegistry, LocationToAccountId};
 use hydradx_traits::{registry::Mutate, AssetKind, Create};
 use orml_traits::currency::MultiCurrency;
 use polkadot_xcm::opaque::v3::{
@@ -45,12 +47,13 @@ fn hydra_should_receive_asset_when_transferred_from_rococo_relay_chain() {
 
 	Rococo::execute_with(|| {
 		//Act
-		assert_ok!(rococo_runtime::XcmPallet::reserve_transfer_assets(
+		assert_ok!(rococo_runtime::XcmPallet::limited_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_versioned()),
 			Box::new((Here, 300 * UNITS).into()),
 			0,
+			WeightLimit::Unlimited,
 		));
 
 		//Assert
@@ -652,38 +655,31 @@ fn transfer_foreign_asset_from_acala_to_hydra_should_not_work() {
 }
 
 #[test]
-fn transfer_dot_reserve_from_asset_hub_to_hydra_should_not_work() {
+fn transfer_dot_from_asset_hub_to_hydra_should_work() {
 	//Arrange
 	TestNet::reset();
 
 	Hydra::execute_with(|| {
-		let _ = with_transaction(|| {
-			register_foreign_asset();
-			assert_ok!(hydradx_runtime::AssetRegistry::set_location(
-				DOT,
-				hydradx_runtime::AssetLocation(MultiLocation::new(1, polkadot_xcm::opaque::v3::Junctions::Here))
-			));
+		add_currency_price(DOT, FixedU128::from(1));
 
-			add_currency_price(FOREIGN_ASSET, FixedU128::from(1));
-			add_currency_price(DOT, FixedU128::from(1));
+		assert_ok!(hydradx_runtime::Tokens::deposit(
+			DOT,
+			&AccountId::from(ALICE),
+			3000 * UNITS
+		));
 
-			TransactionOutcome::Commit(DispatchResult::Ok(()))
-		});
+		assert_ok!(hydradx_runtime::AssetRegistry::set_location(
+			DOT,
+			hydradx_runtime::AssetLocation(MultiLocation::new(1, polkadot_xcm::opaque::v3::Junctions::Here))
+		));
 	});
 
 	AssetHub::execute_with(|| {
 		let _ = with_transaction(|| {
-			register_foreign_asset();
 			register_dot();
 			TransactionOutcome::Commit(DispatchResult::Ok(()))
 		});
 
-		assert_ok!(hydradx_runtime::Tokens::deposit(
-			FOREIGN_ASSET,
-			&AccountId::from(ALICE),
-			3000 * UNITS
-		));
-
 		assert_ok!(hydradx_runtime::Tokens::deposit(
 			DOT,
 			&AccountId::from(ALICE),
@@ -703,7 +699,8 @@ fn transfer_dot_reserve_from_asset_hub_to_hydra_should_not_work() {
 			}])),
 		);
 
-		let xcm = xcm_for_deposit_reserve_asset_to_hydra::<hydradx_runtime::RuntimeCall>(dot, bob_beneficiary);
+		let xcm =
+			xcm_transfer_reserve_asset_and_deposit_asset_to_hydra::<hydradx_runtime::RuntimeCall>(dot, bob_beneficiary);
 
 		//Act
 		let res = hydradx_runtime::PolkadotXcm::execute(
@@ -723,7 +720,111 @@ fn transfer_dot_reserve_from_asset_hub_to_hydra_should_not_work() {
 
 	//Assert
 	Hydra::execute_with(|| {
-		assert_xcm_message_processing_failed();
+		assert_xcm_message_processing_passed();
+
+		let fee = hydradx_runtime::Tokens::free_balance(DOT, &hydradx_runtime::Treasury::account_id());
+		assert!(fee > 0, "treasury should have received fees");
+		//Check if the foreign asset from Assethub has been deposited successfully
+		assert_eq!(
+			hydradx_runtime::Currencies::free_balance(DOT, &AccountId::from(BOB)),
+			100 * UNITS - fee
+		);
+	});
+}
+
+#[test]
+fn transfer_dot_from_hydra_to_asset_hub_should_work() {
+	let init_hydra_para_dot_balance_on_ah = 4000 * UNITS;
+	let hydra_at_ah = Location::new(
+		1,
+		cumulus_primitives_core::Junctions::X1(Arc::new([cumulus_primitives_core::Junction::Parachain(HYDRA_PARA_ID)])),
+	);
+
+	let hydra_parachain_account_at_ah = LocationToAccountId::convert_location(&hydra_at_ah).unwrap();
+
+	let transfer_amount = 3 * UNITS;
+
+	AssetHub::execute_with(|| {
+		let _ = with_transaction(|| {
+			register_dot();
+			add_currency_price(DOT, FixedU128::from(1));
+			TransactionOutcome::Commit(DispatchResult::Ok(()))
+		});
+
+		assert_ok!(hydradx_runtime::Tokens::deposit(
+			DOT,
+			&hydra_parachain_account_at_ah,
+			init_hydra_para_dot_balance_on_ah
+		));
+	});
+
+	//Arrange
+	Hydra::execute_with(|| {
+		let dot_multiloc = MultiLocation::new(1, polkadot_xcm::opaque::v3::Junctions::Here);
+
+		assert_ok!(hydradx_runtime::AssetRegistry::set_location(
+			DOT,
+			hydradx_runtime::AssetLocation(dot_multiloc)
+		));
+
+		let dot_loc = Location::new(1, cumulus_primitives_core::Junctions::Here);
+
+		let dot: Asset = Asset {
+			id: cumulus_primitives_core::AssetId(dot_loc.clone()),
+			fun: Fungible(transfer_amount),
+		};
+
+		let bob_beneficiary = Location::new(
+			0,
+			cumulus_primitives_core::Junctions::X1(Arc::new([cumulus_primitives_core::Junction::AccountId32 {
+				id: BOB,
+				network: None,
+			}])),
+		);
+
+		let deposit_xcm = Xcm(vec![DepositAsset {
+			assets: Wild(WildAsset::AllCounted(1)),
+			beneficiary: bob_beneficiary.clone(),
+		}]);
+
+		//Act
+		assert_ok!(hydradx_runtime::PolkadotXcm::transfer_assets_using_type_and_then(
+			hydradx_runtime::RuntimeOrigin::signed(ALICE.into()),
+			Box::new(MultiLocation::new(1, X1(Junction::Parachain(ASSET_HUB_PARA_ID),)).into_versioned()),
+			Box::new(dot.into()),
+			Box::new(TransferType::DestinationReserve),
+			Box::new(VersionedAssetId::V4(cumulus_primitives_core::AssetId(dot_loc))),
+			Box::new(TransferType::DestinationReserve),
+			Box::new(VersionedXcm::from(deposit_xcm)),
+			WeightLimit::Unlimited,
+		));
+
+		assert_eq!(
+			hydradx_runtime::Tokens::free_balance(DOT, &AccountId::from(ALICE)),
+			ALICE_INITIAL_DOT_BALANCE - transfer_amount
+		);
+	});
+
+	//Needed to process horizontal xcm messages
+	Rococo::execute_with(|| {});
+
+	AssetHub::execute_with(|| {
+		assert_xcm_message_processing_passed();
+
+		//We check if the hydra parachain account balance is reduced on AH, meaning AH is responsible for reserve tracking
+		let hydra_sovereign_account_dot_balance =
+			hydradx_runtime::Currencies::free_balance(DOT, &hydra_parachain_account_at_ah);
+		assert_eq!(
+			hydra_sovereign_account_dot_balance,
+			init_hydra_para_dot_balance_on_ah - transfer_amount
+		);
+
+		let fee = hydradx_runtime::Currencies::free_balance(DOT, &hydradx_runtime::Treasury::account_id());
+
+		assert_eq!(
+			hydradx_runtime::Currencies::free_balance(DOT, &AccountId::from(BOB)),
+			transfer_amount - fee
+		);
 	});
 }
 
@@ -1015,3 +1116,66 @@ fn rococo_xcm_execute_extrinsic_should_be_allowed() {
 		),);
 	});
 }
+
+fn xcm_transfer_reserve_asset_and_deposit_asset_to_hydra<RC: Decode + GetDispatchInfo>(
+	assets: Asset,
+	beneficiary: Location,
+) -> VersionedXcm<RC> {
+	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 = Location::new(
+		1,
+		cumulus_primitives_core::Junctions::X1(Arc::new([cumulus_primitives_core::Junction::Parachain(HYDRA_PARA_ID)])),
+	);
+
+	let max_assets = 1 + 1;
+
+	let context = cumulus_primitives_core::Junctions::X2(Arc::new([
+		cumulus_primitives_core::Junction::GlobalConsensus(cumulus_primitives_core::NetworkId::Polkadot),
+		cumulus_primitives_core::Junction::Parachain(ASSET_HUB_PARA_ID),
+	]));
+
+	let fee_asset = assets.clone().reanchored(&dest, &context).expect("should reanchor");
+	let fees = fee_asset.clone();
+
+	let weight_limit = {
+		let mut remote_message = Xcm(vec![
+			ReserveAssetDeposited::<RC>(assets.clone().into()),
+			ClearOrigin,
+			BuyExecution {
+				fees: fees.clone(),
+				weight_limit: Limited(Weight::zero()),
+			},
+			DepositAsset {
+				assets: Wild(AllCounted(max_assets)),
+				beneficiary: beneficiary.clone(),
+			},
+		]);
+		// 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)
+	};
+	// executed on remote (on hydra)
+	let xcm = Xcm(vec![
+		//ReserveAssetDeposited(assets.clone()),
+		BuyExecution { fees, weight_limit },
+		DepositAsset {
+			assets: Wild(AllCounted(max_assets)),
+			beneficiary,
+		},
+	]);
+	// executed on local (AssetHub)
+	let message = Xcm(vec![
+		SetFeesMode { jit_withdraw: true },
+		TransferReserveAsset {
+			assets: assets.into(),
+			dest,
+			xcm,
+		},
+	]);
+	VersionedXcm::from(message)
+}
diff --git a/integration-tests/src/evm.rs b/integration-tests/src/evm.rs
index 31b6f1973..7e80e809c 100644
--- a/integration-tests/src/evm.rs
+++ b/integration-tests/src/evm.rs
@@ -253,8 +253,9 @@ mod account_conversion {
 			let fee_raw = hydradx_runtime::TransactionPayment::compute_fee_details(len, &info, 0);
 			let fee = fee_raw.final_fee();
 
-			// simple test that the fee is approximately 10/4 HDX (it was originally 10 HDX, but we divided the fee by 4 in the config)
-			assert_eq!(fee / UNITS, 10 / 4);
+			// assert that the fee is within some range
+			assert!(fee > 2 * UNITS);
+			assert!(fee < 4 * UNITS);
 		});
 	}
 
diff --git a/integration-tests/src/evm_permit.rs b/integration-tests/src/evm_permit.rs
index 784098314..36d74a349 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!(dai_diff > 1000 * 1_000_000_000_000);
+		assert!(dai_diff > 1000 * UNITS);
 	})
 }
 
@@ -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_916_889_814_194);
+		assert_eq!(tx_fee, 1_930_010_523_303);
 	})
 }
 
diff --git a/integration-tests/src/fee_calculation.rs b/integration-tests/src/fee_calculation.rs
index 1938f8664..603d0d85d 100644
--- a/integration-tests/src/fee_calculation.rs
+++ b/integration-tests/src/fee_calculation.rs
@@ -4,12 +4,11 @@ use crate::{oracle::hydradx_run_to_block, polkadot_test_net::*};
 use frame_support::assert_ok;
 use frame_support::dispatch::DispatchClass;
 use frame_support::dispatch::GetDispatchInfo;
-use frame_support::weights::constants::RocksDbWeight;
 use frame_support::weights::WeightToFee as WeightToFeeTrait;
 use hydradx_runtime::evm::precompiles::DISPATCH_ADDR;
 use hydradx_runtime::TransactionPayment;
 use hydradx_runtime::EVM;
-use hydradx_runtime::{ExtrinsicBaseWeight, Runtime, Tokens, WeightToFee};
+use hydradx_runtime::{Runtime, Tokens};
 use orml_traits::MultiCurrency;
 use pallet_evm::FeeCalculator;
 use primitives::constants::chain::Weight;
@@ -17,7 +16,6 @@ use primitives::constants::currency::UNITS;
 use primitives::constants::time::HOURS;
 use sp_core::Encode;
 use sp_core::U256;
-use sp_io::storage::changes_root;
 use sp_runtime::{FixedU128, Permill};
 use test_utils::assert_eq_approx;
 use xcm_emulator::TestExt;
@@ -191,7 +189,7 @@ fn substrate_and_evm_fee_growth_simulator_with_idle_chain() {
 			.max_total
 			.unwrap();
 
-		for (nonce, b) in (2..HOURS).enumerate() {
+		for b in 2..HOURS {
 			//=HOURS {
 			hydradx_run_to_block(b);
 			hydradx_runtime::System::set_block_consumed_resources(block_weight, 0);
@@ -206,16 +204,7 @@ fn substrate_and_evm_fee_growth_simulator_with_idle_chain() {
 			let info = call.get_dispatch_info();
 			let fee = TransactionPayment::compute_fee(SWAP_ENCODED_LEN, &info, 0);
 
-			let fee_in_cent = (fee as f64 * HDX_USD_SPOT_PRICE) / 1000000000000.0;
-			let fee_in_cent = round(fee_in_cent);
-
-			let evm_fee_in_cent = round(get_evm_fee_in_cent(nonce as u128));
-			let next = TransactionPayment::next_fee_multiplier();
-
-			let gas_price = hydradx_runtime::DynamicEvmFee::min_gas_price();
-
 			println!("{b:?} - fee: {fee:?}");
-			//println!("{b:?} - fee: ${fee_in_cent:?}  - evm_fee: ${evm_fee_in_cent:?} - multiplier: {next:?} - gas {gas_price:?}");
 		}
 	});
 }
diff --git a/integration-tests/src/insufficient_assets_ed.rs b/integration-tests/src/insufficient_assets_ed.rs
index d87f65076..36c0d4aed 100644
--- a/integration-tests/src/insufficient_assets_ed.rs
+++ b/integration-tests/src/insufficient_assets_ed.rs
@@ -1485,7 +1485,7 @@ fn ed_should_be_paid_in_insufficient_asset_through_dot() {
 				hydradx_runtime::Currencies::free_balance(insufficient_asset, &ALICE.into());
 
 			//Act
-			assert_ok!(Tokens::deposit(insufficient_asset2, &ALICE.into(), 1 * UNITS));
+			assert_ok!(Tokens::deposit(insufficient_asset2, &ALICE.into(), UNITS));
 
 			//Assert
 			let alice_new_insuff_balance = hydradx_runtime::Currencies::free_balance(insufficient_asset, &ALICE.into());
diff --git a/integration-tests/src/non_native_fee.rs b/integration-tests/src/non_native_fee.rs
index f32530035..8bf1e91c8 100644
--- a/integration-tests/src/non_native_fee.rs
+++ b/integration-tests/src/non_native_fee.rs
@@ -47,7 +47,7 @@ fn non_native_fee_payment_works_with_oracle_price_based_on_onchain_route() {
 			)
 		);
 		let bob_balance = hydradx_runtime::Tokens::free_balance(BTC, &AccountId::from(BOB));
-		assert_eq!(bob_balance, 999969);
+		assert_eq!(bob_balance, 999964);
 
 		assert_ok!(hydradx_runtime::Balances::force_set_balance(
 			hydradx_runtime::RuntimeOrigin::root(),
@@ -76,7 +76,7 @@ fn non_native_fee_payment_works_with_oracle_price_based_on_onchain_route() {
 		);
 
 		let dave_new_balance = hydradx_runtime::Tokens::free_balance(DAI, &AccountId::from(DAVE));
-		assert_eq!(dave_new_balance, 999993637058691367900);
+		assert_eq!(dave_new_balance, 999_992_750_748_267_749_500);
 	});
 }
 
@@ -109,7 +109,7 @@ fn set_currency_should_work_in_batch_transaction_when_first_tx() {
 			)
 		);
 		let bob_balance = hydradx_runtime::Tokens::free_balance(BTC, &AccountId::from(BOB));
-		assert_eq!(bob_balance, 999969);
+		assert_eq!(bob_balance, 999964);
 	});
 
 	TestNet::reset();
@@ -139,7 +139,7 @@ fn set_currency_should_work_in_batch_transaction_when_first_tx() {
 			)
 		);
 		let bob_balance = hydradx_runtime::Tokens::free_balance(BTC, &AccountId::from(BOB));
-		assert_eq!(bob_balance, 999969);
+		assert_eq!(bob_balance, 999964);
 	});
 
 	TestNet::reset();
@@ -169,7 +169,7 @@ fn set_currency_should_work_in_batch_transaction_when_first_tx() {
 			)
 		);
 		let bob_balance = hydradx_runtime::Tokens::free_balance(BTC, &AccountId::from(BOB));
-		assert_eq!(bob_balance, 999969);
+		assert_eq!(bob_balance, 999964);
 	});
 }
 
diff --git a/integration-tests/src/polkadot_test_net.rs b/integration-tests/src/polkadot_test_net.rs
index a7eb113ba..5cec09995 100644
--- a/integration-tests/src/polkadot_test_net.rs
+++ b/integration-tests/src/polkadot_test_net.rs
@@ -2,7 +2,7 @@
 use frame_support::{
 	assert_ok,
 	sp_runtime::{
-		traits::{AccountIdConversion, Block as BlockT, Dispatchable},
+		traits::{AccountIdConversion, Block as BlockT, Dispatchable, HashingFor},
 		BuildStorage, FixedU128, Permill,
 	},
 	traits::{GetCallMetadata, OnInitialize},
@@ -18,7 +18,7 @@ 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::v6::{BlockNumber, MAX_CODE_SIZE, MAX_POV_SIZE};
+pub use polkadot_primitives::v7::{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;
@@ -120,7 +120,7 @@ decl_test_networks! {
 }
 
 decl_test_relay_chains! {
-	#[api_version(10)]
+	#[api_version(11)]
 	pub struct RococoRelayChain {
 		genesis = rococo::genesis(),
 		on_init = {
@@ -259,8 +259,6 @@ pub mod rococo {
 			max_code_size: MAX_CODE_SIZE,
 			max_pov_size: MAX_POV_SIZE,
 			max_head_data_size: 32 * 1024,
-			group_rotation_frequency: 20,
-			paras_availability_period: 4,
 			max_upward_queue_count: 8,
 			max_upward_queue_size: 1024 * 1024,
 			max_downward_message_size: 1024,
@@ -378,7 +376,7 @@ pub mod rococo {
 			},
 			babe: rococo_runtime::BabeConfig {
 				authorities: Default::default(),
-				epoch_config: Some(rococo_runtime::BABE_GENESIS_EPOCH_CONFIG),
+				epoch_config: rococo_runtime::BABE_GENESIS_EPOCH_CONFIG,
 				..Default::default()
 			},
 			..Default::default()
@@ -574,9 +572,9 @@ pub mod hydra {
 					(AccountId::from(BOB), LRNA, BOB_INITIAL_LRNA_BALANCE),
 					(AccountId::from(BOB), DAI, BOB_INITIAL_DAI_BALANCE),
 					(AccountId::from(BOB), BTC, 1_000_000),
-					(AccountId::from(CHARLIE), DAI, 80_000_000_000 * UNITS),
 					(AccountId::from(BOB), PEPE, 1_000 * UNITS * 1_000_000),
 					(AccountId::from(CHARLIE), LRNA, CHARLIE_INITIAL_LRNA_BALANCE),
+					(AccountId::from(CHARLIE), DAI, 80_000_000_000 * UNITS),
 					(AccountId::from(DAVE), LRNA, 1_000 * UNITS),
 					(AccountId::from(DAVE), DAI, 1_000_000_000 * UNITS),
 					(omnipool_account.clone(), DAI, stable_amount),
@@ -767,7 +765,7 @@ pub fn rococo_run_to_block(to: BlockNumber) {
 
 pub fn hydra_live_ext(
 	path_to_snapshot: &str,
-) -> frame_remote_externalities::RemoteExternalities<hydradx_runtime::Block> {
+) -> frame_remote_externalities::RemoteExternalities<HashingFor<hydradx_runtime::Block>> {
 	let ext = tokio::runtime::Builder::new_current_thread()
 		.enable_all()
 		.build()
diff --git a/math/Cargo.toml b/math/Cargo.toml
index 9447c3454..12617341c 100644
--- a/math/Cargo.toml
+++ b/math/Cargo.toml
@@ -6,31 +6,36 @@ license = 'Apache-2.0'
 name = "hydra-dx-math"
 description = "A collection of utilities to make performing liquidity pool calculations more convenient."
 repository = 'https://github.com/galacticcouncil/hydradx-math'
-version = "8.1.2"
+version = "8.1.3"
 
 [dependencies]
-primitive-types = {default-features = false, version = '0.12.0'}
-num-traits = {default-features = false, version = "0.2.14"}
-fixed = { version = "=1.15.0", features = ["num-traits"] }
+primitive-types = {  workspace = true }
+num-traits = {  workspace = true }
+fixed = {  workspace = true, features = ["num-traits"] }
 # Added because of use of the FixedU128, used to implement `Ratio`
-codec = { package = "parity-scale-codec", version = "3.4.0", default-features = false, features = ["derive", "max-encoded-len"] }
-scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
+codec = {  workspace = true, features = ["derive", "max-encoded-len"] }
+scale-info = {  workspace = true }
 sp-arithmetic = { workspace = true }
 sp-std = { workspace = true }
-serde = { version = "1.0.136", default-features = false }
+serde = {  workspace = true }
 
 [dev-dependencies]
-approx = "0.5.1"
-criterion = "0.4.0"
-proptest = "1.0.0"
-rand = { version = "0.8.5", default-features = false, features= ["std_rng"] }
-rand_xoshiro = "0.6.0"
-rug = { version = "1.17.0", features = ["num-traits"] }
-test-case = "2.2.1"
+approx = {  workspace = true }
+criterion = {  workspace = true }
+proptest = {  workspace = true }
+rand = {  workspace = true, features= ["std_rng"] }
+rand_xoshiro = {  workspace = true }
+rug = {  workspace = true }
+test-case = {  workspace = true }
 
 [features]
 default = ["std"]
-std = ["codec/std", "serde/std", "sp-arithmetic/std", "sp-std/std"]
+std = [
+    "codec/std",
+    "serde/std",
+    "sp-arithmetic/std",
+    "sp-std/std"
+]
 runtime-benchmarks = []
 
 [[bench]]
diff --git a/node/Cargo.toml b/node/Cargo.toml
index 42a5c68e3..42f1fad24 100644
--- a/node/Cargo.toml
+++ b/node/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "hydradx"
-version = "13.1.2"
+version = "14.0.0"
 description = "Hydration node"
 authors = ["GalacticCouncil"]
 edition = "2021"
@@ -18,15 +18,15 @@ targets = ["x86_64-unknown-linux-gnu"]
 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.20.3", features = ["server", "macros"] }
-log = "0.4.17"
-serde = { version = "1.0.136", features = ["derive"] }
-serde_json = "1.0.85"
-clap = { version = "4.1.8", features = [ "derive" ] }
-futures = "0.3.21"
-async-trait = "0.1"
+codec = { workspace = true }
+hex-literal = { workspace = true }
+jsonrpsee = { workspace = true }
+log = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }
+clap = { workspace = true }
+futures = { workspace = true }
+async-trait = { workspace = true }
 
 # local dependencies
 hydradx-runtime = { workspace = true , features = ["std"] }
@@ -82,7 +82,7 @@ sp-authority-discovery = { workspace = true }
 frame-try-runtime = { workspace = true, optional = true }
 substrate-state-trie-migration-rpc = { workspace = true }
 
-trie-db = "0.28.0"
+trie-db = { workspace = true }
 sp-state-machine = { workspace = true }
 
 # Cumulus dependencies
diff --git a/node/src/command.rs b/node/src/command.rs
index c92ff3beb..0393802c2 100644
--- a/node/src/command.rs
+++ b/node/src/command.rs
@@ -20,6 +20,7 @@ use crate::cli::{Cli, RelayChainCli, Subcommand};
 use crate::service::new_partial;
 
 use codec::Encode;
+use cumulus_client_service::storage_proof_size::HostFunctions as ReclaimHostFunctions;
 use cumulus_primitives_core::ParaId;
 use frame_benchmarking_cli::{BenchmarkCmd, SUBSTRATE_REFERENCE_HARDWARE};
 use hydradx_runtime::Block;
@@ -28,7 +29,6 @@ use sc_cli::{
 	ChainSpec, CliConfiguration, DefaultConfigurationValues, ImportParams, KeystoreParams, NetworkParams, Result,
 	RuntimeVersion, SharedParams, SubstrateCli,
 };
-use sc_executor::sp_wasm_interface::ExtendedHostFunctions;
 use sc_service::config::{BasePath, PrometheusConfig};
 use sp_core::hexdisplay::HexDisplay;
 use sp_runtime::{
@@ -194,12 +194,7 @@ pub fn run() -> sc_cli::Result<()> {
 			match cmd {
 				BenchmarkCmd::Pallet(cmd) => {
 					if cfg!(feature = "runtime-benchmarks") {
-						runner.sync_run(|config| {
-							cmd.run::<Block, ExtendedHostFunctions<
-								sp_io::SubstrateHostFunctions,
-								frame_benchmarking::benchmarking::HostFunctions,
-							>>(config)
-						})
+						runner.sync_run(|config| cmd.run_with_spec::<sp_runtime::traits::HashingFor<Block>, ReclaimHostFunctions>(Some(config.chain_spec)))
 					} else {
 						Err("Benchmarking wasn't enabled when building the node. \
 			   You can enable it with `--features runtime-benchmarks`."
@@ -296,7 +291,7 @@ pub fn run() -> sc_cli::Result<()> {
 				let id = ParaId::from(para_id);
 
 				let parachain_account =
-					AccountIdConversion::<polkadot_primitives::v6::AccountId>::into_account_truncating(&id);
+					AccountIdConversion::<polkadot_primitives::v7::AccountId>::into_account_truncating(&id);
 
 				let state_version = Cli::runtime_version().state_version();
 
diff --git a/node/src/rpc.rs b/node/src/rpc.rs
index 19fa60f40..40df1f0ab 100644
--- a/node/src/rpc.rs
+++ b/node/src/rpc.rs
@@ -25,22 +25,16 @@ use cumulus_primitives_core::PersistedValidationData;
 use cumulus_primitives_parachain_inherent::ParachainInherentData;
 use cumulus_test_relay_sproof_builder::RelayStateSproofBuilder;
 use fc_db::kv::Backend as FrontierBackend;
-pub use fc_rpc::{
-	EthBlockDataCacheTask, OverrideHandle, RuntimeApiStorageOverride, SchemaV1Override, SchemaV2Override,
-	SchemaV3Override, StorageOverride,
-};
-use fc_rpc_core::types::CallRequest;
+pub use fc_rpc::{EthBlockDataCacheTask, StorageOverride, StorageOverrideHandler};
+use fc_rpc_core::types::TransactionRequest;
 pub use fc_rpc_core::types::{FeeHistoryCache, FeeHistoryCacheLimit, FilterPool};
 use fp_rpc::{ConvertTransaction, ConvertTransactionRuntimeApi, EthereumRuntimeRPCApi};
-use hydradx_runtime::{
-	opaque::{Block, Hash},
-	AccountId, Balance, Index,
-};
+use hydradx_runtime::{opaque::Block, AccountId, Balance, Index};
 use sc_client_api::{
 	backend::{Backend, StateBackend, StorageProvider},
 	client::BlockchainEvents,
 };
-use sc_network::NetworkService;
+use sc_network::service::traits::NetworkService;
 use sc_network_sync::SyncingService;
 use sc_rpc::SubscriptionTaskExecutor;
 pub use sc_rpc_api::DenyUnsafe;
@@ -54,18 +48,26 @@ use sp_runtime::traits::{BlakeTwo256, Block as BlockT};
 pub struct HydraDxEGA;
 
 impl fc_rpc::EstimateGasAdapter for HydraDxEGA {
-	fn adapt_request(mut request: CallRequest) -> CallRequest {
+	fn adapt_request(mut request: TransactionRequest) -> TransactionRequest {
 		// 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);
+			match (&mut request.data.input, &mut request.data.data) {
+				(Some(ref mut input), _) => {
+					if input.0.len() >= 4 {
+						input.0[..4].copy_from_slice(&BATCH_PRECOMPILE_BATCH_ALL_SELECTOR);
+					}
+				}
+				(None, Some(ref mut data)) => {
+					if data.0.len() >= 4 {
+						data.0[..4].copy_from_slice(&BATCH_PRECOMPILE_BATCH_ALL_SELECTOR);
+					}
 				}
-			}
+				(_, _) => {}
+			};
 		}
 		request
 	}
@@ -109,13 +111,13 @@ pub struct Deps<C, P, A: ChainApi, CT> {
 	/// Whether to enable dev signer
 	pub enable_dev_signer: bool,
 	/// Network service
-	pub network: Arc<NetworkService<Block, Hash>>,
+	pub network: Arc<dyn NetworkService>,
 	/// Chain syncing service
 	pub sync: Arc<SyncingService<Block>>,
 	/// Frontier Backend.
-	pub frontier_backend: Arc<FrontierBackend<Block>>,
+	pub frontier_backend: Arc<FrontierBackend<Block, C>>,
 	/// Ethereum data access overrides.
-	pub overrides: Arc<OverrideHandle<Block>>,
+	pub overrides: Arc<dyn StorageOverride<Block>>,
 	/// Cache for Ethereum block data.
 	pub block_data_cache: Arc<EthBlockDataCacheTask<Block>>,
 	/// EthFilterApi pool.
diff --git a/node/src/service.rs b/node/src/service.rs
index aaf30824e..231d773fc 100644
--- a/node/src/service.rs
+++ b/node/src/service.rs
@@ -20,8 +20,8 @@
 #![allow(clippy::all)]
 
 use hydradx_runtime::{
+	apis::RuntimeApi,
 	opaque::{Block, Hash},
-	RuntimeApi,
 };
 use std::{sync::Arc, time::Duration};
 
@@ -57,7 +57,7 @@ type ParachainClient = TFullClient<
 	Block,
 	RuntimeApi,
 	WasmExecutor<(
-		sp_io::SubstrateHostFunctions,
+		cumulus_client_service::ParachainHostFunctions,
 		frame_benchmarking::benchmarking::HostFunctions,
 	)>,
 >;
@@ -83,7 +83,7 @@ pub fn new_partial(
 			evm::BlockImport<Block, ParachainBlockImport, ParachainClient>,
 			Option<Telemetry>,
 			Option<TelemetryWorkerHandle>,
-			Arc<FrontierBackend<Block>>,
+			Arc<FrontierBackend<Block, ParachainClient>>,
 			FilterPool,
 			FeeHistoryCache,
 		),
@@ -115,11 +115,13 @@ pub fn new_partial(
 		.with_runtime_cache_size(config.runtime_cache_size)
 		.build();
 
-	let (client, backend, keystore_container, task_manager) = sc_service::new_full_parts::<Block, RuntimeApi, _>(
-		config,
-		telemetry.as_ref().map(|(_, telemetry)| telemetry.handle()),
-		executor,
-	)?;
+	let (client, backend, keystore_container, task_manager) =
+		sc_service::new_full_parts_record_import::<Block, RuntimeApi, _>(
+			config,
+			telemetry.as_ref().map(|(_, telemetry)| telemetry.handle()),
+			executor,
+			true,
+		)?;
 
 	let client = Arc::new(client);
 
@@ -200,7 +202,9 @@ async fn start_node_impl(
 	let params = new_partial(&parachain_config)?;
 	let (block_import, mut telemetry, telemetry_worker_handle, frontier_backend, filter_pool, fee_history_cache) =
 		params.other;
-	let net_config = sc_network::config::FullNetworkConfiguration::new(&parachain_config.network);
+	let net_config = sc_network::config::FullNetworkConfiguration::<_, _, sc_network::NetworkWorker<Block, Hash>>::new(
+		&parachain_config.network,
+	);
 
 	let client = params.client.clone();
 	let backend = params.backend.clone();
@@ -225,13 +229,13 @@ async fn start_node_impl(
 	let (network, system_rpc_tx, tx_handler_controller, start_network, sync_service) =
 		build_network(BuildNetworkParams {
 			parachain_config: &parachain_config,
-			net_config,
 			client: client.clone(),
 			transaction_pool: transaction_pool.clone(),
 			para_id,
 			spawn_handle: task_manager.spawn_handle(),
 			relay_chain_interface: relay_chain_interface.clone(),
 			import_queue: params.import_queue,
+			net_config,
 			sybil_resistance_level: CollatorSybilResistance::Resistant, // because of Aura
 		})
 		.await?;
@@ -247,7 +251,7 @@ async fn start_node_impl(
 				keystore: Some(params.keystore_container.keystore()),
 				offchain_db: backend.offchain_storage(),
 				transaction_pool: Some(OffchainTransactionPoolFactory::new(transaction_pool.clone())),
-				network_provider: network.clone(),
+				network_provider: Arc::new(network.clone()),
 				is_validator: parachain_config.role.is_authority(),
 				enable_http_requests: false,
 				custom_extensions: move |_| vec![],
@@ -257,7 +261,7 @@ async fn start_node_impl(
 		);
 	}
 
-	let overrides = evm::overrides_handle(client.clone());
+	let overrides = Arc::new(crate::rpc::StorageOverrideHandler::new(client.clone()));
 	let block_data_cache = Arc::new(fc_rpc::EthBlockDataCacheTask::new(
 		task_manager.spawn_handle(),
 		overrides.clone(),
@@ -415,8 +419,6 @@ fn build_import_queue(
 	telemetry: Option<TelemetryHandle>,
 	task_manager: &TaskManager,
 ) -> Result<sc_consensus::DefaultImportQueue<Block>, sc_service::Error> {
-	let slot_duration = cumulus_client_consensus_aura::slot_duration(&*client)?;
-
 	Ok(
 		cumulus_client_consensus_aura::equivocation_import_queue::fully_verifying_import_queue::<
 			sp_consensus_aura::sr25519::AuthorityPair,
@@ -431,7 +433,6 @@ fn build_import_queue(
 				let timestamp = sp_timestamp::InherentDataProvider::from_system_time();
 				Ok(timestamp)
 			},
-			slot_duration,
 			&task_manager.spawn_essential_handle(),
 			config.prometheus_registry(),
 			telemetry,
@@ -460,8 +461,6 @@ fn start_consensus(
 	// NOTE: because we use Aura here explicitly, we can use `CollatorSybilResistance::Resistant`
 	// when starting the network.
 
-	let slot_duration = cumulus_client_consensus_aura::slot_duration(&*client)?;
-
 	let proposer_factory = sc_basic_authorship::ProposerFactory::with_proof_recording(
 		task_manager.spawn_handle(),
 		client.clone(),
@@ -489,7 +488,6 @@ fn start_consensus(
 		collator_key,
 		para_id,
 		overseer_handle,
-		slot_duration,
 		relay_chain_slot_duration,
 		proposer,
 		collator_service,
diff --git a/node/src/service/evm.rs b/node/src/service/evm.rs
index 5b1f2ef4c..81ebe94d5 100644
--- a/node/src/service/evm.rs
+++ b/node/src/service/evm.rs
@@ -19,33 +19,27 @@
 //                                          you may not use this file except in compliance with the License.
 //                                          http://www.apache.org/licenses/LICENSE-2.0
 
-use std::{collections::BTreeMap, path::PathBuf, sync::Arc, time::Duration};
-
-use crate::service::{
-	rpc::{RuntimeApiStorageOverride, SchemaV1Override, SchemaV2Override, SchemaV3Override, StorageOverride},
-	ParachainClient,
-};
+use crate::service::ParachainClient;
 use cumulus_client_consensus_common::ParachainBlockImportMarker;
 use fc_consensus::Error;
 use fc_db::kv::Backend as FrontierBackend;
 use fc_mapping_sync::{kv::MappingSyncWorker, SyncStrategy};
-use fc_rpc::{EthTask, OverrideHandle};
+use fc_rpc::{EthTask, StorageOverride};
 use fc_rpc_core::types::{FeeHistoryCache, FeeHistoryCacheLimit, FilterPool};
 use fp_consensus::ensure_log;
 use fp_rpc::EthereumRuntimeRPCApi;
-use fp_storage::EthereumStorageSchema;
 use futures::{future, StreamExt};
 use primitives::Block;
-use sc_client_api::{backend::AuxStore, Backend, BlockOf, BlockchainEvents, StateBackend, StorageProvider};
+use sc_client_api::{backend::AuxStore, BlockOf, BlockchainEvents};
 use sc_consensus::{BlockCheckParams, BlockImport as BlockImportT, BlockImportParams, ImportResult};
 use sc_network_sync::SyncingService;
 use sc_service::{Configuration, TFullBackend, TaskManager};
 use sp_api::ProvideRuntimeApi;
 use sp_block_builder::BlockBuilder as BlockBuilderApi;
-use sp_blockchain::{Error as BlockchainError, HeaderBackend, HeaderMetadata};
+use sp_blockchain::HeaderBackend;
 use sp_consensus::Error as ConsensusError;
-use sp_core::H256;
-use sp_runtime::traits::{BlakeTwo256, Block as BlockT, Header as HeaderT, PhantomData};
+use sp_runtime::traits::{Block as BlockT, Header as HeaderT, PhantomData};
+use std::{path::PathBuf, sync::Arc, time::Duration};
 
 /// The ethereum-compatibility configuration used to run a node.
 #[derive(Clone, Copy, Debug, clap::Parser)]
@@ -80,7 +74,7 @@ type BlockNumberOf<B> = <<B as BlockT>::Header as HeaderT>::Number;
 pub struct BlockImport<B: BlockT, I: BlockImportT<B>, C> {
 	inner: I,
 	client: Arc<C>,
-	backend: Arc<fc_db::kv::Backend<B>>,
+	backend: Arc<fc_db::kv::Backend<B, C>>,
 	evm_since: BlockNumberOf<B>,
 	_marker: PhantomData<B>,
 }
@@ -106,7 +100,7 @@ where
 	C::Api: EthereumRuntimeRPCApi<B>,
 	C::Api: BlockBuilderApi<B>,
 {
-	pub fn new(inner: I, client: Arc<C>, backend: Arc<fc_db::kv::Backend<B>>, evm_since: BlockNumberOf<B>) -> Self {
+	pub fn new(inner: I, client: Arc<C>, backend: Arc<fc_db::kv::Backend<B, C>>, evm_since: BlockNumberOf<B>) -> Self {
 		Self {
 			inner,
 			client,
@@ -152,9 +146,9 @@ pub fn spawn_frontier_tasks(
 	task_manager: &TaskManager,
 	client: Arc<ParachainClient>,
 	backend: Arc<TFullBackend<Block>>,
-	frontier_backend: Arc<FrontierBackend<Block>>,
+	frontier_backend: Arc<FrontierBackend<Block, ParachainClient>>,
 	filter_pool: FilterPool,
-	overrides: Arc<OverrideHandle<Block>>,
+	overrides: Arc<dyn StorageOverride<Block>>,
 	fee_history_cache: FeeHistoryCache,
 	fee_history_cache_limit: FeeHistoryCacheLimit,
 	sync: Arc<SyncingService<Block>>,
@@ -197,32 +191,3 @@ pub fn spawn_frontier_tasks(
 		EthTask::fee_history_task(client, overrides, fee_history_cache, fee_history_cache_limit),
 	);
 }
-
-pub fn overrides_handle<B: BlockT<Hash = H256>, C, BE>(client: Arc<C>) -> Arc<OverrideHandle<B>>
-where
-	C: ProvideRuntimeApi<B> + StorageProvider<B, BE> + AuxStore,
-	C: HeaderBackend<B> + HeaderMetadata<B, Error = BlockchainError>,
-	C: Send + Sync + 'static,
-	C::Api: sp_api::ApiExt<B> + fp_rpc::EthereumRuntimeRPCApi<B> + fp_rpc::ConvertTransactionRuntimeApi<B>,
-	BE: Backend<B> + 'static,
-	BE::State: StateBackend<BlakeTwo256>,
-{
-	let mut overrides_map = BTreeMap::new();
-	overrides_map.insert(
-		EthereumStorageSchema::V1,
-		Box::new(SchemaV1Override::new(client.clone())) as Box<dyn StorageOverride<_>>,
-	);
-	overrides_map.insert(
-		EthereumStorageSchema::V2,
-		Box::new(SchemaV2Override::new(client.clone())) as Box<dyn StorageOverride<_>>,
-	);
-	overrides_map.insert(
-		EthereumStorageSchema::V3,
-		Box::new(SchemaV3Override::new(client.clone())) as Box<dyn StorageOverride<_>>,
-	);
-
-	Arc::new(OverrideHandle {
-		schemas: overrides_map,
-		fallback: Box::new(RuntimeApiStorageOverride::new(client)),
-	})
-}
diff --git a/pallets/asset-registry/Cargo.toml b/pallets/asset-registry/Cargo.toml
index 38832f9e6..9b0b90e87 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.4"
+version = "3.2.5"
 description = "Pallet for asset registry management"
 authors = ["GalacticCouncil"]
 edition = "2021"
@@ -14,10 +14,10 @@ targets = ["x86_64-unknown-linux-gnu"]
 substrate-wasm-builder = { workspace = true }
 
 [dependencies]
-codec = { default-features = false, features = ["derive", "max-encoded-len"], package = "parity-scale-codec", version = "3.4.0" }
-scale-info = { version = "2.1.2", default-features = false, features = ["derive"] }
-primitive-types = { default-features = false, version = "0.12.0" }
-serde = { features = ["derive"], optional = true, version = "1.0.137" }
+codec = { workspace = true, features = ["derive", "max-encoded-len"] }
+scale-info = { workspace = true }
+primitive-types = { workspace = true }
+serde = { workspace = true, optional = true }
 log = { workspace = true }
 
 # ORML dependencies
@@ -43,7 +43,7 @@ orml-tokens = { workspace = true }
 sp-io = { workspace = true }
 polkadot-xcm = { workspace = true }
 test-utils = { workspace = true }
-pretty_assertions = "1.2.1"
+pretty_assertions = { workspace = true }
 
 [features]
 default = ["std"]
diff --git a/pallets/asset-registry/src/tests/mock.rs b/pallets/asset-registry/src/tests/mock.rs
index ba04c5707..eb97c2af0 100644
--- a/pallets/asset-registry/src/tests/mock.rs
+++ b/pallets/asset-registry/src/tests/mock.rs
@@ -88,6 +88,11 @@ impl system::Config for Test {
 	type SS58Prefix = SS58Prefix;
 	type OnSetCode = ();
 	type MaxConsumers = frame_support::traits::ConstU32<16>;
+	type SingleBlockMigrations = ();
+	type MultiBlockMigrator = ();
+	type PreInherents = ();
+	type PostInherents = ();
+	type PostTransactions = ();
 }
 
 use codec::{Decode, Encode, MaxEncodedLen};
diff --git a/pallets/asset-registry/src/weights.rs b/pallets/asset-registry/src/weights.rs
index 8aa8daa00..8648aa7ff 100644
--- a/pallets/asset-registry/src/weights.rs
+++ b/pallets/asset-registry/src/weights.rs
@@ -15,36 +15,32 @@
 // 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 32.0.0
-//! DATE: 2024-05-23, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-09-10, 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`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
 
 // Executed Command:
-// ./target/release/hydradx
+// target/release/hydradx
 // benchmark
 // pallet
+// --chain=dev
+// --steps=50
+// --repeat=20
 // --wasm-execution=compiled
-// --pallet
-// *
-// --extrinsic
-// *
-// --heap-pages
-// 4096
-// --steps
-// 50
-// --repeat
-// 20
+// --pallet=pallet-asset-registry
+// --extrinsic=*
 // --template=scripts/pallet-weight-template.hbs
-// --output
-// weights/
+// --output=./weights/pallet_asset_registry.rs
 
+#![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
-#![allow(clippy::unnecessary_cast)]
+#![allow(missing_docs)]
 
 use frame_support::{
 	traits::Get,
@@ -74,8 +70,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `388`
 		//  Estimated: `4087`
-		// Minimum execution time: 33_258_000 picoseconds.
-		Weight::from_parts(33_840_000, 4087)
+		// Minimum execution time: 33_913_000 picoseconds.
+		Weight::from_parts(34_365_000, 4087)
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
 			.saturating_add(RocksDbWeight::get().writes(4_u64))
 	}
@@ -91,8 +87,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `617`
 		//  Estimated: `4087`
-		// Minimum execution time: 40_246_000 picoseconds.
-		Weight::from_parts(40_839_000, 4087)
+		// Minimum execution time: 41_632_000 picoseconds.
+		Weight::from_parts(42_099_000, 4087)
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
 			.saturating_add(RocksDbWeight::get().writes(5_u64))
 	}
@@ -108,8 +104,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `301`
 		//  Estimated: `4087`
-		// Minimum execution time: 23_496_000 picoseconds.
-		Weight::from_parts(23_982_000, 4087)
+		// Minimum execution time: 24_252_000 picoseconds.
+		Weight::from_parts(24_741_000, 4087)
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(4_u64))
 	}
@@ -121,8 +117,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `427`
 		//  Estimated: `3590`
-		// Minimum execution time: 17_542_000 picoseconds.
-		Weight::from_parts(17_999_000, 3590)
+		// Minimum execution time: 17_713_000 picoseconds.
+		Weight::from_parts(17_997_000, 3590)
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -132,8 +128,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `320`
 		//  Estimated: `3485`
-		// Minimum execution time: 14_891_000 picoseconds.
-		Weight::from_parts(15_319_000, 3485)
+		// Minimum execution time: 14_812_000 picoseconds.
+		Weight::from_parts(15_117_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 2417b8c7d..f858475c6 100644
--- a/pallets/bonds/Cargo.toml
+++ b/pallets/bonds/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-bonds"
-version = "2.2.3"
+version = "2.2.4"
 authors = ['GalacticCouncil']
 edition = "2021"
 license = "Apache-2.0"
@@ -14,8 +14,8 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 # parity
-scale-info = { version = "2.3.1", default-features = false, features = ["derive"] }
-codec = { default-features = false, features = ["derive"], package = "parity-scale-codec", version = "3.4.0" }
+scale-info = { workspace = true }
+codec = { workspace = true }
 
 # HydraDX
 hydradx-traits = { workspace = true }
@@ -35,7 +35,7 @@ orml-traits = { workspace = true }
 
 # third party
 primitive-types = { workspace = true }
-log = { version = "0.4.17", default-features = false }
+log = { workspace = true }
 
 # Optional imports for benchmarking
 frame-benchmarking = { workspace = true, optional = true }
@@ -47,7 +47,7 @@ sp-io = { workspace = true }
 sp-tracing = { workspace = true }
 frame-benchmarking = { workspace = true }
 orml-tokens = { workspace = true }
-pretty_assertions = "1.2.1"
+pretty_assertions = { workspace = true }
 
 [features]
 default = ["std"]
diff --git a/pallets/bonds/src/tests/mock.rs b/pallets/bonds/src/tests/mock.rs
index 31c8b02f2..8d14b74da 100644
--- a/pallets/bonds/src/tests/mock.rs
+++ b/pallets/bonds/src/tests/mock.rs
@@ -63,7 +63,7 @@ pub const NOW: Moment = 1689844300000; // unix time in milliseconds
 thread_local! {
 	// maps AssetId -> existential deposit
 	pub static REGISTERED_ASSETS: RefCell<HashMap<AssetId, (Balance, AssetKind)>> = RefCell::new(HashMap::default());
-	pub static PROTOCOL_FEE: RefCell<Permill> = RefCell::new(Permill::from_percent(0));
+	pub static PROTOCOL_FEE: RefCell<Permill> = const { RefCell::new(Permill::from_percent(0)) };
 }
 
 construct_runtime!(
@@ -142,6 +142,11 @@ impl frame_system::Config for Test {
 	type SS58Prefix = ();
 	type OnSetCode = ();
 	type MaxConsumers = ConstU32<16>;
+	type SingleBlockMigrations = ();
+	type MultiBlockMigrator = ();
+	type PreInherents = ();
+	type PostInherents = ();
+	type PostTransactions = ();
 }
 
 impl orml_tokens::Config for Test {
diff --git a/pallets/bonds/src/weights.rs b/pallets/bonds/src/weights.rs
index 2709a2edd..04b8d0797 100644
--- a/pallets/bonds/src/weights.rs
+++ b/pallets/bonds/src/weights.rs
@@ -15,36 +15,32 @@
 // 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 32.0.0
-//! DATE: 2024-05-23, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-09-10, 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`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
 
 // Executed Command:
-// ./target/release/hydradx
+// target/release/hydradx
 // benchmark
 // pallet
+// --chain=dev
+// --steps=50
+// --repeat=20
 // --wasm-execution=compiled
-// --pallet
-// *
-// --extrinsic
-// *
-// --heap-pages
-// 4096
-// --steps
-// 50
-// --repeat
-// 20
+// --pallet=pallet-bonds
+// --extrinsic=*
 // --template=scripts/pallet-weight-template.hbs
-// --output
-// weights/
+// --output=./weights/pallet_bonds.rs
 
+#![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
-#![allow(clippy::unnecessary_cast)]
+#![allow(missing_docs)]
 
 use frame_support::{
 	traits::Get,
@@ -96,8 +92,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `1393`
 		//  Estimated: `8799`
-		// Minimum execution time: 233_669_000 picoseconds.
-		Weight::from_parts(235_504_000, 8799)
+		// Minimum execution time: 238_932_000 picoseconds.
+		Weight::from_parts(240_147_000, 8799)
 			.saturating_add(RocksDbWeight::get().reads(16_u64))
 			.saturating_add(RocksDbWeight::get().writes(12_u64))
 	}
@@ -115,6 +111,8 @@ impl WeightInfo for () {
 	/// 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: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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)
@@ -123,11 +121,11 @@ impl WeightInfo for () {
 	/// Proof: `Balances::Freezes` (`max_values`: None, `max_size`: Some(49), added: 2524, mode: `MaxEncodedLen`)
 	fn redeem() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1810`
+		//  Measured:  `2018`
 		//  Estimated: `8799`
-		// Minimum execution time: 175_138_000 picoseconds.
-		Weight::from_parts(176_054_000, 8799)
-			.saturating_add(RocksDbWeight::get().reads(12_u64))
+		// Minimum execution time: 180_029_000 picoseconds.
+		Weight::from_parts(181_146_000, 8799)
+			.saturating_add(RocksDbWeight::get().reads(13_u64))
 			.saturating_add(RocksDbWeight::get().writes(7_u64))
 	}
 }
diff --git a/pallets/circuit-breaker/Cargo.toml b/pallets/circuit-breaker/Cargo.toml
index 5ea64546b..70e1f216b 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.25"
+version = "1.1.26"
 authors = ["GalacticCouncil <hydradx@galacticcouncil.io>"]
 edition = "2021"
 license = "Apache-2.0"
@@ -12,9 +12,9 @@ description = "Circuit breakers for AMMs"
 targets = ['x86_64-unknown-linux-gnu']
 
 [dependencies]
-serde = { features = ["derive"], optional = true, version = "1.0.136" }
-codec = { default-features = false, features = ["derive"], package = "parity-scale-codec", version = "3.4.0" }
-scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
+serde = { workspace = true, optional = true }
+codec = { workspace = true }
+scale-info = {workspace = true }
 
 # Substrate dependencies
 frame-benchmarking = { workspace = true, optional = true}
@@ -36,8 +36,8 @@ orml-tokens = { workspace = true }
 orml-traits = { workspace = true }
 hydra-dx-math = { workspace = true }
 test-utils = { workspace = true }
-pretty_assertions = "1.2.1"
-test-case = "3.0.0"
+pretty_assertions = { workspace = true }
+test-case = { workspace = true }
 
 [features]
 default = ['std']
diff --git a/pallets/circuit-breaker/src/tests/mock.rs b/pallets/circuit-breaker/src/tests/mock.rs
index a28a2ac92..9660cf6c3 100644
--- a/pallets/circuit-breaker/src/tests/mock.rs
+++ b/pallets/circuit-breaker/src/tests/mock.rs
@@ -66,16 +66,16 @@ pub const TEN_PERCENT: (u32, u32) = (1_000, 10_000);
 thread_local! {
 	pub static POSITIONS: RefCell<HashMap<u32, u64>> = RefCell::new(HashMap::default());
 	pub static REGISTERED_ASSETS: RefCell<HashMap<AssetId, u32>> = RefCell::new(HashMap::default());
-	pub static ASSET_WEIGHT_CAP: RefCell<Permill> = RefCell::new(Permill::from_percent(100));
-	pub static ASSET_FEE: RefCell<Permill> = RefCell::new(Permill::from_percent(0));
-	pub static PROTOCOL_FEE: RefCell<Permill> = RefCell::new(Permill::from_percent(0));
-	pub static MIN_ADDED_LIQUDIITY: RefCell<Balance> = RefCell::new(1000u128);
-	pub static MIN_TRADE_AMOUNT: RefCell<Balance> = RefCell::new(1000u128);
-	pub static MAX_IN_RATIO: RefCell<Balance> = RefCell::new(1u128);
-	pub static MAX_OUT_RATIO: RefCell<Balance> = RefCell::new(1u128);
-	pub static MAX_NET_TRADE_VOLUME_LIMIT_PER_BLOCK: RefCell<(u32, u32)> = RefCell::new((2_000, 10_000)); // 20%
-	pub static MAX_ADD_LIQUIDITY_LIMIT_PER_BLOCK: RefCell<Option<(u32, u32)>> = RefCell::new(Some((4_000, 10_000))); // 40%
-	pub static MAX_REMOVE_LIQUIDITY_LIMIT_PER_BLOCK: RefCell<Option<(u32, u32)>> = RefCell::new(Some((2_000, 10_000))); // 20%
+	pub static ASSET_WEIGHT_CAP: RefCell<Permill> = const { RefCell::new(Permill::from_percent(100)) };
+	pub static ASSET_FEE: RefCell<Permill> = const { RefCell::new(Permill::from_percent(0)) };
+	pub static PROTOCOL_FEE: RefCell<Permill> = const { RefCell::new(Permill::from_percent(0)) };
+	pub static MIN_ADDED_LIQUDIITY: RefCell<Balance> = const { RefCell::new(1000u128) };
+	pub static MIN_TRADE_AMOUNT: RefCell<Balance> = const { RefCell::new(1000u128) };
+	pub static MAX_IN_RATIO: RefCell<Balance> = const { RefCell::new(1u128) };
+	pub static MAX_OUT_RATIO: RefCell<Balance> = const { RefCell::new(1u128) };
+	pub static MAX_NET_TRADE_VOLUME_LIMIT_PER_BLOCK: RefCell<(u32, u32)> = const { RefCell::new((2_000, 10_000)) }; // 20%
+	pub static MAX_ADD_LIQUIDITY_LIMIT_PER_BLOCK: RefCell<Option<(u32, u32)>> = const { RefCell::new(Some((4_000, 10_000))) }; // 40%
+	pub static MAX_REMOVE_LIQUIDITY_LIMIT_PER_BLOCK: RefCell<Option<(u32, u32)>> = const { RefCell::new(Some((2_000, 10_000))) }; // 20%
 }
 
 frame_support::construct_runtime!(
@@ -119,6 +119,11 @@ impl frame_system::Config for Test {
 	type SS58Prefix = SS58Prefix;
 	type OnSetCode = ();
 	type MaxConsumers = frame_support::traits::ConstU32<16>;
+	type SingleBlockMigrations = ();
+	type MultiBlockMigrator = ();
+	type PreInherents = ();
+	type PostInherents = ();
+	type PostTransactions = ();
 }
 
 parameter_types! {
diff --git a/pallets/circuit-breaker/src/weights.rs b/pallets/circuit-breaker/src/weights.rs
index ec3b5a601..016cb0187 100644
--- a/pallets/circuit-breaker/src/weights.rs
+++ b/pallets/circuit-breaker/src/weights.rs
@@ -15,36 +15,32 @@
 // 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 32.0.0
-//! DATE: 2024-05-23, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-09-10, 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`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
 
 // Executed Command:
-// ./target/release/hydradx
+// target/release/hydradx
 // benchmark
 // pallet
+// --chain=dev
+// --steps=50
+// --repeat=20
 // --wasm-execution=compiled
-// --pallet
-// *
-// --extrinsic
-// *
-// --heap-pages
-// 4096
-// --steps
-// 50
-// --repeat
-// 20
+// --pallet=pallet-circuit-breaker
+// --extrinsic=*
 // --template=scripts/pallet-weight-template.hbs
-// --output
-// weights/
+// --output=./weights/pallet_circuit_breaker.rs
 
+#![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
-#![allow(clippy::unnecessary_cast)]
+#![allow(missing_docs)]
 
 use frame_support::{
 	traits::Get,
@@ -68,39 +64,39 @@ pub trait WeightInfo {
 
 // For backwards compatibility and tests
 impl WeightInfo for () {
-	/// The range of component `n` is `[0, 400]`.
+		/// The range of component `n` is `[0, 400]`.
 	/// The range of component `m` is `[0, 400]`.
-	fn on_finalize(n: u32, m: u32) -> Weight {
+	fn on_finalize(n: u32, m: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `64 + m * (113 ±0) + n * (56 ±0)`
 		//  Estimated: `0`
-		// 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()))
+		// Minimum execution time: 316_267_000 picoseconds.
+		Weight::from_parts(317_103_000, 0)
+			// Standard Error: 9_174
+			.saturating_add(Weight::from_parts(277_948, 0).saturating_mul(n.into()))
+			// Standard Error: 9_174
+			.saturating_add(Weight::from_parts(1_071_388, 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: 8_112_000 picoseconds.
-		Weight::from_parts(8_381_000, 0)
+		// Minimum execution time: 8_606_000 picoseconds.
+		Weight::from_parts(8_803_000, 0)
 	}
 	fn on_finalize_single_trade_limit_entry() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `208`
 		//  Estimated: `0`
-		// Minimum execution time: 8_194_000 picoseconds.
-		Weight::from_parts(8_399_000, 0)
+		// Minimum execution time: 8_600_000 picoseconds.
+		Weight::from_parts(8_907_000, 0)
 	}
 	fn on_finalize_empty() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `208`
 		//  Estimated: `0`
-		// Minimum execution time: 8_191_000 picoseconds.
-		Weight::from_parts(8_373_000, 0)
+		// Minimum execution time: 8_524_000 picoseconds.
+		Weight::from_parts(8_933_000, 0)
 	}
 	/// Storage: `CircuitBreaker::TradeVolumeLimitPerAsset` (r:0 w:1)
 	/// Proof: `CircuitBreaker::TradeVolumeLimitPerAsset` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
@@ -108,8 +104,9 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 8_818_000 picoseconds.
-		Weight::from_parts(9_140_000, 0).saturating_add(RocksDbWeight::get().writes(1_u64))
+		// Minimum execution time: 9_168_000 picoseconds.
+		Weight::from_parts(9_490_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`)
@@ -117,8 +114,9 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 8_841_000 picoseconds.
-		Weight::from_parts(9_081_000, 0).saturating_add(RocksDbWeight::get().writes(1_u64))
+		// Minimum execution time: 8_747_000 picoseconds.
+		Weight::from_parts(9_167_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`)
@@ -126,8 +124,9 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 9_089_000 picoseconds.
-		Weight::from_parts(9_231_000, 0).saturating_add(RocksDbWeight::get().writes(1_u64))
+		// Minimum execution time: 8_922_000 picoseconds.
+		Weight::from_parts(9_161_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`)
@@ -141,8 +140,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `262`
 		//  Estimated: `3517`
-		// Minimum execution time: 20_016_000 picoseconds.
-		Weight::from_parts(20_252_000, 3517)
+		// Minimum execution time: 20_217_000 picoseconds.
+		Weight::from_parts(20_416_000, 3517)
 			.saturating_add(RocksDbWeight::get().reads(4_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
@@ -158,8 +157,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `208`
 		//  Estimated: `3517`
-		// Minimum execution time: 17_308_000 picoseconds.
-		Weight::from_parts(17_647_000, 3517)
+		// Minimum execution time: 17_362_000 picoseconds.
+		Weight::from_parts(17_585_000, 3517)
 			.saturating_add(RocksDbWeight::get().reads(4_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
@@ -171,8 +170,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `208`
 		//  Estimated: `6076`
-		// Minimum execution time: 17_387_000 picoseconds.
-		Weight::from_parts(17_667_000, 6076)
+		// Minimum execution time: 17_624_000 picoseconds.
+		Weight::from_parts(17_932_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 50524f836..401bed2a4 100644
--- a/pallets/claims/Cargo.toml
+++ b/pallets/claims/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = 'pallet-claims'
-version = '3.4.9'
+version = '3.4.10'
 description = 'HydraDX Claims Module'
 authors = ['GalacticCouncil']
 edition = '2021'
@@ -12,13 +12,13 @@ repository = 'https://github.com/galacticcouncil/hydradx-node'
 targets = ['x86_64-unknown-linux-gnu']
 
 [dependencies]
-scale-info = { version = "2.3.1", default-features = false, features = ["derive"] }
-codec = { default-features = false, features = ["derive"], package = "parity-scale-codec", version = "3.4.0" }
-serde = { version = '1.0.136', default-features = false, features = ['derive']}
-hex = {default-features = false, version = "0.4.3"}
-hex-literal = '0.3.4'
-lazy_static = {features = ['spin_no_std'], version = "1.4.0"}
-rustc-hex = {version = '2.1.0', default-features = false}
+scale-info = { workspace = true }
+codec = { workspace = true }
+serde = { workspace = true }
+hex = { workspace = true }
+hex-literal = { workspace = true }
+lazy_static = { workspace = true }
+rustc-hex = { workspace = true }
 
 # Substrate dependencies
 frame-benchmarking = { workspace = true, optional = true}
diff --git a/pallets/claims/src/mock.rs b/pallets/claims/src/mock.rs
index 6746daa7a..2bef59b39 100644
--- a/pallets/claims/src/mock.rs
+++ b/pallets/claims/src/mock.rs
@@ -69,6 +69,11 @@ impl frame_system::Config for Test {
 	type SS58Prefix = ();
 	type OnSetCode = ();
 	type MaxConsumers = frame_support::traits::ConstU32<16>;
+	type SingleBlockMigrations = ();
+	type MultiBlockMigrator = ();
+	type PreInherents = ();
+	type PostInherents = ();
+	type PostTransactions = ();
 }
 
 parameter_types! {
diff --git a/pallets/claims/src/weights.rs b/pallets/claims/src/weights.rs
index 4c0d5b79f..2c591acd6 100644
--- a/pallets/claims/src/weights.rs
+++ b/pallets/claims/src/weights.rs
@@ -15,10 +15,11 @@
 // 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: 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-09-10, 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`
@@ -27,21 +28,19 @@
 // target/release/hydradx
 // benchmark
 // pallet
-// --pallet=pallet-claims
-// --wasm-execution=compiled
-// --heap-pages=4096
 // --chain=dev
-// --extrinsic=*
-// --steps=5
+// --steps=50
 // --repeat=20
-// --output
-// ./weights-1.1.0/claims.rs
-// --template
-// .maintain/pallet-weight-template-no-back.hbs
+// --wasm-execution=compiled
+// --pallet=pallet-claims
+// --extrinsic=*
+// --template=scripts/pallet-weight-template.hbs
+// --output=./weights/pallet_claims.rs
 
+#![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
-#![allow(clippy::unnecessary_cast)]
+#![allow(missing_docs)]
 
 use frame_support::{
 	traits::Get,
@@ -66,8 +65,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `382`
 		//  Estimated: `3593`
-		// Minimum execution time: 69_254_000 picoseconds.
-		Weight::from_parts(69_849_000, 3593)
+		// Minimum execution time: 69_721_000 picoseconds.
+		Weight::from_parts(70_317_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 21f55d01f..8a9202ab1 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.8"
+version = "1.0.9"
 description = "Pallet for collator rewards"
 authors = ["GalacticCouncil"]
 edition = "2021"
@@ -14,10 +14,10 @@ targets = ["x86_64-unknown-linux-gnu"]
 substrate-wasm-builder = { workspace = true }
 
 [dependencies]
-log = { default-features = false, version = "0.4.17" }
-codec = { default-features = false, features = ["derive"], package = "parity-scale-codec", version = "3.4.0" }
-scale-info = { version = "2.1.2", default-features = false, features = ["derive"] }
-serde = { features = ["derive"], optional = true, version = "1.0.137" }
+log = { workspace = true }
+codec = { workspace = true }
+scale-info = { workspace = true }
+serde = { workspace = true, optional = true }
 
 # Substrate dependencies
 sp-std = { workspace = true }
diff --git a/pallets/collator-rewards/src/mock.rs b/pallets/collator-rewards/src/mock.rs
index 5e4a0b5cf..e1fcc1f23 100644
--- a/pallets/collator-rewards/src/mock.rs
+++ b/pallets/collator-rewards/src/mock.rs
@@ -77,6 +77,11 @@ impl system::Config for Test {
 	type SS58Prefix = ();
 	type OnSetCode = ();
 	type MaxConsumers = frame_support::traits::ConstU32<16>;
+	type SingleBlockMigrations = ();
+	type MultiBlockMigrator = ();
+	type PreInherents = ();
+	type PostInherents = ();
+	type PostTransactions = ();
 }
 
 parameter_type_with_key! {
@@ -128,7 +133,7 @@ parameter_types! {
 }
 
 thread_local! {
-	pub static SESSION_ENDED: RefCell<bool> = RefCell::new(false);
+	pub static SESSION_ENDED: RefCell<bool> = const { RefCell::new(false) };
 }
 
 pub struct MockSessionManager {}
diff --git a/pallets/currencies/Cargo.toml b/pallets/currencies/Cargo.toml
index 0421c8177..9e378d677 100644
--- a/pallets/currencies/Cargo.toml
+++ b/pallets/currencies/Cargo.toml
@@ -3,14 +3,14 @@ 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.1"
+version = "2.1.2"
 authors = ["Laminar Developers <hello@laminar.one>"]
 edition = "2021"
 
 [dependencies]
-scale-info = { version = "2.1.2", default-features = false, features = ["derive"] }
-serde = { version = "1.0.137", optional = true }
-codec = { package = "parity-scale-codec", version = "3.4.0", default-features = false }
+scale-info = { workspace = true }
+serde = { workspace = true, optional = true }
+codec = { workspace = true }
 
 sp-runtime = { workspace = true }
 sp-io = { workspace = true }
diff --git a/pallets/currencies/src/mock.rs b/pallets/currencies/src/mock.rs
index 701e1d67c..ba1e4fc76 100644
--- a/pallets/currencies/src/mock.rs
+++ b/pallets/currencies/src/mock.rs
@@ -43,6 +43,11 @@ impl frame_system::Config for Runtime {
 	type SS58Prefix = ();
 	type OnSetCode = ();
 	type MaxConsumers = ConstU32<16>;
+	type SingleBlockMigrations = ();
+	type MultiBlockMigrator = ();
+	type PreInherents = ();
+	type PostInherents = ();
+	type PostTransactions = ();
 }
 
 type CurrencyId = u32;
diff --git a/pallets/currencies/src/weights.rs b/pallets/currencies/src/weights.rs
index 1a75abd99..8d3a327cd 100644
--- a/pallets/currencies/src/weights.rs
+++ b/pallets/currencies/src/weights.rs
@@ -19,34 +19,28 @@
 //! Autogenerated weights for `pallet_currencies`
 //!
 //! 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: `[]`
+//! DATE: 2024-09-10, 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`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
 
 // Executed Command:
-// ./target/release/hydradx
+// target/release/hydradx
 // benchmark
 // pallet
+// --chain=dev
+// --steps=50
+// --repeat=20
 // --wasm-execution=compiled
-// --pallet
-// *
-// --extrinsic
-// *
-// --heap-pages
-// 4096
-// --steps
-// 50
-// --repeat
-// 20
+// --pallet=pallet-currencies
+// --extrinsic=*
 // --template=scripts/pallet-weight-template.hbs
-// --output
-// weights/
+// --output=./weights/pallet_currencies.rs
 
 #![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, constants::RocksDbWeight}};
 use sp_std::marker::PhantomData;
@@ -62,6 +56,8 @@ pub trait WeightInfo {
 
 /// Default weights.
 impl WeightInfo for () {
+	/// Storage: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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)
@@ -78,21 +74,21 @@ 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:  `2649`
+		//  Measured:  `2853`
 		//  Estimated: `6156`
-		// Minimum execution time: 89_816_000 picoseconds.
-		Weight::from_parts(90_275_000, 6156)
-			.saturating_add(RocksDbWeight::get().reads(8_u64))
+		// Minimum execution time: 97_519_000 picoseconds.
+		Weight::from_parts(98_652_000, 6156)
+			.saturating_add(RocksDbWeight::get().reads(9_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:  `1642`
+		//  Measured:  `1638`
 		//  Estimated: `3593`
-		// Minimum execution time: 70_873_000 picoseconds.
-		Weight::from_parts(71_750_000, 3593)
+		// Minimum execution time: 72_480_000 picoseconds.
+		Weight::from_parts(73_383_000, 3593)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -112,10 +108,10 @@ 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:  `2213`
+		//  Measured:  `2209`
 		//  Estimated: `3593`
-		// Minimum execution time: 62_719_000 picoseconds.
-		Weight::from_parts(63_335_000, 3593)
+		// Minimum execution time: 63_540_000 picoseconds.
+		Weight::from_parts(64_326_000, 3593)
 			.saturating_add(RocksDbWeight::get().reads(7_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 	}
@@ -123,10 +119,10 @@ impl WeightInfo for () {
 	/// 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:  `1502`
+		//  Measured:  `1498`
 		//  Estimated: `3593`
-		// Minimum execution time: 38_419_000 picoseconds.
-		Weight::from_parts(39_090_000, 3593)
+		// Minimum execution time: 38_966_000 picoseconds.
+		Weight::from_parts(39_577_000, 3593)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -134,10 +130,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:  `1590`
+		//  Measured:  `1586`
 		//  Estimated: `3593`
-		// Minimum execution time: 40_366_000 picoseconds.
-		Weight::from_parts(41_238_000, 3593)
+		// Minimum execution time: 41_091_000 picoseconds.
+		Weight::from_parts(41_812_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 694279c18..03d8fe8ac 100644
--- a/pallets/dca/Cargo.toml
+++ b/pallets/dca/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = 'pallet-dca'
-version = "1.6.0"
+version = "1.6.1"
 description = 'A pallet to manage DCA scheduling'
 authors = ['GalacticCouncil']
 edition = '2021'
@@ -9,12 +9,12 @@ repository = "https://github.com/galacticcouncil/warehouse/tree/master/route-exe
 
 [dependencies]
 
-log = { version = "0.4.17", default-features = false }
-rand = { version = "0.8.4", default-features = false }
+log = { workspace = true }
+rand = { workspace = true }
 
 # parity
-scale-info = { version = "2.3.1", default-features = false, features = ["derive"] }
-codec = { default-features = false, features = ["derive"], package = "parity-scale-codec", version = "3.4.0" }
+scale-info = { workspace = true }
+codec = { workspace = true }
 
 # primitives
 sp-runtime = { workspace = true }
@@ -50,17 +50,17 @@ primitives = { path = "../../primitives", default-features = false }
 
 [dev-dependencies]
 pallet-route-executor = { workspace = true }
-smallvec = "1.9.0"
+smallvec = { workspace = true }
 pallet-balances = { workspace = true }
 pallet-currencies = { workspace = true }
-lazy_static = { features = ["spin_no_std"], version = "1.4.0", default-features = false }
+lazy_static = { workspace = true }
 sp-api = { workspace = true }
 sp-tracing = { workspace = true }
 orml-tokens = { workspace = true }
-pretty_assertions = "1.2.1"
+pretty_assertions = { workspace = true }
 test-utils = { workspace = true }
-test-case = "2.2.2"
-primitive-types = { version = "0.12.0", default-features = false }
+test-case = { workspace = true }
+primitive-types = { workspace = true }
 
 [features]
 default = ['std']
diff --git a/pallets/dca/src/tests/mock.rs b/pallets/dca/src/tests/mock.rs
index 71387cf76..0b7f8cd1d 100644
--- a/pallets/dca/src/tests/mock.rs
+++ b/pallets/dca/src/tests/mock.rs
@@ -91,22 +91,22 @@ lazy_static::lazy_static! {
 thread_local! {
 	pub static POSITIONS: RefCell<HashMap<u32, u64>> = RefCell::new(HashMap::default());
 	pub static REGISTERED_ASSETS: RefCell<HashMap<AssetId, u32>> = RefCell::new(HashMap::default());
-	pub static ASSET_WEIGHT_CAP: RefCell<Permill> = RefCell::new(Permill::from_percent(100));
-	pub static ASSET_FEE: RefCell<Permill> = RefCell::new(Permill::from_percent(0));
-	pub static PROTOCOL_FEE: RefCell<Permill> = RefCell::new(Permill::from_percent(0));
-	pub static MIN_ADDED_LIQUDIITY: RefCell<Balance> = RefCell::new(1000u128);
-	pub static MIN_TRADE_AMOUNT: RefCell<Balance> = RefCell::new(1000u128);
-	pub static MAX_IN_RATIO: RefCell<Balance> = RefCell::new(1u128);
-	pub static MAX_OUT_RATIO: RefCell<Balance> = RefCell::new(1u128);
+	pub static ASSET_WEIGHT_CAP: RefCell<Permill> = const { RefCell::new(Permill::from_percent(100)) };
+	pub static ASSET_FEE: RefCell<Permill> = const { RefCell::new(Permill::from_percent(0)) };
+	pub static PROTOCOL_FEE: RefCell<Permill> = const { RefCell::new(Permill::from_percent(0)) };
+	pub static MIN_ADDED_LIQUDIITY: RefCell<Balance> = const { RefCell::new(1000u128) };
+	pub static MIN_TRADE_AMOUNT: RefCell<Balance> = const { RefCell::new(1000u128) };
+	pub static MAX_IN_RATIO: RefCell<Balance> = const { RefCell::new(1u128) };
+	pub static MAX_OUT_RATIO: RefCell<Balance> = const { RefCell::new(1u128) };
 	pub static FEE_ASSET: RefCell<Vec<(u64,AssetId)>> = RefCell::new(vec![(ALICE,HDX)]);
 	pub static MIN_BUDGET: RefCell<Balance> = RefCell::new(*ORIGINAL_MIN_BUDGET_IN_NATIVE);
-	pub static BUY_EXECUTIONS: RefCell<Vec<BuyExecution>> = RefCell::new(vec![]);
-	pub static SELL_EXECUTIONS: RefCell<Vec<SellExecution>> = RefCell::new(vec![]);
-	pub static SET_OMNIPOOL_ON: RefCell<bool> = RefCell::new(true);
+	pub static BUY_EXECUTIONS: RefCell<Vec<BuyExecution>> = const { RefCell::new(vec![]) };
+	pub static SELL_EXECUTIONS: RefCell<Vec<SellExecution>> = const { RefCell::new(vec![]) };
+	pub static SET_OMNIPOOL_ON: RefCell<bool> = const { RefCell::new(true) };
 	pub static MAX_PRICE_DIFFERENCE: RefCell<Permill> = RefCell::new(*ORIGINAL_MAX_PRICE_DIFFERENCE);
-	pub static WITHDRAWAL_ADJUSTMENT: RefCell<(u32,u32, bool)> = RefCell::new((0u32,0u32, false));
+	pub static WITHDRAWAL_ADJUSTMENT: RefCell<(u32,u32, bool)> = const { RefCell::new((0u32,0u32, false)) };
 	pub static CALCULATED_AMOUNT_OUT_FOR_SELL: RefCell<Balance> = RefCell::new(*AMOUNT_OUT_FOR_OMNIPOOL_SELL);
-	pub static USE_PROD_RANDOMNESS: RefCell<bool> = RefCell::new(false);
+	pub static USE_PROD_RANDOMNESS: RefCell<bool> = const { RefCell::new(false) };
 	pub static PARENT_HASH: RefCell<Option<Hash>> = RefCell::new(Some([
 			14, 87, 81, 192, 38, 229, 67, 178, 232, 171, 46, 176, 96, 153, 218, 161, 209, 229, 223, 71, 119, 143, 119,
 			135, 250, 171, 69, 205, 241, 47, 227, 168,
@@ -190,6 +190,11 @@ impl system::Config for Test {
 	type SS58Prefix = SS58Prefix;
 	type OnSetCode = ();
 	type MaxConsumers = frame_support::traits::ConstU32<16>;
+	type SingleBlockMigrations = ();
+	type MultiBlockMigrator = ();
+	type PreInherents = ();
+	type PostInherents = ();
+	type PostTransactions = ();
 }
 
 pub type Amount = i128;
diff --git a/pallets/dca/src/weights.rs b/pallets/dca/src/weights.rs
index cae6ae6bd..4054e050b 100644
--- a/pallets/dca/src/weights.rs
+++ b/pallets/dca/src/weights.rs
@@ -15,6 +15,7 @@
 // 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 32.0.0
@@ -28,18 +29,18 @@
 // benchmark
 // pallet
 // --chain=dev
-// --steps=10
-// --repeat=30
+// --steps=50
+// --repeat=20
 // --wasm-execution=compiled
-// --heap-pages=4096
-// --template=scripts/pallet-weight-template.hbs
 // --pallet=pallet-dca
-// --output=weights/dca.rs
 // --extrinsic=*
+// --template=scripts/pallet-weight-template.hbs
+// --output=./weights/pallet_dca.rs
 
+#![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
-#![allow(clippy::unnecessary_cast)]
+#![allow(missing_docs)]
 
 use frame_support::{
 	traits::Get,
diff --git a/pallets/democracy/Cargo.toml b/pallets/democracy/Cargo.toml
index ac15114d4..aeccbab9a 100644
--- a/pallets/democracy/Cargo.toml
+++ b/pallets/democracy/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-democracy"
-version = "4.3.1"
+version = "4.3.2"
 authors = ["Parity Technologies <admin@parity.io>"]
 edition = "2021"
 license = "Apache-2.0"
@@ -13,11 +13,9 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = [
-    "derive",
-] }
-scale-info = { version = "2.5.0", default-features = false, features = ["derive"] }
-serde = { version = "1.0.188", features = ["derive"], optional = true }
+codec = { workspace = true }
+scale-info = { workspace = true }
+serde = { workspace = true, optional = true }
 log = { workspace = true }
 
 frame-benchmarking = { workspace = true, optional = true }
diff --git a/pallets/democracy/src/tests.rs b/pallets/democracy/src/tests.rs
index 8da5228be..e2097218b 100644
--- a/pallets/democracy/src/tests.rs
+++ b/pallets/democracy/src/tests.rs
@@ -118,6 +118,11 @@ impl frame_system::Config for Test {
 	type SS58Prefix = ();
 	type OnSetCode = ();
 	type MaxConsumers = frame_support::traits::ConstU32<16>;
+	type SingleBlockMigrations = ();
+	type MultiBlockMigrator = ();
+	type PreInherents = ();
+	type PostInherents = ();
+	type PostTransactions = ();
 }
 parameter_types! {
 	pub MaximumSchedulerWeight: Weight = Perbill::from_percent(80) * BlockWeights::get().max_block;
@@ -337,8 +342,8 @@ pub struct OnRemoveVoteData {
 }
 
 thread_local! {
-	static ON_VOTE_DATA: RefCell<Vec<OnVoteData>> = RefCell::new(vec![]);
-	static ON_REMOVE_VOTE_DATA: RefCell<Vec<OnRemoveVoteData>> = RefCell::new(vec![]);
+	static ON_VOTE_DATA: RefCell<Vec<OnVoteData>> = const { RefCell::new(vec![]) };
+	static ON_REMOVE_VOTE_DATA: RefCell<Vec<OnRemoveVoteData>> = const { RefCell::new(vec![]) };
 	pub static REMOVE_VOTE_LOCKED_AMOUNT: RefCell<HashMap<u64, u64>> = RefCell::new(HashMap::default());
 }
 
diff --git a/pallets/democracy/src/weights.rs b/pallets/democracy/src/weights.rs
index 076e0aac6..78dc920c2 100644
--- a/pallets/democracy/src/weights.rs
+++ b/pallets/democracy/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
@@ -24,7 +19,7 @@
 //! Autogenerated weights for `pallet_democracy`
 //!
 //! 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: `[]`
+//! DATE: 2024-09-10, 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`
@@ -34,14 +29,13 @@
 // benchmark
 // pallet
 // --chain=dev
-// --steps=10
-// --repeat=30
+// --steps=50
+// --repeat=20
 // --wasm-execution=compiled
-// --heap-pages=4096
-// --template=scripts/pallet-weight-template.hbs
 // --pallet=pallet-democracy
-// --output=weights/democracy.rs
 // --extrinsic=*
+// --template=scripts/pallet-weight-template.hbs
+// --output=./weights/pallet_democracy.rs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -97,8 +91,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `4688`
 		//  Estimated: `18187`
-		// Minimum execution time: 41_701_000 picoseconds.
-		Weight::from_parts(42_235_000, 18187)
+		// Minimum execution time: 41_084_000 picoseconds.
+		Weight::from_parts(41_857_000, 18187)
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 	}
@@ -108,8 +102,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `3443`
 		//  Estimated: `6695`
-		// Minimum execution time: 39_489_000 picoseconds.
-		Weight::from_parts(40_100_000, 6695)
+		// Minimum execution time: 39_522_000 picoseconds.
+		Weight::from_parts(39_987_000, 6695)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -131,8 +125,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `15343`
 		//  Estimated: `268590`
-		// Minimum execution time: 415_574_000 picoseconds.
-		Weight::from_parts(419_090_000, 268590)
+		// Minimum execution time: 414_586_000 picoseconds.
+		Weight::from_parts(418_431_000, 268590)
 			.saturating_add(RocksDbWeight::get().reads(107_u64))
 			.saturating_add(RocksDbWeight::get().writes(5_u64))
 	}
@@ -154,8 +148,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `15365`
 		//  Estimated: `268590`
-		// Minimum execution time: 415_249_000 picoseconds.
-		Weight::from_parts(422_003_000, 268590)
+		// Minimum execution time: 411_716_000 picoseconds.
+		Weight::from_parts(416_992_000, 268590)
 			.saturating_add(RocksDbWeight::get().reads(107_u64))
 			.saturating_add(RocksDbWeight::get().writes(5_u64))
 	}
@@ -169,8 +163,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `249`
 		//  Estimated: `3666`
-		// Minimum execution time: 27_483_000 picoseconds.
-		Weight::from_parts(28_007_000, 3666)
+		// Minimum execution time: 27_470_000 picoseconds.
+		Weight::from_parts(27_800_000, 3666)
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 	}
@@ -192,8 +186,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `6191`
 		//  Estimated: `18187`
-		// Minimum execution time: 107_718_000 picoseconds.
-		Weight::from_parts(108_453_000, 18187)
+		// Minimum execution time: 107_349_000 picoseconds.
+		Weight::from_parts(108_424_000, 18187)
 			.saturating_add(RocksDbWeight::get().reads(9_u64))
 			.saturating_add(RocksDbWeight::get().writes(8_u64))
 	}
@@ -205,8 +199,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `3276`
 		//  Estimated: `6703`
-		// Minimum execution time: 13_141_000 picoseconds.
-		Weight::from_parts(13_507_000, 6703)
+		// Minimum execution time: 12_816_000 picoseconds.
+		Weight::from_parts(13_191_000, 6703)
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -216,8 +210,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 3_720_000 picoseconds.
-		Weight::from_parts(3_904_000, 0)
+		// Minimum execution time: 3_578_000 picoseconds.
+		Weight::from_parts(3_741_000, 0)
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
 	/// Storage: `Democracy::NextExternal` (r:0 w:1)
@@ -226,8 +220,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 3_862_000 picoseconds.
-		Weight::from_parts(4_053_000, 0)
+		// Minimum execution time: 3_603_000 picoseconds.
+		Weight::from_parts(3_844_000, 0)
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
 	/// Storage: `Democracy::NextExternal` (r:1 w:1)
@@ -242,8 +236,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `147`
 		//  Estimated: `3518`
-		// Minimum execution time: 25_432_000 picoseconds.
-		Weight::from_parts(25_892_000, 3518)
+		// Minimum execution time: 24_981_000 picoseconds.
+		Weight::from_parts(25_400_000, 3518)
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
 			.saturating_add(RocksDbWeight::get().writes(5_u64))
 	}
@@ -257,8 +251,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `3377`
 		//  Estimated: `6703`
-		// Minimum execution time: 28_422_000 picoseconds.
-		Weight::from_parts(28_931_000, 6703)
+		// Minimum execution time: 27_959_000 picoseconds.
+		Weight::from_parts(28_449_000, 6703)
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 	}
@@ -274,8 +268,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `6076`
 		//  Estimated: `18187`
-		// Minimum execution time: 87_703_000 picoseconds.
-		Weight::from_parts(88_416_000, 18187)
+		// Minimum execution time: 86_974_000 picoseconds.
+		Weight::from_parts(87_631_000, 18187)
 			.saturating_add(RocksDbWeight::get().reads(5_u64))
 			.saturating_add(RocksDbWeight::get().writes(5_u64))
 	}
@@ -287,8 +281,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `181`
 		//  Estimated: `3518`
-		// Minimum execution time: 20_107_000 picoseconds.
-		Weight::from_parts(20_377_000, 3518)
+		// Minimum execution time: 19_499_000 picoseconds.
+		Weight::from_parts(20_085_000, 3518)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
@@ -301,12 +295,12 @@ impl WeightInfo for () {
 	/// The range of component `r` is `[0, 99]`.
 	fn on_initialize_base(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `125 + r * (86 ±0)`
+		//  Measured:  `127 + r * (86 ±0)`
 		//  Estimated: `1489 + r * (2676 ±0)`
-		// 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()))
+		// Minimum execution time: 3_686_000 picoseconds.
+		Weight::from_parts(8_346_337, 1489)
+			// Standard Error: 6_381
+			.saturating_add(Weight::from_parts(3_255_704, 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))
@@ -327,12 +321,12 @@ impl WeightInfo for () {
 	/// The range of component `r` is `[0, 99]`.
 	fn on_initialize_base_with_launch_period(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `125 + r * (86 ±0)`
+		//  Measured:  `127 + r * (86 ±0)`
 		//  Estimated: `18187 + r * (2676 ±0)`
-		// 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()))
+		// Minimum execution time: 6_309_000 picoseconds.
+		Weight::from_parts(11_146_769, 18187)
+			// Standard Error: 6_126
+			.saturating_add(Weight::from_parts(3_263_109, 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))
@@ -351,10 +345,10 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `677 + r * (108 ±0)`
 		//  Estimated: `19800 + r * (2676 ±0)`
-		// 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()))
+		// Minimum execution time: 43_508_000 picoseconds.
+		Weight::from_parts(49_166_300, 19800)
+			// Standard Error: 5_582
+			.saturating_add(Weight::from_parts(4_141_052, 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))
@@ -368,12 +362,12 @@ impl WeightInfo for () {
 	/// The range of component `r` is `[0, 99]`.
 	fn undelegate(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `373 + r * (108 ±0)`
+		//  Measured:  `374 + r * (108 ±0)`
 		//  Estimated: `13530 + r * (2676 ±0)`
-		// 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()))
+		// Minimum execution time: 20_176_000 picoseconds.
+		Weight::from_parts(22_120_019, 13530)
+			// Standard Error: 5_423
+			.saturating_add(Weight::from_parts(4_137_529, 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))
@@ -386,8 +380,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 4_235_000 picoseconds.
-		Weight::from_parts(4_396_000, 0)
+		// Minimum execution time: 3_913_000 picoseconds.
+		Weight::from_parts(4_061_000, 0)
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
 	/// Storage: `Democracy::VotingOf` (r:1 w:1)
@@ -403,10 +397,10 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `432`
 		//  Estimated: `7260`
-		// 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()))
+		// Minimum execution time: 26_037_000 picoseconds.
+		Weight::from_parts(37_595_177, 7260)
+			// Standard Error: 2_601
+			.saturating_add(Weight::from_parts(37_640, 0).saturating_mul(r.into()))
 			.saturating_add(RocksDbWeight::get().reads(4_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 	}
@@ -421,12 +415,12 @@ impl WeightInfo for () {
 	/// The range of component `r` is `[0, 99]`.
 	fn unlock_set(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `432 + r * (22 ±0)`
+		//  Measured:  `433 + r * (22 ±0)`
 		//  Estimated: `7260`
-		// 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()))
+		// Minimum execution time: 35_921_000 picoseconds.
+		Weight::from_parts(37_458_366, 7260)
+			// Standard Error: 704
+			.saturating_add(Weight::from_parts(62_000, 0).saturating_mul(r.into()))
 			.saturating_add(RocksDbWeight::get().reads(4_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 	}
@@ -445,12 +439,12 @@ impl WeightInfo for () {
 	/// The range of component `r` is `[1, 100]`.
 	fn remove_vote(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1503 + r * (46 ±0)`
+		//  Measured:  `1468 + r * (47 ±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()))
+		// Minimum execution time: 47_278_000 picoseconds.
+		Weight::from_parts(50_625_485, 7260)
+			// Standard Error: 2_207
+			.saturating_add(Weight::from_parts(154_973, 0).saturating_mul(r.into()))
 			.saturating_add(RocksDbWeight::get().reads(7_u64))
 			.saturating_add(RocksDbWeight::get().writes(4_u64))
 	}
@@ -469,12 +463,12 @@ impl WeightInfo for () {
 	/// The range of component `r` is `[1, 100]`.
 	fn remove_other_vote(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1503 + r * (46 ±0)`
+		//  Measured:  `1468 + r * (47 ±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()))
+		// Minimum execution time: 48_145_000 picoseconds.
+		Weight::from_parts(51_215_485, 7260)
+			// Standard Error: 2_118
+			.saturating_add(Weight::from_parts(144_598, 0).saturating_mul(r.into()))
 			.saturating_add(RocksDbWeight::get().reads(7_u64))
 			.saturating_add(RocksDbWeight::get().writes(4_u64))
 	}
@@ -483,15 +477,15 @@ impl WeightInfo for () {
 	/// 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`)
+	/// Proof: `Preimage::RequestStatusFor` (`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: 20_454_000 picoseconds.
-		Weight::from_parts(20_805_000, 3556)
+		// Minimum execution time: 19_975_000 picoseconds.
+		Weight::from_parts(20_324_000, 3556)
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -503,8 +497,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `147`
 		//  Estimated: `3518`
-		// Minimum execution time: 16_223_000 picoseconds.
-		Weight::from_parts(16_478_000, 3518)
+		// Minimum execution time: 15_820_000 picoseconds.
+		Weight::from_parts(16_301_000, 3518)
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -513,15 +507,15 @@ impl WeightInfo for () {
 	/// 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`)
+	/// Proof: `Preimage::RequestStatusFor` (`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: 42_358_000 picoseconds.
-		Weight::from_parts(42_867_000, 18187)
+		// Minimum execution time: 42_054_000 picoseconds.
+		Weight::from_parts(42_492_000, 18187)
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -533,23 +527,23 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `4706`
 		//  Estimated: `18187`
-		// Minimum execution time: 37_064_000 picoseconds.
-		Weight::from_parts(37_477_000, 18187)
+		// Minimum execution time: 36_480_000 picoseconds.
+		Weight::from_parts(36_908_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`)
+	/// Proof: `Preimage::RequestStatusFor` (`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: 18_290_000 picoseconds.
-		Weight::from_parts(18_660_000, 3556)
+		// Minimum execution time: 18_019_000 picoseconds.
+		Weight::from_parts(18_332_000, 3556)
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -561,8 +555,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `159`
 		//  Estimated: `3666`
-		// Minimum execution time: 18_955_000 picoseconds.
-		Weight::from_parts(19_323_000, 3666)
+		// Minimum execution time: 18_356_000 picoseconds.
+		Weight::from_parts(18_625_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 073910cd1..7ac005264 100644
--- a/pallets/duster/Cargo.toml
+++ b/pallets/duster/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-duster"
-version = "3.2.5"
+version = "3.2.6"
 description = "Account duster"
 authors = ["GalacticCouncil"]
 edition = "2021"
@@ -15,9 +15,9 @@ targets = ["x86_64-unknown-linux-gnu"]
 substrate-wasm-builder = { workspace = true }
 
 [dependencies]
-codec = { default-features = false, features = ["derive"], package = "parity-scale-codec", version = "3.4.0" }
-scale-info = { version = "2.1.1", default-features = false, features = ["derive"] }
-serde = { features = ["derive"], optional = true, version = "1.0.136" }
+codec = { workspace = true }
+scale-info = { workspace = true }
+serde = { workspace = true, optional = true }
 log = { workspace = true }
 
 hydradx-traits = { workspace = true }
@@ -35,7 +35,7 @@ frame-system = { workspace = true }
 frame-benchmarking = { workspace = true, optional = true }
 
 [dev-dependencies]
-lazy_static = { features = ["spin_no_std"], version = "1.4.0" }
+lazy_static = { workspace = true }
 sp-io = { workspace = true }
 sp-core = { workspace = true }
 pallet-balances = { workspace = true }
diff --git a/pallets/duster/src/lib.rs b/pallets/duster/src/lib.rs
index a832fb09c..0dc129d35 100644
--- a/pallets/duster/src/lib.rs
+++ b/pallets/duster/src/lib.rs
@@ -126,6 +126,10 @@ pub mod pallet {
 		/// The origin which can manage whiltelist.
 		type BlacklistUpdateOrigin: EnsureOrigin<Self::RuntimeOrigin>;
 
+		/// Default account for `reward_account` and `dust_account` in genesis config.
+		#[pallet::constant]
+		type TreasuryAccountId: Get<Self::AccountId>;
+
 		/// Weight information for extrinsics in this module.
 		type WeightInfo: WeightInfo;
 	}
@@ -145,26 +149,8 @@ pub mod pallet {
 				AccountBlacklist::<T>::insert(account_id, ());
 			});
 
-			if self.reward_account.is_none() {
-				panic!("Reward account is not set in genesis config");
-			}
-
-			if self.dust_account.is_none() {
-				panic!("Dust account is not set in genesis config");
-			}
-
-			RewardAccount::<T>::put(
-				&self
-					.reward_account
-					.clone()
-					.expect("Reward account is not set in genesis config"),
-			);
-			DustAccount::<T>::put(
-				&self
-					.dust_account
-					.clone()
-					.expect("Dust account is not set in genesis config"),
-			);
+			RewardAccount::<T>::put(&self.reward_account.clone().unwrap_or_else(T::TreasuryAccountId::get));
+			DustAccount::<T>::put(&self.dust_account.clone().unwrap_or_else(T::TreasuryAccountId::get));
 		}
 	}
 
diff --git a/pallets/duster/src/mock.rs b/pallets/duster/src/mock.rs
index 42d5638a7..1e4a3229b 100644
--- a/pallets/duster/src/mock.rs
+++ b/pallets/duster/src/mock.rs
@@ -65,7 +65,7 @@ parameter_types! {
 }
 
 thread_local! {
-	pub static KILLED: RefCell<Vec<u64>> = RefCell::new(vec![]);
+	pub static KILLED: RefCell<Vec<u64>> = const { RefCell::new(vec![]) };
 }
 
 pub struct RecordKilled;
@@ -100,6 +100,11 @@ impl system::Config for Test {
 	type SS58Prefix = SS58Prefix;
 	type OnSetCode = ();
 	type MaxConsumers = frame_support::traits::ConstU32<16>;
+	type SingleBlockMigrations = ();
+	type MultiBlockMigrator = ();
+	type PreInherents = ();
+	type PostInherents = ();
+	type PostTransactions = ();
 }
 
 parameter_type_with_key! {
@@ -128,6 +133,7 @@ impl Config for Test {
 	type Reward = Reward;
 	type NativeCurrencyId = NativeCurrencyId;
 	type BlacklistUpdateOrigin = EnsureRoot<AccountId>;
+	type TreasuryAccountId = TreasuryAccount;
 	type WeightInfo = ();
 }
 
diff --git a/pallets/duster/src/weights.rs b/pallets/duster/src/weights.rs
index 16f46958a..ddb9ae540 100644
--- a/pallets/duster/src/weights.rs
+++ b/pallets/duster/src/weights.rs
@@ -15,36 +15,32 @@
 // 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 32.0.0
-//! DATE: 2024-05-23, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-09-10, 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`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
 
 // Executed Command:
-// ./target/release/hydradx
+// target/release/hydradx
 // benchmark
 // pallet
+// --chain=dev
+// --steps=50
+// --repeat=20
 // --wasm-execution=compiled
-// --pallet
-// *
-// --extrinsic
-// *
-// --heap-pages
-// 4096
-// --steps
-// 50
-// --repeat
-// 20
+// --pallet=pallet-duster
+// --extrinsic=*
 // --template=scripts/pallet-weight-template.hbs
-// --output
-// weights/
+// --output=./weights/pallet_duster.rs
 
+#![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
-#![allow(clippy::unnecessary_cast)]
+#![allow(missing_docs)]
 
 use frame_support::{
 	traits::Get,
@@ -69,6 +65,8 @@ impl WeightInfo for () {
 	/// 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: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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)
@@ -79,30 +77,31 @@ 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:  `2690`
+		//  Measured:  `2894`
 		//  Estimated: `6156`
-		// Minimum execution time: 84_500_000 picoseconds.
-		Weight::from_parts(85_254_000, 6156)
-			.saturating_add(RocksDbWeight::get().reads(8_u64))
+		// Minimum execution time: 88_728_000 picoseconds.
+		Weight::from_parts(89_220_000, 6156)
+			.saturating_add(RocksDbWeight::get().reads(9_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:  `1016`
+		//  Measured:  `1012`
 		//  Estimated: `0`
-		// Minimum execution time: 16_109_000 picoseconds.
-		Weight::from_parts(16_551_000, 0).saturating_add(RocksDbWeight::get().writes(1_u64))
+		// Minimum execution time: 16_562_000 picoseconds.
+		Weight::from_parts(16_851_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:  `1370`
+		//  Measured:  `1366`
 		//  Estimated: `3513`
-		// Minimum execution time: 20_814_000 picoseconds.
-		Weight::from_parts(21_277_000, 3513)
+		// Minimum execution time: 21_816_000 picoseconds.
+		Weight::from_parts(22_528_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 7ee724aa4..810ccb0bb 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.2"
+version = "1.0.3"
 description = "Storing and mutating the dynamic fee for EVM transactions."
 authors = ["GalacticCoucil"]
 edition = "2021"
@@ -11,8 +11,8 @@ repository = "https://github.com/galacticcouncil/warehouse"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { default-features = false, features = ["derive"], package = "parity-scale-codec", version = "3.4.0" }
-scale-info = { version = "2.1.2", default-features = false, features = ["derive"] }
+codec = { workspace = true }
+scale-info = { workspace = true }
 log = { workspace = true }
 
 # ORML dependencies
diff --git a/pallets/dynamic-evm-fee/src/tests/mock.rs b/pallets/dynamic-evm-fee/src/tests/mock.rs
index a69655003..1d21306b4 100644
--- a/pallets/dynamic-evm-fee/src/tests/mock.rs
+++ b/pallets/dynamic-evm-fee/src/tests/mock.rs
@@ -59,9 +59,9 @@ pub const HIGH_ED: Balance = 5;
 pub const DEFAULT_ETH_HDX_ORACLE_PRICE: Ratio = Ratio::new(8945857934143137845, FixedU128::DIV);
 
 thread_local! {
-	static EXTRINSIC_BASE_WEIGHT: RefCell<Weight> = RefCell::new(Weight::zero());
-	static MULTIPLIER: RefCell<Multiplier> = RefCell::new(Multiplier::from_rational(1,1000));
-	static ETH_HDX_ORACLE_PRICE: RefCell<Ratio> = RefCell::new(DEFAULT_ETH_HDX_ORACLE_PRICE);
+	static EXTRINSIC_BASE_WEIGHT: RefCell<Weight> = const { RefCell::new(Weight::zero()) };
+	static MULTIPLIER: RefCell<Multiplier> = const { RefCell::new(Multiplier::from_rational(1,1000)) };
+	static ETH_HDX_ORACLE_PRICE: RefCell<Ratio> = const { RefCell::new(DEFAULT_ETH_HDX_ORACLE_PRICE) };
 }
 
 type Block = frame_system::mocking::MockBlock<Test>;
@@ -118,6 +118,11 @@ impl system::Config for Test {
 	type SS58Prefix = SS58Prefix;
 	type OnSetCode = ();
 	type MaxConsumers = frame_support::traits::ConstU32<16>;
+	type SingleBlockMigrations = ();
+	type MultiBlockMigrator = ();
+	type PreInherents = ();
+	type PostInherents = ();
+	type PostTransactions = ();
 }
 
 pub struct MultiplierProviderMock;
diff --git a/pallets/dynamic-evm-fee/src/weights.rs b/pallets/dynamic-evm-fee/src/weights.rs
index b8fbb32bc..effbcf77b 100644
--- a/pallets/dynamic-evm-fee/src/weights.rs
+++ b/pallets/dynamic-evm-fee/src/weights.rs
@@ -19,29 +19,23 @@
 //! 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: `[]`
+//! DATE: 2024-09-10, 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`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
 
 // Executed Command:
-// ./target/release/hydradx
+// target/release/hydradx
 // benchmark
 // pallet
+// --chain=dev
+// --steps=50
+// --repeat=20
 // --wasm-execution=compiled
-// --pallet
-// *
-// --extrinsic
-// *
-// --heap-pages
-// 4096
-// --steps
-// 50
-// --repeat
-// 20
+// --pallet=pallet-dynamic-evm-fee
+// --extrinsic=*
 // --template=scripts/pallet-weight-template.hbs
-// --output
-// weights/
+// --output=./weights/pallet_dynamic_evm_fee.rs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -74,10 +68,10 @@ impl WeightInfo for () {
 	/// 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`
+		//  Measured:  `2742`
 		//  Estimated: `11598`
-		// Minimum execution time: 66_128_000 picoseconds.
-		Weight::from_parts(66_561_000, 11598)
+		// Minimum execution time: 66_789_000 picoseconds.
+		Weight::from_parts(67_440_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 d82bf47fb..d166223b8 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.4'
+version = '1.0.5'
 description = 'A pallet to provide support for dynamic fees'
 authors = ['GalacticCouncil']
 edition = '2021'
@@ -8,9 +8,9 @@ license = 'Apache 2.0'
 repository = "https://github.com/galacticcouncil/warehouse"
 
 [dependencies]
-codec = { default-features = false, features = ["derive"], package = "parity-scale-codec", version = "3.4.0" }
-scale-info = { version = "2.1.2", default-features = false, features = ["derive"] }
-serde = { features = ["derive"], optional = true, version = "1.0.137" }
+codec = { workspace = true }
+scale-info = {workspace = true }
+serde = { workspace = true, optional = true }
 
 # HydraDX dependencies
 hydra-dx-math = { workspace = true }
@@ -28,7 +28,7 @@ sp-runtime = { workspace = true }
 
 [dev-dependencies]
 sp-io = { workspace = true }
-proptest = "1.0.0"
+proptest = { workspace = true }
 
 [features]
 default = ['std']
diff --git a/pallets/dynamic-fees/src/tests/mock.rs b/pallets/dynamic-fees/src/tests/mock.rs
index ee1a57ef5..e76943f83 100644
--- a/pallets/dynamic-fees/src/tests/mock.rs
+++ b/pallets/dynamic-fees/src/tests/mock.rs
@@ -48,7 +48,7 @@ pub(crate) type Fee = Perquintill;
 
 thread_local! {
 	pub static ORACLE: RefCell<Box<dyn CustomOracle>> = RefCell::new(Box::new(Oracle::new()));
-	pub static BLOCK: RefCell<usize> = RefCell::new(0);
+	pub static BLOCK: RefCell<usize> = const { RefCell::new(0) };
 	pub static ASSET_FEE_PARAMS: RefCell<FeeParams<Fee>> = RefCell::new(fee_params_default());
 	pub static PROTOCOL_FEE_PARAMS: RefCell<FeeParams<Fee>> = RefCell::new(fee_params_default());
 }
@@ -95,6 +95,11 @@ impl frame_system::Config for Test {
 	type SS58Prefix = ();
 	type OnSetCode = ();
 	type MaxConsumers = ConstU32<16>;
+	type SingleBlockMigrations = ();
+	type MultiBlockMigrator = ();
+	type PreInherents = ();
+	type PostInherents = ();
+	type PostTransactions = ();
 }
 
 parameter_types! {
diff --git a/pallets/ema-oracle/Cargo.toml b/pallets/ema-oracle/Cargo.toml
index 4427b7748..30b09b716 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.2'
+version = '1.3.3'
 description = 'Exponential moving average oracle for AMM pools'
 authors = ['GalacticCouncil']
 edition = '2021'
@@ -11,9 +11,9 @@ repository = 'https://github.com/galacticcouncil/warehouse'
 targets = ['x86_64-unknown-linux-gnu']
 
 [dependencies]
-serde = {features = ['derive'], optional = true, version = '1.0.136'}
-scale-info = { version = "2.1.2", default-features = false, features = ["derive"] }
-codec = { package = 'parity-scale-codec', version = '3.4.0', default-features = false, features = ['derive', "max-encoded-len"] }
+serde = { workspace = true, optional = true }
+scale-info = {workspace = true }
+codec = { workspace = true, features = ['derive', "max-encoded-len"] }
 
 # HydraDX dependencies
 hydradx-traits = { workspace = true }
@@ -28,12 +28,12 @@ sp-core = { workspace = true }
 sp-std = { workspace = true }
 sp-runtime = { workspace = true }
 
-log = { version = "0.4.14", default-features = false }
+log = { workspace = true }
 
 [dev-dependencies]
-pretty_assertions = "1.3.0"
-proptest = "1.0.0"
-rug = { version = "1.17.0", features = ["num-traits"] }
+pretty_assertions = { workspace = true }
+proptest = { workspace = true }
+rug = { workspace = true }
 sp-io = { workspace = true }
 test-utils = { workspace = true }
 
diff --git a/pallets/ema-oracle/src/tests/mock.rs b/pallets/ema-oracle/src/tests/mock.rs
index 1a8af6712..0f08d1cf9 100644
--- a/pallets/ema-oracle/src/tests/mock.rs
+++ b/pallets/ema-oracle/src/tests/mock.rs
@@ -108,6 +108,11 @@ impl frame_system::Config for Test {
 	type SS58Prefix = ();
 	type OnSetCode = ();
 	type MaxConsumers = ConstU32<16>;
+	type SingleBlockMigrations = ();
+	type MultiBlockMigrator = ();
+	type PreInherents = ();
+	type PostInherents = ();
+	type PostTransactions = ();
 }
 
 pub struct AssetPairAccountIdTest();
diff --git a/pallets/ema-oracle/src/weights.rs b/pallets/ema-oracle/src/weights.rs
index 1d3872a85..453c4b0a1 100644
--- a/pallets/ema-oracle/src/weights.rs
+++ b/pallets/ema-oracle/src/weights.rs
@@ -15,36 +15,32 @@
 // 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 32.0.0
-//! DATE: 2024-05-23, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-09-10, 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`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
 
 // Executed Command:
-// ./target/release/hydradx
+// target/release/hydradx
 // benchmark
 // pallet
+// --chain=dev
+// --steps=50
+// --repeat=20
 // --wasm-execution=compiled
-// --pallet
-// *
-// --extrinsic
-// *
-// --heap-pages
-// 4096
-// --steps
-// 50
-// --repeat
-// 20
+// --pallet=pallet-ema-oracle
+// --extrinsic=*
 // --template=scripts/pallet-weight-template.hbs
-// --output
-// weights*
+// --output=./weights/pallet_ema_oracle.rs
 
+#![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
-#![allow(clippy::unnecessary_cast)]
+#![allow(missing_docs)]
 
 use frame_support::{
 	traits::Get,
@@ -71,8 +67,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `860`
 		//  Estimated: `2126`
-		// Minimum execution time: 15_633_000 picoseconds.
-		Weight::from_parts(15_827_000, 2126)
+		// Minimum execution time: 15_358_000 picoseconds.
+		Weight::from_parts(15_612_000, 2126)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -86,8 +82,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `876`
 		//  Estimated: `7406`
-		// Minimum execution time: 31_307_000 picoseconds.
-		Weight::from_parts(31_799_000, 7406)
+		// Minimum execution time: 32_501_000 picoseconds.
+		Weight::from_parts(32_728_000, 7406)
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(5_u64))
 	}
@@ -97,22 +93,23 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `208`
 		//  Estimated: `7406`
-		// Minimum execution time: 2_253_000 picoseconds.
-		Weight::from_parts(2_365_000, 7406).saturating_add(RocksDbWeight::get().reads(1_u64))
+		// Minimum execution time: 2_187_000 picoseconds.
+		Weight::from_parts(2_267_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`)
 	/// 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 {
+	fn on_finalize_multiple_tokens(b: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `305 + b * (626 ±0)`
 		//  Estimated: `7406 + b * (7956 ±0)`
-		// 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()))
+		// Minimum execution time: 45_323_000 picoseconds.
+		Weight::from_parts(10_030_058, 7406)
+			// Standard Error: 15_380
+			.saturating_add(Weight::from_parts(35_004_114, 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_u64))
@@ -124,14 +121,14 @@ impl WeightInfo for () {
 	/// 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 {
+	fn on_trade_multiple_tokens(b: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `821 + b * (164 ±0)`
 		//  Estimated: `7406`
-		// 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()))
+		// Minimum execution time: 16_045_000 picoseconds.
+		Weight::from_parts(16_698_666, 7406)
+			// Standard Error: 2_712
+			.saturating_add(Weight::from_parts(482_996, 0).saturating_mul(b.into()))
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -140,14 +137,14 @@ impl WeightInfo for () {
 	/// 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 {
+	fn on_liquidity_changed_multiple_tokens(b: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `821 + b * (164 ±0)`
 		//  Estimated: `7406`
-		// 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()))
+		// Minimum execution time: 16_293_000 picoseconds.
+		Weight::from_parts(16_839_547, 7406)
+			// Standard Error: 2_626
+			.saturating_add(Weight::from_parts(478_879, 0).saturating_mul(b.into()))
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -157,7 +154,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `638`
 		//  Estimated: `6294`
-		// Minimum execution time: 17_768_000 picoseconds.
-		Weight::from_parts(18_090_000, 6294).saturating_add(RocksDbWeight::get().reads(2_u64))
+		// Minimum execution time: 17_336_000 picoseconds.
+		Weight::from_parts(17_680_000, 6294)
+			.saturating_add(RocksDbWeight::get().reads(2_u64))
 	}
 }
diff --git a/pallets/evm-accounts/Cargo.toml b/pallets/evm-accounts/Cargo.toml
index 5fc8abfbe..463cf124b 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.2"
+version = "1.1.3"
 authors = ['GalacticCouncil']
 edition = "2021"
 license = "Apache-2.0"
@@ -13,10 +13,10 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
+scale-info = { workspace = true }
+codec = { workspace = true }
+
 hydradx-traits = { workspace = true }
-# parity
-scale-info = { version = "2.3.1", default-features = false, features = ["derive"] }
-codec = { default-features = false, features = ["derive"], package = "parity-scale-codec", version = "3.4.0" }
 
 frame-support = { workspace = true }
 frame-system = { workspace = true }
@@ -34,7 +34,7 @@ frame-benchmarking = { workspace = true }
 orml-tokens = { workspace = true }
 orml-traits = { workspace = true }
 test-utils = { workspace = true }
-hex-literal = "0.4.1"
+hex-literal = { workspace = true }
 
 [features]
 default = ["std"]
diff --git a/pallets/evm-accounts/rpc/runtime-api/Cargo.toml b/pallets/evm-accounts/rpc/runtime-api/Cargo.toml
index 731980d10..f645986a8 100644
--- a/pallets/evm-accounts/rpc/runtime-api/Cargo.toml
+++ b/pallets/evm-accounts/rpc/runtime-api/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-evm-accounts-rpc-runtime-api"
-version = "1.0.0"
+version = "1.0.1"
 authors = ['GalacticCouncil']
 edition = "2021"
 license = "Apache-2.0"
@@ -13,7 +13,7 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "3.6.1", default-features = false, features = ["derive"] }
+codec = { workspace = true }
 sp-api = { workspace = true }
 
 [features]
diff --git a/pallets/evm-accounts/src/lib.rs b/pallets/evm-accounts/src/lib.rs
index e380c4436..cf03e5624 100644
--- a/pallets/evm-accounts/src/lib.rs
+++ b/pallets/evm-accounts/src/lib.rs
@@ -289,9 +289,7 @@ where
 
 	/// Return the Substrate address bound to the EVM account. If not bound, returns `None`.
 	fn bound_account_id(evm_address: EvmAddress) -> Option<T::AccountId> {
-		let Some(last_12_bytes) = AccountExtension::<T>::get(evm_address) else {
-			return None;
-		};
+		let last_12_bytes = AccountExtension::<T>::get(evm_address)?;
 		let mut data: [u8; 32] = [0u8; 32];
 		data[..20].copy_from_slice(evm_address.0.as_ref());
 		data[20..32].copy_from_slice(&last_12_bytes);
diff --git a/pallets/evm-accounts/src/mock.rs b/pallets/evm-accounts/src/mock.rs
index 89b49be1f..dd8b68b6d 100644
--- a/pallets/evm-accounts/src/mock.rs
+++ b/pallets/evm-accounts/src/mock.rs
@@ -89,6 +89,11 @@ impl frame_system::Config for Test {
 	type SS58Prefix = ();
 	type OnSetCode = ();
 	type MaxConsumers = frame_support::traits::ConstU32<16>;
+	type SingleBlockMigrations = ();
+	type MultiBlockMigrator = ();
+	type PreInherents = ();
+	type PostInherents = ();
+	type PostTransactions = ();
 }
 
 parameter_type_with_key! {
diff --git a/pallets/evm-accounts/src/weights.rs b/pallets/evm-accounts/src/weights.rs
index d9175d81c..f6006fe98 100644
--- a/pallets/evm-accounts/src/weights.rs
+++ b/pallets/evm-accounts/src/weights.rs
@@ -15,36 +15,32 @@
 // 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 32.0.0
-//! DATE: 2024-05-23, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-09-10, 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`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
 
 // Executed Command:
-// ./target/release/hydradx
+// target/release/hydradx
 // benchmark
 // pallet
+// --chain=dev
+// --steps=50
+// --repeat=20
 // --wasm-execution=compiled
-// --pallet
-// *
-// --extrinsic
-// *
-// --heap-pages
-// 4096
-// --steps
-// 50
-// --repeat
-// 20
+// --pallet=pallet-evm-accounts
+// --extrinsic=*
 // --template=scripts/pallet-weight-template.hbs
-// --output
-// weights/
+// --output=./weights/pallet_evm_accounts.rs
 
+#![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
-#![allow(clippy::unnecessary_cast)]
+#![allow(missing_docs)]
 
 use frame_support::{
 	traits::Get,
@@ -77,8 +73,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `545`
 		//  Estimated: `4087`
-		// Minimum execution time: 32_109_000 picoseconds.
-		Weight::from_parts(32_705_000, 4087)
+		// Minimum execution time: 32_601_000 picoseconds.
+		Weight::from_parts(33_318_000, 4087)
 			.saturating_add(RocksDbWeight::get().reads(6_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -88,8 +84,9 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 9_574_000 picoseconds.
-		Weight::from_parts(9_760_000, 0).saturating_add(RocksDbWeight::get().writes(1_u64))
+		// Minimum execution time: 9_273_000 picoseconds.
+		Weight::from_parts(9_491_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`)
@@ -97,8 +94,9 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 9_344_000 picoseconds.
-		Weight::from_parts(9_633_000, 0).saturating_add(RocksDbWeight::get().writes(1_u64))
+		// Minimum execution time: 9_169_000 picoseconds.
+		Weight::from_parts(9_370_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`)
@@ -106,7 +104,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 9_421_000 picoseconds.
-		Weight::from_parts(9_685_000, 0).saturating_add(RocksDbWeight::get().writes(1_u64))
+		// Minimum execution time: 9_240_000 picoseconds.
+		Weight::from_parts(9_463_000, 0)
+			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
 }
diff --git a/pallets/genesis-history/Cargo.toml b/pallets/genesis-history/Cargo.toml
index 9975b0a38..a0fc686b3 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.2"
+version = "2.1.3"
 description = "Keeping track of the past chain generations."
 authors = ["GalacticCouncil <hydradx@galacticcouncil.io>"]
 edition = "2021"
@@ -12,10 +12,10 @@ repository = "https://github.com/paritytech/substrate/"
 targets = ['x86_64-unknown-linux-gnu']
 
 [dependencies]
-serde = { features = ["derive"], default-features = false, version = "1.0.136" }
-codec = { default-features = false, features = ["derive"], package = "parity-scale-codec", version = "3.4.0" }
-scale-info = { version = "2.3.1", default-features = false, features = ["derive"] }
-derive_more = "0.99.17"
+serde = { workspace = true }
+codec = { workspace = true }
+scale-info = { workspace = true }
+derive_more = { workspace = true }
 log = { workspace = true }
 
 frame-support = { workspace = true }
@@ -24,7 +24,7 @@ sp-io = { workspace = true }
 sp-runtime = { workspace = true }
 sp-std = { workspace = true }
 sp-core = { workspace = true }
-hex-literal = "0.4.1"
+hex-literal = { workspace = true }
 
 [features]
 default = ['std']
diff --git a/pallets/genesis-history/src/mock.rs b/pallets/genesis-history/src/mock.rs
index bdbc753e1..29d169c37 100644
--- a/pallets/genesis-history/src/mock.rs
+++ b/pallets/genesis-history/src/mock.rs
@@ -66,6 +66,11 @@ impl system::Config for Test {
 	type SS58Prefix = SS58Prefix;
 	type OnSetCode = ();
 	type MaxConsumers = frame_support::traits::ConstU32<16>;
+	type SingleBlockMigrations = ();
+	type MultiBlockMigrator = ();
+	type PreInherents = ();
+	type PostInherents = ();
+	type PostTransactions = ();
 }
 
 impl pallet_genesis_history::Config for Test {}
diff --git a/pallets/lbp/Cargo.toml b/pallets/lbp/Cargo.toml
index 959d96950..10cf93584 100644
--- a/pallets/lbp/Cargo.toml
+++ b/pallets/lbp/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-lbp"
-version = "4.8.5"
+version = "4.8.6"
 description = "HydraDX Liquidity Bootstrapping Pool Pallet"
 authors = ["GalacticCouncil"]
 edition = "2021"
@@ -15,10 +15,10 @@ targets = ["x86_64-unknown-linux-gnu"]
 substrate-wasm-builder = { workspace = true }
 
 [dependencies]
-codec = { default-features = false, features = ["derive"], package = "parity-scale-codec", version = "3.4.0" }
-scale-info = { version = "2.3.1", default-features = false, features = ["derive"] }
-primitive-types = { default-features = false, version = "0.12.0" }
-serde = { features = ["derive"], optional = true, version = "1.0.136" }
+codec = { workspace = true }
+scale-info = { workspace = true }
+primitive-types = { workspace = true }
+serde = { workspace = true, optional = true }
 
 ## Local dependencies
 hydra-dx-math = { workspace = true }
@@ -41,8 +41,8 @@ sp-runtime = { workspace = true }
 [dev-dependencies]
 sp-io = { workspace = true }
 test-utils = { workspace = true }
-rug = { version = "1.17.0", features = ["num-traits"] }
-proptest = "1.2.0"
+rug = { workspace = true }
+proptest = { workspace = true }
 
 [features]
 default = ["std"]
diff --git a/pallets/lbp/src/mock.rs b/pallets/lbp/src/mock.rs
index c685d6dc8..d186613b3 100644
--- a/pallets/lbp/src/mock.rs
+++ b/pallets/lbp/src/mock.rs
@@ -109,6 +109,11 @@ impl frame_system::Config for Test {
 	type SS58Prefix = ();
 	type OnSetCode = ();
 	type MaxConsumers = frame_support::traits::ConstU32<16>;
+	type SingleBlockMigrations = ();
+	type MultiBlockMigrator = ();
+	type PreInherents = ();
+	type PostInherents = ();
+	type PostTransactions = ();
 }
 
 parameter_type_with_key! {
diff --git a/pallets/lbp/src/weights.rs b/pallets/lbp/src/weights.rs
index 7844854cc..19891e220 100644
--- a/pallets/lbp/src/weights.rs
+++ b/pallets/lbp/src/weights.rs
@@ -15,10 +15,11 @@
 // 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 32.0.0
-//! DATE: 2024-06-20, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-09-10, 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`
@@ -28,18 +29,18 @@
 // benchmark
 // pallet
 // --chain=dev
-// --steps=10
-// --repeat=30
+// --steps=50
+// --repeat=20
 // --wasm-execution=compiled
-// --heap-pages=4096
-// --template=scripts/pallet-weight-template.hbs
 // --pallet=pallet-lbp
-// --output=weights/lbp.rs
-// --extrinsic=**
+// --extrinsic=*
+// --template=scripts/pallet-weight-template.hbs
+// --output=./weights/pallet_lbp.rs
 
+#![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
-#![allow(clippy::unnecessary_cast)]
+#![allow(missing_docs)]
 
 use frame_support::{
 	traits::Get,
@@ -69,6 +70,8 @@ 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: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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)
@@ -83,11 +86,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:  `1311`
+		//  Measured:  `1519`
 		//  Estimated: `11322`
-		// Minimum execution time: 133_964_000 picoseconds.
-		Weight::from_parts(135_186_000, 11322)
-			.saturating_add(RocksDbWeight::get().reads(15_u64))
+		// Minimum execution time: 136_266_000 picoseconds.
+		Weight::from_parts(137_668_000, 11322)
+			.saturating_add(RocksDbWeight::get().reads(16_u64))
 			.saturating_add(RocksDbWeight::get().writes(8_u64))
 	}
 	/// Storage: `LBP::PoolData` (r:1 w:1)
@@ -98,8 +101,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `417`
 		//  Estimated: `3628`
-		// Minimum execution time: 25_043_000 picoseconds.
-		Weight::from_parts(25_363_000, 3628)
+		// Minimum execution time: 24_713_000 picoseconds.
+		Weight::from_parts(25_213_000, 3628)
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 	}
@@ -107,6 +110,8 @@ 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: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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)
@@ -117,17 +122,19 @@ impl WeightInfo for () {
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn add_liquidity() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1572`
+		//  Measured:  `1780`
 		//  Estimated: `11322`
-		// Minimum execution time: 100_522_000 picoseconds.
-		Weight::from_parts(101_333_000, 11322)
-			.saturating_add(RocksDbWeight::get().reads(11_u64))
+		// Minimum execution time: 104_132_000 picoseconds.
+		Weight::from_parts(104_897_000, 11322)
+			.saturating_add(RocksDbWeight::get().reads(12_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: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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)
@@ -144,11 +151,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:  `1687`
+		//  Measured:  `1895`
 		//  Estimated: `11322`
-		// Minimum execution time: 131_548_000 picoseconds.
-		Weight::from_parts(132_825_000, 11322)
-			.saturating_add(RocksDbWeight::get().reads(13_u64))
+		// Minimum execution time: 135_138_000 picoseconds.
+		Weight::from_parts(136_175_000, 11322)
+			.saturating_add(RocksDbWeight::get().reads(14_u64))
 			.saturating_add(RocksDbWeight::get().writes(8_u64))
 	}
 	/// Storage: `Tokens::Accounts` (r:5 w:5)
@@ -157,6 +164,8 @@ 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: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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)
@@ -167,11 +176,11 @@ impl WeightInfo for () {
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn sell() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1977`
+		//  Measured:  `2185`
 		//  Estimated: `13905`
-		// Minimum execution time: 233_172_000 picoseconds.
-		Weight::from_parts(234_278_000, 13905)
-			.saturating_add(RocksDbWeight::get().reads(16_u64))
+		// Minimum execution time: 237_882_000 picoseconds.
+		Weight::from_parts(239_360_000, 13905)
+			.saturating_add(RocksDbWeight::get().reads(17_u64))
 			.saturating_add(RocksDbWeight::get().writes(7_u64))
 	}
 	/// Storage: `LBP::PoolData` (r:1 w:0)
@@ -180,6 +189,8 @@ 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: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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)
@@ -190,11 +201,11 @@ impl WeightInfo for () {
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn buy() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1977`
+		//  Measured:  `2185`
 		//  Estimated: `13905`
-		// Minimum execution time: 232_521_000 picoseconds.
-		Weight::from_parts(233_949_000, 13905)
-			.saturating_add(RocksDbWeight::get().reads(16_u64))
+		// Minimum execution time: 237_046_000 picoseconds.
+		Weight::from_parts(238_347_000, 13905)
+			.saturating_add(RocksDbWeight::get().reads(17_u64))
 			.saturating_add(RocksDbWeight::get().writes(7_u64))
 	}
 	/// Storage: `LBP::PoolData` (r:1 w:0)
@@ -203,6 +214,8 @@ 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: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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)
@@ -213,18 +226,18 @@ impl WeightInfo for () {
 	/// 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 {
+	fn router_execution_sell(c: u32, e: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `822 + e * (1155 ±0)`
-		//  Estimated: `6156 + e * (7749 ±251_795_645_551_580_832)`
-		// Minimum execution time: 86_818_000 picoseconds.
-		Weight::from_parts(88_179_000, 6156)
-			// Standard Error: 904_459
-			.saturating_add(Weight::from_parts(3_650_240, 0).saturating_mul(c.into()))
-			// Standard Error: 1_985_547
-			.saturating_add(Weight::from_parts(154_967_721, 0).saturating_mul(e.into()))
+		//  Measured:  `822 + e * (1363 ±0)`
+		//  Estimated: `8799 + e * (7749 ±0)`
+		// Minimum execution time: 87_361_000 picoseconds.
+		Weight::from_parts(88_580_000, 8799)
+			// Standard Error: 241_438
+			.saturating_add(Weight::from_parts(1_047_223, 0).saturating_mul(c.into()))
+			// Standard Error: 537_751
+			.saturating_add(Weight::from_parts(152_397_271, 0).saturating_mul(e.into()))
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
-			.saturating_add(RocksDbWeight::get().reads((13_u64).saturating_mul(e.into())))
+			.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, 7749).saturating_mul(e.into()))
 	}
@@ -234,6 +247,8 @@ 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: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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)
@@ -244,20 +259,20 @@ impl WeightInfo for () {
 	/// 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 {
+	fn router_execution_buy(c: u32, e: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `822 + e * (1155 ±0)`
-		//  Estimated: `6156 + e * (7749 ±0)`
-		// Minimum execution time: 163_430_000 picoseconds.
-		Weight::from_parts(164_981_000, 6156)
-			// Standard Error: 1_122_507
-			.saturating_add(Weight::from_parts(5_914_893, 0).saturating_mul(c.into()))
-			// Standard Error: 3_706_588
-			.saturating_add(Weight::from_parts(112_896_249, 0).saturating_mul(e.into()))
+		//  Measured:  `822 + e * (1363 ±0)`
+		//  Estimated: `6156 + e * (8544 ±0)`
+		// Minimum execution time: 160_618_000 picoseconds.
+		Weight::from_parts(161_967_000, 6156)
+			// Standard Error: 434_297
+			.saturating_add(Weight::from_parts(2_807_924, 0).saturating_mul(c.into()))
+			// Standard Error: 1_464_590
+			.saturating_add(Weight::from_parts(113_441_082, 0).saturating_mul(e.into()))
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
-			.saturating_add(RocksDbWeight::get().reads((13_u64).saturating_mul(e.into())))
+			.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, 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`)
@@ -267,8 +282,9 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `822`
 		//  Estimated: `6156`
-		// Minimum execution time: 89_403_000 picoseconds.
-		Weight::from_parts(90_543_000, 6156).saturating_add(RocksDbWeight::get().reads(3_u64))
+		// Minimum execution time: 89_869_000 picoseconds.
+		Weight::from_parts(90_917_000, 6156)
+			.saturating_add(RocksDbWeight::get().reads(3_u64))
 	}
 	/// Storage: `LBP::PoolData` (r:1 w:0)
 	/// Proof: `LBP::PoolData` (`max_values`: None, `max_size`: Some(163), added: 2638, mode: `MaxEncodedLen`)
@@ -280,7 +296,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `822`
 		//  Estimated: `6156`
-		// Minimum execution time: 24_307_000 picoseconds.
-		Weight::from_parts(24_702_000, 6156).saturating_add(RocksDbWeight::get().reads(4_u64))
+		// Minimum execution time: 25_211_000 picoseconds.
+		Weight::from_parts(25_559_000, 6156)
+			.saturating_add(RocksDbWeight::get().reads(4_u64))
 	}
 }
diff --git a/pallets/liquidity-mining/Cargo.toml b/pallets/liquidity-mining/Cargo.toml
index cb103dd88..7cab1f14a 100644
--- a/pallets/liquidity-mining/Cargo.toml
+++ b/pallets/liquidity-mining/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-liquidity-mining"
-version = "4.4.1"
+version = "4.4.2"
 description = "Liquidity mining"
 authors = ["GalacticCouncil"]
 edition = "2021"
@@ -12,8 +12,8 @@ repository = "https://github.com/galacticcouncil/warehouse"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "3.4.0", features = ["derive", "max-encoded-len"], default-features = false }
-scale-info = { version = "2.1.2", default-features = false, features = ["derive"] }
+codec = { workspace = true, features = ["derive", "max-encoded-len"] }
+scale-info = { workspace = true }
 sp-arithmetic = { workspace = true }
 
 # ORML dependencies
@@ -35,11 +35,10 @@ sp-io = { workspace = true }
 sp-core = { workspace = true }
 orml-tokens = { workspace = true }
 pallet-balances = { workspace = true }
-# This can be updated to lates after rust update(>=1.61)
-fixed = { version = "=1.15.0", default-features = false }
-proptest = "1.0.0"
-pretty_assertions = "1.2.1"
-rand = "0.8.5"
+fixed = { workspace = true }
+proptest = { workspace = true }
+pretty_assertions = { workspace = true }
+rand = { workspace = true }
 
 [features]
 default = ["std"]
diff --git a/pallets/liquidity-mining/src/tests/mock.rs b/pallets/liquidity-mining/src/tests/mock.rs
index f0a270d6d..556027907 100644
--- a/pallets/liquidity-mining/src/tests/mock.rs
+++ b/pallets/liquidity-mining/src/tests/mock.rs
@@ -163,13 +163,18 @@ impl system::Config for Test {
 	type SS58Prefix = ();
 	type OnSetCode = ();
 	type MaxConsumers = frame_support::traits::ConstU32<16>;
+	type SingleBlockMigrations = ();
+	type MultiBlockMigrator = ();
+	type PreInherents = ();
+	type PostInherents = ();
+	type PostTransactions = ();
 }
 
 pub struct Amm;
 
 thread_local! {
 	pub static AMM_POOLS: RefCell<HashMap<String, (AccountId, AssetId)>> = RefCell::new(HashMap::new());
-	pub static DUSTER_WHITELIST: RefCell<Vec<AccountId>> = RefCell::new(Vec::new());
+	pub static DUSTER_WHITELIST: RefCell<Vec<AccountId>> = const { RefCell::new(Vec::new()) };
 }
 
 impl AMM<AccountId, AssetId, AssetPair, Balance> for Amm {
@@ -409,10 +414,6 @@ impl DustRemovalAccountWhitelist<AccountId> for Whitelist {
 	type Error = DispatchError;
 
 	fn add_account(account: &AccountId) -> Result<(), Self::Error> {
-		if Whitelist::contains(account) {
-			return Err(sp_runtime::DispatchError::Other("Account is already in the whitelist"));
-		}
-
 		DUSTER_WHITELIST.with(|v| v.borrow_mut().push(*account));
 
 		Ok(())
diff --git a/pallets/nft/Cargo.toml b/pallets/nft/Cargo.toml
index 0ad235e1e..462c34520 100644
--- a/pallets/nft/Cargo.toml
+++ b/pallets/nft/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-nft"
-version = "7.1.4"
+version = "7.1.5"
 description = "A generic NFT pallet for managing non-fungible tokens"
 authors = ["GalacticCoucil"]
 edition = "2021"
@@ -12,9 +12,9 @@ repository = "https://github.com/galacticcouncil/warehouse"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { default-features = false, features = ["derive"], package = "parity-scale-codec", version = "3.4.0" }
-scale-info = { version = "2.1.2", default-features = false, features = ["derive"] }
-serde = { version = "1.0.137", optional = true, features = ["derive"] }
+codec = {  workspace = true }
+scale-info = {  workspace = true }
+serde = {  workspace = true, optional = true }
 log = { workspace = true }
 
 # Substrate dependencies
diff --git a/pallets/nft/src/benchmarking.rs b/pallets/nft/src/benchmarking.rs
index b52dfd350..cd717d08a 100644
--- a/pallets/nft/src/benchmarking.rs
+++ b/pallets/nft/src/benchmarking.rs
@@ -34,7 +34,8 @@ const COLLECTION_ID_0: u32 = 1_000_000;
 
 fn create_account<T: Config>(name: &'static str, index: u32) -> T::AccountId {
 	let caller: T::AccountId = account(name, index, SEED);
-	<T as pallet_uniques::Config>::Currency::deposit_creating(&caller, ENDOWMENT.unique_saturated_into());
+	let _imbalance =
+		<T as pallet_uniques::Config>::Currency::deposit_creating(&caller, ENDOWMENT.unique_saturated_into());
 	caller
 }
 
diff --git a/pallets/nft/src/mock.rs b/pallets/nft/src/mock.rs
index dc380f668..359af583c 100644
--- a/pallets/nft/src/mock.rs
+++ b/pallets/nft/src/mock.rs
@@ -149,6 +149,11 @@ impl frame_system::Config for Test {
 	type SS58Prefix = ();
 	type OnSetCode = ();
 	type MaxConsumers = frame_support::traits::ConstU32<16>;
+	type SingleBlockMigrations = ();
+	type MultiBlockMigrator = ();
+	type PreInherents = ();
+	type PostInherents = ();
+	type PostTransactions = ();
 }
 
 parameter_types! {
diff --git a/pallets/omnipool-liquidity-mining/Cargo.toml b/pallets/omnipool-liquidity-mining/Cargo.toml
index e90e2ac97..91ac3bd29 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.2.0"
+version = "2.2.1"
 authors = ['GalacticCouncil']
 edition = "2021"
 license = "Apache-2.0"
@@ -13,8 +13,8 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 # parity
-scale-info = { version = "2.3.1", default-features = false, features = ["derive"] }
-codec = { default-features = false, features = ["derive"], package = "parity-scale-codec", version = "3.4.0" }
+scale-info = { workspace = true }
+codec = {workspace = true }
 log = { workspace = true }
 
 # local
@@ -40,7 +40,7 @@ hydradx-traits = { workspace = true }
 hydra-dx-math = { workspace = true }
 
 # third party
-primitive-types = { version = "0.12.0", default-features = false }
+primitive-types = { workspace = true }
 
 # Optional imports for benchmarking
 frame-benchmarking = { workspace = true, optional = true }
@@ -52,7 +52,7 @@ sp-io = { workspace = true, optional = true }
 sp-io = { workspace = true }
 sp-core = { workspace = true }
 orml-tokens = { workspace = true }
-pretty_assertions = "1.2.1"
+pretty_assertions = { workspace = true }
 
 [features]
 default = ["std"]
diff --git a/pallets/omnipool-liquidity-mining/src/tests/mock.rs b/pallets/omnipool-liquidity-mining/src/tests/mock.rs
index a04e8cfd1..8c9175f02 100644
--- a/pallets/omnipool-liquidity-mining/src/tests/mock.rs
+++ b/pallets/omnipool-liquidity-mining/src/tests/mock.rs
@@ -89,15 +89,15 @@ pub const LM_COLLECTION_ID: u128 = 1;
 thread_local! {
 	pub static NFTS: RefCell<HashMap<(CollectionId, ItemId), AccountId>> = RefCell::new(HashMap::default());
 	pub static REGISTERED_ASSETS: RefCell<HashMap<AssetId, u32>> = RefCell::new(HashMap::default());
-	pub static ASSET_WEIGHT_CAP: RefCell<Permill> = RefCell::new(Permill::from_percent(100));
-	pub static ASSET_FEE: RefCell<Permill> = RefCell::new(Permill::from_percent(0));
-	pub static PROTOCOL_FEE: RefCell<Permill> = RefCell::new(Permill::from_percent(0));
-	pub static MIN_ADDED_LIQUDIITY: RefCell<Balance> = RefCell::new(1000u128);
-	pub static MIN_TRADE_AMOUNT: RefCell<Balance> = RefCell::new(1000u128);
-	pub static MAX_IN_RATIO: RefCell<Balance> = RefCell::new(1u128);
-	pub static MAX_OUT_RATIO: RefCell<Balance> = RefCell::new(1u128);
+	pub static ASSET_WEIGHT_CAP: RefCell<Permill> = const { RefCell::new(Permill::from_percent(100)) };
+	pub static ASSET_FEE: RefCell<Permill> = const { RefCell::new(Permill::from_percent(0)) };
+	pub static PROTOCOL_FEE: RefCell<Permill> = const { RefCell::new(Permill::from_percent(0)) };
+	pub static MIN_ADDED_LIQUDIITY: RefCell<Balance> = const { RefCell::new(1000u128) };
+	pub static MIN_TRADE_AMOUNT: RefCell<Balance> = const { RefCell::new(1000u128) };
+	pub static MAX_IN_RATIO: RefCell<Balance> = const { RefCell::new(1u128) };
+	pub static MAX_OUT_RATIO: RefCell<Balance> = const { RefCell::new(1u128) };
 
-	 pub static DUSTER_WHITELIST: RefCell<Vec<AccountId>> = RefCell::new(Vec::new());
+	 pub static DUSTER_WHITELIST: RefCell<Vec<AccountId>> = const { RefCell::new(Vec::new()) };
 }
 
 construct_runtime!(
@@ -155,6 +155,11 @@ impl frame_system::Config for Test {
 	type SS58Prefix = ();
 	type OnSetCode = ();
 	type MaxConsumers = ConstU32<16>;
+	type SingleBlockMigrations = ();
+	type MultiBlockMigrator = ();
+	type PreInherents = ();
+	type PostInherents = ();
+	type PostTransactions = ();
 }
 
 parameter_types! {
diff --git a/pallets/omnipool-liquidity-mining/src/weights.rs b/pallets/omnipool-liquidity-mining/src/weights.rs
index 8b0265865..aca4df76a 100644
--- a/pallets/omnipool-liquidity-mining/src/weights.rs
+++ b/pallets/omnipool-liquidity-mining/src/weights.rs
@@ -15,36 +15,32 @@
 // 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 32.0.0
-//! DATE: 2024-05-23, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-09-19, 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`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
 
 // Executed Command:
-// ./target/release/hydradx
+// target/release/hydradx
 // benchmark
 // pallet
+// --chain=dev
+// --steps=50
+// --repeat=20
 // --wasm-execution=compiled
-// --pallet
-// *
-// --extrinsic
-// *
-// --heap-pages
-// 4096
-// --steps
-// 50
-// --repeat
-// 20
+// --pallet=pallet-omnipool-liquidity-mining
+// --extrinsic=*
 // --template=scripts/pallet-weight-template.hbs
-// --output
-// weights/
+// --output=./weights/pallet_omnipool_liquidity_mining.rs
 
+#![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
-#![allow(clippy::unnecessary_cast)]
+#![allow(missing_docs)]
 
 use frame_support::{
 	traits::Get,
@@ -84,12 +80,11 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `557`
 		//  Estimated: `6196`
-		// Minimum execution time: 80_933_000 picoseconds.
-		Weight::from_parts(81_673_000, 6196)
+		// Minimum execution time: 80_879_000 picoseconds.
+		Weight::from_parts(81_849_000, 6196)
 			.saturating_add(RocksDbWeight::get().reads(5_u64))
 			.saturating_add(RocksDbWeight::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:1 w:0)
@@ -98,12 +93,11 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `573`
 		//  Estimated: `3670`
-		// Minimum execution time: 22_855_000 picoseconds.
-		Weight::from_parts(23_088_000, 3670)
+		// Minimum execution time: 22_272_000 picoseconds.
+		Weight::from_parts(22_662_000, 3670)
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_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)
@@ -114,8 +108,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `964`
 		//  Estimated: `6196`
-		// Minimum execution time: 79_070_000 picoseconds.
-		Weight::from_parts(79_648_000, 6196)
+		// Minimum execution time: 79_877_000 picoseconds.
+		Weight::from_parts(80_351_000, 6196)
 			.saturating_add(RocksDbWeight::get().reads(4_u64))
 			.saturating_add(RocksDbWeight::get().writes(4_u64))
 	}
@@ -139,8 +133,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `2337`
 		//  Estimated: `6294`
-		// Minimum execution time: 123_093_000 picoseconds.
-		Weight::from_parts(124_230_000, 6294)
+		// Minimum execution time: 123_991_000 picoseconds.
+		Weight::from_parts(125_177_000, 6294)
 			.saturating_add(RocksDbWeight::get().reads(9_u64))
 			.saturating_add(RocksDbWeight::get().writes(6_u64))
 	}
@@ -162,8 +156,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `2507`
 		//  Estimated: `6294`
-		// Minimum execution time: 126_053_000 picoseconds.
-		Weight::from_parts(127_134_000, 6294)
+		// Minimum execution time: 127_115_000 picoseconds.
+		Weight::from_parts(128_119_000, 6294)
 			.saturating_add(RocksDbWeight::get().reads(9_u64))
 			.saturating_add(RocksDbWeight::get().writes(4_u64))
 	}
@@ -183,8 +177,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `2146`
 		//  Estimated: `6294`
-		// Minimum execution time: 120_037_000 picoseconds.
-		Weight::from_parts(120_995_000, 6294)
+		// Minimum execution time: 121_664_000 picoseconds.
+		Weight::from_parts(122_411_000, 6294)
 			.saturating_add(RocksDbWeight::get().reads(8_u64))
 			.saturating_add(RocksDbWeight::get().writes(5_u64))
 	}
@@ -206,8 +200,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `2543`
 		//  Estimated: `6294`
-		// Minimum execution time: 124_191_000 picoseconds.
-		Weight::from_parts(124_920_000, 6294)
+		// Minimum execution time: 125_411_000 picoseconds.
+		Weight::from_parts(126_409_000, 6294)
 			.saturating_add(RocksDbWeight::get().reads(9_u64))
 			.saturating_add(RocksDbWeight::get().writes(5_u64))
 	}
@@ -223,8 +217,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `924`
 		//  Estimated: `6196`
-		// Minimum execution time: 75_542_000 picoseconds.
-		Weight::from_parts(75_959_000, 6196)
+		// Minimum execution time: 75_744_000 picoseconds.
+		Weight::from_parts(76_652_000, 6196)
 			.saturating_add(RocksDbWeight::get().reads(5_u64))
 			.saturating_add(RocksDbWeight::get().writes(4_u64))
 	}
@@ -262,8 +256,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `4072`
 		//  Estimated: `11598`
-		// Minimum execution time: 207_096_000 picoseconds.
-		Weight::from_parts(208_255_000, 11598)
+		// Minimum execution time: 208_598_000 picoseconds.
+		Weight::from_parts(210_852_000, 11598)
 			.saturating_add(RocksDbWeight::get().reads(17_u64))
 			.saturating_add(RocksDbWeight::get().writes(14_u64))
 	}
@@ -291,8 +285,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `4381`
 		//  Estimated: `11598`
-		// Minimum execution time: 171_971_000 picoseconds.
-		Weight::from_parts(173_516_000, 11598)
+		// Minimum execution time: 174_272_000 picoseconds.
+		Weight::from_parts(175_291_000, 11598)
 			.saturating_add(RocksDbWeight::get().reads(15_u64))
 			.saturating_add(RocksDbWeight::get().writes(5_u64))
 	}
@@ -314,8 +308,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `2946`
 		//  Estimated: `8799`
-		// Minimum execution time: 165_734_000 picoseconds.
-		Weight::from_parts(167_004_000, 8799)
+		// Minimum execution time: 171_370_000 picoseconds.
+		Weight::from_parts(172_314_000, 8799)
 			.saturating_add(RocksDbWeight::get().reads(10_u64))
 			.saturating_add(RocksDbWeight::get().writes(6_u64))
 	}
@@ -347,8 +341,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `3940`
 		//  Estimated: `8799`
-		// Minimum execution time: 250_173_000 picoseconds.
-		Weight::from_parts(251_222_000, 8799)
+		// Minimum execution time: 255_448_000 picoseconds.
+		Weight::from_parts(257_109_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 d7307ad76..504ec6d9f 100644
--- a/pallets/omnipool/Cargo.toml
+++ b/pallets/omnipool/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-omnipool"
-version = "4.3.3"
+version = "4.3.4"
 authors = ['GalacticCouncil']
 edition = "2021"
 license = "Apache-2.0"
@@ -14,8 +14,8 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 # parity
-scale-info = { version = "2.3.1", default-features = false, features = ["derive"] }
-codec = { default-features = false, features = ["derive"], package = "parity-scale-codec", version = "3.4.0" }
+scale-info = { workspace = true }
+codec = { workspace = true }
 
 # primitives
 sp-runtime = { workspace = true }
@@ -34,10 +34,10 @@ hydradx-traits = { workspace = true }
 hydra-dx-math = { workspace = true }
 
 # third party
-primitive-types = { version = "0.12.0", default-features = false }
-bitflags = "1.3.2"
-impl-trait-for-tuples = "0.2.2"
-log = { version = "0.4.17", default-features = false }
+primitive-types = { workspace = true }
+bitflags = { workspace = true }
+impl-trait-for-tuples = { workspace = true }
+log = { workspace = true }
 
 # Optional imports for benchmarking
 frame-benchmarking = { workspace = true, optional = true }
@@ -52,8 +52,8 @@ sp-tracing = { workspace = true }
 pallet-balances = { workspace = true }
 frame-benchmarking = { workspace = true }
 orml-tokens = { workspace = true }
-proptest = "1.0.0"
-pretty_assertions = "1.2.1"
+proptest = { workspace = true }
+pretty_assertions = { workspace = true }
 
 [features]
 default = ["std"]
diff --git a/pallets/omnipool/src/tests/mock.rs b/pallets/omnipool/src/tests/mock.rs
index 6d7dfe5a8..adca0cbfb 100644
--- a/pallets/omnipool/src/tests/mock.rs
+++ b/pallets/omnipool/src/tests/mock.rs
@@ -65,18 +65,18 @@ pub const DEFAULT_WEIGHT_CAP: u128 = 1_000_000_000_000_000_000;
 thread_local! {
 	pub static POSITIONS: RefCell<HashMap<u32, u64>> = RefCell::new(HashMap::default());
 	pub static REGISTERED_ASSETS: RefCell<HashMap<AssetId, u32>> = RefCell::new(HashMap::default());
-	pub static ASSET_WEIGHT_CAP: RefCell<Permill> = RefCell::new(Permill::from_percent(100));
-	pub static ASSET_FEE: RefCell<Permill> = RefCell::new(Permill::from_percent(0));
-	pub static PROTOCOL_FEE: RefCell<Permill> = RefCell::new(Permill::from_percent(0));
-	pub static MIN_ADDED_LIQUDIITY: RefCell<Balance> = RefCell::new(1000u128);
-	pub static MIN_TRADE_AMOUNT: RefCell<Balance> = RefCell::new(1000u128);
-	pub static MAX_IN_RATIO: RefCell<Balance> = RefCell::new(1u128);
-	pub static MAX_OUT_RATIO: RefCell<Balance> = RefCell::new(1u128);
-	pub static MAX_PRICE_DIFF: RefCell<Permill> = RefCell::new(Permill::from_percent(0));
-	pub static EXT_PRICE_ADJUSTMENT: RefCell<(u32,u32, bool)> = RefCell::new((0u32,0u32, false));
-	pub static WITHDRAWAL_FEE: RefCell<Permill> = RefCell::new(Permill::from_percent(0));
-	pub static WITHDRAWAL_ADJUSTMENT: RefCell<(u32,u32, bool)> = RefCell::new((0u32,0u32, false));
-	pub static ON_TRADE_WITHDRAWAL: RefCell<Permill> = RefCell::new(Permill::from_percent(0));
+	pub static ASSET_WEIGHT_CAP: RefCell<Permill> = const { RefCell::new(Permill::from_percent(100)) };
+	pub static ASSET_FEE: RefCell<Permill> = const { RefCell::new(Permill::from_percent(0)) };
+	pub static PROTOCOL_FEE: RefCell<Permill> = const { RefCell::new(Permill::from_percent(0)) };
+	pub static MIN_ADDED_LIQUDIITY: RefCell<Balance> = const { RefCell::new(1000u128) };
+	pub static MIN_TRADE_AMOUNT: RefCell<Balance> = const { RefCell::new(1000u128) };
+	pub static MAX_IN_RATIO: RefCell<Balance> = const { RefCell::new(1u128) };
+	pub static MAX_OUT_RATIO: RefCell<Balance> = const { RefCell::new(1u128) };
+	pub static MAX_PRICE_DIFF: RefCell<Permill> = const { RefCell::new(Permill::from_percent(0)) };
+	pub static EXT_PRICE_ADJUSTMENT: RefCell<(u32,u32, bool)> = const { RefCell::new((0u32,0u32, false)) };
+	pub static WITHDRAWAL_FEE: RefCell<Permill> = const { RefCell::new(Permill::from_percent(0)) };
+	pub static WITHDRAWAL_ADJUSTMENT: RefCell<(u32,u32, bool)> = const { RefCell::new((0u32,0u32, false)) };
+	pub static ON_TRADE_WITHDRAWAL: RefCell<Permill> = const { RefCell::new(Permill::from_percent(0)) };
 }
 
 construct_runtime!(
@@ -114,6 +114,11 @@ impl frame_system::Config for Test {
 	type SS58Prefix = ();
 	type OnSetCode = ();
 	type MaxConsumers = ConstU32<16>;
+	type SingleBlockMigrations = ();
+	type MultiBlockMigrator = ();
+	type PreInherents = ();
+	type PostInherents = ();
+	type PostTransactions = ();
 }
 
 impl pallet_balances::Config for Test {
diff --git a/pallets/omnipool/src/weights.rs b/pallets/omnipool/src/weights.rs
index 948525e4d..bfb822049 100644
--- a/pallets/omnipool/src/weights.rs
+++ b/pallets/omnipool/src/weights.rs
@@ -15,10 +15,11 @@
 // 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 32.0.0
-//! DATE: 2024-06-20, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-09-10, 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`
@@ -28,18 +29,18 @@
 // benchmark
 // pallet
 // --chain=dev
-// --steps=10
-// --repeat=30
+// --steps=50
+// --repeat=20
 // --wasm-execution=compiled
-// --heap-pages=4096
-// --template=scripts/pallet-weight-template.hbs
 // --pallet=pallet-omnipool
-// --output=weights/omnipool.rs
 // --extrinsic=*
+// --template=scripts/pallet-weight-template.hbs
+// --output=./weights/pallet_omnipool.rs
 
+#![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
-#![allow(clippy::unnecessary_cast)]
+#![allow(missing_docs)]
 
 use frame_support::{
 	traits::Get,
@@ -97,8 +98,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `3128`
 		//  Estimated: `7406`
-		// Minimum execution time: 129_557_000 picoseconds.
-		Weight::from_parts(130_648_000, 7406)
+		// Minimum execution time: 129_737_000 picoseconds.
+		Weight::from_parts(131_001_000, 7406)
 			.saturating_add(RocksDbWeight::get().reads(13_u64))
 			.saturating_add(RocksDbWeight::get().writes(10_u64))
 	}
@@ -118,6 +119,8 @@ 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: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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)
@@ -144,11 +147,11 @@ 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:  `4344`
+		//  Measured:  `4552`
 		//  Estimated: `8739`
-		// Minimum execution time: 212_794_000 picoseconds.
-		Weight::from_parts(214_077_000, 8739)
-			.saturating_add(RocksDbWeight::get().reads(23_u64))
+		// Minimum execution time: 218_146_000 picoseconds.
+		Weight::from_parts(219_509_000, 8739)
+			.saturating_add(RocksDbWeight::get().reads(24_u64))
 			.saturating_add(RocksDbWeight::get().writes(14_u64))
 	}
 	/// Storage: `Uniques::Asset` (r:1 w:1)
@@ -163,6 +166,8 @@ 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: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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)
@@ -195,11 +200,11 @@ 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:  `7255`
+		//  Measured:  `7463`
 		//  Estimated: `11322`
-		// Minimum execution time: 283_260_000 picoseconds.
-		Weight::from_parts(285_188_000, 11322)
-			.saturating_add(RocksDbWeight::get().reads(26_u64))
+		// Minimum execution time: 288_313_000 picoseconds.
+		Weight::from_parts(290_432_000, 11322)
+			.saturating_add(RocksDbWeight::get().reads(27_u64))
 			.saturating_add(RocksDbWeight::get().writes(16_u64))
 	}
 	/// Storage: `Tokens::Accounts` (r:5 w:5)
@@ -210,6 +215,8 @@ 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: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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)
@@ -252,11 +259,11 @@ 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:  `7615`
+		//  Measured:  `7823`
 		//  Estimated: `13905`
-		// Minimum execution time: 326_103_000 picoseconds.
-		Weight::from_parts(327_911_000, 13905)
-			.saturating_add(RocksDbWeight::get().reads(41_u64))
+		// Minimum execution time: 333_717_000 picoseconds.
+		Weight::from_parts(335_901_000, 13905)
+			.saturating_add(RocksDbWeight::get().reads(42_u64))
 			.saturating_add(RocksDbWeight::get().writes(23_u64))
 	}
 	/// Storage: `Omnipool::Assets` (r:3 w:3)
@@ -267,6 +274,8 @@ 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: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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)
@@ -309,11 +318,11 @@ 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:  `7615`
+		//  Measured:  `7823`
 		//  Estimated: `13905`
-		// Minimum execution time: 328_543_000 picoseconds.
-		Weight::from_parts(330_455_000, 13905)
-			.saturating_add(RocksDbWeight::get().reads(41_u64))
+		// Minimum execution time: 335_910_000 picoseconds.
+		Weight::from_parts(337_763_000, 13905)
+			.saturating_add(RocksDbWeight::get().reads(42_u64))
 			.saturating_add(RocksDbWeight::get().writes(23_u64))
 	}
 	/// Storage: `Omnipool::Assets` (r:1 w:1)
@@ -322,8 +331,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `1305`
 		//  Estimated: `3550`
-		// Minimum execution time: 28_191_000 picoseconds.
-		Weight::from_parts(28_788_000, 3550)
+		// Minimum execution time: 28_270_000 picoseconds.
+		Weight::from_parts(28_812_000, 3550)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -331,6 +340,8 @@ impl WeightInfo for () {
 	/// 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: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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)
@@ -345,11 +356,11 @@ 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:  `2642`
+		//  Measured:  `2850`
 		//  Estimated: `6196`
-		// Minimum execution time: 99_781_000 picoseconds.
-		Weight::from_parts(101_151_000, 6196)
-			.saturating_add(RocksDbWeight::get().reads(10_u64))
+		// Minimum execution time: 104_659_000 picoseconds.
+		Weight::from_parts(105_287_000, 6196)
+			.saturating_add(RocksDbWeight::get().reads(11_u64))
 			.saturating_add(RocksDbWeight::get().writes(5_u64))
 	}
 	/// Storage: `Omnipool::Positions` (r:1 w:1)
@@ -368,8 +379,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `2910`
 		//  Estimated: `3655`
-		// Minimum execution time: 67_106_000 picoseconds.
-		Weight::from_parts(67_630_000, 3655)
+		// Minimum execution time: 67_565_000 picoseconds.
+		Weight::from_parts(68_526_000, 3655)
 			.saturating_add(RocksDbWeight::get().reads(4_u64))
 			.saturating_add(RocksDbWeight::get().writes(6_u64))
 	}
@@ -379,8 +390,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `1305`
 		//  Estimated: `3550`
-		// Minimum execution time: 28_644_000 picoseconds.
-		Weight::from_parts(29_012_000, 3550)
+		// Minimum execution time: 28_717_000 picoseconds.
+		Weight::from_parts(29_137_000, 3550)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -390,6 +401,8 @@ 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: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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)
@@ -408,11 +421,11 @@ 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:  `4337`
+		//  Measured:  `4545`
 		//  Estimated: `8739`
-		// Minimum execution time: 146_511_000 picoseconds.
-		Weight::from_parts(147_743_000, 8739)
-			.saturating_add(RocksDbWeight::get().reads(15_u64))
+		// Minimum execution time: 150_915_000 picoseconds.
+		Weight::from_parts(152_374_000, 8739)
+			.saturating_add(RocksDbWeight::get().reads(16_u64))
 			.saturating_add(RocksDbWeight::get().writes(8_u64))
 	}
 	/// Storage: `Omnipool::Assets` (r:1 w:1)
@@ -425,6 +438,8 @@ impl WeightInfo for () {
 	/// 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: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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)
@@ -437,11 +452,11 @@ 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:  `3428`
+		//  Measured:  `3636`
 		//  Estimated: `11322`
-		// Minimum execution time: 145_853_000 picoseconds.
-		Weight::from_parts(147_060_000, 11322)
-			.saturating_add(RocksDbWeight::get().reads(16_u64))
+		// Minimum execution time: 151_145_000 picoseconds.
+		Weight::from_parts(152_034_000, 11322)
+			.saturating_add(RocksDbWeight::get().reads(17_u64))
 			.saturating_add(RocksDbWeight::get().writes(8_u64))
 	}
 	/// Storage: `Omnipool::Assets` (r:3 w:3)
@@ -452,6 +467,8 @@ 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: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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)
@@ -490,18 +507,20 @@ 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 * (5140 ±0)`
-		//  Estimated: `6156 + e * (8517 ±251_795_645_551_580_832)`
-		// Minimum execution time: 44_661_000 picoseconds.
-		Weight::from_parts(46_229_971, 6156)
-			// Standard Error: 148_969
-			.saturating_add(Weight::from_parts(285_100_297, 0).saturating_mul(e.into()))
+		//  Measured:  `1974 + e * (5348 ±0)`
+		//  Estimated: `11390 + e * (7749 ±0)`
+		// Minimum execution time: 45_263_000 picoseconds.
+		Weight::from_parts(45_693_748, 11390)
+			// Standard Error: 134_488
+			.saturating_add(Weight::from_parts(268_691, 0).saturating_mul(c.into()))
+			// Standard Error: 134_488
+			.saturating_add(Weight::from_parts(289_580_167, 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().reads((32_u64).saturating_mul(e.into())))
 			.saturating_add(RocksDbWeight::get().writes((21_u64).saturating_mul(e.into())))
-			.saturating_add(Weight::from_parts(0, 8517).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`)
@@ -511,6 +530,8 @@ 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: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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)
@@ -549,17 +570,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:  `7114`
+		//  Measured:  `7322`
 		//  Estimated: `13905`
-		// Minimum execution time: 315_214_000 picoseconds.
-		Weight::from_parts(296_879_705, 13905)
-			// Standard Error: 261_774
-			.saturating_add(Weight::from_parts(18_029_452, 0).saturating_mul(c.into()))
-			// Standard Error: 261_774
-			.saturating_add(Weight::from_parts(2_977_423, 0).saturating_mul(e.into()))
-			.saturating_add(RocksDbWeight::get().reads(38_u64))
+		// Minimum execution time: 319_285_000 picoseconds.
+		Weight::from_parts(311_604_346, 13905)
+			// Standard Error: 213_268
+			.saturating_add(Weight::from_parts(12_523_973, 0).saturating_mul(c.into()))
+			.saturating_add(RocksDbWeight::get().reads(39_u64))
 			.saturating_add(RocksDbWeight::get().writes(21_u64))
 	}
 	/// Storage: `DynamicFees::AssetFee` (r:2 w:0)
@@ -572,7 +591,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `1933`
 		//  Estimated: `6156`
-		// Minimum execution time: 43_389_000 picoseconds.
-		Weight::from_parts(43_919_000, 6156).saturating_add(RocksDbWeight::get().reads(6_u64))
+		// Minimum execution time: 44_268_000 picoseconds.
+		Weight::from_parts(44_633_000, 6156)
+			.saturating_add(RocksDbWeight::get().reads(6_u64))
 	}
 }
diff --git a/pallets/otc-settlements/Cargo.toml b/pallets/otc-settlements/Cargo.toml
index 24e23f5d2..9c9f14002 100644
--- a/pallets/otc-settlements/Cargo.toml
+++ b/pallets/otc-settlements/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = 'pallet-otc-settlements'
-version = '1.0.3'
+version = '1.0.4'
 description = 'A pallet with offchain worker closing OTC arbs'
 authors = ['GalacticCouncil']
 edition = '2021'
@@ -9,9 +9,9 @@ repository = "https://github.com/galacticcouncil/Hydradx-node"
 
 [dependencies]
 # parity
-codec = { package = "parity-scale-codec", version = "3.4.0", features = ["derive", "max-encoded-len"], default-features = false }
-scale-info = { version = "2.1.2", default-features = false, features = ["derive"] }
-log = { version = "0.4.17", default-features = false }
+codec = { workspace = true, features = ["derive", "max-encoded-len"] }
+scale-info = { workspace = true }
+log = { workspace = true }
 
 # primitives
 sp-runtime = { workspace = true }
@@ -41,11 +41,11 @@ pallet-balances = { workspace = true }
 pallet-currencies = { workspace = true }
 sp-api = { workspace = true }
 orml-traits = { workspace = true }
-orml-tokens = { workspace = true, features=["std"] }
-proptest = "1.0.0"
-pretty_assertions = "1.2.1"
+orml-tokens = { workspace = true, features = ["std"] }
+proptest = { workspace = true }
+pretty_assertions = { workspace = true }
 test-utils = { workspace = true }
-parking_lot = "0.12.1"
+parking_lot = { workspace = true }
 
 [features]
 default = ['std']
diff --git a/pallets/otc-settlements/src/mock.rs b/pallets/otc-settlements/src/mock.rs
index 0fb3789c9..3f327c971 100644
--- a/pallets/otc-settlements/src/mock.rs
+++ b/pallets/otc-settlements/src/mock.rs
@@ -190,6 +190,11 @@ impl frame_system::Config for Test {
 	type SS58Prefix = SS58Prefix;
 	type OnSetCode = ();
 	type MaxConsumers = frame_support::traits::ConstU32<16>;
+	type SingleBlockMigrations = ();
+	type MultiBlockMigrator = ();
+	type PreInherents = ();
+	type PostInherents = ();
+	type PostTransactions = ();
 }
 
 impl orml_tokens::Config for Test {
diff --git a/pallets/otc-settlements/src/weights.rs b/pallets/otc-settlements/src/weights.rs
index 7e40e9064..988c134c9 100644
--- a/pallets/otc-settlements/src/weights.rs
+++ b/pallets/otc-settlements/src/weights.rs
@@ -15,10 +15,11 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
+
 //! Autogenerated weights for `pallet_otc_settlements`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
-//! DATE: 2024-07-12, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-09-11, 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`
@@ -28,18 +29,18 @@
 // benchmark
 // pallet
 // --chain=dev
-// --steps=10
-// --repeat=30
+// --steps=50
+// --repeat=20
 // --wasm-execution=compiled
-// --heap-pages=4096
-// --template=scripts/pallet-weight-template.hbs
 // --pallet=pallet-otc-settlements
-// --output=weights/otc-settlements.rs
 // --extrinsic=*
+// --template=scripts/pallet-weight-template.hbs
+// --output=./weights/pallet_otc_settlements.rs
 
+#![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
-#![allow(clippy::unnecessary_cast)]
+#![allow(missing_docs)]
 
 use frame_support::{
 	traits::Get,
@@ -64,8 +65,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `747`
 		//  Estimated: `6196`
-		// Minimum execution time: 97_577_000 picoseconds.
-		Weight::from_parts(98_741_000, 6196)
+		// Minimum execution time: 101_333_000 picoseconds.
+		Weight::from_parts(102_441_000, 6196)
 			.saturating_add(RocksDbWeight::get().reads(4_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
diff --git a/pallets/otc/Cargo.toml b/pallets/otc/Cargo.toml
index 97633fbdf..2e938e458 100644
--- a/pallets/otc/Cargo.toml
+++ b/pallets/otc/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = 'pallet-otc'
-version = '2.0.1'
+version = '2.0.2'
 description = 'A pallet for trustless over-the-counter trading'
 authors = ['GalacticCouncil']
 edition = '2021'
@@ -9,8 +9,8 @@ repository = "https://github.com/galacticcouncil/Hydradx-node"
 
 [dependencies]
 # parity
-codec = { package = "parity-scale-codec", version = "3.4.0", features = ["derive", "max-encoded-len"], default-features = false }
-scale-info = { version = "2.1.2", default-features = false, features = ["derive"] }
+codec = { workspace = true, features = ["derive", "max-encoded-len"] }
+scale-info = { workspace = true }
 
 # primitives
 sp-runtime = { workspace = true }
@@ -34,8 +34,8 @@ frame-benchmarking = { workspace = true, optional = true }
 sp-api = { workspace = true }
 sp-io = { workspace = true }
 orml-tokens = { workspace = true, features=["std"] }
-proptest = "1.0.0"
-pretty_assertions = "1.2.1"
+proptest = { workspace = true }
+pretty_assertions = { workspace = true }
 test-utils = { workspace = true }
 
 [features]
diff --git a/pallets/otc/src/tests/mock.rs b/pallets/otc/src/tests/mock.rs
index e314193d6..13546d1c0 100644
--- a/pallets/otc/src/tests/mock.rs
+++ b/pallets/otc/src/tests/mock.rs
@@ -123,6 +123,11 @@ impl system::Config for Test {
 	type SS58Prefix = SS58Prefix;
 	type OnSetCode = ();
 	type MaxConsumers = frame_support::traits::ConstU32<16>;
+	type SingleBlockMigrations = ();
+	type MultiBlockMigrator = ();
+	type PreInherents = ();
+	type PostInherents = ();
+	type PostTransactions = ();
 }
 
 impl orml_tokens::Config for Test {
@@ -304,7 +309,7 @@ impl ExtBuilder {
 }
 
 thread_local! {
-	pub static DUMMYTHREADLOCAL: RefCell<u128> = RefCell::new(100);
+	pub static DUMMYTHREADLOCAL: RefCell<u128> = const { RefCell::new(100) };
 }
 
 pub fn expect_events(e: Vec<RuntimeEvent>) {
diff --git a/pallets/otc/src/weights.rs b/pallets/otc/src/weights.rs
index cd8a19cdd..608937384 100644
--- a/pallets/otc/src/weights.rs
+++ b/pallets/otc/src/weights.rs
@@ -15,10 +15,11 @@
 // 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 32.0.0
-//! DATE: 2024-07-12, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-09-10, 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`
@@ -28,18 +29,18 @@
 // benchmark
 // pallet
 // --chain=dev
-// --steps=10
-// --repeat=30
+// --steps=50
+// --repeat=20
 // --wasm-execution=compiled
-// --heap-pages=4096
-// --template=scripts/pallet-weight-template.hbs
 // --pallet=pallet-otc
-// --output=weights/otc.rs
 // --extrinsic=*
+// --template=scripts/pallet-weight-template.hbs
+// --output=./weights/pallet_otc.rs
 
+#![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
-#![allow(clippy::unnecessary_cast)]
+#![allow(missing_docs)]
 
 use frame_support::{
 	traits::Get,
@@ -71,8 +72,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `963`
 		//  Estimated: `6190`
-		// Minimum execution time: 46_746_000 picoseconds.
-		Weight::from_parts(47_337_000, 6190)
+		// Minimum execution time: 46_446_000 picoseconds.
+		Weight::from_parts(47_816_000, 6190)
 			.saturating_add(RocksDbWeight::get().reads(5_u64))
 			.saturating_add(RocksDbWeight::get().writes(4_u64))
 	}
@@ -80,6 +81,8 @@ impl WeightInfo for () {
 	/// 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(125), added: 2600, mode: `MaxEncodedLen`)
+	/// Storage: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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)
@@ -96,15 +99,17 @@ impl WeightInfo for () {
 	/// Proof: `MultiTransactionPayment::AcceptedCurrencies` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
 	fn partial_fill_order() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2228`
+		//  Measured:  `2436`
 		//  Estimated: `13905`
-		// Minimum execution time: 164_109_000 picoseconds.
-		Weight::from_parts(164_977_000, 13905)
-			.saturating_add(RocksDbWeight::get().reads(18_u64))
+		// Minimum execution time: 165_029_000 picoseconds.
+		Weight::from_parts(166_577_000, 13905)
+			.saturating_add(RocksDbWeight::get().reads(19_u64))
 			.saturating_add(RocksDbWeight::get().writes(8_u64))
 	}
 	/// Storage: `OTC::Orders` (r:1 w:1)
 	/// Proof: `OTC::Orders` (`max_values`: None, `max_size`: Some(93), added: 2568, mode: `MaxEncodedLen`)
+	/// Storage: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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)
@@ -123,11 +128,11 @@ impl WeightInfo for () {
 	/// Proof: `MultiTransactionPayment::AcceptedCurrencies` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
 	fn fill_order() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2228`
+		//  Measured:  `2436`
 		//  Estimated: `13905`
-		// Minimum execution time: 159_500_000 picoseconds.
-		Weight::from_parts(161_112_000, 13905)
-			.saturating_add(RocksDbWeight::get().reads(18_u64))
+		// Minimum execution time: 161_252_000 picoseconds.
+		Weight::from_parts(162_540_000, 13905)
+			.saturating_add(RocksDbWeight::get().reads(19_u64))
 			.saturating_add(RocksDbWeight::get().writes(8_u64))
 	}
 	/// Storage: `OTC::Orders` (r:1 w:1)
@@ -142,8 +147,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `1197`
 		//  Estimated: `4726`
-		// Minimum execution time: 42_224_000 picoseconds.
-		Weight::from_parts(42_776_000, 4726)
+		// Minimum execution time: 42_576_000 picoseconds.
+		Weight::from_parts(42_962_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 981f0829e..261e5ab24 100644
--- a/pallets/referrals/Cargo.toml
+++ b/pallets/referrals/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-referrals"
-version = "1.2.5"
+version = "1.2.6"
 authors = ['GalacticCouncil']
 edition = "2021"
 license = "Apache-2.0"
@@ -13,10 +13,10 @@ readme = "README.md"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-hex-literal = "0.3.4"
+hex-literal = { workspace = true }
 # parity
-scale-info = { version = "2.3.1", default-features = false, features = ["derive"] }
-codec = { default-features = false, features = ["derive"], package = "parity-scale-codec", version = "3.4.0" }
+scale-info = { workspace = true }
+codec = { workspace = true }
 
 # HydraDX
 hydradx-traits = { workspace = true }
@@ -39,7 +39,7 @@ orml-traits = { workspace = true }
 [dev-dependencies]
 sp-io = { workspace = true }
 sp-tracing = { workspace = true }
-pretty_assertions = "1.2.1"
+pretty_assertions = { workspace = true }
 orml-tokens = { workspace = true }
 
 [features]
diff --git a/pallets/referrals/src/tests.rs b/pallets/referrals/src/tests.rs
index 3267a3e6b..29d5a373e 100644
--- a/pallets/referrals/src/tests.rs
+++ b/pallets/referrals/src/tests.rs
@@ -70,7 +70,7 @@ thread_local! {
 	pub static TIER_VOLUME: RefCell<HashMap<Level, Option<Balance>>> = RefCell::new(HashMap::default());
 	pub static TIER_REWARDS: RefCell<HashMap<Level, FeeDistribution>> = RefCell::new(HashMap::default());
 	pub static SEED_AMOUNT: RefCell<Balance> = RefCell::new(Balance::zero());
-	pub static EXTERNAL_ACCOUNT: RefCell<Option<AccountId>> = RefCell::new(None);
+	pub static EXTERNAL_ACCOUNT: RefCell<Option<AccountId>> = const { RefCell::new(None) };
 }
 
 construct_runtime!(
@@ -173,6 +173,11 @@ impl frame_system::Config for Test {
 	type SS58Prefix = ();
 	type OnSetCode = ();
 	type MaxConsumers = ConstU32<16>;
+	type SingleBlockMigrations = ();
+	type MultiBlockMigrator = ();
+	type PreInherents = ();
+	type PostInherents = ();
+	type PostTransactions = ();
 }
 
 parameter_type_with_key! {
diff --git a/pallets/referrals/src/weights.rs b/pallets/referrals/src/weights.rs
index d2a537eb0..2c2e7ee12 100644
--- a/pallets/referrals/src/weights.rs
+++ b/pallets/referrals/src/weights.rs
@@ -15,36 +15,32 @@
 // 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 32.0.0
-//! DATE: 2024-05-23, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-09-10, 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`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
 
 // Executed Command:
-// ./target/release/hydradx
+// target/release/hydradx
 // benchmark
 // pallet
+// --chain=dev
+// --steps=50
+// --repeat=20
 // --wasm-execution=compiled
-// --pallet
-// *
-// --extrinsic
-// *
-// --heap-pages
-// 4096
-// --steps
-// 50
-// --repeat
-// 20
+// --pallet=pallet-referrals
+// --extrinsic=*
 // --template=scripts/pallet-weight-template.hbs
-// --output
-// weights/
+// --output=./weights/pallet_referrals.rs
 
+#![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
-#![allow(clippy::unnecessary_cast)]
+#![allow(missing_docs)]
 
 use frame_support::{
 	traits::Get,
@@ -75,8 +71,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `318`
 		//  Estimated: `6196`
-		// Minimum execution time: 58_712_000 picoseconds.
-		Weight::from_parts(59_464_000, 6196)
+		// Minimum execution time: 59_104_000 picoseconds.
+		Weight::from_parts(59_872_000, 6196)
 			.saturating_add(RocksDbWeight::get().reads(4_u64))
 			.saturating_add(RocksDbWeight::get().writes(5_u64))
 	}
@@ -88,8 +84,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `228`
 		//  Estimated: `3545`
-		// Minimum execution time: 17_123_000 picoseconds.
-		Weight::from_parts(17_546_000, 3545)
+		// Minimum execution time: 17_219_000 picoseconds.
+		Weight::from_parts(17_478_000, 3545)
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -105,6 +101,8 @@ 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: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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)
@@ -133,11 +131,11 @@ 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:  `2226`
+		//  Measured:  `2434`
 		//  Estimated: `8790`
-		// Minimum execution time: 263_297_000 picoseconds.
-		Weight::from_parts(264_892_000, 8790)
-			.saturating_add(RocksDbWeight::get().reads(27_u64))
+		// Minimum execution time: 267_679_000 picoseconds.
+		Weight::from_parts(269_271_000, 8790)
+			.saturating_add(RocksDbWeight::get().reads(28_u64))
 			.saturating_add(RocksDbWeight::get().writes(15_u64))
 	}
 	/// Storage: `Referrals::PendingConversions` (r:1 w:0)
@@ -156,8 +154,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `689`
 		//  Estimated: `6196`
-		// Minimum execution time: 77_361_000 picoseconds.
-		Weight::from_parts(78_136_000, 6196)
+		// Minimum execution time: 78_198_000 picoseconds.
+		Weight::from_parts(78_998_000, 6196)
 			.saturating_add(RocksDbWeight::get().reads(7_u64))
 			.saturating_add(RocksDbWeight::get().writes(6_u64))
 	}
@@ -167,8 +165,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `76`
 		//  Estimated: `3514`
-		// Minimum execution time: 11_771_000 picoseconds.
-		Weight::from_parts(11_990_000, 3514)
+		// Minimum execution time: 11_391_000 picoseconds.
+		Weight::from_parts(11_668_000, 3514)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
diff --git a/pallets/relaychain-info/Cargo.toml b/pallets/relaychain-info/Cargo.toml
index 5e0f04ef4..88d241665 100644
--- a/pallets/relaychain-info/Cargo.toml
+++ b/pallets/relaychain-info/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-relaychain-info"
-version = "0.3.4"
+version = "0.3.5"
 description = "Relaychain info pallet provides various support features for a parachain"
 authors = ["GalacticCouncil"]
 edition = "2021"
@@ -8,8 +8,8 @@ license = "Apache 2.0"
 repository = "https://github.com/galacticcouncil/warehouse/tree/master/relaychain-info"
 
 [dependencies]
-codec = { default-features = false, features = ["derive"], package = "parity-scale-codec", version = "3.4.0" }
-scale-info = { version = "2.1.2", default-features = false, features = ["derive"] }
+codec = { workspace = true }
+scale-info = { workspace = true }
 
 # Substrate dependencies
 sp-std = { workspace = true }
diff --git a/pallets/route-executor/Cargo.toml b/pallets/route-executor/Cargo.toml
index 16894edfd..8ce1e6bb3 100644
--- a/pallets/route-executor/Cargo.toml
+++ b/pallets/route-executor/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = 'pallet-route-executor'
-version = '2.6.0'
+version = '2.6.1'
 description = 'A pallet to execute a route containing a sequence of trades'
 authors = ['GalacticCouncil']
 edition = '2021'
@@ -8,9 +8,9 @@ license = 'Apache 2.0'
 repository = "https://github.com/galacticcouncil/HydraDX-node/tree/master/route-executor"
 
 [dependencies]
-codec = { default-features = false, features = ["derive"], package = "parity-scale-codec", version = "3.4.0" }
-scale-info = { version = "2.1.2", default-features = false, features = ["derive"] }
-serde = { features = ["derive"], optional = true, version = "1.0.137" }
+codec = { workspace = true }
+scale-info = { workspace = true }
+serde = { workspace = true }
 
 # HydraDX dependencies
 hydradx-traits = { workspace = true }
@@ -30,7 +30,7 @@ pallet-balances = { workspace = true }
 
 [dev-dependencies]
 sp-io = { workspace = true }
-pretty_assertions = "1.2.1"
+pretty_assertions = { workspace = true }
 orml-tokens = { workspace = true }
 pallet-currencies = { workspace = true }
 hydradx-adapters = { workspace = true }
diff --git a/pallets/route-executor/src/tests/mock.rs b/pallets/route-executor/src/tests/mock.rs
index 0363cf739..40eda43ca 100644
--- a/pallets/route-executor/src/tests/mock.rs
+++ b/pallets/route-executor/src/tests/mock.rs
@@ -83,6 +83,11 @@ impl frame_system::Config for Test {
 	type SS58Prefix = SS58Prefix;
 	type OnSetCode = ();
 	type MaxConsumers = frame_support::traits::ConstU32<16>;
+	type SingleBlockMigrations = ();
+	type MultiBlockMigrator = ();
+	type PreInherents = ();
+	type PostInherents = ();
+	type PostTransactions = ();
 }
 
 pub type Amount = i128;
diff --git a/pallets/route-executor/src/weights.rs b/pallets/route-executor/src/weights.rs
index 653099c85..8835c140d 100644
--- a/pallets/route-executor/src/weights.rs
+++ b/pallets/route-executor/src/weights.rs
@@ -19,7 +19,7 @@
 //! Autogenerated weights for `pallet_route_executor`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
-//! DATE: 2024-07-23, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-09-11, 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`
@@ -29,14 +29,13 @@
 // benchmark
 // pallet
 // --chain=dev
-// --steps=10
-// --repeat=30
+// --steps=50
+// --repeat=20
 // --wasm-execution=compiled
-// --heap-pages=4096
-// --template=scripts/pallet-weight-template.hbs
 // --pallet=pallet-route-executor
-// --output=weights/router.rs
 // --extrinsic=*
+// --template=scripts/pallet-weight-template.hbs
+// --output=./weights/pallet_route_executor.rs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -70,175 +69,8 @@ impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `944`
 		//  Estimated: `3590`
-		// Minimum execution time: 13_700_000 picoseconds.
-		Weight::from_parts(13_874_000, 3590)
-			.saturating_add(T::DbWeight::get().reads(1_u64))
-			.saturating_add(T::DbWeight::get().writes(1_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: `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: `Router::SkipEd` (r:1 w:1)
-	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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`)
-	/// The range of component `c` is `[0, 1]`.
-	fn calculate_and_execute_sell_in_lbp(c: u32, ) -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `3743`
-		//  Estimated: `13905`
-		// Minimum execution time: 352_057_000 picoseconds.
-		Weight::from_parts(358_601_823, 13905)
-			// Standard Error: 319_985
-			.saturating_add(Weight::from_parts(70_948_801, 0).saturating_mul(c.into()))
-			.saturating_add(T::DbWeight::get().reads(17_u64))
-			.saturating_add(T::DbWeight::get().writes(8_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: `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: `Router::SkipEd` (r:1 w:1)
-	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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`)
-	/// 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:  `1637 + b * (2131 ±0)`
-		//  Estimated: `6156 + b * (7749 ±245_709_589_663_843_264)`
-		// Minimum execution time: 94_752_000 picoseconds.
-		Weight::from_parts(96_589_000, 6156)
-			// Standard Error: 840_786
-			.saturating_add(Weight::from_parts(3_341_044, 0).saturating_mul(c.into()))
-			// Standard Error: 1_845_765
-			.saturating_add(Weight::from_parts(271_881_978, 0).saturating_mul(b.into()))
-			.saturating_add(T::DbWeight::get().reads(3_u64))
-			.saturating_add(T::DbWeight::get().reads((14_u64).saturating_mul(b.into())))
-			.saturating_add(T::DbWeight::get().writes((8_u64).saturating_mul(b.into())))
-			.saturating_add(Weight::from_parts(0, 7749).saturating_mul(b.into()))
-	}
-	/// Storage: `EmaOracle::Oracles` (r:2 w:0)
-	/// Proof: `EmaOracle::Oracles` (`max_values`: None, `max_size`: Some(177), added: 2652, 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: `AssetRegistry::Assets` (r:6 w:0)
-	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
-	/// Storage: `XYK::ShareToken` (r:6 w:0)
-	/// Proof: `XYK::ShareToken` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
-	/// Storage: `Router::SkipEd` (r:1 w:0)
-	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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:  `7004`
-		//  Estimated: `39735`
-		// Minimum execution time: 1_946_884_000 picoseconds.
-		Weight::from_parts(1_957_705_000, 39735)
-			.saturating_add(T::DbWeight::get().reads(58_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: 25_748_000 picoseconds.
-		Weight::from_parts(26_215_000, 0)
-			.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`)
-	fn get_route() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `800`
-		//  Estimated: `3555`
-		// Minimum execution time: 7_522_000 picoseconds.
-		Weight::from_parts(7_689_000, 3555)
-			.saturating_add(T::DbWeight::get().reads(1_u64))
-	}
-	/// Storage: `EmaOracle::Oracles` (r:2 w:0)
-	/// Proof: `EmaOracle::Oracles` (`max_values`: None, `max_size`: Some(177), added: 2652, mode: `MaxEncodedLen`)
-	fn get_oracle_price_for_xyk() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1452`
-		//  Estimated: `6294`
-		// Minimum execution time: 26_571_000 picoseconds.
-		Weight::from_parts(27_038_000, 6294)
-			.saturating_add(T::DbWeight::get().reads(2_u64))
-	}
-	/// Storage: `EmaOracle::Oracles` (r:4 w:0)
-	/// Proof: `EmaOracle::Oracles` (`max_values`: None, `max_size`: Some(177), added: 2652, mode: `MaxEncodedLen`)
-	fn get_oracle_price_for_omnipool() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1814`
-		//  Estimated: `11598`
-		// Minimum execution time: 40_728_000 picoseconds.
-		Weight::from_parts(41_338_000, 11598)
-			.saturating_add(T::DbWeight::get().reads(4_u64))
-	}
-	/// 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:0)
-	/// Proof: `Tokens::Locks` (`max_values`: None, `max_size`: Some(1261), added: 3736, 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_spot_price_with_fee_in_lbp() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `1674`
-		//  Estimated: `6156`
-		// Minimum execution time: 35_793_000 picoseconds.
-		Weight::from_parts(36_285_000, 6156)
-			.saturating_add(T::DbWeight::get().reads(4_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(125), added: 2600, mode: `MaxEncodedLen`)
-	/// Storage: `Router::SkipEd` (r:0 w:1)
-	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`)
-	fn skip_ed_handling_for_trade_with_insufficient_assets() -> Weight {
-		// Proof Size summary in bytes:
-		//  Measured:  `944`
-		//  Estimated: `3590`
-		// Minimum execution time: 13_700_000 picoseconds.
-		Weight::from_parts(13_874_000, 3590)
+		// Minimum execution time: 14_078_000 picoseconds.
+		Weight::from_parts(14_311_000, 3590)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -263,10 +95,10 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `3743`
 		//  Estimated: `13905`
-		// Minimum execution time: 352_057_000 picoseconds.
-		Weight::from_parts(358_601_823, 13905)
-			// Standard Error: 319_985
-			.saturating_add(Weight::from_parts(70_948_801, 0).saturating_mul(c.into()))
+		// Minimum execution time: 358_498_000 picoseconds.
+		Weight::from_parts(363_434_920, 13905)
+			// Standard Error: 527_071
+			.saturating_add(Weight::from_parts(73_831_579, 0).saturating_mul(c.into()))
 			.saturating_add(RocksDbWeight::get().reads(17_u64))
 			.saturating_add(RocksDbWeight::get().writes(8_u64))
 	}
@@ -291,13 +123,13 @@ impl WeightInfo for () {
 	fn calculate_and_execute_buy_in_lbp(c: u32, b: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `1637 + b * (2131 ±0)`
-		//  Estimated: `6156 + b * (7749 ±245_709_589_663_843_264)`
-		// Minimum execution time: 94_752_000 picoseconds.
-		Weight::from_parts(96_589_000, 6156)
-			// Standard Error: 840_786
-			.saturating_add(Weight::from_parts(3_341_044, 0).saturating_mul(c.into()))
-			// Standard Error: 1_845_765
-			.saturating_add(Weight::from_parts(271_881_978, 0).saturating_mul(b.into()))
+		//  Estimated: `8799 + b * (7749 ±0)`
+		// Minimum execution time: 97_161_000 picoseconds.
+		Weight::from_parts(98_156_000, 8799)
+			// Standard Error: 243_998
+			.saturating_add(Weight::from_parts(1_011_059, 0).saturating_mul(c.into()))
+			// Standard Error: 543_453
+			.saturating_add(Weight::from_parts(269_812_210, 0).saturating_mul(b.into()))
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
 			.saturating_add(RocksDbWeight::get().reads((14_u64).saturating_mul(b.into())))
 			.saturating_add(RocksDbWeight::get().writes((8_u64).saturating_mul(b.into())))
@@ -333,8 +165,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `7004`
 		//  Estimated: `39735`
-		// Minimum execution time: 1_946_884_000 picoseconds.
-		Weight::from_parts(1_957_705_000, 39735)
+		// Minimum execution time: 1_934_148_000 picoseconds.
+		Weight::from_parts(1_942_875_000, 39735)
 			.saturating_add(RocksDbWeight::get().reads(58_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -344,8 +176,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `1012`
 		//  Estimated: `0`
-		// Minimum execution time: 25_748_000 picoseconds.
-		Weight::from_parts(26_215_000, 0)
+		// Minimum execution time: 25_655_000 picoseconds.
+		Weight::from_parts(26_130_000, 0)
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
 	/// Storage: `Router::Routes` (r:1 w:0)
@@ -354,8 +186,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `800`
 		//  Estimated: `3555`
-		// Minimum execution time: 7_522_000 picoseconds.
-		Weight::from_parts(7_689_000, 3555)
+		// Minimum execution time: 7_524_000 picoseconds.
+		Weight::from_parts(7_759_000, 3555)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 	}
 	/// Storage: `EmaOracle::Oracles` (r:2 w:0)
@@ -364,8 +196,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `1452`
 		//  Estimated: `6294`
-		// Minimum execution time: 26_571_000 picoseconds.
-		Weight::from_parts(27_038_000, 6294)
+		// Minimum execution time: 26_686_000 picoseconds.
+		Weight::from_parts(26_929_000, 6294)
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 	}
 	/// Storage: `EmaOracle::Oracles` (r:4 w:0)
@@ -374,8 +206,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `1814`
 		//  Estimated: `11598`
-		// Minimum execution time: 40_728_000 picoseconds.
-		Weight::from_parts(41_338_000, 11598)
+		// Minimum execution time: 40_799_000 picoseconds.
+		Weight::from_parts(41_526_000, 11598)
 			.saturating_add(RocksDbWeight::get().reads(4_u64))
 	}
 	/// Storage: `LBP::PoolData` (r:1 w:0)
@@ -388,8 +220,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `1674`
 		//  Estimated: `6156`
-		// Minimum execution time: 35_793_000 picoseconds.
-		Weight::from_parts(36_285_000, 6156)
+		// Minimum execution time: 36_673_000 picoseconds.
+		Weight::from_parts(37_031_000, 6156)
 			.saturating_add(RocksDbWeight::get().reads(4_u64))
 	}
 }
diff --git a/pallets/stableswap/Cargo.toml b/pallets/stableswap/Cargo.toml
index 462c072f5..897272638 100644
--- a/pallets/stableswap/Cargo.toml
+++ b/pallets/stableswap/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = 'pallet-stableswap'
-version = '3.6.4'
+version = '3.6.5'
 description = 'AMM for correlated assets'
 authors = ['GalacticCouncil']
 edition = '2021'
@@ -12,12 +12,12 @@ repository = "https://github.com/galacticcouncil/warehouse"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-bitflags = "1.3.2"
+bitflags = { workspace = true }
 
 # parity
-scale-info = { version = "2.1.2", default-features = false, features = ["derive"] }
-codec = { default-features = false, features = ["derive"], package = "parity-scale-codec", version = "3.4.0" }
-serde = { features = ["derive"], optional = true, version = "1.0.137" }
+scale-info = { workspace = true }
+codec = { workspace = true }
+serde = { workspace = true }
 
 # primitives
 sp-runtime = { workspace = true }
@@ -44,8 +44,8 @@ frame-benchmarking = { workspace = true, optional = true }
 [dev-dependencies]
 sp-api = { workspace = true }
 sp-tracing = { workspace = true }
-orml-tokens = { workspace = true, features=["std"] }
-proptest = "1.0.0"
+orml-tokens = { workspace = true, features = ["std"] }
+proptest = { workspace = true }
 test-utils = { workspace = true }
 
 [features]
diff --git a/pallets/stableswap/src/tests/mock.rs b/pallets/stableswap/src/tests/mock.rs
index 079938ce3..f6a447582 100644
--- a/pallets/stableswap/src/tests/mock.rs
+++ b/pallets/stableswap/src/tests/mock.rs
@@ -69,10 +69,10 @@ macro_rules! assert_balance {
 thread_local! {
 	pub static REGISTERED_ASSETS: RefCell<HashMap<AssetId, (u32,u8)>> = RefCell::new(HashMap::default());
 	pub static ASSET_IDENTS: RefCell<HashMap<Vec<u8>, u32>> = RefCell::new(HashMap::default());
-	pub static POOL_IDS: RefCell<Vec<AssetId>> = RefCell::new(Vec::new());
-	pub static DUSTER_WHITELIST: RefCell<Vec<AccountId>> = RefCell::new(Vec::new());
-	pub static LAST_LIQUDITY_CHANGE_HOOK: RefCell<Option<(AssetId, PoolState<AssetId>)>> = RefCell::new(None);
-	pub static LAST_TRADE_HOOK: RefCell<Option<(AssetId, AssetId, AssetId, PoolState<AssetId>)>> = RefCell::new(None);
+	pub static POOL_IDS: RefCell<Vec<AssetId>> = const { RefCell::new(Vec::new()) };
+	pub static DUSTER_WHITELIST: RefCell<Vec<AccountId>> = const { RefCell::new(Vec::new()) };
+	pub static LAST_LIQUDITY_CHANGE_HOOK: RefCell<Option<(AssetId, PoolState<AssetId>)>> = const { RefCell::new(None) };
+	pub static LAST_TRADE_HOOK: RefCell<Option<(AssetId, AssetId, AssetId, PoolState<AssetId>)>> = const { RefCell::new(None) };
 }
 
 construct_runtime!(
@@ -109,6 +109,11 @@ impl frame_system::Config for Test {
 	type SS58Prefix = ();
 	type OnSetCode = ();
 	type MaxConsumers = ConstU32<16>;
+	type SingleBlockMigrations = ();
+	type MultiBlockMigrator = ();
+	type PreInherents = ();
+	type PostInherents = ();
+	type PostTransactions = ();
 }
 
 parameter_type_with_key! {
diff --git a/pallets/stableswap/src/weights.rs b/pallets/stableswap/src/weights.rs
index 46753cdd5..2a6b88fbf 100644
--- a/pallets/stableswap/src/weights.rs
+++ b/pallets/stableswap/src/weights.rs
@@ -15,10 +15,11 @@
 // 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 32.0.0
-//! DATE: 2024-06-20, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-09-10, 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`
@@ -28,18 +29,18 @@
 // benchmark
 // pallet
 // --chain=dev
-// --steps=10
-// --repeat=30
+// --steps=50
+// --repeat=20
 // --wasm-execution=compiled
-// --heap-pages=4096
-// --template=scripts/pallet-weight-template.hbs
 // --pallet=pallet-stableswap
-// --output=weights/stableswap.rs
 // --extrinsic=*
+// --template=scripts/pallet-weight-template.hbs
+// --output=./weights/pallet_stableswap.rs
 
+#![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
-#![allow(clippy::unnecessary_cast)]
+#![allow(missing_docs)]
 
 use frame_support::{
 	traits::Get,
@@ -76,8 +77,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `855`
 		//  Estimated: `16590`
-		// Minimum execution time: 42_163_000 picoseconds.
-		Weight::from_parts(42_971_000, 16590)
+		// Minimum execution time: 41_642_000 picoseconds.
+		Weight::from_parts(42_696_000, 16590)
 			.saturating_add(RocksDbWeight::get().reads(7_u64))
 			.saturating_add(RocksDbWeight::get().writes(2_u64))
 	}
@@ -99,17 +100,19 @@ impl WeightInfo for () {
 	/// 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: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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:  `3471`
+		//  Measured:  `3679`
 		//  Estimated: `29403`
-		// Minimum execution time: 1_327_528_000 picoseconds.
-		Weight::from_parts(1_331_117_000, 29403)
-			.saturating_add(RocksDbWeight::get().reads(35_u64))
+		// Minimum execution time: 1_344_257_000 picoseconds.
+		Weight::from_parts(1_350_664_000, 29403)
+			.saturating_add(RocksDbWeight::get().reads(36_u64))
 			.saturating_add(RocksDbWeight::get().writes(14_u64))
 	}
 	/// Storage: `Stableswap::AssetTradability` (r:1 w:0)
@@ -130,17 +133,19 @@ impl WeightInfo for () {
 	/// 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: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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:  `3339`
+		//  Measured:  `3548`
 		//  Estimated: `19071`
-		// Minimum execution time: 896_585_000 picoseconds.
-		Weight::from_parts(900_938_000, 19071)
-			.saturating_add(RocksDbWeight::get().reads(23_u64))
+		// Minimum execution time: 914_603_000 picoseconds.
+		Weight::from_parts(920_734_000, 19071)
+			.saturating_add(RocksDbWeight::get().reads(24_u64))
 			.saturating_add(RocksDbWeight::get().writes(6_u64))
 	}
 	/// Storage: `Stableswap::AssetTradability` (r:1 w:0)
@@ -155,6 +160,8 @@ impl WeightInfo for () {
 	/// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
 	/// Storage: `System::Account` (r:2 w:1)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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)
@@ -167,11 +174,11 @@ 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:  `3363`
+		//  Measured:  `3571`
 		//  Estimated: `19071`
-		// Minimum execution time: 925_710_000 picoseconds.
-		Weight::from_parts(928_674_000, 19071)
-			.saturating_add(RocksDbWeight::get().reads(22_u64))
+		// Minimum execution time: 942_225_000 picoseconds.
+		Weight::from_parts(945_590_000, 19071)
+			.saturating_add(RocksDbWeight::get().reads(23_u64))
 			.saturating_add(RocksDbWeight::get().writes(7_u64))
 	}
 	/// Storage: `Stableswap::AssetTradability` (r:1 w:0)
@@ -184,6 +191,8 @@ impl WeightInfo for () {
 	/// 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: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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)
@@ -198,11 +207,11 @@ 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:  `3363`
+		//  Measured:  `3571`
 		//  Estimated: `19071`
-		// Minimum execution time: 1_412_294_000 picoseconds.
-		Weight::from_parts(1_416_948_000, 19071)
-			.saturating_add(RocksDbWeight::get().reads(23_u64))
+		// Minimum execution time: 1_303_657_000 picoseconds.
+		Weight::from_parts(1_309_790_000, 19071)
+			.saturating_add(RocksDbWeight::get().reads(24_u64))
 			.saturating_add(RocksDbWeight::get().writes(6_u64))
 	}
 	/// Storage: `Stableswap::AssetTradability` (r:2 w:0)
@@ -213,6 +222,8 @@ impl WeightInfo for () {
 	/// 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(125), added: 2600, mode: `MaxEncodedLen`)
+	/// Storage: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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)
@@ -229,11 +240,11 @@ 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:  `3426`
+		//  Measured:  `3634`
 		//  Estimated: `19071`
-		// Minimum execution time: 862_103_000 picoseconds.
-		Weight::from_parts(867_533_000, 19071)
-			.saturating_add(RocksDbWeight::get().reads(25_u64))
+		// Minimum execution time: 879_444_000 picoseconds.
+		Weight::from_parts(883_301_000, 19071)
+			.saturating_add(RocksDbWeight::get().reads(26_u64))
 			.saturating_add(RocksDbWeight::get().writes(7_u64))
 	}
 	/// Storage: `Stableswap::AssetTradability` (r:2 w:0)
@@ -244,6 +255,8 @@ impl WeightInfo for () {
 	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
 	/// Storage: `AssetRegistry::Assets` (r:6 w:0)
 	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
+	/// Storage: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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)
@@ -260,11 +273,11 @@ 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:  `3396`
+		//  Measured:  `3604`
 		//  Estimated: `19071`
-		// Minimum execution time: 844_279_000 picoseconds.
-		Weight::from_parts(848_664_000, 19071)
-			.saturating_add(RocksDbWeight::get().reads(26_u64))
+		// Minimum execution time: 864_832_000 picoseconds.
+		Weight::from_parts(867_874_000, 19071)
+			.saturating_add(RocksDbWeight::get().reads(27_u64))
 			.saturating_add(RocksDbWeight::get().writes(6_u64))
 	}
 	/// Storage: `Stableswap::Pools` (r:1 w:0)
@@ -275,8 +288,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `291`
 		//  Estimated: `3522`
-		// Minimum execution time: 21_172_000 picoseconds.
-		Weight::from_parts(21_538_000, 3522)
+		// Minimum execution time: 20_286_000 picoseconds.
+		Weight::from_parts(20_596_000, 3522)
 			.saturating_add(RocksDbWeight::get().reads(2_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -286,8 +299,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `291`
 		//  Estimated: `3522`
-		// Minimum execution time: 18_710_000 picoseconds.
-		Weight::from_parts(19_155_000, 3522)
+		// Minimum execution time: 17_920_000 picoseconds.
+		Weight::from_parts(18_179_000, 3522)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -297,8 +310,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `291`
 		//  Estimated: `3522`
-		// Minimum execution time: 19_403_000 picoseconds.
-		Weight::from_parts(19_822_000, 3522)
+		// Minimum execution time: 18_938_000 picoseconds.
+		Weight::from_parts(19_266_000, 3522)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -310,6 +323,8 @@ impl WeightInfo for () {
 	/// 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: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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)
@@ -326,18 +341,18 @@ 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:  `1621 + e * (1805 ±0)`
-		//  Estimated: `13990 + e * (5797 ±201_913_854_157_949_888)`
-		// Minimum execution time: 371_777_000 picoseconds.
-		Weight::from_parts(384_499_218, 13990)
-			// Standard Error: 722_175
-			.saturating_add(Weight::from_parts(831_895_585, 0).saturating_mul(e.into()))
+		//  Measured:  `1621 + e * (2013 ±0)`
+		//  Estimated: `13990 + e * (5166 ±0)`
+		// Minimum execution time: 381_827_000 picoseconds.
+		Weight::from_parts(392_709_451, 13990)
+			// Standard Error: 757_457
+			.saturating_add(Weight::from_parts(852_318_239, 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().reads((15_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`)
@@ -347,6 +362,8 @@ impl WeightInfo for () {
 	/// 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: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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)
@@ -363,20 +380,20 @@ impl WeightInfo for () {
 	/// 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 {
+	fn router_execution_buy(c: u32, e: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1620 + e * (1776 ±0)`
-		//  Estimated: `13990 + e * (5797 ±213_489_293_787_578_112)`
-		// Minimum execution time: 371_923_000 picoseconds.
-		Weight::from_parts(373_003_000, 13990)
-			// Standard Error: 3_999_909
-			.saturating_add(Weight::from_parts(15_028_502, 0).saturating_mul(c.into()))
-			// Standard Error: 8_780_942
-			.saturating_add(Weight::from_parts(520_802_190, 0).saturating_mul(e.into()))
+		//  Measured:  `1620 + e * (1984 ±0)`
+		//  Estimated: `13990 + e * (5166 ±0)`
+		// Minimum execution time: 381_083_000 picoseconds.
+		Weight::from_parts(383_051_000, 13990)
+			// Standard Error: 1_076_925
+			.saturating_add(Weight::from_parts(4_093_007, 0).saturating_mul(c.into()))
+			// Standard Error: 2_398_616
+			.saturating_add(Weight::from_parts(496_972_488, 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().reads((16_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()))
 	}
 	/// Storage: `Stableswap::Pools` (r:1 w:0)
 	/// Proof: `Stableswap::Pools` (`max_values`: None, `max_size`: Some(57), added: 2532, mode: `MaxEncodedLen`)
@@ -390,7 +407,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `1827`
 		//  Estimated: `13990`
-		// Minimum execution time: 308_105_000 picoseconds.
-		Weight::from_parts(309_400_000, 13990).saturating_add(RocksDbWeight::get().reads(12_u64))
+		// Minimum execution time: 314_631_000 picoseconds.
+		Weight::from_parts(316_077_000, 13990)
+			.saturating_add(RocksDbWeight::get().reads(12_u64))
 	}
 }
diff --git a/pallets/staking/Cargo.toml b/pallets/staking/Cargo.toml
index 35a8b2dbd..fe0c2ae6c 100644
--- a/pallets/staking/Cargo.toml
+++ b/pallets/staking/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-staking"
-version = "3.1.1"
+version = "3.1.2"
 authors = ['GalacticCouncil']
 edition = "2021"
 license = "Apache-2.0"
@@ -14,10 +14,10 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 # parity
-scale-info = { version = "2.3.1", default-features = false, features = ["derive"] }
-codec = { default-features = false, features = ["derive"], package = "parity-scale-codec", version = "3.4.0" }
-serde = { version = "1.0.136", features = ["derive"], optional = true }
-log = { version = "0.4.17", default-features = false }
+scale-info = { workspace = true }
+codec = { workspace = true }
+serde = { workspace = true, optional = true }
+log = { workspace = true }
 
 # ORML
 orml-traits = { workspace = true }
@@ -37,7 +37,7 @@ pallet-democracy = { workspace = true }
 pallet-uniques = { workspace = true }
 orml-tokens = { workspace = true }
 pallet-balances = { workspace = true }
-pretty_assertions = "1.2.1"
+pretty_assertions = { workspace = true }
 
 [features]
 default = ["std"]
diff --git a/pallets/staking/src/integrations/democracy.rs b/pallets/staking/src/integrations/democracy.rs
index 5d84f2b16..c4078e8cd 100644
--- a/pallets/staking/src/integrations/democracy.rs
+++ b/pallets/staking/src/integrations/democracy.rs
@@ -128,21 +128,17 @@ where
 	}
 
 	fn remove_vote_locks_if_needed(who: &T::AccountId, ref_index: ReferendumIndex) -> Option<Balance> {
-		let Some(position_id) = Pallet::<T>::get_user_position_id(who).ok()? else {
-			return None;
-		};
+		let position_id = Pallet::<T>::get_user_position_id(who).ok()??;
 
 		if let Some(vote) = ProcessedVotes::<T>::get(who, ref_index) {
 			return Some(vote.amount);
 		}
 
-		let Some(vote_idx) = PositionVotes::<T>::get(position_id)
+		let vote_idx = PositionVotes::<T>::get(position_id)
 			.votes
 			.iter()
-			.position(|(idx, _)| *idx == ref_index)
-		else {
-			return None;
-		};
+			.position(|(idx, _)| *idx == ref_index)?;
+
 		let (ref_idx, vote) = PositionVotes::<T>::get(position_id).votes[vote_idx];
 		debug_assert_eq!(ref_idx, ref_index, "Referendum index mismatch");
 		Some(vote.amount)
diff --git a/pallets/staking/src/tests/mock.rs b/pallets/staking/src/tests/mock.rs
index d149fb4e6..7e0a7ef22 100644
--- a/pallets/staking/src/tests/mock.rs
+++ b/pallets/staking/src/tests/mock.rs
@@ -110,6 +110,11 @@ impl frame_system::Config for Test {
 	type SS58Prefix = ();
 	type OnSetCode = ();
 	type MaxConsumers = ConstU32<16>;
+	type SingleBlockMigrations = ();
+	type MultiBlockMigrator = ();
+	type PreInherents = ();
+	type PostInherents = ();
+	type PostTransactions = ();
 }
 
 parameter_types! {
diff --git a/pallets/staking/src/weights.rs b/pallets/staking/src/weights.rs
index 46c45c092..d64badb28 100644
--- a/pallets/staking/src/weights.rs
+++ b/pallets/staking/src/weights.rs
@@ -15,10 +15,11 @@
 // 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 32.0.0
-//! DATE: 2024-05-29, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-09-10, 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`
@@ -28,18 +29,18 @@
 // benchmark
 // pallet
 // --chain=dev
-// --steps=10
-// --repeat=30
+// --steps=50
+// --repeat=20
 // --wasm-execution=compiled
-// --heap-pages=4096
-// --template=scripts/pallet-weight-template.hbs
 // --pallet=pallet-staking
-// --output=weights/staking.rs
 // --extrinsic=*
+// --template=scripts/pallet-weight-template.hbs
+// --output=./weights/pallet_staking.rs
 
+#![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
-#![allow(clippy::unnecessary_cast)]
+#![allow(missing_docs)]
 
 use frame_support::{
 	traits::Get,
@@ -70,8 +71,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `516`
 		//  Estimated: `3655`
-		// Minimum execution time: 34_969_000 picoseconds.
-		Weight::from_parts(35_577_000, 3655)
+		// Minimum execution time: 33_733_000 picoseconds.
+		Weight::from_parts(34_400_000, 3655)
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
 			.saturating_add(RocksDbWeight::get().writes(3_u64))
 	}
@@ -99,8 +100,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `1274`
 		//  Estimated: `6196`
-		// Minimum execution time: 89_837_000 picoseconds.
-		Weight::from_parts(90_522_000, 6196)
+		// Minimum execution time: 88_822_000 picoseconds.
+		Weight::from_parts(89_489_000, 6196)
 			.saturating_add(RocksDbWeight::get().reads(10_u64))
 			.saturating_add(RocksDbWeight::get().writes(8_u64))
 	}
@@ -126,8 +127,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `3379`
 		//  Estimated: `268590`
-		// Minimum execution time: 260_523_000 picoseconds.
-		Weight::from_parts(264_621_000, 268590)
+		// Minimum execution time: 260_117_000 picoseconds.
+		Weight::from_parts(264_603_000, 268590)
 			.saturating_add(RocksDbWeight::get().reads(109_u64))
 			.saturating_add(RocksDbWeight::get().writes(6_u64))
 	}
@@ -153,8 +154,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `3379`
 		//  Estimated: `268590`
-		// Minimum execution time: 256_924_000 picoseconds.
-		Weight::from_parts(260_188_000, 268590)
+		// Minimum execution time: 253_815_000 picoseconds.
+		Weight::from_parts(257_035_000, 268590)
 			.saturating_add(RocksDbWeight::get().reads(109_u64))
 			.saturating_add(RocksDbWeight::get().writes(6_u64))
 	}
@@ -184,8 +185,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `1431`
 		//  Estimated: `6196`
-		// Minimum execution time: 136_034_000 picoseconds.
-		Weight::from_parts(137_189_000, 6196)
+		// Minimum execution time: 134_541_000 picoseconds.
+		Weight::from_parts(135_440_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 8d52b6cfa..6bc89f94b 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.1.0"
+version = "10.1.1"
 description = "Transaction multi currency payment support module"
 authors = ["GalacticCoucil"]
 edition = "2021"
@@ -11,8 +11,8 @@ repository = "https://github.com/galacticcouncil/warehouse"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { default-features = false, features = ["derive"], package = "parity-scale-codec", version = "3.4.0" }
-scale-info = { version = "2.1.2", default-features = false, features = ["derive"] }
+codec = { workspace = true }
+scale-info = { workspace = true }
 
 # ORML dependencies
 orml-traits = { workspace = true }
@@ -37,8 +37,8 @@ pallet-evm = { workspace = true, optional = true }
 
 [dev-dependencies]
 pallet-currencies = { workspace = true }
-orml-tokens = { workspace = true, features=["std"] }
-pallet-balances = { workspace = true, features=["std"] }
+orml-tokens = { workspace = true, features = ["std"] }
+pallet-balances = { workspace = true, features = ["std"] }
 pallet-evm-accounts = { workspace = true, features = ["std"] }
 sp-io = { workspace = true }
 test-utils = { workspace = true }
diff --git a/pallets/transaction-multi-payment/src/mock.rs b/pallets/transaction-multi-payment/src/mock.rs
index 9cb2af24d..27d160e2b 100644
--- a/pallets/transaction-multi-payment/src/mock.rs
+++ b/pallets/transaction-multi-payment/src/mock.rs
@@ -72,7 +72,7 @@ const NORMAL_DISPATCH_RATIO: Perbill = Perbill::from_percent(75);
 const MAX_BLOCK_WEIGHT: Weight = Weight::from_parts(1024, 0);
 
 thread_local! {
-	static EXTRINSIC_BASE_WEIGHT: RefCell<Weight> = RefCell::new(Weight::zero());
+	static EXTRINSIC_BASE_WEIGHT: RefCell<Weight> = const { RefCell::new(Weight::zero()) };
 }
 
 pub struct ExtrinsicBaseWeight;
@@ -156,6 +156,11 @@ impl system::Config for Test {
 	type SS58Prefix = SS58Prefix;
 	type OnSetCode = ();
 	type MaxConsumers = frame_support::traits::ConstU32<16>;
+	type SingleBlockMigrations = ();
+	type MultiBlockMigrator = ();
+	type PreInherents = ();
+	type PostInherents = ();
+	type PostTransactions = ();
 }
 
 impl Config for Test {
@@ -502,8 +507,8 @@ pub struct ValidationData {
 }
 
 thread_local! {
-	static PERMIT_VALIDATION: RefCell<Vec<ValidationData>> = RefCell::new(vec![]);
-	static PERMIT_DISPATCH: RefCell<Vec<PermitDispatchData>> = RefCell::new(vec![]);
+	static PERMIT_VALIDATION: RefCell<Vec<ValidationData>> = const { RefCell::new(vec![]) };
+	static PERMIT_DISPATCH: RefCell<Vec<PermitDispatchData>> = const { RefCell::new(vec![]) };
 }
 
 pub struct PermitDispatchHandler;
diff --git a/pallets/transaction-multi-payment/src/traits.rs b/pallets/transaction-multi-payment/src/traits.rs
index 176c04240..a181b9d79 100644
--- a/pallets/transaction-multi-payment/src/traits.rs
+++ b/pallets/transaction-multi-payment/src/traits.rs
@@ -1,3 +1,4 @@
+use crate::{Config, Error, PhantomData};
 use frame_support::dispatch::PostDispatchInfo;
 use frame_support::pallet_prelude::DispatchResultWithPostInfo;
 use frame_support::sp_runtime::DispatchResult;
@@ -94,3 +95,48 @@ impl EVMPermit for () {
 
 	fn on_dispatch_permit_error() {}
 }
+
+pub struct DisabledEvmPermitHandler<T>(PhantomData<T>);
+impl<T: Config> EVMPermit for DisabledEvmPermitHandler<T> {
+	fn validate_permit(
+		_source: H160,
+		_target: H160,
+		_data: Vec<u8>,
+		_value: U256,
+		_gas_limit: u64,
+		_deadline: U256,
+		_v: u8,
+		_r: H256,
+		_s: H256,
+	) -> DispatchResult {
+		Err(Error::<T>::EvmPermitCallExecutionError.into())
+	}
+
+	fn dispatch_permit(
+		_source: H160,
+		_target: H160,
+		_data: Vec<u8>,
+		_value: U256,
+		_gas_limit: u64,
+		_max_fee_per_gas: U256,
+		_max_priority_fee_per_gas: Option<U256>,
+		_nonce: Option<U256>,
+		_access_list: Vec<(H160, Vec<H256>)>,
+	) -> DispatchResultWithPostInfo {
+		Err(Error::<T>::EvmPermitCallExecutionError.into())
+	}
+
+	fn gas_price() -> (U256, Weight) {
+		Default::default()
+	}
+
+	fn dispatch_weight(_gas_limit: u64) -> Weight {
+		Weight::MAX
+	}
+
+	fn permit_nonce(_account: H160) -> U256 {
+		U256::default()
+	}
+
+	fn on_dispatch_permit_error() {}
+}
diff --git a/pallets/transaction-multi-payment/src/weights.rs b/pallets/transaction-multi-payment/src/weights.rs
index 983400082..13c7badb0 100644
--- a/pallets/transaction-multi-payment/src/weights.rs
+++ b/pallets/transaction-multi-payment/src/weights.rs
@@ -15,36 +15,32 @@
 // 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 32.0.0
-//! DATE: 2024-05-23, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-09-10, 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`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
 
 // Executed Command:
-// ./target/release/hydradx
+// target/release/hydradx
 // benchmark
 // pallet
+// --chain=dev
+// --steps=50
+// --repeat=20
 // --wasm-execution=compiled
-// --pallet
-// *
-// --extrinsic
-// *
-// --heap-pages
-// 4096
-// --steps
-// 50
-// --repeat
-// 20
+// --pallet=pallet-transaction-multi-payment
+// --extrinsic=*
 // --template=scripts/pallet-weight-template.hbs
-// --output
-// weights/
+// --output=./weights/pallet_transaction_multi_payment.rs
 
+#![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
-#![allow(clippy::unnecessary_cast)]
+#![allow(missing_docs)]
 
 use frame_support::{
 	traits::Get,
@@ -68,10 +64,10 @@ impl WeightInfo for () {
 	/// Proof: `MultiTransactionPayment::AcceptedCurrencies` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
 	fn add_currency() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1180`
+		//  Measured:  `1176`
 		//  Estimated: `3493`
-		// Minimum execution time: 19_243_000 picoseconds.
-		Weight::from_parts(19_945_000, 3493)
+		// Minimum execution time: 20_049_000 picoseconds.
+		Weight::from_parts(20_425_000, 3493)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -79,10 +75,10 @@ impl WeightInfo for () {
 	/// Proof: `MultiTransactionPayment::AcceptedCurrencies` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
 	fn remove_currency() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1211`
+		//  Measured:  `1207`
 		//  Estimated: `3493`
-		// Minimum execution time: 20_151_000 picoseconds.
-		Weight::from_parts(20_486_000, 3493)
+		// Minimum execution time: 20_453_000 picoseconds.
+		Weight::from_parts(20_789_000, 3493)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -92,10 +88,10 @@ 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:  `1245`
+		//  Measured:  `1241`
 		//  Estimated: `3493`
-		// Minimum execution time: 24_924_000 picoseconds.
-		Weight::from_parts(25_169_000, 3493)
+		// Minimum execution time: 25_834_000 picoseconds.
+		Weight::from_parts(26_377_000, 3493)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -105,10 +101,11 @@ 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:  `3225`
+		//  Measured:  `3221`
 		//  Estimated: `27510`
-		// Minimum execution time: 89_268_000 picoseconds.
-		Weight::from_parts(90_513_000, 27510).saturating_add(RocksDbWeight::get().reads(11_u64))
+		// Minimum execution time: 90_605_000 picoseconds.
+		Weight::from_parts(91_251_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`)
@@ -118,10 +115,10 @@ 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:  `1317`
+		//  Measured:  `1313`
 		//  Estimated: `4087`
-		// Minimum execution time: 22_192_000 picoseconds.
-		Weight::from_parts(22_762_000, 4087)
+		// Minimum execution time: 22_716_000 picoseconds.
+		Weight::from_parts(23_254_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 1c5e05d5c..95cfc0734 100644
--- a/pallets/transaction-pause/Cargo.toml
+++ b/pallets/transaction-pause/Cargo.toml
@@ -1,12 +1,12 @@
 [package]
 name = "pallet-transaction-pause"
-version = "1.0.3"
+version = "1.0.4"
 authors = ["Acala Developers", "GalacticCouncil"]
 edition = "2021"
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "3.4.0", default-features = false }
-scale-info = { version = "2.1.2", default-features = false, features = ["derive"] }
+codec = { workspace = true }
+scale-info = { workspace = true }
 sp-runtime = { workspace = true }
 frame-support = { workspace = true }
 frame-system = { workspace = true }
@@ -21,9 +21,9 @@ sp-api = { workspace = true, optional = true }
 sp-core = { workspace = true }
 sp-io = { workspace = true }
 pallet-balances = { workspace = true }
-orml-tokens = { workspace = true, features=["std"] }
-orml-traits = { workspace = true, features=["std"] }
-smallvec = "1.9.0"
+orml-tokens = { workspace = true, features = ["std"] }
+orml-traits = { workspace = true, features = ["std"] }
+smallvec = { workspace = true }
 
 [features]
 default = ["std"]
diff --git a/pallets/transaction-pause/src/mock.rs b/pallets/transaction-pause/src/mock.rs
index 2178e4772..a51b617bd 100644
--- a/pallets/transaction-pause/src/mock.rs
+++ b/pallets/transaction-pause/src/mock.rs
@@ -67,6 +67,11 @@ impl frame_system::Config for Runtime {
 	type SS58Prefix = ();
 	type OnSetCode = ();
 	type MaxConsumers = ConstU32<16>;
+	type SingleBlockMigrations = ();
+	type MultiBlockMigrator = ();
+	type PreInherents = ();
+	type PostInherents = ();
+	type PostTransactions = ();
 }
 
 impl pallet_balances::Config for Runtime {
diff --git a/pallets/transaction-pause/src/weights.rs b/pallets/transaction-pause/src/weights.rs
index 43cf80f9e..cd8670c6d 100644
--- a/pallets/transaction-pause/src/weights.rs
+++ b/pallets/transaction-pause/src/weights.rs
@@ -19,34 +19,28 @@
 //! Autogenerated weights for `pallet_transaction_pause`
 //!
 //! 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: `[]`
+//! DATE: 2024-09-10, 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`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
 
 // Executed Command:
-// ./target/release/hydradx
+// target/release/hydradx
 // benchmark
 // pallet
+// --chain=dev
+// --steps=50
+// --repeat=20
 // --wasm-execution=compiled
-// --pallet
-// *
-// --extrinsic
-// *
-// --heap-pages
-// 4096
-// --steps
-// 50
-// --repeat
-// 20
+// --pallet=pallet-transaction-pause
+// --extrinsic=*
 // --template=scripts/pallet-weight-template.hbs
-// --output
-// weights/
+// --output=./weights/pallet_transaction_pause.rs
 
 #![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, constants::RocksDbWeight}};
 use sp_std::marker::PhantomData;
@@ -65,8 +59,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `109`
 		//  Estimated: `3555`
-		// Minimum execution time: 10_806_000 picoseconds.
-		Weight::from_parts(10_995_000, 3555)
+		// Minimum execution time: 10_654_000 picoseconds.
+		Weight::from_parts(11_047_000, 3555)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
@@ -76,8 +70,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `160`
 		//  Estimated: `3555`
-		// Minimum execution time: 12_641_000 picoseconds.
-		Weight::from_parts(13_122_000, 3555)
+		// Minimum execution time: 12_775_000 picoseconds.
+		Weight::from_parts(13_283_000, 3555)
 			.saturating_add(RocksDbWeight::get().reads(1_u64))
 			.saturating_add(RocksDbWeight::get().writes(1_u64))
 	}
diff --git a/pallets/xcm-rate-limiter/Cargo.toml b/pallets/xcm-rate-limiter/Cargo.toml
index 0cfffa1e9..cf41d33f5 100644
--- a/pallets/xcm-rate-limiter/Cargo.toml
+++ b/pallets/xcm-rate-limiter/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "pallet-xcm-rate-limiter"
-version = "0.1.8"
+version = "0.1.9"
 authors = ["GalacticCouncil <hydradx@galacticcouncil.io>"]
 edition = "2021"
 license = "Apache-2.0"
@@ -12,9 +12,9 @@ description = "Rate limiter for tokens arriving via XCM"
 targets = ['x86_64-unknown-linux-gnu']
 
 [dependencies]
-serde = { features = ["derive"], optional = true, version = "1.0.136" }
-codec = { default-features = false, features = ["derive"], package = "parity-scale-codec", version = "3.4.0" }
-scale-info = { version = "2.3.1", default-features = false, features = ["derive"] }
+serde = { workspace = true, optional = true }
+codec = { workspace = true }
+scale-info = { workspace = true }
 
 # Hydradx
 hydradx-traits = { workspace = true }
@@ -44,7 +44,7 @@ orml-traits = { workspace = true }
 pallet-balances = { workspace = true, features = ["std"] }
 pallet-omnipool = { workspace = true, features = ["std"] }
 orml-tokens = { workspace = true, features = ["std"] }
-pretty_assertions = "1.2.1"
+pretty_assertions = { workspace = true }
 
 [features]
 default = ['std']
diff --git a/pallets/xcm-rate-limiter/src/tests/mock.rs b/pallets/xcm-rate-limiter/src/tests/mock.rs
index 8ba04257c..ec5fdd071 100644
--- a/pallets/xcm-rate-limiter/src/tests/mock.rs
+++ b/pallets/xcm-rate-limiter/src/tests/mock.rs
@@ -115,6 +115,11 @@ impl frame_system::Config for Test {
 	type SS58Prefix = SS58Prefix;
 	type OnSetCode = ();
 	type MaxConsumers = frame_support::traits::ConstU32<16>;
+	type SingleBlockMigrations = ();
+	type MultiBlockMigrator = ();
+	type PreInherents = ();
+	type PostInherents = ();
+	type PostTransactions = ();
 }
 
 parameter_types! {
diff --git a/pallets/xyk-liquidity-mining/Cargo.toml b/pallets/xyk-liquidity-mining/Cargo.toml
index 71c8eeded..8de677323 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.13"
+version = "1.1.14"
 description = "Liquidity mining"
 authors = ["GalacticCouncil"]
 edition = "2021"
@@ -12,8 +12,8 @@ license = "Apache 2.0"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "3.4.0", features = ["derive", "max-encoded-len"], default-features = false }
-scale-info = { version = "2.3.1", default-features = false, features = ["derive"] }
+codec = { workspace = true, features = ["derive", "max-encoded-len"] }
+scale-info = { workspace = true }
 
 log = { workspace = true }
 
@@ -40,7 +40,7 @@ sp-io = { workspace = true }
 sp-core = { workspace = true }
 orml-tokens = { workspace = true }
 pallet-balances = { workspace = true }
-pretty_assertions = "1.2.1"
+pretty_assertions = { workspace = true }
 
 [features]
 default = ["std"]
diff --git a/pallets/xyk-liquidity-mining/benchmarking/Cargo.toml b/pallets/xyk-liquidity-mining/benchmarking/Cargo.toml
index 829873557..b5afb9af3 100644
--- a/pallets/xyk-liquidity-mining/benchmarking/Cargo.toml
+++ b/pallets/xyk-liquidity-mining/benchmarking/Cargo.toml
@@ -12,8 +12,8 @@ repository = "https://github.com/galacticcouncil/basilisk-node"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "3.4.0", features = ["derive", "max-encoded-len"], default-features = false }
-scale-info = { version = "2.3.1", features = ["derive"], default-features = false }
+codec = { workspace = true, features = ["derive", "max-encoded-len"] }
+scale-info = { workspace = true }
 
 # Local dependencies
 pallet-xyk-liquidity-mining = { path = "../../xyk-liquidity-mining", default-features = false }
diff --git a/pallets/xyk-liquidity-mining/src/tests/mock.rs b/pallets/xyk-liquidity-mining/src/tests/mock.rs
index c8d8b3939..516905411 100644
--- a/pallets/xyk-liquidity-mining/src/tests/mock.rs
+++ b/pallets/xyk-liquidity-mining/src/tests/mock.rs
@@ -139,24 +139,29 @@ impl system::Config for Test {
 	type SS58Prefix = ();
 	type OnSetCode = ();
 	type MaxConsumers = frame_support::traits::ConstU32<16>;
+	type SingleBlockMigrations = ();
+	type MultiBlockMigrator = ();
+	type PreInherents = ();
+	type PostInherents = ();
+	type PostTransactions = ();
 }
 
 thread_local! {
-	pub static NFT_COLLECTION: RefCell<(u128, u128, u128)>= RefCell::new((0,0,0));
+	pub static NFT_COLLECTION: RefCell<(u128, u128, u128)>= const { RefCell::new((0,0,0)) };
 
 	pub static AMM_POOLS: RefCell<HashMap<AccountId, (AssetId, AssetPair)>> = RefCell::new(HashMap::new());
 	pub static NFTS: RefCell<HashMap<(CollectionId, ItemId), AccountId>> = RefCell::new(HashMap::default());
-	pub static DEPOSIT_IDS: RefCell<Vec<DepositId>> = RefCell::new(Vec::new());
+	pub static DEPOSIT_IDS: RefCell<Vec<DepositId>> = const { RefCell::new(Vec::new()) };
 
 	pub static GLOBAL_FARMS: RefCell<HashMap<u32, DymmyGlobalFarm>> = RefCell::new(HashMap::default());
 	pub static YIELD_FARMS: RefCell<HashMap<u32, DummyYieldFarm>> = RefCell::new(HashMap::default());
 	pub static DEPOSITS: RefCell<HashMap<u128, DummyDeposit>> = RefCell::new(HashMap::default());
 	pub static DEPOSIT_ENTRIES: RefCell<HashMap<(DepositId, u32), DummyFarmEntry>> = RefCell::new(HashMap::default());
 
-	pub static FARM_ID: RefCell<u32> = RefCell::new(0);
-	pub static DEPOSIT_ID: RefCell<DepositId> = RefCell::new(0);
+	pub static FARM_ID: RefCell<u32> = const { RefCell::new(0) };
+	pub static DEPOSIT_ID: RefCell<DepositId> = const { RefCell::new(0) };
 
-	pub static DUSTER_WHITELIST: RefCell<Vec<AccountId>>= RefCell::new(Vec::new());
+	pub static DUSTER_WHITELIST: RefCell<Vec<AccountId>>= const { RefCell::new(Vec::new()) };
 }
 #[derive(Copy, Clone)]
 pub struct DymmyGlobalFarm {
diff --git a/pallets/xyk-liquidity-mining/src/weights.rs b/pallets/xyk-liquidity-mining/src/weights.rs
index ee4ccc904..123342513 100644
--- a/pallets/xyk-liquidity-mining/src/weights.rs
+++ b/pallets/xyk-liquidity-mining/src/weights.rs
@@ -15,36 +15,32 @@
 // 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 32.0.0
-//! DATE: 2024-05-23, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-09-10, 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`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
 
 // Executed Command:
-// ./target/release/hydradx
+// target/release/hydradx
 // benchmark
 // pallet
+// --chain=dev
+// --steps=50
+// --repeat=20
 // --wasm-execution=compiled
-// --pallet
-// *
-// --extrinsic
-// *
-// --heap-pages
-// 4096
-// --steps
-// 50
-// --repeat
-// 20
+// --pallet=pallet-xyk-liquidity-mining
+// --extrinsic=*
 // --template=scripts/pallet-weight-template.hbs
-// --output
-// weights/
+// --output=./weights/pallet_xyk_liquidity_mining.rs
 
+#![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
-#![allow(clippy::unnecessary_cast)]
+#![allow(missing_docs)]
 
 use frame_support::{
 	traits::Get,
@@ -72,6 +68,8 @@ pub trait WeightInfo {
 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: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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)
@@ -96,11 +94,11 @@ impl WeightInfo for () {
 	/// 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:  `3102`
+		//  Measured:  `3306`
 		//  Estimated: `11402`
-		// Minimum execution time: 277_908_000 picoseconds.
-		Weight::from_parts(279_339_000, 11402)
-			.saturating_add(RocksDbWeight::get().reads(19_u64))
+		// Minimum execution time: 286_016_000 picoseconds.
+		Weight::from_parts(287_567_000, 11402)
+			.saturating_add(RocksDbWeight::get().reads(20_u64))
 			.saturating_add(RocksDbWeight::get().writes(12_u64))
 	}
 	/// Storage: `XYKWarehouseLM::GlobalFarm` (r:1 w:1)
@@ -111,6 +109,8 @@ impl WeightInfo for () {
 	/// 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: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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)
@@ -119,17 +119,19 @@ impl WeightInfo for () {
 	/// 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:  `4351`
+		//  Measured:  `4555`
 		//  Estimated: `6156`
-		// Minimum execution time: 103_336_000 picoseconds.
-		Weight::from_parts(104_299_000, 6156)
-			.saturating_add(RocksDbWeight::get().reads(8_u64))
+		// Minimum execution time: 108_467_000 picoseconds.
+		Weight::from_parts(109_587_000, 6156)
+			.saturating_add(RocksDbWeight::get().reads(9_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: `Tokens::Accounts` (r:2 w:2)
 	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
+	/// Storage: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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)
@@ -148,11 +150,11 @@ impl WeightInfo for () {
 	/// 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:  `3814`
+		//  Measured:  `4018`
 		//  Estimated: `6196`
-		// Minimum execution time: 172_009_000 picoseconds.
-		Weight::from_parts(173_139_000, 6196)
-			.saturating_add(RocksDbWeight::get().reads(12_u64))
+		// Minimum execution time: 177_875_000 picoseconds.
+		Weight::from_parts(178_816_000, 6196)
+			.saturating_add(RocksDbWeight::get().reads(13_u64))
 			.saturating_add(RocksDbWeight::get().writes(8_u64))
 	}
 	/// Storage: `XYK::ShareToken` (r:1 w:0)
@@ -167,10 +169,10 @@ impl WeightInfo for () {
 	/// 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:  `1586`
+		//  Measured:  `1582`
 		//  Estimated: `3670`
-		// Minimum execution time: 47_538_000 picoseconds.
-		Weight::from_parts(48_206_000, 3670)
+		// Minimum execution time: 49_227_000 picoseconds.
+		Weight::from_parts(49_753_000, 3670)
 			.saturating_add(RocksDbWeight::get().reads(4_u64))
 			.saturating_add(RocksDbWeight::get().writes(4_u64))
 	}
@@ -188,6 +190,8 @@ impl WeightInfo for () {
 	/// 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: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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)
@@ -196,11 +200,11 @@ impl WeightInfo for () {
 	/// 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:  `4867`
+		//  Measured:  `5071`
 		//  Estimated: `6156`
-		// Minimum execution time: 127_361_000 picoseconds.
-		Weight::from_parts(128_178_000, 6156)
-			.saturating_add(RocksDbWeight::get().reads(11_u64))
+		// Minimum execution time: 132_814_000 picoseconds.
+		Weight::from_parts(134_194_000, 6156)
+			.saturating_add(RocksDbWeight::get().reads(12_u64))
 			.saturating_add(RocksDbWeight::get().writes(4_u64))
 	}
 	/// Storage: `XYKWarehouseLM::ActiveYieldFarm` (r:1 w:1)
@@ -215,6 +219,8 @@ impl WeightInfo for () {
 	/// 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: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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)
@@ -223,11 +229,11 @@ impl WeightInfo for () {
 	/// 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:  `4667`
+		//  Measured:  `4871`
 		//  Estimated: `6156`
-		// Minimum execution time: 122_100_000 picoseconds.
-		Weight::from_parts(123_315_000, 6156)
-			.saturating_add(RocksDbWeight::get().reads(10_u64))
+		// Minimum execution time: 127_078_000 picoseconds.
+		Weight::from_parts(128_319_000, 6156)
+			.saturating_add(RocksDbWeight::get().reads(11_u64))
 			.saturating_add(RocksDbWeight::get().writes(5_u64))
 	}
 	/// Storage: `XYKWarehouseLM::ActiveYieldFarm` (r:1 w:0)
@@ -236,6 +242,8 @@ 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: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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)
@@ -248,11 +256,11 @@ impl WeightInfo for () {
 	/// 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:  `4714`
+		//  Measured:  `4918`
 		//  Estimated: `6156`
-		// Minimum execution time: 99_990_000 picoseconds.
-		Weight::from_parts(100_957_000, 6156)
-			.saturating_add(RocksDbWeight::get().reads(9_u64))
+		// Minimum execution time: 105_075_000 picoseconds.
+		Weight::from_parts(105_714_000, 6156)
+			.saturating_add(RocksDbWeight::get().reads(10_u64))
 			.saturating_add(RocksDbWeight::get().writes(4_u64))
 	}
 	/// Storage: `XYK::ShareToken` (r:1 w:0)
@@ -267,6 +275,8 @@ impl WeightInfo for () {
 	/// 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: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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)
@@ -291,11 +301,11 @@ impl WeightInfo for () {
 	/// Proof: `XYKWarehouseLM::Deposit` (`max_values`: None, `max_size`: Some(413), added: 2888, mode: `MaxEncodedLen`)
 	fn deposit_shares() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `6036`
+		//  Measured:  `6240`
 		//  Estimated: `16488`
-		// Minimum execution time: 218_921_000 picoseconds.
-		Weight::from_parts(220_788_000, 16488)
-			.saturating_add(RocksDbWeight::get().reads(24_u64))
+		// Minimum execution time: 228_440_000 picoseconds.
+		Weight::from_parts(229_414_000, 16488)
+			.saturating_add(RocksDbWeight::get().reads(25_u64))
 			.saturating_add(RocksDbWeight::get().writes(11_u64))
 	}
 	/// Storage: `Uniques::Asset` (r:1 w:0)
@@ -314,6 +324,8 @@ impl WeightInfo for () {
 	/// 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: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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)
@@ -326,11 +338,11 @@ impl WeightInfo for () {
 	/// Proof: `XYK::TotalLiquidity` (`max_values`: None, `max_size`: Some(64), added: 2539, mode: `MaxEncodedLen`)
 	fn redeposit_shares() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `6965`
+		//  Measured:  `7169`
 		//  Estimated: `11322`
-		// Minimum execution time: 169_802_000 picoseconds.
-		Weight::from_parts(170_914_000, 11322)
-			.saturating_add(RocksDbWeight::get().reads(16_u64))
+		// Minimum execution time: 175_597_000 picoseconds.
+		Weight::from_parts(176_747_000, 11322)
+			.saturating_add(RocksDbWeight::get().reads(17_u64))
 			.saturating_add(RocksDbWeight::get().writes(5_u64))
 	}
 	/// Storage: `Uniques::Asset` (r:1 w:0)
@@ -347,6 +359,8 @@ impl WeightInfo for () {
 	/// 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: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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)
@@ -355,11 +369,11 @@ impl WeightInfo for () {
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn claim_rewards() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `6806`
+		//  Measured:  `7011`
 		//  Estimated: `8739`
-		// Minimum execution time: 174_694_000 picoseconds.
-		Weight::from_parts(176_187_000, 8739)
-			.saturating_add(RocksDbWeight::get().reads(14_u64))
+		// Minimum execution time: 183_988_000 picoseconds.
+		Weight::from_parts(184_719_000, 8739)
+			.saturating_add(RocksDbWeight::get().reads(15_u64))
 			.saturating_add(RocksDbWeight::get().writes(6_u64))
 	}
 	/// Storage: `Uniques::Asset` (r:1 w:1)
@@ -378,6 +392,8 @@ impl WeightInfo for () {
 	/// 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: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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)
@@ -402,11 +418,11 @@ 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:  `6479`
+		//  Measured:  `6683`
 		//  Estimated: `13905`
-		// Minimum execution time: 369_769_000 picoseconds.
-		Weight::from_parts(371_613_000, 13905)
-			.saturating_add(RocksDbWeight::get().reads(28_u64))
+		// Minimum execution time: 381_117_000 picoseconds.
+		Weight::from_parts(383_838_000, 13905)
+			.saturating_add(RocksDbWeight::get().reads(29_u64))
 			.saturating_add(RocksDbWeight::get().writes(16_u64))
 	}
 	/// Storage: `XYK::ShareToken` (r:1 w:0)
@@ -423,6 +439,8 @@ impl WeightInfo for () {
 	/// 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: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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)
@@ -431,11 +449,11 @@ impl WeightInfo for () {
 	/// 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:  `5159`
+		//  Measured:  `5363`
 		//  Estimated: `6156`
-		// Minimum execution time: 127_095_000 picoseconds.
-		Weight::from_parts(128_067_000, 6156)
-			.saturating_add(RocksDbWeight::get().reads(11_u64))
+		// Minimum execution time: 131_995_000 picoseconds.
+		Weight::from_parts(132_870_000, 6156)
+			.saturating_add(RocksDbWeight::get().reads(12_u64))
 			.saturating_add(RocksDbWeight::get().writes(5_u64))
 	}
 }
diff --git a/pallets/xyk/Cargo.toml b/pallets/xyk/Cargo.toml
index bd585403a..f26aaf7df 100644
--- a/pallets/xyk/Cargo.toml
+++ b/pallets/xyk/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = 'pallet-xyk'
-version = "6.5.1"
+version = "6.5.2"
 description = 'XYK automated market maker'
 authors = ['GalacticCouncil']
 edition = '2021'
@@ -15,11 +15,11 @@ targets = ['x86_64-unknown-linux-gnu']
 substrate-wasm-builder = { workspace = true }
 
 [dependencies]
-codec = { default-features = false, features = ["derive"], package = "parity-scale-codec", version = "3.1.5" }
-scale-info = { version = "2.3.1", default-features = false, features = ["derive"] }
-primitive-types = { default-features = false, version = "0.12.0" }
-serde = { features = ['derive'], optional = true, version = '1.0.136' }
-log = { version = "0.4.17", default-features = false }
+codec = {workspace = true }
+scale-info = { workspace = true }
+primitive-types = { workspace = true }
+serde = { workspace = true, optional = true }
+log = { workspace = true }
 
 hydra-dx-math = { workspace = true }
 
@@ -42,7 +42,7 @@ sp-std = { workspace = true }
 pallet-asset-registry = { workspace = true }
 sp-io = { workspace = true }
 sp-api = { workspace = true }
-proptest = "1.0.0"
+proptest = { workspace = true }
 
 [features]
 default = ['std']
diff --git a/pallets/xyk/src/tests/mock.rs b/pallets/xyk/src/tests/mock.rs
index 00aaa71bb..70198fecf 100644
--- a/pallets/xyk/src/tests/mock.rs
+++ b/pallets/xyk/src/tests/mock.rs
@@ -66,9 +66,9 @@ frame_support::construct_runtime!(
 );
 
 thread_local! {
-		static EXCHANGE_FEE: RefCell<(u32, u32)> = RefCell::new((2, 1_000));
-		static DISCOUNTED_FEE: RefCell<(u32, u32)> = RefCell::new((7, 10_000));
-		static MAX_OUT_RATIO: RefCell<u128> = RefCell::new(3);
+		static EXCHANGE_FEE: RefCell<(u32, u32)> = const { RefCell::new((2, 1_000)) };
+		static DISCOUNTED_FEE: RefCell<(u32, u32)> = const { RefCell::new((7, 10_000)) };
+		static MAX_OUT_RATIO: RefCell<u128> = const { RefCell::new(3) };
 }
 
 struct ExchangeFee;
@@ -144,6 +144,11 @@ impl system::Config for Test {
 	type SS58Prefix = ();
 	type OnSetCode = ();
 	type MaxConsumers = frame_support::traits::ConstU32<16>;
+	type SingleBlockMigrations = ();
+	type MultiBlockMigrator = ();
+	type PreInherents = ();
+	type PostInherents = ();
+	type PostTransactions = ();
 }
 
 parameter_type_with_key! {
diff --git a/pallets/xyk/src/weights.rs b/pallets/xyk/src/weights.rs
index 7cd3a85cc..d8161ab93 100644
--- a/pallets/xyk/src/weights.rs
+++ b/pallets/xyk/src/weights.rs
@@ -15,10 +15,11 @@
 // 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 32.0.0
-//! DATE: 2024-06-20, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-09-10, 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`
@@ -28,18 +29,18 @@
 // benchmark
 // pallet
 // --chain=dev
-// --steps=10
-// --repeat=30
+// --steps=50
+// --repeat=20
 // --wasm-execution=compiled
-// --heap-pages=4096
-// --template=scripts/pallet-weight-template.hbs
 // --pallet=pallet-xyk
-// --output=weights/xyk.rs
 // --extrinsic=*
+// --template=scripts/pallet-weight-template.hbs
+// --output=./weights/pallet_xyk.rs
 
+#![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
 #![allow(unused_imports)]
-#![allow(clippy::unnecessary_cast)]
+#![allow(missing_docs)]
 
 use frame_support::{
 	traits::Get,
@@ -73,6 +74,8 @@ impl WeightInfo for () {
 	/// 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: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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:4 w:0)
@@ -99,11 +102,11 @@ impl WeightInfo for () {
 	/// Proof: `XYK::PoolAssets` (`max_values`: None, `max_size`: Some(56), added: 2531, mode: `MaxEncodedLen`)
 	fn create_pool() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `3655`
+		//  Measured:  `3863`
 		//  Estimated: `19071`
-		// Minimum execution time: 478_829_000 picoseconds.
-		Weight::from_parts(482_189_000, 19071)
-			.saturating_add(RocksDbWeight::get().reads(33_u64))
+		// Minimum execution time: 482_234_000 picoseconds.
+		Weight::from_parts(487_055_000, 19071)
+			.saturating_add(RocksDbWeight::get().reads(34_u64))
 			.saturating_add(RocksDbWeight::get().writes(20_u64))
 	}
 	/// Storage: `XYK::ShareToken` (r:1 w:0)
@@ -112,6 +115,8 @@ impl WeightInfo for () {
 	/// 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: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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:4 w:0)
@@ -136,11 +141,11 @@ impl WeightInfo for () {
 	/// 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:  `4291`
+		//  Measured:  `4499`
 		//  Estimated: `19071`
-		// Minimum execution time: 295_216_000 picoseconds.
-		Weight::from_parts(297_013_000, 19071)
-			.saturating_add(RocksDbWeight::get().reads(27_u64))
+		// Minimum execution time: 300_637_000 picoseconds.
+		Weight::from_parts(301_659_000, 19071)
+			.saturating_add(RocksDbWeight::get().reads(28_u64))
 			.saturating_add(RocksDbWeight::get().writes(13_u64))
 	}
 	/// Storage: `XYK::ShareToken` (r:1 w:1)
@@ -149,6 +154,8 @@ impl WeightInfo for () {
 	/// 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: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`)
 	/// 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)
@@ -175,17 +182,19 @@ impl WeightInfo for () {
 	/// Proof: `XYK::PoolAssets` (`max_values`: None, `max_size`: Some(56), added: 2531, mode: `MaxEncodedLen`)
 	fn remove_liquidity() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `4341`
+		//  Measured:  `4549`
 		//  Estimated: `19071`
-		// Minimum execution time: 432_017_000 picoseconds.
-		Weight::from_parts(435_171_000, 19071)
-			.saturating_add(RocksDbWeight::get().reads(29_u64))
+		// Minimum execution time: 437_485_000 picoseconds.
+		Weight::from_parts(441_006_000, 19071)
+			.saturating_add(RocksDbWeight::get().reads(30_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:6 w:6)
 	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
+	/// Storage: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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)
@@ -208,17 +217,19 @@ impl WeightInfo for () {
 	/// Proof: `EmaOracle::WhitelistedAssets` (`max_values`: Some(1), `max_size`: Some(641), added: 1136, mode: `MaxEncodedLen`)
 	fn sell() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `4190`
+		//  Measured:  `4398`
 		//  Estimated: `16488`
-		// Minimum execution time: 259_720_000 picoseconds.
-		Weight::from_parts(262_022_000, 16488)
-			.saturating_add(RocksDbWeight::get().reads(24_u64))
+		// Minimum execution time: 263_251_000 picoseconds.
+		Weight::from_parts(265_158_000, 16488)
+			.saturating_add(RocksDbWeight::get().reads(25_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:6 w:6)
 	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
+	/// Storage: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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)
@@ -241,17 +252,19 @@ impl WeightInfo for () {
 	/// Proof: `EmaOracle::WhitelistedAssets` (`max_values`: Some(1), `max_size`: Some(641), added: 1136, mode: `MaxEncodedLen`)
 	fn buy() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `4190`
+		//  Measured:  `4398`
 		//  Estimated: `16488`
-		// Minimum execution time: 258_233_000 picoseconds.
-		Weight::from_parts(260_534_000, 16488)
-			.saturating_add(RocksDbWeight::get().reads(24_u64))
+		// Minimum execution time: 261_604_000 picoseconds.
+		Weight::from_parts(262_778_000, 16488)
+			.saturating_add(RocksDbWeight::get().reads(25_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:6 w:6)
 	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
+	/// Storage: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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)
@@ -274,18 +287,18 @@ impl WeightInfo for () {
 	/// 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 {
+	fn router_execution_sell(c: u32, e: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1221 + e * (2969 ±0)`
-		//  Estimated: `6156 + e * (10332 ±118_379_753_737_997_488)`
-		// Minimum execution time: 24_323_000 picoseconds.
-		Weight::from_parts(10_607_591, 6156)
-			// Standard Error: 167_239
-			.saturating_add(Weight::from_parts(7_205_082, 0).saturating_mul(c.into()))
-			// Standard Error: 167_239
-			.saturating_add(Weight::from_parts(243_290_509, 0).saturating_mul(e.into()))
+		//  Measured:  `1221 + e * (3177 ±0)`
+		//  Estimated: `8799 + e * (10332 ±0)`
+		// Minimum execution time: 24_468_000 picoseconds.
+		Weight::from_parts(8_259_951, 8799)
+			// Standard Error: 78_193
+			.saturating_add(Weight::from_parts(8_502_639, 0).saturating_mul(c.into()))
+			// Standard Error: 78_193
+			.saturating_add(Weight::from_parts(247_520_019, 0).saturating_mul(e.into()))
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
-			.saturating_add(RocksDbWeight::get().reads((21_u64).saturating_mul(e.into())))
+			.saturating_add(RocksDbWeight::get().reads((22_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()))
 	}
@@ -293,6 +306,8 @@ impl WeightInfo for () {
 	/// Proof: `XYK::ShareToken` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
 	/// Storage: `Tokens::Accounts` (r:6 w:6)
 	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
+	/// Storage: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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)
@@ -315,18 +330,18 @@ impl WeightInfo for () {
 	/// 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 {
+	fn router_execution_buy(c: u32, e: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `1221 + e * (2969 ±0)`
-		//  Estimated: `6156 + e * (10332 ±0)`
-		// Minimum execution time: 31_926_000 picoseconds.
-		Weight::from_parts(8_222_348, 6156)
-			// Standard Error: 100_411
-			.saturating_add(Weight::from_parts(8_150_950, 0).saturating_mul(c.into()))
-			// Standard Error: 170_358
-			.saturating_add(Weight::from_parts(243_286_593, 0).saturating_mul(e.into()))
+		//  Measured:  `1221 + e * (3177 ±0)`
+		//  Estimated: `6156 + e * (10332 ±3_500_844_840_074_025)`
+		// Minimum execution time: 31_785_000 picoseconds.
+		Weight::from_parts(11_618_923, 6156)
+			// Standard Error: 29_806
+			.saturating_add(Weight::from_parts(6_978_081, 0).saturating_mul(c.into()))
+			// Standard Error: 49_613
+			.saturating_add(Weight::from_parts(245_134_509, 0).saturating_mul(e.into()))
 			.saturating_add(RocksDbWeight::get().reads(3_u64))
-			.saturating_add(RocksDbWeight::get().reads((21_u64).saturating_mul(e.into())))
+			.saturating_add(RocksDbWeight::get().reads((22_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()))
 	}
@@ -336,7 +351,8 @@ impl WeightInfo for () {
 		// Proof Size summary in bytes:
 		//  Measured:  `1021`
 		//  Estimated: `6156`
-		// Minimum execution time: 19_174_000 picoseconds.
-		Weight::from_parts(19_702_000, 6156).saturating_add(RocksDbWeight::get().reads(2_u64))
+		// Minimum execution time: 19_349_000 picoseconds.
+		Weight::from_parts(19_578_000, 6156)
+			.saturating_add(RocksDbWeight::get().reads(2_u64))
 	}
 }
diff --git a/precompiles/call-permit/Cargo.toml b/precompiles/call-permit/Cargo.toml
index 556178a13..632a7e729 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.1"
+version = "0.1.2"
 authors = ["PureStake"]
 repository = "https://github.com/PureStake/moonbeam"
 
diff --git a/precompiles/call-permit/src/lib.rs b/precompiles/call-permit/src/lib.rs
index 4f4e7957c..5e6f3386c 100644
--- a/precompiles/call-permit/src/lib.rs
+++ b/precompiles/call-permit/src/lib.rs
@@ -18,8 +18,7 @@
 #![cfg_attr(not(feature = "std"), no_std)]
 
 use core::marker::PhantomData;
-use evm::ExitReason;
-use fp_evm::{Context, ExitRevert, PrecompileFailure, PrecompileHandle, Transfer};
+use fp_evm::{Context, ExitReason, ExitRevert, PrecompileFailure, PrecompileHandle, Transfer};
 use frame_support::{
 	ensure,
 	storage::types::{StorageMap, ValueQuery},
diff --git a/precompiles/call-permit/src/mock.rs b/precompiles/call-permit/src/mock.rs
index 193f58339..e9266d2c8 100644
--- a/precompiles/call-permit/src/mock.rs
+++ b/precompiles/call-permit/src/mock.rs
@@ -75,6 +75,11 @@ impl frame_system::Config for Runtime {
 	type SS58Prefix = SS58Prefix;
 	type OnSetCode = ();
 	type MaxConsumers = frame_support::traits::ConstU32<16>;
+	type SingleBlockMigrations = ();
+	type MultiBlockMigrator = ();
+	type PreInherents = ();
+	type PostInherents = ();
+	type PostTransactions = ();
 }
 parameter_types! {
 	pub const ExistentialDeposit: u128 = 0;
diff --git a/precompiles/utils/Cargo.toml b/precompiles/utils/Cargo.toml
index 4f1a22312..988508aa3 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.1"
+version = "0.1.2"
 authors = ["PureStake"]
 repository = "https://github.com/PureStake/moonbeam"
 
@@ -27,7 +27,7 @@ precompile-utils-macro = { path = "macro" }
 # Substrate
 frame-support = { workspace = true }
 frame-system = { workspace = true }
-parity-scale-codec = { version = "3.4.0", default-features = false, features = ["derive"] }
+codec = {  workspace = true }
 sp-core = { workspace = true }
 sp-io = { workspace = true }
 sp-runtime = { workspace = true }
@@ -54,7 +54,7 @@ std = [
 	"frame-support/std",
 	"frame-system/std",
 	"pallet-evm/std",
-	"parity-scale-codec/std",
+	"codec/std",
 	"sp-core/std",
 	"sp-io/std",
 	"sp-std/std",
diff --git a/precompiles/utils/macro/Cargo.toml b/precompiles/utils/macro/Cargo.toml
index 6c3e171f6..503283804 100644
--- a/precompiles/utils/macro/Cargo.toml
+++ b/precompiles/utils/macro/Cargo.toml
@@ -13,17 +13,17 @@ name = "tests"
 path = "tests/tests.rs"
 
 [dependencies]
-case = "1.0"
-num_enum = { version = "0.5.3", default-features = false }
-prettyplease = "0.1.18"
-proc-macro2 = "1.0"
-quote = "1.0"
-sha3 = "0.10"
-syn = { version = "1.0", features = [ "extra-traits", "fold", "full", "visit" ] }
+case = {  workspace = true }
+num_enum = { workspace = true, default-features = false }
+prettyplease = {  workspace = true }
+proc-macro2 = {  workspace = true }
+quote = {  workspace = true }
+sha3 = {  workspace = true }
+syn = {  workspace = true }
 
 [dev-dependencies]
-macrotest = "1.0.9"
-trybuild = "1.0"
+macrotest = {  workspace = true }
+trybuild = {  workspace = true }
 
 precompile-utils = { path = "../", features = [ "testing" ] }
 
diff --git a/precompiles/utils/src/evm/costs.rs b/precompiles/utils/src/evm/costs.rs
index c7b7fdb81..411029eb8 100644
--- a/precompiles/utils/src/evm/costs.rs
+++ b/precompiles/utils/src/evm/costs.rs
@@ -52,12 +52,12 @@ pub fn log_costs(topics: usize, data_len: usize) -> EvmResult<u64> {
 
 // Compute the cost of doing a subcall.
 // Some parameters cannot be known in advance, so we estimate the worst possible cost.
-pub fn call_cost(value: U256, config: &evm::Config) -> u64 {
+pub fn call_cost(value: U256, config: &fp_evm::Config) -> u64 {
 	// Copied from EVM code since not public.
 	pub const G_CALLVALUE: u64 = 9000;
 	pub const G_NEWACCOUNT: u64 = 25000;
 
-	fn address_access_cost(is_cold: bool, regular_value: u64, config: &evm::Config) -> u64 {
+	fn address_access_cost(is_cold: bool, regular_value: u64, config: &fp_evm::Config) -> u64 {
 		if config.increase_state_access_gas {
 			if is_cold {
 				config.gas_account_access_cold
@@ -77,7 +77,7 @@ pub fn call_cost(value: U256, config: &evm::Config) -> u64 {
 		}
 	}
 
-	fn new_cost(is_call_or_staticcall: bool, new_account: bool, transfers_value: bool, config: &evm::Config) -> u64 {
+	fn new_cost(is_call_or_staticcall: bool, new_account: bool, transfers_value: bool, config: &fp_evm::Config) -> u64 {
 		let eip161 = !config.empty_considered_exists;
 		if is_call_or_staticcall {
 			if eip161 {
diff --git a/precompiles/utils/src/evm/handle.rs b/precompiles/utils/src/evm/handle.rs
index 9689c13e1..85ca7f7ee 100644
--- a/precompiles/utils/src/evm/handle.rs
+++ b/precompiles/utils/src/evm/handle.rs
@@ -33,7 +33,7 @@ pub trait PrecompileHandleExt: PrecompileHandle {
 	fn record_db_read<Runtime: pallet_evm::Config>(
 		&mut self,
 		data_max_encoded_len: usize,
-	) -> Result<(), evm::ExitError>;
+	) -> Result<(), fp_evm::ExitError>;
 
 	/// Record cost of a log manually.
 	/// This can be useful to record log costs early when their content have static size.
@@ -63,7 +63,7 @@ impl<T: PrecompileHandle> PrecompileHandleExt for T {
 	fn record_db_read<Runtime: pallet_evm::Config>(
 		&mut self,
 		data_max_encoded_len: usize,
-	) -> Result<(), evm::ExitError> {
+	) -> Result<(), fp_evm::ExitError> {
 		self.record_cost(crate::prelude::RuntimeHelper::<Runtime>::db_read_gas_cost())?;
 		// TODO: record ref time when precompile will be benchmarked
 		self.record_external_cost(None, Some(data_max_encoded_len as u64), None)
diff --git a/precompiles/utils/src/precompile_set.rs b/precompiles/utils/src/precompile_set.rs
index 1c941549b..0e7bba60d 100644
--- a/precompiles/utils/src/precompile_set.rs
+++ b/precompiles/utils/src/precompile_set.rs
@@ -414,15 +414,15 @@ impl<'a, H: PrecompileHandle> PrecompileHandle for RestrictiveHandle<'a, H> {
 	fn call(
 		&mut self,
 		address: H160,
-		transfer: Option<evm::Transfer>,
+		transfer: Option<fp_evm::Transfer>,
 		input: Vec<u8>,
 		target_gas: Option<u64>,
 		is_static: bool,
-		context: &evm::Context,
-	) -> (evm::ExitReason, Vec<u8>) {
+		context: &fp_evm::Context,
+	) -> (fp_evm::ExitReason, Vec<u8>) {
 		if !self.allow_subcalls {
 			return (
-				evm::ExitReason::Revert(evm::ExitRevert::Reverted),
+				fp_evm::ExitReason::Revert(fp_evm::ExitRevert::Reverted),
 				crate::solidity::revert::revert_as_bytes("subcalls disabled for this precompile"),
 			);
 		}
@@ -431,7 +431,7 @@ impl<'a, H: PrecompileHandle> PrecompileHandle for RestrictiveHandle<'a, H> {
 			.call(address, transfer, input, target_gas, is_static, context)
 	}
 
-	fn record_cost(&mut self, cost: u64) -> Result<(), evm::ExitError> {
+	fn record_cost(&mut self, cost: u64) -> Result<(), fp_evm::ExitError> {
 		self.handle.record_cost(cost)
 	}
 
@@ -439,7 +439,7 @@ impl<'a, H: PrecompileHandle> PrecompileHandle for RestrictiveHandle<'a, H> {
 		self.handle.remaining_gas()
 	}
 
-	fn log(&mut self, address: H160, topics: Vec<H256>, data: Vec<u8>) -> Result<(), evm::ExitError> {
+	fn log(&mut self, address: H160, topics: Vec<H256>, data: Vec<u8>) -> Result<(), fp_evm::ExitError> {
 		self.handle.log(address, topics, data)
 	}
 
@@ -451,7 +451,7 @@ impl<'a, H: PrecompileHandle> PrecompileHandle for RestrictiveHandle<'a, H> {
 		self.handle.input()
 	}
 
-	fn context(&self) -> &evm::Context {
+	fn context(&self) -> &fp_evm::Context {
 		self.handle.context()
 	}
 
diff --git a/primitives/Cargo.toml b/primitives/Cargo.toml
index b62a44c7e..595709770 100644
--- a/primitives/Cargo.toml
+++ b/primitives/Cargo.toml
@@ -1,16 +1,16 @@
 [package]
 name = "primitives"
-version = "6.0.3"
+version = "6.0.4"
 authors = ["GalacticCouncil"]
 edition = "2021"
 repository = "https://github.com/galacticcouncil/HydraDX-node"
 
 [dependencies]
-codec = { default-features = false, features = ["derive"], package = "parity-scale-codec", version = "3.4.0" }
-scale-info = { version = "2.3.1", default-features = false, features = ["derive"] }
-serde = { features = ["derive"], optional = true, version = "1.0.136" }
-hex-literal = {version = '0.3.4'}
-static_assertions = "1.1.0"
+codec = { workspace = true }
+scale-info = { workspace = true }
+serde = { workspace = true, optional = true }
+hex-literal = { workspace = true }
+static_assertions = { workspace = true }
 
 # Substrate dependencies
 frame-support = { workspace = true }
diff --git a/primitives/src/constants.rs b/primitives/src/constants.rs
index 1a825da6f..6af68683d 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::v6::MAX_POV_SIZE as u64,
+		polkadot_primitives::v7::MAX_POV_SIZE as u64,
 	);
 
 	/// The source of the data for the oracle.
diff --git a/runtime-mock/Cargo.toml b/runtime-mock/Cargo.toml
index 9b9c7266f..5fb31cac6 100644
--- a/runtime-mock/Cargo.toml
+++ b/runtime-mock/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "runtime-mock"
-version = "1.0.0"
+version = "1.0.1"
 description = "Mock of the HydraDX Runtime for testing purposes"
 authors = ["GalacticCouncil"]
 edition = "2021"
@@ -9,8 +9,8 @@ license = "Apache 2.0"
 repository = "https://github.com/galacticcouncil/HydraDX-node"
 
 [dependencies]
-serde = { version = "1.0.136", features = ["derive"] }
-toml = "0.5"
+serde = {  workspace = true }
+toml = {  workspace = true }
 
 # local dependencies
 hydradx-runtime = { workspace = true }
diff --git a/runtime/adapters/Cargo.toml b/runtime/adapters/Cargo.toml
index d6ca4836a..0cf8fee70 100644
--- a/runtime/adapters/Cargo.toml
+++ b/runtime/adapters/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "hydradx-adapters"
-version = "1.3.5"
+version = "1.3.6"
 description = "Structs and other generic types for building runtimes."
 authors = ["GalacticCouncil"]
 edition = "2021"
@@ -8,9 +8,9 @@ license = "Apache 2.0"
 repository = "https://github.com/galacticcouncil/warehouse/tree/master/adapters"
 
 [dependencies]
-codec = { default-features = false, features = ["derive"], package = "parity-scale-codec", version = "3.4.0" }
-log = { version = "0.4.17", default-features = false }
-scale-info = { version = "2.3.1", default-features = false, features = ["derive"] }
+codec = {workspace = true }
+log = { workspace = true }
+scale-info = { workspace = true }
 
 # HydraDX dependencies
 primitives = { workspace = true }
@@ -63,8 +63,8 @@ orml-tokens = { workspace = true }
 pallet-balances = { workspace = true }
 
 [dev-dependencies]
-lazy_static = { features = ["spin_no_std"], version = "1.4.0" }
-pretty_assertions = "1.4.0"
+lazy_static = { workspace = true }
+pretty_assertions = { workspace = true }
 pallet-xyk = { workspace = true }
 
 [features]
diff --git a/runtime/adapters/src/lib.rs b/runtime/adapters/src/lib.rs
index 9fe5f2641..ab6240ef0 100644
--- a/runtime/adapters/src/lib.rs
+++ b/runtime/adapters/src/lib.rs
@@ -267,7 +267,7 @@ impl<T: cumulus_pallet_parachain_system::Config> BlockNumberProvider for RelayCh
 	type BlockNumber = polkadot_parachain::primitives::RelayChainBlockNumber;
 
 	fn current_block_number() -> Self::BlockNumber {
-		let maybe_data = cumulus_pallet_parachain_system::Pallet::<T>::validation_data();
+		let maybe_data = cumulus_pallet_parachain_system::ValidationData::<T>::get();
 
 		if let Some(data) = maybe_data {
 			data.relay_parent_number
@@ -300,7 +300,7 @@ where
 	Runtime: cumulus_pallet_parachain_system::Config,
 {
 	fn parent_hash() -> Option<cumulus_primitives_core::relay_chain::Hash> {
-		let validation_data = cumulus_pallet_parachain_system::Pallet::<Runtime>::validation_data();
+		let validation_data = cumulus_pallet_parachain_system::ValidationData::<Runtime>::get();
 		match validation_data {
 			Some(data) => Some(data.parent_head.hash()),
 			None => None,
diff --git a/runtime/adapters/src/tests/mock.rs b/runtime/adapters/src/tests/mock.rs
index 149ef9140..f4f0bd1f5 100644
--- a/runtime/adapters/src/tests/mock.rs
+++ b/runtime/adapters/src/tests/mock.rs
@@ -75,20 +75,20 @@ pub const ONE: Balance = 1_000_000_000_000;
 pub const NATIVE_AMOUNT: Balance = 10_000 * ONE;
 
 thread_local! {
-	pub static DUSTER_WHITELIST: RefCell<Vec<AccountId>> = RefCell::new(Vec::new());
+	pub static DUSTER_WHITELIST: RefCell<Vec<AccountId>> = const { RefCell::new(Vec::new()) };
 	pub static POSITIONS: RefCell<HashMap<u32, u64>> = RefCell::new(HashMap::default());
 	pub static REGISTERED_ASSETS: RefCell<HashMap<AssetId, u32>> = RefCell::new(HashMap::default());
-	pub static ASSET_WEIGHT_CAP: RefCell<Permill> = RefCell::new(Permill::from_percent(100));
-	pub static ASSET_FEE: RefCell<Permill> = RefCell::new(Permill::from_percent(0));
-	pub static PROTOCOL_FEE: RefCell<Permill> = RefCell::new(Permill::from_percent(0));
-	pub static MIN_ADDED_LIQUDIITY: RefCell<Balance> = RefCell::new(1000u128);
-	pub static MIN_TRADE_AMOUNT: RefCell<Balance> = RefCell::new(1000u128);
-	pub static MAX_IN_RATIO: RefCell<Balance> = RefCell::new(1u128);
-	pub static MAX_OUT_RATIO: RefCell<Balance> = RefCell::new(1u128);
-	pub static MAX_PRICE_DIFF: RefCell<Permill> = RefCell::new(Permill::from_percent(0));
-	pub static EXT_PRICE_ADJUSTMENT: RefCell<(u32,u32, bool)> = RefCell::new((0u32,0u32, false));
-	pub static WITHDRAWAL_FEE: RefCell<Permill> = RefCell::new(Permill::from_percent(0));
-	pub static WITHDRAWAL_ADJUSTMENT: RefCell<(u32,u32, bool)> = RefCell::new((0u32,0u32, false));
+	pub static ASSET_WEIGHT_CAP: RefCell<Permill> = const { RefCell::new(Permill::from_percent(100)) };
+	pub static ASSET_FEE: RefCell<Permill> = const { RefCell::new(Permill::from_percent(0)) };
+	pub static PROTOCOL_FEE: RefCell<Permill> = const { RefCell::new(Permill::from_percent(0)) };
+	pub static MIN_ADDED_LIQUDIITY: RefCell<Balance> = const { RefCell::new(1000u128) };
+	pub static MIN_TRADE_AMOUNT: RefCell<Balance> = const { RefCell::new(1000u128) };
+	pub static MAX_IN_RATIO: RefCell<Balance> = const { RefCell::new(1u128) };
+	pub static MAX_OUT_RATIO: RefCell<Balance> = const { RefCell::new(1u128) };
+	pub static MAX_PRICE_DIFF: RefCell<Permill> = const { RefCell::new(Permill::from_percent(0)) };
+	pub static EXT_PRICE_ADJUSTMENT: RefCell<(u32,u32, bool)> = const { RefCell::new((0u32,0u32, false)) };
+	pub static WITHDRAWAL_FEE: RefCell<Permill> = const { RefCell::new(Permill::from_percent(0)) };
+	pub static WITHDRAWAL_ADJUSTMENT: RefCell<(u32,u32, bool)> = const { RefCell::new((0u32,0u32, false)) };
 }
 
 construct_runtime!(
@@ -129,6 +129,11 @@ impl frame_system::Config for Test {
 	type SS58Prefix = ();
 	type OnSetCode = ();
 	type MaxConsumers = ConstU32<16>;
+	type SingleBlockMigrations = ();
+	type MultiBlockMigrator = ();
+	type PreInherents = ();
+	type PostInherents = ();
+	type PostTransactions = ();
 }
 
 impl pallet_balances::Config for Test {
diff --git a/runtime/adapters/src/tests/trader.rs b/runtime/adapters/src/tests/trader.rs
index 12ecf5a5d..1d6d52cad 100644
--- a/runtime/adapters/src/tests/trader.rs
+++ b/runtime/adapters/src/tests/trader.rs
@@ -98,8 +98,8 @@ impl Convert<Asset, Option<AssetId>> for MockConvert {
 }
 
 thread_local! {
-	pub static TAKEN_REVENUE: RefCell<BTreeSet<Asset>> = RefCell::new(BTreeSet::new());
-	pub static EXPECTED_REVENUE: RefCell<BTreeSet<Asset>> = RefCell::new(BTreeSet::new());
+	pub static TAKEN_REVENUE: RefCell<BTreeSet<Asset>> = const { RefCell::new(BTreeSet::new()) };
+	pub static EXPECTED_REVENUE: RefCell<BTreeSet<Asset>> = const { RefCell::new(BTreeSet::new()) };
 }
 
 struct ExpectRevenue;
@@ -143,7 +143,7 @@ impl TakeRevenue for ExpectRevenue {
 }
 
 thread_local! {
-	pub static EXPECTED_DEPOSITS: RefCell<BTreeSet<(AccountId, AssetId, Balance)>> = RefCell::new(BTreeSet::new());
+	pub static EXPECTED_DEPOSITS: RefCell<BTreeSet<(AccountId, AssetId, Balance)>> = const { RefCell::new(BTreeSet::new()) };
 }
 
 struct ExpectDeposit;
diff --git a/runtime/hydradx/Cargo.toml b/runtime/hydradx/Cargo.toml
index 0c1c72c61..ef58b2c8f 100644
--- a/runtime/hydradx/Cargo.toml
+++ b/runtime/hydradx/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "hydradx-runtime"
-version = "260.0.0"
+version = "261.0.0"
 authors = ["GalacticCouncil"]
 edition = "2021"
 license = "Apache 2.0"
@@ -13,13 +13,13 @@ targets = ["x86_64-unknown-linux-gnu"]
 substrate-wasm-builder = { workspace = true }
 
 [dependencies]
-hex-literal = "0.4.1"
-serde = { features = ["derive"], optional = true, version = "1.0.136" }
-codec = { package = "parity-scale-codec", version = "3.4.0", default-features = false, features = ["derive"] }
-scale-info = { version = "2.3.1", default-features = false, features = ["derive"] }
-smallvec = "1.9.0"
+hex-literal = { workspace = true }
+serde = { workspace = true, optional = true }
+codec = { workspace = true }
+scale-info = { workspace = true }
+smallvec = { workspace = true }
 log = { workspace = true }
-num_enum = { version = "0.5.1", default-features = false }
+num_enum = { workspace = true, default-features = false }
 evm = { workspace = true, features = ["with-codec"] }
 
 # local dependencies
@@ -117,6 +117,7 @@ polkadot-xcm = { workspace = true }
 xcm-executor = { workspace = true }
 xcm-builder = { workspace = true }
 polkadot-runtime-common = { workspace = true }
+xcm-fee-payment-runtime-api = { workspace = true }
 
 # Substrate dependencies
 frame-benchmarking = { workspace = true, optional = true }
@@ -160,7 +161,7 @@ pallet-evm-precompile-blake2 = { workspace = true }
 pallet-evm-precompile-call-permit = { workspace = true }
 precompile-utils = { workspace = true }
 module-evm-utility-macro = { workspace = true }
-ethabi = { version = "18.0.0", default-features = false }
+ethabi = {  workspace = true }
 
 [features]
 default = ["std"]
@@ -234,6 +235,7 @@ std = [
     "staging-parachain-info/std",
     "pallet-xcm/std",
     "polkadot-xcm/std",
+    "xcm-fee-payment-runtime-api/std",
     "xcm-executor/std",
     "xcm-builder/std",
     "orml-tokens/std",
diff --git a/runtime/hydradx/src/apis.rs b/runtime/hydradx/src/apis.rs
new file mode 100644
index 000000000..3c9de5bbb
--- /dev/null
+++ b/runtime/hydradx/src/apis.rs
@@ -0,0 +1,692 @@
+// This file is part of HydraDX-node.
+
+// 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.
+
+use crate::*;
+use frame_support::{
+	genesis_builder_helper::{build_state, get_preset},
+	sp_runtime::{
+		traits::Convert,
+		transaction_validity::{TransactionSource, TransactionValidity},
+		ApplyExtrinsicResult, ExtrinsicInclusionMode, FixedPointNumber,
+	},
+	weights::WeightToFee as _,
+};
+use hydradx_traits::NativePriceOracle;
+use polkadot_xcm::{IntoVersion, VersionedAssetId, VersionedAssets, VersionedLocation, VersionedXcm};
+use primitives::constants::chain::CORE_ASSET_ID;
+use sp_api::impl_runtime_apis;
+use sp_core::OpaqueMetadata;
+use xcm_fee_payment_runtime_api::Error as XcmPaymentApiError;
+
+impl_runtime_apis! {
+	impl sp_api::Core<Block> for Runtime {
+		fn version() -> RuntimeVersion {
+			VERSION
+		}
+
+		fn execute_block(block: Block) {
+			Executive::execute_block(block)
+		}
+
+		fn initialize_block(header: &<Block as BlockT>::Header) -> ExtrinsicInclusionMode {
+			Executive::initialize_block(header)
+		}
+	}
+
+	impl sp_api::Metadata<Block> for Runtime {
+		fn metadata() -> OpaqueMetadata {
+			OpaqueMetadata::new(Runtime::metadata().into())
+		}
+
+		fn metadata_at_version(version: u32) -> Option<OpaqueMetadata> {
+			Runtime::metadata_at_version(version)
+		}
+
+		fn metadata_versions() -> sp_std::vec::Vec<u32> {
+			Runtime::metadata_versions()
+		}
+	}
+
+	impl sp_block_builder::BlockBuilder<Block> for Runtime {
+		fn apply_extrinsic(extrinsic: <Block as BlockT>::Extrinsic) -> ApplyExtrinsicResult {
+			Executive::apply_extrinsic(extrinsic)
+		}
+
+		fn finalize_block() -> <Block as BlockT>::Header {
+			Executive::finalize_block()
+		}
+
+		fn inherent_extrinsics(data: sp_inherents::InherentData) -> Vec<<Block as BlockT>::Extrinsic> {
+			data.create_extrinsics()
+		}
+
+		fn check_inherents(
+			block: Block,
+			data: sp_inherents::InherentData,
+		) -> sp_inherents::CheckInherentsResult {
+			data.check_extrinsics(&block)
+		}
+	}
+
+	impl sp_transaction_pool::runtime_api::TaggedTransactionQueue<Block> for Runtime {
+		fn validate_transaction(
+			source: TransactionSource,
+			tx: <Block as BlockT>::Extrinsic,
+			block_hash: <Block as BlockT>::Hash,
+		) -> TransactionValidity {
+			Executive::validate_transaction(source, tx, block_hash)
+		}
+	}
+
+	impl sp_offchain::OffchainWorkerApi<Block> for Runtime {
+		fn offchain_worker(header: &<Block as BlockT>::Header) {
+			Executive::offchain_worker(header)
+		}
+	}
+
+	impl sp_session::SessionKeys<Block> for Runtime {
+		fn decode_session_keys(
+			encoded: Vec<u8>,
+		) -> Option<Vec<(Vec<u8>, sp_core::crypto::KeyTypeId)>> {
+			opaque::SessionKeys::decode_into_raw_public_keys(&encoded)
+		}
+
+		fn generate_session_keys(seed: Option<Vec<u8>>) -> Vec<u8> {
+			opaque::SessionKeys::generate(seed)
+		}
+	}
+
+	impl sp_consensus_aura::AuraApi<Block, AuraId> for Runtime {
+		fn slot_duration() -> sp_consensus_aura::SlotDuration {
+			sp_consensus_aura::SlotDuration::from_millis(Aura::slot_duration())
+		}
+
+		fn authorities() -> Vec<AuraId> {
+			pallet_aura::Authorities::<Runtime>::get().into_inner()
+		}
+	}
+
+	impl cumulus_primitives_core::CollectCollationInfo<Block> for Runtime {
+		fn collect_collation_info(header: &<Block as BlockT>::Header) -> cumulus_primitives_core::CollationInfo {
+			ParachainSystem::collect_collation_info(header)
+		}
+	}
+
+	#[cfg(feature = "try-runtime")]
+	impl frame_try_runtime::TryRuntime<Block> for Runtime {
+		fn on_runtime_upgrade(checks: frame_try_runtime::UpgradeCheckSelect) -> (Weight, Weight) {
+			log::info!("try-runtime::on_runtime_upgrade.");
+			let weight = Executive::try_runtime_upgrade(checks).unwrap();
+			(weight, BlockWeights::get().max_block)
+		}
+
+		fn execute_block(
+			block: Block,
+			state_root_check: bool,
+			signature_check: bool,
+			select: frame_try_runtime::TryStateSelect,
+		) -> Weight {
+			Executive::try_execute_block(block, state_root_check, signature_check, select).unwrap()
+		}
+	}
+
+
+	impl frame_system_rpc_runtime_api::AccountNonceApi<Block, AccountId, Index> for Runtime {
+		fn account_nonce(account: AccountId) -> Index {
+			System::account_nonce(account)
+		}
+	}
+
+	impl pallet_transaction_payment_rpc_runtime_api::TransactionPaymentApi<Block, Balance> for Runtime {
+		fn query_info(
+			uxt: <Block as BlockT>::Extrinsic,
+			len: u32,
+		) -> pallet_transaction_payment_rpc_runtime_api::RuntimeDispatchInfo<Balance> {
+			TransactionPayment::query_info(uxt, len)
+		}
+
+		fn query_fee_details(
+			uxt: <Block as BlockT>::Extrinsic,
+			len: u32,
+		) -> pallet_transaction_payment_rpc_runtime_api::FeeDetails<Balance> {
+			TransactionPayment::query_fee_details(uxt, len)
+		}
+
+		fn query_weight_to_fee(weight: Weight) -> Balance {
+			TransactionPayment::weight_to_fee(weight)
+		}
+		fn query_length_to_fee(length: u32) -> Balance {
+			TransactionPayment::length_to_fee(length)
+		}
+	}
+
+	// Frontier RPC support
+	impl fp_rpc::EthereumRuntimeRPCApi<Block> for Runtime {
+		fn chain_id() -> u64 {
+			<Runtime as pallet_evm::Config>::ChainId::get()
+		}
+
+		fn account_basic(address: H160) -> EVMAccount {
+			let (account, _) = EVM::account_basic(&address);
+			account
+		}
+
+		fn gas_price() -> U256 {
+			let (gas_price, _) = <Runtime as pallet_evm::Config>::FeeCalculator::min_gas_price();
+			gas_price
+		}
+
+		fn account_code_at(address: H160) -> Vec<u8> {
+			pallet_evm::AccountCodes::<Runtime>::get(address)
+		}
+
+		fn author() -> H160 {
+			<pallet_evm::Pallet<Runtime>>::find_author()
+		}
+
+		fn storage_at(address: H160, index: U256) -> H256 {
+			let mut tmp = [0u8; 32];
+			index.to_big_endian(&mut tmp);
+			pallet_evm::AccountStorages::<Runtime>::get(address, H256::from_slice(&tmp[..]))
+		}
+
+		fn call(
+			from: H160,
+			to: H160,
+			data: Vec<u8>,
+			value: U256,
+			gas_limit: U256,
+			max_fee_per_gas: Option<U256>,
+			max_priority_fee_per_gas: Option<U256>,
+			nonce: Option<U256>,
+			estimate: bool,
+			access_list: Option<Vec<(H160, Vec<H256>)>>,
+		) -> Result<pallet_evm::CallInfo, sp_runtime::DispatchError> {
+			let mut config = <Runtime as pallet_evm::Config>::config().clone();
+			config.estimate = estimate;
+
+			let is_transactional = false;
+			let validate = true;
+
+			// Estimated encoded transaction size must be based on the heaviest transaction
+			// type (EIP1559Transaction) to be compatible with all transaction types.
+			let mut estimated_transaction_len = data.len() +
+				// pallet ethereum index: 1
+				// transact call index: 1
+				// Transaction enum variant: 1
+				// chain_id 8 bytes
+				// nonce: 32
+				// max_priority_fee_per_gas: 32
+				// max_fee_per_gas: 32
+				// gas_limit: 32
+				// action: 21 (enum varianrt + call address)
+				// value: 32
+				// access_list: 1 (empty vec size)
+				// 65 bytes signature
+				258;
+
+			if access_list.is_some() {
+				estimated_transaction_len += access_list.encoded_size();
+			}
+
+			let gas_limit = gas_limit.min(u64::MAX.into()).low_u64();
+			let without_base_extrinsic_weight = true;
+
+			let (weight_limit, proof_size_base_cost) =
+						match <Runtime as pallet_evm::Config>::GasWeightMapping::gas_to_weight(
+							gas_limit,
+							without_base_extrinsic_weight
+						) {
+							weight_limit if weight_limit.proof_size() > 0 => {
+								(Some(weight_limit), Some(estimated_transaction_len as u64))
+							}
+							_ => (None, None),
+						};
+
+			// don't allow calling EVM RPC or Runtime API from a bound address
+			if EVMAccounts::bound_account_id(from).is_some() {
+				return Err(pallet_evm_accounts::Error::<Runtime>::BoundAddressCannotBeUsed.into())
+			};
+
+			<Runtime as pallet_evm::Config>::Runner::call(
+				from,
+				to,
+				data,
+				value,
+				gas_limit.unique_saturated_into(),
+				max_fee_per_gas,
+				max_priority_fee_per_gas,
+				nonce,
+				access_list.unwrap_or_default(),
+				is_transactional,
+				validate,
+				weight_limit,
+				proof_size_base_cost,
+				&config,
+			)
+			.map_err(|err| err.error.into())
+		}
+
+		fn create(
+			from: H160,
+			data: Vec<u8>,
+			value: U256,
+			gas_limit: U256,
+			max_fee_per_gas: Option<U256>,
+			max_priority_fee_per_gas: Option<U256>,
+			nonce: Option<U256>,
+			estimate: bool,
+			access_list: Option<Vec<(H160, Vec<H256>)>>,
+		) -> Result<pallet_evm::CreateInfo, sp_runtime::DispatchError> {
+			let config = if estimate {
+				let mut config = <Runtime as pallet_evm::Config>::config().clone();
+				config.estimate = true;
+				Some(config)
+			} else {
+				None
+			};
+
+			let is_transactional = false;
+			let validate = true;
+
+			// Reused approach from Moonbeam since Frontier implementation doesn't support this
+			let mut estimated_transaction_len = data.len() +
+				// to: 20
+				// from: 20
+				// value: 32
+				// gas_limit: 32
+				// nonce: 32
+				// 1 byte transaction action variant
+				// chain id 8 bytes
+				// 65 bytes signature
+				210;
+			if max_fee_per_gas.is_some() {
+				estimated_transaction_len += 32;
+			}
+			if max_priority_fee_per_gas.is_some() {
+				estimated_transaction_len += 32;
+			}
+			if access_list.is_some() {
+				estimated_transaction_len += access_list.encoded_size();
+			}
+
+			let gas_limit = gas_limit.min(u64::MAX.into()).low_u64();
+			let without_base_extrinsic_weight = true;
+
+			let (weight_limit, proof_size_base_cost) =
+				match <Runtime as pallet_evm::Config>::GasWeightMapping::gas_to_weight(
+					gas_limit,
+					without_base_extrinsic_weight
+				) {
+					weight_limit if weight_limit.proof_size() > 0 => {
+						(Some(weight_limit), Some(estimated_transaction_len as u64))
+					}
+					_ => (None, None),
+				};
+
+			// don't allow calling EVM RPC or Runtime API from a bound address
+			if EVMAccounts::bound_account_id(from).is_some() {
+				return Err(pallet_evm_accounts::Error::<Runtime>::BoundAddressCannotBeUsed.into())
+				};
+
+			// the address needs to have a permission to deploy smart contract
+			if !EVMAccounts::can_deploy_contracts(from) {
+				return Err(pallet_evm_accounts::Error::<Runtime>::AddressNotWhitelisted.into())
+			};
+
+			#[allow(clippy::or_fun_call)] // suggestion not helpful here
+			<Runtime as pallet_evm::Config>::Runner::create(
+				from,
+				data,
+				value,
+				gas_limit.unique_saturated_into(),
+				max_fee_per_gas,
+				max_priority_fee_per_gas,
+				nonce,
+				Vec::new(),
+				is_transactional,
+				validate,
+				weight_limit,
+				proof_size_base_cost,
+				config
+					.as_ref()
+					.unwrap_or(<Runtime as pallet_evm::Config>::config()),
+				)
+				.map_err(|err| err.error.into())
+		}
+
+		fn current_transaction_statuses() -> Option<Vec<TransactionStatus>> {
+			pallet_ethereum::CurrentTransactionStatuses::<Runtime>::get()
+		}
+
+		fn current_block() -> Option<pallet_ethereum::Block> {
+			pallet_ethereum::CurrentBlock::<Runtime>::get()
+		}
+
+		fn current_receipts() -> Option<Vec<pallet_ethereum::Receipt>> {
+			pallet_ethereum::CurrentReceipts::<Runtime>::get()
+		}
+
+		fn current_all() -> (
+			Option<pallet_ethereum::Block>,
+			Option<Vec<pallet_ethereum::Receipt>>,
+			Option<Vec<TransactionStatus>>,
+		) {
+			(
+				pallet_ethereum::CurrentBlock::<Runtime>::get(),
+				pallet_ethereum::CurrentReceipts::<Runtime>::get(),
+				pallet_ethereum::CurrentTransactionStatuses::<Runtime>::get(),
+			)
+		}
+
+		fn extrinsic_filter(xts: Vec<<Block as BlockT>::Extrinsic>) -> Vec<EthereumTransaction> {
+			xts.into_iter()
+				.filter_map(|xt| match xt.0.function {
+					RuntimeCall::Ethereum(pallet_ethereum::Call::transact { transaction }) => Some(transaction),
+					_ => None,
+				})
+				.collect::<Vec<EthereumTransaction>>()
+		}
+
+		fn elasticity() -> Option<Permill> {
+			None
+		}
+
+		fn gas_limit_multiplier_support() {}
+
+		fn pending_block(
+			xts: Vec<<Block as BlockT>::Extrinsic>,
+		) -> (Option<pallet_ethereum::Block>, Option<Vec<TransactionStatus>>) {
+			for ext in xts.into_iter() {
+				let _ = Executive::apply_extrinsic(ext);
+			}
+
+			Ethereum::on_finalize(System::block_number() + 1);
+
+			(
+				pallet_ethereum::CurrentBlock::<Runtime>::get(),
+				pallet_ethereum::CurrentTransactionStatuses::<Runtime>::get()
+			)
+		}
+
+		fn initialize_pending_block(header: &<Block as BlockT>::Header) {
+			Executive::initialize_block(header);
+		}
+	}
+
+	impl fp_rpc::ConvertTransactionRuntimeApi<Block> for Runtime {
+		fn convert_transaction(transaction: EthereumTransaction) -> <Block as BlockT>::Extrinsic {
+			UncheckedExtrinsic::new_unsigned(pallet_ethereum::Call::<Runtime>::transact { transaction }.into())
+		}
+	}
+
+	impl pallet_evm_accounts_rpc_runtime_api::EvmAccountsApi<Block, AccountId, H160> for Runtime {
+		fn evm_address(account_id: AccountId) -> H160 {
+			EVMAccounts::evm_address(&account_id)
+		}
+		fn bound_account_id(evm_address: H160) -> Option<AccountId> {
+			EVMAccounts::bound_account_id(evm_address)
+		}
+		fn account_id(evm_address: H160) -> AccountId {
+			EVMAccounts::account_id(evm_address)
+		}
+	}
+
+	impl xcm_fee_payment_runtime_api::XcmPaymentApi<Block> for Runtime {
+		fn query_acceptable_payment_assets(xcm_version: polkadot_xcm::Version) -> Result<Vec<VersionedAssetId>, XcmPaymentApiError> {
+			if !matches!(xcm_version, 3 | 4) {
+				return Err(XcmPaymentApiError::UnhandledXcmVersion);
+			}
+
+			let mut asset_locations = vec![
+		AssetLocation(polkadot_xcm::v3::MultiLocation {
+				parents: 1,
+				interior: [
+					polkadot_xcm::v3::Junction::Parachain(ParachainInfo::get().into()),
+					polkadot_xcm::v3::Junction::GeneralIndex(CORE_ASSET_ID.into()),
+				]
+				.into(),
+			}),
+			AssetLocation(polkadot_xcm::v3::MultiLocation {
+				parents: 0,
+				interior: [
+					polkadot_xcm::v3::Junction::GeneralIndex(CORE_ASSET_ID.into()),
+				]
+				.into(),
+			})];
+
+			let mut asset_registry_locations: Vec<AssetLocation> = pallet_asset_registry::LocationAssets::<Runtime>::iter_keys().collect();
+			asset_locations.append(&mut asset_registry_locations);
+
+			let versioned_locations = asset_locations.iter().map(|loc| VersionedAssetId::V3(polkadot_xcm::v3::AssetId::Concrete(loc.0)));
+
+			Ok(versioned_locations
+				.filter_map(|asset| asset.into_version(xcm_version).ok())
+				.collect())
+		}
+
+		fn query_weight_to_asset_fee(weight: Weight, asset: VersionedAssetId) -> Result<u128, XcmPaymentApiError> {
+			let v4_xcm_asset_id = asset.into_version(4).map_err(|_| XcmPaymentApiError::VersionedConversionFailed)?;
+
+			// get nested polkadot_xcm::AssetId type
+			let xcm_asset_id: &polkadot_xcm::v4::AssetId = v4_xcm_asset_id.try_as().map_err(|_| XcmPaymentApiError::WeightNotComputable)?;
+
+			let asset_id: AssetId = CurrencyIdConvert::convert(xcm_asset_id.clone().0).ok_or(XcmPaymentApiError::AssetNotFound)?;
+
+			let price = MultiTransactionPayment::price(asset_id).ok_or(XcmPaymentApiError::WeightNotComputable)?;
+
+			let fee = WeightToFee::weight_to_fee(&weight);
+
+			let converted_fee = price.checked_mul_int(fee).ok_or(XcmPaymentApiError::WeightNotComputable)?;
+
+			Ok(converted_fee)
+		}
+
+		fn query_xcm_weight(message: VersionedXcm<()>) -> Result<Weight, XcmPaymentApiError> {
+			PolkadotXcm::query_xcm_weight(message)
+		}
+
+		fn query_delivery_fees(destination: VersionedLocation, message: VersionedXcm<()>) -> Result<VersionedAssets, XcmPaymentApiError> {
+			PolkadotXcm::query_delivery_fees(destination, message)
+		}
+	}
+
+	#[cfg(feature = "runtime-benchmarks")]
+	impl frame_benchmarking::Benchmark<Block> for Runtime {
+		fn benchmark_metadata(extra: bool) -> (
+			Vec<frame_benchmarking::BenchmarkList>,
+			Vec<frame_support::traits::StorageInfo>,
+		) {
+			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_benchmarks!(list, extra);
+
+			orml_list_benchmark!(list, extra, pallet_currencies, benchmarking::currencies);
+			orml_list_benchmark!(list, extra, orml_tokens, benchmarking::tokens);
+			orml_list_benchmark!(list, extra, orml_vesting, benchmarking::vesting);
+			orml_list_benchmark!(list, extra, pallet_transaction_multi_payment, benchmarking::multi_payment);
+			orml_list_benchmark!(list, extra, pallet_duster, benchmarking::duster);
+			orml_list_benchmark!(list, extra, pallet_omnipool, benchmarking::omnipool);
+			orml_list_benchmark!(list, extra, pallet_route_executor, benchmarking::route_executor);
+			orml_list_benchmark!(list, extra, pallet_dca, benchmarking::dca);
+			orml_list_benchmark!(list, extra, pallet_xyk, benchmarking::xyk);
+			orml_list_benchmark!(list, extra, pallet_dynamic_evm_fee, benchmarking::dynamic_evm_fee);
+			orml_list_benchmark!(list, extra, pallet_xyk_liquidity_mining, benchmarking::xyk_liquidity_mining);
+
+			let storage_info = AllPalletsWithSystem::storage_info();
+
+			(list, storage_info)
+		}
+
+		fn dispatch_benchmark(
+			config: frame_benchmarking::BenchmarkConfig
+		) -> Result<Vec<frame_benchmarking::BenchmarkBatch>, sp_runtime::RuntimeString> {
+			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;
+			use primitives::constants::chain::CORE_ASSET_ID;
+			use sp_std::sync::Arc;
+
+			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);
+					Ok(())
+				}
+
+				fn verify_set_code() {
+					System::assert_last_event(cumulus_pallet_parachain_system::Event::<Runtime>::ValidationFunctionStored.into());
+				}
+			}
+
+			frame_support::parameter_types! {
+				pub const RandomParaId: ParaId = ParaId::new(22_222_222);
+				pub const ExistentialDeposit: u128 = 1_000_000_000_000;
+				pub AssetLocation: Location = Location::new(0, cumulus_primitives_core::Junctions::X1(
+					Arc::new([
+						cumulus_primitives_core::Junction::GeneralIndex(CORE_ASSET_ID.into())
+						])
+				));
+			}
+
+			use polkadot_xcm::latest::prelude::{Location, AssetId, Fungible, Asset, Assets, Parent, ParentThen, Parachain};
+
+			impl pallet_xcm::benchmarking::Config for Runtime {
+				type DeliveryHelper = ();
+
+				fn reachable_dest() -> Option<Location> {
+					Some(Parent.into())
+				}
+
+				fn teleportable_asset_and_dest() -> Option<(Asset, Location)> {
+					None
+				}
+
+				fn reserve_transferable_asset_and_dest() -> Option<(Asset, Location)> {
+					ParachainSystem::open_outbound_hrmp_channel_for_benchmarks_or_tests(
+								RandomParaId::get()
+							);
+
+					Some((
+						Asset {
+							fun: Fungible(ExistentialDeposit::get()),
+							id: AssetId(AssetLocation::get())
+						},
+						ParentThen(Parachain(RandomParaId::get().into()).into()).into(),
+					))
+				}
+
+				fn set_up_complex_asset_transfer() -> Option<(Assets, u32, Location, Box<dyn FnOnce()>)> {
+					ParachainSystem::open_outbound_hrmp_channel_for_benchmarks_or_tests(
+								RandomParaId::get()
+							);
+
+					let destination = ParentThen(Parachain(RandomParaId::get().into()).into()).into();
+
+					let fee_asset: Asset = (
+						   AssetLocation::get(),
+						   ExistentialDeposit::get(),
+					 ).into();
+
+					let who = frame_benchmarking::whitelisted_caller();
+					let balance = 10 * ExistentialDeposit::get();
+					let _ = <Balances as frame_support::traits::Currency<_>>::make_free_balance_be(&who, balance );
+
+					assert_eq!(Balances::free_balance(&who), balance);
+
+					let transfer_asset: Asset = (
+						   AssetLocation::get(),
+						   ExistentialDeposit::get(),
+					 ).into();
+
+					let assets: Assets = vec![fee_asset.clone(), transfer_asset].into();
+
+					let fee_index: u32 = 0;
+
+					let verify: Box<dyn FnOnce()> = Box::new(move || {
+						assert!(Balances::free_balance(&who) <= balance - ExistentialDeposit::get());
+					});
+
+					Some((assets, fee_index, destination, verify))
+			   }
+
+				fn get_asset() -> Asset {
+					Asset {
+						id: AssetId(Location::here()),
+						fun: Fungible(ExistentialDeposit::get()),
+					}
+				}
+			}
+
+			let whitelist: Vec<TrackedStorageKey> = vec![
+				// Block Number
+				hex!("26aa394eea5630e07c48ae0c9558cef702a5c1b19ab7a04f536c519aca4983ac").to_vec().into(),
+				// Total Issuance
+				hex!("c2261276cc9d1f8598ea4b6a74b15c2f57c875e4cff74148e4628f264b974c80").to_vec().into(),
+				// Execution Phase
+				hex!("26aa394eea5630e07c48ae0c9558cef7ff553b5a9862a516939d82b3d3d8661a").to_vec().into(),
+				// Event Count
+				hex!("26aa394eea5630e07c48ae0c9558cef70a98fdbe9ce6c55837576c60c7af3850").to_vec().into(),
+				// System Events
+				hex!("26aa394eea5630e07c48ae0c9558cef780d41e5e16056765bc8461851072c9d7").to_vec().into(),
+			];
+
+			let mut batches = Vec::<BenchmarkBatch>::new();
+			let params = (&config, &whitelist);
+
+			add_benchmarks!(params, batches);
+
+			orml_add_benchmark!(params, batches, pallet_currencies, benchmarking::currencies);
+			orml_add_benchmark!(params, batches, orml_tokens, benchmarking::tokens);
+			orml_add_benchmark!(params, batches, orml_vesting, benchmarking::vesting);
+			orml_add_benchmark!(params, batches, pallet_transaction_multi_payment, benchmarking::multi_payment);
+			orml_add_benchmark!(params, batches, pallet_duster, benchmarking::duster);
+			orml_add_benchmark!(params, batches, pallet_omnipool, benchmarking::omnipool);
+			orml_add_benchmark!(params, batches, pallet_route_executor, benchmarking::route_executor);
+			orml_add_benchmark!(params, batches, pallet_dca, benchmarking::dca);
+			orml_add_benchmark!(params, batches, pallet_xyk, benchmarking::xyk);
+			orml_add_benchmark!(params, batches, pallet_dynamic_evm_fee, benchmarking::dynamic_evm_fee);
+			orml_add_benchmark!(params, batches, pallet_xyk_liquidity_mining, benchmarking::xyk_liquidity_mining);
+
+			if batches.is_empty() { return Err("Benchmark not found for this pallet.".into()) }
+			Ok(batches)
+		}
+	}
+
+	impl sp_genesis_builder::GenesisBuilder<Block> for Runtime {
+		fn build_state(config: Vec<u8>) -> sp_genesis_builder::Result {
+			build_state::<RuntimeGenesisConfig>(config)
+		}
+
+		fn get_preset(id: &Option<PresetId>) -> Option<Vec<u8>> {
+			get_preset::<RuntimeGenesisConfig>(id, |_| None)
+		}
+
+		fn preset_names() -> Vec<PresetId> {
+			Default::default()
+		}
+	}
+}
diff --git a/runtime/hydradx/src/assets.rs b/runtime/hydradx/src/assets.rs
index 480f643b4..4d01b10ed 100644
--- a/runtime/hydradx/src/assets.rs
+++ b/runtime/hydradx/src/assets.rs
@@ -610,6 +610,7 @@ impl pallet_duster::Config for Runtime {
 	type Reward = DustingReward;
 	type NativeCurrencyId = NativeAssetId;
 	type BlacklistUpdateOrigin = SuperMajorityTechCommittee;
+	type TreasuryAccountId = TreasuryAccount;
 	type WeightInfo = weights::pallet_duster::HydraWeight<Runtime>;
 }
 
@@ -720,7 +721,7 @@ where
 	Runtime: cumulus_pallet_parachain_system::Config,
 {
 	fn parent_hash() -> Option<cumulus_primitives_core::relay_chain::Hash> {
-		let validation_data = cumulus_pallet_parachain_system::Pallet::<Runtime>::validation_data();
+		let validation_data = cumulus_pallet_parachain_system::ValidationData::<Runtime>::get();
 		match validation_data {
 			Some(data) => Some(data.parent_head.hash()),
 			None => None,
diff --git a/runtime/hydradx/src/evm/accounts_conversion.rs b/runtime/hydradx/src/evm/accounts_conversion.rs
index c3fe1f0f2..1cd7ce35f 100644
--- a/runtime/hydradx/src/evm/accounts_conversion.rs
+++ b/runtime/hydradx/src/evm/accounts_conversion.rs
@@ -30,7 +30,7 @@ use hex_literal::hex;
 use hydradx_traits::evm::InspectEvmAccounts;
 use pallet_evm::AddressMapping;
 use sp_core::{crypto::ByteArray, H160};
-use sp_runtime::traits::AccountIdConversion;
+use sp_runtime::{traits::AccountIdConversion, RuntimeAppPublic};
 
 pub struct ExtendedAddressMapping;
 
@@ -42,14 +42,14 @@ impl AddressMapping<AccountId> for ExtendedAddressMapping {
 
 // Ethereum-compatible blocks author (20 bytes)
 // Converted by truncating from Substrate author (32 bytes)
-pub struct FindAuthorTruncated<F>(PhantomData<F>);
-impl<F: FindAuthor<u32>> FindAuthor<H160> for FindAuthorTruncated<F> {
+pub struct FindAuthorTruncated<T, F>(PhantomData<(T, F)>);
+impl<T: pallet_aura::Config, F: FindAuthor<u32>> FindAuthor<H160> for FindAuthorTruncated<T, F> {
 	fn find_author<'a, I>(digests: I) -> Option<H160>
 	where
 		I: 'a + IntoIterator<Item = (ConsensusEngineId, &'a [u8])>,
 	{
 		if let Some(author_index) = F::find_author(digests) {
-			let authority_id = Aura::authorities()[author_index as usize].clone();
+			let authority_id = pallet_aura::Authorities::<T>::get()[author_index as usize].clone();
 			return Some(H160::from_slice(&authority_id.to_raw_vec()[4..24]));
 		}
 		None
diff --git a/runtime/hydradx/src/evm/evm-utility/Cargo.toml b/runtime/hydradx/src/evm/evm-utility/Cargo.toml
index f6182015f..4c34386a9 100644
--- a/runtime/hydradx/src/evm/evm-utility/Cargo.toml
+++ b/runtime/hydradx/src/evm/evm-utility/Cargo.toml
@@ -1,20 +1,20 @@
 [package]
 name = "module-evm-utility"
-version = "2.21.0"
+version = "2.21.1"
 authors = ["Acala Developers"]
 edition = "2021"
 
 [dependencies]
-sha3 = { version = "0.10.6", default-features = false }
+sha3 = { workspace = true }
 
 #Substrate dependencies
 sp-std = { workspace = true }
 
 #Evm dependencies
 evm = { git = "https://github.com/rust-blockchain/evm", rev = "13240a8a551586fdef0b5028ed73af80b248092a", default-features = false, features = ["with-codec"] }
-evm-gasometer = { git = "https://github.com/rust-blockchain/evm", rev = "13240a8a551586fdef0b5028ed73af80b248092a", default-features = false }
-evm-runtime = { git = "https://github.com/rust-blockchain/evm", rev = "13240a8a551586fdef0b5028ed73af80b248092a", default-features = false }
-ethereum = { version = "0.14.0", default-features = false, features = ["with-codec"] }
+evm-gasometer = { workspace = true }
+evm-runtime = { workspace = true }
+ethereum = {  workspace = true }
 
 [features]
 default = ["std"]
diff --git a/runtime/hydradx/src/evm/evm-utility/macro/Cargo.toml b/runtime/hydradx/src/evm/evm-utility/macro/Cargo.toml
index 738d54abe..bfa0aa005 100644
--- a/runtime/hydradx/src/evm/evm-utility/macro/Cargo.toml
+++ b/runtime/hydradx/src/evm/evm-utility/macro/Cargo.toml
@@ -8,7 +8,7 @@ edition = "2021"
 proc-macro = true
 
 [dependencies]
-quote = "1.0.20"
-syn = { version = "1.0.98", features = ["full", "fold", "extra-traits", "visit"] }
-proc-macro2 = "1.0.40"
+quote = { workspace = true }
+syn = {  workspace = true }
+proc-macro2 = { workspace = true }
 module-evm-utility = { path = ".." }
diff --git a/runtime/hydradx/src/evm/evm_fee.rs b/runtime/hydradx/src/evm/evm_fee.rs
index 237994144..e27782ca3 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,
-	) -> Result<Self::LiquidityInfo, Error<T>> {
+	) -> Self::LiquidityInfo {
 		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 Ok(None);
+			return None;
 		}
-		Ok(None)
+		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 a9d3cfe98..165815e58 100644
--- a/runtime/hydradx/src/evm/mod.rs
+++ b/runtime/hydradx/src/evm/mod.rs
@@ -135,7 +135,7 @@ impl pallet_evm::Config for crate::Runtime {
 	type ChainId = crate::EVMChainId;
 	type Currency = WethCurrency;
 	type FeeCalculator = crate::DynamicEvmFee;
-	type FindAuthor = FindAuthorTruncated<Aura>;
+	type FindAuthor = FindAuthorTruncated<crate::Runtime, Aura>;
 	type GasWeightMapping = pallet_evm::FixedGasWeightMapping<Self>;
 	type OnChargeTransaction = evm_fee::TransferEvmFees<
 		evm_fee::DepositEvmFeeToTreasury,
diff --git a/runtime/hydradx/src/evm/runner.rs b/runtime/hydradx/src/evm/runner.rs
index d2ab5a951..bbf58eb89 100644
--- a/runtime/hydradx/src/evm/runner.rs
+++ b/runtime/hydradx/src/evm/runner.rs
@@ -260,4 +260,56 @@ where
 			config,
 		)
 	}
+
+	fn create_force_address(
+		source: H160,
+		init: Vec<u8>,
+		value: U256,
+		gas_limit: u64,
+		max_fee_per_gas: Option<U256>,
+		max_priority_fee_per_gas: Option<U256>,
+		nonce: Option<U256>,
+		access_list: Vec<(H160, Vec<H256>)>,
+		is_transactional: bool,
+		validate: bool,
+		weight_limit: Option<Weight>,
+		proof_size_base_cost: Option<u64>,
+		config: &evm::Config,
+		contract_address: H160,
+	) -> Result<CreateInfo, RunnerError<Self::Error>> {
+		if validate {
+			Self::validate(
+				source,
+				None,
+				init.clone(),
+				value,
+				gas_limit,
+				max_fee_per_gas,
+				max_priority_fee_per_gas,
+				nonce,
+				access_list.clone(),
+				is_transactional,
+				weight_limit,
+				proof_size_base_cost,
+				config,
+			)?;
+		}
+		//Validated, flag set to false
+		R::create_force_address(
+			source,
+			init,
+			value,
+			gas_limit,
+			max_fee_per_gas,
+			max_priority_fee_per_gas,
+			nonce,
+			access_list,
+			is_transactional,
+			false,
+			weight_limit,
+			proof_size_base_cost,
+			config,
+			contract_address,
+		)
+	}
 }
diff --git a/runtime/hydradx/src/lib.rs b/runtime/hydradx/src/lib.rs
index e52d92d9c..334e65987 100644
--- a/runtime/hydradx/src/lib.rs
+++ b/runtime/hydradx/src/lib.rs
@@ -31,6 +31,7 @@ mod tests;
 mod benchmarking;
 pub mod weights;
 
+pub mod apis;
 mod assets;
 pub mod evm;
 mod governance;
@@ -45,16 +46,16 @@ pub use xcm::*;
 
 use codec::{Decode, Encode};
 use hydradx_traits::evm::InspectEvmAccounts;
-use sp_api::impl_runtime_apis;
-use sp_core::{ConstU128, Get, OpaqueMetadata, H160, H256, U256};
+use sp_core::{ConstU128, Get, H160, H256, U256};
+use sp_genesis_builder::PresetId;
 use sp_runtime::{
 	create_runtime_str, generic, impl_opaque_keys,
 	traits::{
 		AccountIdConversion, BlakeTwo256, Block as BlockT, DispatchInfoOf, Dispatchable, PostDispatchInfoOf,
 		UniqueSaturatedInto,
 	},
-	transaction_validity::{TransactionSource, TransactionValidity, TransactionValidityError},
-	ApplyExtrinsicResult, Permill,
+	transaction_validity::{TransactionValidity, TransactionValidityError},
+	Permill,
 };
 
 use sp_std::{convert::From, prelude::*};
@@ -62,13 +63,7 @@ use sp_std::{convert::From, prelude::*};
 use sp_version::NativeVersion;
 use sp_version::RuntimeVersion;
 // A few exports that help ease life for downstream crates.
-use frame_support::{
-	construct_runtime,
-	genesis_builder_helper::{build_config, create_default_config},
-	pallet_prelude::Hooks,
-	parameter_types,
-	weights::Weight,
-};
+use frame_support::{construct_runtime, pallet_prelude::Hooks, weights::Weight};
 pub use hex_literal::hex;
 /// Import HydraDX pallets
 pub use pallet_claims;
@@ -113,9 +108,9 @@ pub const VERSION: RuntimeVersion = RuntimeVersion {
 	spec_name: create_runtime_str!("hydradx"),
 	impl_name: create_runtime_str!("hydradx"),
 	authoring_version: 1,
-	spec_version: 260,
+	spec_version: 261,
 	impl_version: 0,
-	apis: RUNTIME_API_VERSIONS,
+	apis: apis::RUNTIME_API_VERSIONS,
 	transaction_version: 1,
 	state_version: 1,
 };
@@ -271,12 +266,7 @@ pub type Executive = frame_executive::Executive<
 	frame_system::ChainContext<Runtime>,
 	Runtime,
 	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
-	),
+	(pallet_collator_selection::migration::v2::MigrationToV2<Runtime>,),
 >;
 
 impl<C> frame_system::offchain::SendTransactionTypes<C> for Runtime
@@ -287,556 +277,6 @@ where
 	type Extrinsic = UncheckedExtrinsic;
 }
 
-// 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 {
-			VERSION
-		}
-
-		fn execute_block(block: Block) {
-			Executive::execute_block(block)
-		}
-
-		fn initialize_block(header: &<Block as BlockT>::Header) {
-			Executive::initialize_block(header)
-		}
-	}
-
-	impl sp_api::Metadata<Block> for Runtime {
-		fn metadata() -> OpaqueMetadata {
-			OpaqueMetadata::new(Runtime::metadata().into())
-		}
-
-		fn metadata_at_version(version: u32) -> Option<OpaqueMetadata> {
-			Runtime::metadata_at_version(version)
-		}
-
-		fn metadata_versions() -> sp_std::vec::Vec<u32> {
-			Runtime::metadata_versions()
-		}
-	}
-
-	impl sp_block_builder::BlockBuilder<Block> for Runtime {
-		fn apply_extrinsic(extrinsic: <Block as BlockT>::Extrinsic) -> ApplyExtrinsicResult {
-			Executive::apply_extrinsic(extrinsic)
-		}
-
-		fn finalize_block() -> <Block as BlockT>::Header {
-			Executive::finalize_block()
-		}
-
-		fn inherent_extrinsics(data: sp_inherents::InherentData) -> Vec<<Block as BlockT>::Extrinsic> {
-			data.create_extrinsics()
-		}
-
-		fn check_inherents(
-			block: Block,
-			data: sp_inherents::InherentData,
-		) -> sp_inherents::CheckInherentsResult {
-			data.check_extrinsics(&block)
-		}
-	}
-
-	impl sp_transaction_pool::runtime_api::TaggedTransactionQueue<Block> for Runtime {
-		fn validate_transaction(
-			source: TransactionSource,
-			tx: <Block as BlockT>::Extrinsic,
-			block_hash: <Block as BlockT>::Hash,
-		) -> TransactionValidity {
-			Executive::validate_transaction(source, tx, block_hash)
-		}
-	}
-
-	impl sp_offchain::OffchainWorkerApi<Block> for Runtime {
-		fn offchain_worker(header: &<Block as BlockT>::Header) {
-			Executive::offchain_worker(header)
-		}
-	}
-
-	impl sp_session::SessionKeys<Block> for Runtime {
-		fn decode_session_keys(
-			encoded: Vec<u8>,
-		) -> Option<Vec<(Vec<u8>, sp_core::crypto::KeyTypeId)>> {
-			opaque::SessionKeys::decode_into_raw_public_keys(&encoded)
-		}
-
-		fn generate_session_keys(seed: Option<Vec<u8>>) -> Vec<u8> {
-			opaque::SessionKeys::generate(seed)
-		}
-	}
-
-	impl sp_consensus_aura::AuraApi<Block, AuraId> for Runtime {
-		fn slot_duration() -> sp_consensus_aura::SlotDuration {
-			sp_consensus_aura::SlotDuration::from_millis(Aura::slot_duration())
-		}
-
-		fn authorities() -> Vec<AuraId> {
-			Aura::authorities().into_inner()
-		}
-	}
-
-	impl cumulus_primitives_core::CollectCollationInfo<Block> for Runtime {
-		fn collect_collation_info(header: &<Block as BlockT>::Header) -> cumulus_primitives_core::CollationInfo {
-			ParachainSystem::collect_collation_info(header)
-		}
-	}
-
-	#[cfg(feature = "try-runtime")]
-	impl frame_try_runtime::TryRuntime<Block> for Runtime {
-		fn on_runtime_upgrade(checks: frame_try_runtime::UpgradeCheckSelect) -> (Weight, Weight) {
-			log::info!("try-runtime::on_runtime_upgrade.");
-			let weight = Executive::try_runtime_upgrade(checks).unwrap();
-			(weight, BlockWeights::get().max_block)
-		}
-
-		fn execute_block(
-			block: Block,
-			state_root_check: bool,
-			signature_check: bool,
-			select: frame_try_runtime::TryStateSelect,
-		) -> Weight {
-			Executive::try_execute_block(block, state_root_check, signature_check, select).unwrap()
-		}
-	}
-
-
-	impl frame_system_rpc_runtime_api::AccountNonceApi<Block, AccountId, Index> for Runtime {
-		fn account_nonce(account: AccountId) -> Index {
-			System::account_nonce(account)
-		}
-	}
-
-	impl pallet_transaction_payment_rpc_runtime_api::TransactionPaymentApi<Block, Balance> for Runtime {
-		fn query_info(
-			uxt: <Block as BlockT>::Extrinsic,
-			len: u32,
-		) -> pallet_transaction_payment_rpc_runtime_api::RuntimeDispatchInfo<Balance> {
-			TransactionPayment::query_info(uxt, len)
-		}
-
-		fn query_fee_details(
-			uxt: <Block as BlockT>::Extrinsic,
-			len: u32,
-		) -> pallet_transaction_payment_rpc_runtime_api::FeeDetails<Balance> {
-			TransactionPayment::query_fee_details(uxt, len)
-		}
-
-		fn query_weight_to_fee(weight: Weight) -> Balance {
-			TransactionPayment::weight_to_fee(weight)
-		}
-		fn query_length_to_fee(length: u32) -> Balance {
-			TransactionPayment::length_to_fee(length)
-		}
-	}
-
-	// Frontier RPC support
-	impl fp_rpc::EthereumRuntimeRPCApi<Block> for Runtime {
-		fn chain_id() -> u64 {
-			<Runtime as pallet_evm::Config>::ChainId::get()
-		}
-
-		fn account_basic(address: H160) -> EVMAccount {
-			let (account, _) = EVM::account_basic(&address);
-			account
-		}
-
-		fn gas_price() -> U256 {
-			let (gas_price, _) = <Runtime as pallet_evm::Config>::FeeCalculator::min_gas_price();
-			gas_price
-		}
-
-		fn account_code_at(address: H160) -> Vec<u8> {
-			pallet_evm::AccountCodes::<Runtime>::get(address)
-		}
-
-		fn author() -> H160 {
-			<pallet_evm::Pallet<Runtime>>::find_author()
-		}
-
-		fn storage_at(address: H160, index: U256) -> H256 {
-			let mut tmp = [0u8; 32];
-			index.to_big_endian(&mut tmp);
-			pallet_evm::AccountStorages::<Runtime>::get(address, H256::from_slice(&tmp[..]))
-		}
-
-		fn call(
-			from: H160,
-			to: H160,
-			data: Vec<u8>,
-			value: U256,
-			gas_limit: U256,
-			max_fee_per_gas: Option<U256>,
-			max_priority_fee_per_gas: Option<U256>,
-			nonce: Option<U256>,
-			estimate: bool,
-			access_list: Option<Vec<(H160, Vec<H256>)>>,
-		) -> Result<pallet_evm::CallInfo, sp_runtime::DispatchError> {
-			let mut config = <Runtime as pallet_evm::Config>::config().clone();
-			config.estimate = estimate;
-
-			let is_transactional = false;
-			let validate = true;
-
-			// Estimated encoded transaction size must be based on the heaviest transaction
-			// type (EIP1559Transaction) to be compatible with all transaction types.
-			let mut estimated_transaction_len = data.len() +
-				// pallet ethereum index: 1
-				// transact call index: 1
-				// Transaction enum variant: 1
-				// chain_id 8 bytes
-				// nonce: 32
-				// max_priority_fee_per_gas: 32
-				// max_fee_per_gas: 32
-				// gas_limit: 32
-				// action: 21 (enum varianrt + call address)
-				// value: 32
-				// access_list: 1 (empty vec size)
-				// 65 bytes signature
-				258;
-
-			if access_list.is_some() {
-				estimated_transaction_len += access_list.encoded_size();
-			}
-
-			let gas_limit = gas_limit.min(u64::MAX.into()).low_u64();
-			let without_base_extrinsic_weight = true;
-
-			let (weight_limit, proof_size_base_cost) =
-						match <Runtime as pallet_evm::Config>::GasWeightMapping::gas_to_weight(
-							gas_limit,
-							without_base_extrinsic_weight
-						) {
-							weight_limit if weight_limit.proof_size() > 0 => {
-								(Some(weight_limit), Some(estimated_transaction_len as u64))
-							}
-							_ => (None, None),
-						};
-
-			// don't allow calling EVM RPC or Runtime API from a bound address
-			if EVMAccounts::bound_account_id(from).is_some() {
-				return Err(pallet_evm_accounts::Error::<Runtime>::BoundAddressCannotBeUsed.into())
-			};
-
-			<Runtime as pallet_evm::Config>::Runner::call(
-				from,
-				to,
-				data,
-				value,
-				gas_limit.unique_saturated_into(),
-				max_fee_per_gas,
-				max_priority_fee_per_gas,
-				nonce,
-				access_list.unwrap_or_default(),
-				is_transactional,
-				validate,
-				weight_limit,
-				proof_size_base_cost,
-				&config,
-			)
-			.map_err(|err| err.error.into())
-		}
-
-		fn create(
-			from: H160,
-			data: Vec<u8>,
-			value: U256,
-			gas_limit: U256,
-			max_fee_per_gas: Option<U256>,
-			max_priority_fee_per_gas: Option<U256>,
-			nonce: Option<U256>,
-			estimate: bool,
-			access_list: Option<Vec<(H160, Vec<H256>)>>,
-		) -> Result<pallet_evm::CreateInfo, sp_runtime::DispatchError> {
-			let config = if estimate {
-				let mut config = <Runtime as pallet_evm::Config>::config().clone();
-				config.estimate = true;
-				Some(config)
-			} else {
-				None
-			};
-
-			let is_transactional = false;
-			let validate = true;
-
-			// Reused approach from Moonbeam since Frontier implementation doesn't support this
-			let mut estimated_transaction_len = data.len() +
-				// to: 20
-				// from: 20
-				// value: 32
-				// gas_limit: 32
-				// nonce: 32
-				// 1 byte transaction action variant
-				// chain id 8 bytes
-				// 65 bytes signature
-				210;
-			if max_fee_per_gas.is_some() {
-				estimated_transaction_len += 32;
-			}
-			if max_priority_fee_per_gas.is_some() {
-				estimated_transaction_len += 32;
-			}
-			if access_list.is_some() {
-				estimated_transaction_len += access_list.encoded_size();
-			}
-
-			let gas_limit = gas_limit.min(u64::MAX.into()).low_u64();
-			let without_base_extrinsic_weight = true;
-
-			let (weight_limit, proof_size_base_cost) =
-				match <Runtime as pallet_evm::Config>::GasWeightMapping::gas_to_weight(
-					gas_limit,
-					without_base_extrinsic_weight
-				) {
-					weight_limit if weight_limit.proof_size() > 0 => {
-						(Some(weight_limit), Some(estimated_transaction_len as u64))
-					}
-					_ => (None, None),
-				};
-
-			// don't allow calling EVM RPC or Runtime API from a bound address
-			if EVMAccounts::bound_account_id(from).is_some() {
-				return Err(pallet_evm_accounts::Error::<Runtime>::BoundAddressCannotBeUsed.into())
-				};
-
-			// the address needs to have a permission to deploy smart contract
-			if !EVMAccounts::can_deploy_contracts(from) {
-				return Err(pallet_evm_accounts::Error::<Runtime>::AddressNotWhitelisted.into())
-			};
-
-			#[allow(clippy::or_fun_call)] // suggestion not helpful here
-			<Runtime as pallet_evm::Config>::Runner::create(
-				from,
-				data,
-				value,
-				gas_limit.unique_saturated_into(),
-				max_fee_per_gas,
-				max_priority_fee_per_gas,
-				nonce,
-				Vec::new(),
-				is_transactional,
-				validate,
-				weight_limit,
-				proof_size_base_cost,
-				config
-					.as_ref()
-					.unwrap_or(<Runtime as pallet_evm::Config>::config()),
-				)
-				.map_err(|err| err.error.into())
-		}
-
-		fn current_transaction_statuses() -> Option<Vec<TransactionStatus>> {
-			pallet_ethereum::CurrentTransactionStatuses::<Runtime>::get()
-		}
-
-		fn current_block() -> Option<pallet_ethereum::Block> {
-			pallet_ethereum::CurrentBlock::<Runtime>::get()
-		}
-
-		fn current_receipts() -> Option<Vec<pallet_ethereum::Receipt>> {
-			pallet_ethereum::CurrentReceipts::<Runtime>::get()
-		}
-
-		fn current_all() -> (
-			Option<pallet_ethereum::Block>,
-			Option<Vec<pallet_ethereum::Receipt>>,
-			Option<Vec<TransactionStatus>>,
-		) {
-			(
-				pallet_ethereum::CurrentBlock::<Runtime>::get(),
-				pallet_ethereum::CurrentReceipts::<Runtime>::get(),
-				pallet_ethereum::CurrentTransactionStatuses::<Runtime>::get(),
-			)
-		}
-
-		fn extrinsic_filter(xts: Vec<<Block as BlockT>::Extrinsic>) -> Vec<EthereumTransaction> {
-			xts.into_iter()
-				.filter_map(|xt| match xt.0.function {
-					RuntimeCall::Ethereum(pallet_ethereum::Call::transact { transaction }) => Some(transaction),
-					_ => None,
-				})
-				.collect::<Vec<EthereumTransaction>>()
-		}
-
-		fn elasticity() -> Option<Permill> {
-			None
-		}
-
-		fn gas_limit_multiplier_support() {}
-
-		fn pending_block(
-			xts: Vec<<Block as BlockT>::Extrinsic>,
-		) -> (Option<pallet_ethereum::Block>, Option<Vec<TransactionStatus>>) {
-			for ext in xts.into_iter() {
-				let _ = Executive::apply_extrinsic(ext);
-			}
-
-			Ethereum::on_finalize(System::block_number() + 1);
-
-			(
-				pallet_ethereum::CurrentBlock::<Runtime>::get(),
-				pallet_ethereum::CurrentTransactionStatuses::<Runtime>::get()
-			)
-		}
-
-		fn initialize_pending_block(header: &<Block as BlockT>::Header) {
-			Executive::initialize_block(header)
-		}
-	}
-
-	impl fp_rpc::ConvertTransactionRuntimeApi<Block> for Runtime {
-		fn convert_transaction(transaction: EthereumTransaction) -> <Block as BlockT>::Extrinsic {
-			UncheckedExtrinsic::new_unsigned(pallet_ethereum::Call::<Runtime>::transact { transaction }.into())
-		}
-	}
-
-	impl pallet_evm_accounts_rpc_runtime_api::EvmAccountsApi<Block, AccountId, H160> for Runtime {
-		fn evm_address(account_id: AccountId) -> H160 {
-			EVMAccounts::evm_address(&account_id)
-		}
-		fn bound_account_id(evm_address: H160) -> Option<AccountId> {
-			EVMAccounts::bound_account_id(evm_address)
-		}
-		fn account_id(evm_address: H160) -> AccountId {
-			EVMAccounts::account_id(evm_address)
-		}
-	}
-
-	#[cfg(feature = "runtime-benchmarks")]
-	impl frame_benchmarking::Benchmark<Block> for Runtime {
-		fn benchmark_metadata(extra: bool) -> (
-			Vec<frame_benchmarking::BenchmarkList>,
-			Vec<frame_support::traits::StorageInfo>,
-		) {
-			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_benchmarks!(list, extra);
-
-			orml_list_benchmark!(list, extra, pallet_currencies, benchmarking::currencies);
-			orml_list_benchmark!(list, extra, orml_tokens, benchmarking::tokens);
-			orml_list_benchmark!(list, extra, orml_vesting, benchmarking::vesting);
-			orml_list_benchmark!(list, extra, pallet_transaction_multi_payment, benchmarking::multi_payment);
-			orml_list_benchmark!(list, extra, pallet_duster, benchmarking::duster);
-			orml_list_benchmark!(list, extra, pallet_omnipool, benchmarking::omnipool);
-			orml_list_benchmark!(list, extra, pallet_route_executor, benchmarking::route_executor);
-			orml_list_benchmark!(list, extra, pallet_dca, benchmarking::dca);
-			orml_list_benchmark!(list, extra, pallet_xyk, benchmarking::xyk);
-			orml_list_benchmark!(list, extra, pallet_dynamic_evm_fee, benchmarking::dynamic_evm_fee);
-			orml_list_benchmark!(list, extra, pallet_xyk_liquidity_mining, benchmarking::xyk_liquidity_mining);
-
-			let storage_info = AllPalletsWithSystem::storage_info();
-
-			(list, storage_info)
-		}
-
-		fn dispatch_benchmark(
-			config: frame_benchmarking::BenchmarkConfig
-		) -> Result<Vec<frame_benchmarking::BenchmarkBatch>, sp_runtime::RuntimeString> {
-			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);
-					Ok(())
-				}
-
-				fn verify_set_code() {
-					System::assert_last_event(cumulus_pallet_parachain_system::Event::<Runtime>::ValidationFunctionStored.into());
-				}
-			}
-
-			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(),
-				// Total Issuance
-				hex!("c2261276cc9d1f8598ea4b6a74b15c2f57c875e4cff74148e4628f264b974c80").to_vec().into(),
-				// Execution Phase
-				hex!("26aa394eea5630e07c48ae0c9558cef7ff553b5a9862a516939d82b3d3d8661a").to_vec().into(),
-				// Event Count
-				hex!("26aa394eea5630e07c48ae0c9558cef70a98fdbe9ce6c55837576c60c7af3850").to_vec().into(),
-				// System Events
-				hex!("26aa394eea5630e07c48ae0c9558cef780d41e5e16056765bc8461851072c9d7").to_vec().into(),
-			];
-
-			let mut batches = Vec::<BenchmarkBatch>::new();
-			let params = (&config, &whitelist);
-
-			add_benchmarks!(params, batches);
-
-			orml_add_benchmark!(params, batches, pallet_currencies, benchmarking::currencies);
-			orml_add_benchmark!(params, batches, orml_tokens, benchmarking::tokens);
-			orml_add_benchmark!(params, batches, orml_vesting, benchmarking::vesting);
-			orml_add_benchmark!(params, batches, pallet_transaction_multi_payment, benchmarking::multi_payment);
-			orml_add_benchmark!(params, batches, pallet_duster, benchmarking::duster);
-			orml_add_benchmark!(params, batches, pallet_omnipool, benchmarking::omnipool);
-			orml_add_benchmark!(params, batches, pallet_route_executor, benchmarking::route_executor);
-			orml_add_benchmark!(params, batches, pallet_dca, benchmarking::dca);
-			orml_add_benchmark!(params, batches, pallet_xyk, benchmarking::xyk);
-			orml_add_benchmark!(params, batches, pallet_dynamic_evm_fee, benchmarking::dynamic_evm_fee);
-			orml_add_benchmark!(params, batches, pallet_xyk_liquidity_mining, benchmarking::xyk_liquidity_mining);
-
-			if batches.is_empty() { return Err("Benchmark not found for this pallet.".into()) }
-			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! {
diff --git a/runtime/hydradx/src/system.rs b/runtime/hydradx/src/system.rs
index cf815c6b7..f0da22297 100644
--- a/runtime/hydradx/src/system.rs
+++ b/runtime/hydradx/src/system.rs
@@ -30,7 +30,7 @@ use frame_support::{
 	dispatch::DispatchClass,
 	parameter_types,
 	sp_runtime::{
-		traits::{ConstU32, IdentityLookup},
+		traits::{ConstU32, ConstU64, IdentityLookup},
 		FixedPointNumber, Perbill, Perquintill, RuntimeDebug,
 	},
 	traits::{ConstBool, Contains, InstanceFilter, SortedMembers},
@@ -198,6 +198,11 @@ impl frame_system::Config for Runtime {
 	type SS58Prefix = SS58Prefix;
 	type OnSetCode = cumulus_pallet_parachain_system::ParachainSetCode<Self>;
 	type MaxConsumers = frame_support::traits::ConstU32<16>;
+	type SingleBlockMigrations = ();
+	type MultiBlockMigrator = ();
+	type PreInherents = ();
+	type PostInherents = ();
+	type PostTransactions = ();
 }
 
 parameter_types! {
@@ -239,6 +244,7 @@ impl pallet_aura::Config for Runtime {
 	type MaxAuthorities = MaxAuthorities;
 	type DisabledValidators = ();
 	type AllowMultipleBlocksPerSlot = ConstBool<false>;
+	type SlotDuration = ConstU64<SLOT_DURATION>;
 }
 
 impl staging_parachain_info::Config for Runtime {}
@@ -561,7 +567,7 @@ impl pallet_transaction_pause::Config for Runtime {
 pub struct TechCommAccounts;
 impl SortedMembers<AccountId> for TechCommAccounts {
 	fn sorted_members() -> Vec<AccountId> {
-		TechnicalCommittee::members()
+		pallet_collective::Members::<Runtime, TechnicalCollective>::get()
 	}
 }
 
diff --git a/runtime/hydradx/src/tests.rs b/runtime/hydradx/src/tests.rs
index 7c975f228..de7b84964 100644
--- a/runtime/hydradx/src/tests.rs
+++ b/runtime/hydradx/src/tests.rs
@@ -6,12 +6,16 @@ use primitives::constants::{
 
 use codec::Encode;
 use frame_support::{
+	assert_err,
 	dispatch::{DispatchClass, GetDispatchInfo},
 	sp_runtime::{traits::Convert, FixedPointNumber},
 	weights::WeightToFee,
 };
 use pallet_transaction_payment::Multiplier;
-use sp_runtime::BuildStorage;
+use polkadot_xcm::opaque::VersionedXcm;
+use polkadot_xcm::{VersionedAssets, VersionedLocation};
+use sp_runtime::{BuildStorage, FixedU128};
+use sp_std::sync::Arc;
 
 #[test]
 #[ignore]
@@ -174,3 +178,188 @@ fn max_multiplier() {
 		});
 	}
 }
+
+#[cfg(test)]
+mod xcm_fee_payment_api_tests {
+	use super::*;
+	use frame_support::assert_ok;
+	use polkadot_xcm::v4::prelude::*;
+	use polkadot_xcm::VersionedAssetId::V4;
+	use xcm_fee_payment_runtime_api::runtime_decl_for_xcm_payment_api::XcmPaymentApiV1;
+	use xcm_fee_payment_runtime_api::Error as XcmPaymentApiError;
+
+	#[test]
+	fn query_acceptable_payment_assets_should_return_native_and_registered_locations() {
+		sp_io::TestExternalities::new_empty().execute_with(|| {
+			// register new asset in the asset registry
+			assert_ok!(AssetRegistry::register_external(
+				RuntimeOrigin::signed([0u8; 32].into()),
+				crate::xcm::AssetLocation(polkadot_xcm::v3::Location::new(
+					1,
+					polkadot_xcm::v3::Junctions::X2(
+						polkadot_xcm::v3::Junction::Parachain(123),
+						polkadot_xcm::v3::Junction::GeneralIndex(123)
+					)
+				))
+			));
+
+			assert_eq!(
+				Runtime::query_acceptable_payment_assets(4u32),
+				Ok(vec![
+					// HDX locations
+					V4(AssetId(Location {
+						parents: 1,
+						interior: Junctions::X2([Parachain(100), GeneralIndex(0)].into())
+					})),
+					V4(AssetId(Location {
+						parents: 0,
+						interior: Junctions::X1([GeneralIndex(0)].into())
+					})),
+					// asset from the asset registry
+					V4(AssetId(Location {
+						parents: 1,
+						interior: Junctions::X2([Parachain(123), GeneralIndex(123)].into())
+					})),
+				])
+			);
+		});
+	}
+
+	#[test]
+	fn query_weight_to_asset_fee_should_return_correct_weight() {
+		sp_io::TestExternalities::new_empty().execute_with(|| {
+			// register new assets in the asset registry
+			let registered_asset_with_price = AssetRegistry::next_asset_id().unwrap();
+			assert_ok!(AssetRegistry::register_external(
+				RuntimeOrigin::signed([0u8; 32].into()),
+				crate::xcm::AssetLocation(polkadot_xcm::v3::Location::new(
+					1,
+					polkadot_xcm::v3::Junctions::X2(
+						polkadot_xcm::v3::Junction::Parachain(123),
+						polkadot_xcm::v3::Junction::GeneralIndex(123)
+					)
+				))
+			));
+
+			assert_ok!(AssetRegistry::register_external(
+				RuntimeOrigin::signed([0u8; 32].into()),
+				crate::xcm::AssetLocation(polkadot_xcm::v3::Location::new(
+					1,
+					polkadot_xcm::v3::Junctions::X2(
+						polkadot_xcm::v3::Junction::Parachain(123),
+						polkadot_xcm::v3::Junction::GeneralIndex(456)
+					)
+				))
+			));
+
+			// set the price of registered asset
+			assert_ok!(MultiTransactionPayment::add_currency(
+				RuntimeOrigin::root(),
+				registered_asset_with_price,
+				FixedU128::from_float(2.0)
+			));
+			MultiTransactionPayment::on_initialize(1);
+
+			let expected_fee = 155655590214;
+			// HDX fee
+			assert_eq!(
+				Runtime::query_weight_to_asset_fee(
+					Weight::from_parts(1_000_000_000, 1_000_000_000),
+					V4(AssetId(Location::new(
+						1,
+						Junctions::X2(Arc::new([Parachain(100), GeneralIndex(0)]))
+					)))
+				),
+				Ok(expected_fee)
+			);
+			// registered asset fee
+			assert_eq!(
+				Runtime::query_weight_to_asset_fee(
+					Weight::from_parts(1_000_000_000, 1_000_000_000),
+					V4(AssetId(Location::new(
+						1,
+						Junctions::X2(Arc::new([Parachain(123), GeneralIndex(123)]))
+					)))
+				),
+				Ok(2 * expected_fee)
+			);
+			// asset not registered
+			assert_err!(
+				Runtime::query_weight_to_asset_fee(
+					Weight::from_parts(1_000_000_000, 1_000_000_000),
+					V4(AssetId(Location::new(
+						1,
+						Junctions::X2(Arc::new([Parachain(666), GeneralIndex(0)]))
+					)))
+				),
+				XcmPaymentApiError::AssetNotFound
+			);
+			// price not available
+			assert_err!(
+				Runtime::query_weight_to_asset_fee(
+					Weight::from_parts(1_000_000_000, 1_000_000_000),
+					V4(AssetId(Location::new(
+						1,
+						Junctions::X2(Arc::new([Parachain(123), GeneralIndex(456)]))
+					)))
+				),
+				XcmPaymentApiError::WeightNotComputable
+			);
+		});
+	}
+
+	#[test]
+	fn query_xcm_weight_should_return_weight_for_xcm() {
+		sp_io::TestExternalities::new_empty().execute_with(|| {
+			let hdx_loc = Location::new(1, Junctions::X2(Arc::new([Parachain(100), GeneralIndex(0)])));
+
+			let asset_to_withdraw: Asset = Asset {
+				id: AssetId(hdx_loc.clone()),
+				fun: Fungible(1_000_000_000_000u128),
+			};
+			let xcm_message = Xcm(vec![
+				WithdrawAsset(asset_to_withdraw.into()),
+				BuyExecution {
+					fees: (Here, 400000000000u128).into(),
+					weight_limit: Unlimited,
+				},
+			]);
+
+			assert_eq!(
+				Runtime::query_xcm_weight(VersionedXcm::from(xcm_message.clone())),
+				Ok(Weight::from_parts(200000000, 0))
+			);
+		});
+	}
+
+	#[test]
+	fn query_delivery_fees_should_return_no_assets() {
+		sp_io::TestExternalities::new_empty().execute_with(|| {
+			let hdx_loc = Location::new(1, Junctions::X2(Arc::new([Parachain(100), GeneralIndex(0)])));
+
+			let asset_to_withdraw: Asset = Asset {
+				id: AssetId(hdx_loc.clone()),
+				fun: Fungible(1_000_000_000_000u128),
+			};
+			let xcm_message = Xcm(vec![
+				WithdrawAsset(asset_to_withdraw.into()),
+				BuyExecution {
+					fees: (Here, 400000000000u128).into(),
+					weight_limit: Unlimited,
+				},
+			]);
+
+			let destination = Location::new(1, Junctions::X1(Arc::new([Parachain(100)])));
+
+			// set default XCM version
+			assert_ok!(PolkadotXcm::force_default_xcm_version(
+				RuntimeOrigin::root(),
+				Some(3u32)
+			));
+			assert_eq!(
+				Runtime::query_delivery_fees(VersionedLocation::V4(destination), VersionedXcm::from(xcm_message)),
+				Ok(VersionedAssets::V4(Assets::new()))
+			);
+		});
+	}
+}
diff --git a/runtime/hydradx/src/weights/cumulus_pallet_parachain_system.rs b/runtime/hydradx/src/weights/cumulus_pallet_parachain_system.rs
index 40fe12423..74d1a3a5f 100644
--- a/runtime/hydradx/src/weights/cumulus_pallet_parachain_system.rs
+++ b/runtime/hydradx/src/weights/cumulus_pallet_parachain_system.rs
@@ -18,30 +18,28 @@
 
 //! 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: `[]`
+//! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 42.0.0
+//! DATE: 2024-09-10, 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
+// frame-omni-bencher
+// v1
 // benchmark
 // pallet
-// --wasm-execution=compiled
-// --pallet
-// *
+// --runtime
+// target/release/wbuild/hydradx-runtime/hydradx_runtime.compact.compressed.wasm
 // --extrinsic
-// *
-// --heap-pages
-// 4096
-// --steps
-// 50
-// --repeat
-// 20
+//
+// --heap-pages=4096
+// --steps=50
+// --repeat=20
 // --template=scripts/pallet-weight-template.hbs
-// --output
-// weights/
+// --pallet
+// cumulus_pallet_parachain_system
+// --output=./weights/cumulus_pallet_parachain_system.rs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -70,12 +68,12 @@ impl<T: frame_system::Config> cumulus_pallet_parachain_system::WeightInfo for Hy
 	/// The range of component `n` is `[0, 1000]`.
 	fn enqueue_inbound_downward_messages(n: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `152`
+		//  Measured:  `0`
 		//  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()))
+		// Minimum execution time: 1_358_000 picoseconds.
+		Weight::from_parts(1_419_000, 3517)
+			// Standard Error: 20_289
+			.saturating_add(Weight::from_parts(268_761_310, 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())))
diff --git a/runtime/hydradx/src/weights/cumulus_pallet_xcmp_queue.rs b/runtime/hydradx/src/weights/cumulus_pallet_xcmp_queue.rs
index 6b9dd8d79..00a5e1f44 100644
--- a/runtime/hydradx/src/weights/cumulus_pallet_xcmp_queue.rs
+++ b/runtime/hydradx/src/weights/cumulus_pallet_xcmp_queue.rs
@@ -19,29 +19,23 @@
 //! 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: `[]`
+//! DATE: 2024-09-10, 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`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
 
 // Executed Command:
-// ./target/release/hydradx
+// target/release/hydradx
 // benchmark
 // pallet
+// --chain=dev
+// --steps=50
+// --repeat=20
 // --wasm-execution=compiled
-// --pallet
-// *
-// --extrinsic
-// *
-// --heap-pages
-// 4096
-// --steps
-// 50
-// --repeat
-// 20
+// --pallet=cumulus-pallet-xcmp-queue
+// --extrinsic=*
 // --template=scripts/pallet-weight-template.hbs
-// --output
-// weights/
+// --output=./weights/cumulus_pallet_xcmp_queue.rs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -63,8 +57,8 @@ impl<T: frame_system::Config> cumulus_pallet_xcmp_queue::WeightInfo for HydraWei
 		// Proof Size summary in bytes:
 		//  Measured:  `142`
 		//  Estimated: `1627`
-		// Minimum execution time: 5_674_000 picoseconds.
-		Weight::from_parts(5_888_000, 1627)
+		// Minimum execution time: 5_588_000 picoseconds.
+		Weight::from_parts(5_774_000, 1627)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -82,8 +76,8 @@ impl<T: frame_system::Config> cumulus_pallet_xcmp_queue::WeightInfo for HydraWei
 		// Proof Size summary in bytes:
 		//  Measured:  `218`
 		//  Estimated: `3517`
-		// Minimum execution time: 15_775_000 picoseconds.
-		Weight::from_parts(16_085_000, 3517)
+		// Minimum execution time: 16_526_000 picoseconds.
+		Weight::from_parts(16_912_000, 3517)
 			.saturating_add(T::DbWeight::get().reads(4_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
@@ -93,8 +87,8 @@ impl<T: frame_system::Config> cumulus_pallet_xcmp_queue::WeightInfo for HydraWei
 		// Proof Size summary in bytes:
 		//  Measured:  `142`
 		//  Estimated: `1627`
-		// Minimum execution time: 3_240_000 picoseconds.
-		Weight::from_parts(3_353_000, 1627)
+		// Minimum execution time: 2_964_000 picoseconds.
+		Weight::from_parts(3_153_000, 1627)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -104,8 +98,8 @@ impl<T: frame_system::Config> cumulus_pallet_xcmp_queue::WeightInfo for HydraWei
 		// Proof Size summary in bytes:
 		//  Measured:  `177`
 		//  Estimated: `1662`
-		// Minimum execution time: 3_923_000 picoseconds.
-		Weight::from_parts(4_120_000, 1662)
+		// Minimum execution time: 3_771_000 picoseconds.
+		Weight::from_parts(3_917_000, 1662)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -113,8 +107,8 @@ impl<T: frame_system::Config> cumulus_pallet_xcmp_queue::WeightInfo for HydraWei
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 9_208_000 picoseconds.
-		Weight::from_parts(9_370_000, 0)
+		// Minimum execution time: 10_409_000 picoseconds.
+		Weight::from_parts(10_518_000, 0)
 	}
 	/// Storage: UNKNOWN KEY `0x7b3237373ffdfeb1cab4222e3b520d6b345d8e88afa015075c945637c07e8f20` (r:1 w:1)
 	/// Proof: UNKNOWN KEY `0x7b3237373ffdfeb1cab4222e3b520d6b345d8e88afa015075c945637c07e8f20` (r:1 w:1)
@@ -134,8 +128,8 @@ impl<T: frame_system::Config> cumulus_pallet_xcmp_queue::WeightInfo for HydraWei
 		// Proof Size summary in bytes:
 		//  Measured:  `134455`
 		//  Estimated: `137920`
-		// Minimum execution time: 204_087_000 picoseconds.
-		Weight::from_parts(205_689_000, 137920)
+		// Minimum execution time: 205_692_000 picoseconds.
+		Weight::from_parts(207_335_000, 137920)
 			.saturating_add(T::DbWeight::get().reads(6_u64))
 			.saturating_add(T::DbWeight::get().writes(5_u64))
 	}
@@ -157,8 +151,8 @@ impl<T: frame_system::Config> cumulus_pallet_xcmp_queue::WeightInfo for HydraWei
 		// Proof Size summary in bytes:
 		//  Measured:  `65852`
 		//  Estimated: `69317`
-		// Minimum execution time: 116_628_000 picoseconds.
-		Weight::from_parts(117_388_000, 69317)
+		// Minimum execution time: 118_408_000 picoseconds.
+		Weight::from_parts(119_041_000, 69317)
 			.saturating_add(T::DbWeight::get().reads(6_u64))
 			.saturating_add(T::DbWeight::get().writes(5_u64))
 	}
diff --git a/runtime/hydradx/src/weights/frame_system.rs b/runtime/hydradx/src/weights/frame_system.rs
index 72d4f547c..3ba4c3f7f 100644
--- a/runtime/hydradx/src/weights/frame_system.rs
+++ b/runtime/hydradx/src/weights/frame_system.rs
@@ -19,29 +19,23 @@
 //! Autogenerated weights for `frame_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: `[]`
+//! DATE: 2024-09-10, 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`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
 
 // Executed Command:
-// ./target/release/hydradx
+// target/release/hydradx
 // benchmark
 // pallet
+// --chain=dev
+// --steps=50
+// --repeat=20
 // --wasm-execution=compiled
-// --pallet
-// *
-// --extrinsic
-// *
-// --heap-pages
-// 4096
-// --steps
-// 50
-// --repeat
-// 20
+// --pallet=frame-system
+// --extrinsic=*
 // --template=scripts/pallet-weight-template.hbs
-// --output
-// weights/
+// --output=./weights/frame_system.rs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -62,20 +56,20 @@ impl<T: frame_system::Config> frame_system::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_952_000 picoseconds.
-		Weight::from_parts(2_985_000, 0)
+		// Minimum execution time: 2_885_000 picoseconds.
+		Weight::from_parts(2_932_000, 0)
 			// Standard Error: 0
-			.saturating_add(Weight::from_parts(410, 0).saturating_mul(b.into()))
+			.saturating_add(Weight::from_parts(370, 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: 7_401_000 picoseconds.
-		Weight::from_parts(7_577_000, 0)
+		// Minimum execution time: 7_544_000 picoseconds.
+		Weight::from_parts(7_664_000, 0)
 			// Standard Error: 0
-			.saturating_add(Weight::from_parts(1_433, 0).saturating_mul(b.into()))
+			.saturating_add(Weight::from_parts(1_403, 0).saturating_mul(b.into()))
 	}
 	/// Storage: `System::Digest` (r:1 w:1)
 	/// Proof: `System::Digest` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
@@ -85,8 +79,8 @@ impl<T: frame_system::Config> frame_system::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `1485`
-		// Minimum execution time: 5_067_000 picoseconds.
-		Weight::from_parts(5_260_000, 1485)
+		// Minimum execution time: 4_923_000 picoseconds.
+		Weight::from_parts(5_041_000, 1485)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -106,8 +100,8 @@ impl<T: frame_system::Config> frame_system::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `198`
 		//  Estimated: `1683`
-		// Minimum execution time: 120_537_211_000 picoseconds.
-		Weight::from_parts(121_688_931_000, 1683)
+		// Minimum execution time: 119_876_461_000 picoseconds.
+		Weight::from_parts(122_560_761_000, 1683)
 			.saturating_add(T::DbWeight::get().reads(4_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
@@ -118,10 +112,10 @@ impl<T: frame_system::Config> frame_system::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// 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()))
+		// Minimum execution time: 2_996_000 picoseconds.
+		Weight::from_parts(3_063_000, 0)
+			// Standard Error: 1_882
+			.saturating_add(Weight::from_parts(735_848, 0).saturating_mul(i.into()))
 			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(i.into())))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
@@ -131,10 +125,10 @@ impl<T: frame_system::Config> frame_system::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 2_951_000 picoseconds.
-		Weight::from_parts(2_997_000, 0)
+		// Minimum execution time: 3_031_000 picoseconds.
+		Weight::from_parts(3_138_000, 0)
 			// Standard Error: 763
-			.saturating_add(Weight::from_parts(582_917, 0).saturating_mul(i.into()))
+			.saturating_add(Weight::from_parts(528_428, 0).saturating_mul(i.into()))
 			.saturating_add(T::DbWeight::get().writes((1_u64).saturating_mul(i.into())))
 	}
 	/// Storage: `Skipped::Metadata` (r:0 w:0)
@@ -144,10 +138,10 @@ impl<T: frame_system::Config> frame_system::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  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()))
+		// Minimum execution time: 5_859_000 picoseconds.
+		Weight::from_parts(5_935_000, 153)
+			// Standard Error: 929
+			.saturating_add(Weight::from_parts(991_213, 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()))
@@ -158,8 +152,8 @@ impl<T: frame_system::Config> frame_system::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 10_017_000 picoseconds.
-		Weight::from_parts(10_283_000, 0)
+		// Minimum execution time: 9_973_000 picoseconds.
+		Weight::from_parts(10_773_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	/// Storage: `System::AuthorizedUpgrade` (r:1 w:1)
@@ -180,8 +174,8 @@ impl<T: frame_system::Config> frame_system::WeightInfo for HydraWeight<T> {
 		// 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)
+		// Minimum execution time: 117_746_207_000 picoseconds.
+		Weight::from_parts(120_783_937_000, 1705)
 			.saturating_add(T::DbWeight::get().reads(5_u64))
 			.saturating_add(T::DbWeight::get().writes(4_u64))
 	}
diff --git a/runtime/hydradx/src/weights/orml_tokens.rs b/runtime/hydradx/src/weights/orml_tokens.rs
index 7ac51bcab..b62573ca0 100644
--- a/runtime/hydradx/src/weights/orml_tokens.rs
+++ b/runtime/hydradx/src/weights/orml_tokens.rs
@@ -19,7 +19,7 @@
 //! Autogenerated weights for `orml_tokens`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
-//! DATE: 2024-07-23, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-09-10, 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`
@@ -29,14 +29,13 @@
 // benchmark
 // pallet
 // --chain=dev
-// --steps=10
-// --repeat=30
+// --steps=50
+// --repeat=20
 // --wasm-execution=compiled
-// --heap-pages=4096
-// --template=scripts/pallet-weight-template.hbs
 // --pallet=orml-tokens
-// --output=orml.rs
 // --extrinsic=*
+// --template=scripts/pallet-weight-template.hbs
+// --output=./weights/orml_tokens.rs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
diff --git a/runtime/hydradx/src/weights/orml_vesting.rs b/runtime/hydradx/src/weights/orml_vesting.rs
index 10b472663..20bb588d3 100644
--- a/runtime/hydradx/src/weights/orml_vesting.rs
+++ b/runtime/hydradx/src/weights/orml_vesting.rs
@@ -19,29 +19,23 @@
 //! Autogenerated weights for `orml_vesting`
 //!
 //! 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: `[]`
+//! DATE: 2024-09-10, 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`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
 
 // Executed Command:
-// ./target/release/hydradx
+// target/release/hydradx
 // benchmark
 // pallet
+// --chain=dev
+// --steps=50
+// --repeat=20
 // --wasm-execution=compiled
-// --pallet
-// *
-// --extrinsic
-// *
-// --heap-pages
-// 4096
-// --steps
-// 50
-// --repeat
-// 20
+// --pallet=orml-vesting
+// --extrinsic=*
 // --template=scripts/pallet-weight-template.hbs
-// --output
-// weights/
+// --output=./weights/orml_vesting.rs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -67,10 +61,10 @@ 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:  `1888`
+		//  Measured:  `1884`
 		//  Estimated: `6315`
-		// Minimum execution time: 93_625_000 picoseconds.
-		Weight::from_parts(94_750_000, 6315)
+		// Minimum execution time: 95_162_000 picoseconds.
+		Weight::from_parts(96_298_000, 6315)
 			.saturating_add(T::DbWeight::get().reads(5_u64))
 			.saturating_add(T::DbWeight::get().writes(4_u64))
 	}
@@ -83,12 +77,12 @@ 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:  `2007 + i * (18 ±0)`
+		//  Measured:  `2003 + i * (18 ±0)`
 		//  Estimated: `6315`
-		// 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()))
+		// Minimum execution time: 54_205_000 picoseconds.
+		Weight::from_parts(55_514_086, 6315)
+			// Standard Error: 675
+			.saturating_add(Weight::from_parts(102_635, 0).saturating_mul(i.into()))
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -103,12 +97,12 @@ 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:  `1589`
+		//  Measured:  `1585`
 		//  Estimated: `4764`
-		// 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()))
+		// Minimum execution time: 46_304_000 picoseconds.
+		Weight::from_parts(47_432_665, 4764)
+			// Standard Error: 352
+			.saturating_add(Weight::from_parts(101_939, 0).saturating_mul(i.into()))
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
diff --git a/runtime/hydradx/src/weights/pallet_asset_registry.rs b/runtime/hydradx/src/weights/pallet_asset_registry.rs
index 18a0799dd..4021e76d9 100644
--- a/runtime/hydradx/src/weights/pallet_asset_registry.rs
+++ b/runtime/hydradx/src/weights/pallet_asset_registry.rs
@@ -19,29 +19,23 @@
 //! Autogenerated weights for `pallet_asset_registry`
 //!
 //! 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: `[]`
+//! DATE: 2024-09-10, 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`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
 
 // Executed Command:
-// ./target/release/hydradx
+// target/release/hydradx
 // benchmark
 // pallet
+// --chain=dev
+// --steps=50
+// --repeat=20
 // --wasm-execution=compiled
-// --pallet
-// *
-// --extrinsic
-// *
-// --heap-pages
-// 4096
-// --steps
-// 50
-// --repeat
-// 20
+// --pallet=pallet-asset-registry
+// --extrinsic=*
 // --template=scripts/pallet-weight-template.hbs
-// --output
-// weights/
+// --output=./weights/pallet_asset_registry.rs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -69,8 +63,8 @@ impl<T: frame_system::Config> pallet_asset_registry::WeightInfo for HydraWeight<
 		// Proof Size summary in bytes:
 		//  Measured:  `388`
 		//  Estimated: `4087`
-		// Minimum execution time: 33_258_000 picoseconds.
-		Weight::from_parts(33_840_000, 4087)
+		// Minimum execution time: 33_913_000 picoseconds.
+		Weight::from_parts(34_365_000, 4087)
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 			.saturating_add(T::DbWeight::get().writes(4_u64))
 	}
@@ -86,8 +80,8 @@ impl<T: frame_system::Config> pallet_asset_registry::WeightInfo for HydraWeight<
 		// Proof Size summary in bytes:
 		//  Measured:  `617`
 		//  Estimated: `4087`
-		// Minimum execution time: 40_246_000 picoseconds.
-		Weight::from_parts(40_839_000, 4087)
+		// Minimum execution time: 41_632_000 picoseconds.
+		Weight::from_parts(42_099_000, 4087)
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 			.saturating_add(T::DbWeight::get().writes(5_u64))
 	}
@@ -103,8 +97,8 @@ impl<T: frame_system::Config> pallet_asset_registry::WeightInfo for HydraWeight<
 		// Proof Size summary in bytes:
 		//  Measured:  `301`
 		//  Estimated: `4087`
-		// Minimum execution time: 23_496_000 picoseconds.
-		Weight::from_parts(23_982_000, 4087)
+		// Minimum execution time: 24_252_000 picoseconds.
+		Weight::from_parts(24_741_000, 4087)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(4_u64))
 	}
@@ -116,8 +110,8 @@ impl<T: frame_system::Config> pallet_asset_registry::WeightInfo for HydraWeight<
 		// Proof Size summary in bytes:
 		//  Measured:  `427`
 		//  Estimated: `3590`
-		// Minimum execution time: 17_542_000 picoseconds.
-		Weight::from_parts(17_999_000, 3590)
+		// Minimum execution time: 17_713_000 picoseconds.
+		Weight::from_parts(17_997_000, 3590)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -127,8 +121,8 @@ impl<T: frame_system::Config> pallet_asset_registry::WeightInfo for HydraWeight<
 		// Proof Size summary in bytes:
 		//  Measured:  `320`
 		//  Estimated: `3485`
-		// Minimum execution time: 14_891_000 picoseconds.
-		Weight::from_parts(15_319_000, 3485)
+		// Minimum execution time: 14_812_000 picoseconds.
+		Weight::from_parts(15_117_000, 3485)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
diff --git a/runtime/hydradx/src/weights/pallet_balances.rs b/runtime/hydradx/src/weights/pallet_balances.rs
index 87535feb6..bb5b632d8 100644
--- a/runtime/hydradx/src/weights/pallet_balances.rs
+++ b/runtime/hydradx/src/weights/pallet_balances.rs
@@ -19,29 +19,23 @@
 //! Autogenerated weights for `pallet_balances`
 //!
 //! 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: `[]`
+//! DATE: 2024-09-10, 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`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
 
 // Executed Command:
-// ./target/release/hydradx
+// target/release/hydradx
 // benchmark
 // pallet
+// --chain=dev
+// --steps=50
+// --repeat=20
 // --wasm-execution=compiled
-// --pallet
-// *
-// --extrinsic
-// *
-// --heap-pages
-// 4096
-// --steps
-// 50
-// --repeat
-// 20
+// --pallet=pallet-balances
+// --extrinsic=*
 // --template=scripts/pallet-weight-template.hbs
-// --output
-// weights/
+// --output=./weights/pallet_balances.rs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -63,8 +57,8 @@ impl<T: frame_system::Config> pallet_balances::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `103`
 		//  Estimated: `6196`
-		// Minimum execution time: 71_487_000 picoseconds.
-		Weight::from_parts(71_988_000, 6196)
+		// Minimum execution time: 72_733_000 picoseconds.
+		Weight::from_parts(73_054_000, 6196)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -74,8 +68,8 @@ impl<T: frame_system::Config> pallet_balances::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `3593`
-		// Minimum execution time: 44_826_000 picoseconds.
-		Weight::from_parts(45_268_000, 3593)
+		// Minimum execution time: 45_382_000 picoseconds.
+		Weight::from_parts(45_678_000, 3593)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -85,8 +79,8 @@ impl<T: frame_system::Config> pallet_balances::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `174`
 		//  Estimated: `3593`
-		// Minimum execution time: 18_696_000 picoseconds.
-		Weight::from_parts(19_084_000, 3593)
+		// Minimum execution time: 19_099_000 picoseconds.
+		Weight::from_parts(19_395_000, 3593)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -96,8 +90,8 @@ impl<T: frame_system::Config> pallet_balances::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `174`
 		//  Estimated: `3593`
-		// Minimum execution time: 24_875_000 picoseconds.
-		Weight::from_parts(25_461_000, 3593)
+		// Minimum execution time: 25_029_000 picoseconds.
+		Weight::from_parts(25_720_000, 3593)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -107,8 +101,8 @@ impl<T: frame_system::Config> pallet_balances::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `206`
 		//  Estimated: `8799`
-		// Minimum execution time: 73_484_000 picoseconds.
-		Weight::from_parts(74_356_000, 8799)
+		// Minimum execution time: 74_509_000 picoseconds.
+		Weight::from_parts(75_092_000, 8799)
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
@@ -118,8 +112,8 @@ impl<T: frame_system::Config> pallet_balances::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `3593`
-		// Minimum execution time: 55_533_000 picoseconds.
-		Weight::from_parts(56_121_000, 3593)
+		// Minimum execution time: 56_492_000 picoseconds.
+		Weight::from_parts(56_941_000, 3593)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -129,8 +123,8 @@ impl<T: frame_system::Config> pallet_balances::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `174`
 		//  Estimated: `3593`
-		// Minimum execution time: 21_695_000 picoseconds.
-		Weight::from_parts(22_271_000, 3593)
+		// Minimum execution time: 21_953_000 picoseconds.
+		Weight::from_parts(22_376_000, 3593)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -141,10 +135,10 @@ impl<T: frame_system::Config> pallet_balances::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0 + u * (136 ±0)`
 		//  Estimated: `990 + u * (2603 ±0)`
-		// 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()))
+		// Minimum execution time: 20_359_000 picoseconds.
+		Weight::from_parts(20_523_000, 990)
+			// Standard Error: 9_802
+			.saturating_add(Weight::from_parts(15_242_065, 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()))
@@ -155,8 +149,8 @@ impl<T: frame_system::Config> pallet_balances::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `1501`
-		// Minimum execution time: 8_117_000 picoseconds.
-		Weight::from_parts(8_302_000, 1501)
+		// Minimum execution time: 8_031_000 picoseconds.
+		Weight::from_parts(8_333_000, 1501)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 	}
 }
\ No newline at end of file
diff --git a/runtime/hydradx/src/weights/pallet_bonds.rs b/runtime/hydradx/src/weights/pallet_bonds.rs
index 6ea57d61f..e28d3642f 100644
--- a/runtime/hydradx/src/weights/pallet_bonds.rs
+++ b/runtime/hydradx/src/weights/pallet_bonds.rs
@@ -19,29 +19,23 @@
 //! Autogenerated weights for `pallet_bonds`
 //!
 //! 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: `[]`
+//! DATE: 2024-09-10, 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`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
 
 // Executed Command:
-// ./target/release/hydradx
+// target/release/hydradx
 // benchmark
 // pallet
+// --chain=dev
+// --steps=50
+// --repeat=20
 // --wasm-execution=compiled
-// --pallet
-// *
-// --extrinsic
-// *
-// --heap-pages
-// 4096
-// --steps
-// 50
-// --repeat
-// 20
+// --pallet=pallet-bonds
+// --extrinsic=*
 // --template=scripts/pallet-weight-template.hbs
-// --output
-// weights/
+// --output=./weights/pallet_bonds.rs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -91,8 +85,8 @@ impl<T: frame_system::Config> pallet_bonds::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `1393`
 		//  Estimated: `8799`
-		// Minimum execution time: 233_669_000 picoseconds.
-		Weight::from_parts(235_504_000, 8799)
+		// Minimum execution time: 238_932_000 picoseconds.
+		Weight::from_parts(240_147_000, 8799)
 			.saturating_add(T::DbWeight::get().reads(16_u64))
 			.saturating_add(T::DbWeight::get().writes(12_u64))
 	}
@@ -110,6 +104,8 @@ impl<T: frame_system::Config> pallet_bonds::WeightInfo for HydraWeight<T> {
 	/// 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: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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)
@@ -118,11 +114,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:  `1810`
+		//  Measured:  `2018`
 		//  Estimated: `8799`
-		// Minimum execution time: 175_138_000 picoseconds.
-		Weight::from_parts(176_054_000, 8799)
-			.saturating_add(T::DbWeight::get().reads(12_u64))
+		// Minimum execution time: 180_029_000 picoseconds.
+		Weight::from_parts(181_146_000, 8799)
+			.saturating_add(T::DbWeight::get().reads(13_u64))
 			.saturating_add(T::DbWeight::get().writes(7_u64))
 	}
 }
\ No newline at end of file
diff --git a/runtime/hydradx/src/weights/pallet_circuit_breaker.rs b/runtime/hydradx/src/weights/pallet_circuit_breaker.rs
index d2e8c563f..ec2170722 100644
--- a/runtime/hydradx/src/weights/pallet_circuit_breaker.rs
+++ b/runtime/hydradx/src/weights/pallet_circuit_breaker.rs
@@ -19,29 +19,23 @@
 //! Autogenerated weights for `pallet_circuit_breaker`
 //!
 //! 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: `[]`
+//! DATE: 2024-09-10, 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`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
 
 // Executed Command:
-// ./target/release/hydradx
+// target/release/hydradx
 // benchmark
 // pallet
+// --chain=dev
+// --steps=50
+// --repeat=20
 // --wasm-execution=compiled
-// --pallet
-// *
-// --extrinsic
-// *
-// --heap-pages
-// 4096
-// --steps
-// 50
-// --repeat
-// 20
+// --pallet=pallet-circuit-breaker
+// --extrinsic=*
 // --template=scripts/pallet-weight-template.hbs
-// --output
-// weights/
+// --output=./weights/pallet_circuit_breaker.rs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -63,33 +57,33 @@ impl<T: frame_system::Config> pallet_circuit_breaker::WeightInfo for HydraWeight
 		// Proof Size summary in bytes:
 		//  Measured:  `64 + m * (113 ±0) + n * (56 ±0)`
 		//  Estimated: `0`
-		// 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()))
+		// Minimum execution time: 316_267_000 picoseconds.
+		Weight::from_parts(317_103_000, 0)
+			// Standard Error: 9_174
+			.saturating_add(Weight::from_parts(277_948, 0).saturating_mul(n.into()))
+			// Standard Error: 9_174
+			.saturating_add(Weight::from_parts(1_071_388, 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: 8_112_000 picoseconds.
-		Weight::from_parts(8_381_000, 0)
+		// Minimum execution time: 8_606_000 picoseconds.
+		Weight::from_parts(8_803_000, 0)
 	}
 	fn on_finalize_single_trade_limit_entry() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `208`
 		//  Estimated: `0`
-		// Minimum execution time: 8_194_000 picoseconds.
-		Weight::from_parts(8_399_000, 0)
+		// Minimum execution time: 8_600_000 picoseconds.
+		Weight::from_parts(8_907_000, 0)
 	}
 	fn on_finalize_empty() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `208`
 		//  Estimated: `0`
-		// Minimum execution time: 8_191_000 picoseconds.
-		Weight::from_parts(8_373_000, 0)
+		// Minimum execution time: 8_524_000 picoseconds.
+		Weight::from_parts(8_933_000, 0)
 	}
 	/// Storage: `CircuitBreaker::TradeVolumeLimitPerAsset` (r:0 w:1)
 	/// Proof: `CircuitBreaker::TradeVolumeLimitPerAsset` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
@@ -97,8 +91,8 @@ impl<T: frame_system::Config> pallet_circuit_breaker::WeightInfo for HydraWeight
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 8_818_000 picoseconds.
-		Weight::from_parts(9_140_000, 0)
+		// Minimum execution time: 9_168_000 picoseconds.
+		Weight::from_parts(9_490_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	/// Storage: `CircuitBreaker::LiquidityAddLimitPerAsset` (r:0 w:1)
@@ -107,8 +101,8 @@ impl<T: frame_system::Config> pallet_circuit_breaker::WeightInfo for HydraWeight
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 8_841_000 picoseconds.
-		Weight::from_parts(9_081_000, 0)
+		// Minimum execution time: 8_747_000 picoseconds.
+		Weight::from_parts(9_167_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	/// Storage: `CircuitBreaker::LiquidityRemoveLimitPerAsset` (r:0 w:1)
@@ -117,8 +111,8 @@ impl<T: frame_system::Config> pallet_circuit_breaker::WeightInfo for HydraWeight
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 9_089_000 picoseconds.
-		Weight::from_parts(9_231_000, 0)
+		// Minimum execution time: 8_922_000 picoseconds.
+		Weight::from_parts(9_161_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	/// Storage: `CircuitBreaker::LiquidityAddLimitPerAsset` (r:1 w:0)
@@ -133,8 +127,8 @@ impl<T: frame_system::Config> pallet_circuit_breaker::WeightInfo for HydraWeight
 		// Proof Size summary in bytes:
 		//  Measured:  `262`
 		//  Estimated: `3517`
-		// Minimum execution time: 20_016_000 picoseconds.
-		Weight::from_parts(20_252_000, 3517)
+		// Minimum execution time: 20_217_000 picoseconds.
+		Weight::from_parts(20_416_000, 3517)
 			.saturating_add(T::DbWeight::get().reads(4_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -150,8 +144,8 @@ impl<T: frame_system::Config> pallet_circuit_breaker::WeightInfo for HydraWeight
 		// Proof Size summary in bytes:
 		//  Measured:  `208`
 		//  Estimated: `3517`
-		// Minimum execution time: 17_308_000 picoseconds.
-		Weight::from_parts(17_647_000, 3517)
+		// Minimum execution time: 17_362_000 picoseconds.
+		Weight::from_parts(17_585_000, 3517)
 			.saturating_add(T::DbWeight::get().reads(4_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -163,8 +157,8 @@ impl<T: frame_system::Config> pallet_circuit_breaker::WeightInfo for HydraWeight
 		// Proof Size summary in bytes:
 		//  Measured:  `208`
 		//  Estimated: `6076`
-		// Minimum execution time: 17_387_000 picoseconds.
-		Weight::from_parts(17_667_000, 6076)
+		// Minimum execution time: 17_624_000 picoseconds.
+		Weight::from_parts(17_932_000, 6076)
 			.saturating_add(T::DbWeight::get().reads(4_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
diff --git a/runtime/hydradx/src/weights/pallet_claims.rs b/runtime/hydradx/src/weights/pallet_claims.rs
index 6f9128b56..995e08f94 100644
--- a/runtime/hydradx/src/weights/pallet_claims.rs
+++ b/runtime/hydradx/src/weights/pallet_claims.rs
@@ -19,29 +19,23 @@
 //! Autogenerated weights for `pallet_claims`
 //!
 //! 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: `[]`
+//! DATE: 2024-09-10, 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`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
 
 // Executed Command:
-// ./target/release/hydradx
+// target/release/hydradx
 // benchmark
 // pallet
+// --chain=dev
+// --steps=50
+// --repeat=20
 // --wasm-execution=compiled
-// --pallet
-// *
-// --extrinsic
-// *
-// --heap-pages
-// 4096
-// --steps
-// 50
-// --repeat
-// 20
+// --pallet=pallet-claims
+// --extrinsic=*
 // --template=scripts/pallet-weight-template.hbs
-// --output
-// weights/
+// --output=./weights/pallet_claims.rs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -65,8 +59,8 @@ impl<T: frame_system::Config> pallet_claims::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `382`
 		//  Estimated: `3593`
-		// Minimum execution time: 69_254_000 picoseconds.
-		Weight::from_parts(69_849_000, 3593)
+		// Minimum execution time: 69_721_000 picoseconds.
+		Weight::from_parts(70_317_000, 3593)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
diff --git a/runtime/hydradx/src/weights/pallet_collator_selection.rs b/runtime/hydradx/src/weights/pallet_collator_selection.rs
index 78b8bc8b9..95e988821 100644
--- a/runtime/hydradx/src/weights/pallet_collator_selection.rs
+++ b/runtime/hydradx/src/weights/pallet_collator_selection.rs
@@ -19,29 +19,23 @@
 //! 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: `[]`
+//! DATE: 2024-09-10, 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`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
 
 // Executed Command:
-// ./target/release/hydradx
+// target/release/hydradx
 // benchmark
 // pallet
+// --chain=dev
+// --steps=50
+// --repeat=20
 // --wasm-execution=compiled
-// --pallet
-// *
-// --extrinsic
-// *
-// --heap-pages
-// 4096
-// --steps
-// 50
-// --repeat
-// 20
+// --pallet=pallet-collator-selection
+// --extrinsic=*
 // --template=scripts/pallet-weight-template.hbs
-// --output
-// weights/
+// --output=./weights/pallet_collator_selection.rs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -66,10 +60,10 @@ impl<T: frame_system::Config> pallet_collator_selection::WeightInfo for HydraWei
 		// 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()))
+		// Minimum execution time: 15_508_000 picoseconds.
+		Weight::from_parts(14_917_258, 1196)
+			// Standard Error: 4_177
+			.saturating_add(Weight::from_parts(3_179_911, 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()))
@@ -88,12 +82,12 @@ impl<T: frame_system::Config> pallet_collator_selection::WeightInfo for HydraWei
 		// 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()))
+		// Minimum execution time: 45_428_000 picoseconds.
+		Weight::from_parts(44_858_123, 4440)
+			// Standard Error: 1_044
+			.saturating_add(Weight::from_parts(89_971, 0).saturating_mul(b.into()))
+			// Standard Error: 2_751
+			.saturating_add(Weight::from_parts(34_291, 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()))
@@ -108,10 +102,10 @@ impl<T: frame_system::Config> pallet_collator_selection::WeightInfo for HydraWei
 		// 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()))
+		// Minimum execution time: 15_336_000 picoseconds.
+		Weight::from_parts(15_669_562, 3086)
+			// Standard Error: 482
+			.saturating_add(Weight::from_parts(39_269, 0).saturating_mul(b.into()))
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -121,8 +115,8 @@ impl<T: frame_system::Config> pallet_collator_selection::WeightInfo for HydraWei
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 6_784_000 picoseconds.
-		Weight::from_parts(7_000_000, 0)
+		// Minimum execution time: 6_534_000 picoseconds.
+		Weight::from_parts(6_746_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	/// Storage: `CollatorSelection::CandidacyBond` (r:1 w:1)
@@ -139,12 +133,12 @@ impl<T: frame_system::Config> pallet_collator_selection::WeightInfo for HydraWei
 		// 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()))
+		// Minimum execution time: 12_527_000 picoseconds.
+		Weight::from_parts(12_724_000, 3593)
+			// Standard Error: 180_183
+			.saturating_add(Weight::from_parts(6_143_451, 0).saturating_mul(c.into()))
+			// Standard Error: 180_183
+			.saturating_add(Weight::from_parts(6_008_930, 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())))
@@ -161,10 +155,10 @@ impl<T: frame_system::Config> pallet_collator_selection::WeightInfo for HydraWei
 		// 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()))
+		// Minimum execution time: 30_706_000 picoseconds.
+		Weight::from_parts(31_406_577, 2446)
+			// Standard Error: 3_667
+			.saturating_add(Weight::from_parts(76_610, 0).saturating_mul(c.into()))
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -183,10 +177,10 @@ impl<T: frame_system::Config> pallet_collator_selection::WeightInfo for HydraWei
 		// 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()))
+		// Minimum execution time: 41_163_000 picoseconds.
+		Weight::from_parts(42_077_576, 4181)
+			// Standard Error: 2_295
+			.saturating_add(Weight::from_parts(165_977, 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()))
@@ -208,10 +202,10 @@ impl<T: frame_system::Config> pallet_collator_selection::WeightInfo for HydraWei
 		// 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()))
+		// Minimum execution time: 62_690_000 picoseconds.
+		Weight::from_parts(63_565_013, 4281)
+			// Standard Error: 2_956
+			.saturating_add(Weight::from_parts(134_919, 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()))
@@ -227,10 +221,10 @@ impl<T: frame_system::Config> pallet_collator_selection::WeightInfo for HydraWei
 		// 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()))
+		// Minimum execution time: 35_943_000 picoseconds.
+		Weight::from_parts(36_613_289, 3086)
+			// Standard Error: 2_142
+			.saturating_add(Weight::from_parts(98_251, 0).saturating_mul(c.into()))
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -242,10 +236,10 @@ impl<T: frame_system::Config> pallet_collator_selection::WeightInfo for HydraWei
 	/// 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`
+		//  Measured:  `192`
 		//  Estimated: `6196`
-		// Minimum execution time: 51_400_000 picoseconds.
-		Weight::from_parts(51_952_000, 6196)
+		// Minimum execution time: 50_915_000 picoseconds.
+		Weight::from_parts(51_431_000, 6196)
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 			.saturating_add(T::DbWeight::get().writes(4_u64))
 	}
@@ -265,12 +259,12 @@ impl<T: frame_system::Config> pallet_collator_selection::WeightInfo for HydraWei
 	/// 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()))
+		//  Measured:  `464 + c * (98 ±0) + r * (134 ±0)`
+		//  Estimated: `3086 + c * (2519 ±0) + r * (2571 ±3)`
+		// Minimum execution time: 24_333_000 picoseconds.
+		Weight::from_parts(24_636_000, 3086)
+			// Standard Error: 307_144
+			.saturating_add(Weight::from_parts(13_674_735, 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))
diff --git a/runtime/hydradx/src/weights/pallet_collective_council.rs b/runtime/hydradx/src/weights/pallet_collective_council.rs
index ff44cde9c..30d3f7d59 100644
--- a/runtime/hydradx/src/weights/pallet_collective_council.rs
+++ b/runtime/hydradx/src/weights/pallet_collective_council.rs
@@ -19,29 +19,23 @@
 //! Autogenerated weights for `pallet_collective_council`
 //!
 //! 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: `[]`
+//! DATE: 2024-09-10, 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`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
 
 // Executed Command:
-// ./target/release/hydradx
+// target/release/hydradx
 // benchmark
 // pallet
+// --chain=dev
+// --steps=50
+// --repeat=20
 // --wasm-execution=compiled
-// --pallet
-// *
-// --extrinsic
-// *
-// --heap-pages
-// 4096
-// --steps
-// 50
-// --repeat
-// 20
+// --pallet=pallet-collective_council
+// --extrinsic=*
 // --template=scripts/pallet-weight-template.hbs
-// --output
-// weights/
+// --output=./weights/pallet_collective_council.rs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -71,13 +65,13 @@ impl<T: frame_system::Config> pallet_collective::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: `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()))
+		//  Estimated: `4558 + m * (591 ±8) + p * (2676 ±3)`
+		// Minimum execution time: 11_116_000 picoseconds.
+		Weight::from_parts(11_570_000, 4558)
+			// Standard Error: 88_060
+			.saturating_add(Weight::from_parts(2_599_907, 0).saturating_mul(m.into()))
+			// Standard Error: 38_594
+			.saturating_add(Weight::from_parts(4_022_591, 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_u64))
@@ -93,12 +87,12 @@ impl<T: frame_system::Config> pallet_collective::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `142 + m * (32 ±0)`
 		//  Estimated: `1627 + m * (32 ±0)`
-		// Minimum execution time: 16_578_000 picoseconds.
-		Weight::from_parts(16_660_936, 1627)
+		// Minimum execution time: 16_994_000 picoseconds.
+		Weight::from_parts(17_187_705, 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(Weight::from_parts(1_286, 0).saturating_mul(b.into()))
+			// Standard Error: 1_462
+			.saturating_add(Weight::from_parts(23_136, 0).saturating_mul(m.into()))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(Weight::from_parts(0, 32).saturating_mul(m.into()))
 	}
@@ -112,12 +106,12 @@ impl<T: frame_system::Config> pallet_collective::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  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()))
+		// Minimum execution time: 20_581_000 picoseconds.
+		Weight::from_parts(20_591_706, 3607)
+			// Standard Error: 19
+			.saturating_add(Weight::from_parts(1_417, 0).saturating_mul(b.into()))
+			// Standard Error: 1_550
+			.saturating_add(Weight::from_parts(29_117, 0).saturating_mul(m.into()))
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(Weight::from_parts(0, 32).saturating_mul(m.into()))
 	}
@@ -138,12 +132,12 @@ impl<T: frame_system::Config> pallet_collective::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  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)
+		// Minimum execution time: 26_450_000 picoseconds.
+		Weight::from_parts(26_951_580, 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(Weight::from_parts(2_293, 0).saturating_mul(b.into()))
+			// Standard Error: 1_923
+			.saturating_add(Weight::from_parts(264_030, 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()))
@@ -158,10 +152,10 @@ impl<T: frame_system::Config> pallet_collective::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  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()))
+		// Minimum execution time: 22_681_000 picoseconds.
+		Weight::from_parts(23_021_649, 4141)
+			// Standard Error: 1_771
+			.saturating_add(Weight::from_parts(41_632, 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()))
@@ -180,12 +174,12 @@ impl<T: frame_system::Config> pallet_collective::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  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()))
+		// Minimum execution time: 27_035_000 picoseconds.
+		Weight::from_parts(27_763_225, 3706)
+			// Standard Error: 4_535
+			.saturating_add(Weight::from_parts(66_672, 0).saturating_mul(m.into()))
+			// Standard Error: 1_466
+			.saturating_add(Weight::from_parts(225_668, 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()))
@@ -206,14 +200,14 @@ impl<T: frame_system::Config> pallet_collective::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  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()))
+		// Minimum execution time: 39_442_000 picoseconds.
+		Weight::from_parts(40_446_745, 3673)
+			// Standard Error: 88
+			.saturating_add(Weight::from_parts(737, 0).saturating_mul(b.into()))
+			// Standard Error: 9_477
+			.saturating_add(Weight::from_parts(64_747, 0).saturating_mul(m.into()))
+			// Standard Error: 3_069
+			.saturating_add(Weight::from_parts(255_543, 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()))
@@ -236,12 +230,12 @@ impl<T: frame_system::Config> pallet_collective::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  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()))
+		// Minimum execution time: 29_257_000 picoseconds.
+		Weight::from_parts(29_839_843, 3726)
+			// Standard Error: 4_544
+			.saturating_add(Weight::from_parts(71_362, 0).saturating_mul(m.into()))
+			// Standard Error: 1_469
+			.saturating_add(Weight::from_parts(231_125, 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()))
@@ -264,14 +258,14 @@ impl<T: frame_system::Config> pallet_collective::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  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()))
+		// Minimum execution time: 41_239_000 picoseconds.
+		Weight::from_parts(42_735_190, 3693)
+			// Standard Error: 97
+			.saturating_add(Weight::from_parts(522, 0).saturating_mul(b.into()))
+			// Standard Error: 10_447
+			.saturating_add(Weight::from_parts(66_882, 0).saturating_mul(m.into()))
+			// Standard Error: 3_383
+			.saturating_add(Weight::from_parts(255_986, 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()))
@@ -289,10 +283,10 @@ impl<T: frame_system::Config> pallet_collective::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  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()))
+		// Minimum execution time: 17_543_000 picoseconds.
+		Weight::from_parts(18_522_898, 1783)
+			// Standard Error: 1_533
+			.saturating_add(Weight::from_parts(197_867, 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()))
diff --git a/runtime/hydradx/src/weights/pallet_collective_technical_committee.rs b/runtime/hydradx/src/weights/pallet_collective_technical_committee.rs
index aba61868a..19d39250f 100644
--- a/runtime/hydradx/src/weights/pallet_collective_technical_committee.rs
+++ b/runtime/hydradx/src/weights/pallet_collective_technical_committee.rs
@@ -19,29 +19,23 @@
 //! Autogenerated weights for `pallet_collective_technical_committee`
 //!
 //! 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: `[]`
+//! DATE: 2024-09-10, 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`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
 
 // Executed Command:
-// ./target/release/hydradx
+// target/release/hydradx
 // benchmark
 // pallet
+// --chain=dev
+// --steps=50
+// --repeat=20
 // --wasm-execution=compiled
-// --pallet
-// *
-// --extrinsic
-// *
-// --heap-pages
-// 4096
-// --steps
-// 50
-// --repeat
-// 20
+// --pallet=pallet-collective_technical-committee
+// --extrinsic=*
 // --template=scripts/pallet-weight-template.hbs
-// --output
-// weights/
+// --output=./weights/pallet_collective_technical_committee.rs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -71,13 +65,13 @@ impl<T: frame_system::Config> pallet_collective::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: `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()))
+		//  Estimated: `4294 + m * (398 ±4) + p * (2601 ±2)`
+		// Minimum execution time: 9_345_000 picoseconds.
+		Weight::from_parts(9_522_000, 4294)
+			// Standard Error: 82_506
+			.saturating_add(Weight::from_parts(2_589_250, 0).saturating_mul(m.into()))
+			// Standard Error: 41_723
+			.saturating_add(Weight::from_parts(3_914_618, 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_u64))
@@ -93,12 +87,12 @@ impl<T: frame_system::Config> pallet_collective::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `70 + m * (32 ±0)`
 		//  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()))
+		// Minimum execution time: 16_228_000 picoseconds.
+		Weight::from_parts(16_360_050, 1554)
+			// Standard Error: 17
+			.saturating_add(Weight::from_parts(1_363, 0).saturating_mul(b.into()))
+			// Standard Error: 1_885
+			.saturating_add(Weight::from_parts(30_725, 0).saturating_mul(m.into()))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(Weight::from_parts(0, 32).saturating_mul(m.into()))
 	}
@@ -112,12 +106,12 @@ impl<T: frame_system::Config> pallet_collective::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `70 + m * (32 ±0)`
 		//  Estimated: `3534 + m * (32 ±0)`
-		// Minimum execution time: 19_545_000 picoseconds.
-		Weight::from_parts(19_640_829, 3534)
+		// Minimum execution time: 19_740_000 picoseconds.
+		Weight::from_parts(19_631_508, 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(Weight::from_parts(1_428, 0).saturating_mul(b.into()))
+			// Standard Error: 2_183
+			.saturating_add(Weight::from_parts(55_508, 0).saturating_mul(m.into()))
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(Weight::from_parts(0, 32).saturating_mul(m.into()))
 	}
@@ -138,14 +132,14 @@ impl<T: frame_system::Config> pallet_collective::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  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()))
+		// Minimum execution time: 25_048_000 picoseconds.
+		Weight::from_parts(25_210_488, 3603)
+			// Standard Error: 55
+			.saturating_add(Weight::from_parts(2_170, 0).saturating_mul(b.into()))
+			// Standard Error: 6_581
+			.saturating_add(Weight::from_parts(13_392, 0).saturating_mul(m.into()))
+			// Standard Error: 2_898
+			.saturating_add(Weight::from_parts(319_885, 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()))
@@ -160,10 +154,10 @@ impl<T: frame_system::Config> pallet_collective::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `538 + m * (64 ±0)`
 		//  Estimated: `4003 + m * (64 ±0)`
-		// 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()))
+		// Minimum execution time: 21_171_000 picoseconds.
+		Weight::from_parts(21_451_280, 4003)
+			// Standard Error: 3_519
+			.saturating_add(Weight::from_parts(64_268, 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()))
@@ -182,12 +176,12 @@ impl<T: frame_system::Config> pallet_collective::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  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()))
+		// Minimum execution time: 25_860_000 picoseconds.
+		Weight::from_parts(26_325_272, 3607)
+			// Standard Error: 5_983
+			.saturating_add(Weight::from_parts(65_285, 0).saturating_mul(m.into()))
+			// Standard Error: 2_016
+			.saturating_add(Weight::from_parts(292_033, 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()))
@@ -208,14 +202,14 @@ impl<T: frame_system::Config> pallet_collective::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  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()))
+		// Minimum execution time: 38_154_000 picoseconds.
+		Weight::from_parts(39_544_525, 3720)
+			// Standard Error: 63
+			.saturating_add(Weight::from_parts(722, 0).saturating_mul(b.into()))
+			// Standard Error: 9_788
+			.saturating_add(Weight::from_parts(14_584, 0).saturating_mul(m.into()))
+			// Standard Error: 3_305
+			.saturating_add(Weight::from_parts(299_839, 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()))
@@ -238,12 +232,12 @@ impl<T: frame_system::Config> pallet_collective::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  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()))
+		// Minimum execution time: 27_508_000 picoseconds.
+		Weight::from_parts(28_012_452, 3627)
+			// Standard Error: 6_320
+			.saturating_add(Weight::from_parts(90_244, 0).saturating_mul(m.into()))
+			// Standard Error: 2_129
+			.saturating_add(Weight::from_parts(299_943, 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()))
@@ -266,14 +260,14 @@ impl<T: frame_system::Config> pallet_collective::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  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()))
+		// Minimum execution time: 40_152_000 picoseconds.
+		Weight::from_parts(41_495_647, 3740)
+			// Standard Error: 63
+			.saturating_add(Weight::from_parts(736, 0).saturating_mul(b.into()))
+			// Standard Error: 9_742
+			.saturating_add(Weight::from_parts(9_030, 0).saturating_mul(m.into()))
+			// Standard Error: 3_290
+			.saturating_add(Weight::from_parts(311_862, 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()))
@@ -291,10 +285,10 @@ impl<T: frame_system::Config> pallet_collective::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `226 + p * (32 ±0)`
 		//  Estimated: `1711 + p * (32 ±0)`
-		// 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()))
+		// Minimum execution time: 16_786_000 picoseconds.
+		Weight::from_parts(17_319_591, 1711)
+			// Standard Error: 1_476
+			.saturating_add(Weight::from_parts(215_900, 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()))
diff --git a/runtime/hydradx/src/weights/pallet_currencies.rs b/runtime/hydradx/src/weights/pallet_currencies.rs
index 2b2a6579b..27f02556b 100644
--- a/runtime/hydradx/src/weights/pallet_currencies.rs
+++ b/runtime/hydradx/src/weights/pallet_currencies.rs
@@ -19,29 +19,23 @@
 //! Autogenerated weights for `pallet_currencies`
 //!
 //! 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: `[]`
+//! DATE: 2024-09-10, 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`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
 
 // Executed Command:
-// ./target/release/hydradx
+// target/release/hydradx
 // benchmark
 // pallet
+// --chain=dev
+// --steps=50
+// --repeat=20
 // --wasm-execution=compiled
-// --pallet
-// *
-// --extrinsic
-// *
-// --heap-pages
-// 4096
-// --steps
-// 50
-// --repeat
-// 20
+// --pallet=pallet-currencies
+// --extrinsic=*
 // --template=scripts/pallet-weight-template.hbs
-// --output
-// weights/
+// --output=./weights/pallet_currencies.rs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -57,6 +51,8 @@ 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: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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)
@@ -73,21 +69,21 @@ 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:  `2649`
+		//  Measured:  `2853`
 		//  Estimated: `6156`
-		// Minimum execution time: 89_816_000 picoseconds.
-		Weight::from_parts(90_275_000, 6156)
-			.saturating_add(T::DbWeight::get().reads(8_u64))
+		// Minimum execution time: 97_519_000 picoseconds.
+		Weight::from_parts(98_652_000, 6156)
+			.saturating_add(T::DbWeight::get().reads(9_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:  `1642`
+		//  Measured:  `1638`
 		//  Estimated: `3593`
-		// Minimum execution time: 70_873_000 picoseconds.
-		Weight::from_parts(71_750_000, 3593)
+		// Minimum execution time: 72_480_000 picoseconds.
+		Weight::from_parts(73_383_000, 3593)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -107,10 +103,10 @@ 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:  `2213`
+		//  Measured:  `2209`
 		//  Estimated: `3593`
-		// Minimum execution time: 62_719_000 picoseconds.
-		Weight::from_parts(63_335_000, 3593)
+		// Minimum execution time: 63_540_000 picoseconds.
+		Weight::from_parts(64_326_000, 3593)
 			.saturating_add(T::DbWeight::get().reads(7_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
@@ -118,10 +114,10 @@ impl<T: frame_system::Config> pallet_currencies::WeightInfo for HydraWeight<T> {
 	/// 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:  `1502`
+		//  Measured:  `1498`
 		//  Estimated: `3593`
-		// Minimum execution time: 38_419_000 picoseconds.
-		Weight::from_parts(39_090_000, 3593)
+		// Minimum execution time: 38_966_000 picoseconds.
+		Weight::from_parts(39_577_000, 3593)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -129,10 +125,10 @@ impl<T: frame_system::Config> pallet_currencies::WeightInfo for HydraWeight<T> {
 	/// 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:  `1590`
+		//  Measured:  `1586`
 		//  Estimated: `3593`
-		// Minimum execution time: 40_366_000 picoseconds.
-		Weight::from_parts(41_238_000, 3593)
+		// Minimum execution time: 41_091_000 picoseconds.
+		Weight::from_parts(41_812_000, 3593)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
diff --git a/runtime/hydradx/src/weights/pallet_democracy.rs b/runtime/hydradx/src/weights/pallet_democracy.rs
index 4c1ad0cb3..9c107fafa 100644
--- a/runtime/hydradx/src/weights/pallet_democracy.rs
+++ b/runtime/hydradx/src/weights/pallet_democracy.rs
@@ -19,7 +19,7 @@
 //! Autogenerated weights for `pallet_democracy`
 //!
 //! 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: `[]`
+//! DATE: 2024-09-10, 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`
@@ -29,14 +29,13 @@
 // benchmark
 // pallet
 // --chain=dev
-// --steps=10
-// --repeat=30
+// --steps=50
+// --repeat=20
 // --wasm-execution=compiled
-// --heap-pages=4096
-// --template=scripts/pallet-weight-template.hbs
 // --pallet=pallet-democracy
-// --output=weights/democracy.rs
 // --extrinsic=*
+// --template=scripts/pallet-weight-template.hbs
+// --output=./weights/pallet_democracy.rs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -64,8 +63,8 @@ impl<T: frame_system::Config> pallet_democracy::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `4688`
 		//  Estimated: `18187`
-		// Minimum execution time: 41_701_000 picoseconds.
-		Weight::from_parts(42_235_000, 18187)
+		// Minimum execution time: 41_084_000 picoseconds.
+		Weight::from_parts(41_857_000, 18187)
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
@@ -75,8 +74,8 @@ impl<T: frame_system::Config> pallet_democracy::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `3443`
 		//  Estimated: `6695`
-		// Minimum execution time: 39_489_000 picoseconds.
-		Weight::from_parts(40_100_000, 6695)
+		// Minimum execution time: 39_522_000 picoseconds.
+		Weight::from_parts(39_987_000, 6695)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -98,8 +97,8 @@ impl<T: frame_system::Config> pallet_democracy::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `15343`
 		//  Estimated: `268590`
-		// Minimum execution time: 415_574_000 picoseconds.
-		Weight::from_parts(419_090_000, 268590)
+		// Minimum execution time: 414_586_000 picoseconds.
+		Weight::from_parts(418_431_000, 268590)
 			.saturating_add(T::DbWeight::get().reads(107_u64))
 			.saturating_add(T::DbWeight::get().writes(5_u64))
 	}
@@ -121,8 +120,8 @@ impl<T: frame_system::Config> pallet_democracy::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `15365`
 		//  Estimated: `268590`
-		// Minimum execution time: 415_249_000 picoseconds.
-		Weight::from_parts(422_003_000, 268590)
+		// Minimum execution time: 411_716_000 picoseconds.
+		Weight::from_parts(416_992_000, 268590)
 			.saturating_add(T::DbWeight::get().reads(107_u64))
 			.saturating_add(T::DbWeight::get().writes(5_u64))
 	}
@@ -136,8 +135,8 @@ impl<T: frame_system::Config> pallet_democracy::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `249`
 		//  Estimated: `3666`
-		// Minimum execution time: 27_483_000 picoseconds.
-		Weight::from_parts(28_007_000, 3666)
+		// Minimum execution time: 27_470_000 picoseconds.
+		Weight::from_parts(27_800_000, 3666)
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
@@ -159,8 +158,8 @@ impl<T: frame_system::Config> pallet_democracy::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `6191`
 		//  Estimated: `18187`
-		// Minimum execution time: 107_718_000 picoseconds.
-		Weight::from_parts(108_453_000, 18187)
+		// Minimum execution time: 107_349_000 picoseconds.
+		Weight::from_parts(108_424_000, 18187)
 			.saturating_add(T::DbWeight::get().reads(9_u64))
 			.saturating_add(T::DbWeight::get().writes(8_u64))
 	}
@@ -172,8 +171,8 @@ impl<T: frame_system::Config> pallet_democracy::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `3276`
 		//  Estimated: `6703`
-		// Minimum execution time: 13_141_000 picoseconds.
-		Weight::from_parts(13_507_000, 6703)
+		// Minimum execution time: 12_816_000 picoseconds.
+		Weight::from_parts(13_191_000, 6703)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -183,8 +182,8 @@ impl<T: frame_system::Config> pallet_democracy::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 3_720_000 picoseconds.
-		Weight::from_parts(3_904_000, 0)
+		// Minimum execution time: 3_578_000 picoseconds.
+		Weight::from_parts(3_741_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	/// Storage: `Democracy::NextExternal` (r:0 w:1)
@@ -193,8 +192,8 @@ impl<T: frame_system::Config> pallet_democracy::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 3_862_000 picoseconds.
-		Weight::from_parts(4_053_000, 0)
+		// Minimum execution time: 3_603_000 picoseconds.
+		Weight::from_parts(3_844_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	/// Storage: `Democracy::NextExternal` (r:1 w:1)
@@ -209,8 +208,8 @@ impl<T: frame_system::Config> pallet_democracy::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `147`
 		//  Estimated: `3518`
-		// Minimum execution time: 25_432_000 picoseconds.
-		Weight::from_parts(25_892_000, 3518)
+		// Minimum execution time: 24_981_000 picoseconds.
+		Weight::from_parts(25_400_000, 3518)
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 			.saturating_add(T::DbWeight::get().writes(5_u64))
 	}
@@ -224,8 +223,8 @@ impl<T: frame_system::Config> pallet_democracy::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `3377`
 		//  Estimated: `6703`
-		// Minimum execution time: 28_422_000 picoseconds.
-		Weight::from_parts(28_931_000, 6703)
+		// Minimum execution time: 27_959_000 picoseconds.
+		Weight::from_parts(28_449_000, 6703)
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
@@ -241,8 +240,8 @@ impl<T: frame_system::Config> pallet_democracy::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `6076`
 		//  Estimated: `18187`
-		// Minimum execution time: 87_703_000 picoseconds.
-		Weight::from_parts(88_416_000, 18187)
+		// Minimum execution time: 86_974_000 picoseconds.
+		Weight::from_parts(87_631_000, 18187)
 			.saturating_add(T::DbWeight::get().reads(5_u64))
 			.saturating_add(T::DbWeight::get().writes(5_u64))
 	}
@@ -254,8 +253,8 @@ impl<T: frame_system::Config> pallet_democracy::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `181`
 		//  Estimated: `3518`
-		// Minimum execution time: 20_107_000 picoseconds.
-		Weight::from_parts(20_377_000, 3518)
+		// Minimum execution time: 19_499_000 picoseconds.
+		Weight::from_parts(20_085_000, 3518)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -268,12 +267,12 @@ 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:  `125 + r * (86 ±0)`
+		//  Measured:  `127 + r * (86 ±0)`
 		//  Estimated: `1489 + r * (2676 ±0)`
-		// 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()))
+		// Minimum execution time: 3_686_000 picoseconds.
+		Weight::from_parts(8_346_337, 1489)
+			// Standard Error: 6_381
+			.saturating_add(Weight::from_parts(3_255_704, 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))
@@ -294,12 +293,12 @@ 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:  `125 + r * (86 ±0)`
+		//  Measured:  `127 + r * (86 ±0)`
 		//  Estimated: `18187 + r * (2676 ±0)`
-		// 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()))
+		// Minimum execution time: 6_309_000 picoseconds.
+		Weight::from_parts(11_146_769, 18187)
+			// Standard Error: 6_126
+			.saturating_add(Weight::from_parts(3_263_109, 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))
@@ -318,10 +317,10 @@ impl<T: frame_system::Config> pallet_democracy::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `677 + r * (108 ±0)`
 		//  Estimated: `19800 + r * (2676 ±0)`
-		// 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()))
+		// Minimum execution time: 43_508_000 picoseconds.
+		Weight::from_parts(49_166_300, 19800)
+			// Standard Error: 5_582
+			.saturating_add(Weight::from_parts(4_141_052, 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))
@@ -335,12 +334,12 @@ 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:  `373 + r * (108 ±0)`
+		//  Measured:  `374 + r * (108 ±0)`
 		//  Estimated: `13530 + r * (2676 ±0)`
-		// 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()))
+		// Minimum execution time: 20_176_000 picoseconds.
+		Weight::from_parts(22_120_019, 13530)
+			// Standard Error: 5_423
+			.saturating_add(Weight::from_parts(4_137_529, 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))
@@ -353,8 +352,8 @@ impl<T: frame_system::Config> pallet_democracy::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 4_235_000 picoseconds.
-		Weight::from_parts(4_396_000, 0)
+		// Minimum execution time: 3_913_000 picoseconds.
+		Weight::from_parts(4_061_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	/// Storage: `Democracy::VotingOf` (r:1 w:1)
@@ -370,10 +369,10 @@ impl<T: frame_system::Config> pallet_democracy::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `432`
 		//  Estimated: `7260`
-		// 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()))
+		// Minimum execution time: 26_037_000 picoseconds.
+		Weight::from_parts(37_595_177, 7260)
+			// Standard Error: 2_601
+			.saturating_add(Weight::from_parts(37_640, 0).saturating_mul(r.into()))
 			.saturating_add(T::DbWeight::get().reads(4_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
@@ -388,12 +387,12 @@ impl<T: frame_system::Config> pallet_democracy::WeightInfo for HydraWeight<T> {
 	/// The range of component `r` is `[0, 99]`.
 	fn unlock_set(r: u32, ) -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `432 + r * (22 ±0)`
+		//  Measured:  `433 + r * (22 ±0)`
 		//  Estimated: `7260`
-		// 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()))
+		// Minimum execution time: 35_921_000 picoseconds.
+		Weight::from_parts(37_458_366, 7260)
+			// Standard Error: 704
+			.saturating_add(Weight::from_parts(62_000, 0).saturating_mul(r.into()))
 			.saturating_add(T::DbWeight::get().reads(4_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
@@ -412,12 +411,12 @@ 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:  `1503 + r * (46 ±0)`
+		//  Measured:  `1468 + r * (47 ±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()))
+		// Minimum execution time: 47_278_000 picoseconds.
+		Weight::from_parts(50_625_485, 7260)
+			// Standard Error: 2_207
+			.saturating_add(Weight::from_parts(154_973, 0).saturating_mul(r.into()))
 			.saturating_add(T::DbWeight::get().reads(7_u64))
 			.saturating_add(T::DbWeight::get().writes(4_u64))
 	}
@@ -436,12 +435,12 @@ 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:  `1503 + r * (46 ±0)`
+		//  Measured:  `1468 + r * (47 ±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()))
+		// Minimum execution time: 48_145_000 picoseconds.
+		Weight::from_parts(51_215_485, 7260)
+			// Standard Error: 2_118
+			.saturating_add(Weight::from_parts(144_598, 0).saturating_mul(r.into()))
 			.saturating_add(T::DbWeight::get().reads(7_u64))
 			.saturating_add(T::DbWeight::get().writes(4_u64))
 	}
@@ -450,15 +449,15 @@ impl<T: frame_system::Config> pallet_democracy::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:0)
-	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(75), added: 2550, mode: `MaxEncodedLen`)
+	/// Proof: `Preimage::RequestStatusFor` (`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: 20_454_000 picoseconds.
-		Weight::from_parts(20_805_000, 3556)
+		// Minimum execution time: 19_975_000 picoseconds.
+		Weight::from_parts(20_324_000, 3556)
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -470,8 +469,8 @@ impl<T: frame_system::Config> pallet_democracy::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `147`
 		//  Estimated: `3518`
-		// Minimum execution time: 16_223_000 picoseconds.
-		Weight::from_parts(16_478_000, 3518)
+		// Minimum execution time: 15_820_000 picoseconds.
+		Weight::from_parts(16_301_000, 3518)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -480,15 +479,15 @@ impl<T: frame_system::Config> pallet_democracy::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:0)
-	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(75), added: 2550, mode: `MaxEncodedLen`)
+	/// Proof: `Preimage::RequestStatusFor` (`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: 42_358_000 picoseconds.
-		Weight::from_parts(42_867_000, 18187)
+		// Minimum execution time: 42_054_000 picoseconds.
+		Weight::from_parts(42_492_000, 18187)
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -500,23 +499,23 @@ impl<T: frame_system::Config> pallet_democracy::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `4706`
 		//  Estimated: `18187`
-		// Minimum execution time: 37_064_000 picoseconds.
-		Weight::from_parts(37_477_000, 18187)
+		// Minimum execution time: 36_480_000 picoseconds.
+		Weight::from_parts(36_908_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`)
+	/// Proof: `Preimage::RequestStatusFor` (`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: 18_290_000 picoseconds.
-		Weight::from_parts(18_660_000, 3556)
+		// Minimum execution time: 18_019_000 picoseconds.
+		Weight::from_parts(18_332_000, 3556)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -528,8 +527,8 @@ impl<T: frame_system::Config> pallet_democracy::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `159`
 		//  Estimated: `3666`
-		// Minimum execution time: 18_955_000 picoseconds.
-		Weight::from_parts(19_323_000, 3666)
+		// Minimum execution time: 18_356_000 picoseconds.
+		Weight::from_parts(18_625_000, 3666)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
diff --git a/runtime/hydradx/src/weights/pallet_duster.rs b/runtime/hydradx/src/weights/pallet_duster.rs
index 67e855672..326bb23c8 100644
--- a/runtime/hydradx/src/weights/pallet_duster.rs
+++ b/runtime/hydradx/src/weights/pallet_duster.rs
@@ -19,29 +19,23 @@
 //! Autogenerated weights for `pallet_duster`
 //!
 //! 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: `[]`
+//! DATE: 2024-09-10, 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`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
 
 // Executed Command:
-// ./target/release/hydradx
+// target/release/hydradx
 // benchmark
 // pallet
+// --chain=dev
+// --steps=50
+// --repeat=20
 // --wasm-execution=compiled
-// --pallet
-// *
-// --extrinsic
-// *
-// --heap-pages
-// 4096
-// --steps
-// 50
-// --repeat
-// 20
+// --pallet=pallet-duster
+// --extrinsic=*
 // --template=scripts/pallet-weight-template.hbs
-// --output
-// weights/
+// --output=./weights/pallet_duster.rs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -65,6 +59,8 @@ impl<T: frame_system::Config> pallet_duster::WeightInfo for HydraWeight<T> {
 	/// 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: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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)
@@ -75,31 +71,31 @@ impl<T: frame_system::Config> pallet_duster::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:  `2690`
+		//  Measured:  `2894`
 		//  Estimated: `6156`
-		// Minimum execution time: 84_500_000 picoseconds.
-		Weight::from_parts(85_254_000, 6156)
-			.saturating_add(T::DbWeight::get().reads(8_u64))
+		// Minimum execution time: 88_728_000 picoseconds.
+		Weight::from_parts(89_220_000, 6156)
+			.saturating_add(T::DbWeight::get().reads(9_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:  `1016`
+		//  Measured:  `1012`
 		//  Estimated: `0`
-		// Minimum execution time: 16_109_000 picoseconds.
-		Weight::from_parts(16_551_000, 0)
+		// Minimum execution time: 16_562_000 picoseconds.
+		Weight::from_parts(16_851_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:  `1370`
+		//  Measured:  `1366`
 		//  Estimated: `3513`
-		// Minimum execution time: 20_814_000 picoseconds.
-		Weight::from_parts(21_277_000, 3513)
+		// Minimum execution time: 21_816_000 picoseconds.
+		Weight::from_parts(22_528_000, 3513)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
diff --git a/runtime/hydradx/src/weights/pallet_dynamic_evm_fee.rs b/runtime/hydradx/src/weights/pallet_dynamic_evm_fee.rs
index 7eebdff7c..702f216d6 100644
--- a/runtime/hydradx/src/weights/pallet_dynamic_evm_fee.rs
+++ b/runtime/hydradx/src/weights/pallet_dynamic_evm_fee.rs
@@ -19,29 +19,23 @@
 //! 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: `[]`
+//! DATE: 2024-09-10, 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`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
 
 // Executed Command:
-// ./target/release/hydradx
+// target/release/hydradx
 // benchmark
 // pallet
+// --chain=dev
+// --steps=50
+// --repeat=20
 // --wasm-execution=compiled
-// --pallet
-// *
-// --extrinsic
-// *
-// --heap-pages
-// 4096
-// --steps
-// 50
-// --repeat
-// 20
+// --pallet=pallet-dynamic-evm-fee
+// --extrinsic=*
 // --template=scripts/pallet-weight-template.hbs
-// --output
-// weights/
+// --output=./weights/pallet_dynamic_evm_fee.rs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -73,10 +67,10 @@ impl<T: frame_system::Config> pallet_dynamic_evm_fee::WeightInfo for HydraWeight
 	/// 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`
+		//  Measured:  `2742`
 		//  Estimated: `11598`
-		// Minimum execution time: 66_128_000 picoseconds.
-		Weight::from_parts(66_561_000, 11598)
+		// Minimum execution time: 66_789_000 picoseconds.
+		Weight::from_parts(67_440_000, 11598)
 			.saturating_add(T::DbWeight::get().reads(10_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
diff --git a/runtime/hydradx/src/weights/pallet_elections_phragmen.rs b/runtime/hydradx/src/weights/pallet_elections_phragmen.rs
index 8d64e0ca1..8febcf6b5 100644
--- a/runtime/hydradx/src/weights/pallet_elections_phragmen.rs
+++ b/runtime/hydradx/src/weights/pallet_elections_phragmen.rs
@@ -19,29 +19,23 @@
 //! Autogenerated weights for `pallet_elections_phragmen`
 //!
 //! 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: `[]`
+//! DATE: 2024-09-10, 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`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
 
 // Executed Command:
-// ./target/release/hydradx
+// target/release/hydradx
 // benchmark
 // pallet
+// --chain=dev
+// --steps=50
+// --repeat=20
 // --wasm-execution=compiled
-// --pallet
-// *
-// --extrinsic
-// *
-// --heap-pages
-// 4096
-// --steps
-// 50
-// --repeat
-// 20
+// --pallet=pallet-elections-phragmen
+// --extrinsic=*
 // --template=scripts/pallet-weight-template.hbs
-// --output
-// weights/
+// --output=./weights/pallet_elections_phragmen.rs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -74,10 +68,10 @@ impl<T: frame_system::Config> pallet_elections_phragmen::WeightInfo for HydraWei
 		// Proof Size summary in bytes:
 		//  Measured:  `429 + v * (80 ±0)`
 		//  Estimated: `4764 + v * (80 ±0)`
-		// 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()))
+		// Minimum execution time: 36_437_000 picoseconds.
+		Weight::from_parts(36_965_587, 4764)
+			// Standard Error: 2_824
+			.saturating_add(Weight::from_parts(140_702, 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()))
@@ -99,10 +93,10 @@ 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: 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()))
+		// Minimum execution time: 49_364_000 picoseconds.
+		Weight::from_parts(49_861_243, 4764)
+			// Standard Error: 3_513
+			.saturating_add(Weight::from_parts(144_027, 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()))
@@ -124,10 +118,10 @@ 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: 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()))
+		// Minimum execution time: 49_587_000 picoseconds.
+		Weight::from_parts(49_934_252, 4764)
+			// Standard Error: 3_154
+			.saturating_add(Weight::from_parts(135_416, 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()))
@@ -142,8 +136,8 @@ impl<T: frame_system::Config> pallet_elections_phragmen::WeightInfo for HydraWei
 		// Proof Size summary in bytes:
 		//  Measured:  `761`
 		//  Estimated: `4764`
-		// Minimum execution time: 49_563_000 picoseconds.
-		Weight::from_parts(49_816_000, 4764)
+		// Minimum execution time: 49_898_000 picoseconds.
+		Weight::from_parts(50_308_000, 4764)
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -158,10 +152,10 @@ impl<T: frame_system::Config> pallet_elections_phragmen::WeightInfo for HydraWei
 		// Proof Size summary in bytes:
 		//  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()))
+		// Minimum execution time: 36_579_000 picoseconds.
+		Weight::from_parts(37_389_041, 3633)
+			// Standard Error: 460
+			.saturating_add(Weight::from_parts(50_926, 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()))
@@ -173,10 +167,10 @@ impl<T: frame_system::Config> pallet_elections_phragmen::WeightInfo for HydraWei
 		// Proof Size summary in bytes:
 		//  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()))
+		// Minimum execution time: 31_561_000 picoseconds.
+		Weight::from_parts(32_148_967, 1836)
+			// Standard Error: 336
+			.saturating_add(Weight::from_parts(38_083, 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()))
@@ -195,8 +189,8 @@ impl<T: frame_system::Config> pallet_elections_phragmen::WeightInfo for HydraWei
 		// Proof Size summary in bytes:
 		//  Measured:  `2417`
 		//  Estimated: `3902`
-		// Minimum execution time: 43_953_000 picoseconds.
-		Weight::from_parts(44_501_000, 3902)
+		// Minimum execution time: 43_878_000 picoseconds.
+		Weight::from_parts(44_275_000, 3902)
 			.saturating_add(T::DbWeight::get().reads(4_u64))
 			.saturating_add(T::DbWeight::get().writes(4_u64))
 	}
@@ -206,8 +200,8 @@ impl<T: frame_system::Config> pallet_elections_phragmen::WeightInfo for HydraWei
 		// Proof Size summary in bytes:
 		//  Measured:  `1491`
 		//  Estimated: `2976`
-		// Minimum execution time: 31_618_000 picoseconds.
-		Weight::from_parts(32_155_000, 2976)
+		// Minimum execution time: 31_763_000 picoseconds.
+		Weight::from_parts(32_375_000, 2976)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -236,8 +230,8 @@ impl<T: frame_system::Config> pallet_elections_phragmen::WeightInfo for HydraWei
 		// Proof Size summary in bytes:
 		//  Measured:  `2557`
 		//  Estimated: `6196`
-		// Minimum execution time: 63_946_000 picoseconds.
-		Weight::from_parts(64_791_000, 6196)
+		// Minimum execution time: 64_834_000 picoseconds.
+		Weight::from_parts(65_557_000, 6196)
 			.saturating_add(T::DbWeight::get().reads(6_u64))
 			.saturating_add(T::DbWeight::get().writes(6_u64))
 	}
@@ -260,13 +254,13 @@ impl<T: frame_system::Config> pallet_elections_phragmen::WeightInfo for HydraWei
 	fn clean_defunct_voters(v: u32, d: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  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()))
+		//  Estimated: `32254 + d * (3774 ±0) + v * (24 ±0)`
+		// Minimum execution time: 8_722_000 picoseconds.
+		Weight::from_parts(9_309_000, 32254)
+			// Standard Error: 9_203
+			.saturating_add(Weight::from_parts(141_957, 0).saturating_mul(v.into()))
+			// Standard Error: 20_041
+			.saturating_add(Weight::from_parts(53_516_701, 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())))
@@ -298,12 +292,12 @@ impl<T: frame_system::Config> pallet_elections_phragmen::WeightInfo for HydraWei
 		// Proof Size summary in bytes:
 		//  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()))
+		// Minimum execution time: 2_796_875_000 picoseconds.
+		Weight::from_parts(2_803_427_000, 278118)
+			// Standard Error: 601_243
+			.saturating_add(Weight::from_parts(21_103_938, 0).saturating_mul(v.into()))
+			// Standard Error: 62_724
+			.saturating_add(Weight::from_parts(1_474_615, 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())))
diff --git a/runtime/hydradx/src/weights/pallet_ema_oracle.rs b/runtime/hydradx/src/weights/pallet_ema_oracle.rs
index 78967acd2..36664fd4d 100644
--- a/runtime/hydradx/src/weights/pallet_ema_oracle.rs
+++ b/runtime/hydradx/src/weights/pallet_ema_oracle.rs
@@ -19,29 +19,23 @@
 //! Autogenerated weights for `pallet_ema_oracle`
 //!
 //! 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: `[]`
+//! DATE: 2024-09-10, 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`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
 
 // Executed Command:
-// ./target/release/hydradx
+// target/release/hydradx
 // benchmark
 // pallet
+// --chain=dev
+// --steps=50
+// --repeat=20
 // --wasm-execution=compiled
-// --pallet
-// *
-// --extrinsic
-// *
-// --heap-pages
-// 4096
-// --steps
-// 50
-// --repeat
-// 20
+// --pallet=pallet-ema-oracle
+// --extrinsic=*
 // --template=scripts/pallet-weight-template.hbs
-// --output
-// weights/
+// --output=./weights/pallet_ema_oracle.rs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -63,8 +57,8 @@ impl<T: frame_system::Config> pallet_ema_oracle::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `860`
 		//  Estimated: `2126`
-		// Minimum execution time: 15_633_000 picoseconds.
-		Weight::from_parts(15_827_000, 2126)
+		// Minimum execution time: 15_358_000 picoseconds.
+		Weight::from_parts(15_612_000, 2126)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -78,8 +72,8 @@ impl<T: frame_system::Config> pallet_ema_oracle::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `876`
 		//  Estimated: `7406`
-		// Minimum execution time: 31_307_000 picoseconds.
-		Weight::from_parts(31_799_000, 7406)
+		// Minimum execution time: 32_501_000 picoseconds.
+		Weight::from_parts(32_728_000, 7406)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(5_u64))
 	}
@@ -89,8 +83,8 @@ impl<T: frame_system::Config> pallet_ema_oracle::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `208`
 		//  Estimated: `7406`
-		// Minimum execution time: 2_253_000 picoseconds.
-		Weight::from_parts(2_365_000, 7406)
+		// Minimum execution time: 2_187_000 picoseconds.
+		Weight::from_parts(2_267_000, 7406)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 	}
 	/// Storage: `EmaOracle::Accumulator` (r:1 w:1)
@@ -102,10 +96,10 @@ impl<T: frame_system::Config> pallet_ema_oracle::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `305 + b * (626 ±0)`
 		//  Estimated: `7406 + b * (7956 ±0)`
-		// 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()))
+		// Minimum execution time: 45_323_000 picoseconds.
+		Weight::from_parts(10_030_058, 7406)
+			// Standard Error: 15_380
+			.saturating_add(Weight::from_parts(35_004_114, 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_u64))
@@ -121,10 +115,10 @@ impl<T: frame_system::Config> pallet_ema_oracle::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `821 + b * (164 ±0)`
 		//  Estimated: `7406`
-		// 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()))
+		// Minimum execution time: 16_045_000 picoseconds.
+		Weight::from_parts(16_698_666, 7406)
+			// Standard Error: 2_712
+			.saturating_add(Weight::from_parts(482_996, 0).saturating_mul(b.into()))
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -137,10 +131,10 @@ impl<T: frame_system::Config> pallet_ema_oracle::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `821 + b * (164 ±0)`
 		//  Estimated: `7406`
-		// 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()))
+		// Minimum execution time: 16_293_000 picoseconds.
+		Weight::from_parts(16_839_547, 7406)
+			// Standard Error: 2_626
+			.saturating_add(Weight::from_parts(478_879, 0).saturating_mul(b.into()))
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -150,8 +144,8 @@ impl<T: frame_system::Config> pallet_ema_oracle::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `638`
 		//  Estimated: `6294`
-		// Minimum execution time: 17_768_000 picoseconds.
-		Weight::from_parts(18_090_000, 6294)
+		// Minimum execution time: 17_336_000 picoseconds.
+		Weight::from_parts(17_680_000, 6294)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 	}
 }
\ No newline at end of file
diff --git a/runtime/hydradx/src/weights/pallet_evm_accounts.rs b/runtime/hydradx/src/weights/pallet_evm_accounts.rs
index e378bb693..c273f9725 100644
--- a/runtime/hydradx/src/weights/pallet_evm_accounts.rs
+++ b/runtime/hydradx/src/weights/pallet_evm_accounts.rs
@@ -19,29 +19,23 @@
 //! Autogenerated weights for `pallet_evm_accounts`
 //!
 //! 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: `[]`
+//! DATE: 2024-09-10, 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`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
 
 // Executed Command:
-// ./target/release/hydradx
+// target/release/hydradx
 // benchmark
 // pallet
+// --chain=dev
+// --steps=50
+// --repeat=20
 // --wasm-execution=compiled
-// --pallet
-// *
-// --extrinsic
-// *
-// --heap-pages
-// 4096
-// --steps
-// 50
-// --repeat
-// 20
+// --pallet=pallet-evm-accounts
+// --extrinsic=*
 // --template=scripts/pallet-weight-template.hbs
-// --output
-// weights/
+// --output=./weights/pallet_evm_accounts.rs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -73,8 +67,8 @@ impl<T: frame_system::Config> pallet_evm_accounts::WeightInfo for HydraWeight<T>
 		// Proof Size summary in bytes:
 		//  Measured:  `545`
 		//  Estimated: `4087`
-		// Minimum execution time: 32_109_000 picoseconds.
-		Weight::from_parts(32_705_000, 4087)
+		// Minimum execution time: 32_601_000 picoseconds.
+		Weight::from_parts(33_318_000, 4087)
 			.saturating_add(T::DbWeight::get().reads(6_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -84,8 +78,8 @@ impl<T: frame_system::Config> pallet_evm_accounts::WeightInfo for HydraWeight<T>
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 9_574_000 picoseconds.
-		Weight::from_parts(9_760_000, 0)
+		// Minimum execution time: 9_273_000 picoseconds.
+		Weight::from_parts(9_491_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	/// Storage: `EVMAccounts::ContractDeployer` (r:0 w:1)
@@ -94,8 +88,8 @@ impl<T: frame_system::Config> pallet_evm_accounts::WeightInfo for HydraWeight<T>
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 9_344_000 picoseconds.
-		Weight::from_parts(9_633_000, 0)
+		// Minimum execution time: 9_169_000 picoseconds.
+		Weight::from_parts(9_370_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	/// Storage: `EVMAccounts::ContractDeployer` (r:0 w:1)
@@ -104,8 +98,8 @@ impl<T: frame_system::Config> pallet_evm_accounts::WeightInfo for HydraWeight<T>
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 9_421_000 picoseconds.
-		Weight::from_parts(9_685_000, 0)
+		// Minimum execution time: 9_240_000 picoseconds.
+		Weight::from_parts(9_463_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
index ff1b56687..793f6642f 100644
--- a/runtime/hydradx/src/weights/pallet_identity.rs
+++ b/runtime/hydradx/src/weights/pallet_identity.rs
@@ -19,29 +19,23 @@
 //! 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: `[]`
+//! DATE: 2024-09-10, 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`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
 
 // Executed Command:
-// ./target/release/hydradx
+// target/release/hydradx
 // benchmark
 // pallet
+// --chain=dev
+// --steps=50
+// --repeat=20
 // --wasm-execution=compiled
-// --pallet
-// *
-// --extrinsic
-// *
-// --heap-pages
-// 4096
-// --steps
-// 50
-// --repeat
-// 20
+// --pallet=pallet-identity
+// --extrinsic=*
 // --template=scripts/pallet-weight-template.hbs
-// --output
-// weights/
+// --output=./weights/pallet_identity.rs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -64,10 +58,10 @@ impl<T: frame_system::Config> pallet_identity::WeightInfo for HydraWeight<T> {
 		// 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()))
+		// Minimum execution time: 11_320_000 picoseconds.
+		Weight::from_parts(12_195_192, 2626)
+			// Standard Error: 1_742
+			.saturating_add(Weight::from_parts(75_979, 0).saturating_mul(r.into()))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -78,10 +72,10 @@ impl<T: frame_system::Config> pallet_identity::WeightInfo for HydraWeight<T> {
 		// 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()))
+		// Minimum execution time: 148_893_000 picoseconds.
+		Weight::from_parts(149_991_395, 11037)
+			// Standard Error: 3_728
+			.saturating_add(Weight::from_parts(40_031, 0).saturating_mul(r.into()))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -96,10 +90,10 @@ impl<T: frame_system::Config> pallet_identity::WeightInfo for HydraWeight<T> {
 		// 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()))
+		// Minimum execution time: 13_595_000 picoseconds.
+		Weight::from_parts(29_401_389, 11037)
+			// Standard Error: 3_919
+			.saturating_add(Weight::from_parts(3_772_021, 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))
@@ -117,10 +111,10 @@ impl<T: frame_system::Config> pallet_identity::WeightInfo for HydraWeight<T> {
 		// 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()))
+		// Minimum execution time: 13_460_000 picoseconds.
+		Weight::from_parts(28_754_749, 11037)
+			// Standard Error: 3_527
+			.saturating_add(Weight::from_parts(1_465_845, 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())))
@@ -137,12 +131,12 @@ impl<T: frame_system::Config> pallet_identity::WeightInfo for HydraWeight<T> {
 		// 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()))
+		// Minimum execution time: 67_893_000 picoseconds.
+		Weight::from_parts(70_981_106, 11037)
+			// Standard Error: 4_685
+			.saturating_add(Weight::from_parts(20_850, 0).saturating_mul(r.into()))
+			// Standard Error: 914
+			.saturating_add(Weight::from_parts(1_445_202, 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())))
@@ -156,10 +150,10 @@ impl<T: frame_system::Config> pallet_identity::WeightInfo for HydraWeight<T> {
 		// 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()))
+		// Minimum execution time: 100_118_000 picoseconds.
+		Weight::from_parts(101_073_565, 11037)
+			// Standard Error: 2_560
+			.saturating_add(Weight::from_parts(100_431, 0).saturating_mul(r.into()))
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -170,10 +164,10 @@ impl<T: frame_system::Config> pallet_identity::WeightInfo for HydraWeight<T> {
 		// 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()))
+		// Minimum execution time: 98_046_000 picoseconds.
+		Weight::from_parts(98_844_481, 11037)
+			// Standard Error: 1_891
+			.saturating_add(Weight::from_parts(57_879, 0).saturating_mul(r.into()))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -184,10 +178,10 @@ impl<T: frame_system::Config> pallet_identity::WeightInfo for HydraWeight<T> {
 		// 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()))
+		// Minimum execution time: 8_537_000 picoseconds.
+		Weight::from_parts(8_898_208, 2626)
+			// Standard Error: 940
+			.saturating_add(Weight::from_parts(67_204, 0).saturating_mul(r.into()))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -198,10 +192,10 @@ impl<T: frame_system::Config> pallet_identity::WeightInfo for HydraWeight<T> {
 		// 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()))
+		// Minimum execution time: 8_569_000 picoseconds.
+		Weight::from_parts(8_909_007, 2626)
+			// Standard Error: 822
+			.saturating_add(Weight::from_parts(58_675, 0).saturating_mul(r.into()))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -212,10 +206,10 @@ impl<T: frame_system::Config> pallet_identity::WeightInfo for HydraWeight<T> {
 		// 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()))
+		// Minimum execution time: 8_362_000 picoseconds.
+		Weight::from_parts(8_797_932, 2626)
+			// Standard Error: 1_073
+			.saturating_add(Weight::from_parts(57_564, 0).saturating_mul(r.into()))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -228,10 +222,10 @@ impl<T: frame_system::Config> pallet_identity::WeightInfo for HydraWeight<T> {
 		// 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()))
+		// Minimum execution time: 127_101_000 picoseconds.
+		Weight::from_parts(127_865_155, 11037)
+			// Standard Error: 2_732
+			.saturating_add(Weight::from_parts(113_704, 0).saturating_mul(r.into()))
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -249,12 +243,12 @@ impl<T: frame_system::Config> pallet_identity::WeightInfo for HydraWeight<T> {
 		// 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()))
+		// Minimum execution time: 86_147_000 picoseconds.
+		Weight::from_parts(88_859_181, 11037)
+			// Standard Error: 5_243
+			.saturating_add(Weight::from_parts(17_602, 0).saturating_mul(r.into()))
+			// Standard Error: 1_023
+			.saturating_add(Weight::from_parts(1_454_021, 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())))
@@ -270,10 +264,10 @@ impl<T: frame_system::Config> pallet_identity::WeightInfo for HydraWeight<T> {
 		// 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()))
+		// Minimum execution time: 32_974_000 picoseconds.
+		Weight::from_parts(37_676_517, 11037)
+			// Standard Error: 1_129
+			.saturating_add(Weight::from_parts(53_168, 0).saturating_mul(s.into()))
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -286,10 +280,10 @@ impl<T: frame_system::Config> pallet_identity::WeightInfo for HydraWeight<T> {
 		// 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()))
+		// Minimum execution time: 16_801_000 picoseconds.
+		Weight::from_parts(19_000_566, 11037)
+			// Standard Error: 570
+			.saturating_add(Weight::from_parts(18_672, 0).saturating_mul(s.into()))
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -304,10 +298,10 @@ impl<T: frame_system::Config> pallet_identity::WeightInfo for HydraWeight<T> {
 		// 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()))
+		// Minimum execution time: 36_288_000 picoseconds.
+		Weight::from_parts(39_191_108, 11037)
+			// Standard Error: 757
+			.saturating_add(Weight::from_parts(38_383, 0).saturating_mul(s.into()))
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -322,10 +316,10 @@ impl<T: frame_system::Config> pallet_identity::WeightInfo for HydraWeight<T> {
 		// 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()))
+		// Minimum execution time: 28_096_000 picoseconds.
+		Weight::from_parts(30_099_612, 6723)
+			// Standard Error: 764
+			.saturating_add(Weight::from_parts(46_105, 0).saturating_mul(s.into()))
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -335,8 +329,8 @@ impl<T: frame_system::Config> pallet_identity::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 9_266_000 picoseconds.
-		Weight::from_parts(9_524_000, 0)
+		// Minimum execution time: 9_137_000 picoseconds.
+		Weight::from_parts(9_293_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	/// Storage: `Identity::UsernameAuthorities` (r:1 w:1)
@@ -345,8 +339,8 @@ impl<T: frame_system::Config> pallet_identity::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `80`
 		//  Estimated: `3517`
-		// Minimum execution time: 11_923_000 picoseconds.
-		Weight::from_parts(12_167_000, 3517)
+		// Minimum execution time: 11_768_000 picoseconds.
+		Weight::from_parts(11_992_000, 3517)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -362,8 +356,8 @@ impl<T: frame_system::Config> pallet_identity::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `80`
 		//  Estimated: `11037`
-		// Minimum execution time: 66_614_000 picoseconds.
-		Weight::from_parts(67_277_000, 11037)
+		// Minimum execution time: 63_750_000 picoseconds.
+		Weight::from_parts(64_767_000, 11037)
 			.saturating_add(T::DbWeight::get().reads(4_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
@@ -377,8 +371,8 @@ impl<T: frame_system::Config> pallet_identity::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `115`
 		//  Estimated: `11037`
-		// Minimum execution time: 26_815_000 picoseconds.
-		Weight::from_parts(27_250_000, 11037)
+		// Minimum execution time: 26_875_000 picoseconds.
+		Weight::from_parts(27_229_000, 11037)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
@@ -388,8 +382,8 @@ impl<T: frame_system::Config> pallet_identity::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `115`
 		//  Estimated: `3550`
-		// Minimum execution time: 16_590_000 picoseconds.
-		Weight::from_parts(16_962_000, 3550)
+		// Minimum execution time: 16_262_000 picoseconds.
+		Weight::from_parts(16_750_000, 3550)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -401,8 +395,8 @@ impl<T: frame_system::Config> pallet_identity::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `257`
 		//  Estimated: `11037`
-		// Minimum execution time: 22_033_000 picoseconds.
-		Weight::from_parts(22_650_000, 11037)
+		// Minimum execution time: 21_983_000 picoseconds.
+		Weight::from_parts(22_299_000, 11037)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -414,8 +408,8 @@ impl<T: frame_system::Config> pallet_identity::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `98`
 		//  Estimated: `11037`
-		// Minimum execution time: 14_896_000 picoseconds.
-		Weight::from_parts(15_302_000, 11037)
+		// Minimum execution time: 14_438_000 picoseconds.
+		Weight::from_parts(14_730_000, 11037)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
diff --git a/runtime/hydradx/src/weights/pallet_lbp.rs b/runtime/hydradx/src/weights/pallet_lbp.rs
index 1b53799ca..fb172bd35 100644
--- a/runtime/hydradx/src/weights/pallet_lbp.rs
+++ b/runtime/hydradx/src/weights/pallet_lbp.rs
@@ -19,7 +19,7 @@
 //! Autogenerated weights for `pallet_lbp`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
-//! DATE: 2024-06-20, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-09-10, 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`
@@ -29,14 +29,13 @@
 // benchmark
 // pallet
 // --chain=dev
-// --steps=10
-// --repeat=30
+// --steps=50
+// --repeat=20
 // --wasm-execution=compiled
-// --heap-pages=4096
-// --template=scripts/pallet-weight-template.hbs
 // --pallet=pallet-lbp
-// --output=weights/lbp.rs
 // --extrinsic=*
+// --template=scripts/pallet-weight-template.hbs
+// --output=./weights/pallet_lbp.rs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -58,6 +57,8 @@ impl<T: frame_system::Config> pallet_lbp::WeightInfo for HydraWeight<T> {
 	/// 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: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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)
@@ -72,11 +73,11 @@ impl<T: frame_system::Config> pallet_lbp::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:  `1311`
+		//  Measured:  `1519`
 		//  Estimated: `11322`
-		// Minimum execution time: 133_964_000 picoseconds.
-		Weight::from_parts(135_186_000, 11322)
-			.saturating_add(T::DbWeight::get().reads(15_u64))
+		// Minimum execution time: 136_266_000 picoseconds.
+		Weight::from_parts(137_668_000, 11322)
+			.saturating_add(T::DbWeight::get().reads(16_u64))
 			.saturating_add(T::DbWeight::get().writes(8_u64))
 	}
 	/// Storage: `LBP::PoolData` (r:1 w:1)
@@ -87,8 +88,8 @@ impl<T: frame_system::Config> pallet_lbp::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `417`
 		//  Estimated: `3628`
-		// Minimum execution time: 25_043_000 picoseconds.
-		Weight::from_parts(25_363_000, 3628)
+		// Minimum execution time: 24_713_000 picoseconds.
+		Weight::from_parts(25_213_000, 3628)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
@@ -96,6 +97,8 @@ impl<T: frame_system::Config> pallet_lbp::WeightInfo for HydraWeight<T> {
 	/// 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: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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)
@@ -106,17 +109,19 @@ impl<T: frame_system::Config> pallet_lbp::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:  `1572`
+		//  Measured:  `1780`
 		//  Estimated: `11322`
-		// Minimum execution time: 100_522_000 picoseconds.
-		Weight::from_parts(101_333_000, 11322)
-			.saturating_add(T::DbWeight::get().reads(11_u64))
+		// Minimum execution time: 104_132_000 picoseconds.
+		Weight::from_parts(104_897_000, 11322)
+			.saturating_add(T::DbWeight::get().reads(12_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: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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)
@@ -133,11 +138,11 @@ impl<T: frame_system::Config> pallet_lbp::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:  `1687`
+		//  Measured:  `1895`
 		//  Estimated: `11322`
-		// Minimum execution time: 131_548_000 picoseconds.
-		Weight::from_parts(132_825_000, 11322)
-			.saturating_add(T::DbWeight::get().reads(13_u64))
+		// Minimum execution time: 135_138_000 picoseconds.
+		Weight::from_parts(136_175_000, 11322)
+			.saturating_add(T::DbWeight::get().reads(14_u64))
 			.saturating_add(T::DbWeight::get().writes(8_u64))
 	}
 	/// Storage: `Tokens::Accounts` (r:5 w:5)
@@ -146,6 +151,8 @@ impl<T: frame_system::Config> pallet_lbp::WeightInfo for HydraWeight<T> {
 	/// 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: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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)
@@ -156,11 +163,11 @@ impl<T: frame_system::Config> pallet_lbp::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:  `1977`
+		//  Measured:  `2185`
 		//  Estimated: `13905`
-		// Minimum execution time: 233_172_000 picoseconds.
-		Weight::from_parts(234_278_000, 13905)
-			.saturating_add(T::DbWeight::get().reads(16_u64))
+		// Minimum execution time: 237_882_000 picoseconds.
+		Weight::from_parts(239_360_000, 13905)
+			.saturating_add(T::DbWeight::get().reads(17_u64))
 			.saturating_add(T::DbWeight::get().writes(7_u64))
 	}
 	/// Storage: `LBP::PoolData` (r:1 w:0)
@@ -169,6 +176,8 @@ impl<T: frame_system::Config> pallet_lbp::WeightInfo for HydraWeight<T> {
 	/// 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: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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)
@@ -179,11 +188,11 @@ impl<T: frame_system::Config> pallet_lbp::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:  `1977`
+		//  Measured:  `2185`
 		//  Estimated: `13905`
-		// Minimum execution time: 232_521_000 picoseconds.
-		Weight::from_parts(233_949_000, 13905)
-			.saturating_add(T::DbWeight::get().reads(16_u64))
+		// Minimum execution time: 237_046_000 picoseconds.
+		Weight::from_parts(238_347_000, 13905)
+			.saturating_add(T::DbWeight::get().reads(17_u64))
 			.saturating_add(T::DbWeight::get().writes(7_u64))
 	}
 	/// Storage: `LBP::PoolData` (r:1 w:0)
@@ -192,6 +201,8 @@ impl<T: frame_system::Config> pallet_lbp::WeightInfo for HydraWeight<T> {
 	/// 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: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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)
@@ -204,16 +215,16 @@ impl<T: frame_system::Config> pallet_lbp::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:  `822 + e * (1155 ±0)`
-		//  Estimated: `6156 + e * (7749 ±251_795_645_551_580_832)`
-		// Minimum execution time: 86_818_000 picoseconds.
-		Weight::from_parts(88_179_000, 6156)
-			// Standard Error: 904_459
-			.saturating_add(Weight::from_parts(3_650_240, 0).saturating_mul(c.into()))
-			// Standard Error: 1_985_547
-			.saturating_add(Weight::from_parts(154_967_721, 0).saturating_mul(e.into()))
+		//  Measured:  `822 + e * (1363 ±0)`
+		//  Estimated: `8799 + e * (7749 ±0)`
+		// Minimum execution time: 87_361_000 picoseconds.
+		Weight::from_parts(88_580_000, 8799)
+			// Standard Error: 241_438
+			.saturating_add(Weight::from_parts(1_047_223, 0).saturating_mul(c.into()))
+			// Standard Error: 537_751
+			.saturating_add(Weight::from_parts(152_397_271, 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().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, 7749).saturating_mul(e.into()))
 	}
@@ -223,6 +234,8 @@ impl<T: frame_system::Config> pallet_lbp::WeightInfo for HydraWeight<T> {
 	/// 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: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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)
@@ -235,18 +248,18 @@ impl<T: frame_system::Config> pallet_lbp::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:  `822 + e * (1155 ±0)`
-		//  Estimated: `6156 + e * (7749 ±0)`
-		// Minimum execution time: 163_430_000 picoseconds.
-		Weight::from_parts(164_981_000, 6156)
-			// Standard Error: 1_122_507
-			.saturating_add(Weight::from_parts(5_914_893, 0).saturating_mul(c.into()))
-			// Standard Error: 3_706_588
-			.saturating_add(Weight::from_parts(112_896_249, 0).saturating_mul(e.into()))
+		//  Measured:  `822 + e * (1363 ±0)`
+		//  Estimated: `6156 + e * (8544 ±0)`
+		// Minimum execution time: 160_618_000 picoseconds.
+		Weight::from_parts(161_967_000, 6156)
+			// Standard Error: 434_297
+			.saturating_add(Weight::from_parts(2_807_924, 0).saturating_mul(c.into()))
+			// Standard Error: 1_464_590
+			.saturating_add(Weight::from_parts(113_441_082, 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().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, 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`)
@@ -256,8 +269,8 @@ impl<T: frame_system::Config> pallet_lbp::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `822`
 		//  Estimated: `6156`
-		// Minimum execution time: 89_403_000 picoseconds.
-		Weight::from_parts(90_543_000, 6156)
+		// Minimum execution time: 89_869_000 picoseconds.
+		Weight::from_parts(90_917_000, 6156)
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 	}
 	/// Storage: `LBP::PoolData` (r:1 w:0)
@@ -270,8 +283,8 @@ impl<T: frame_system::Config> pallet_lbp::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `822`
 		//  Estimated: `6156`
-		// Minimum execution time: 24_307_000 picoseconds.
-		Weight::from_parts(24_702_000, 6156)
+		// Minimum execution time: 25_211_000 picoseconds.
+		Weight::from_parts(25_559_000, 6156)
 			.saturating_add(T::DbWeight::get().reads(4_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
index 4b61714b9..814993025 100644
--- a/runtime/hydradx/src/weights/pallet_message_queue.rs
+++ b/runtime/hydradx/src/weights/pallet_message_queue.rs
@@ -19,29 +19,23 @@
 //! 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: `[]`
+//! DATE: 2024-09-10, 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`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
 
 // Executed Command:
-// ./target/release/hydradx
+// target/release/hydradx
 // benchmark
 // pallet
+// --chain=dev
+// --steps=50
+// --repeat=20
 // --wasm-execution=compiled
-// --pallet
-// *
-// --extrinsic
-// *
-// --heap-pages
-// 4096
-// --steps
-// 50
-// --repeat
-// 20
+// --pallet=pallet-message-queue
+// --extrinsic=*
 // --template=scripts/pallet-weight-template.hbs
-// --output
-// weights/
+// --output=./weights/pallet_message_queue.rs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -65,8 +59,8 @@ impl<T: frame_system::Config> pallet_message_queue::WeightInfo for HydraWeight<T
 		// Proof Size summary in bytes:
 		//  Measured:  `294`
 		//  Estimated: `6044`
-		// Minimum execution time: 15_012_000 picoseconds.
-		Weight::from_parts(15_338_000, 6044)
+		// Minimum execution time: 15_212_000 picoseconds.
+		Weight::from_parts(15_437_000, 6044)
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -78,8 +72,8 @@ impl<T: frame_system::Config> pallet_message_queue::WeightInfo for HydraWeight<T
 		// Proof Size summary in bytes:
 		//  Measured:  `289`
 		//  Estimated: `6044`
-		// Minimum execution time: 13_429_000 picoseconds.
-		Weight::from_parts(13_758_000, 6044)
+		// Minimum execution time: 13_393_000 picoseconds.
+		Weight::from_parts(13_710_000, 6044)
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
@@ -89,8 +83,8 @@ impl<T: frame_system::Config> pallet_message_queue::WeightInfo for HydraWeight<T
 		// Proof Size summary in bytes:
 		//  Measured:  `76`
 		//  Estimated: `3517`
-		// Minimum execution time: 5_484_000 picoseconds.
-		Weight::from_parts(5_641_000, 3517)
+		// Minimum execution time: 5_466_000 picoseconds.
+		Weight::from_parts(5_655_000, 3517)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -100,8 +94,8 @@ impl<T: frame_system::Config> pallet_message_queue::WeightInfo for HydraWeight<T
 		// Proof Size summary in bytes:
 		//  Measured:  `143`
 		//  Estimated: `137658`
-		// Minimum execution time: 8_251_000 picoseconds.
-		Weight::from_parts(8_563_000, 137658)
+		// Minimum execution time: 8_108_000 picoseconds.
+		Weight::from_parts(8_462_000, 137658)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -111,8 +105,8 @@ impl<T: frame_system::Config> pallet_message_queue::WeightInfo for HydraWeight<T
 		// Proof Size summary in bytes:
 		//  Measured:  `143`
 		//  Estimated: `137658`
-		// Minimum execution time: 8_267_000 picoseconds.
-		Weight::from_parts(8_556_000, 137658)
+		// Minimum execution time: 8_221_000 picoseconds.
+		Weight::from_parts(8_421_000, 137658)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -124,8 +118,8 @@ impl<T: frame_system::Config> pallet_message_queue::WeightInfo for HydraWeight<T
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 277_206_000 picoseconds.
-		Weight::from_parts(279_349_000, 0)
+		// Minimum execution time: 276_793_000 picoseconds.
+		Weight::from_parts(278_116_000, 0)
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
 	/// Storage: `MessageQueue::ServiceHead` (r:1 w:1)
@@ -136,8 +130,8 @@ impl<T: frame_system::Config> pallet_message_queue::WeightInfo for HydraWeight<T
 		// Proof Size summary in bytes:
 		//  Measured:  `242`
 		//  Estimated: `3517`
-		// Minimum execution time: 8_602_000 picoseconds.
-		Weight::from_parts(8_764_000, 3517)
+		// Minimum execution time: 8_444_000 picoseconds.
+		Weight::from_parts(8_741_000, 3517)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -149,8 +143,8 @@ impl<T: frame_system::Config> pallet_message_queue::WeightInfo for HydraWeight<T
 		// Proof Size summary in bytes:
 		//  Measured:  `134345`
 		//  Estimated: `137658`
-		// Minimum execution time: 101_898_000 picoseconds.
-		Weight::from_parts(102_451_000, 137658)
+		// Minimum execution time: 92_452_000 picoseconds.
+		Weight::from_parts(93_074_000, 137658)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -162,8 +156,8 @@ impl<T: frame_system::Config> pallet_message_queue::WeightInfo for HydraWeight<T
 		// Proof Size summary in bytes:
 		//  Measured:  `134345`
 		//  Estimated: `137658`
-		// Minimum execution time: 139_941_000 picoseconds.
-		Weight::from_parts(140_920_000, 137658)
+		// Minimum execution time: 133_675_000 picoseconds.
+		Weight::from_parts(137_370_000, 137658)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -175,8 +169,8 @@ impl<T: frame_system::Config> pallet_message_queue::WeightInfo for HydraWeight<T
 		// Proof Size summary in bytes:
 		//  Measured:  `134345`
 		//  Estimated: `137658`
-		// Minimum execution time: 201_758_000 picoseconds.
-		Weight::from_parts(202_959_000, 137658)
+		// Minimum execution time: 205_201_000 picoseconds.
+		Weight::from_parts(206_944_000, 137658)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
diff --git a/runtime/hydradx/src/weights/pallet_multisig.rs b/runtime/hydradx/src/weights/pallet_multisig.rs
index b0a86acd6..36f0619cd 100644
--- a/runtime/hydradx/src/weights/pallet_multisig.rs
+++ b/runtime/hydradx/src/weights/pallet_multisig.rs
@@ -19,29 +19,23 @@
 //! 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: `[]`
+//! DATE: 2024-09-10, 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`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
 
 // Executed Command:
-// ./target/release/hydradx
+// target/release/hydradx
 // benchmark
 // pallet
+// --chain=dev
+// --steps=50
+// --repeat=20
 // --wasm-execution=compiled
-// --pallet
-// *
-// --extrinsic
-// *
-// --heap-pages
-// 4096
-// --steps
-// 50
-// --repeat
-// 20
+// --pallet=pallet-multisig
+// --extrinsic=*
 // --template=scripts/pallet-weight-template.hbs
-// --output
-// weights/
+// --output=./weights/pallet_multisig.rs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -62,10 +56,10 @@ impl<T: frame_system::Config> pallet_multisig::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 13_646_000 picoseconds.
-		Weight::from_parts(14_094_950, 0)
+		// Minimum execution time: 13_685_000 picoseconds.
+		Weight::from_parts(14_220_986, 0)
 			// Standard Error: 1
-			.saturating_add(Weight::from_parts(536, 0).saturating_mul(z.into()))
+			.saturating_add(Weight::from_parts(559, 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`)
@@ -75,12 +69,12 @@ impl<T: frame_system::Config> pallet_multisig::WeightInfo for HydraWeight<T> {
 		// 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()))
+		// Minimum execution time: 45_377_000 picoseconds.
+		Weight::from_parts(39_587_049, 6811)
+			// Standard Error: 354
+			.saturating_add(Weight::from_parts(65_638, 0).saturating_mul(s.into()))
 			// Standard Error: 3
-			.saturating_add(Weight::from_parts(1_243, 0).saturating_mul(z.into()))
+			.saturating_add(Weight::from_parts(1_248, 0).saturating_mul(z.into()))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -92,12 +86,12 @@ impl<T: frame_system::Config> pallet_multisig::WeightInfo for HydraWeight<T> {
 		// 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()))
+		// Minimum execution time: 30_761_000 picoseconds.
+		Weight::from_parts(24_486_480, 6811)
+			// Standard Error: 296
+			.saturating_add(Weight::from_parts(69_430, 0).saturating_mul(s.into()))
+			// Standard Error: 2
+			.saturating_add(Weight::from_parts(1_216, 0).saturating_mul(z.into()))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -111,12 +105,12 @@ impl<T: frame_system::Config> pallet_multisig::WeightInfo for HydraWeight<T> {
 		// 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()))
+		// Minimum execution time: 51_067_000 picoseconds.
+		Weight::from_parts(43_662_040, 6811)
+			// Standard Error: 435
+			.saturating_add(Weight::from_parts(85_808, 0).saturating_mul(s.into()))
 			// Standard Error: 4
-			.saturating_add(Weight::from_parts(1_296, 0).saturating_mul(z.into()))
+			.saturating_add(Weight::from_parts(1_280, 0).saturating_mul(z.into()))
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -127,10 +121,10 @@ impl<T: frame_system::Config> pallet_multisig::WeightInfo for HydraWeight<T> {
 		// 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()))
+		// Minimum execution time: 35_840_000 picoseconds.
+		Weight::from_parts(37_128_113, 6811)
+			// Standard Error: 558
+			.saturating_add(Weight::from_parts(70_564, 0).saturating_mul(s.into()))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -141,10 +135,10 @@ impl<T: frame_system::Config> pallet_multisig::WeightInfo for HydraWeight<T> {
 		// 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()))
+		// Minimum execution time: 20_936_000 picoseconds.
+		Weight::from_parts(21_902_006, 6811)
+			// Standard Error: 424
+			.saturating_add(Weight::from_parts(66_780, 0).saturating_mul(s.into()))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -155,10 +149,10 @@ impl<T: frame_system::Config> pallet_multisig::WeightInfo for HydraWeight<T> {
 		// 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()))
+		// Minimum execution time: 36_731_000 picoseconds.
+		Weight::from_parts(37_838_429, 6811)
+			// Standard Error: 494
+			.saturating_add(Weight::from_parts(70_143, 0).saturating_mul(s.into()))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
diff --git a/runtime/hydradx/src/weights/pallet_omnipool.rs b/runtime/hydradx/src/weights/pallet_omnipool.rs
index 25742e267..3c81a7897 100644
--- a/runtime/hydradx/src/weights/pallet_omnipool.rs
+++ b/runtime/hydradx/src/weights/pallet_omnipool.rs
@@ -19,7 +19,7 @@
 //! Autogenerated weights for `pallet_omnipool`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
-//! DATE: 2024-06-20, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-09-10, 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`
@@ -29,14 +29,13 @@
 // benchmark
 // pallet
 // --chain=dev
-// --steps=10
-// --repeat=30
+// --steps=50
+// --repeat=20
 // --wasm-execution=compiled
-// --heap-pages=4096
-// --template=scripts/pallet-weight-template.hbs
 // --pallet=pallet-omnipool
-// --output=weights/omnipool.rs
 // --extrinsic=*
+// --template=scripts/pallet-weight-template.hbs
+// --output=./weights/pallet_omnipool.rs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -82,8 +81,8 @@ impl<T: frame_system::Config> pallet_omnipool::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `3128`
 		//  Estimated: `7406`
-		// Minimum execution time: 129_557_000 picoseconds.
-		Weight::from_parts(130_648_000, 7406)
+		// Minimum execution time: 129_737_000 picoseconds.
+		Weight::from_parts(131_001_000, 7406)
 			.saturating_add(T::DbWeight::get().reads(13_u64))
 			.saturating_add(T::DbWeight::get().writes(10_u64))
 	}
@@ -103,6 +102,8 @@ impl<T: frame_system::Config> pallet_omnipool::WeightInfo for HydraWeight<T> {
 	/// 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: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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)
@@ -129,11 +130,11 @@ 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:  `4344`
+		//  Measured:  `4552`
 		//  Estimated: `8739`
-		// Minimum execution time: 212_794_000 picoseconds.
-		Weight::from_parts(214_077_000, 8739)
-			.saturating_add(T::DbWeight::get().reads(23_u64))
+		// Minimum execution time: 218_146_000 picoseconds.
+		Weight::from_parts(219_509_000, 8739)
+			.saturating_add(T::DbWeight::get().reads(24_u64))
 			.saturating_add(T::DbWeight::get().writes(14_u64))
 	}
 	/// Storage: `Uniques::Asset` (r:1 w:1)
@@ -148,6 +149,8 @@ impl<T: frame_system::Config> pallet_omnipool::WeightInfo for HydraWeight<T> {
 	/// 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: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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)
@@ -180,11 +183,11 @@ 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:  `7255`
+		//  Measured:  `7463`
 		//  Estimated: `11322`
-		// Minimum execution time: 283_260_000 picoseconds.
-		Weight::from_parts(285_188_000, 11322)
-			.saturating_add(T::DbWeight::get().reads(26_u64))
+		// Minimum execution time: 288_313_000 picoseconds.
+		Weight::from_parts(290_432_000, 11322)
+			.saturating_add(T::DbWeight::get().reads(27_u64))
 			.saturating_add(T::DbWeight::get().writes(16_u64))
 	}
 	/// Storage: `Tokens::Accounts` (r:5 w:5)
@@ -195,6 +198,8 @@ impl<T: frame_system::Config> pallet_omnipool::WeightInfo for HydraWeight<T> {
 	/// 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: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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)
@@ -237,11 +242,11 @@ 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:  `7615`
+		//  Measured:  `7823`
 		//  Estimated: `13905`
-		// Minimum execution time: 326_103_000 picoseconds.
-		Weight::from_parts(327_911_000, 13905)
-			.saturating_add(T::DbWeight::get().reads(41_u64))
+		// Minimum execution time: 333_717_000 picoseconds.
+		Weight::from_parts(335_901_000, 13905)
+			.saturating_add(T::DbWeight::get().reads(42_u64))
 			.saturating_add(T::DbWeight::get().writes(23_u64))
 	}
 	/// Storage: `Omnipool::Assets` (r:3 w:3)
@@ -252,6 +257,8 @@ impl<T: frame_system::Config> pallet_omnipool::WeightInfo for HydraWeight<T> {
 	/// 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: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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)
@@ -294,11 +301,11 @@ 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:  `7615`
+		//  Measured:  `7823`
 		//  Estimated: `13905`
-		// Minimum execution time: 328_543_000 picoseconds.
-		Weight::from_parts(330_455_000, 13905)
-			.saturating_add(T::DbWeight::get().reads(41_u64))
+		// Minimum execution time: 335_910_000 picoseconds.
+		Weight::from_parts(337_763_000, 13905)
+			.saturating_add(T::DbWeight::get().reads(42_u64))
 			.saturating_add(T::DbWeight::get().writes(23_u64))
 	}
 	/// Storage: `Omnipool::Assets` (r:1 w:1)
@@ -307,8 +314,8 @@ impl<T: frame_system::Config> pallet_omnipool::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `1305`
 		//  Estimated: `3550`
-		// Minimum execution time: 28_191_000 picoseconds.
-		Weight::from_parts(28_788_000, 3550)
+		// Minimum execution time: 28_270_000 picoseconds.
+		Weight::from_parts(28_812_000, 3550)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -316,6 +323,8 @@ impl<T: frame_system::Config> pallet_omnipool::WeightInfo for HydraWeight<T> {
 	/// 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: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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)
@@ -330,11 +339,11 @@ 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:  `2642`
+		//  Measured:  `2850`
 		//  Estimated: `6196`
-		// Minimum execution time: 99_781_000 picoseconds.
-		Weight::from_parts(101_151_000, 6196)
-			.saturating_add(T::DbWeight::get().reads(10_u64))
+		// Minimum execution time: 104_659_000 picoseconds.
+		Weight::from_parts(105_287_000, 6196)
+			.saturating_add(T::DbWeight::get().reads(11_u64))
 			.saturating_add(T::DbWeight::get().writes(5_u64))
 	}
 	/// Storage: `Omnipool::Positions` (r:1 w:1)
@@ -353,8 +362,8 @@ impl<T: frame_system::Config> pallet_omnipool::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `2910`
 		//  Estimated: `3655`
-		// Minimum execution time: 67_106_000 picoseconds.
-		Weight::from_parts(67_630_000, 3655)
+		// Minimum execution time: 67_565_000 picoseconds.
+		Weight::from_parts(68_526_000, 3655)
 			.saturating_add(T::DbWeight::get().reads(4_u64))
 			.saturating_add(T::DbWeight::get().writes(6_u64))
 	}
@@ -364,8 +373,8 @@ impl<T: frame_system::Config> pallet_omnipool::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `1305`
 		//  Estimated: `3550`
-		// Minimum execution time: 28_644_000 picoseconds.
-		Weight::from_parts(29_012_000, 3550)
+		// Minimum execution time: 28_717_000 picoseconds.
+		Weight::from_parts(29_137_000, 3550)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -375,6 +384,8 @@ impl<T: frame_system::Config> pallet_omnipool::WeightInfo for HydraWeight<T> {
 	/// 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: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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)
@@ -393,11 +404,11 @@ 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:  `4337`
+		//  Measured:  `4545`
 		//  Estimated: `8739`
-		// Minimum execution time: 146_511_000 picoseconds.
-		Weight::from_parts(147_743_000, 8739)
-			.saturating_add(T::DbWeight::get().reads(15_u64))
+		// Minimum execution time: 150_915_000 picoseconds.
+		Weight::from_parts(152_374_000, 8739)
+			.saturating_add(T::DbWeight::get().reads(16_u64))
 			.saturating_add(T::DbWeight::get().writes(8_u64))
 	}
 	/// Storage: `Omnipool::Assets` (r:1 w:1)
@@ -410,6 +421,8 @@ impl<T: frame_system::Config> pallet_omnipool::WeightInfo for HydraWeight<T> {
 	/// 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: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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)
@@ -422,11 +435,11 @@ 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:  `3428`
+		//  Measured:  `3636`
 		//  Estimated: `11322`
-		// Minimum execution time: 145_853_000 picoseconds.
-		Weight::from_parts(147_060_000, 11322)
-			.saturating_add(T::DbWeight::get().reads(16_u64))
+		// Minimum execution time: 151_145_000 picoseconds.
+		Weight::from_parts(152_034_000, 11322)
+			.saturating_add(T::DbWeight::get().reads(17_u64))
 			.saturating_add(T::DbWeight::get().writes(8_u64))
 	}
 	/// Storage: `Omnipool::Assets` (r:3 w:3)
@@ -437,6 +450,8 @@ impl<T: frame_system::Config> pallet_omnipool::WeightInfo for HydraWeight<T> {
 	/// 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: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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)
@@ -475,18 +490,20 @@ 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`)
 	/// 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 * (5140 ±0)`
-		//  Estimated: `6156 + e * (8517 ±251_795_645_551_580_832)`
-		// Minimum execution time: 44_661_000 picoseconds.
-		Weight::from_parts(46_229_971, 6156)
-			// Standard Error: 148_969
-			.saturating_add(Weight::from_parts(285_100_297, 0).saturating_mul(e.into()))
+		//  Measured:  `1974 + e * (5348 ±0)`
+		//  Estimated: `11390 + e * (7749 ±0)`
+		// Minimum execution time: 45_263_000 picoseconds.
+		Weight::from_parts(45_693_748, 11390)
+			// Standard Error: 134_488
+			.saturating_add(Weight::from_parts(268_691, 0).saturating_mul(c.into()))
+			// Standard Error: 134_488
+			.saturating_add(Weight::from_parts(289_580_167, 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().reads((32_u64).saturating_mul(e.into())))
 			.saturating_add(T::DbWeight::get().writes((21_u64).saturating_mul(e.into())))
-			.saturating_add(Weight::from_parts(0, 8517).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`)
@@ -496,6 +513,8 @@ impl<T: frame_system::Config> pallet_omnipool::WeightInfo for HydraWeight<T> {
 	/// 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: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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)
@@ -534,17 +553,15 @@ 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`)
 	/// 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:  `7114`
+		//  Measured:  `7322`
 		//  Estimated: `13905`
-		// Minimum execution time: 315_214_000 picoseconds.
-		Weight::from_parts(296_879_705, 13905)
-			// Standard Error: 261_774
-			.saturating_add(Weight::from_parts(18_029_452, 0).saturating_mul(c.into()))
-			// Standard Error: 261_774
-			.saturating_add(Weight::from_parts(2_977_423, 0).saturating_mul(e.into()))
-			.saturating_add(T::DbWeight::get().reads(38_u64))
+		// Minimum execution time: 319_285_000 picoseconds.
+		Weight::from_parts(311_604_346, 13905)
+			// Standard Error: 213_268
+			.saturating_add(Weight::from_parts(12_523_973, 0).saturating_mul(c.into()))
+			.saturating_add(T::DbWeight::get().reads(39_u64))
 			.saturating_add(T::DbWeight::get().writes(21_u64))
 	}
 	/// Storage: `DynamicFees::AssetFee` (r:2 w:0)
@@ -557,8 +574,8 @@ impl<T: frame_system::Config> pallet_omnipool::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `1933`
 		//  Estimated: `6156`
-		// Minimum execution time: 43_389_000 picoseconds.
-		Weight::from_parts(43_919_000, 6156)
+		// Minimum execution time: 44_268_000 picoseconds.
+		Weight::from_parts(44_633_000, 6156)
 			.saturating_add(T::DbWeight::get().reads(6_u64))
 	}
 }
\ No newline at end of file
diff --git a/runtime/hydradx/src/weights/pallet_omnipool_liquidity_mining.rs b/runtime/hydradx/src/weights/pallet_omnipool_liquidity_mining.rs
index 2c7a76dbb..abd24b9d7 100644
--- a/runtime/hydradx/src/weights/pallet_omnipool_liquidity_mining.rs
+++ b/runtime/hydradx/src/weights/pallet_omnipool_liquidity_mining.rs
@@ -19,29 +19,23 @@
 //! Autogenerated weights for `pallet_omnipool_liquidity_mining`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
-//! DATE: 2024-09-18, STEPS: `50`, REPEAT: `20`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-09-19, 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`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
 
 // Executed Command:
-// ./target/release/hydradx
+// target/release/hydradx
 // benchmark
 // pallet
+// --chain=dev
+// --steps=50
+// --repeat=20
 // --wasm-execution=compiled
-// --pallet
-// pallet_omnipool_liquidity_mining
-// --extrinsic
-// *
-// --heap-pages
-// 4096
-// --steps
-// 50
-// --repeat
-// 20
+// --pallet=pallet-omnipool-liquidity-mining
+// --extrinsic=*
 // --template=scripts/pallet-weight-template.hbs
-// --output
-// ol.rs
+// --output=./weights/pallet_omnipool_liquidity_mining.rs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -71,8 +65,8 @@ impl<T: frame_system::Config> pallet_omnipool_liquidity_mining::WeightInfo for H
 		// Proof Size summary in bytes:
 		//  Measured:  `557`
 		//  Estimated: `6196`
-		// Minimum execution time: 83_911_000 picoseconds.
-		Weight::from_parts(84_650_000, 6196)
+		// Minimum execution time: 80_879_000 picoseconds.
+		Weight::from_parts(81_849_000, 6196)
 			.saturating_add(T::DbWeight::get().reads(5_u64))
 			.saturating_add(T::DbWeight::get().writes(5_u64))
 	}
@@ -84,8 +78,8 @@ impl<T: frame_system::Config> pallet_omnipool_liquidity_mining::WeightInfo for H
 		// Proof Size summary in bytes:
 		//  Measured:  `573`
 		//  Estimated: `3670`
-		// Minimum execution time: 22_855_000 picoseconds.
-		Weight::from_parts(23_088_000, 3670)
+		// Minimum execution time: 22_272_000 picoseconds.
+		Weight::from_parts(22_662_000, 3670)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -99,8 +93,8 @@ impl<T: frame_system::Config> pallet_omnipool_liquidity_mining::WeightInfo for H
 		// Proof Size summary in bytes:
 		//  Measured:  `964`
 		//  Estimated: `6196`
-		// Minimum execution time: 82_043_000 picoseconds.
-		Weight::from_parts(82_866_000, 6196)
+		// Minimum execution time: 79_877_000 picoseconds.
+		Weight::from_parts(80_351_000, 6196)
 			.saturating_add(T::DbWeight::get().reads(4_u64))
 			.saturating_add(T::DbWeight::get().writes(4_u64))
 	}
@@ -124,8 +118,8 @@ impl<T: frame_system::Config> pallet_omnipool_liquidity_mining::WeightInfo for H
 		// Proof Size summary in bytes:
 		//  Measured:  `2337`
 		//  Estimated: `6294`
-		// Minimum execution time: 126_484_000 picoseconds.
-		Weight::from_parts(127_302_000, 6294)
+		// Minimum execution time: 123_991_000 picoseconds.
+		Weight::from_parts(125_177_000, 6294)
 			.saturating_add(T::DbWeight::get().reads(9_u64))
 			.saturating_add(T::DbWeight::get().writes(6_u64))
 	}
@@ -147,8 +141,8 @@ impl<T: frame_system::Config> pallet_omnipool_liquidity_mining::WeightInfo for H
 		// Proof Size summary in bytes:
 		//  Measured:  `2507`
 		//  Estimated: `6294`
-		// Minimum execution time: 129_979_000 picoseconds.
-		Weight::from_parts(130_956_000, 6294)
+		// Minimum execution time: 127_115_000 picoseconds.
+		Weight::from_parts(128_119_000, 6294)
 			.saturating_add(T::DbWeight::get().reads(9_u64))
 			.saturating_add(T::DbWeight::get().writes(4_u64))
 	}
@@ -168,8 +162,8 @@ impl<T: frame_system::Config> pallet_omnipool_liquidity_mining::WeightInfo for H
 		// Proof Size summary in bytes:
 		//  Measured:  `2146`
 		//  Estimated: `6294`
-		// Minimum execution time: 124_701_000 picoseconds.
-		Weight::from_parts(125_711_000, 6294)
+		// Minimum execution time: 121_664_000 picoseconds.
+		Weight::from_parts(122_411_000, 6294)
 			.saturating_add(T::DbWeight::get().reads(8_u64))
 			.saturating_add(T::DbWeight::get().writes(5_u64))
 	}
@@ -191,8 +185,8 @@ impl<T: frame_system::Config> pallet_omnipool_liquidity_mining::WeightInfo for H
 		// Proof Size summary in bytes:
 		//  Measured:  `2543`
 		//  Estimated: `6294`
-		// Minimum execution time: 127_337_000 picoseconds.
-		Weight::from_parts(128_237_000, 6294)
+		// Minimum execution time: 125_411_000 picoseconds.
+		Weight::from_parts(126_409_000, 6294)
 			.saturating_add(T::DbWeight::get().reads(9_u64))
 			.saturating_add(T::DbWeight::get().writes(5_u64))
 	}
@@ -208,8 +202,8 @@ impl<T: frame_system::Config> pallet_omnipool_liquidity_mining::WeightInfo for H
 		// Proof Size summary in bytes:
 		//  Measured:  `924`
 		//  Estimated: `6196`
-		// Minimum execution time: 77_685_000 picoseconds.
-		Weight::from_parts(78_427_000, 6196)
+		// Minimum execution time: 75_744_000 picoseconds.
+		Weight::from_parts(76_652_000, 6196)
 			.saturating_add(T::DbWeight::get().reads(5_u64))
 			.saturating_add(T::DbWeight::get().writes(4_u64))
 	}
@@ -247,8 +241,8 @@ impl<T: frame_system::Config> pallet_omnipool_liquidity_mining::WeightInfo for H
 		// Proof Size summary in bytes:
 		//  Measured:  `4072`
 		//  Estimated: `11598`
-		// Minimum execution time: 213_332_000 picoseconds.
-		Weight::from_parts(215_220_000, 11598)
+		// Minimum execution time: 208_598_000 picoseconds.
+		Weight::from_parts(210_852_000, 11598)
 			.saturating_add(T::DbWeight::get().reads(17_u64))
 			.saturating_add(T::DbWeight::get().writes(14_u64))
 	}
@@ -276,8 +270,8 @@ impl<T: frame_system::Config> pallet_omnipool_liquidity_mining::WeightInfo for H
 		// Proof Size summary in bytes:
 		//  Measured:  `4381`
 		//  Estimated: `11598`
-		// Minimum execution time: 177_225_000 picoseconds.
-		Weight::from_parts(178_486_000, 11598)
+		// Minimum execution time: 174_272_000 picoseconds.
+		Weight::from_parts(175_291_000, 11598)
 			.saturating_add(T::DbWeight::get().reads(15_u64))
 			.saturating_add(T::DbWeight::get().writes(5_u64))
 	}
@@ -299,8 +293,8 @@ impl<T: frame_system::Config> pallet_omnipool_liquidity_mining::WeightInfo for H
 		// Proof Size summary in bytes:
 		//  Measured:  `2946`
 		//  Estimated: `8799`
-		// Minimum execution time: 176_191_000 picoseconds.
-		Weight::from_parts(177_601_000, 8799)
+		// Minimum execution time: 171_370_000 picoseconds.
+		Weight::from_parts(172_314_000, 8799)
 			.saturating_add(T::DbWeight::get().reads(10_u64))
 			.saturating_add(T::DbWeight::get().writes(6_u64))
 	}
@@ -332,8 +326,8 @@ impl<T: frame_system::Config> pallet_omnipool_liquidity_mining::WeightInfo for H
 		// Proof Size summary in bytes:
 		//  Measured:  `3940`
 		//  Estimated: `8799`
-		// Minimum execution time: 260_267_000 picoseconds.
-		Weight::from_parts(263_572_000, 8799)
+		// Minimum execution time: 255_448_000 picoseconds.
+		Weight::from_parts(257_109_000, 8799)
 			.saturating_add(T::DbWeight::get().reads(15_u64))
 			.saturating_add(T::DbWeight::get().writes(15_u64))
 	}
diff --git a/runtime/hydradx/src/weights/pallet_otc.rs b/runtime/hydradx/src/weights/pallet_otc.rs
index 722bc4702..4159772bc 100644
--- a/runtime/hydradx/src/weights/pallet_otc.rs
+++ b/runtime/hydradx/src/weights/pallet_otc.rs
@@ -19,7 +19,7 @@
 //! Autogenerated weights for `pallet_otc`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
-//! DATE: 2024-07-12, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-09-10, 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`
@@ -29,14 +29,13 @@
 // benchmark
 // pallet
 // --chain=dev
-// --steps=10
-// --repeat=30
+// --steps=50
+// --repeat=20
 // --wasm-execution=compiled
-// --heap-pages=4096
-// --template=scripts/pallet-weight-template.hbs
 // --pallet=pallet-otc
-// --output=weights/otc.rs
 // --extrinsic=*
+// --template=scripts/pallet-weight-template.hbs
+// --output=./weights/pallet_otc.rs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -66,8 +65,8 @@ impl<T: frame_system::Config> pallet_otc::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `963`
 		//  Estimated: `6190`
-		// Minimum execution time: 46_746_000 picoseconds.
-		Weight::from_parts(47_337_000, 6190)
+		// Minimum execution time: 46_446_000 picoseconds.
+		Weight::from_parts(47_816_000, 6190)
 			.saturating_add(T::DbWeight::get().reads(5_u64))
 			.saturating_add(T::DbWeight::get().writes(4_u64))
 	}
@@ -75,6 +74,8 @@ impl<T: frame_system::Config> pallet_otc::WeightInfo for HydraWeight<T> {
 	/// 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(125), added: 2600, mode: `MaxEncodedLen`)
+	/// Storage: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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)
@@ -91,15 +92,17 @@ impl<T: frame_system::Config> pallet_otc::WeightInfo for HydraWeight<T> {
 	/// Proof: `MultiTransactionPayment::AcceptedCurrencies` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
 	fn partial_fill_order() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2228`
+		//  Measured:  `2436`
 		//  Estimated: `13905`
-		// Minimum execution time: 164_109_000 picoseconds.
-		Weight::from_parts(164_977_000, 13905)
-			.saturating_add(T::DbWeight::get().reads(18_u64))
+		// Minimum execution time: 165_029_000 picoseconds.
+		Weight::from_parts(166_577_000, 13905)
+			.saturating_add(T::DbWeight::get().reads(19_u64))
 			.saturating_add(T::DbWeight::get().writes(8_u64))
 	}
 	/// Storage: `OTC::Orders` (r:1 w:1)
 	/// Proof: `OTC::Orders` (`max_values`: None, `max_size`: Some(93), added: 2568, mode: `MaxEncodedLen`)
+	/// Storage: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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)
@@ -118,11 +121,11 @@ impl<T: frame_system::Config> pallet_otc::WeightInfo for HydraWeight<T> {
 	/// Proof: `MultiTransactionPayment::AcceptedCurrencies` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
 	fn fill_order() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `2228`
+		//  Measured:  `2436`
 		//  Estimated: `13905`
-		// Minimum execution time: 159_500_000 picoseconds.
-		Weight::from_parts(161_112_000, 13905)
-			.saturating_add(T::DbWeight::get().reads(18_u64))
+		// Minimum execution time: 161_252_000 picoseconds.
+		Weight::from_parts(162_540_000, 13905)
+			.saturating_add(T::DbWeight::get().reads(19_u64))
 			.saturating_add(T::DbWeight::get().writes(8_u64))
 	}
 	/// Storage: `OTC::Orders` (r:1 w:1)
@@ -137,8 +140,8 @@ impl<T: frame_system::Config> pallet_otc::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `1197`
 		//  Estimated: `4726`
-		// Minimum execution time: 42_224_000 picoseconds.
-		Weight::from_parts(42_776_000, 4726)
+		// Minimum execution time: 42_576_000 picoseconds.
+		Weight::from_parts(42_962_000, 4726)
 			.saturating_add(T::DbWeight::get().reads(4_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
diff --git a/runtime/hydradx/src/weights/pallet_otc_settlements.rs b/runtime/hydradx/src/weights/pallet_otc_settlements.rs
index f0a613d50..510edd4a0 100644
--- a/runtime/hydradx/src/weights/pallet_otc_settlements.rs
+++ b/runtime/hydradx/src/weights/pallet_otc_settlements.rs
@@ -19,7 +19,7 @@
 //! Autogenerated weights for `pallet_otc_settlements`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
-//! DATE: 2024-07-12, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-09-11, 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`
@@ -29,14 +29,13 @@
 // benchmark
 // pallet
 // --chain=dev
-// --steps=10
-// --repeat=30
+// --steps=50
+// --repeat=20
 // --wasm-execution=compiled
-// --heap-pages=4096
-// --template=scripts/pallet-weight-template.hbs
 // --pallet=pallet-otc-settlements
-// --output=weights/otc-settlements.rs
 // --extrinsic=*
+// --template=scripts/pallet-weight-template.hbs
+// --output=./weights/pallet_otc_settlements.rs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -46,11 +45,9 @@
 use frame_support::{traits::Get, weights::Weight};
 use core::marker::PhantomData;
 
-use pallet_otc_settlements::weights::WeightInfo;
-
-/// Weight functions for `pallet_otc`.
+/// Weights for `pallet_otc_settlements` 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_settlements::weights::WeightInfo for HydraWeight<T> {
 	/// Storage: `OTC::Orders` (r:1 w:0)
 	/// Proof: `OTC::Orders` (`max_values`: None, `max_size`: Some(93), added: 2568, mode: `MaxEncodedLen`)
 	/// Storage: `System::Account` (r:2 w:1)
@@ -61,9 +58,9 @@ impl<T: frame_system::Config> WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `747`
 		//  Estimated: `6196`
-		// Minimum execution time: 97_577_000 picoseconds.
-		Weight::from_parts(98_741_000, 6196)
+		// Minimum execution time: 101_333_000 picoseconds.
+		Weight::from_parts(102_441_000, 6196)
 			.saturating_add(T::DbWeight::get().reads(4_u64))
 			.saturating_add(T::DbWeight::get().writes(1_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
index cc8aee33e..4904e0d14 100644
--- a/runtime/hydradx/src/weights/pallet_preimage.rs
+++ b/runtime/hydradx/src/weights/pallet_preimage.rs
@@ -19,29 +19,23 @@
 //! 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: `[]`
+//! DATE: 2024-09-10, 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`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
 
 // Executed Command:
-// ./target/release/hydradx
+// target/release/hydradx
 // benchmark
 // pallet
+// --chain=dev
+// --steps=50
+// --repeat=20
 // --wasm-execution=compiled
-// --pallet
-// *
-// --extrinsic
-// *
-// --heap-pages
-// 4096
-// --steps
-// 50
-// --repeat
-// 20
+// --pallet=pallet-preimage
+// --extrinsic=*
 // --template=scripts/pallet-weight-template.hbs
-// --output
-// weights/
+// --output=./weights/pallet_preimage.rs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -60,7 +54,9 @@ 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`)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Holds` (r:1 w:1)
+	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(85), added: 2560, 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]`.
@@ -68,17 +64,17 @@ impl<T: frame_system::Config> pallet_preimage::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `109`
 		//  Estimated: `3556`
-		// Minimum execution time: 18_738_000 picoseconds.
-		Weight::from_parts(18_982_000, 3556)
+		// Minimum execution time: 57_263_000 picoseconds.
+		Weight::from_parts(57_678_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))
+			.saturating_add(Weight::from_parts(2_020, 0).saturating_mul(s.into()))
+			.saturating_add(T::DbWeight::get().reads(3_u64))
+			.saturating_add(T::DbWeight::get().writes(3_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`)
+	/// Proof: `Preimage::RequestStatusFor` (`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]`.
@@ -86,17 +82,17 @@ impl<T: frame_system::Config> pallet_preimage::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `173`
 		//  Estimated: `3556`
-		// Minimum execution time: 20_168_000 picoseconds.
-		Weight::from_parts(20_415_000, 3556)
+		// Minimum execution time: 20_468_000 picoseconds.
+		Weight::from_parts(20_650_000, 3556)
 			// Standard Error: 1
-			.saturating_add(Weight::from_parts(1_985, 0).saturating_mul(s.into()))
+			.saturating_add(Weight::from_parts(2_016, 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`)
+	/// Proof: `Preimage::RequestStatusFor` (`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]`.
@@ -104,133 +100,135 @@ impl<T: frame_system::Config> pallet_preimage::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `173`
 		//  Estimated: `3556`
-		// Minimum execution time: 19_009_000 picoseconds.
-		Weight::from_parts(19_256_000, 3556)
+		// Minimum execution time: 18_957_000 picoseconds.
+		Weight::from_parts(19_168_000, 3556)
 			// Standard Error: 1
-			.saturating_add(Weight::from_parts(1_994, 0).saturating_mul(s.into()))
+			.saturating_add(Weight::from_parts(2_021, 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`)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`)
+	/// Storage: `Balances::Holds` (r:1 w:1)
+	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(85), added: 2560, 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`
+		//  Measured:  `310`
 		//  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))
+		// Minimum execution time: 64_098_000 picoseconds.
+		Weight::from_parts(65_017_000, 3556)
+			.saturating_add(T::DbWeight::get().reads(3_u64))
+			.saturating_add(T::DbWeight::get().writes(3_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`)
+	/// Proof: `Preimage::RequestStatusFor` (`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: 28_722_000 picoseconds.
-		Weight::from_parts(29_613_000, 3556)
+		// Minimum execution time: 30_224_000 picoseconds.
+		Weight::from_parts(31_592_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`)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, mode: `MaxEncodedLen`)
 	fn request_preimage() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `239`
+		//  Measured:  `255`
 		//  Estimated: `3556`
-		// Minimum execution time: 24_756_000 picoseconds.
-		Weight::from_parts(25_638_000, 3556)
+		// Minimum execution time: 25_991_000 picoseconds.
+		Weight::from_parts(27_000_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`)
+	/// Proof: `Preimage::RequestStatusFor` (`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: 16_915_000 picoseconds.
-		Weight::from_parts(17_589_000, 3556)
+		// Minimum execution time: 18_283_000 picoseconds.
+		Weight::from_parts(19_097_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`)
+	/// Proof: `Preimage::RequestStatusFor` (`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: 15_906_000 picoseconds.
-		Weight::from_parts(16_554_000, 3556)
+		// Minimum execution time: 16_538_000 picoseconds.
+		Weight::from_parts(17_110_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`)
+	/// Proof: `Preimage::RequestStatusFor` (`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_522_000 picoseconds.
-		Weight::from_parts(12_867_000, 3556)
+		// Minimum execution time: 12_458_000 picoseconds.
+		Weight::from_parts(12_860_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`)
+	/// Proof: `Preimage::RequestStatusFor` (`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: 26_228_000 picoseconds.
-		Weight::from_parts(26_977_000, 3556)
+		// Minimum execution time: 26_722_000 picoseconds.
+		Weight::from_parts(27_867_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`)
+	/// Proof: `Preimage::RequestStatusFor` (`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_831_000, 3556)
+		// Minimum execution time: 12_521_000 picoseconds.
+		Weight::from_parts(12_863_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`)
+	/// Proof: `Preimage::RequestStatusFor` (`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_446_000 picoseconds.
-		Weight::from_parts(12_729_000, 3556)
+		// Minimum execution time: 12_599_000 picoseconds.
+		Weight::from_parts(12_829_000, 3556)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -238,19 +236,21 @@ impl<T: frame_system::Config> pallet_preimage::WeightInfo for HydraWeight<T> {
 	/// 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: `Balances::Holds` (r:1023 w:1023)
+	/// Proof: `Balances::Holds` (`max_values`: None, `max_size`: Some(85), added: 2560, mode: `MaxEncodedLen`)
 	/// Storage: `Preimage::RequestStatusFor` (r:0 w:1023)
-	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(75), added: 2550, mode: `MaxEncodedLen`)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, 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())))
+		// Minimum execution time: 63_331_000 picoseconds.
+		Weight::from_parts(63_778_000, 990)
+			// Standard Error: 30_315
+			.saturating_add(Weight::from_parts(58_611_389, 0).saturating_mul(n.into()))
+			.saturating_add(T::DbWeight::get().reads((3_u64).saturating_mul(n.into())))
+			.saturating_add(T::DbWeight::get().writes((4_u64).saturating_mul(n.into())))
 			.saturating_add(Weight::from_parts(0, 2603).saturating_mul(n.into()))
 	}
 }
\ No newline at end of file
diff --git a/runtime/hydradx/src/weights/pallet_proxy.rs b/runtime/hydradx/src/weights/pallet_proxy.rs
index cce1c1d76..3bb2f8c5d 100644
--- a/runtime/hydradx/src/weights/pallet_proxy.rs
+++ b/runtime/hydradx/src/weights/pallet_proxy.rs
@@ -19,29 +19,23 @@
 //! Autogenerated weights for `pallet_proxy`
 //!
 //! 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: `[]`
+//! DATE: 2024-09-10, 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`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
 
 // Executed Command:
-// ./target/release/hydradx
+// target/release/hydradx
 // benchmark
 // pallet
+// --chain=dev
+// --steps=50
+// --repeat=20
 // --wasm-execution=compiled
-// --pallet
-// *
-// --extrinsic
-// *
-// --heap-pages
-// 4096
-// --steps
-// 50
-// --repeat
-// 20
+// --pallet=pallet-proxy
+// --extrinsic=*
 // --template=scripts/pallet-weight-template.hbs
-// --output
-// weights/
+// --output=./weights/pallet_proxy.rs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -64,10 +58,10 @@ 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: 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()))
+		// Minimum execution time: 18_116_000 picoseconds.
+		Weight::from_parts(18_572_854, 4706)
+			// Standard Error: 773
+			.saturating_add(Weight::from_parts(38_263, 0).saturating_mul(p.into()))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 	}
 	/// Storage: `Proxy::Proxies` (r:1 w:0)
@@ -82,12 +76,12 @@ 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: 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()))
+		// Minimum execution time: 41_327_000 picoseconds.
+		Weight::from_parts(41_420_615, 5698)
+			// Standard Error: 1_508
+			.saturating_add(Weight::from_parts(163_852, 0).saturating_mul(a.into()))
+			// Standard Error: 1_558
+			.saturating_add(Weight::from_parts(29_950, 0).saturating_mul(p.into()))
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -97,14 +91,16 @@ impl<T: frame_system::Config> pallet_proxy::WeightInfo for HydraWeight<T> {
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	/// The range of component `a` is `[0, 31]`.
 	/// The range of component `p` is `[1, 31]`.
-	fn remove_announcement(a: u32, _p: u32, ) -> Weight {
+	fn remove_announcement(a: u32, p: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `535 + a * (68 ±0)`
 		//  Estimated: `5698`
-		// 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()))
+		// Minimum execution time: 28_413_000 picoseconds.
+		Weight::from_parts(28_943_470, 5698)
+			// Standard Error: 1_307
+			.saturating_add(Weight::from_parts(158_692, 0).saturating_mul(a.into()))
+			// Standard Error: 1_350
+			.saturating_add(Weight::from_parts(1_469, 0).saturating_mul(p.into()))
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -118,10 +114,10 @@ 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: 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()))
+		// Minimum execution time: 28_238_000 picoseconds.
+		Weight::from_parts(29_204_634, 5698)
+			// Standard Error: 1_258
+			.saturating_add(Weight::from_parts(155_827, 0).saturating_mul(a.into()))
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -137,12 +133,12 @@ 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: 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()))
+		// Minimum execution time: 37_041_000 picoseconds.
+		Weight::from_parts(36_712_843, 5698)
+			// Standard Error: 1_183
+			.saturating_add(Weight::from_parts(164_464, 0).saturating_mul(a.into()))
+			// Standard Error: 1_222
+			.saturating_add(Weight::from_parts(32_030, 0).saturating_mul(p.into()))
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -153,10 +149,10 @@ 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: 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()))
+		// Minimum execution time: 27_337_000 picoseconds.
+		Weight::from_parts(27_834_770, 4706)
+			// Standard Error: 917
+			.saturating_add(Weight::from_parts(48_479, 0).saturating_mul(p.into()))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -167,10 +163,10 @@ 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: 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()))
+		// Minimum execution time: 27_374_000 picoseconds.
+		Weight::from_parts(28_238_749, 4706)
+			// Standard Error: 1_968
+			.saturating_add(Weight::from_parts(44_077, 0).saturating_mul(p.into()))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -181,10 +177,10 @@ 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: 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()))
+		// Minimum execution time: 26_435_000 picoseconds.
+		Weight::from_parts(27_094_909, 4706)
+			// Standard Error: 1_301
+			.saturating_add(Weight::from_parts(40_033, 0).saturating_mul(p.into()))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -195,10 +191,10 @@ impl<T: frame_system::Config> pallet_proxy::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `305`
 		//  Estimated: `4706`
-		// 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()))
+		// Minimum execution time: 29_659_000 picoseconds.
+		Weight::from_parts(30_223_367, 4706)
+			// Standard Error: 894
+			.saturating_add(Weight::from_parts(12_705, 0).saturating_mul(p.into()))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -209,10 +205,10 @@ 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: 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()))
+		// Minimum execution time: 27_577_000 picoseconds.
+		Weight::from_parts(28_124_008, 4706)
+			// Standard Error: 912
+			.saturating_add(Weight::from_parts(37_989, 0).saturating_mul(p.into()))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
diff --git a/runtime/hydradx/src/weights/pallet_referrals.rs b/runtime/hydradx/src/weights/pallet_referrals.rs
index 703c9c2fb..6ca82ab4c 100644
--- a/runtime/hydradx/src/weights/pallet_referrals.rs
+++ b/runtime/hydradx/src/weights/pallet_referrals.rs
@@ -19,29 +19,23 @@
 //! Autogenerated weights for `pallet_referrals`
 //!
 //! 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: `[]`
+//! DATE: 2024-09-10, 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`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
 
 // Executed Command:
-// ./target/release/hydradx
+// target/release/hydradx
 // benchmark
 // pallet
+// --chain=dev
+// --steps=50
+// --repeat=20
 // --wasm-execution=compiled
-// --pallet
-// *
-// --extrinsic
-// *
-// --heap-pages
-// 4096
-// --steps
-// 50
-// --repeat
-// 20
+// --pallet=pallet-referrals
+// --extrinsic=*
 // --template=scripts/pallet-weight-template.hbs
-// --output
-// weights/
+// --output=./weights/pallet_referrals.rs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -69,8 +63,8 @@ impl<T: frame_system::Config> pallet_referrals::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `318`
 		//  Estimated: `6196`
-		// Minimum execution time: 58_712_000 picoseconds.
-		Weight::from_parts(59_464_000, 6196)
+		// Minimum execution time: 59_104_000 picoseconds.
+		Weight::from_parts(59_872_000, 6196)
 			.saturating_add(T::DbWeight::get().reads(4_u64))
 			.saturating_add(T::DbWeight::get().writes(5_u64))
 	}
@@ -82,8 +76,8 @@ impl<T: frame_system::Config> pallet_referrals::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `228`
 		//  Estimated: `3545`
-		// Minimum execution time: 17_123_000 picoseconds.
-		Weight::from_parts(17_546_000, 3545)
+		// Minimum execution time: 17_219_000 picoseconds.
+		Weight::from_parts(17_478_000, 3545)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -99,6 +93,8 @@ impl<T: frame_system::Config> pallet_referrals::WeightInfo for HydraWeight<T> {
 	/// 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: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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)
@@ -127,11 +123,11 @@ impl<T: frame_system::Config> pallet_referrals::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:  `2226`
+		//  Measured:  `2434`
 		//  Estimated: `8790`
-		// Minimum execution time: 263_297_000 picoseconds.
-		Weight::from_parts(264_892_000, 8790)
-			.saturating_add(T::DbWeight::get().reads(27_u64))
+		// Minimum execution time: 267_679_000 picoseconds.
+		Weight::from_parts(269_271_000, 8790)
+			.saturating_add(T::DbWeight::get().reads(28_u64))
 			.saturating_add(T::DbWeight::get().writes(15_u64))
 	}
 	/// Storage: `Referrals::PendingConversions` (r:1 w:0)
@@ -150,8 +146,8 @@ impl<T: frame_system::Config> pallet_referrals::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `689`
 		//  Estimated: `6196`
-		// Minimum execution time: 77_361_000 picoseconds.
-		Weight::from_parts(78_136_000, 6196)
+		// Minimum execution time: 78_198_000 picoseconds.
+		Weight::from_parts(78_998_000, 6196)
 			.saturating_add(T::DbWeight::get().reads(7_u64))
 			.saturating_add(T::DbWeight::get().writes(6_u64))
 	}
@@ -161,8 +157,8 @@ impl<T: frame_system::Config> pallet_referrals::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `76`
 		//  Estimated: `3514`
-		// Minimum execution time: 11_771_000 picoseconds.
-		Weight::from_parts(11_990_000, 3514)
+		// Minimum execution time: 11_391_000 picoseconds.
+		Weight::from_parts(11_668_000, 3514)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
diff --git a/runtime/hydradx/src/weights/pallet_route_executor.rs b/runtime/hydradx/src/weights/pallet_route_executor.rs
index 0d8ff8b0d..2aaa06528 100644
--- a/runtime/hydradx/src/weights/pallet_route_executor.rs
+++ b/runtime/hydradx/src/weights/pallet_route_executor.rs
@@ -19,7 +19,7 @@
 //! Autogenerated weights for `pallet_route_executor`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
-//! DATE: 2024-07-25, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-09-11, 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`
@@ -29,14 +29,13 @@
 // benchmark
 // pallet
 // --chain=dev
-// --steps=10
-// --repeat=30
+// --steps=50
+// --repeat=20
 // --wasm-execution=compiled
-// --heap-pages=4096
-// --template=scripts/pallet-weight-template.hbs
 // --pallet=pallet-route-executor
-// --output=router.rs
 // --extrinsic=*
+// --template=scripts/pallet-weight-template.hbs
+// --output=./weights/pallet_route_executor.rs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -60,8 +59,8 @@ impl<T: frame_system::Config> pallet_route_executor::WeightInfo for HydraWeight<
 		// Proof Size summary in bytes:
 		//  Measured:  `944`
 		//  Estimated: `3590`
-		// Minimum execution time: 13_700_000 picoseconds.
-		Weight::from_parts(13_874_000, 3590)
+		// Minimum execution time: 14_078_000 picoseconds.
+		Weight::from_parts(14_311_000, 3590)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -86,10 +85,10 @@ impl<T: frame_system::Config> pallet_route_executor::WeightInfo for HydraWeight<
 		// Proof Size summary in bytes:
 		//  Measured:  `3743`
 		//  Estimated: `13905`
-		// Minimum execution time: 352_057_000 picoseconds.
-		Weight::from_parts(358_601_823, 13905)
-			// Standard Error: 319_985
-			.saturating_add(Weight::from_parts(70_948_801, 0).saturating_mul(c.into()))
+		// Minimum execution time: 358_498_000 picoseconds.
+		Weight::from_parts(363_434_920, 13905)
+			// Standard Error: 527_071
+			.saturating_add(Weight::from_parts(73_831_579, 0).saturating_mul(c.into()))
 			.saturating_add(T::DbWeight::get().reads(17_u64))
 			.saturating_add(T::DbWeight::get().writes(8_u64))
 	}
@@ -114,13 +113,13 @@ impl<T: frame_system::Config> pallet_route_executor::WeightInfo for HydraWeight<
 	fn calculate_and_execute_buy_in_lbp(c: u32, b: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `1637 + b * (2131 ±0)`
-		//  Estimated: `6156 + b * (7749 ±245_709_589_663_843_264)`
-		// Minimum execution time: 94_752_000 picoseconds.
-		Weight::from_parts(96_589_000, 6156)
-			// Standard Error: 840_786
-			.saturating_add(Weight::from_parts(3_341_044, 0).saturating_mul(c.into()))
-			// Standard Error: 1_845_765
-			.saturating_add(Weight::from_parts(271_881_978, 0).saturating_mul(b.into()))
+		//  Estimated: `8799 + b * (7749 ±0)`
+		// Minimum execution time: 97_161_000 picoseconds.
+		Weight::from_parts(98_156_000, 8799)
+			// Standard Error: 243_998
+			.saturating_add(Weight::from_parts(1_011_059, 0).saturating_mul(c.into()))
+			// Standard Error: 543_453
+			.saturating_add(Weight::from_parts(269_812_210, 0).saturating_mul(b.into()))
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 			.saturating_add(T::DbWeight::get().reads((14_u64).saturating_mul(b.into())))
 			.saturating_add(T::DbWeight::get().writes((8_u64).saturating_mul(b.into())))
@@ -156,8 +155,8 @@ impl<T: frame_system::Config> pallet_route_executor::WeightInfo for HydraWeight<
 		// Proof Size summary in bytes:
 		//  Measured:  `7004`
 		//  Estimated: `39735`
-		// Minimum execution time: 1_946_884_000 picoseconds.
-		Weight::from_parts(1_957_705_000, 39735)
+		// Minimum execution time: 1_934_148_000 picoseconds.
+		Weight::from_parts(1_942_875_000, 39735)
 			.saturating_add(T::DbWeight::get().reads(58_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -167,8 +166,8 @@ impl<T: frame_system::Config> pallet_route_executor::WeightInfo for HydraWeight<
 		// Proof Size summary in bytes:
 		//  Measured:  `1012`
 		//  Estimated: `0`
-		// Minimum execution time: 25_748_000 picoseconds.
-		Weight::from_parts(26_215_000, 0)
+		// Minimum execution time: 25_655_000 picoseconds.
+		Weight::from_parts(26_130_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	/// Storage: `Router::Routes` (r:1 w:0)
@@ -177,8 +176,8 @@ impl<T: frame_system::Config> pallet_route_executor::WeightInfo for HydraWeight<
 		// Proof Size summary in bytes:
 		//  Measured:  `800`
 		//  Estimated: `3555`
-		// Minimum execution time: 7_522_000 picoseconds.
-		Weight::from_parts(7_689_000, 3555)
+		// Minimum execution time: 7_524_000 picoseconds.
+		Weight::from_parts(7_759_000, 3555)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 	}
 	/// Storage: `EmaOracle::Oracles` (r:2 w:0)
@@ -187,8 +186,8 @@ impl<T: frame_system::Config> pallet_route_executor::WeightInfo for HydraWeight<
 		// Proof Size summary in bytes:
 		//  Measured:  `1452`
 		//  Estimated: `6294`
-		// Minimum execution time: 26_571_000 picoseconds.
-		Weight::from_parts(27_038_000, 6294)
+		// Minimum execution time: 26_686_000 picoseconds.
+		Weight::from_parts(26_929_000, 6294)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 	}
 	/// Storage: `EmaOracle::Oracles` (r:4 w:0)
@@ -197,8 +196,8 @@ impl<T: frame_system::Config> pallet_route_executor::WeightInfo for HydraWeight<
 		// Proof Size summary in bytes:
 		//  Measured:  `1814`
 		//  Estimated: `11598`
-		// Minimum execution time: 40_728_000 picoseconds.
-		Weight::from_parts(41_338_000, 11598)
+		// Minimum execution time: 40_799_000 picoseconds.
+		Weight::from_parts(41_526_000, 11598)
 			.saturating_add(T::DbWeight::get().reads(4_u64))
 	}
 	/// Storage: `LBP::PoolData` (r:1 w:0)
@@ -211,8 +210,8 @@ impl<T: frame_system::Config> pallet_route_executor::WeightInfo for HydraWeight<
 		// Proof Size summary in bytes:
 		//  Measured:  `1674`
 		//  Estimated: `6156`
-		// Minimum execution time: 35_793_000 picoseconds.
-		Weight::from_parts(36_285_000, 6156)
+		// Minimum execution time: 36_673_000 picoseconds.
+		Weight::from_parts(37_031_000, 6156)
 			.saturating_add(T::DbWeight::get().reads(4_u64))
 	}
 }
\ No newline at end of file
diff --git a/runtime/hydradx/src/weights/pallet_scheduler.rs b/runtime/hydradx/src/weights/pallet_scheduler.rs
index ba8d895fc..9ac6d9ea1 100644
--- a/runtime/hydradx/src/weights/pallet_scheduler.rs
+++ b/runtime/hydradx/src/weights/pallet_scheduler.rs
@@ -19,29 +19,23 @@
 //! Autogenerated weights for `pallet_scheduler`
 //!
 //! 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: `[]`
+//! DATE: 2024-09-10, 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`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
 
 // Executed Command:
-// ./target/release/hydradx
+// target/release/hydradx
 // benchmark
 // pallet
+// --chain=dev
+// --steps=50
+// --repeat=20
 // --wasm-execution=compiled
-// --pallet
-// *
-// --extrinsic
-// *
-// --heap-pages
-// 4096
-// --steps
-// 50
-// --repeat
-// 20
+// --pallet=pallet-scheduler
+// --extrinsic=*
 // --template=scripts/pallet-weight-template.hbs
-// --output
-// weights/
+// --output=./weights/pallet_scheduler.rs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -63,8 +57,8 @@ impl<T: frame_system::Config> pallet_scheduler::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `31`
 		//  Estimated: `1489`
-		// Minimum execution time: 3_113_000 picoseconds.
-		Weight::from_parts(3_195_000, 1489)
+		// Minimum execution time: 2_988_000 picoseconds.
+		Weight::from_parts(3_094_000, 1489)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -75,10 +69,10 @@ 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_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()))
+		// Minimum execution time: 4_456_000 picoseconds.
+		Weight::from_parts(8_469_334, 42428)
+			// Standard Error: 1_970
+			.saturating_add(Weight::from_parts(474_495, 0).saturating_mul(s.into()))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -86,24 +80,24 @@ impl<T: frame_system::Config> pallet_scheduler::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 4_444_000 picoseconds.
-		Weight::from_parts(4_628_000, 0)
+		// Minimum execution time: 4_529_000 picoseconds.
+		Weight::from_parts(4_600_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: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`)
+	/// Proof: `Preimage::RequestStatusFor` (`max_values`: None, `max_size`: Some(91), added: 2566, 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: `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()))
+		// Minimum execution time: 22_166_000 picoseconds.
+		Weight::from_parts(22_453_000, 3711)
+			// Standard Error: 11
+			.saturating_add(Weight::from_parts(1_208, 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()))
@@ -114,30 +108,30 @@ impl<T: frame_system::Config> pallet_scheduler::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 6_750_000 picoseconds.
-		Weight::from_parts(6_944_000, 0)
+		// Minimum execution time: 6_800_000 picoseconds.
+		Weight::from_parts(7_010_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: 4_487_000 picoseconds.
-		Weight::from_parts(4_588_000, 0)
+		// Minimum execution time: 4_461_000 picoseconds.
+		Weight::from_parts(4_624_000, 0)
 	}
 	fn execute_dispatch_signed() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 3_474_000 picoseconds.
-		Weight::from_parts(3_624_000, 0)
+		// Minimum execution time: 3_365_000 picoseconds.
+		Weight::from_parts(3_454_000, 0)
 	}
 	fn execute_dispatch_unsigned() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 3_330_000 picoseconds.
-		Weight::from_parts(3_439_000, 0)
+		// Minimum execution time: 3_335_000 picoseconds.
+		Weight::from_parts(3_461_000, 0)
 	}
 	/// Storage: `Scheduler::Agenda` (r:1 w:1)
 	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(38963), added: 41438, mode: `MaxEncodedLen`)
@@ -146,15 +140,17 @@ 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: 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()))
+		// Minimum execution time: 13_378_000 picoseconds.
+		Weight::from_parts(17_624_839, 42428)
+			// Standard Error: 2_016
+			.saturating_add(Weight::from_parts(479_532, 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`)
+	/// Storage: `Scheduler::Retries` (r:0 w:1)
+	/// Proof: `Scheduler::Retries` (`max_values`: None, `max_size`: Some(30), added: 2505, mode: `MaxEncodedLen`)
 	/// Storage: `Scheduler::Lookup` (r:0 w:1)
 	/// Proof: `Scheduler::Lookup` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
 	/// The range of component `s` is `[1, 50]`.
@@ -162,12 +158,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: 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()))
+		// Minimum execution time: 21_097_000 picoseconds.
+		Weight::from_parts(20_505_291, 42428)
+			// Standard Error: 966
+			.saturating_add(Weight::from_parts(745_843, 0).saturating_mul(s.into()))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
-			.saturating_add(T::DbWeight::get().writes(2_u64))
+			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
 	/// Storage: `Scheduler::Lookup` (r:1 w:1)
 	/// Proof: `Scheduler::Lookup` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
@@ -178,10 +174,10 @@ impl<T: frame_system::Config> pallet_scheduler::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `255 + s * (185 ±0)`
 		//  Estimated: `42428`
-		// 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()))
+		// Minimum execution time: 17_778_000 picoseconds.
+		Weight::from_parts(23_159_212, 42428)
+			// Standard Error: 3_005
+			.saturating_add(Weight::from_parts(504_556, 0).saturating_mul(s.into()))
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -189,16 +185,90 @@ impl<T: frame_system::Config> pallet_scheduler::WeightInfo for HydraWeight<T> {
 	/// Proof: `Scheduler::Lookup` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
 	/// Storage: `Scheduler::Agenda` (r:1 w:1)
 	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(38963), added: 41438, mode: `MaxEncodedLen`)
+	/// Storage: `Scheduler::Retries` (r:0 w:1)
+	/// Proof: `Scheduler::Retries` (`max_values`: None, `max_size`: Some(30), added: 2505, mode: `MaxEncodedLen`)
 	/// The range of component `s` is `[1, 50]`.
 	fn cancel_named(s: u32, ) -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `281 + s * (185 ±0)`
 		//  Estimated: `42428`
-		// 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()))
+		// Minimum execution time: 22_832_000 picoseconds.
+		Weight::from_parts(23_360_505, 42428)
+			// Standard Error: 1_500
+			.saturating_add(Weight::from_parts(763_333, 0).saturating_mul(s.into()))
 			.saturating_add(T::DbWeight::get().reads(2_u64))
+			.saturating_add(T::DbWeight::get().writes(3_u64))
+	}
+	/// Storage: `Scheduler::Agenda` (r:1 w:1)
+	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(38963), added: 41438, mode: `MaxEncodedLen`)
+	/// Storage: `Scheduler::Retries` (r:0 w:1)
+	/// Proof: `Scheduler::Retries` (`max_values`: None, `max_size`: Some(30), added: 2505, mode: `MaxEncodedLen`)
+	/// The range of component `s` is `[1, 50]`.
+	fn schedule_retry(s: u32, ) -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `118`
+		//  Estimated: `42428`
+		// Minimum execution time: 11_634_000 picoseconds.
+		Weight::from_parts(12_204_817, 42428)
+			// Standard Error: 430
+			.saturating_add(Weight::from_parts(22_212, 0).saturating_mul(s.into()))
+			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
+	/// Storage: `Scheduler::Agenda` (r:1 w:0)
+	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(38963), added: 41438, mode: `MaxEncodedLen`)
+	/// Storage: `Scheduler::Retries` (r:0 w:1)
+	/// Proof: `Scheduler::Retries` (`max_values`: None, `max_size`: Some(30), added: 2505, mode: `MaxEncodedLen`)
+	fn set_retry() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `8928`
+		//  Estimated: `42428`
+		// Minimum execution time: 32_456_000 picoseconds.
+		Weight::from_parts(33_288_000, 42428)
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
+	}
+	/// Storage: `Scheduler::Lookup` (r:1 w:0)
+	/// Proof: `Scheduler::Lookup` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
+	/// Storage: `Scheduler::Agenda` (r:1 w:0)
+	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(38963), added: 41438, mode: `MaxEncodedLen`)
+	/// Storage: `Scheduler::Retries` (r:0 w:1)
+	/// Proof: `Scheduler::Retries` (`max_values`: None, `max_size`: Some(30), added: 2505, mode: `MaxEncodedLen`)
+	fn set_retry_named() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `9606`
+		//  Estimated: `42428`
+		// Minimum execution time: 38_489_000 picoseconds.
+		Weight::from_parts(38_907_000, 42428)
+			.saturating_add(T::DbWeight::get().reads(2_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
+	}
+	/// Storage: `Scheduler::Agenda` (r:1 w:0)
+	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(38963), added: 41438, mode: `MaxEncodedLen`)
+	/// Storage: `Scheduler::Retries` (r:0 w:1)
+	/// Proof: `Scheduler::Retries` (`max_values`: None, `max_size`: Some(30), added: 2505, mode: `MaxEncodedLen`)
+	fn cancel_retry() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `8940`
+		//  Estimated: `42428`
+		// Minimum execution time: 31_489_000 picoseconds.
+		Weight::from_parts(32_042_000, 42428)
+			.saturating_add(T::DbWeight::get().reads(1_u64))
+			.saturating_add(T::DbWeight::get().writes(1_u64))
+	}
+	/// Storage: `Scheduler::Lookup` (r:1 w:0)
+	/// Proof: `Scheduler::Lookup` (`max_values`: None, `max_size`: Some(48), added: 2523, mode: `MaxEncodedLen`)
+	/// Storage: `Scheduler::Agenda` (r:1 w:0)
+	/// Proof: `Scheduler::Agenda` (`max_values`: None, `max_size`: Some(38963), added: 41438, mode: `MaxEncodedLen`)
+	/// Storage: `Scheduler::Retries` (r:0 w:1)
+	/// Proof: `Scheduler::Retries` (`max_values`: None, `max_size`: Some(30), added: 2505, mode: `MaxEncodedLen`)
+	fn cancel_retry_named() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `9618`
+		//  Estimated: `42428`
+		// Minimum execution time: 37_586_000 picoseconds.
+		Weight::from_parts(38_254_000, 42428)
+			.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/pallet_stableswap.rs b/runtime/hydradx/src/weights/pallet_stableswap.rs
index 9cbf2532a..b6ad669b2 100644
--- a/runtime/hydradx/src/weights/pallet_stableswap.rs
+++ b/runtime/hydradx/src/weights/pallet_stableswap.rs
@@ -19,7 +19,7 @@
 //! Autogenerated weights for `pallet_stableswap`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
-//! DATE: 2024-06-20, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-09-10, 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`
@@ -29,14 +29,13 @@
 // benchmark
 // pallet
 // --chain=dev
-// --steps=10
-// --repeat=30
+// --steps=50
+// --repeat=20
 // --wasm-execution=compiled
-// --heap-pages=4096
-// --template=scripts/pallet-weight-template.hbs
 // --pallet=pallet-stableswap
-// --output=weights/stableswap.rs
 // --extrinsic=*
+// --template=scripts/pallet-weight-template.hbs
+// --output=./weights/pallet_stableswap.rs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -62,8 +61,8 @@ impl<T: frame_system::Config> pallet_stableswap::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `855`
 		//  Estimated: `16590`
-		// Minimum execution time: 42_163_000 picoseconds.
-		Weight::from_parts(42_971_000, 16590)
+		// Minimum execution time: 41_642_000 picoseconds.
+		Weight::from_parts(42_696_000, 16590)
 			.saturating_add(T::DbWeight::get().reads(7_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -85,17 +84,19 @@ impl<T: frame_system::Config> pallet_stableswap::WeightInfo for HydraWeight<T> {
 	/// 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: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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:  `3471`
+		//  Measured:  `3679`
 		//  Estimated: `29403`
-		// Minimum execution time: 1_327_528_000 picoseconds.
-		Weight::from_parts(1_331_117_000, 29403)
-			.saturating_add(T::DbWeight::get().reads(35_u64))
+		// Minimum execution time: 1_344_257_000 picoseconds.
+		Weight::from_parts(1_350_664_000, 29403)
+			.saturating_add(T::DbWeight::get().reads(36_u64))
 			.saturating_add(T::DbWeight::get().writes(14_u64))
 	}
 	/// Storage: `Stableswap::AssetTradability` (r:1 w:0)
@@ -116,17 +117,19 @@ impl<T: frame_system::Config> pallet_stableswap::WeightInfo for HydraWeight<T> {
 	/// 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: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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:  `3339`
+		//  Measured:  `3548`
 		//  Estimated: `19071`
-		// Minimum execution time: 896_585_000 picoseconds.
-		Weight::from_parts(900_938_000, 19071)
-			.saturating_add(T::DbWeight::get().reads(23_u64))
+		// Minimum execution time: 914_603_000 picoseconds.
+		Weight::from_parts(920_734_000, 19071)
+			.saturating_add(T::DbWeight::get().reads(24_u64))
 			.saturating_add(T::DbWeight::get().writes(6_u64))
 	}
 	/// Storage: `Stableswap::AssetTradability` (r:1 w:0)
@@ -141,6 +144,8 @@ impl<T: frame_system::Config> pallet_stableswap::WeightInfo for HydraWeight<T> {
 	/// Proof: `Tokens::TotalIssuance` (`max_values`: None, `max_size`: Some(28), added: 2503, mode: `MaxEncodedLen`)
 	/// Storage: `System::Account` (r:2 w:1)
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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)
@@ -153,11 +158,11 @@ impl<T: frame_system::Config> pallet_stableswap::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:  `3363`
+		//  Measured:  `3571`
 		//  Estimated: `19071`
-		// Minimum execution time: 925_710_000 picoseconds.
-		Weight::from_parts(928_674_000, 19071)
-			.saturating_add(T::DbWeight::get().reads(22_u64))
+		// Minimum execution time: 942_225_000 picoseconds.
+		Weight::from_parts(945_590_000, 19071)
+			.saturating_add(T::DbWeight::get().reads(23_u64))
 			.saturating_add(T::DbWeight::get().writes(7_u64))
 	}
 	/// Storage: `Stableswap::AssetTradability` (r:1 w:0)
@@ -170,6 +175,8 @@ impl<T: frame_system::Config> pallet_stableswap::WeightInfo for HydraWeight<T> {
 	/// 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: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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)
@@ -184,11 +191,11 @@ impl<T: frame_system::Config> pallet_stableswap::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:  `3363`
+		//  Measured:  `3571`
 		//  Estimated: `19071`
-		// Minimum execution time: 1_412_294_000 picoseconds.
-		Weight::from_parts(1_416_948_000, 19071)
-			.saturating_add(T::DbWeight::get().reads(23_u64))
+		// Minimum execution time: 1_303_657_000 picoseconds.
+		Weight::from_parts(1_309_790_000, 19071)
+			.saturating_add(T::DbWeight::get().reads(24_u64))
 			.saturating_add(T::DbWeight::get().writes(6_u64))
 	}
 	/// Storage: `Stableswap::AssetTradability` (r:2 w:0)
@@ -199,6 +206,8 @@ impl<T: frame_system::Config> pallet_stableswap::WeightInfo for HydraWeight<T> {
 	/// 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(125), added: 2600, mode: `MaxEncodedLen`)
+	/// Storage: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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)
@@ -215,11 +224,11 @@ impl<T: frame_system::Config> pallet_stableswap::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:  `3426`
+		//  Measured:  `3634`
 		//  Estimated: `19071`
-		// Minimum execution time: 862_103_000 picoseconds.
-		Weight::from_parts(867_533_000, 19071)
-			.saturating_add(T::DbWeight::get().reads(25_u64))
+		// Minimum execution time: 879_444_000 picoseconds.
+		Weight::from_parts(883_301_000, 19071)
+			.saturating_add(T::DbWeight::get().reads(26_u64))
 			.saturating_add(T::DbWeight::get().writes(7_u64))
 	}
 	/// Storage: `Stableswap::AssetTradability` (r:2 w:0)
@@ -230,6 +239,8 @@ impl<T: frame_system::Config> pallet_stableswap::WeightInfo for HydraWeight<T> {
 	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
 	/// Storage: `AssetRegistry::Assets` (r:6 w:0)
 	/// Proof: `AssetRegistry::Assets` (`max_values`: None, `max_size`: Some(125), added: 2600, mode: `MaxEncodedLen`)
+	/// Storage: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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)
@@ -246,11 +257,11 @@ impl<T: frame_system::Config> pallet_stableswap::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:  `3396`
+		//  Measured:  `3604`
 		//  Estimated: `19071`
-		// Minimum execution time: 844_279_000 picoseconds.
-		Weight::from_parts(848_664_000, 19071)
-			.saturating_add(T::DbWeight::get().reads(26_u64))
+		// Minimum execution time: 864_832_000 picoseconds.
+		Weight::from_parts(867_874_000, 19071)
+			.saturating_add(T::DbWeight::get().reads(27_u64))
 			.saturating_add(T::DbWeight::get().writes(6_u64))
 	}
 	/// Storage: `Stableswap::Pools` (r:1 w:0)
@@ -261,8 +272,8 @@ impl<T: frame_system::Config> pallet_stableswap::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `291`
 		//  Estimated: `3522`
-		// Minimum execution time: 21_172_000 picoseconds.
-		Weight::from_parts(21_538_000, 3522)
+		// Minimum execution time: 20_286_000 picoseconds.
+		Weight::from_parts(20_596_000, 3522)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -272,8 +283,8 @@ impl<T: frame_system::Config> pallet_stableswap::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `291`
 		//  Estimated: `3522`
-		// Minimum execution time: 18_710_000 picoseconds.
-		Weight::from_parts(19_155_000, 3522)
+		// Minimum execution time: 17_920_000 picoseconds.
+		Weight::from_parts(18_179_000, 3522)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -283,8 +294,8 @@ impl<T: frame_system::Config> pallet_stableswap::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `291`
 		//  Estimated: `3522`
-		// Minimum execution time: 19_403_000 picoseconds.
-		Weight::from_parts(19_822_000, 3522)
+		// Minimum execution time: 18_938_000 picoseconds.
+		Weight::from_parts(19_266_000, 3522)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -296,6 +307,8 @@ impl<T: frame_system::Config> pallet_stableswap::WeightInfo for HydraWeight<T> {
 	/// 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: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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)
@@ -314,16 +327,16 @@ impl<T: frame_system::Config> pallet_stableswap::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:  `1621 + e * (1805 ±0)`
-		//  Estimated: `13990 + e * (5797 ±201_913_854_157_949_888)`
-		// Minimum execution time: 371_777_000 picoseconds.
-		Weight::from_parts(384_499_218, 13990)
-			// Standard Error: 722_175
-			.saturating_add(Weight::from_parts(831_895_585, 0).saturating_mul(e.into()))
+		//  Measured:  `1621 + e * (2013 ±0)`
+		//  Estimated: `13990 + e * (5166 ±0)`
+		// Minimum execution time: 381_827_000 picoseconds.
+		Weight::from_parts(392_709_451, 13990)
+			// Standard Error: 757_457
+			.saturating_add(Weight::from_parts(852_318_239, 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().reads((15_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`)
@@ -333,6 +346,8 @@ impl<T: frame_system::Config> pallet_stableswap::WeightInfo for HydraWeight<T> {
 	/// 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: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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)
@@ -351,18 +366,18 @@ impl<T: frame_system::Config> pallet_stableswap::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:  `1620 + e * (1776 ±0)`
-		//  Estimated: `13990 + e * (5797 ±213_489_293_787_578_112)`
-		// Minimum execution time: 371_923_000 picoseconds.
-		Weight::from_parts(373_003_000, 13990)
-			// Standard Error: 3_999_909
-			.saturating_add(Weight::from_parts(15_028_502, 0).saturating_mul(c.into()))
-			// Standard Error: 8_780_942
-			.saturating_add(Weight::from_parts(520_802_190, 0).saturating_mul(e.into()))
+		//  Measured:  `1620 + e * (1984 ±0)`
+		//  Estimated: `13990 + e * (5166 ±0)`
+		// Minimum execution time: 381_083_000 picoseconds.
+		Weight::from_parts(383_051_000, 13990)
+			// Standard Error: 1_076_925
+			.saturating_add(Weight::from_parts(4_093_007, 0).saturating_mul(c.into()))
+			// Standard Error: 2_398_616
+			.saturating_add(Weight::from_parts(496_972_488, 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().reads((16_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()))
 	}
 	/// Storage: `Stableswap::Pools` (r:1 w:0)
 	/// Proof: `Stableswap::Pools` (`max_values`: None, `max_size`: Some(57), added: 2532, mode: `MaxEncodedLen`)
@@ -376,8 +391,8 @@ impl<T: frame_system::Config> pallet_stableswap::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `1827`
 		//  Estimated: `13990`
-		// Minimum execution time: 308_105_000 picoseconds.
-		Weight::from_parts(309_400_000, 13990)
+		// Minimum execution time: 314_631_000 picoseconds.
+		Weight::from_parts(316_077_000, 13990)
 			.saturating_add(T::DbWeight::get().reads(12_u64))
 	}
-}
+}
\ No newline at end of file
diff --git a/runtime/hydradx/src/weights/pallet_staking.rs b/runtime/hydradx/src/weights/pallet_staking.rs
index 76fe85383..e3af9f630 100644
--- a/runtime/hydradx/src/weights/pallet_staking.rs
+++ b/runtime/hydradx/src/weights/pallet_staking.rs
@@ -19,7 +19,7 @@
 //! Autogenerated weights for `pallet_staking`
 //!
 //! 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: `[]`
+//! DATE: 2024-09-10, 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`
@@ -29,14 +29,13 @@
 // benchmark
 // pallet
 // --chain=dev
-// --steps=10
-// --repeat=30
+// --steps=50
+// --repeat=20
 // --wasm-execution=compiled
-// --heap-pages=4096
-// --template=scripts/pallet-weight-template.hbs
 // --pallet=pallet-staking
-// --output=weights/staking.rs
 // --extrinsic=*
+// --template=scripts/pallet-weight-template.hbs
+// --output=./weights/pallet_staking.rs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -64,8 +63,8 @@ impl<T: frame_system::Config> pallet_staking::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `516`
 		//  Estimated: `3655`
-		// Minimum execution time: 34_969_000 picoseconds.
-		Weight::from_parts(35_577_000, 3655)
+		// Minimum execution time: 33_733_000 picoseconds.
+		Weight::from_parts(34_400_000, 3655)
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
@@ -93,8 +92,8 @@ impl<T: frame_system::Config> pallet_staking::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `1274`
 		//  Estimated: `6196`
-		// Minimum execution time: 89_837_000 picoseconds.
-		Weight::from_parts(90_522_000, 6196)
+		// Minimum execution time: 88_822_000 picoseconds.
+		Weight::from_parts(89_489_000, 6196)
 			.saturating_add(T::DbWeight::get().reads(10_u64))
 			.saturating_add(T::DbWeight::get().writes(8_u64))
 	}
@@ -120,8 +119,8 @@ impl<T: frame_system::Config> pallet_staking::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `3379`
 		//  Estimated: `268590`
-		// Minimum execution time: 260_523_000 picoseconds.
-		Weight::from_parts(264_621_000, 268590)
+		// Minimum execution time: 260_117_000 picoseconds.
+		Weight::from_parts(264_603_000, 268590)
 			.saturating_add(T::DbWeight::get().reads(109_u64))
 			.saturating_add(T::DbWeight::get().writes(6_u64))
 	}
@@ -147,8 +146,8 @@ impl<T: frame_system::Config> pallet_staking::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `3379`
 		//  Estimated: `268590`
-		// Minimum execution time: 256_924_000 picoseconds.
-		Weight::from_parts(260_188_000, 268590)
+		// Minimum execution time: 253_815_000 picoseconds.
+		Weight::from_parts(257_035_000, 268590)
 			.saturating_add(T::DbWeight::get().reads(109_u64))
 			.saturating_add(T::DbWeight::get().writes(6_u64))
 	}
@@ -178,8 +177,8 @@ impl<T: frame_system::Config> pallet_staking::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `1431`
 		//  Estimated: `6196`
-		// Minimum execution time: 136_034_000 picoseconds.
-		Weight::from_parts(137_189_000, 6196)
+		// Minimum execution time: 134_541_000 picoseconds.
+		Weight::from_parts(135_440_000, 6196)
 			.saturating_add(T::DbWeight::get().reads(10_u64))
 			.saturating_add(T::DbWeight::get().writes(10_u64))
 	}
diff --git a/runtime/hydradx/src/weights/pallet_state_trie_migration.rs b/runtime/hydradx/src/weights/pallet_state_trie_migration.rs
index 8e03f10af..0f38b19f4 100644
--- a/runtime/hydradx/src/weights/pallet_state_trie_migration.rs
+++ b/runtime/hydradx/src/weights/pallet_state_trie_migration.rs
@@ -19,29 +19,23 @@
 //! Autogenerated weights for `pallet_state_trie_migration`
 //!
 //! 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: `[]`
+//! DATE: 2024-09-10, 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`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
 
 // Executed Command:
-// ./target/release/hydradx
+// target/release/hydradx
 // benchmark
 // pallet
+// --chain=dev
+// --steps=50
+// --repeat=20
 // --wasm-execution=compiled
-// --pallet
-// *
-// --extrinsic
-// *
-// --heap-pages
-// 4096
-// --steps
-// 50
-// --repeat
-// 20
+// --pallet=pallet-state-trie-migration
+// --extrinsic=*
 // --template=scripts/pallet-weight-template.hbs
-// --output
-// weights/
+// --output=./weights/pallet_state_trie_migration.rs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -67,8 +61,8 @@ impl<T: frame_system::Config> pallet_state_trie_migration::WeightInfo for HydraW
 		// Proof Size summary in bytes:
 		//  Measured:  `174`
 		//  Estimated: `3550`
-		// Minimum execution time: 24_739_000 picoseconds.
-		Weight::from_parts(25_378_000, 3550)
+		// Minimum execution time: 24_940_000 picoseconds.
+		Weight::from_parts(25_464_000, 3550)
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -78,8 +72,8 @@ impl<T: frame_system::Config> pallet_state_trie_migration::WeightInfo for HydraW
 		// Proof Size summary in bytes:
 		//  Measured:  `142`
 		//  Estimated: `1493`
-		// Minimum execution time: 5_190_000 picoseconds.
-		Weight::from_parts(5_356_000, 1493)
+		// Minimum execution time: 4_910_000 picoseconds.
+		Weight::from_parts(5_082_000, 1493)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 	}
 	/// Storage: `Balances::Holds` (r:1 w:0)
@@ -88,8 +82,8 @@ impl<T: frame_system::Config> pallet_state_trie_migration::WeightInfo for HydraW
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `3550`
-		// Minimum execution time: 14_750_000 picoseconds.
-		Weight::from_parts(14_989_000, 3550)
+		// Minimum execution time: 14_681_000 picoseconds.
+		Weight::from_parts(15_054_000, 3550)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 	}
 	/// Storage: `Balances::Holds` (r:1 w:1)
@@ -100,8 +94,8 @@ impl<T: frame_system::Config> pallet_state_trie_migration::WeightInfo for HydraW
 		// Proof Size summary in bytes:
 		//  Measured:  `179`
 		//  Estimated: `3644`
-		// Minimum execution time: 76_510_000 picoseconds.
-		Weight::from_parts(77_694_000, 3644)
+		// Minimum execution time: 77_309_000 picoseconds.
+		Weight::from_parts(77_843_000, 3644)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -111,8 +105,8 @@ impl<T: frame_system::Config> pallet_state_trie_migration::WeightInfo for HydraW
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `3550`
-		// Minimum execution time: 15_002_000 picoseconds.
-		Weight::from_parts(15_332_000, 3550)
+		// Minimum execution time: 15_041_000 picoseconds.
+		Weight::from_parts(15_210_000, 3550)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 	}
 	/// Storage: `Balances::Holds` (r:1 w:1)
@@ -123,8 +117,8 @@ impl<T: frame_system::Config> pallet_state_trie_migration::WeightInfo for HydraW
 		// Proof Size summary in bytes:
 		//  Measured:  `106`
 		//  Estimated: `3571`
-		// Minimum execution time: 78_788_000 picoseconds.
-		Weight::from_parts(79_332_000, 3571)
+		// Minimum execution time: 78_084_000 picoseconds.
+		Weight::from_parts(78_871_000, 3571)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -135,10 +129,10 @@ impl<T: frame_system::Config> pallet_state_trie_migration::WeightInfo for HydraW
 		// Proof Size summary in bytes:
 		//  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()))
+		// Minimum execution time: 6_063_000 picoseconds.
+		Weight::from_parts(6_244_000, 3760)
+			// Standard Error: 10
+			.saturating_add(Weight::from_parts(1_439, 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()))
diff --git a/runtime/hydradx/src/weights/pallet_timestamp.rs b/runtime/hydradx/src/weights/pallet_timestamp.rs
index d53aace17..4c0c2d475 100644
--- a/runtime/hydradx/src/weights/pallet_timestamp.rs
+++ b/runtime/hydradx/src/weights/pallet_timestamp.rs
@@ -19,29 +19,23 @@
 //! Autogenerated weights for `pallet_timestamp`
 //!
 //! 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: `[]`
+//! DATE: 2024-09-10, 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`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
 
 // Executed Command:
-// ./target/release/hydradx
+// target/release/hydradx
 // benchmark
 // pallet
+// --chain=dev
+// --steps=50
+// --repeat=20
 // --wasm-execution=compiled
-// --pallet
-// *
-// --extrinsic
-// *
-// --heap-pages
-// 4096
-// --steps
-// 50
-// --repeat
-// 20
+// --pallet=pallet-timestamp
+// --extrinsic=*
 // --template=scripts/pallet-weight-template.hbs
-// --output
-// weights/
+// --output=./weights/pallet_timestamp.rs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -63,8 +57,8 @@ impl<T: frame_system::Config> pallet_timestamp::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `42`
 		//  Estimated: `1493`
-		// Minimum execution time: 6_253_000 picoseconds.
-		Weight::from_parts(6_598_000, 1493)
+		// Minimum execution time: 6_330_000 picoseconds.
+		Weight::from_parts(6_579_000, 1493)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -72,7 +66,7 @@ impl<T: frame_system::Config> pallet_timestamp::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `94`
 		//  Estimated: `0`
-		// Minimum execution time: 3_659_000 picoseconds.
-		Weight::from_parts(3_726_000, 0)
+		// Minimum execution time: 3_581_000 picoseconds.
+		Weight::from_parts(3_706_000, 0)
 	}
 }
\ No newline at end of file
diff --git a/runtime/hydradx/src/weights/pallet_tips.rs b/runtime/hydradx/src/weights/pallet_tips.rs
index 0a255e8e1..56d45c831 100644
--- a/runtime/hydradx/src/weights/pallet_tips.rs
+++ b/runtime/hydradx/src/weights/pallet_tips.rs
@@ -19,29 +19,23 @@
 //! Autogenerated weights for `pallet_tips`
 //!
 //! 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: `[]`
+//! DATE: 2024-09-10, 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`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
 
 // Executed Command:
-// ./target/release/hydradx
+// target/release/hydradx
 // benchmark
 // pallet
+// --chain=dev
+// --steps=50
+// --repeat=20
 // --wasm-execution=compiled
-// --pallet
-// *
-// --extrinsic
-// *
-// --heap-pages
-// 4096
-// --steps
-// 50
-// --repeat
-// 20
+// --pallet=pallet-tips
+// --extrinsic=*
 // --template=scripts/pallet-weight-template.hbs
-// --output
-// weights/
+// --output=./weights/pallet_tips.rs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -66,10 +60,10 @@ impl<T: frame_system::Config> pallet_tips::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `42`
 		//  Estimated: `3507`
-		// 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()))
+		// Minimum execution time: 34_011_000 picoseconds.
+		Weight::from_parts(35_102_953, 3507)
+			// Standard Error: 33
+			.saturating_add(Weight::from_parts(1_220, 0).saturating_mul(r.into()))
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -81,8 +75,8 @@ impl<T: frame_system::Config> pallet_tips::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `259`
 		//  Estimated: `3724`
-		// Minimum execution time: 32_135_000 picoseconds.
-		Weight::from_parts(32_556_000, 3724)
+		// Minimum execution time: 32_632_000 picoseconds.
+		Weight::from_parts(33_087_000, 3724)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -98,12 +92,12 @@ 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: 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()))
+		// Minimum execution time: 22_754_000 picoseconds.
+		Weight::from_parts(22_734_008, 3903)
+			// Standard Error: 20
+			.saturating_add(Weight::from_parts(1_658, 0).saturating_mul(r.into()))
+			// Standard Error: 1_648
+			.saturating_add(Weight::from_parts(37_991, 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()))
@@ -117,10 +111,10 @@ 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: 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()))
+		// Minimum execution time: 18_711_000 picoseconds.
+		Weight::from_parts(18_993_380, 4124)
+			// Standard Error: 1_903
+			.saturating_add(Weight::from_parts(147_068, 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()))
@@ -138,10 +132,10 @@ impl<T: frame_system::Config> pallet_tips::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `801 + t * (112 ±0)`
 		//  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()))
+		// Minimum execution time: 67_694_000 picoseconds.
+		Weight::from_parts(68_775_940, 6196)
+			// Standard Error: 6_603
+			.saturating_add(Weight::from_parts(145_198, 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()))
@@ -155,10 +149,10 @@ impl<T: frame_system::Config> pallet_tips::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `307`
 		//  Estimated: `3772`
-		// 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()))
+		// Minimum execution time: 16_772_000 picoseconds.
+		Weight::from_parts(17_200_331, 3772)
+			// Standard Error: 962
+			.saturating_add(Weight::from_parts(13_197, 0).saturating_mul(t.into()))
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
diff --git a/runtime/hydradx/src/weights/pallet_transaction_multi_payment.rs b/runtime/hydradx/src/weights/pallet_transaction_multi_payment.rs
index e81808b0f..f667bd8b2 100644
--- a/runtime/hydradx/src/weights/pallet_transaction_multi_payment.rs
+++ b/runtime/hydradx/src/weights/pallet_transaction_multi_payment.rs
@@ -22,12 +22,15 @@
 //! DATE: 2024-08-30, 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`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
 
 // Executed Command:
-// ./target/release/hydradx
+// target/release/hydradx
 // benchmark
 // pallet
+// --chain=dev
+// --steps=50
+// --repeat=20
 // --wasm-execution=compiled
 // --pallet
 // pallet_transaction_multi_payment
diff --git a/runtime/hydradx/src/weights/pallet_transaction_pause.rs b/runtime/hydradx/src/weights/pallet_transaction_pause.rs
index 178691fd4..9f7381d7a 100644
--- a/runtime/hydradx/src/weights/pallet_transaction_pause.rs
+++ b/runtime/hydradx/src/weights/pallet_transaction_pause.rs
@@ -19,29 +19,23 @@
 //! Autogenerated weights for `pallet_transaction_pause`
 //!
 //! 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: `[]`
+//! DATE: 2024-09-10, 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`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
 
 // Executed Command:
-// ./target/release/hydradx
+// target/release/hydradx
 // benchmark
 // pallet
+// --chain=dev
+// --steps=50
+// --repeat=20
 // --wasm-execution=compiled
-// --pallet
-// *
-// --extrinsic
-// *
-// --heap-pages
-// 4096
-// --steps
-// 50
-// --repeat
-// 20
+// --pallet=pallet-transaction-pause
+// --extrinsic=*
 // --template=scripts/pallet-weight-template.hbs
-// --output
-// weights/
+// --output=./weights/pallet_transaction_pause.rs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -63,8 +57,8 @@ impl<T: frame_system::Config> pallet_transaction_pause::WeightInfo for HydraWeig
 		// Proof Size summary in bytes:
 		//  Measured:  `109`
 		//  Estimated: `3555`
-		// Minimum execution time: 10_806_000 picoseconds.
-		Weight::from_parts(10_995_000, 3555)
+		// Minimum execution time: 10_654_000 picoseconds.
+		Weight::from_parts(11_047_000, 3555)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -74,8 +68,8 @@ impl<T: frame_system::Config> pallet_transaction_pause::WeightInfo for HydraWeig
 		// Proof Size summary in bytes:
 		//  Measured:  `160`
 		//  Estimated: `3555`
-		// Minimum execution time: 12_641_000 picoseconds.
-		Weight::from_parts(13_122_000, 3555)
+		// Minimum execution time: 12_775_000 picoseconds.
+		Weight::from_parts(13_283_000, 3555)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
diff --git a/runtime/hydradx/src/weights/pallet_treasury.rs b/runtime/hydradx/src/weights/pallet_treasury.rs
index 24d51e0a5..d8a640093 100644
--- a/runtime/hydradx/src/weights/pallet_treasury.rs
+++ b/runtime/hydradx/src/weights/pallet_treasury.rs
@@ -19,29 +19,23 @@
 //! 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: `[]`
+//! DATE: 2024-09-10, 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`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
 
 // Executed Command:
-// ./target/release/hydradx
+// target/release/hydradx
 // benchmark
 // pallet
+// --chain=dev
+// --steps=50
+// --repeat=20
 // --wasm-execution=compiled
-// --pallet
-// *
-// --extrinsic
-// *
-// --heap-pages
-// 4096
-// --steps
-// 50
-// --repeat
-// 20
+// --pallet=pallet-treasury
+// --extrinsic=*
 // --template=scripts/pallet-weight-template.hbs
-// --output
-// weights/
+// --output=./weights/pallet_treasury.rs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -67,8 +61,8 @@ impl<T: frame_system::Config> pallet_treasury::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `109`
 		//  Estimated: `1887`
-		// Minimum execution time: 14_347_000 picoseconds.
-		Weight::from_parts(14_682_000, 1887)
+		// Minimum execution time: 13_958_000 picoseconds.
+		Weight::from_parts(14_341_000, 1887)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
@@ -80,8 +74,8 @@ impl<T: frame_system::Config> pallet_treasury::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `210`
 		//  Estimated: `1489`
-		// Minimum execution time: 29_707_000 picoseconds.
-		Weight::from_parts(30_262_000, 1489)
+		// Minimum execution time: 30_038_000 picoseconds.
+		Weight::from_parts(30_597_000, 1489)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -93,8 +87,8 @@ impl<T: frame_system::Config> pallet_treasury::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `471`
 		//  Estimated: `6196`
-		// Minimum execution time: 43_672_000 picoseconds.
-		Weight::from_parts(44_114_000, 6196)
+		// Minimum execution time: 44_053_000 picoseconds.
+		Weight::from_parts(44_495_000, 6196)
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
@@ -107,10 +101,10 @@ impl<T: frame_system::Config> pallet_treasury::WeightInfo for HydraWeight<T> {
 		// 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()))
+		// Minimum execution time: 11_720_000 picoseconds.
+		Weight::from_parts(15_016_101, 3573)
+			// Standard Error: 985
+			.saturating_add(Weight::from_parts(38_372, 0).saturating_mul(p.into()))
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -120,8 +114,8 @@ impl<T: frame_system::Config> pallet_treasury::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `194`
 		//  Estimated: `1887`
-		// Minimum execution time: 7_594_000 picoseconds.
-		Weight::from_parts(7_876_000, 1887)
+		// Minimum execution time: 7_411_000 picoseconds.
+		Weight::from_parts(7_600_000, 1887)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -140,10 +134,10 @@ impl<T: frame_system::Config> pallet_treasury::WeightInfo for HydraWeight<T> {
 		// 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()))
+		// Minimum execution time: 23_603_000 picoseconds.
+		Weight::from_parts(35_329_333, 3593)
+			// Standard Error: 15_662
+			.saturating_add(Weight::from_parts(37_022_288, 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))
@@ -158,8 +152,8 @@ impl<T: frame_system::Config> pallet_treasury::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `109`
 		//  Estimated: `1489`
-		// Minimum execution time: 12_454_000 picoseconds.
-		Weight::from_parts(12_784_000, 1489)
+		// Minimum execution time: 12_398_000 picoseconds.
+		Weight::from_parts(12_687_000, 1489)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -171,8 +165,8 @@ impl<T: frame_system::Config> pallet_treasury::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `382`
 		//  Estimated: `6196`
-		// Minimum execution time: 59_855_000 picoseconds.
-		Weight::from_parts(60_501_000, 6196)
+		// Minimum execution time: 60_678_000 picoseconds.
+		Weight::from_parts(61_098_000, 6196)
 			.saturating_add(T::DbWeight::get().reads(3_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
@@ -182,8 +176,8 @@ impl<T: frame_system::Config> pallet_treasury::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `227`
 		//  Estimated: `3534`
-		// Minimum execution time: 15_984_000 picoseconds.
-		Weight::from_parts(16_232_000, 3534)
+		// Minimum execution time: 16_013_000 picoseconds.
+		Weight::from_parts(16_224_000, 3534)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
@@ -193,8 +187,8 @@ impl<T: frame_system::Config> pallet_treasury::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `227`
 		//  Estimated: `3534`
-		// Minimum execution time: 14_109_000 picoseconds.
-		Weight::from_parts(14_541_000, 3534)
+		// Minimum execution time: 14_062_000 picoseconds.
+		Weight::from_parts(14_486_000, 3534)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
diff --git a/runtime/hydradx/src/weights/pallet_utility.rs b/runtime/hydradx/src/weights/pallet_utility.rs
index 4f0a0fc0c..e30a8a166 100644
--- a/runtime/hydradx/src/weights/pallet_utility.rs
+++ b/runtime/hydradx/src/weights/pallet_utility.rs
@@ -19,29 +19,23 @@
 //! Autogenerated weights for `pallet_utility`
 //!
 //! 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: `[]`
+//! DATE: 2024-09-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`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
 
 // Executed Command:
-// ./target/release/hydradx
+// target/release/hydradx
 // benchmark
 // pallet
+// --chain=dev
+// --steps=50
+// --repeat=20
 // --wasm-execution=compiled
-// --pallet
-// *
-// --extrinsic
-// *
-// --heap-pages
-// 4096
-// --steps
-// 50
-// --repeat
-// 20
+// --pallet=pallet-utility
+// --extrinsic=*
 // --template=scripts/pallet-weight-template.hbs
-// --output
-// weights/
+// --output=./weights/pallet_utility.rs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -62,43 +56,43 @@ impl<T: frame_system::Config> pallet_utility::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// 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()))
+		// Minimum execution time: 6_275_000 picoseconds.
+		Weight::from_parts(6_413_000, 0)
+			// Standard Error: 1_609
+			.saturating_add(Weight::from_parts(3_722_278, 0).saturating_mul(c.into()))
 	}
 	fn as_derivative() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 6_469_000 picoseconds.
-		Weight::from_parts(6_636_000, 0)
+		// Minimum execution time: 6_401_000 picoseconds.
+		Weight::from_parts(6_546_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: 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()))
+		// Minimum execution time: 6_281_000 picoseconds.
+		Weight::from_parts(6_139_425, 0)
+			// Standard Error: 2_538
+			.saturating_add(Weight::from_parts(4_015_708, 0).saturating_mul(c.into()))
 	}
 	fn dispatch_as() -> Weight {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 8_898_000 picoseconds.
-		Weight::from_parts(9_127_000, 0)
+		// Minimum execution time: 8_731_000 picoseconds.
+		Weight::from_parts(8_957_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: 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()))
+		// Minimum execution time: 6_152_000 picoseconds.
+		Weight::from_parts(8_319_759, 0)
+			// Standard Error: 2_825
+			.saturating_add(Weight::from_parts(3_699_376, 0).saturating_mul(c.into()))
 	}
 }
\ No newline at end of file
diff --git a/runtime/hydradx/src/weights/pallet_xcm.rs b/runtime/hydradx/src/weights/pallet_xcm.rs
index c9c9fd7ac..d289dbbd6 100644
--- a/runtime/hydradx/src/weights/pallet_xcm.rs
+++ b/runtime/hydradx/src/weights/pallet_xcm.rs
@@ -19,29 +19,23 @@
 //! Autogenerated weights for `pallet_xcm`
 //!
 //! 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: `[]`
+//! DATE: 2024-09-10, 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`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
 
 // Executed Command:
-// ./target/release/hydradx
+// target/release/hydradx
 // benchmark
 // pallet
+// --chain=dev
+// --steps=50
+// --repeat=20
 // --wasm-execution=compiled
-// --pallet
-// *
-// --extrinsic
-// *
-// --heap-pages
-// 4096
-// --steps
-// 50
-// --repeat
-// 20
+// --pallet=pallet-xcm
+// --extrinsic=*
 // --template=scripts/pallet-weight-template.hbs
-// --output
-// weights/
+// --output=./weights/pallet_xcm.rs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -71,8 +65,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `145`
 		//  Estimated: `3610`
-		// Minimum execution time: 25_608_000 picoseconds.
-		Weight::from_parts(26_239_000, 3610)
+		// Minimum execution time: 26_808_000 picoseconds.
+		Weight::from_parts(27_657_000, 3610)
 			.saturating_add(T::DbWeight::get().reads(5_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -85,30 +79,62 @@ 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: `Benchmark::Override` (r:0 w:0)
-	/// Proof: `Benchmark::Override` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
+	/// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:1 w:1)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
+	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
+	/// Proof: `PolkadotXcm::VersionDiscoveryQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `PolkadotXcm::SafeXcmVersion` (r:1 w:0)
+	/// Proof: `PolkadotXcm::SafeXcmVersion` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `ParachainSystem::RelevantMessagingState` (r:1 w:0)
+	/// Proof: `ParachainSystem::RelevantMessagingState` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `XcmpQueue::OutboundXcmpStatus` (r:1 w:1)
+	/// Proof: `XcmpQueue::OutboundXcmpStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `XcmpQueue::OutboundXcmpMessages` (r:0 w:1)
+	/// Proof: `XcmpQueue::OutboundXcmpMessages` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	fn reserve_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)
+		//  Measured:  `536`
+		//  Estimated: `4001`
+		// Minimum execution time: 119_808_000 picoseconds.
+		Weight::from_parts(120_772_000, 4001)
+			.saturating_add(T::DbWeight::get().reads(7_u64))
+			.saturating_add(T::DbWeight::get().writes(4_u64))
 	}
-	/// Storage: `Benchmark::Override` (r:0 w:0)
-	/// Proof: `Benchmark::Override` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `ParachainInfo::ParachainId` (r:1 w:0)
+	/// Proof: `ParachainInfo::ParachainId` (`max_values`: Some(1), `max_size`: Some(4), added: 499, mode: `MaxEncodedLen`)
+	/// Storage: `System::Account` (r:1 w:1)
+	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
+	/// Storage: `PolkadotXcm::SupportedVersion` (r:1 w:0)
+	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `PolkadotXcm::VersionDiscoveryQueue` (r:1 w:1)
+	/// Proof: `PolkadotXcm::VersionDiscoveryQueue` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `PolkadotXcm::SafeXcmVersion` (r:1 w:0)
+	/// Proof: `PolkadotXcm::SafeXcmVersion` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `ParachainSystem::RelevantMessagingState` (r:1 w:0)
+	/// Proof: `ParachainSystem::RelevantMessagingState` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `XcmpQueue::OutboundXcmpStatus` (r:1 w:1)
+	/// Proof: `XcmpQueue::OutboundXcmpStatus` (`max_values`: Some(1), `max_size`: None, mode: `Measured`)
+	/// Storage: `XcmpQueue::OutboundXcmpMessages` (r:0 w:1)
+	/// Proof: `XcmpQueue::OutboundXcmpMessages` (`max_values`: None, `max_size`: None, mode: `Measured`)
 	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)
+		//  Measured:  `536`
+		//  Estimated: `4001`
+		// Minimum execution time: 113_768_000 picoseconds.
+		Weight::from_parts(114_458_000, 4001)
+			.saturating_add(T::DbWeight::get().reads(7_u64))
+			.saturating_add(T::DbWeight::get().writes(4_u64))
 	}
 	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)
+		// Minimum execution time: 10_674_000 picoseconds.
+		Weight::from_parts(11_085_000, 0)
 	}
 	/// Storage: `PolkadotXcm::SupportedVersion` (r:0 w:1)
 	/// Proof: `PolkadotXcm::SupportedVersion` (`max_values`: None, `max_size`: None, mode: `Measured`)
@@ -116,8 +142,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 10_030_000 picoseconds.
-		Weight::from_parts(10_369_000, 0)
+		// Minimum execution time: 10_294_000 picoseconds.
+		Weight::from_parts(10_566_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	/// Storage: `PolkadotXcm::SafeXcmVersion` (r:0 w:1)
@@ -126,8 +152,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 3_622_000 picoseconds.
-		Weight::from_parts(3_786_000, 0)
+		// Minimum execution time: 3_300_000 picoseconds.
+		Weight::from_parts(3_438_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	/// Storage: `PolkadotXcm::VersionNotifiers` (r:1 w:1)
@@ -150,8 +176,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `145`
 		//  Estimated: `3610`
-		// Minimum execution time: 32_757_000 picoseconds.
-		Weight::from_parts(33_308_000, 3610)
+		// Minimum execution time: 34_496_000 picoseconds.
+		Weight::from_parts(35_126_000, 3610)
 			.saturating_add(T::DbWeight::get().reads(7_u64))
 			.saturating_add(T::DbWeight::get().writes(5_u64))
 	}
@@ -173,8 +199,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `328`
 		//  Estimated: `3793`
-		// Minimum execution time: 33_735_000 picoseconds.
-		Weight::from_parts(34_032_000, 3793)
+		// Minimum execution time: 35_498_000 picoseconds.
+		Weight::from_parts(36_205_000, 3793)
 			.saturating_add(T::DbWeight::get().reads(6_u64))
 			.saturating_add(T::DbWeight::get().writes(4_u64))
 	}
@@ -184,8 +210,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `0`
 		//  Estimated: `0`
-		// Minimum execution time: 3_635_000 picoseconds.
-		Weight::from_parts(3_791_000, 0)
+		// Minimum execution time: 3_429_000 picoseconds.
+		Weight::from_parts(3_514_000, 0)
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
 	/// Storage: `PolkadotXcm::SupportedVersion` (r:5 w:2)
@@ -194,8 +220,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `125`
 		//  Estimated: `13490`
-		// Minimum execution time: 23_554_000 picoseconds.
-		Weight::from_parts(23_975_000, 13490)
+		// Minimum execution time: 23_899_000 picoseconds.
+		Weight::from_parts(24_595_000, 13490)
 			.saturating_add(T::DbWeight::get().reads(5_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -205,8 +231,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `129`
 		//  Estimated: `13494`
-		// Minimum execution time: 23_816_000 picoseconds.
-		Weight::from_parts(24_477_000, 13494)
+		// Minimum execution time: 24_345_000 picoseconds.
+		Weight::from_parts(24_819_000, 13494)
 			.saturating_add(T::DbWeight::get().reads(5_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -216,8 +242,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `178`
 		//  Estimated: `16018`
-		// Minimum execution time: 26_544_000 picoseconds.
-		Weight::from_parts(27_025_000, 16018)
+		// Minimum execution time: 25_896_000 picoseconds.
+		Weight::from_parts(26_370_000, 16018)
 			.saturating_add(T::DbWeight::get().reads(6_u64))
 	}
 	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:2 w:1)
@@ -236,8 +262,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `212`
 		//  Estimated: `6152`
-		// Minimum execution time: 31_656_000 picoseconds.
-		Weight::from_parts(32_180_000, 6152)
+		// Minimum execution time: 33_012_000 picoseconds.
+		Weight::from_parts(33_556_000, 6152)
 			.saturating_add(T::DbWeight::get().reads(7_u64))
 			.saturating_add(T::DbWeight::get().writes(3_u64))
 	}
@@ -247,8 +273,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `172`
 		//  Estimated: `11062`
-		// Minimum execution time: 15_817_000 picoseconds.
-		Weight::from_parts(15_997_000, 11062)
+		// Minimum execution time: 15_074_000 picoseconds.
+		Weight::from_parts(15_300_000, 11062)
 			.saturating_add(T::DbWeight::get().reads(4_u64))
 	}
 	/// Storage: `PolkadotXcm::VersionNotifyTargets` (r:5 w:2)
@@ -257,8 +283,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `136`
 		//  Estimated: `13501`
-		// Minimum execution time: 24_645_000 picoseconds.
-		Weight::from_parts(25_287_000, 13501)
+		// Minimum execution time: 24_481_000 picoseconds.
+		Weight::from_parts(24_983_000, 13501)
 			.saturating_add(T::DbWeight::get().reads(5_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -278,8 +304,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `212`
 		//  Estimated: `13577`
-		// Minimum execution time: 42_396_000 picoseconds.
-		Weight::from_parts(42_908_000, 13577)
+		// Minimum execution time: 43_872_000 picoseconds.
+		Weight::from_parts(44_246_000, 13577)
 			.saturating_add(T::DbWeight::get().reads(10_u64))
 			.saturating_add(T::DbWeight::get().writes(4_u64))
 	}
@@ -291,8 +317,8 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `69`
 		//  Estimated: `1554`
-		// Minimum execution time: 5_356_000 picoseconds.
-		Weight::from_parts(5_526_000, 1554)
+		// Minimum execution time: 5_184_000 picoseconds.
+		Weight::from_parts(5_385_000, 1554)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(2_u64))
 	}
@@ -302,9 +328,24 @@ impl<T: frame_system::Config> pallet_xcm::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `7706`
 		//  Estimated: `11171`
-		// Minimum execution time: 34_538_000 picoseconds.
-		Weight::from_parts(35_078_000, 11171)
+		// Minimum execution time: 36_167_000 picoseconds.
+		Weight::from_parts(36_522_000, 11171)
 			.saturating_add(T::DbWeight::get().reads(1_u64))
 			.saturating_add(T::DbWeight::get().writes(1_u64))
 	}
+	/// Storage: `PolkadotXcm::AssetTraps` (r:1 w:1)
+	/// Proof: `PolkadotXcm::AssetTraps` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	/// Storage: `AssetRegistry::LocationAssets` (r:1 w:0)
+	/// Proof: `AssetRegistry::LocationAssets` (`max_values`: None, `max_size`: Some(622), added: 3097, mode: `MaxEncodedLen`)
+	/// Storage: `UnknownTokens::ConcreteFungibleBalances` (r:1 w:1)
+	/// Proof: `UnknownTokens::ConcreteFungibleBalances` (`max_values`: None, `max_size`: None, mode: `Measured`)
+	fn claim_assets() -> Weight {
+		// Proof Size summary in bytes:
+		//  Measured:  `448`
+		//  Estimated: `4087`
+		// Minimum execution time: 42_235_000 picoseconds.
+		Weight::from_parts(42_824_000, 4087)
+			.saturating_add(T::DbWeight::get().reads(3_u64))
+			.saturating_add(T::DbWeight::get().writes(2_u64))
+	}
 }
\ No newline at end of file
diff --git a/runtime/hydradx/src/weights/pallet_xyk.rs b/runtime/hydradx/src/weights/pallet_xyk.rs
index 37f325e36..1e6fc1551 100644
--- a/runtime/hydradx/src/weights/pallet_xyk.rs
+++ b/runtime/hydradx/src/weights/pallet_xyk.rs
@@ -19,7 +19,7 @@
 //! Autogenerated weights for `pallet_xyk`
 //!
 //! THIS FILE WAS AUTO-GENERATED USING THE SUBSTRATE BENCHMARK CLI VERSION 32.0.0
-//! DATE: 2024-06-20, STEPS: `10`, REPEAT: `30`, LOW RANGE: `[]`, HIGH RANGE: `[]`
+//! DATE: 2024-09-10, 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`
@@ -29,14 +29,13 @@
 // benchmark
 // pallet
 // --chain=dev
-// --steps=10
-// --repeat=30
+// --steps=50
+// --repeat=20
 // --wasm-execution=compiled
-// --heap-pages=4096
-// --template=scripts/pallet-weight-template.hbs
 // --pallet=pallet-xyk
-// --output=weights/xyk.rs
 // --extrinsic=*
+// --template=scripts/pallet-weight-template.hbs
+// --output=./weights/pallet_xyk.rs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -64,6 +63,8 @@ impl<T: frame_system::Config> pallet_xyk::WeightInfo for HydraWeight<T> {
 	/// 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: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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:4 w:0)
@@ -90,11 +91,11 @@ impl<T: frame_system::Config> pallet_xyk::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:  `3655`
+		//  Measured:  `3863`
 		//  Estimated: `19071`
-		// Minimum execution time: 478_829_000 picoseconds.
-		Weight::from_parts(482_189_000, 19071)
-			.saturating_add(T::DbWeight::get().reads(33_u64))
+		// Minimum execution time: 482_234_000 picoseconds.
+		Weight::from_parts(487_055_000, 19071)
+			.saturating_add(T::DbWeight::get().reads(34_u64))
 			.saturating_add(T::DbWeight::get().writes(20_u64))
 	}
 	/// Storage: `XYK::ShareToken` (r:1 w:0)
@@ -103,6 +104,8 @@ impl<T: frame_system::Config> pallet_xyk::WeightInfo for HydraWeight<T> {
 	/// 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: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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:4 w:0)
@@ -127,11 +130,11 @@ impl<T: frame_system::Config> pallet_xyk::WeightInfo for HydraWeight<T> {
 	/// 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:  `4291`
+		//  Measured:  `4499`
 		//  Estimated: `19071`
-		// Minimum execution time: 295_216_000 picoseconds.
-		Weight::from_parts(297_013_000, 19071)
-			.saturating_add(T::DbWeight::get().reads(27_u64))
+		// Minimum execution time: 300_637_000 picoseconds.
+		Weight::from_parts(301_659_000, 19071)
+			.saturating_add(T::DbWeight::get().reads(28_u64))
 			.saturating_add(T::DbWeight::get().writes(13_u64))
 	}
 	/// Storage: `XYK::ShareToken` (r:1 w:1)
@@ -140,6 +143,8 @@ impl<T: frame_system::Config> pallet_xyk::WeightInfo for HydraWeight<T> {
 	/// 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: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, mode: `MaxEncodedLen`)
 	/// 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)
@@ -166,17 +171,19 @@ impl<T: frame_system::Config> pallet_xyk::WeightInfo for HydraWeight<T> {
 	/// Proof: `XYK::PoolAssets` (`max_values`: None, `max_size`: Some(56), added: 2531, mode: `MaxEncodedLen`)
 	fn remove_liquidity() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `4341`
+		//  Measured:  `4549`
 		//  Estimated: `19071`
-		// Minimum execution time: 432_017_000 picoseconds.
-		Weight::from_parts(435_171_000, 19071)
-			.saturating_add(T::DbWeight::get().reads(29_u64))
+		// Minimum execution time: 437_485_000 picoseconds.
+		Weight::from_parts(441_006_000, 19071)
+			.saturating_add(T::DbWeight::get().reads(30_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`)
 	/// Storage: `Tokens::Accounts` (r:6 w:6)
 	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
+	/// Storage: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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)
@@ -199,17 +206,19 @@ impl<T: frame_system::Config> pallet_xyk::WeightInfo for HydraWeight<T> {
 	/// Proof: `EmaOracle::WhitelistedAssets` (`max_values`: Some(1), `max_size`: Some(641), added: 1136, mode: `MaxEncodedLen`)
 	fn sell() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `4190`
+		//  Measured:  `4398`
 		//  Estimated: `16488`
-		// Minimum execution time: 259_720_000 picoseconds.
-		Weight::from_parts(262_022_000, 16488)
-			.saturating_add(T::DbWeight::get().reads(24_u64))
+		// Minimum execution time: 263_251_000 picoseconds.
+		Weight::from_parts(265_158_000, 16488)
+			.saturating_add(T::DbWeight::get().reads(25_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`)
 	/// Storage: `Tokens::Accounts` (r:6 w:6)
 	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
+	/// Storage: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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)
@@ -232,17 +241,19 @@ impl<T: frame_system::Config> pallet_xyk::WeightInfo for HydraWeight<T> {
 	/// Proof: `EmaOracle::WhitelistedAssets` (`max_values`: Some(1), `max_size`: Some(641), added: 1136, mode: `MaxEncodedLen`)
 	fn buy() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `4190`
+		//  Measured:  `4398`
 		//  Estimated: `16488`
-		// Minimum execution time: 258_233_000 picoseconds.
-		Weight::from_parts(260_534_000, 16488)
-			.saturating_add(T::DbWeight::get().reads(24_u64))
+		// Minimum execution time: 261_604_000 picoseconds.
+		Weight::from_parts(262_778_000, 16488)
+			.saturating_add(T::DbWeight::get().reads(25_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`)
 	/// Storage: `Tokens::Accounts` (r:6 w:6)
 	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
+	/// Storage: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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)
@@ -267,16 +278,16 @@ impl<T: frame_system::Config> pallet_xyk::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:  `1221 + e * (2969 ±0)`
-		//  Estimated: `6156 + e * (10332 ±118_379_753_737_997_488)`
-		// Minimum execution time: 24_323_000 picoseconds.
-		Weight::from_parts(10_607_591, 6156)
-			// Standard Error: 167_239
-			.saturating_add(Weight::from_parts(7_205_082, 0).saturating_mul(c.into()))
-			// Standard Error: 167_239
-			.saturating_add(Weight::from_parts(243_290_509, 0).saturating_mul(e.into()))
+		//  Measured:  `1221 + e * (3177 ±0)`
+		//  Estimated: `8799 + e * (10332 ±0)`
+		// Minimum execution time: 24_468_000 picoseconds.
+		Weight::from_parts(8_259_951, 8799)
+			// Standard Error: 78_193
+			.saturating_add(Weight::from_parts(8_502_639, 0).saturating_mul(c.into()))
+			// Standard Error: 78_193
+			.saturating_add(Weight::from_parts(247_520_019, 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().reads((22_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()))
 	}
@@ -284,6 +295,8 @@ impl<T: frame_system::Config> pallet_xyk::WeightInfo for HydraWeight<T> {
 	/// Proof: `XYK::ShareToken` (`max_values`: None, `max_size`: Some(52), added: 2527, mode: `MaxEncodedLen`)
 	/// Storage: `Tokens::Accounts` (r:6 w:6)
 	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
+	/// Storage: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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)
@@ -308,16 +321,16 @@ impl<T: frame_system::Config> pallet_xyk::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:  `1221 + e * (2969 ±0)`
-		//  Estimated: `6156 + e * (10332 ±0)`
-		// Minimum execution time: 31_926_000 picoseconds.
-		Weight::from_parts(8_222_348, 6156)
-			// Standard Error: 100_411
-			.saturating_add(Weight::from_parts(8_150_950, 0).saturating_mul(c.into()))
-			// Standard Error: 170_358
-			.saturating_add(Weight::from_parts(243_286_593, 0).saturating_mul(e.into()))
+		//  Measured:  `1221 + e * (3177 ±0)`
+		//  Estimated: `6156 + e * (10332 ±3_500_844_840_074_025)`
+		// Minimum execution time: 31_785_000 picoseconds.
+		Weight::from_parts(11_618_923, 6156)
+			// Standard Error: 29_806
+			.saturating_add(Weight::from_parts(6_978_081, 0).saturating_mul(c.into()))
+			// Standard Error: 49_613
+			.saturating_add(Weight::from_parts(245_134_509, 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().reads((22_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()))
 	}
@@ -327,8 +340,8 @@ impl<T: frame_system::Config> pallet_xyk::WeightInfo for HydraWeight<T> {
 		// Proof Size summary in bytes:
 		//  Measured:  `1021`
 		//  Estimated: `6156`
-		// Minimum execution time: 19_174_000 picoseconds.
-		Weight::from_parts(19_702_000, 6156)
+		// Minimum execution time: 19_349_000 picoseconds.
+		Weight::from_parts(19_578_000, 6156)
 			.saturating_add(T::DbWeight::get().reads(2_u64))
 	}
-}
+}
\ No newline at end of file
diff --git a/runtime/hydradx/src/weights/pallet_xyk_liquidity_mining.rs b/runtime/hydradx/src/weights/pallet_xyk_liquidity_mining.rs
index 75005c448..2d3a59698 100644
--- a/runtime/hydradx/src/weights/pallet_xyk_liquidity_mining.rs
+++ b/runtime/hydradx/src/weights/pallet_xyk_liquidity_mining.rs
@@ -19,29 +19,23 @@
 //! Autogenerated weights for `pallet_xyk_liquidity_mining`
 //!
 //! 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: `[]`
+//! DATE: 2024-09-10, 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`
+//! WASM-EXECUTION: `Compiled`, CHAIN: `Some("dev")`, DB CACHE: `1024`
 
 // Executed Command:
-// ./target/release/hydradx
+// target/release/hydradx
 // benchmark
 // pallet
+// --chain=dev
+// --steps=50
+// --repeat=20
 // --wasm-execution=compiled
-// --pallet
-// *
-// --extrinsic
-// *
-// --heap-pages
-// 4096
-// --steps
-// 50
-// --repeat
-// 20
+// --pallet=pallet-xyk-liquidity-mining
+// --extrinsic=*
 // --template=scripts/pallet-weight-template.hbs
-// --output
-// weights/
+// --output=./weights/pallet_xyk_liquidity_mining.rs
 
 #![cfg_attr(rustfmt, rustfmt_skip)]
 #![allow(unused_parens)]
@@ -59,6 +53,8 @@ pub struct HydraWeight<T>(PhantomData<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: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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)
@@ -83,11 +79,11 @@ impl<T: frame_system::Config> pallet_xyk_liquidity_mining::WeightInfo for HydraW
 	/// 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:  `3102`
+		//  Measured:  `3306`
 		//  Estimated: `11402`
-		// Minimum execution time: 277_908_000 picoseconds.
-		Weight::from_parts(279_339_000, 11402)
-			.saturating_add(T::DbWeight::get().reads(19_u64))
+		// Minimum execution time: 286_016_000 picoseconds.
+		Weight::from_parts(287_567_000, 11402)
+			.saturating_add(T::DbWeight::get().reads(20_u64))
 			.saturating_add(T::DbWeight::get().writes(12_u64))
 	}
 	/// Storage: `XYKWarehouseLM::GlobalFarm` (r:1 w:1)
@@ -98,6 +94,8 @@ impl<T: frame_system::Config> pallet_xyk_liquidity_mining::WeightInfo for HydraW
 	/// 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: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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)
@@ -106,17 +104,19 @@ impl<T: frame_system::Config> pallet_xyk_liquidity_mining::WeightInfo for HydraW
 	/// 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:  `4351`
+		//  Measured:  `4555`
 		//  Estimated: `6156`
-		// Minimum execution time: 103_336_000 picoseconds.
-		Weight::from_parts(104_299_000, 6156)
-			.saturating_add(T::DbWeight::get().reads(8_u64))
+		// Minimum execution time: 108_467_000 picoseconds.
+		Weight::from_parts(109_587_000, 6156)
+			.saturating_add(T::DbWeight::get().reads(9_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: `Tokens::Accounts` (r:2 w:2)
 	/// Proof: `Tokens::Accounts` (`max_values`: None, `max_size`: Some(108), added: 2583, mode: `MaxEncodedLen`)
+	/// Storage: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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)
@@ -135,11 +135,11 @@ impl<T: frame_system::Config> pallet_xyk_liquidity_mining::WeightInfo for HydraW
 	/// 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:  `3814`
+		//  Measured:  `4018`
 		//  Estimated: `6196`
-		// Minimum execution time: 172_009_000 picoseconds.
-		Weight::from_parts(173_139_000, 6196)
-			.saturating_add(T::DbWeight::get().reads(12_u64))
+		// Minimum execution time: 177_875_000 picoseconds.
+		Weight::from_parts(178_816_000, 6196)
+			.saturating_add(T::DbWeight::get().reads(13_u64))
 			.saturating_add(T::DbWeight::get().writes(8_u64))
 	}
 	/// Storage: `XYK::ShareToken` (r:1 w:0)
@@ -154,10 +154,10 @@ impl<T: frame_system::Config> pallet_xyk_liquidity_mining::WeightInfo for HydraW
 	/// 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:  `1586`
+		//  Measured:  `1582`
 		//  Estimated: `3670`
-		// Minimum execution time: 47_538_000 picoseconds.
-		Weight::from_parts(48_206_000, 3670)
+		// Minimum execution time: 49_227_000 picoseconds.
+		Weight::from_parts(49_753_000, 3670)
 			.saturating_add(T::DbWeight::get().reads(4_u64))
 			.saturating_add(T::DbWeight::get().writes(4_u64))
 	}
@@ -175,6 +175,8 @@ impl<T: frame_system::Config> pallet_xyk_liquidity_mining::WeightInfo for HydraW
 	/// 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: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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)
@@ -183,11 +185,11 @@ impl<T: frame_system::Config> pallet_xyk_liquidity_mining::WeightInfo for HydraW
 	/// 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:  `4867`
+		//  Measured:  `5071`
 		//  Estimated: `6156`
-		// Minimum execution time: 127_361_000 picoseconds.
-		Weight::from_parts(128_178_000, 6156)
-			.saturating_add(T::DbWeight::get().reads(11_u64))
+		// Minimum execution time: 132_814_000 picoseconds.
+		Weight::from_parts(134_194_000, 6156)
+			.saturating_add(T::DbWeight::get().reads(12_u64))
 			.saturating_add(T::DbWeight::get().writes(4_u64))
 	}
 	/// Storage: `XYKWarehouseLM::ActiveYieldFarm` (r:1 w:1)
@@ -202,6 +204,8 @@ impl<T: frame_system::Config> pallet_xyk_liquidity_mining::WeightInfo for HydraW
 	/// 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: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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)
@@ -210,11 +214,11 @@ impl<T: frame_system::Config> pallet_xyk_liquidity_mining::WeightInfo for HydraW
 	/// 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:  `4667`
+		//  Measured:  `4871`
 		//  Estimated: `6156`
-		// Minimum execution time: 122_100_000 picoseconds.
-		Weight::from_parts(123_315_000, 6156)
-			.saturating_add(T::DbWeight::get().reads(10_u64))
+		// Minimum execution time: 127_078_000 picoseconds.
+		Weight::from_parts(128_319_000, 6156)
+			.saturating_add(T::DbWeight::get().reads(11_u64))
 			.saturating_add(T::DbWeight::get().writes(5_u64))
 	}
 	/// Storage: `XYKWarehouseLM::ActiveYieldFarm` (r:1 w:0)
@@ -223,6 +227,8 @@ impl<T: frame_system::Config> pallet_xyk_liquidity_mining::WeightInfo for HydraW
 	/// 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: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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)
@@ -235,11 +241,11 @@ impl<T: frame_system::Config> pallet_xyk_liquidity_mining::WeightInfo for HydraW
 	/// 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:  `4714`
+		//  Measured:  `4918`
 		//  Estimated: `6156`
-		// Minimum execution time: 99_990_000 picoseconds.
-		Weight::from_parts(100_957_000, 6156)
-			.saturating_add(T::DbWeight::get().reads(9_u64))
+		// Minimum execution time: 105_075_000 picoseconds.
+		Weight::from_parts(105_714_000, 6156)
+			.saturating_add(T::DbWeight::get().reads(10_u64))
 			.saturating_add(T::DbWeight::get().writes(4_u64))
 	}
 	/// Storage: `XYK::ShareToken` (r:1 w:0)
@@ -254,6 +260,8 @@ impl<T: frame_system::Config> pallet_xyk_liquidity_mining::WeightInfo for HydraW
 	/// 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: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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)
@@ -278,11 +286,11 @@ impl<T: frame_system::Config> pallet_xyk_liquidity_mining::WeightInfo for HydraW
 	/// Proof: `XYKWarehouseLM::Deposit` (`max_values`: None, `max_size`: Some(413), added: 2888, mode: `MaxEncodedLen`)
 	fn deposit_shares() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `6036`
+		//  Measured:  `6240`
 		//  Estimated: `16488`
-		// Minimum execution time: 218_921_000 picoseconds.
-		Weight::from_parts(220_788_000, 16488)
-			.saturating_add(T::DbWeight::get().reads(24_u64))
+		// Minimum execution time: 228_440_000 picoseconds.
+		Weight::from_parts(229_414_000, 16488)
+			.saturating_add(T::DbWeight::get().reads(25_u64))
 			.saturating_add(T::DbWeight::get().writes(11_u64))
 	}
 	/// Storage: `Uniques::Asset` (r:1 w:0)
@@ -301,6 +309,8 @@ impl<T: frame_system::Config> pallet_xyk_liquidity_mining::WeightInfo for HydraW
 	/// 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: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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)
@@ -313,11 +323,11 @@ impl<T: frame_system::Config> pallet_xyk_liquidity_mining::WeightInfo for HydraW
 	/// Proof: `XYK::TotalLiquidity` (`max_values`: None, `max_size`: Some(64), added: 2539, mode: `MaxEncodedLen`)
 	fn redeposit_shares() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `6965`
+		//  Measured:  `7169`
 		//  Estimated: `11322`
-		// Minimum execution time: 169_802_000 picoseconds.
-		Weight::from_parts(170_914_000, 11322)
-			.saturating_add(T::DbWeight::get().reads(16_u64))
+		// Minimum execution time: 175_597_000 picoseconds.
+		Weight::from_parts(176_747_000, 11322)
+			.saturating_add(T::DbWeight::get().reads(17_u64))
 			.saturating_add(T::DbWeight::get().writes(5_u64))
 	}
 	/// Storage: `Uniques::Asset` (r:1 w:0)
@@ -334,6 +344,8 @@ impl<T: frame_system::Config> pallet_xyk_liquidity_mining::WeightInfo for HydraW
 	/// 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: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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)
@@ -342,11 +354,11 @@ impl<T: frame_system::Config> pallet_xyk_liquidity_mining::WeightInfo for HydraW
 	/// Proof: `System::Account` (`max_values`: None, `max_size`: Some(128), added: 2603, mode: `MaxEncodedLen`)
 	fn claim_rewards() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `6806`
+		//  Measured:  `7011`
 		//  Estimated: `8739`
-		// Minimum execution time: 174_694_000 picoseconds.
-		Weight::from_parts(176_187_000, 8739)
-			.saturating_add(T::DbWeight::get().reads(14_u64))
+		// Minimum execution time: 183_988_000 picoseconds.
+		Weight::from_parts(184_719_000, 8739)
+			.saturating_add(T::DbWeight::get().reads(15_u64))
 			.saturating_add(T::DbWeight::get().writes(6_u64))
 	}
 	/// Storage: `Uniques::Asset` (r:1 w:1)
@@ -365,6 +377,8 @@ impl<T: frame_system::Config> pallet_xyk_liquidity_mining::WeightInfo for HydraW
 	/// 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: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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)
@@ -389,11 +403,11 @@ impl<T: frame_system::Config> pallet_xyk_liquidity_mining::WeightInfo for HydraW
 	/// Proof: `Uniques::ItemPriceOf` (`max_values`: None, `max_size`: Some(113), added: 2588, mode: `MaxEncodedLen`)
 	fn withdraw_shares() -> Weight {
 		// Proof Size summary in bytes:
-		//  Measured:  `6479`
+		//  Measured:  `6683`
 		//  Estimated: `13905`
-		// Minimum execution time: 369_769_000 picoseconds.
-		Weight::from_parts(371_613_000, 13905)
-			.saturating_add(T::DbWeight::get().reads(28_u64))
+		// Minimum execution time: 381_117_000 picoseconds.
+		Weight::from_parts(383_838_000, 13905)
+			.saturating_add(T::DbWeight::get().reads(29_u64))
 			.saturating_add(T::DbWeight::get().writes(16_u64))
 	}
 	/// Storage: `XYK::ShareToken` (r:1 w:0)
@@ -410,6 +424,8 @@ impl<T: frame_system::Config> pallet_xyk_liquidity_mining::WeightInfo for HydraW
 	/// 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: `Router::SkipEd` (r:1 w:0)
+	/// Proof: `Router::SkipEd` (`max_values`: Some(1), `max_size`: Some(1), added: 496, 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)
@@ -418,11 +434,11 @@ impl<T: frame_system::Config> pallet_xyk_liquidity_mining::WeightInfo for HydraW
 	/// 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:  `5159`
+		//  Measured:  `5363`
 		//  Estimated: `6156`
-		// Minimum execution time: 127_095_000 picoseconds.
-		Weight::from_parts(128_067_000, 6156)
-			.saturating_add(T::DbWeight::get().reads(11_u64))
+		// Minimum execution time: 131_995_000 picoseconds.
+		Weight::from_parts(132_870_000, 6156)
+			.saturating_add(T::DbWeight::get().reads(12_u64))
 			.saturating_add(T::DbWeight::get().writes(5_u64))
 	}
 }
\ No newline at end of file
diff --git a/runtime/hydradx/src/xcm.rs b/runtime/hydradx/src/xcm.rs
index 853841cd2..bd1af1b6d 100644
--- a/runtime/hydradx/src/xcm.rs
+++ b/runtime/hydradx/src/xcm.rs
@@ -38,7 +38,7 @@ 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)
+		xcm_builder::WithLatestLocationConverter::convert_back(&location.0)
 	}
 }
 
@@ -141,7 +141,29 @@ where
 	}
 }
 
+pub struct IsDotFrom<Origin>(PhantomData<Origin>);
+impl<Origin> ContainsPair<Asset, Location> for IsDotFrom<Origin>
+where
+	Origin: Get<Location>,
+{
+	fn contains(asset: &Asset, origin: &Location) -> bool {
+		let loc = Origin::get();
+		&loc == origin
+			&& matches!(
+				asset,
+				Asset {
+					id: AssetId(Location {
+						parents: 1,
+						interior: Here
+					}),
+					fun: Fungible(_),
+				},
+			)
+	}
+}
+
 pub type Reserves = (
+	IsDotFrom<AssetHubLocation>,
 	IsForeignNativeAssetFrom<AssetHubLocation>,
 	MultiNativeAsset<AbsoluteReserveProvider>,
 );
@@ -188,6 +210,9 @@ impl Config for XcmConfig {
 	type SafeCallFilter = Everything;
 	type Aliasers = Nothing;
 	type TransactionalProcessor = xcm_builder::FrameTransactionalProcessor;
+	type HrmpNewChannelOpenRequestHandler = ();
+	type HrmpChannelClosingHandler = ();
+	type HrmpChannelAcceptedHandler = ();
 }
 
 impl cumulus_pallet_xcm::Config for Runtime {
@@ -217,7 +242,7 @@ parameter_type_with_key! {
 	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),
+			(1, Some(Parachain(ASSET_HUB_PARA_ID))) => Some(150_000_000),
 			_ => None,
 		}
 	};
@@ -297,6 +322,7 @@ impl pallet_message_queue::Config for Runtime {
 	type HeapSize = MessageQueueHeapSize;
 	type MaxStale = MessageQueueMaxStale;
 	type ServiceWeight = MessageQueueServiceWeight;
+	type IdleMaxServiceWeight = MessageQueueServiceWeight;
 }
 
 pub struct CurrencyIdConvert;
diff --git a/rust-toolchain b/rust-toolchain
index fa4029d55..47a114dc5 100644
--- a/rust-toolchain
+++ b/rust-toolchain
@@ -1,5 +1,5 @@
 [toolchain]
-channel = "1.75.0"
+channel = "1.77.0"
 components = [ "rustfmt", "clippy", "rust-src" ]
 targets = [ "wasm32-unknown-unknown" ]
 profile = "minimal"
diff --git a/scraper/Cargo.toml b/scraper/Cargo.toml
index a7c66357f..e80c1d9a1 100644
--- a/scraper/Cargo.toml
+++ b/scraper/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "scraper"
-version = "1.2.4"
+version = "1.2.5"
 description = "Scraper tool"
 authors = ["GalacticCouncil"]
 edition = "2021"
@@ -9,11 +9,11 @@ license = "Apache 2.0"
 repository = "https://github.com/galacticcouncil/HydraDX-node"
 
 [dependencies]
-codec = { package = "parity-scale-codec", version = "3.4.0" }
-jsonrpsee = { version = "0.15.1", features = ["server", "macros"] }
-serde = { version = "1.0.136", features = ["derive"] }
-clap = { version = "3.2.11", features = [ "derive" ] }
-tokio = { version = "1", features = ["macros", "rt-multi-thread"] }
+codec = { workspace = true }
+jsonrpsee = { workspace = true }
+serde = { workspace = true }
+clap = { workspace = true }
+tokio = {workspace = true }
 
 # local dependencies
 hydradx-runtime = { workspace = true }
diff --git a/scraper/src/main.rs b/scraper/src/main.rs
index 4ad27abf3..17e6a65e3 100644
--- a/scraper/src/main.rs
+++ b/scraper/src/main.rs
@@ -10,10 +10,10 @@ use substrate_rpc_client::{ws_client, ChainApi};
 struct StorageCmd {
 	/// The block hash at which to get the runtime state. Will be latest finalized head if not
 	/// provided.
-	#[clap(long)]
+	#[arg(long)]
 	at: Option<<Block as BlockT>::Hash>,
 	/// The pallets to scrape. If empty, entire chain state will be scraped.
-	#[clap(long, multiple_values = true)]
+	#[arg(long, num_args = 0..)]
 	pallet: Vec<String>,
 	#[allow(missing_docs)]
 	#[clap(flatten)]
@@ -42,10 +42,10 @@ enum Command {
 #[derive(Parser, Debug)]
 struct SharedParams {
 	/// The url to connect to.
-	#[clap(short, long)]
+	#[arg(short, long)]
 	uri: String,
 	/// The path where to save the storage file.
-	#[clap(long)]
+	#[arg(long)]
 	path: Option<PathBuf>,
 }
 
diff --git a/traits/Cargo.toml b/traits/Cargo.toml
index c3ad8f9a7..18e42626c 100644
--- a/traits/Cargo.toml
+++ b/traits/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "hydradx-traits"
-version = "3.7.0"
+version = "3.7.1"
 description = "Shared traits"
 authors = ["GalacticCouncil"]
 edition = "2021"
@@ -8,10 +8,10 @@ license = "Apache 2.0"
 repository = "https://github.com/galacticcouncil/warehouse/tree/master/traits"
 
 [dependencies]
-codec = { default-features = false, features = ["derive"], package = "parity-scale-codec", version = "3.4.0" }
-scale-info = { version = "2.1.2", default-features = false, features = ["derive"] }
-serde = { features = ["derive"], default-features = false, version = "1.0.137" }
-impl-trait-for-tuples = "0.2.2"
+codec = {  workspace = true }
+scale-info = {  workspace = true }
+serde = {  workspace = true }
+impl-trait-for-tuples = {  workspace = true }
 sp-arithmetic = { workspace = true }
 
 # Substrate dependencies
diff --git a/utils/build-script-utils/Cargo.toml b/utils/build-script-utils/Cargo.toml
index 5ce5154f3..0252f1aa9 100644
--- a/utils/build-script-utils/Cargo.toml
+++ b/utils/build-script-utils/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "hydra-dx-build-script-utils"
-version = "1.0.3"
+version = "1.0.4"
 description = "Crate with utility functions for `build.rs` scripts."
 authors = ["GalacticCouncil <hydradx@galacticcouncil.io>"]
 edition = "2021"
@@ -12,5 +12,5 @@ repository = "https://github.com/paritytech/substrate/"
 targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
-platforms = "1.1"
-cargo-lock = "9.0.0"
+platforms = { workspace = true }
+cargo-lock = { workspace = true }
diff --git a/utils/test-utils/Cargo.toml b/utils/test-utils/Cargo.toml
index f406c5f61..b1b1b9287 100644
--- a/utils/test-utils/Cargo.toml
+++ b/utils/test-utils/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "test-utils"
-version = "1.1.1"
+version = "1.1.2"
 description = "Utility functions for testing pallets"
 authors = ["GalacticCouncil"]
 edition = "2021"
@@ -12,8 +12,7 @@ targets = ["x86_64-unknown-linux-gnu"]
 
 [dependencies]
 frame-system = { workspace = true }
-
-pretty_assertions = { version= "1.3.0", default-features = false, features = ["alloc"] }
+pretty_assertions = {  workspace = true, features = ["alloc"] }
 
 [features]
 default = ["std"]